Merge remote-tracking branch 'github/pr/494'.

2026-09-24 04:59:14 -07:00 · 2015-12-19 18:58:52 +00:00
parent 4282b8acb7 61796c7476
commit d0c2dc76ba
82 changed files with 2177 additions and 369 deletions
--- a/app-dicts/myspell-en/metadata.xml
+++ b/app-dicts/myspell-en/metadata.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
+	<herd>proxy-maintainers</herd>
+	<maintainer>
+		<name>Elizabeth Myers</name>
+		<email>elizabeth@interlinked.me</email>
+		<description>Proxied maintainer; set to assignee in all bugs</description>
+	</maintainer>
 </pkgmetadata>
--- a/app-dicts/myspell-en/myspell-en-20151201.ebuild
+++ b/app-dicts/myspell-en/myspell-en-20151201.ebuild
@@ -2,6 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

+EAPI=5
+
 MYSPELL_DICT=(
 	"en_AU.aff"
 	"en_AU.dic"
--- a/app-i18n/man-pages-it/Manifest
+++ b/app-i18n/man-pages-it/Manifest
@@ -1 +1,2 @@
 DIST man-pages-it-2.80.tar.gz 1789480 SHA256 a9c88fd61b057e31ea4a3183fbaf71927aa3962928eefc4c393364e7b0ad8492 SHA512 81cee1b4d0c818b83830355ba1347df7a309b87ebfe3169db7763b22de8638273eacf377d0b9127aa1e748c8fd427eb268dda6d6c4b543c6d3788edda86980ef WHIRLPOOL cae8dea02428f17409421a46c0a475f583e7a84d2eeb0c831061bf09571fde796e4de86799197a7acf6b09922be635f0078c62796509343c5547607f5439d5a7
+DIST man-pages-it-4.00.tar.xz 349192 SHA256 780bc7280508d56a4e585248e336d3b31e9c91f4d88d783242b7b0f3c6c41916 SHA512 6392b42254eba42bd76f3aef3b6206396a817019df61462e44bd0f7dc519768cb1b1107726c45e402a0cf27e6f2ca8c8912363bd9bec7562b10e8fd5dcc60ffe WHIRLPOOL bc8a8d9e633c1f029b5a4b1bbe3d202dfb5b2a39de92cbafc3bcad32c366f25acde209748d6fa4577f7caeb768f7dcd6a147226264845f76704a22d20061e707
--- a/app-i18n/man-pages-it/man-pages-it-4.00.ebuild
+++ b/app-i18n/man-pages-it/man-pages-it-4.00.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="A somewhat comprehensive collection of Italian Linux man pages"
+HOMEPAGE="http://it.tldp.org/man/"
+SRC_URI="ftp://ftp.pluto.it/pub/pluto/ildp/man/${P}.tar.xz"
+
+LICENSE="man-pages GPL-2+ BSD MIT FDL-1.1+ public-domain man-pages-posix"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+RDEPEND="virtual/man"
+
+src_compile() { :; } # emake does bad things here
+
+src_install() {
+	doman -i18n=it man-pages/man[1-9]/* binutils/man[1-9]/* inetutils/man[1-9]/* \
+		util-linux/man[1-9]/* misc/man[1-9]/*
+
+	dodoc description README CHANGELOG
+}
--- a/app-i18n/man-pages-it/metadata.xml
+++ b/app-i18n/man-pages-it/metadata.xml
@@ -1,7 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>maintainer-needed@gentoo.org</email>
-</maintainer>
+	<herd>proxy-maintainers</herd>
+	<maintainer>
+		<email>axelgenus@gmail.com</email>
+		<name>Alessandro Calorì</name>
+		<description>Proxied maintainer; set to assignee in all bugs</description>
+	</maintainer>
+	<upstream>
+		<maintainer status="active">
+			<email>giulio@pluto.it</email>
+		</maintainer>
+	</upstream>
+	<longdescription lang="en">
+		A somewhat comprehensive collection of Italian Linux man pages.
+	</longdescription>
 </pkgmetadata>
--- a/app-text/aspell/metadata.xml
+++ b/app-text/aspell/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<herd>proxy-maintainers</herd>
 	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
+		<name>Elizabeth Myers</name>
+		<email>elizabeth@interlinked.me</email>
+		<description>Proxied maintainer; set to assignee in all bugs</description>
 	</maintainer>
 </pkgmetadata>
--- a/app-text/hunspell/metadata.xml
+++ b/app-text/hunspell/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<herd>proxy-maintainers</herd>
 	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
+		<name>Elizabeth Myers</name>
+		<email>elizabeth@interlinked.me</email>
+		<description>Proxied maintainer; set to assignee in all bugs</description>
 	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">hunspell</remote-id>
--- a/dev-cpp/gconfmm/Manifest
+++ b/dev-cpp/gconfmm/Manifest
@@ -1 +1,2 @@
+DIST gconfmm-2.28.3.tar.bz2 471125 SHA256 a5e0092bb73371a3ca76b2ecae794778f3a9409056fee9b28ec1db072d8e6108 SHA512 0fd3a43373dfdf514eca61537c19dafd4ad582d2ec6bb325652766fba90ed723feff6daf93effcdf20f917c573131d58c16f1a826194f653864a701bb8a57097 WHIRLPOOL 361aeef2173cbc0f43efacf8b612f1a933e332e94f1b57d1039a67e08bd3757524b6d68347c136f650523b1a80e97267c60babed6e0caa158c8452be8c39db32
 DIST gconfmm-2.28.3.tar.xz 376840 SHA256 d7bd2d29c1a87b85329547fb29a0eca52d944e60699982152775002e24c09228 SHA512 8a6f34b175fd2370d596ef859b7075140441f14b97b708afd96bae25874780d321ed81905182ed50abaf6f41f710a325b8053b9aef511cd242df43570646df73 WHIRLPOOL 452f600bb03670a09797ac43c547e7038c16f322f372dd1a4db9ec4a5646ecb4be40a69e2aa91aaa849a3211268d060bcca4b44a438c8c194261253d71d89bc5
--- a/dev-cpp/gconfmm/gconfmm-2.28.3-r1.ebuild
+++ b/dev-cpp/gconfmm/gconfmm-2.28.3-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+GNOME_TARBALL_SUFFIX="bz2"
+
+inherit flag-o-matic gnome2
+
+DESCRIPTION="C++ bindings for GConf"
+HOMEPAGE="http://www.gtkmm.org"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="doc"
+
+RDEPEND="
+	>=gnome-base/gconf-2.4:2
+	>=dev-cpp/glibmm-2.12:2[doc?]
+	>=dev-cpp/gtkmm-2.4:2.4
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+src_configure() {
+	append-cxxflags -std=c++11 #568580
+	gnome2_src_configure \
+		$(use_enable doc documentation)
+}
+
+src_install() {
+	gnome2_src_install
+
+	if use doc ; then
+		dohtml -r docs/reference/html/*
+	fi
+}
--- a/dev-cpp/gnome-vfsmm/gnome-vfsmm-2.26.0-r1.ebuild
+++ b/dev-cpp/gnome-vfsmm/gnome-vfsmm-2.26.0-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+GCONF_DEBUG="no"
+GNOME_TARBALL_SUFFIX="bz2"
+
+inherit flag-o-matic gnome2
+
+DESCRIPTION="C++ bindings for gnome-vfs"
+HOMEPAGE="http://www.gtkmm.org"
+
+LICENSE="LGPL-2.1"
+SLOT="1.1"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="doc examples"
+
+# glibmm dep is because build fails with older versions...
+RDEPEND="
+	>=gnome-base/gnome-vfs-2.8.1
+	>=dev-cpp/glibmm-2.12
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+
+src_prepare() {
+	if ! use doc; then
+		# documentation requires Doxygen and takes time
+		sed -i 's/^\(SUBDIRS =.*\)docs\(.*\)$/\1\2/' Makefile.in || \
+			die "sed Makefile.in failed"
+	fi
+
+	if ! use examples; then
+		# don't waste time building the examples
+		sed -i 's/^\(SUBDIRS =.*\)examples\(.*\)$/\1\2/' Makefile.in || \
+			die "sed Makefile.in failed"
+	fi
+
+	append-cxxflags -std=c++11
+
+	gnome2_src_prepare
+}
+
+src_install() {
+	gnome2_src_install
+
+	if use doc ; then
+		dohtml -r docs/reference/html/*
+	fi
+
+	if use examples; then
+		find examples -type d -name '.deps' -exec rm -fr {} \; 2>/dev/null
+		cp -R examples "${ED}"/usr/share/doc/${PF}
+	fi
+}
--- a/dev-cpp/gtksourceviewmm/gtksourceviewmm-2.10.3-r1.ebuild
+++ b/dev-cpp/gtksourceviewmm/gtksourceviewmm-2.10.3-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit flag-o-matic gnome2
+
+DESCRIPTION="C++ bindings for gtksourceview"
+HOMEPAGE="https://wiki.gnome.org/Projects/GtkSourceView"
+
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc"
+SLOT="2.0"
+LICENSE="LGPL-2.1"
+
+RDEPEND="
+	>=dev-cpp/gtkmm-2.12:2.4
+	dev-cpp/atkmm
+	>=x11-libs/gtksourceview-2.10.0:2.0
+	!>=dev-cpp/libgtksourceviewmm-1
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# Remove docs from SUBDIRS so that docs are not installed, as
+	# we handle it in src_install.
+	sed -i -e 's|^\(SUBDIRS =.*\)$(doc_subdirs)\(.*\)|\1\2|' Makefile.in || \
+		die "sed Makefile.in failed"
+}
+
+src_configure() {
+	append-cxxflags -std=c++11
+	gnome2_src_configure \
+		$(use_enable doc documentation) \
+		--disable-static
+}
+
+src_install() {
+	gnome2_src_install
+	use doc && dohtml -r docs/reference/html/*
+}
--- a/dev-embedded/libftdi/files/libftdi-0.20-cmake-include.patch
+++ b/dev-embedded/libftdi/files/libftdi-0.20-cmake-include.patch
@@ -0,0 +1,22 @@
+From ccbd6cf1934056386772debba8583bc9b3721072 Mon Sep 17 00:00:00 2001
+From: Uffe Jakobsen <uffe@uffe.org>
+Date: Mon, 22 Oct 2012 12:03:22 +0200
+Subject: [PATCH] Fix build on FreeBSD (cmake file typo)
+
+---
+ examples/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
+index 6793d89..1263c62 100644
+--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
+@@ -2,7 +2,7 @@ option(EXAMPLES "Build example programs" ON)
+ 
+ if (EXAMPLES)
+     # Includes
+-    include( ${CMAKE_CURRENT_SOURCE_DIR}
+    include_directories( ${CMAKE_CURRENT_SOURCE_DIR}
+             ${CMAKE_CURRENT_BINARY_DIR}
+             )
+ 
--- a/dev-embedded/libftdi/files/libftdi-0.20-cmake-version.patch
+++ b/dev-embedded/libftdi/files/libftdi-0.20-cmake-version.patch
@@ -0,0 +1,38 @@
+From e18b700743217e8c505e97762e0f66a4f6a90425 Mon Sep 17 00:00:00 2001
+From: Maciej Grela <maciej.grela@gmail.com>
+Date: Wed, 20 Jun 2012 23:08:50 +0200
+Subject: [PATCH] Fix libftdi.pc file generation when building with
+ -DDOCUMENTATION=OFF
+
+---
+ CMakeLists.txt | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 4c43a48..07f8bb9 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -2,7 +2,9 @@
+ project(libftdi)
+ set(MAJOR_VERSION 0)
+ set(MINOR_VERSION 20)
+set(PACKAGE libftdi)
+ set(VERSION_STRING ${MAJOR_VERSION}.${MINOR_VERSION})
+set(VERSION ${VERSION_STRING})
+ SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}")
+ 
+ # CMake
+@@ -116,12 +118,11 @@ add_custom_target(dist
+ 
+ option(DOCUMENTATION "Generate API documentation with Doxygen" ON)
+ 
+
+ find_package(Doxygen)
+ if(DOCUMENTATION AND DOXYGEN_FOUND)
+ 
+    # Set variables
+-   set(PACKAGE libftdi)
+-   set(VERSION ${VERSION_STRING})
+    set(top_srcdir ${CMAKE_SOURCE_DIR})
+ 
+    # Find doxy config
--- a/dev-embedded/libftdi/libftdi-0.20.ebuild
+++ b/dev-embedded/libftdi/libftdi-0.20.ebuild
@@ -4,7 +4,7 @@

 EAPI="2"

-inherit cmake-utils python
+inherit cmake-utils python eutils

 if [[ ${PV} == 9999* ]] ; then
 	EGIT_REPO_URI="git://developer.intra2net.com/${PN}"
@@ -34,6 +34,8 @@ src_prepare() {
 	sed -i \
 		-e '/SET(LIB_SUFFIX /d' \
 		CMakeLists.txt || die
+
+	epatch "${FILESDIR}"/${P}-cmake-{include,version}.patch
 }

 src_configure() {
--- a/dev-embedded/sdcc/sdcc-2.9.0.ebuild
+++ b/dev-embedded/sdcc/sdcc-2.9.0.ebuild
@@ -7,7 +7,7 @@ EAPI="2"
 inherit eutils

 if [[ ${PV} == "9999" ]] ; then
-	ESVN_REPO_URI="https://sdcc.svn.sourceforge.net/svnroot/sdcc/trunk/sdcc"
+	ESVN_REPO_URI="https://svn.code.sourceforge.net/p/sdcc/code/trunk/sdcc"
 	inherit subversion autotools
 	docs_compile() { return 0; }
 else
--- a/dev-embedded/sdcc/sdcc-3.5.0.ebuild
+++ b/dev-embedded/sdcc/sdcc-3.5.0.ebuild
@@ -7,7 +7,7 @@ EAPI="5"
 inherit eutils toolchain-funcs

 if [[ ${PV} == "9999" ]] ; then
-	ESVN_REPO_URI="https://sdcc.svn.sourceforge.net/svnroot/sdcc/trunk/sdcc"
+	ESVN_REPO_URI="https://svn.code.sourceforge.net/p/sdcc/code/trunk/sdcc"
 	inherit subversion
 	docs_compile() { return 0; }
 else
--- a/dev-embedded/sdcc/sdcc-9999.ebuild
+++ b/dev-embedded/sdcc/sdcc-9999.ebuild
@@ -7,7 +7,7 @@ EAPI="5"
 inherit eutils toolchain-funcs

 if [[ ${PV} == "9999" ]] ; then
-	ESVN_REPO_URI="https://sdcc.svn.sourceforge.net/svnroot/sdcc/trunk/sdcc"
+	ESVN_REPO_URI="https://svn.code.sourceforge.net/p/sdcc/code/trunk/sdcc"
 	inherit subversion
 	docs_compile() { return 0; }
 else
@@ -20,9 +20,20 @@ fi
 DESCRIPTION="Small device C compiler (for various microprocessors)"
 HOMEPAGE="http://sdcc.sourceforge.net/"

-LICENSE="GPL-2"
+LICENSE="GPL-2 ZLIB
+	non-free? ( MicroChip-SDCC )
+	packihx? ( public-domain )"
 SLOT="0"
-IUSE="+boehm-gc doc"
+IUSE="mcs51 z80 z180 r2k r3ka gbz80 tlcs90 ds390 ds400 pic14 pic16 hc08 s08 stm8
+ucsim device-lib packihx +sdcpp sdcdb sdbinutils non-free +boehm-gc doc"
+
+REQUIRED_USE="
+	mcs51? ( sdbinutils )
+	ds390? ( sdbinutils )
+	ds400? ( sdbinutils )
+	hc08?  ( sdbinutils )
+	s08?   ( sdbinutils )"
+
 RESTRICT="strip"

 RDEPEND="dev-libs/boost:=
@@ -41,12 +52,10 @@ if docs_compile ; then
 		)"
 fi

-S=${WORKDIR}/${PN}
-
 src_prepare() {
 	# Fix conflicting variable names between Gentoo and sdcc
 	find \
-		'(' -name 'Makefile*.in' -o -name configure ')' \
+		'(' -name 'Makefile*.in' -o -name 'configure' ')' \
 		-exec sed -r -i \
 			-e 's:\<(PORTDIR|ARCH)\>:SDCC\1:g' \
 			{} + || die
@@ -57,15 +66,8 @@ src_prepare() {
 		-e "/^AR =/s:=.*:=$(tc-getAR):" \
 		support/cpp/Makefile.in || die

-	# We'll install doc manually
-	sed -i -e '/SDCC_DOC/d' Makefile.in || die
-	sed -i -e 's/ doc//' sim/ucsim/packages_in.mk || die
-
 	# Make sure timestamps don't get messed up.
 	[[ ${PV} == "9999" ]] && find "${S}" -type f -exec touch -r . {} +
-
-	# workaround parallel build issues with lyx
-	mkdir -p "${HOME}"/.lyx
 }

 src_configure() {
@@ -77,6 +79,27 @@ src_configure() {
 		ac_cv_prog_AR="$(tc-getAR)" \
 		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
 		--without-ccache \
+		$(use_enable mcs51 mcs51-port) \
+		$(use_enable z80 z80-port) \
+		$(use_enable z180 z180-port) \
+		$(use_enable r2k r2k-port) \
+		$(use_enable r3ka r3ka-port) \
+		$(use_enable gbz80 gbz80-port) \
+		$(use_enable tlcs90 tlcs90-port) \
+		$(use_enable ds390 ds390-port) \
+		$(use_enable ds400 ds400-port) \
+		$(use_enable pic14 pic14-port) \
+		$(use_enable pic16 pic16-port) \
+		$(use_enable hc08 hc08-port) \
+		$(use_enable s08 s08-port) \
+		$(use_enable stm8 stm8-port) \
+		$(use_enable ucsim ucsim) \
+		$(use_enable device-lib device-lib) \
+		$(use_enable packihx packihx) \
+		$(use_enable sdcpp sdcpp) \
+		$(use_enable sdcdb sdcdb) \
+		$(use_enable sdbinutils sdbinutils) \
+		$(use_enable non-free non-free) \
 		$(use_enable boehm-gc libgc) \
 		$(docs_compile && use_enable doc || echo --disable-doc)
 }
--- a/dev-libs/guiloader-c++/guiloader-c++-2.21.0-r1.ebuild
+++ b/dev-libs/guiloader-c++/guiloader-c++-2.21.0-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+inherit eutils flag-o-matic
+
+DESCRIPTION="C++ binding to GuiLoader library"
+HOMEPAGE="http://www.crowdesigner.org"
+SRC_URI="https://nothing-personal.googlecode.com/files/${P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls"
+
+LANGS="ru"
+
+RDEPEND=">=dev-libs/guiloader-2.21
+	>=dev-cpp/gtkmm-2.22:2.4
+	>=dev-cpp/glibmm-2.24:2"
+DEPEND="${RDEPEND}
+	dev-libs/boost
+	virtual/pkgconfig
+	nls? ( >=sys-devel/gettext-0.18 )"
+
+for x in ${LANGS}; do
+	IUSE="${IUSE} linguas_${x}"
+done
+
+src_configure() {
+	append-cxxflags -std=c++11
+	econf $(use_enable nls)
+}
+
+src_install() {
+	default
+	prune_libtool_files
+	dodoc doc/{authors.txt,news.en.txt,readme.en.txt}
+}
--- a/dev-libs/libnl/libnl-3.2.27.ebuild
+++ b/dev-libs/libnl/libnl-3.2.27.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 "
 LICENSE="LGPL-2.1 utils? ( GPL-2 )"
 SLOT="3"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux"
 IUSE="static-libs python utils"

 RDEPEND="python? ( ${PYTHON_DEPS} )
--- a/dev-ml/ocaml-cstruct/Manifest
+++ b/dev-ml/ocaml-cstruct/Manifest
@@ -1 +1,2 @@
 DIST ocaml-cstruct-1.7.0.tar.gz 245652 SHA256 db996700df500cff933eaaebfff9834ccaba466518bade575934bb133f62f322 SHA512 5a43ffa0ee867c917f171cd90186eaf44a258f1e4fb9db7947d23113fe7d8e9058acfce7030c0e31e211b5448a9e23b48ad748c61ffab6678aa79c6aeaac2f48 WHIRLPOOL 99d7650405df68d8e4d1cfc237eb9a791db5c54cfcdbbf2e9eb5c493881256eed7298588c6ad9ca91b493544df0bb24e9c87c2820c5b92c37d460a8cc6211c26
+DIST ocaml-cstruct-1.7.1.tar.gz 245894 SHA256 7869d096fe7c6231bbceefe3b2205417b28b6c10f4174b7e2cfdfa46956eaaa5 SHA512 67dd276ab2f895ef80cc7ba5b48d51bcfcf52ac49aa29cd4b17aa00be109198347a50229b81fbe506d831ace753d72f3b4bb80f19e8e57fa29d9ba65da472f19 WHIRLPOOL 8145930a1dcadbcf48c1da0dcba10a45f3d52c8ae2565aee7e609bd3eeb5eead9cee9ef423332a580ab77ceabb2f301917226d1a73e1b7f6efc7a3096c4112d6
--- a/dev-ml/ocaml-cstruct/ocaml-cstruct-1.7.1.ebuild
+++ b/dev-ml/ocaml-cstruct/ocaml-cstruct-1.7.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+OASIS_BUILD_DOCS=1
+OASIS_BUILD_TESTS=1
+
+inherit oasis
+
+DESCRIPTION="Map OCaml arrays onto C-like structs"
+HOMEPAGE="https://github.com/mirage/ocaml-cstruct https://mirage.io"
+SRC_URI="https://github.com/mirage/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="async +camlp4 +lwt"
+
+RDEPEND="
+	async? ( dev-ml/async:= )
+	camlp4? ( dev-ml/camlp4:= )
+	lwt? ( dev-ml/lwt:= )
+	>=dev-lang/ocaml-4.01:=
+	dev-ml/ocplib-endian:=
+	dev-ml/sexplib:=
+	dev-ml/type-conv:=
+"
+DEPEND="
+	test? ( dev-ml/ounit )
+	${RDEPEND}
+"
+
+src_configure() {
+	oasis_configure_opts="
+		$(use_enable lwt)
+		$(use_enable camlp4)
+		$(use_enable async)
+		--enable-unix
+	" oasis_src_configure
+}
+
+DOCS=( CHANGES README.md TODO.md )
--- a/dev-ml/postgresql-ocaml/Manifest
+++ b/dev-ml/postgresql-ocaml/Manifest
@@ -2,3 +2,4 @@ DIST postgresql-ocaml-2.0.5.tar.gz 79123 SHA256 e786c46edbd63aacd82e008098a2c801
 DIST postgresql-ocaml-2.0.6.tar.gz 79697 SHA256 1f3ae24c323f3b1f5876d647168eeca2182994feb53dad9ef540fd54837887cb SHA512 0cde0deb38df5bdce467941ca4e9bd3a9648c430a9e406eadc6aecffbe7b5aae27fb5fe3464954de98cba8ecece77e91416cd28f94cb3d3d7d08993d2238f2dc WHIRLPOOL f5f3a100074fb0e1d1dbc6ae13b98be28db76cf7dce5f1731bee44f099dd00f40dd0e13015432f6e1e1f55d3b522986bacf1ea369f1d1a881be10266d2decd8c
 DIST postgresql-ocaml-3.2.0.tar.gz 85619 SHA256 bdae08e08fffa0f863512ac54675db6fa2edd0bab63762cc9ffbedc656893426 SHA512 da35820cf1081641161e8e9c0ee5c0d1090fa61b1f0e13893feda83ae6a0167aac93e58db7448b3cf841bab345f3a4efa97b385ca7819019c6146fd17cd9f146 WHIRLPOOL fab8eee40cbf808faab9aca277a1a6306a1bb02d7fba9d2a45fdf8c586d6174367417b9760656a13622bc9fbff2d4b8218b7627a8c9f365db99eb9bd983cac34
 DIST postgresql-ocaml-3.2.1.tar.gz 85604 SHA256 e4679e22f10d4c366ad03b926ab63e65618e4da8359e16711d8f2d9dff8a7593 SHA512 36c4c894259d8bfaccbb1e5dc517fdbb025fe6d9fd24fa5e1d2120faf75aec472218d62c8816ef0055b1c0de934ff74a7eb22d8724d9e9790c21eaa6c4a56ed6 WHIRLPOOL c1476316e1b9b77ef0d5e8c76384a1bfb367d83cb527fed56afbea51e924cebef51af7de2e7d72ca6b117726d71147e8b842f57bf1aa003a7f9e7f06a59fdfbf
+DIST postgresql-ocaml-3.2.2.tar.gz 85697 SHA256 51348110f06e7d17f68894fd91f91b3e1f935647355a94a79b8c16f923ce9e81 SHA512 c41c6feed76d8d49932399a080d2e2fa9227b742e0cab5efdf849315ae1b633369e035bee3fd1d94c6a61e533f23d3881e9de650d1b4ec01946660f39c245917 WHIRLPOOL c314346cf113c87ceec3ded469505952a7717f06bdc6099e5fab84d4b5911927b611036bf924c9fdadb35c545ad3fc8ab06d115fd24ad78e045580ba8e02a04f
--- a/dev-ml/postgresql-ocaml/postgresql-ocaml-3.2.2.ebuild
+++ b/dev-ml/postgresql-ocaml/postgresql-ocaml-3.2.2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+OASIS_BUILD_DOCS=1
+
+inherit oasis
+
+DESCRIPTION="A package for ocaml that provides access to PostgreSQL databases"
+SRC_URI="https://github.com/mmottl/postgresql-ocaml/releases/download/v${PV}/${P}.tar.gz"
+HOMEPAGE="http://mmottl.github.io/postgresql-ocaml/"
+IUSE="examples"
+
+RDEPEND="
+	dev-db/postgresql:=[server]
+"
+DEPEND="${RDEPEND}
+	>=dev-ml/findlib-1.5"
+
+SLOT="0/${PV}"
+LICENSE="LGPL-2"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+DOCS=( "AUTHORS.txt" "CHANGES.txt" "README.md" )
+
+src_install() {
+	oasis_src_install
+	if use examples ; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples
+	fi
+}
--- a/dev-ml/yojson/Manifest
+++ b/dev-ml/yojson/Manifest
@@ -1,3 +1,4 @@
 DIST yojson-1.2.0.tar.gz 26069 SHA256 7c163d820c12773681abed7e02d6a7ebd8b8d00163e81ce5a3742b5fd39d7a8f SHA512 7d5c7ab17a7230fe23fab956bba905fca40429575c708606ec07fe32ccace6816db4499756954c4e3d0f7d2686ca789d214e381b9236afe7e8efe0855fb01561 WHIRLPOOL cffe050d98677441707451219a69251f834847bf1a68b347be8939040767f030dc7af4af2da0165d88cbf2ce42c52c157ef9db9387a6bfee0fac893a18c5704b
 DIST yojson-1.2.1.tar.gz 26268 SHA256 df8cb4945b592897cdb54e4240758a88a38267daa54554dc62a2f48a91e8a32d SHA512 5a8b302e41ff1dfb312636d68bcf4bb38231335b8f35b0a9236dcdc97cd1a3026e7a349fdc0d73866c0432a86fe350a650c791f89122cc9bc129c7fcb54b4715 WHIRLPOOL c9df8f62bc3aadc4a905c434db53e1fd3a3ec14917a58dcbbe239c8ba9f196c1f819da20df4c253d0a8e4a7b54025c4a75453e817bb0cdc8dce0fbf89c52a0e5
 DIST yojson-1.2.3.tar.gz 26388 SHA256 7e0d8ecc47f43b051901a2b556a7c65bb62fcf1ab856d822f50f2bdd35a36078 SHA512 12929e6b4db13074fc708a9bb45a35a5661a0a43e893c03cc984a346e4e0aa04ca91f3ecce3460147ef6e85ddeda28ed251fefb2bf3e71b06edbe4fdc53b6c9b WHIRLPOOL c2ac1291f375870023a4883e9866a74be19647863ccee0f0e95ee2dee0734c57489612f96897330c223549166a21a8e44088e8eac186ac0d596a3469cf3bbe04
+DIST yojson-1.3.0.tar.gz 26610 SHA256 80e26e6d902c57bbacf44467f2a5cc30e4e189260093c66a3269fb1b1cc37094 SHA512 65e2d5bb7649cad3d395ec8fead11b18fd0ca5e59e87194a39a77561bcdaa04cecdc71f0da32ac268a36c0e7b21f56e9f40a08610f84cf7f81d0da20daf90fc0 WHIRLPOOL ed5ba5a5c397d47616282272573f9940d02035698a45dc7bc377c1fb2918d4a72fc789a4332ff7c09113d6bdcb223e2321f46f21f9576ff85197825bdc661d0d
--- a/dev-ml/yojson/yojson-1.3.0.ebuild
+++ b/dev-ml/yojson/yojson-1.3.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit findlib
+
+DESCRIPTION="JSON parsing and pretty-printing library for OCaml"
+HOMEPAGE="http://mjambon.com/yojson.html"
+SRC_URI="https://github.com/mjambon/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0/${PV}"
+LICENSE="BSD"
+KEYWORDS="~amd64"
+IUSE="examples"
+
+RDEPEND=">=dev-lang/ocaml-3.11:=[ocamlopt]
+	dev-ml/easy-format:=[ocamlopt]
+	dev-ml/biniou:=[ocamlopt]
+"
+DEPEND="${RDEPEND}
+	dev-ml/cppo
+"
+
+src_compile() {
+	emake -j1
+}
+
+src_install() {
+	dodir /usr/bin
+	findlib_src_install BINDIR="${ED}"/usr/bin
+	dodoc README.md Changes
+	if use examples ; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
--- a/dev-python/python-systemd/Manifest
+++ b/dev-python/python-systemd/Manifest
@@ -1 +1,2 @@
 DIST python-systemd-230.tar.gz 39329 SHA256 656a83ff695f5de7d63411a86ea38601ad5a918595eebd0817d7b8e68642c64d SHA512 3c26c59b9005a45c3aeea8a6838ece9b5aa27dd7394ebe75319c1536b52462a847f18a79fdc8cf3bf6df9a70af63c84d5ff66a9587519dd9a006cc3df4966ce8 WHIRLPOOL 0de7ff6919bdf1c6c9cdafd71944801396157281fae1583bb060da4cf800369f97bb0c9f484f81635ed8b2e170db2bbbecf59adac0470a910167333f93c607e6
+DIST python-systemd-231.tar.gz 44430 SHA256 2c9cf53d041374898beead0c6f3b042c7d5b52425e6eb4d4b3c583d7eac12eea SHA512 b1567bd8e99025cc3b5aaeaab6539af8a5307068c403c0f1628bebc518ded80d0843b804244d1f252c858229f7f9578ce9aa988ded25f55999b0d355ce8a3455 WHIRLPOOL 4a1e05687080e8613ae607f837f39672727e60fc7bca1bca445f46413ce16280ab3bfaa30e969414d0da41f06420b7ef59043d2624dc50342cbe2d6df6add449
--- a/dev-python/python-systemd/files/231-test_daemon-SO_PASSCRED.patch
+++ b/dev-python/python-systemd/files/231-test_daemon-SO_PASSCRED.patch
@@ -0,0 +1,28 @@
+From a129428dcd92095dc5f3c7ac4b4f096181129063 Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Sat, 19 Dec 2015 09:42:49 -0500
+Subject: [PATCH] test_daemon: Define a default value for SO_PASSCRED
+
+The socket module seems to be missing this in python2.7.
+---
+ systemd/test/test_daemon.py | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/systemd/test/test_daemon.py b/systemd/test/test_daemon.py
+index e055048..8c776d5 100644
+--- a/systemd/test/test_daemon.py
+++ b/systemd/test/test_daemon.py
+@@ -228,7 +228,9 @@ def test_notify_with_socket(tmpdir):
+     path = tmpdir.join('socket').strpath
+     sock = socket.socket(socket.AF_UNIX, socket.SOCK_DGRAM)
+     sock.bind(path)
+-    sock.setsockopt(socket.SOL_SOCKET, socket.SO_PASSCRED, 1)
+    # SO_PASSCRED is not defined in python2.7
+    SO_PASSCRED = getattr(socket, 'SO_PASSCRED', 16)
+    sock.setsockopt(socket.SOL_SOCKET, SO_PASSCRED, 1)
+     os.environ['NOTIFY_SOCKET'] = path
+ 
+     assert notify('READY=1') == True
+-- 
+2.6.4
+
--- a/dev-python/python-systemd/python-systemd-231.ebuild
+++ b/dev-python/python-systemd/python-systemd-231.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python module for native access to the systemd facilities"
+HOMEPAGE="https://github.com/systemd/python-systemd"
+SRC_URI="https://github.com/systemd/python-systemd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+
+COMMON_DEPEND="
+	sys-apps/systemd:0=
+"
+DEPEND="${COMMON_DEPEND}
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+"
+RDEPEND="${COMMON_DEPEND}
+	!sys-apps/systemd[python(-)]
+"
+
+PATCHES=(
+	"${FILESDIR}"/231-test_daemon-SO_PASSCRED.patch
+)
+
+python_test() {
+	py.test "${BUILD_DIR}/lib" || die
+}
--- a/dev-util/regexxer/regexxer-0.10.ebuild
+++ b/dev-util/regexxer/regexxer-0.10.ebuild
@@ -4,7 +4,8 @@

 EAPI=5
 GCONF_DEBUG=no
-inherit autotools eutils gnome2
+
+inherit autotools eutils flag-o-matic gnome2

 DESCRIPTION="An interactive tool for performing search and replace operations"
 HOMEPAGE="http://regexxer.sourceforge.net/"
@@ -22,9 +23,9 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	sys-devel/gettext"

-DOCS=( AUTHORS ChangeLog NEWS README )
-
 src_prepare() {
+	append-cxxflags -std=c++11
+
 	epatch "${FILESDIR}"/${P}-glib-2.32.patch
 	epatch "${FILESDIR}"/${P}-sandbox.patch
 	eautoreconf
--- a/eclass/distutils-r1.eclass
+++ b/eclass/distutils-r1.eclass
@@ -419,7 +419,7 @@ _distutils-r1_create_setup_cfg() {
 _distutils-r1_copy_egg_info() {
 	mkdir -p "${BUILD_DIR}" || die
 	# stupid freebsd can't do 'cp -t ${BUILD_DIR} {} +'
-	find -name '*.egg-info' -type d -exec cp -pr {} "${BUILD_DIR}"/ ';' || die
+	find -name '*.egg-info' -type d -exec cp -R -p {} "${BUILD_DIR}"/ ';' || die
 }

 # @FUNCTION: distutils-r1_python_compile
--- a/eclass/elisp.eclass
+++ b/eclass/elisp.eclass
@@ -67,7 +67,7 @@

 inherit elisp-common eutils

-case "${EAPI:-0}" in
+case ${EAPI:-0} in
 	0|1) EXPORT_FUNCTIONS src_{unpack,compile,install} \
 		pkg_{setup,postinst,postrm} ;;
 	*) EXPORT_FUNCTIONS src_{unpack,prepare,configure,compile,install} \
@@ -105,7 +105,7 @@ elisp_src_unpack() {
 		[[ -d ${S} ]] || S=${WORKDIR}
 	fi

-	case "${EAPI:-0}" in
+	case ${EAPI:-0} in
 		0|1) [[ -d ${S} ]] && cd "${S}"
 			elisp_src_prepare ;;
 	esac
--- a/eclass/multibuild.eclass
+++ b/eclass/multibuild.eclass
@@ -195,7 +195,7 @@ multibuild_copy_sources() {

 	_multibuild_create_source_copy() {
 		einfo "${MULTIBUILD_VARIANT}: copying to ${BUILD_DIR}"
-		cp -pr "${cp_args[@]}" \
+		cp -p -R "${cp_args[@]}" \
 			"${_MULTIBUILD_INITIAL_BUILD_DIR}" "${BUILD_DIR}" || die
 	}

--- a/eclass/readme.gentoo-r1.eclass
+++ b/eclass/readme.gentoo-r1.eclass
@@ -24,10 +24,10 @@ _README_GENTOO_ECLASS=1
 inherit eutils

 case "${EAPI:-0}" in
-	0|1|2|3|4|5)
+	0|1|2|3)
 		die "Unsupported EAPI=${EAPI:-0} (too old) for ${ECLASS}"
 		;;
-	6)
+	4|5|6)
 		;;
 	*)
 		die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}"
--- a/games-board/hexxagon/hexxagon-1.0.2.ebuild
+++ b/games-board/hexxagon/hexxagon-1.0.2.ebuild
@@ -3,7 +3,7 @@
 # $Id$

 EAPI=5
-inherit eutils games
+inherit eutils flag-o-matic games

 DESCRIPTION="Clone of the original DOS game"
 HOMEPAGE="http://www.nesqi.se/"
@@ -20,6 +20,10 @@ RDEPEND="dev-cpp/glibmm:2
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"

+src_prepare() {
+	append-cxxflags -std=c++11
+}
+
 src_install() {
 	emake DESTDIR="${D}" install
 	newicon images/board_N_2.xpm ${PN}.xpm
--- a/gnome-base/nautilus/Manifest
+++ b/gnome-base/nautilus/Manifest
@@ -1,2 +1,3 @@
 DIST nautilus-3.16.2.tar.xz 3325172 SHA256 3e7ecdda3a47b6ad03098270940aa506782866fa3602d91e711d99f96741478f SHA512 06b4c338fe2295122b35053d754d8bb797cfeedf736db3a52dd290d7742d79fbbf50c23a3d59e62ef937f3ebf6b67f26f12a652b75d42a8b44462a3e1eef1be1 WHIRLPOOL bd6d3aee888474e247f19cf95fecead27a86296afcab04de7052b8403df95d9b776b0c93bad04b748ba638d4edfc3fc11e8fbce50142a0aad517a0ed35038f9c
 DIST nautilus-3.18.2.tar.xz 3316652 SHA256 68dcf668e2ca93126a899d2e236ef37af2aea93e3fc25eee23ccd7ba911d424a SHA512 ac40683027f3318bbea23feee7a654502106932b049faa4bcbc1340a7fbafaa7e8857237b1ec5a0bcbee25e8d75eb1e9c8136cd5b748f9009e72589e73908e86 WHIRLPOOL 317258a102cf89497cfe87965614f77bff189ad3539c61f777b0d19bd0f8febe316a1389f47256f65de50b23b8c79382ac5b45cfb94919c8bf2a7e1fbe26a304
+DIST nautilus-3.18.3.tar.xz 3343876 SHA256 44802222779123ad9f818ac9020f1417afd18e81d2f5c385a46cc5cf3b36a99d SHA512 05318b42fe2921c4c65a16b97b8c774f0897a3045d216227d697b754d8e1ec97e87db7d7f78d4078793da9bed302834a7c1786d85e5c2815e4208e7cfd2f818f WHIRLPOOL 30c532c868412897690929e707aa241a3641c1058e2558053141ba5b373928ce55b101b3dad6d40f34e1633a4edba7ac06c473f19d0aa18ff04e0b82cee65634
--- a/gnome-base/nautilus/nautilus-3.18.3.ebuild
+++ b/gnome-base/nautilus/nautilus-3.18.3.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes" # Needed with USE 'sendto'
+
+inherit autotools eutils gnome2 readme.gentoo virtualx
+
+DESCRIPTION="A file manager for the GNOME desktop"
+HOMEPAGE="https://wiki.gnome.org/Apps/Nautilus"
+
+LICENSE="GPL-2+ LGPL-2+ FDL-1.1"
+SLOT="0"
+
+# TODO: control profiling ?
+IUSE="exif gnome +introspection packagekit +previewer selinux sendto tracker xmp"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux"
+
+# FIXME: tests fails under Xvfb, but pass when building manually
+# "FAIL: check failed in nautilus-file.c, line 8307"
+# need org.gnome.SessionManager service (aka gnome-session) but cannot find it
+RESTRICT="test"
+
+# Require {glib,gdbus-codegen}-2.30.0 due to GDBus API changes between 2.29.92
+# and 2.30.0
+COMMON_DEPEND="
+	>=dev-libs/glib-2.45.7:2[dbus]
+	>=x11-libs/pango-1.28.3
+	>=x11-libs/gtk+-3.18.5:3[introspection?]
+	>=dev-libs/libxml2-2.7.8:2
+	>=gnome-base/gnome-desktop-3:3=
+
+	gnome-base/dconf
+	>=gnome-base/gsettings-desktop-schemas-3.8.0
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXrender
+
+	exif? ( >=media-libs/libexif-0.6.20 )
+	introspection? ( >=dev-libs/gobject-introspection-0.6.4:= )
+	selinux? ( >=sys-libs/libselinux-2 )
+	tracker? ( >=app-misc/tracker-0.16:= )
+	xmp? ( >=media-libs/exempi-2.1.0 )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-lang/perl-5
+	>=dev-util/gdbus-codegen-2.33
+	>=dev-util/gtk-doc-am-1.10
+	>=dev-util/intltool-0.40.1
+	sys-devel/gettext
+	virtual/pkgconfig
+	x11-proto/xproto
+"
+RDEPEND="${COMMON_DEPEND}
+	packagekit? ( app-admin/packagekit-base )
+	sendto? ( !<gnome-extra/nautilus-sendto-3.0.1 )
+"
+
+# For eautoreconf
+#	gnome-base/gnome-common
+#	dev-util/gtk-doc-am"
+
+PDEPEND="
+	gnome? (
+		>=x11-themes/gnome-icon-theme-1.1.91
+		x11-themes/gnome-icon-theme-symbolic )
+	tracker? ( >=gnome-extra/nautilus-tracker-tags-0.12 )
+	previewer? ( >=gnome-extra/sushi-0.1.9 )
+	sendto? ( >=gnome-extra/nautilus-sendto-3.0.1 )
+	>=gnome-base/gvfs-1.14[gtk]
+"
+# Need gvfs[gtk] for recent:/// support
+
+src_prepare() {
+	if use previewer; then
+		DOC_CONTENTS="nautilus uses gnome-extra/sushi to preview media files.
+			To activate the previewer, select a file and press space; to
+			close the previewer, press space again."
+	fi
+
+	# Control selinux support
+	# https://bugzilla.gnome.org/show_bug.cgi?id=758632
+	epatch "${FILESDIR}"/${PN}-3.18.2-automagic-selinux.patch
+
+	eautoreconf
+
+	# Remove -D*DEPRECATED flags. Don't leave this for eclass! (bug #448822)
+	sed -e 's/DISABLE_DEPRECATED_CFLAGS=.*/DISABLE_DEPRECATED_CFLAGS=/' \
+		-i configure || die "sed failed"
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	DOCS="AUTHORS HACKING MAINTAINERS NEWS README* THANKS"
+	gnome2_src_configure \
+		--disable-profiling \
+		--disable-update-mimedb \
+		$(use_enable exif libexif) \
+		$(use_enable introspection) \
+		$(use_enable packagekit) \
+		$(use_enable sendto nst-extension) \
+		$(use_enable selinux) \
+		$(use_enable tracker) \
+		$(use_enable xmp)
+}
+
+src_test() {
+	gnome2_environment_reset
+	Xemake check
+}
+
+src_install() {
+	use previewer && readme.gentoo_create_doc
+	gnome2_src_install
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	if use previewer; then
+		readme.gentoo_print_elog
+	else
+		elog "To preview media files, emerge nautilus with USE=previewer"
+	fi
+}
--- a/gnome-extra/gnome-color-chooser/gnome-color-chooser-0.2.5.ebuild
+++ b/gnome-extra/gnome-color-chooser/gnome-color-chooser-0.2.5.ebuild
@@ -3,6 +3,7 @@
 # $Id$

 EAPI=5
+GCONF_DEBUG="no"

 inherit gnome2 flag-o-matic

@@ -13,10 +14,10 @@ SRC_URI="mirror://sourceforge/gnomecc/${P}.tar.bz2"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-
 IUSE="debug"

-RDEPEND="dev-cpp/atkmm
+RDEPEND="
+	dev-cpp/atkmm
 	>=dev-cpp/libglademm-2.6.0:2.4
 	dev-cpp/glibmm:2
 	>=dev-cpp/gtkmm-2.8.0:2.4
@@ -26,18 +27,20 @@ RDEPEND="dev-cpp/atkmm
 	>=gnome-base/libgnome-2.16.0
 	>=gnome-base/libgnomeui-2.14.0
 	x11-libs/gtk+:2
-	x11-libs/pango"
-
+	x11-libs/pango
+"
 DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+	virtual/pkgconfig
+"

 src_configure() {
 	# Don't pass --enable/disable-assert since it has broken
 	# AC_ARG_ENABLE call. Pass -DNDEBUG to cppflags instead.
 	use debug || append-cppflags -DNDEBUG

-	econf \
-		--disable-dependency-tracking \
+	append-cxxflags -std=c++11
+
+	gnome2_src_configure \
 		--disable-link-as-needed
 }

--- a/media-sound/paprefs/paprefs-0.9.10.ebuild
+++ b/media-sound/paprefs/paprefs-0.9.10.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

-EAPI=4
+EAPI=5
+inherit flag-o-matic

 DESCRIPTION="PulseAudio Preferences, configuration dialog for PulseAudio"
 HOMEPAGE="http://freedesktop.org/software/pulseaudio/paprefs"
@@ -25,6 +26,7 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig"

 src_configure() {
+	append-cxxflags -std=c++11 #568590
 	econf \
 		--disable-dependency-tracking \
 		--disable-lynx \
@@ -32,7 +34,6 @@ src_configure() {
 }

 src_install() {
-	emake DESTDIR="${D}" install || die
+	default
 	dohtml -r doc
-	dodoc README
 }
--- a/media-sound/pavucontrol/pavucontrol-3.0.ebuild
+++ b/media-sound/pavucontrol/pavucontrol-3.0.ebuild
@@ -3,6 +3,7 @@
 # $Id$

 EAPI=5
+inherit flag-o-matic

 DESCRIPTION="Pulseaudio Volume Control, GTK based mixer for Pulseaudio"
 HOMEPAGE="http://freedesktop.org/software/pulseaudio/pavucontrol/"
@@ -29,6 +30,7 @@ DEPEND="${RDEPEND}
 "

 src_configure() {
+	append-cxxflags -std=c++11 #567216
 	econf \
 		--docdir=/usr/share/doc/${PF} \
 		--htmldir=/usr/share/doc/${PF}/html \
--- a/media-sound/pavumeter/pavumeter-0.9.3-r1.ebuild
+++ b/media-sound/pavumeter/pavumeter-0.9.3-r1.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

-EAPI=2
+EAPI=5
+inherit flag-o-matic

 DESCRIPTION="PulseAudio Volume Meter, simple GTK volume meter for PulseAudio"
 HOMEPAGE="http://0pointer.de/lennart/projects/pavumeter/"
@@ -21,13 +22,12 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig"

 src_configure() {
+	append-cxxflags -std=c++11 #568592
 	econf \
-		--disable-dependency-tracking \
 		--disable-lynx
 }

 src_install() {
-	emake DESTDIR="${D}" install || die
+	default
 	dohtml -r doc
-	dodoc README
 }
--- a/media-video/cclive/cclive-0.9.3-r1.ebuild
+++ b/media-video/cclive/cclive-0.9.3-r1.ebuild
@@ -4,7 +4,7 @@

 EAPI=5

-inherit eutils
+inherit eutils flag-o-matic

 DESCRIPTION="Command line tool for extracting videos from various websites"
 HOMEPAGE="http://cclive.sourceforge.net/"
@@ -30,5 +30,6 @@ src_prepare() {
 }

 src_configure() {
+	append-cxxflags -std=c++11 #567174
 	econf --disable-ccl
 }
--- a/net-irc/kvirc/Manifest
+++ b/net-irc/kvirc/Manifest
@@ -1 +1,2 @@
+DIST kvirc-4.4_pre20151218202654.tar.gz 7185704 SHA256 592a4cecf7f810501de5fa6daa7b3909a3bd600c59a6aa2e5a35d5dac4ad5d48 SHA512 bcd2403d869f92260bb6d07eb1313a9ecd85b211366d1655ff83d8a70f555f062e2e56d0743520f41e3e5131c8283ff31fed05765654f47ba5adbfce71339f7b WHIRLPOOL 78e915ea445f5a7a386397322e33dd2e019a9f55db48405e8bc6cca8daf6bc4e9b1e35138604deb77b62c0bdf740fc514f01ed8c473b442d69a94e6dade4670e
 DIST kvirc-4.4_pre6250.tar.xz 4606432 SHA256 58919286d63d8579778c9374b8aab7bde3ba2238bee32dcb5376b0aa45951a92 SHA512 2ba35cfd68a42fe075845241bf445f9dd3ca01b701b17f3162c34f8ef6f03a84f098b4647c821294cb54e2bbca9436debd6f53da98f7b83475196c115b936a94 WHIRLPOOL 3d18094433e258f4fa824eb2a0ac55edf54a879981398b44301a2e7444f61071c4b53131f5f8ad6795e92cf71d6ddda7e1aea7c5c2a3e9e46d2188f1267696f7
--- a/net-irc/kvirc/kvirc-4.4_pre20151218202654.ebuild
+++ b/net-irc/kvirc/kvirc-4.4_pre20151218202654.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+PYTHON_DEPEND="python? 2"
+
+inherit cmake-utils flag-o-matic multilib python
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/kvirc/KVIrc"
+	KVIRC_GIT_REVISION=""
+	KVIRC_GIT_SOURCES_DATE=""
+else
+	inherit vcs-snapshot
+
+	KVIRC_GIT_REVISION="d1e304ba1fdd27645af53573f9ed96b44199dfd3"
+	KVIRC_GIT_SOURCES_DATE="${PV#*_pre}"
+	KVIRC_GIT_SOURCES_DATE="$(printf "%04u-%02u-%02u" ${KVIRC_GIT_SOURCES_DATE:0:4} ${KVIRC_GIT_SOURCES_DATE:4:2} ${KVIRC_GIT_SOURCES_DATE:6:2})"
+fi
+
+DESCRIPTION="Advanced IRC Client"
+HOMEPAGE="http://www.kvirc.net/ https://github.com/kvirc/KVIrc"
+if [[ "${PV}" == "9999" ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/kvirc/KVIrc/archive/${KVIRC_GIT_REVISION}.tar.gz -> ${P}.tar.gz"
+fi
+
+LICENSE="kvirc"
+SLOT="4"
+KEYWORDS="~amd64 ~x86"
+IUSE="audiofile +dbus dcc_video +dcc_voice debug doc gsm +ipc ipv6 kde +nls oss +perl +phonon profile +python spell +ssl theora +transparency webkit"
+
+RDEPEND="dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtmultimedia:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtsql:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	dev-qt/qtxml:5
+	sys-libs/zlib:0=
+	x11-libs/libX11
+	audiofile? ( media-libs/audiofile )
+	dbus? ( dev-qt/qtdbus:5 )
+	dcc_video? ( dev-qt/qtmultimedia:5[widgets] )
+	kde? (
+		kde-frameworks/kcoreaddons:5
+		kde-frameworks/ki18n:5
+		kde-frameworks/knotifications:5
+		kde-frameworks/kservice:5
+		kde-frameworks/kwindowsystem:5
+		kde-frameworks/kxmlgui:5
+	)
+	perl? ( dev-lang/perl )
+	phonon? ( media-libs/phonon:0[qt5] )
+	spell? ( app-text/enchant )
+	ssl? ( dev-libs/openssl:0= )
+	theora? (
+		media-libs/libogg
+		media-libs/libtheora
+		media-libs/libvorbis
+	)
+	webkit? ( dev-qt/qtwebkit:5 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	x11-proto/scrnsaverproto
+	doc? ( app-doc/doxygen )
+	kde? ( kde-frameworks/extra-cmake-modules:5 )
+	nls? ( sys-devel/gettext )"
+RDEPEND="${RDEPEND}
+	gsm? ( media-sound/gsm )"
+REQUIRED_USE="audiofile? ( oss )"
+
+DOCS=(ChangeLog doc/FAQ)
+
+pkg_setup() {
+	if use python; then
+		python_set_active_version 2
+		python_pkg_setup
+	fi
+}
+
+src_prepare() {
+	if [[ "${PV}" == "9999" ]]; then
+		KVIRC_GIT_REVISION="$(git show -s --format=%H)"
+		KVIRC_GIT_SOURCES_DATE="$(git show -s --format=%cd --date=short)"
+	fi
+	einfo "Setting of revision number to ${KVIRC_GIT_REVISION} ${KVIRC_GIT_SOURCES_DATE}"
+	sed -e "/#define KVI_DEFAULT_FRAME_CAPTION/s/KVI_VERSION/& \" (${KVIRC_GIT_REVISION} ${KVIRC_GIT_SOURCES_DATE})\"/" -i src/kvirc/ui/KviMainWindow.cpp || die "Setting of revision number failed"
+}
+
+src_configure() {
+	append-flags -fno-strict-aliasing
+
+	local libdir="$(get_libdir)"
+	local mycmakeargs=(
+		-DLIB_SUFFIX=${libdir#lib}
+		-DMANUAL_REVISION=${KVIRC_GIT_REVISION}
+		-DMANUAL_SOURCES_DATE=${KVIRC_GIT_SOURCES_DATE//-/}
+		-DWANT_COEXISTENCE=1
+		-DWANT_CRYPT=1
+		-DWANT_ENV_FLAGS=1
+		-DWANT_VERBOSE=1
+		$(cmake-utils_use_want audiofile AUDIOFILE)
+		$(cmake-utils_use_want dbus QTDBUS)
+		$(cmake-utils_use_want dcc_video DCC_VIDEO)
+		$(cmake-utils_use_want dcc_voice DCC_VOICE)
+		$(cmake-utils_use_want debug DEBUG)
+		$(cmake-utils_use_want doc DOXYGEN)
+		$(cmake-utils_use_want gsm GSM)
+		$(cmake-utils_use_want ipc IPC)
+		$(cmake-utils_use_want ipv6 IPV6)
+		$(cmake-utils_use_want kde KDE)
+		$(cmake-utils_use_want nls GETTEXT)
+		$(cmake-utils_use_want oss OSS)
+		$(cmake-utils_use_want perl PERL)
+		$(cmake-utils_use_want phonon PHONON)
+		$(cmake-utils_use_want profile MEMORY_PROFILE)
+		$(cmake-utils_use_want python PYTHON)
+		$(cmake-utils_use_want spell SPELLCHECKER)
+		$(cmake-utils_use_want ssl OPENSSL)
+		$(cmake-utils_use_want theora OGG_THEORA)
+		$(cmake-utils_use_want transparency TRANSPARENCY)
+		$(cmake-utils_use_want webkit QTWEBKIT)
+
+		# COMPILE_SVG_SUPPORT not used in source code.
+		-DWANT_QTSVG=OFF
+	)
+
+	cmake-utils_src_configure
+}
--- a/net-irc/kvirc/kvirc-4.4_pre6250.ebuild
+++ b/net-irc/kvirc/kvirc-4.4_pre6250.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@@ -14,13 +14,14 @@ SRC_URI="http://people.apache.org/~Arfrever/gentoo/${P}.tar.xz"
 LICENSE="kvirc"
 SLOT="4"
 KEYWORDS="~alpha amd64 ~ppc ~ppc64 x86"
-IUSE="audiofile dcc_video +dcc_voice debug doc gsm +ipc ipv6 kde +nls oss +perl +phonon profile +python +qt-dbus +ssl theora +transparency webkit"
+IUSE="audiofile +dbus dcc_video +dcc_voice debug doc gsm +ipc ipv6 kde +nls oss +perl +phonon profile +python +ssl theora +transparency webkit"

 RDEPEND=">=dev-qt/qtcore-4.6:4
 	>=dev-qt/qtgui-4.6:4
 	>=dev-qt/qtsql-4.6:4
 	sys-libs/zlib
 	x11-libs/libX11
+	dbus? ( >=dev-qt/qtdbus-4.6:4 )
 	dcc_video? (
 		media-libs/libv4l
 		theora? ( media-libs/libogg media-libs/libtheora )
@@ -29,7 +30,6 @@ RDEPEND=">=dev-qt/qtcore-4.6:4
 	oss? ( audiofile? ( media-libs/audiofile ) )
 	perl? ( dev-lang/perl )
 	phonon? ( || ( media-libs/phonon[qt4] >=dev-qt/qtphonon-4.6:4 ) )
-	qt-dbus? ( >=dev-qt/qtdbus-4.6:4 )
 	ssl? ( dev-libs/openssl )
 	webkit? ( >=dev-qt/qtwebkit-4.6:4 )"
 DEPEND="${RDEPEND}
@@ -72,6 +72,7 @@ src_configure() {
 		-DWANT_ENV_FLAGS=1
 		-DWANT_VERBOSE=1
 		$(cmake-utils_use_want audiofile AUDIOFILE)
+		$(cmake-utils_use_want dbus QTDBUS)
 		$(cmake-utils_use_want dcc_video DCC_VIDEO)
 		$(cmake-utils_use_want dcc_voice DCC_VOICE)
 		$(cmake-utils_use_want debug DEBUG)
@@ -86,7 +87,6 @@ src_configure() {
 		$(cmake-utils_use_want phonon PHONON)
 		$(cmake-utils_use_want profile MEMORY_PROFILE)
 		$(cmake-utils_use_want python PYTHON)
-		$(cmake-utils_use_want qt-dbus QTDBUS)
 		$(cmake-utils_use_want ssl OPENSSL)
 		$(cmake-utils_use_want theora OGG_THEORA)
 		$(cmake-utils_use_want transparency TRANSPARENCY)
--- a/net-irc/kvirc/kvirc-9999.ebuild
+++ b/net-irc/kvirc/kvirc-9999.ebuild
@@ -5,17 +5,34 @@
 EAPI="5"
 PYTHON_DEPEND="python? 2"

-inherit cmake-utils flag-o-matic git-r3 multilib python
+inherit cmake-utils flag-o-matic multilib python
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/kvirc/KVIrc"
+	KVIRC_GIT_REVISION=""
+	KVIRC_GIT_SOURCES_DATE=""
+else
+	inherit vcs-snapshot
+
+	KVIRC_GIT_REVISION=""
+	KVIRC_GIT_SOURCES_DATE="${PV#*_pre}"
+	KVIRC_GIT_SOURCES_DATE="$(printf "%04u-%02u-%02u" ${KVIRC_GIT_SOURCES_DATE:0:4} ${KVIRC_GIT_SOURCES_DATE:4:2} ${KVIRC_GIT_SOURCES_DATE:6:2})"
+fi

 DESCRIPTION="Advanced IRC Client"
-HOMEPAGE="http://www.kvirc.net/"
-SRC_URI=""
-EGIT_REPO_URI="https://github.com/kvirc/KVIrc"
+HOMEPAGE="http://www.kvirc.net/ https://github.com/kvirc/KVIrc"
+if [[ "${PV}" == "9999" ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/kvirc/KVIrc/archive/${KVIRC_GIT_REVISION}.tar.gz -> ${P}.tar.gz"
+fi

 LICENSE="kvirc"
 SLOT="4"
 KEYWORDS=""
-IUSE="audiofile dcc_video +dcc_voice debug doc gsm +ipc ipv6 kde +nls oss +perl +phonon profile +python +qt-dbus spell +ssl theora +transparency webkit"
+IUSE="audiofile +dbus dcc_video +dcc_voice debug doc gsm +ipc ipv6 kde +nls oss +perl +phonon profile +python spell +ssl theora +transparency webkit"

 RDEPEND="dev-qt/qtcore:5
 	dev-qt/qtgui:5
@@ -26,8 +43,10 @@ RDEPEND="dev-qt/qtcore:5
 	dev-qt/qtwidgets:5
 	dev-qt/qtx11extras:5
 	dev-qt/qtxml:5
-	sys-libs/zlib
+	sys-libs/zlib:0=
 	x11-libs/libX11
+	audiofile? ( media-libs/audiofile )
+	dbus? ( dev-qt/qtdbus:5 )
 	dcc_video? ( dev-qt/qtmultimedia:5[widgets] )
 	kde? (
 		kde-frameworks/kcoreaddons:5
@@ -37,12 +56,10 @@ RDEPEND="dev-qt/qtcore:5
 		kde-frameworks/kwindowsystem:5
 		kde-frameworks/kxmlgui:5
 	)
-	oss? ( audiofile? ( media-libs/audiofile ) )
 	perl? ( dev-lang/perl )
 	phonon? ( media-libs/phonon:0[qt5] )
-	qt-dbus? ( dev-qt/qtdbus:5 )
 	spell? ( app-text/enchant )
-	ssl? ( dev-libs/openssl )
+	ssl? ( dev-libs/openssl:0= )
 	theora? (
 		media-libs/libogg
 		media-libs/libtheora
@@ -52,9 +69,9 @@ RDEPEND="dev-qt/qtcore:5
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	x11-proto/scrnsaverproto
+	doc? ( app-doc/doxygen )
 	kde? ( kde-frameworks/extra-cmake-modules:5 )
-	nls? ( sys-devel/gettext )
-	doc? ( app-doc/doxygen )"
+	nls? ( sys-devel/gettext )"
 RDEPEND="${RDEPEND}
 	gsm? ( media-sound/gsm )"
 REQUIRED_USE="audiofile? ( oss )"
@@ -69,8 +86,10 @@ pkg_setup() {
 }

 src_prepare() {
-	KVIRC_GIT_REVISION="$(git show -s --format=%H)"
-	KVIRC_GIT_SOURCES_DATE="$(git show -s --format=%cd --date=short)"
+	if [[ "${PV}" == "9999" ]]; then
+		KVIRC_GIT_REVISION="$(git show -s --format=%H)"
+		KVIRC_GIT_SOURCES_DATE="$(git show -s --format=%cd --date=short)"
+	fi
 	einfo "Setting of revision number to ${KVIRC_GIT_REVISION} ${KVIRC_GIT_SOURCES_DATE}"
 	sed -e "/#define KVI_DEFAULT_FRAME_CAPTION/s/KVI_VERSION/& \" (${KVIRC_GIT_REVISION} ${KVIRC_GIT_SOURCES_DATE})\"/" -i src/kvirc/ui/KviMainWindow.cpp || die "Setting of revision number failed"
 }
@@ -88,6 +107,7 @@ src_configure() {
 		-DWANT_ENV_FLAGS=1
 		-DWANT_VERBOSE=1
 		$(cmake-utils_use_want audiofile AUDIOFILE)
+		$(cmake-utils_use_want dbus QTDBUS)
 		$(cmake-utils_use_want dcc_video DCC_VIDEO)
 		$(cmake-utils_use_want dcc_voice DCC_VOICE)
 		$(cmake-utils_use_want debug DEBUG)
@@ -102,7 +122,6 @@ src_configure() {
 		$(cmake-utils_use_want phonon PHONON)
 		$(cmake-utils_use_want profile MEMORY_PROFILE)
 		$(cmake-utils_use_want python PYTHON)
-		$(cmake-utils_use_want qt-dbus QTDBUS)
 		$(cmake-utils_use_want spell SPELLCHECKER)
 		$(cmake-utils_use_want ssl OPENSSL)
 		$(cmake-utils_use_want theora OGG_THEORA)
--- a/net-irc/kvirc/metadata.xml
+++ b/net-irc/kvirc/metadata.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>arfrever.fta@gmail.com</email>
+		<name>Arfrever Frehtes Taifersar Arahesis</name>
 	</maintainer>
+	<herd>proxy-maintainers</herd>
 	<use>
 		<flag name="dcc_video">Support video connections over DCC protocol</flag>
 		<flag name="dcc_voice">Support voice connections over DCC protocol</flag>
 		<flag name="ipc">Support inter-process communication between KVIrc processes</flag>
 		<flag name="phonon">Support Phonon for audio output</flag>
-		<flag name="qt-dbus">Support Qt-DBus</flag>
 		<flag name="transparency">Support pseudo-transparency</flag>
 	</use>
 </pkgmetadata>
--- a/net-libs/gnutls/files/gnutls-3.3.19-build-allow-installing-man-1-even-with-disable-doc.patch
+++ b/net-libs/gnutls/files/gnutls-3.3.19-build-allow-installing-man-1-even-with-disable-doc.patch
@@ -0,0 +1,94 @@
+From 0f230c6375fd3680837d98f20ee3862e9041af3d Mon Sep 17 00:00:00 2001
+From: Alon Bar-Lev <alon.barlev@gmail.com>
+Date: Fri, 18 Dec 2015 12:14:08 +0200
+Subject: [PATCH] build: allow installing man(1) even with --disable-doc
+
+Currently these man pages are installed only if --enable-doc
+is provided, while these are not actually docs, do not require any
+special dependency, nor consume large space.
+
+This adds --enable-manpages to enable/disable manpages installation, and
+install the man(1) regardless of --disable-doc.
+
+Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
+Signed-off-by: Nikos Mavrogiannopoulos <nmav@redhat.com>
+
+---
+ Makefile.am              |  3 +++
+ configure.ac             | 10 ++++++++++
+ doc/Makefile.am          |  2 +-
+ doc/manpages/Makefile.am |  2 ++
+ 5 files changed, 17 insertions(+), 1 deletion(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index d446711..6e19f26 100644
+--- a/Makefile.am
+++ b/Makefile.am
+@@ -28,6 +28,9 @@ SUBDIRS += libdane
+ endif
+ 
+ SUBDIRS += po src
+if ENABLE_MANPAGES
+SUBDIRS += doc/manpages
+endif
+ if ENABLE_DOC
+ SUBDIRS += doc
+ endif
+diff --git a/configure.ac b/configure.ac
+index c7a83b8..d161c05 100644
+--- a/configure.ac
+++ b/configure.ac
+@@ -152,6 +152,15 @@ AC_ARG_ENABLE(doc,
+     enable_doc=$enableval, enable_doc=yes)
+ AM_CONDITIONAL(ENABLE_DOC, test "$enable_doc" != "no")
+ 
+AC_ARG_ENABLE(manpages,
+  AS_HELP_STRING([--enable-manpages], [install manpages even if disable-doc is given]),
+    enable_manpages=$enableval,enable_manpages=auto)
+
+if test "${enable_manpages}" = "auto";then
+  enable_manpages="${enable_doc}"
+fi
+AM_CONDITIONAL(ENABLE_MANPAGES, test "$enable_manpages" != "no")
+
+ AC_ARG_ENABLE(tests,
+   AS_HELP_STRING([--disable-tests], [don't compile or run any tests]),
+     enable_tests=$enableval, enable_tests=yes)
+@@ -838,6 +847,7 @@ AC_MSG_NOTICE([summary of build options:
+   Local libtasn1:       ${included_libtasn1}
+   Use nettle-mini:      ${mini_nettle}
+   nettle-version:       ${nettle_version}
+  Documentation:        ${enable_doc} (manpages: ${enable_manpages})
+ ])
+ 
+ AC_MSG_NOTICE([External hardware support:
+diff --git a/doc/Makefile.am b/doc/Makefile.am
+index d9b4022..492a74a 100644
+--- a/doc/Makefile.am
+++ b/doc/Makefile.am
+@@ -24,7 +24,7 @@ EXTRA_DIST = TODO certtool.cfg gnutls.pdf gnutls.html	\
+ 	gnutls-guile.pdf gnutls-guile.html stamp_enums stamp_functions \
+ 	doc.mk
+ 
+-SUBDIRS = examples cyclo scripts manpages credentials latex
+SUBDIRS = examples cyclo scripts credentials latex
+ if ENABLE_GTK_DOC
+ SUBDIRS += reference
+ endif
+diff --git a/doc/manpages/Makefile.am b/doc/manpages/Makefile.am
+index 6d16787..2840197 100644
+--- a/doc/manpages/Makefile.am
+++ b/doc/manpages/Makefile.am
+@@ -1053,7 +1053,9 @@ APIMANS += gnutls_x509_trust_list_verify_crt.3
+ APIMANS += gnutls_x509_trust_list_verify_crt2.3
+ APIMANS += gnutls_x509_trust_list_verify_named_crt.3
+ 
+if ENABLE_DOC
+ dist_man_MANS += $(APIMANS)
+endif
+ 
+ $(APIMANS): stamp_mans
+ 
+-- 
+2.4.10
+
--- a/net-libs/gnutls/files/gnutls-3.4.7-build-allow-installing-man-1-even-with-disable-doc.patch
+++ b/net-libs/gnutls/files/gnutls-3.4.7-build-allow-installing-man-1-even-with-disable-doc.patch
@@ -0,0 +1,96 @@
+From 86f039f8c78f87edd6346265010abc679d9283a9 Mon Sep 17 00:00:00 2001
+From: Alon Bar-Lev <alon.barlev@gmail.com>
+Date: Fri, 18 Dec 2015 12:14:08 +0200
+Subject: [PATCH] build: allow installing man(1) even with --disable-doc
+
+Currently these man pages are installed only if --enable-doc
+is provided, while these are not actually docs, do not require any
+special dependency, nor consume large space.
+
+This adds --enable-manpages to enable/disable manpages installation, and
+install the man(1) regardless of --disable-doc.
+
+Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
+Signed-off-by: Nikos Mavrogiannopoulos <nmav@redhat.com>
+
+---
+ Makefile.am              |  4 ++++
+ configure.ac             | 11 +++++++++++
+ doc/Makefile.am          |  2 +-
+ doc/manpages/Makefile.am |  2 ++
+ 5 files changed, 19 insertions(+), 1 deletion(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 19fcb90..b94af06 100644
+--- a/Makefile.am
+++ b/Makefile.am
+@@ -42,6 +42,10 @@ if HAVE_GUILE
+ SUBDIRS += guile
+ endif
+ 
+if ENABLE_MANPAGES
+SUBDIRS += doc/manpages
+endif
+
+ if ENABLE_DOC
+ SUBDIRS += doc
+ endif
+diff --git a/configure.ac b/configure.ac
+index e634236..0b1625b 100644
+--- a/configure.ac
+++ b/configure.ac
+@@ -51,6 +51,16 @@ AC_ARG_ENABLE(doc,
+     enable_doc=$enableval, enable_doc=yes)
+ AM_CONDITIONAL(ENABLE_DOC, test "$enable_doc" != "no")
+ 
+AC_ARG_ENABLE(manpages,
+  AS_HELP_STRING([--enable-manpages], [install manpages even if disable-doc is given]),
+    enable_manpages=$enableval,enable_manpages=auto)
+
+if test "${enable_manpages}" = "auto";then
+  enable_manpages="${enable_doc}"
+fi
+
+AM_CONDITIONAL(ENABLE_MANPAGES, test "$enable_manpages" != "no")
+
+ AC_ARG_ENABLE(tools,
+   AS_HELP_STRING([--disable-tools], [don't compile any tools]),
+     enable_tools=$enableval, enable_tools=yes)
+@@ -920,6 +930,7 @@ AC_MSG_NOTICE([summary of build options:
+   Local libopts:        ${included_libopts}
+   Local libtasn1:       ${included_libtasn1}
+   Use nettle-mini:      ${mini_nettle}
+  Documentation:        ${enable_doc} (manpages: ${enable_manpages})
+ ])
+ 
+ AC_MSG_NOTICE([External hardware support:
+diff --git a/doc/Makefile.am b/doc/Makefile.am
+index 1e99dd0..05c2188 100644
+--- a/doc/Makefile.am
+++ b/doc/Makefile.am
+@@ -24,7 +24,7 @@ EXTRA_DIST = TODO certtool.cfg gnutls.pdf gnutls.html	\
+ 	gnutls-guile.pdf gnutls-guile.html stamp_enums stamp_functions \
+ 	doc.mk
+ 
+-SUBDIRS = examples cyclo scripts manpages credentials latex
+SUBDIRS = examples cyclo scripts credentials latex
+ if ENABLE_GTK_DOC
+ SUBDIRS += reference
+ endif
+diff --git a/doc/manpages/Makefile.am b/doc/manpages/Makefile.am
+index 8a1613d..10365a9 100644
+--- a/doc/manpages/Makefile.am
+++ b/doc/manpages/Makefile.am
+@@ -1127,7 +1127,9 @@ APIMANS += gnutls_x509_trust_list_verify_crt.3
+ APIMANS += gnutls_x509_trust_list_verify_crt2.3
+ APIMANS += gnutls_x509_trust_list_verify_named_crt.3
+ 
+if ENABLE_DOC
+ dist_man_MANS += $(APIMANS)
+endif
+ 
+ $(APIMANS): stamp_mans
+ 
+-- 
+2.4.10
+
--- a/net-libs/gnutls/gnutls-3.3.19-r1.ebuild
+++ b/net-libs/gnutls/gnutls-3.3.19-r1.ebuild
@@ -0,0 +1,177 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools libtool eutils multilib-minimal versionator
+
+DESCRIPTION="A TLS 1.2 and SSL 3.0 implementation for the GNU project"
+HOMEPAGE="http://www.gnutls.org/"
+SRC_URI="mirror://gnupg/gnutls/v$(get_version_component_range 1-2)/${P}.tar.xz"
+
+# LGPL-3 for libgnutls library and GPL-3 for libgnutls-extra library.
+# soon to be relicensed as LGPL-2.1 unless heartbeat extension enabled.
+LICENSE="GPL-3 LGPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE_LINGUAS=" en cs de fi fr it ms nl pl sv uk vi zh_CN"
+IUSE="+cxx +crywrap dane doc examples guile nls +openssl pkcs11 static-libs test zlib ${IUSE_LINGUAS// / linguas_}"
+# heartbeat support is not disabled until re-licensing happens fullyf
+
+# NOTICE: sys-devel/autogen is required at runtime as we
+# use system libopts
+RDEPEND=">=dev-libs/libtasn1-4.3[${MULTILIB_USEDEP}]
+	>=dev-libs/nettle-2.7:=[gmp,${MULTILIB_USEDEP}]
+	>=dev-libs/gmp-5.1.3-r1[${MULTILIB_USEDEP}]
+	sys-devel/autogen
+	crywrap? ( net-dns/libidn )
+	dane? ( >=net-dns/unbound-1.4.20[${MULTILIB_USEDEP}] )
+	guile? ( >=dev-scheme/guile-1.8:*[networking] )
+	nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )
+	pkcs11? ( >=app-crypt/p11-kit-0.20.7[${MULTILIB_USEDEP}] )
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-baselibs-20140508
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+	)"
+DEPEND="${RDEPEND}
+	>=sys-devel/automake-1.11.6
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+	doc? (
+		sys-apps/texinfo
+		dev-util/gtk-doc
+	)
+	nls? ( sys-devel/gettext )
+	test? ( app-misc/datefudge )"
+
+DOCS=( AUTHORS ChangeLog NEWS README THANKS doc/TODO )
+
+pkg_setup() {
+	# bug#520818
+	export TZ=UTC
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-build-allow-installing-man-1-even-with-disable-doc.patch"
+
+	sed -i \
+		-e 's/imagesdir = $(infodir)/imagesdir = $(htmldir)/' \
+		doc/Makefile.am || die
+
+	# force regeneration of autogen-ed files
+	local file
+	for file in $(grep -l AutoGen-ed src/*.c) ; do
+		rm src/$(basename ${file} .c).{c,h} || die
+	done
+
+	# force regeneration of makeinfo files
+	# have no idea why on some system these files are not
+	# accepted as-is, see bug#520818
+	for file in $(grep -l "produced by makeinfo" doc/*.info) ; do
+		rm "${file}" || die
+	done
+
+	# support user patches
+	epatch_user
+
+	eautoreconf
+
+	# Use sane .so versioning on FreeBSD.
+	elibtoolize
+
+	# bug 497472
+	use cxx || epunt_cxx
+}
+
+multilib_src_configure() {
+	LINGUAS="${LINGUAS//en/en@boldquot en@quot}"
+
+	# TPM needs to be tested before being enabled
+	# hardware-accell is disabled on OSX because the asm files force
+	#   GNU-stack (as doesn't support that) and when that's removed ld
+	#   complains about duplicate symbols
+	ECONF_SOURCE=${S} \
+	econf \
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
+		--disable-valgrind-tests \
+		--without-included-libtasn1 \
+		--enable-heartbeat-support \
+		$(use_enable cxx) \
+		$(use_enable dane libdane) \
+		$(multilib_native_enable manpages) \
+		$(multilib_native_use_enable doc) \
+		$(multilib_native_use_enable doc gtk-doc) \
+		$(multilib_native_use_enable guile) \
+		$(multilib_native_use_enable crywrap) \
+		$(use_enable nls) \
+		$(use_enable openssl openssl-compatibility) \
+		$(use_enable static-libs static) \
+		$(use_with pkcs11 p11-kit) \
+		$(use_with zlib) \
+		--without-tpm \
+		--with-unbound-root-key-file=/etc/dnssec/root-anchors.txt \
+		$([[ ${CHOST} == *-darwin* ]] && echo --disable-hardware-acceleration)
+
+	if multilib_is_native_abi; then
+		ln -s "${S}"/doc/reference/html doc/reference/html || die
+	fi
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi; then
+		default
+
+		# symlink certtool for use in other ABIs
+		if use test; then
+			ln -s "${BUILD_DIR}"/src "${T}"/native-tools || die
+		fi
+	else
+		emake -C gl
+		emake -C lib
+		emake -C extra
+		use dane && emake -C libdane
+	fi
+}
+
+multilib_src_test() {
+	if multilib_is_native_abi; then
+		# parallel testing often fails
+		emake -j1 check
+	else
+		# use native ABI tools
+		ln -s "${T}"/native-tools/{certtool,gnutls-{serv,cli}} \
+			"${BUILD_DIR}"/src/ || die
+
+		emake -C gl -j1 check
+		emake -C tests -j1 check
+	fi
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		emake DESTDIR="${D}" install
+	else
+		emake -C lib DESTDIR="${D}" install
+		emake -C extra DESTDIR="${D}" install
+		use dane && emake -C libdane DESTDIR="${D}" install
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	prune_libtool_files --all
+
+	dodoc doc/certtool.cfg
+
+	if use doc; then
+		dohtml doc/gnutls.html
+	else
+		rm -fr "${ED}/usr/share/doc/${PF}/html"
+	fi
+
+	if use examples; then
+		docinto examples
+		dodoc doc/examples/*.c
+	fi
+}
--- a/net-libs/gnutls/gnutls-3.4.7-r1.ebuild
+++ b/net-libs/gnutls/gnutls-3.4.7-r1.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools libtool eutils multilib-minimal versionator
+
+DESCRIPTION="A TLS 1.2 and SSL 3.0 implementation for the GNU project"
+HOMEPAGE="http://www.gnutls.org/"
+SRC_URI="mirror://gnupg/gnutls/v$(get_version_component_range 1-2)/${P}.tar.xz"
+
+# LGPL-3 for libgnutls library and GPL-3 for libgnutls-extra library.
+# soon to be relicensed as LGPL-2.1 unless heartbeat extension enabled.
+LICENSE="GPL-3 LGPL-3"
+SLOT="0/30" # libgnutls.so number
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE_LINGUAS=" en cs de fi fr it ms nl pl sv uk vi zh_CN"
+IUSE="+cxx +crywrap dane doc examples guile nls +openssl pkcs11 static-libs test +tools zlib ${IUSE_LINGUAS// / linguas_}"
+# heartbeat support is not disabled until re-licensing happens fullyf
+
+# NOTICE: sys-devel/autogen is required at runtime as we
+# use system libopts
+RDEPEND=">=dev-libs/libtasn1-4.3[${MULTILIB_USEDEP}]
+	>=dev-libs/nettle-3.1:=[gmp,${MULTILIB_USEDEP}]
+	>=dev-libs/gmp-5.1.3-r1[${MULTILIB_USEDEP}]
+	tools? ( sys-devel/autogen )
+	crywrap? ( net-dns/libidn )
+	dane? ( >=net-dns/unbound-1.4.20[${MULTILIB_USEDEP}] )
+	guile? ( >=dev-scheme/guile-1.8:*[networking] )
+	nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )
+	pkcs11? ( >=app-crypt/p11-kit-0.23.1[${MULTILIB_USEDEP}] )
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-baselibs-20140508
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+	)"
+DEPEND="${RDEPEND}
+	>=sys-devel/automake-1.11.6
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+	doc? (
+		sys-apps/texinfo
+		dev-util/gtk-doc
+	)
+	nls? ( sys-devel/gettext )
+	test? ( app-misc/datefudge )"
+
+DOCS=( AUTHORS ChangeLog NEWS README THANKS doc/TODO )
+
+pkg_setup() {
+	# bug#520818
+	export TZ=UTC
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-build-allow-installing-man-1-even-with-disable-doc.patch"
+
+	sed -i \
+		-e 's/imagesdir = $(infodir)/imagesdir = $(htmldir)/' \
+		doc/Makefile.am || die
+
+	# force regeneration of autogen-ed files
+	local file
+	for file in $(grep -l AutoGen-ed src/*.c) ; do
+		rm src/$(basename ${file} .c).{c,h} || die
+	done
+
+	# force regeneration of makeinfo files
+	# have no idea why on some system these files are not
+	# accepted as-is, see bug#520818
+	for file in $(grep -l "produced by makeinfo" doc/*.info) ; do
+		rm "${file}" || die
+	done
+
+	# support user patches
+	epatch_user
+
+	eautoreconf
+
+	# Use sane .so versioning on FreeBSD.
+	elibtoolize
+
+	# bug 497472
+	use cxx || epunt_cxx
+}
+
+multilib_src_configure() {
+	LINGUAS="${LINGUAS//en/en@boldquot en@quot}"
+
+	# TPM needs to be tested before being enabled
+	# hardware-accell is disabled on OSX because the asm files force
+	#   GNU-stack (as doesn't support that) and when that's removed ld
+	#   complains about duplicate symbols
+	ECONF_SOURCE=${S} \
+	econf \
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
+		--disable-valgrind-tests \
+		--without-included-libtasn1 \
+		--enable-heartbeat-support \
+		$(use_enable cxx) \
+		$(use_enable dane libdane) \
+		$(multilib_native_enable manpages) \
+		$(multilib_native_use_enable tools) \
+		$(multilib_native_use_enable doc) \
+		$(multilib_native_use_enable doc gtk-doc) \
+		$(multilib_native_use_enable guile) \
+		$(multilib_native_use_enable crywrap) \
+		$(multilib_native_use_enable test tests) \
+		$(use_enable nls) \
+		$(use_enable openssl openssl-compatibility) \
+		$(use_enable static-libs static) \
+		$(use_with pkcs11 p11-kit) \
+		$(use_with zlib) \
+		--without-tpm \
+		--with-unbound-root-key-file=/etc/dnssec/root-anchors.txt \
+		$([[ ${CHOST} == *-darwin* ]] && echo --disable-hardware-acceleration)
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	prune_libtool_files --all
+
+	dodoc doc/certtool.cfg
+
+	if use doc; then
+		dohtml doc/gnutls.html
+	else
+		rm -fr "${ED}/usr/share/doc/${PF}/html"
+	fi
+
+	if use examples; then
+		docinto examples
+		dodoc doc/examples/*.c
+	fi
+}
--- a/net-libs/net6/net6-1.3.14-r1.ebuild
+++ b/net-libs/net6/net6-1.3.14-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit flag-o-matic multilib
+
+DESCRIPTION="Network access framework for IPv4/IPv6 written in C++"
+HOMEPAGE="http://gobby.0x539.de/"
+SRC_URI="http://releases.0x539.de/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~x86"
+IUSE="nls static-libs"
+
+RDEPEND="dev-libs/libsigc++:2
+	>=net-libs/gnutls-1.2.10"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+DOCS=( AUTHORS ChangeLog NEWS README )
+
+src_configure() {
+	append-cxxflags -std=c++11
+	econf $(use_enable nls) \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	use static-libs || rm -f "${D}"/usr/$(get_libdir)/lib${PN}.la
+}
+
+pkg_postinst() {
+	elog "Please note that because of the use of C++ templates"
+	elog "Gobby 0.4 has to be recompiled against the new ${PN}"
+	elog "to pick up the changes."
+}
--- a/net-misc/guacamole-server/Manifest
+++ b/net-misc/guacamole-server/Manifest
@@ -1,6 +1,6 @@
-DIST guacamole-server-0.8.3.tar.gz 515611 SHA256 e958291ca967ce05d9e5e55d884b25725330fff6c067cbde4bbb7b039fb8db09 SHA512 c61428e83104fce004d99c83b31a195ef5dd01d601f5e5e15ab03530401fb9e23a8a6927b39a8854b14da7ab90407d9f56190ffc7649ff52501c59055d9a145a WHIRLPOOL 78ce02e7ad87120ca31be56a98fbeca71ab5b0725b7a456b70a5f8cef8d1d98b4b7fbcdc4bba4dd1f43da897118e3532ea5d1f4458864ef7ac6081942074542f
 DIST guacamole-server-0.9.0.tar.gz 556465 SHA256 289cb1ea0261396e9ede6aa0d2ac8d80b9ec03a124cb0669802f7e8556e21a58 SHA512 73942eecdeb8204a32e0d6ef0b92c2b23dea0b4a0e82693c05a81539319a7ff9db9ac897822f9ca33fb1913cec25058a16c67ec10d91778a3f1cf9615add5f0a WHIRLPOOL abb9c1d3fa144ae817fd87f42a1f4bfc69e9c6c3f41bac5f76b06b46dc8087d279a061b81097c3dad3c6ed5b528d8b400d8f8b3d3a4338189d401f6dc1845799
 DIST guacamole-server-0.9.2.tar.gz 595062 SHA256 b6e26751023082b6f0380323f05b8b50e71bcf4c1421c3118237b5a8df22660d SHA512 ed01bcbfc0612a1b05434cc5c412fbed6f877713049418aa25a577e9e020bd6abddeab4d31a50b5b4a6785b8c79f0625dd90181a643913bd813cbbba3a24bf6c WHIRLPOOL 6eac4e63cfabcedc2d31ed9c2063c6a0f0293dc0a9769e70bbf785d8236e5139caec5d255f9d2094220aca37eb2f96677223de6351a6c818141daf74e6b36185
 DIST guacamole-server-0.9.3.tar.gz 614640 SHA256 545e22401bbe62734c02577331c52e54dddf14dd950844d2ccc5aad318c16076 SHA512 eb296f17b27bc14633b511ce6cbe0025e18ea24e3b9b3e132b103de2071a9f18b64d7ced8f20bea1ab8f65755a047e98d670d522f4a5b4ec73e5696ecfb7d948 WHIRLPOOL db2f8f4d0839de9fa82bd0aeb047ed33468f817c0ee094388c7fb587ce044b586a097de94ac2e0e997bb757f31e6f4927e3b1d059f0caab6b7177ca37b5717a8
 DIST guacamole-server-0.9.7.tar.gz 639630 SHA256 285f367d89ee51981db84b00698b05b3d9ba5de2fb2922115c9e38d2b9b88d09 SHA512 c9ef2df6d0724c19e61b3f8913e94ff7c39f17e3beca0bd2eab1648e3c96d4b248bef9bc09b47fd8a4da6b994aea9df94e442286ce0fa3881d5e44b4923b1b14 WHIRLPOOL c7f2213b92e6ca40b93a251a72698229c7e34fbfaf00006b372910d7f2456c0cf6ccf75f8d89f136c41b61cd41ea492c52a14e970ff5bc2231fe826584c8d723
 DIST guacamole-server-0.9.8.tar.gz 691627 SHA256 6fcbff7b540ae296e049ff9b25b7b84bae247b54d2d8dfb5672fea4967406bdc SHA512 3bdbc9502070fa11fc276c7122a33a8428d130ad122157740618a5addf77bebf8d79e2c1a765f36a30feed2ac18f1911c84c9dc4a04e0235dd4d4069c8990a73 WHIRLPOOL 2e9be3f0a6492f1d6dab34f00f7decd5b7e133ad879ca6c4822496731a7fe3aac6cb22af43f634f3e526790187acea91f0ae3f3c6a4ab7901c2cbbec71b70ca3
+DIST guacamole-server-0.9.9.tar.gz 679635 SHA256 b37ac2013f278558094488c15ec4d6ee8f01e60cd2bcb0d976a207eb9d9c4e7d SHA512 bdc004c45e63bb2c692c1dfd280840ea682e461b2c578da511247cd36d727ffa22c3fdde22b3635ef6ac7e35a1b5e63f5971bdbb4d227f88d1b81ff035bd5f83 WHIRLPOOL 42a15cab6d723a9d0fe3376afad96e3283447bb7664c102b3795869fd72dd518281db447bceab18502ceaa38c9a322903a3b85dcff37c38f3bd568ea07f47ecb
--- a/net-misc/guacamole-server/guacamole-server-0.8.3.ebuild
+++ b/net-misc/guacamole-server/guacamole-server-0.8.3.ebuild
@@ -1,41 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit eutils
-DESCRIPTION="This is the proxy-daemon used by www-apps/guacamole"
-
-HOMEPAGE="http://guacamole.sourceforge.net/"
-SRC_URI="mirror://sourceforge/guacamole/${P}.tar.gz"
-
-LICENSE="AGPL-3"
-
-SLOT="0"
-
-KEYWORDS="~x86"
-
-IUSE="rdesktop vnc ssh pulseaudio vorbis"
-
-DEPEND="x11-libs/cairo
-	ssh? ( x11-libs/pango
-		net-libs/libssh )
-	rdesktop? ( >=net-misc/freerdp-1.1.0_beta1_p20130710 )
-	vnc? ( net-libs/libvncserver
-	pulseaudio? ( media-sound/pulseaudio ) )
-	vorbis? ( media-libs/libvorbis )"
-
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	econf --with-init-dir=/etc/init.d
-}
-
-src_compile() {
-	emake || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-}
--- a/net-misc/guacamole-server/guacamole-server-0.9.9.ebuild
+++ b/net-misc/guacamole-server/guacamole-server-0.9.9.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils systemd user
+DESCRIPTION="This is the proxy-daemon used by www-apps/guacamole"
+
+HOMEPAGE="http://guac-dev.org/"
+SRC_URI="mirror://sourceforge/guacamole/${P}.tar.gz"
+
+LICENSE="MIT"
+
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86"
+
+IUSE="rdesktop vnc ssh pulseaudio vorbis telnet ssl"
+
+DEPEND="x11-libs/cairo
+	media-libs/libpng:*
+	dev-libs/ossp-uuid
+	rdesktop? ( <net-misc/freerdp-1.1.0_beta1_p20150312 )
+	ssh? ( x11-libs/pango
+		net-libs/libssh2 )
+	telnet?	( net-libs/libtelnet
+		x11-libs/pango )
+	vnc? ( net-libs/libvncserver
+		pulseaudio? ( media-sound/pulseaudio ) )
+	ssl? ( dev-libs/openssl:* )
+	vorbis? ( media-libs/libvorbis )"
+
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local myconf="--without-terminal --without-pango"
+	if use ssh || use telnet; then
+		myconf="--with-terminal --with-pango"
+	fi
+
+	econf $myconf \
+		$(use_with ssh) \
+		$(use_with rdesktop rdp) \
+		$(use_with vnc) \
+		$(use_with pulseaudio pulse) \
+		$(use_with vorbis) \
+		$(use_with telnet) \
+		$(use_with ssl)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	doinitd "${FILESDIR}/guacd"
+	systemd_dounit "${FILESDIR}/guacd.service"
+}
+
+pkg_postinst() {
+	enewgroup guacd
+	enewuser guacd -1 -1 -1 guacd
+}
--- a/net-misc/oidentd/files/oidentd-2.0.8-gcc5.patch
+++ b/net-misc/oidentd/files/oidentd-2.0.8-gcc5.patch
@@ -0,0 +1,25 @@
+Description: Fix a failure to build with gcc5.
+Bug: http://bugs.debian.org/778035
+
+--- a/src/oidentd_util.c	2015-07-03 05:56:24.000000000 -0400
+++ b/src/oidentd_util.c	2015-07-03 05:56:47.671378000 -0400
+@@ -75,7 +75,7 @@
+ ** PRNG functions on systems whose libraries provide them.)
+ */
+ 
+-inline int randval(int i) {
+extern __attribute__ ((gnu_inline)) int randval(int i) {
+ 	/* Per _Numerical Recipes in C_: */
+ 	return ((double) i * rand() / (RAND_MAX+1.0));
+ }
+--- a/src/oidentd_util.h	2015-07-03 05:56:32.000000000 -0400
+++ b/src/oidentd_util.h	2015-07-03 05:56:53.835378000 -0400
+@@ -58,7 +58,7 @@
+ int find_group(const char *temp_group, gid_t *gid);
+ 
+ int random_seed(void);
+-inline int randval(int i);
+extern __attribute__ ((gnu_inline)) int randval(int i);
+ 
+ #ifndef HAVE_SNPRINTF
+ 	int snprintf(char *str, size_t n, char const *fmt, ...);
--- a/net-misc/oidentd/oidentd-2.0.8-r5.ebuild
+++ b/net-misc/oidentd/oidentd-2.0.8-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@@ -17,7 +17,8 @@ IUSE="debug ipv6 masquerade"

 src_prepare() {
 	epatch "${FILESDIR}/${P}-masquerading.patch" \
-		"${FILESDIR}/${P}-bind-to-ipv6-too.patch"
+		"${FILESDIR}/${P}-bind-to-ipv6-too.patch" \
+		"${FILESDIR}/${P}-gcc5.patch"
 }

 src_configure() {
--- a/net-wireless/gnuradio/Manifest
+++ b/net-wireless/gnuradio/Manifest
@@ -1,4 +1,5 @@
 DIST gnuradio-3.6.5.1.tar.gz 3150283 SHA256 0875d2f0a7da0f3bcc1771b528b0f98f79d9ab69aa1ef953651bbbe1f57b4621 SHA512 23a22aed482da11005b17e5197ee3ba24d442b30309522b0858e694b58f46b76cc050143d365623c7dd4241cdf8b9f988e1a4dabe2e1f98d0fd4cca71bbb82e8 WHIRLPOOL 7cf55be5fac7891a737d228d83718bbc43f9069c6275c5ac465ae11088559dca5e7fa31239e281271b529aa8b9ae1a0efe3850a16a40e53c0f1fe57e351ff2a8
 DIST gnuradio-3.7.6.1.tar.gz 3588833 SHA256 39dede70eec36f430c4895900bbd7ed266aa9e846d0a362987e806b7197c4c0b SHA512 88ec30b2bd93ca032c29f4606856a8e70b0123474fd84115657804429f381dea78f97a7523c9684acad6a27b357ddf876632e957de5c6e0170045dc38d121939 WHIRLPOOL 97d70e403fe46b0afbd1e6f0812f8d9de4ea506dcb2190a23d9a0f0499662f9e2bbaa86d1b624f7c621ae1675094f92cd295bc273db0759b2647e2dfb2a49b43
 DIST gnuradio-3.7.7.1.tar.gz 3845988 SHA256 2b27b13fc734ab5882e42c1661d433c0c097fd8b55b682f00626fa96c356584e SHA512 7be9568d19cbe03f3c229dbda5fc8d448a4a57d84bd9f8b91a400c65b526414539536c0a391b15d5f0e63bf22ef5675dc3ed8a6ed94ce3b1e4328948fa202ba1 WHIRLPOOL c54e26af37ecb27dd515d1ca320ccf363f6a9bbff61724f7d98f751d69a32ba21f2a631ce07caf273596f4297ff92359d2469768cd927ae9d680c8a8bbd25dbd
+DIST gnuradio-3.7.8.1.tar.gz 3962961 SHA256 8406f49d085fdc2ef5d8ea90f3e19ad8782d2a2f5154bbe4f076591ddf7ae5aa SHA512 21468335d698963ce5090b03b980ecc3714c301f3cd5d071d8a1b083c3c985479c42ee6d842b1b600ac85640ce875fb2bbfd6f51d30144cb612ac55e648c0c9a WHIRLPOOL 94d1b357539299b74b9f08659426ade1fa6ac3ae6950ec4ffe6797eadaca06785c4707ea1db3500c5b57395e6f7e8c0f14718d00c556aaf6537835ebb6969b7a
 DIST gnuradio-3.7.8.tar.gz 3990172 SHA256 fe19cb54b5d77fb76dde61d5cf184c6dee7066779b45c51676bae6e6d0cd4172 SHA512 2a69101acf8b1ed8cc4791de2961b4d8a4baf50a84e5514ba8f29e300829228daa50863dda8434c1703829412ec6fb2f25560d851b4a39cc687cba0646e1a7d9 WHIRLPOOL 6682b48cde8643509629b4d45f95971260657546349b1bbcb7a4c8323feebd0d042f190824026c26d9d1aa8a91a3e10380c49dc2d4ea1128dcb73edaa903d556
--- a/net-wireless/gnuradio/gnuradio-3.7.8.1.ebuild
+++ b/net-wireless/gnuradio/gnuradio-3.7.8.1.ebuild
@@ -0,0 +1,231 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+CMAKE_BUILD_TYPE="None"
+inherit cmake-utils fdo-mime gnome2-utils python-single-r1 eutils
+
+DESCRIPTION="Toolkit that provides signal processing blocks to implement software radios"
+HOMEPAGE="http://gnuradio.org/"
+LICENSE="GPL-3"
+SLOT="0/${PV}"
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="http://gnuradio.org/git/gnuradio.git"
+	inherit git-r3
+	KEYWORDS=""
+else
+	SRC_URI="http://gnuradio.org/releases/gnuradio/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+IUSE="+audio +alsa atsc +analog +digital channels doc dtv examples fcd fec +filter grc jack log noaa oss pager performance-counters portaudio +qt4 sdl test trellis uhd vocoder +utils wavelet wxwidgets zeromq"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+		audio? ( || ( alsa oss jack portaudio ) )
+		alsa? ( audio )
+		oss? ( audio )
+		jack? ( audio )
+		portaudio? ( audio )
+		analog? ( filter )
+		digital? ( filter analog )
+		dtv? ( fec )
+		pager? ( filter analog )
+		qt4? ( filter )
+		uhd? ( filter analog )
+		fcd? ( || ( alsa oss ) )
+		wavelet? ( analog )
+		wxwidgets? ( filter analog )"
+
+# bug #348206
+# comedi? ( >=sci-electronics/comedilib-0.8 )
+# boost-1.52.0 is blacklisted, bug #461578, upstream #513, boost #7669
+RDEPEND="${PYTHON_DEPS}
+	>=dev-lang/orc-0.4.12
+	dev-libs/boost:0=[${PYTHON_USEDEP}]
+	!<=dev-libs/boost-1.52.0-r6:0/1.52
+	dev-python/numpy[${PYTHON_USEDEP}]
+	sci-libs/fftw:3.0=
+	alsa? (
+		media-libs/alsa-lib[${PYTHON_USEDEP}]
+	)
+	fcd? ( virtual/libusb:1 )
+	filter? ( sci-libs/scipy )
+	grc? (
+		dev-python/cheetah[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+		>=dev-python/pygtk-2.10:2[${PYTHON_USEDEP}]
+	)
+	jack? (
+		media-sound/jack-audio-connection-kit
+	)
+	log? ( dev-libs/log4cpp )
+	portaudio? (
+		>=media-libs/portaudio-19_pre
+	)
+	qt4? (
+		>=dev-python/PyQt4-4.4[X,opengl,${PYTHON_USEDEP}]
+		>=dev-python/pyqwt-5.2:5[${PYTHON_USEDEP}]
+		>=dev-qt/qtcore-4.4:4
+		>=dev-qt/qtgui-4.4:4
+		x11-libs/qwt:6
+	)
+	sdl? ( >=media-libs/libsdl-1.2.0 )
+	uhd? ( >=net-wireless/uhd-3.4.3-r1:=[${PYTHON_USEDEP}] )
+	utils? ( dev-python/matplotlib[${PYTHON_USEDEP}] )
+	vocoder? ( media-sound/gsm )
+	wavelet? (
+		>=sci-libs/gsl-1.10
+	)
+	wxwidgets? (
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/wxpython:2.8[${PYTHON_USEDEP}]
+	)
+	zeromq? ( >=net-libs/zeromq-2.1.11 )
+	"
+
+DEPEND="${RDEPEND}
+	>=dev-lang/swig-3.0.5
+	dev-python/cheetah[${PYTHON_USEDEP}]
+	virtual/pkgconfig
+	doc? (
+		>=app-doc/doxygen-1.5.7.1
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	)
+	grc? ( x11-misc/xdg-utils )
+	oss? ( virtual/os-headers )
+	test? ( >=dev-util/cppunit-1.9.14 )
+	zeromq? ( net-libs/cppzmq )
+"
+
+src_prepare() {
+	gnome2_environment_reset #534582
+
+	# Useless UI element would require qt3support, bug #365019
+	sed -i '/qPixmapFromMimeSource/d' "${S}"/gr-qtgui/lib/spectrumdisplayform.ui || die
+	epatch_user
+}
+
+src_configure() {
+	# SYSCONFDIR/GR_PREFSDIR default to install below CMAKE_INSTALL_PREFIX
+	#audio provider is still automagic
+	#zeromq missing deps isn't fatal
+	mycmakeargs=(
+		-DENABLE_DEFAULT=OFF
+		-DENABLE_GNURADIO_RUNTIME=ON
+		-DENABLE_VOLK=ON
+		-DENABLE_PYTHON=ON
+		-DENABLE_GR_BLOCKS=ON
+		-DENABLE_GR_FFT=ON
+		-DENABLE_GR_AUDIO=ON
+		$(cmake-utils_use_enable alsa GR_AUDIO_ALSA) \
+		$(cmake-utils_use_enable analog GR_ANALOG) \
+		$(cmake-utils_use_enable atsc GR_ATSC) \
+		$(cmake-utils_use_enable channels GR_CHANNELS) \
+		$(cmake-utils_use_enable digital GR_DIGITAL) \
+		$(cmake-utils_use_enable doc DOXYGEN) \
+		$(cmake-utils_use_enable doc SPHINX) \
+		$(cmake-utils_use_enable dtv GR_DTV) \
+		$(cmake-utils_use_enable fcd GR_FCD) \
+		$(cmake-utils_use_enable fec GR_FEC) \
+		$(cmake-utils_use_enable filter GR_FILTER) \
+		$(cmake-utils_use_enable grc GRC) \
+		$(cmake-utils_use_enable jack GR_AUDIO_JACK) \
+		$(cmake-utils_use_enable log GR_LOG) \
+		$(cmake-utils_use_enable noaa GR_NOAA) \
+		$(cmake-utils_use_enable oss GR_AUDIO_OSS) \
+		$(cmake-utils_use_enable pager GR_PAGER) \
+		$(cmake-utils_use_enable performance-counters ENABLE_PERFORMANCE_COUNTERS) \
+		$(cmake-utils_use_enable portaudio GR_AUDIO_PORTAUDIO) \
+		$(cmake-utils_use_enable test TESTING) \
+		$(cmake-utils_use_enable trellis GR_TRELLIS) \
+		$(cmake-utils_use_enable uhd GR_UHD) \
+		$(cmake-utils_use_enable utils GR_UTILS) \
+		$(cmake-utils_use_enable vocoder GR_VOCODER) \
+		$(cmake-utils_use_enable wavelet GR_WAVELET) \
+		$(cmake-utils_use_enable wxwidgets GR_WXGUI) \
+		$(cmake-utils_use_enable qt4 GR_QTGUI) \
+		$(cmake-utils_use_enable sdl GR_VIDEO_SDL) \
+		$(cmake-utils_use_enable zeromq GR_ZEROMQ) \
+		-DENABLE_GR_CORE=ON \
+		-DSYSCONFDIR="${EPREFIX}"/etc \
+		-DPYTHON_EXECUTABLE="${PYTHON}"
+		-DGR_PKG_DOC_DIR='${GR_DOC_DIR}/${CMAKE_PROJECT_NAME}'-"${PVF}"
+	)
+	use vocoder && mycmakeargs+=( -DGR_USE_SYSTEM_LIBGSM=TRUE )
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if use examples ; then
+		dodir /usr/share/doc/${PF}/
+		mv "${ED}"/usr/share/${PN}/examples "${ED}"/usr/share/doc/${PF}/ || die
+	else
+	# It seems that the examples are always installed
+		rm -rf "${ED}"/usr/share/${PN}/examples || die
+	fi
+
+	# We install the mimetypes to the correct locations from the ebuild
+	rm -rf "${ED}"/usr/share/${PN}/grc/freedesktop || die
+	rm -f "${ED}"/usr/libexec/${PN}/grc_setup_freedesktop || die
+
+	# Install icons, menu items and mime-types for GRC
+	if use grc ; then
+		local fd_path="${S}/grc/freedesktop"
+		insinto /usr/share/mime/packages
+		doins "${fd_path}/${PN}-grc.xml"
+
+		domenu "${fd_path}/"*.desktop
+		doicon "${fd_path}/"*.png
+	fi
+
+	python_fix_shebang "${ED}"
+}
+
+src_test()
+{
+	ctest -E qtgui
+}
+
+pkg_postinst()
+{
+	local GRC_ICON_SIZES="32 48 64 128 256"
+
+	if use grc ; then
+		fdo-mime_desktop_database_update
+		fdo-mime_mime_database_update
+		for size in ${GRC_ICON_SIZES} ; do
+			xdg-icon-resource install --noupdate --context mimetypes --size ${size} \
+				"${EROOT}/usr/share/pixmaps/grc-icon-${size}.png" application-gnuradio-grc \
+				|| die "icon resource installation failed"
+			xdg-icon-resource install --noupdate --context apps --size ${size} \
+				"${EROOT}/usr/share/pixmaps/grc-icon-${size}.png" gnuradio-grc \
+				|| die "icon resource installation failed"
+		done
+		xdg-icon-resource forceupdate
+	fi
+}
+
+pkg_postrm()
+{
+	local GRC_ICON_SIZES="32 48 64 128 256"
+
+	if use grc ; then
+		fdo-mime_desktop_database_update
+		fdo-mime_mime_database_update
+		for size in ${GRC_ICON_SIZES} ; do
+			xdg-icon-resource uninstall --noupdate --context mimetypes --size ${size} \
+				application-gnuradio-grc || ewarn "icon uninstall failed"
+			xdg-icon-resource uninstall --noupdate --context apps --size ${size} \
+				gnuradio-grc || ewarn "icon uninstall failed"
+
+		done
+		xdg-icon-resource forceupdate
+	fi
+}
--- a/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20150730.ebuild
+++ b/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20150730.ebuild
@@ -66,5 +66,7 @@ src_configure() {

 src_install() {
 	cmake-utils_src_install
-	python_fix_shebang "${ED}"/usr/bin
+	if use python; then
+		python_fix_shebang "${ED}"/usr/bin
+	fi
 }
--- a/net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild
+++ b/net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@@ -66,5 +66,7 @@ src_configure() {

 src_install() {
 	cmake-utils_src_install
-	python_fix_shebang "${ED}"/usr/bin
+	if use python; then
+		python_fix_shebang "${ED}"/usr/bin
+	fi
 }
--- a/sci-electronics/pulseview/pulseview-9999.ebuild
+++ b/sci-electronics/pulseview/pulseview-9999.ebuild
@@ -26,7 +26,7 @@ REQUIRED_USE="decode? ( ${PYTHON_REQUIRED_USE} )"
 RDEPEND="
 	dev-libs/boost:0=
 	dev-libs/glib:2
-	>=sci-libs/libsigrok-0.4.0
+	>=sci-libs/libsigrok-0.4.0[cxx]
 	dev-qt/qtgui:4
 	decode? (
 		>=sci-libs/libsigrokdecode-0.4.0
--- a/sci-geosciences/osm2pgsql/osm2pgsql-99999999.ebuild
+++ b/sci-geosciences/osm2pgsql/osm2pgsql-99999999.ebuild
@@ -4,10 +4,9 @@

 EAPI=5

-inherit autotools git-2
+inherit cmake-utils git-2

 EGIT_REPO_URI="git://github.com/openstreetmap/osm2pgsql.git"
-EGIT_BOOTSTRAP="eautoreconf"

 DESCRIPTION="Converts OSM planet.osm data to a PostgreSQL/PostGIS database"
 HOMEPAGE="http://wiki.openstreetmap.org/wiki/Osm2pgsql"
@@ -16,17 +15,16 @@ SRC_URI=""
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="+lua +pbf"
+IUSE="+lua"

 DEPEND="
 	app-arch/bzip2
 	dev-db/postgresql:=
+	dev-libs/expat
 	dev-libs/boost
-	dev-libs/libxml2:2
 	sci-libs/geos
 	sci-libs/proj
 	sys-libs/zlib
 	lua? ( dev-lang/lua:= )
-	pbf? ( dev-libs/protobuf-c )
 "
 RDEPEND="${DEPEND}"
--- a/sci-libs/libsigrok/libsigrok-9999.ebuild
+++ b/sci-libs/libsigrok/libsigrok-9999.ebuild
@@ -4,7 +4,9 @@

 EAPI="5"

-inherit eutils
+PYTHON_COMPAT=( python{2_7,3_{3,4,5}} )
+
+inherit eutils python-single-r1 java-pkg-opt-2

 if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="git://sigrok.org/${PN}"
@@ -19,29 +21,51 @@ HOMEPAGE="http://sigrok.org/wiki/Libsigrok"

 LICENSE="GPL-3"
 SLOT="0"
-IUSE="ftdi serial static-libs test usb"
+IUSE="cxx ftdi java parport python serial static-libs test usb"
+REQUIRED_USE="java? ( cxx ) python? ( cxx ${PYTHON_REQUIRED_USE} )"

 # We also support librevisa, but that isn't in the tree ...
 LIB_DEPEND=">=dev-libs/glib-2.32.0[static-libs(+)]
 	>=dev-libs/libzip-0.8[static-libs(+)]
+	cxx? ( dev-cpp/glibmm:2[static-libs(+)] )
+	python? ( ${PYTHON_DEPS} >=dev-python/pygobject-3.0.0[${PYTHON_USEDEP}] )
 	ftdi? ( >=dev-embedded/libftdi-0.16[static-libs(+)] )
+	parport? ( sys-libs/libieee1284[static-libs(+)] )
 	serial? ( dev-libs/libserialport[static-libs(+)] )
 	usb? ( virtual/libusb:1[static-libs(+)] )"
 RDEPEND="!static-libs? ( ${LIB_DEPEND//\[static-libs(+)]} )
-	static-libs? ( ${LIB_DEPEND} )"
+	static-libs? ( ${LIB_DEPEND} )
+	java? ( >=virtual/jre-1.4 )"
 DEPEND="${LIB_DEPEND//\[static-libs(+)]}
 	test? ( >=dev-libs/check-0.9.4 )
+	cxx? ( app-doc/doxygen )
+	java? (
+		>=dev-lang/swig-3.0.6
+		>=virtual/jdk-1.4
+	)
+	python? (
+		>=dev-lang/swig-3.0.6
+	)
 	virtual/pkgconfig"

+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+	java-pkg-opt-2_pkg_setup
+}
+
 src_prepare() {
 	[[ ${PV} == "9999" ]] && eautoreconf
 }

 src_configure() {
 	econf \
-		$(use_enable ftdi libftdi) \
-		$(use_enable serial libserialport) \
-		$(use_enable usb libusb) \
+		$(use_with ftdi libftdi) \
+		$(use_with parport libieee1284) \
+		$(use_with serial libserialport) \
+		$(use_with usb libusb) \
+		$(use_enable cxx) \
+		$(use_enable java) \
+		$(use_enable python) \
 		$(use_enable static-libs static)
 }

--- a/sci-libs/libsigrok/metadata.xml
+++ b/sci-libs/libsigrok/metadata.xml
@@ -4,6 +4,7 @@
 <herd>dev-embedded</herd>
 <use>
 <flag name='ftdi'>Enable drivers that need libftdi</flag>
+ <flag name='parport'>Enable drivers that are parallel (IEEE1284) based</flag>
 <flag name='serial'>Enable drivers that are serial (RS232) based</flag>
 </use>
 </pkgmetadata>
--- a/sci-mathematics/fricas/Manifest
+++ b/sci-mathematics/fricas/Manifest
@@ -1,2 +1 @@
-DIST fricas-1.2.6-full.tar.bz2 10196018 SHA256 725b62d9139a345a3bc0eb0d29bd0e0764de475792918165c3bcd293d3c292ae SHA512 6c98844b6815bd6bfbe50881179b746aa38af48e3992179e3746bd175ef2a0940d9855e79b66b1b5e34d9fc9fe1b8f3578483847b18d7cc2781f7f72b65fb2ac WHIRLPOOL de221add1c68da205d8689834ccb52a0ea468af253ccae70ce7c25156b0ece810dcc50a9db99549ed461a10dcaea13f503c1f0838141262dd6c6d524a217be61
 DIST fricas-1.2.7-full.tar.bz2 10289500 SHA256 f23d892c17fca850726ab6f1f03061bbced6c487d2eed23e86037672b7473e1b SHA512 1e6e34dc0e4b535bf937ebdefb5099629b2893e6db0dba8b84f259e2a3b7244692ab704dd04aa24f257089661f6747d8f367d0f58bb8cebd652469cb58c72897 WHIRLPOOL 41934d03203b6b6ca51ab0f54d3c7087de67366bba5794785360cbb61fc7cb18a6d4b489c176d75815bdb7b68b4aba31d0724bb5be94f1bfa6cb01e930af7991
--- a/sci-mathematics/fricas/fricas-1.2.7-r1.ebuild
+++ b/sci-mathematics/fricas/fricas-1.2.7-r1.ebuild
@@ -13,6 +13,8 @@ KEYWORDS="~amd64 ~x86"

 # Supported lisps, number 0 is the default
 LISPS=( sbcl cmucl     gcl ecls   clisp clozurecl )
+# Version restrictions, . means no restrictions
+REST=( "<=dev-lisp/sbcl-1.3.0" . . . . . )
 # command name: . means just ${LISP}
 COMS=(  .    lisp      .   ecl    .     ccl       )

@@ -25,9 +27,19 @@ RDEPEND="X? ( x11-libs/libXpm x11-libs/libICE )
 n=${#LISPS[*]}
 for ((n--; n > 0; n--)); do
 	LISP=${LISPS[$n]}
-	RDEPEND="${RDEPEND} ${LISP}? ( dev-lisp/${LISP}:= ) !${LISP}? ("
+	if [ "${REST[$n]}" = "." ]; then
+		DEP="dev-lisp/${LISP}"
+	else
+		DEP="${REST[$n]}"
+	fi
+	RDEPEND="${RDEPEND} ${LISP}? ( ${DEP}:= ) !${LISP}? ("
 done
-RDEPEND="${RDEPEND} dev-lisp/${LISPS[0]}:="
+if [ "${REST[0]}" = "." ]; then
+	DEP="dev-lisp/${LISPS[0]}"
+else
+	DEP="${REST[0]}"
+fi
+RDEPEND="${RDEPEND} ${DEP}:="
 n=${#LISPS[*]}
 for ((n--; n > 0; n--)); do
 	RDEPEND="${RDEPEND} )"
--- a/sci-mathematics/fricas/fricas-1.2.7.ebuild
+++ b/sci-mathematics/fricas/fricas-1.2.7.ebuild
@@ -1,90 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-EAPI=5
-inherit multilib elisp-common
-
-DESCRIPTION="FriCAS is a fork of Axiom computer algebra system"
-HOMEPAGE="http://${PN}.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}-full.tar.bz2"
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-# Supported lisps, number 0 is the default
-LISPS=( sbcl cmucl     gcl ecls   clisp clozurecl )
-# command name: . means just ${LISP}
-COMS=(  .    lisp      .   ecl    .     ccl       )
-
-IUSE="${LISPS[*]} X emacs gmp"
-RDEPEND="X? ( x11-libs/libXpm x11-libs/libICE )
-	emacs? ( virtual/emacs )
-	gmp? ( dev-libs/gmp )"
-
-# Generating lisp deps
-n=${#LISPS[*]}
-for ((n--; n > 0; n--)); do
-	LISP=${LISPS[$n]}
-	RDEPEND="${RDEPEND} ${LISP}? ( dev-lisp/${LISP}:= ) !${LISP}? ("
-done
-RDEPEND="${RDEPEND} dev-lisp/${LISPS[0]}:="
-n=${#LISPS[*]}
-for ((n--; n > 0; n--)); do
-	RDEPEND="${RDEPEND} )"
-done
-
-DEPEND="${RDEPEND}"
-
-# necessary for clisp and gcl
-RESTRICT="strip"
-
-src_configure() {
-	local LISP n
-	LISP=sbcl
-	n=${#LISPS[*]}
-	for ((n--; n > 0; n--)); do
-		if use ${LISPS[$n]}; then
-			LISP=${COMS[$n]}
-			if [ "${LISP}" = "." ]; then
-				LISP=${LISPS[$n]}
-			fi
-		fi
-	done
-	einfo "Using lisp: ${LISP}"
-
-	# aldor is not yet in portage
-	econf --disable-aldor --with-lisp=${LISP} $(use_with X x) $(use_with gmp)
-}
-
-src_compile() {
-	# bug #300132
-	emake -j1
-}
-
-src_test() {
-	emake -j1 all-input
-}
-
-src_install() {
-	emake -j1 DESTDIR="${D}" install
-	dodoc README FAQ
-
-	if use emacs; then
-		sed -e "s|(setq load-path (cons (quote \"/usr/$(get_libdir)/fricas/emacs\") load-path)) ||" \
-			-i "${D}"/usr/bin/efricas \
-			|| die "sed efricas failed"
-		elisp-install ${PN} "${D}"/usr/$(get_libdir)/${PN}/emacs/*.el
-		elisp-site-file-install "${FILESDIR}"/64${PN}-gentoo.el
-	else
-		rm "${D}"/usr/bin/efricas || die "rm efricas failed"
-	fi
-	rm -r "${D}"/usr/$(get_libdir)/${PN}/emacs || die "rm -r emacs failed"
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
--- a/sys-apps/sandbox/files/sandbox-2.10-memory-corruption.patch
+++ b/sys-apps/sandbox/files/sandbox-2.10-memory-corruption.patch
@@ -0,0 +1,42 @@
+From 529a388ebb1b4e9d6ad8a1bb61dd8211833a5976 Mon Sep 17 00:00:00 2001
+From: Denis Lisov <dennis.lissov@gmail.com>
+Date: Sat, 19 Dec 2015 19:13:58 +0300
+Subject: [PATCH] libsandbox: fix old_malloc_size check on realloc
+
+Realloc uses SB_MALLOC_TO_SIZE assuming it returns the usable size,
+while it is really the mmap size, which is greater. Thus it may fail
+to reallocate even if required.
+
+URL: https://bugs.gentoo.org/568714
+Signed-off-by: Denis Lisov <dennis.lissov@gmail.com>
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ libsandbox/memory.c | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/libsandbox/memory.c b/libsandbox/memory.c
+index 8581128..a2d69a2 100644
+--- a/libsandbox/memory.c
+++ b/libsandbox/memory.c
+@@ -40,7 +40,8 @@ static int sb_munmap(void *addr, size_t length)
+ 
+ #define SB_MALLOC_TO_MMAP(ptr) ((void*)((uintptr_t)(ptr) - MIN_ALIGN))
+ #define SB_MMAP_TO_MALLOC(ptr) ((void*)((uintptr_t)(ptr) + MIN_ALIGN))
+-#define SB_MALLOC_TO_SIZE(ptr) (*((size_t*)SB_MALLOC_TO_MMAP(ptr)))
+#define SB_MALLOC_TO_MMAP_SIZE(ptr) (*((size_t*)SB_MALLOC_TO_MMAP(ptr)))
+#define SB_MALLOC_TO_SIZE(ptr) (SB_MALLOC_TO_MMAP_SIZE(ptr) - MIN_ALIGN)
+ 
+ void *malloc(size_t size)
+ {
+@@ -57,7 +58,7 @@ void free(void *ptr)
+ {
+ 	if (ptr == NULL)
+ 		return;
+-	if (munmap(SB_MALLOC_TO_MMAP(ptr), SB_MALLOC_TO_SIZE(ptr)))
+	if (munmap(SB_MALLOC_TO_MMAP(ptr), SB_MALLOC_TO_MMAP_SIZE(ptr)))
+ 		sb_ebort("sandbox memory corruption with free(%p): %s\n",
+ 			ptr, strerror(errno));
+ }
+-- 
+2.6.2
+
--- a/sys-apps/sandbox/sandbox-2.10-r1.ebuild
+++ b/sys-apps/sandbox/sandbox-2.10-r1.ebuild
@@ -46,6 +46,7 @@ sb_foreach_abi() {
 src_unpack() {
 	unpacker
 	cd "${S}"
+	epatch "${FILESDIR}"/${P}-memory-corruption.patch #568714
 	epatch_user
 }

--- a/sys-firmware/sigrok-firmware-fx2lafw/sigrok-firmware-fx2lafw-0.1.2.ebuild
+++ b/sys-firmware/sigrok-firmware-fx2lafw/sigrok-firmware-fx2lafw-0.1.2.ebuild
@@ -24,7 +24,7 @@ IUSE="binary"

 RDEPEND=""
 DEPEND="${RDEPEND}
-	!binary? ( >=dev-embedded/sdcc-2.9.0 )"
+	!binary? ( >=dev-embedded/sdcc-2.9.0[device-lib(+),mcs51(+)] )"

 src_unpack() {
 	[[ ${PV} == "9999" ]] && git-2_src_unpack || default
--- a/sys-firmware/sigrok-firmware-fx2lafw/sigrok-firmware-fx2lafw-9999.ebuild
+++ b/sys-firmware/sigrok-firmware-fx2lafw/sigrok-firmware-fx2lafw-9999.ebuild
@@ -24,7 +24,7 @@ IUSE="binary"

 RDEPEND=""
 DEPEND="${RDEPEND}
-	!binary? ( >=dev-embedded/sdcc-2.9.0 )"
+	!binary? ( >=dev-embedded/sdcc-2.9.0[device-lib(+),mcs51(+)] )"

 src_unpack() {
 	[[ ${PV} == "9999" ]] && git-2_src_unpack || default
--- a/sys-fs/atari-fdisk/Manifest
+++ b/sys-fs/atari-fdisk/Manifest
@@ -1,2 +1 @@
-DIST atari-fdisk_0.7.1-5.1.tar.gz 67705 SHA256 91eeb9db76b3f99ce48128281a00494a0a2ca43d5ef6bd3690adcf22bb5fcb95 SHA512 80e5e4ed1a1dd3d7fbfed68e33e43864d593f084921c699beca100ddbd5e8adb2da36badd6fc467417d3e80855b484f87576c78700ccfa763c5c7644370275f9 WHIRLPOOL 3b4d66163598d7896beb011d5c86ae481664fbbdd7f243bb2943531d7164924a867e242cf89fd4d664e5feb942c4c272623f3fb0be58685ae533d100be9aa02d
 DIST atari-fdisk_0.7.1-5.4.tar.gz 47576 SHA256 81ddb3a0d0088fb32011cede6deacb98a2b97da24fc8b2efe87dc45da601b96f SHA512 014be9a92b19f81901f814308b0f380df77de712f1e3f69438cf7ae7c57c53111cfc39f60899facd04af8b5457e980fdc689bfbfe2a91e5c2a0de8446a724961 WHIRLPOOL 324ee5ce4408d1f93407d4bde83d2c86e23114d1d4d877794d6474c042b47fe7428697b3d57863841cc0253ea1fd28b458d0169783d2bdc41b27caa56c05e71b
--- a/sys-fs/atari-fdisk/atari-fdisk-0.7.1.5.1.ebuild
+++ b/sys-fs/atari-fdisk/atari-fdisk-0.7.1.5.1.ebuild
@@ -1,42 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit versionator toolchain-funcs
-
-MY_PV=$(get_version_component_range 1-3)
-DEB_PV=$(get_version_component_range 4-5)
-DESCRIPTION="create and edit the partition table of a disk partitioned in Atari format"
-HOMEPAGE="http://packages.qa.debian.org/a/atari-fdisk.html"
-SRC_URI="mirror://debian/pool/main/a/${PN}/${PN}_${MY_PV}-${DEB_PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha ~amd64 arm ~hppa ia64 m68k ~mips ~ppc s390 sh ~sparc ~x86"
-IUSE=""
-
-DEPEND=""
-
-S=${WORKDIR}/${PN}-${MY_PV}
-
-src_compile() {
-	emake \
-		CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		COMPILE_ARCH=m68k \
-		|| die
-}
-
-src_install() {
-	dodoc NEWS README TODO debian/changelog
-	doman debian/atari-fdisk.8
-
-	into /
-	if [[ $(tc-arch) == "m68k" ]] ; then
-		dosbin fdisk || die "sbin fdisk failed"
-		dosym fdisk /sbin/atari-fdisk
-		dosym atari-fdisk.8 /usr/share/man/man8/fdisk.8
-	else
-		dosbin atari-fdisk || die "sbin atari-fdisk failed"
-	fi
-}
--- a/sys-fs/atari-fdisk/atari-fdisk-0.7.1.5.4.ebuild
+++ b/sys-fs/atari-fdisk/atari-fdisk-0.7.1.5.4.ebuild
@@ -2,7 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

-inherit versionator toolchain-funcs
+EAPI="5"
+
+inherit versionator toolchain-funcs eutils

 MY_PV=$(get_version_component_range 1-3)
 DEB_PV=$(get_version_component_range 4-5)
@@ -12,19 +14,25 @@ SRC_URI="mirror://debian/pool/main/a/${PN}/${PN}_${MY_PV}-${DEB_PV}.tar.gz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 m68k ~mips ~ppc ~s390 ~sh ~sparc ~x86"
+# Note: The code assumes sizeof(long) == 4 everywhere.  If you try to
+# use this on 64bit systems (where sizeof(long) == 8), then misbehavior
+# and memory corruption will ensue.
+KEYWORDS="-* m68k x86"
 IUSE=""

-DEPEND=""
-
 S=${WORKDIR}/${PN}-${MY_PV}

+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.7.1.5.4-prompt-logic.patch
+	epatch "${FILESDIR}"/${PN}-0.7.1.5.4-gcc-5-inline.patch
+}
+
 src_compile() {
 	emake \
 		CFLAGS="${CFLAGS}" \
 		LDFLAGS="${LDFLAGS}" \
-		COMPILE_ARCH=m68k \
-		|| die
+		CC="$(tc-getCC)" \
+		COMPILE_ARCH=m68k
 }

 src_install() {
@@ -33,10 +41,10 @@ src_install() {

 	into /
 	if [[ $(tc-arch) == "m68k" ]] ; then
-		dosbin fdisk || die "sbin fdisk failed"
+		dosbin fdisk
 		dosym fdisk /sbin/atari-fdisk
 		dosym atari-fdisk.8 /usr/share/man/man8/fdisk.8
 	else
-		dosbin atari-fdisk || die "sbin atari-fdisk failed"
+		dosbin atari-fdisk
 	fi
 }
--- a/sys-fs/atari-fdisk/files/atari-fdisk-0.7.1.5.4-gcc-5-inline.patch
+++ b/sys-fs/atari-fdisk/files/atari-fdisk-0.7.1.5.4-gcc-5-inline.patch
@@ -0,0 +1,22 @@
+gcc 5 changed the default C standard which changes the behavior of extern
+inline.  convert these tiny funcs to static inline to fix builds.
+
+https://bugs.gentoo.org/568732
+
+--- a/fdisk.h
+++ b/fdisk.h
+@@ -224,12 +224,12 @@ extern jmp_buf listingbuf;
+      :									\
+      	(__var = (__typeof(__var))swab32((unsigned long)__var)))
+ 
+-extern __inline__ unsigned short swab16( unsigned short val )
+static __inline__ unsigned short swab16( unsigned short val )
+ {
+     return( (val << 8) | (val >> 8) );
+ }
+ 
+-extern __inline__ unsigned long swab32( unsigned long val )
+static __inline__ unsigned long swab32( unsigned long val )
+ {
+     unsigned short vall = val, valh = val >> 16;
+     vall = (vall << 8) | (vall >> 8);
--- a/sys-fs/atari-fdisk/files/atari-fdisk-0.7.1.5.4-prompt-logic.patch
+++ b/sys-fs/atari-fdisk/files/atari-fdisk-0.7.1.5.4-prompt-logic.patch
@@ -0,0 +1,15 @@
+there is a function called "primary_possible" which is used to set the
+"prim_possible" variable a few lines before this, but the logic will
+incorrectly test "primary_possible" instead of "prim_possible".
+
+--- a/menufuncs.c
+++ b/menufuncs.c
+@@ -599,7 +599,7 @@ void new_partition( void )
+ 	}
+ 	else if (!ext_possible)
+ 	    make_ext = 0;
+-	else if (!primary_possible)
+	else if (!prim_possible)
+ 	    make_ext = 1;
+ 	else
+ 	    /* Create an extended partition if this is the 4th part. (to avoid
--- a/www-apps/guacamole/Manifest
+++ b/www-apps/guacamole/Manifest
@@ -1,20 +1,18 @@
 DIST guacamole-auth-jdbc-0.9.7.tar.gz 2997194 SHA256 f112c0ab83e4253f3a914716c5a7e61c4d7dc64d724e7c11bb4b695f386474a5 SHA512 0bfa920fed4b5baabc6f5541d9a5badc0a88c51e95675f00889d9d6f7a2069b07f0bee4ed628b82a4c243dd0a8fb1646a5ba6f822ca5704b1f60b49f3a2fd698 WHIRLPOOL 013ad62f68050b8c431565fa375e6c3c50e2cd1b962b6409c3b79f8652f021f71139de6facf3cd4195b34067ad01fba33bc980bbe4d50d8cc3d7f984555396c9
 DIST guacamole-auth-jdbc-0.9.8.tar.gz 7018542 SHA256 7a4026e1cc3cb08bf4b7c265c91df62a616560b21ec14bbde32f5c52bd0e928a SHA512 c1c1a4f0f33a46108a45c826ad075825846838ad05205579024820f4737db6c96e35c5be3d20c78a0e088cecc08738369bdcf00c6efd43307848a71c710aa394 WHIRLPOOL d05038376e7f5cb1722c0e05a5a70892341806de27cf107c99e6545f3e7d239ff2ea6b7eb3b528099dfd764ff9b79a01e038e7c37ca008f7f502d752b323d836
-DIST guacamole-auth-ldap-0.8.0.tar.gz 382872 SHA256 745e7541ab5db9decb463a7358e17c13cab5843d8458e0bf04f5a8eda8f19064 SHA512 2e775de3757b0e161fd7c6ac19982763bbafec42fef3418cb469cf3cb6bf1783b01486fe28e5a250af7b67107a5c3c73e2ad2b10a4e49b3ca187e76e2b578776 WHIRLPOOL df9a926df2f2a095a816234b6499640149e81acb4b6610d94ff8588e28ae9eaace8c0ca1808d1522aa55531674c53cbc6b5f55f606d7af73918610c9eb095ecf
 DIST guacamole-auth-ldap-0.9.0.tar.gz 382885 SHA256 b9e0440202a4106b6fd0a8cdd9da7bfa476895ce8724edc7d75e80b89bca9780 SHA512 caf228029a4e69ac1ac1f252c761167c1676eadbb362877753710aa28d274f76ed8091102f5a142b871dc7a7e22f98d113c18fa06e46dfbf6ec57c3ea92b435b WHIRLPOOL 3f674c98c6c0bf068426f3c78947f1f09fecc19d55a341b58f9adde8920bc30722077feed7f293d082009991bc08ab8cbddba2569a65e05fcc39b8a91f5f875f
 DIST guacamole-auth-ldap-0.9.2.tar.gz 382892 SHA256 478b0f5a3f9df0de4614b0432707cad443ea9f65ad219cffe904c6a91177250c SHA512 7ff6ed8aeac872aebfe654992208342370f991eabd141ac102ea553cc94b8c69c382344b5c8419745bcdc8f83b77d9b72577c8ddef9e2d000549a5fb1ae70617 WHIRLPOOL 846a673f1d61294b201d95160e2979254537fe80ffbbdc00756ee6202dd9886807a9c1f4b8f60653c528776a5c852cc7382cd14dec624aa10934fbf04e4a4584
 DIST guacamole-auth-ldap-0.9.3.tar.gz 382919 SHA256 0502e3d4e8512fbdd12b144285badfe2cd0b02fa9b0072b0b9772076998c8156 SHA512 e3eebeafd841d304f4c2beb21c1d54327bf0af2201794685c008d1812f05e70c8389888eec1e417c7e08600ebaf6f7f7330cddcf5176c9a12c987ba516155ebe WHIRLPOOL c7d2869d4ede53478cf55be4825dfdae4f47a7c03113e79dbf17afd190c823279f9967c2fefd518de0858484151901e5c3d4592ef3ffcb241c50949d59643068
 DIST guacamole-auth-ldap-0.9.7.tar.gz 384154 SHA256 479307fc54c20f0e4c661e135c0ad7251b3601054adbccdab2b7638cfa9c40bd SHA512 e750a89059a247ac17c7d137f8b7e03f43673a82559b91a39d0d1e69c94bb8212f7a17c335ec69f3c7d892c8ad0aaa746f50dfd247202468fc6c880e9126f1d2 WHIRLPOOL bdce95eb5d8a07de539dd44e55b6b44b746d0d3b12c7caba3c205ae584bdc69a83e5d05b753a650367fb2e172bd42eea0e3a21d3ef61f9e2cb35b8a028ac203c
 DIST guacamole-auth-ldap-0.9.8.tar.gz 1055810 SHA256 712d7462368b690ddecd26a9bac926f9f307c84a63d8af622996d29fea71c99b SHA512 b13947581dfad5b25a423369867c1a98327fd9a6a2124c12fe16c68700caefec217f18d01a1436419cb60dd43bb7f2126f5e47f3aebd069b2ce6a46759c0b402 WHIRLPOOL 270991364222ea8f0202cc0fb76c129859f717e24bd3e1653a880562d077eb9368d8e56f327f60b07f7c2d615b2981dcc604261288cd90630b53087a738369d6
-DIST guacamole-auth-mysql-0.8.2.tar.gz 2101795 SHA256 26902d50237a5bcb65b5dc9e31e7c51d6318614b97200c58c030a655e57aed82 SHA512 9bc5e7a5750d52a3df288088fa331f9e442cea06abf704df3989e714daba03e20b07ff5c531b4966ccc2f50c49124b9b7819447330d3be9ac5cce79c368663c6 WHIRLPOOL bce4711ca03315feb770cd82f07b4370ea8ff74ca38a952827b36428150ee31c3e6deaf633fd7e256047ccf9e361e80b2d46248e5f2f6c3f896363b2e2badd13
 DIST guacamole-auth-mysql-0.9.0.tar.gz 2104231 SHA256 5419d62a8decae579b54773ed70c8f21b03c11a53c24de982e8f84a79d74423e SHA512 00cc09e75f8c977a2465759b97022007fe34ba9272f9b9004eec404419a68b8c0b301fc385b4f09af07bde82510a6f5b808585c78a61b26cabd98529a5b1c4fa WHIRLPOOL cacb8ee6387b43b0c4fd5c473680404828acc8cbdee219930043ef2f18857ca53b1502e8a650f0cbc6a4a2dfbb42d457991043a4823445e261eb2dc53aad9601
 DIST guacamole-auth-mysql-0.9.2.tar.gz 2104317 SHA256 74567dcb03f2b4bbe059a8270c568ccf54a0a0ed8491de4ed2c3500cde0eabc3 SHA512 4422358b1ced34ca468f130807da6f8d7c65f39a0c3e1c7eecf004803ca62ccccda07b5a7a2b72f4b4e8337ad60783e5514af6318c2cc38f37397ba14cd2f552 WHIRLPOOL cc9583781f53110fd53e4f5dd6e2fc24fdd8a1c160fc674db4694ca3517b20846f43e0bb1a172378982303d03e4be8b2cb3a9e0e5e7c52a4d0f708b4da3766f1
 DIST guacamole-auth-mysql-0.9.3.tar.gz 2104479 SHA256 1cd081758b81b7cc082c383c7c2804434cb90ce609f5d02ed5c48fdcd50d13e6 SHA512 b33e1228b261e3857c385260a15f7b3b6088bdcaf2785f837b9525c5469a7af6560610c8064614b438160d98e349487037d78c11737dbef6a83be6b41bd37e4c WHIRLPOOL 371617fecb15b193cb51a3f76896982365e7d1d4c394021eeaec5281f57ce885517240842ce30f9543b002db71907ae550173b8ba75f19c866f297c3c52985a5
 DIST guacamole-auth-noauth-0.9.7.tar.gz 5810 SHA256 0ff433a73dcbc014cc5c7269f408ef01d02ab0d743f4b45a868b0f98a38d61ba SHA512 1f5e6f0b9e035c75edc556ff47a73e8e6e047369306e00e1281a97ac4896c7563b41dfbd66c89926d972e01a5aee3fdd9c0214d91cb84a83f177a4e3df05d537 WHIRLPOOL 7b75d883f6785bee4470cc3dee70e964c36447c0d1434c785e23b2d5bed8b18b3488c04dc4f8ae04f5a12dd54ba88ac7035acea99cd89e855ff264b1c548a09f
 DIST guacamole-auth-noauth-0.9.8.tar.gz 6011 SHA256 3e3c060b37e6fd606b489ffb8b048749208d4124e075e42fb2b1cfe556cf4d4b SHA512 481f7ee88cbc7989734afb23cb9807d2cab71846ecdd17475f0e24afab5d3cd82040d5f448abe3eb01bfd828b9d834a753e0f0ec573b8b8c863fe5e2718ad1a2 WHIRLPOOL 8ad6bb47e47fe3f7e905e4f4e44a41affbe890a38d066357f255006ce0879f29a509255a750d2fae4a3d5e295e1f78fcd8898b22cd03060c2252df9d09859624
-DIST guacamole-client-0.8.3.tar.gz 345097 SHA256 a2e3d96b9f83308caf35068d657882fff9c3977533bb3b125cda1971422112ce SHA512 395ffbb08b877e4af538b1d0859d8e28e3352f2fe41482e7790c9b3c7597f37882ca032d383c7994d5f2e193404c5c267cdf793d642fb551e04465edfe93d7f0 WHIRLPOOL 19a778b40b7220604a7c5ecd93fa8a7680b7efadf304ffb5b747dad52bbf6dffdeed5a16c26cdd3773b6a0a155b7ba23a76b3233bdd2d658c0dc71a4a86ada80
 DIST guacamole-client-0.9.0.tar.gz 314566 SHA256 2f98776e542fccdeb3a120ae266834e56935a30196d0c3088a8fa523a07f3594 SHA512 33dd583cde9188066f0254fe9a531886be79110ef9f0e62fc60771d2751a927f783eb484e5484760e4ed3bc2aaa1f2000f43f953b78122cbdc2b0f19d8141457 WHIRLPOOL 972ea5c2bfe7f7dc2b1cc42ca6bc49485c18e46b161180e6eddf828467dcce76cae58f89ca0a4e847ab33ebb0ee2ffa87b052c94a9707d8b1538cc3f1ac29c20
 DIST guacamole-client-0.9.2.tar.gz 386263 SHA256 c12f9b1b32621cc44d1e428d71eac5798f85f6b8df23edd3920907678205084c SHA512 e9e73b23b64883c64a1bd0908ecc9e685dc23308c3d44bd2c9c691e43fe383424bfc14816d0248b0f2a693da473a3a780a2d2469024aae53587b67f78d0b0af6 WHIRLPOOL 5a25e9942c9d9067bfad063833f89cc003ad8ba99c1ad1a2fd49d901f3c3616dac974f6abc67a4854129ea5160a7f7194a6b3e72e4741b0ff9a71025f57f229f
 DIST guacamole-client-0.9.3.tar.gz 396313 SHA256 e579ef8f5271c19955429b9d064fd58f7554031c078557c1d65e5d51f695d8d1 SHA512 4ec3ec74b1175ce6b3cde4b9669a3f54f21b45c489c592ea3cabd2af670bf0ec9449f8a368d416640ed7348e77c23ad05243b4fdff083a120f432053642f7727 WHIRLPOOL cb44f374acce366964554cd192440cd4eb71e6b5364bff31a853a7769becce34a608358c204702702220e602cf94732af59ab707b4fb38452cbc78fca541829f
 DIST guacamole-client-0.9.7.tar.gz 1580766 SHA256 905c32cb26844d7fca2a135cc6fcbc5017da7a71df5d4fed01786fe404ab9883 SHA512 eb9d9be14e9a55192c2e341fbd9b07d3cf1b3f4f06dbe97cdb5ca5d624362a895a6369100859716d9cf65562fa251424c9b3a36c2a7d4812bfb2814ab96dc5c3 WHIRLPOOL fbdade073fd2be4ea442d1b604f623a1e0046d744b86447e1eabc42643aae70eec62b596e2e014b294f14377c5823a42a498b75c06ded70346446b4ccc9c72b4
 DIST guacamole-client-0.9.8.tar.gz 1685223 SHA256 115107d4404a96abb122e5e4c06071adfe60bdd6bc7ff949dc537578f98e7f8b SHA512 e8152a10c8c51b0adff93ee476287e3c264ddae4de4b581a43009d8613e8cc2276ddd1ff5a53e84d74ff19901ec82433321d176e1335b4445dcbed04afe6f9f8 WHIRLPOOL 3daf2ac277f12360914c8cea0752a146d944ff8eaba01bfade5e8863b5e7d0da2163767b732b6f96120c4bfb2ab2f3eaa38fa700663b114684de12a311cd7411
+DIST guacamole-client-0.9.9.tar.gz 1725944 SHA256 f99f686aa49393160b7602048e78fb99886c4e367125d243eb3a741936833150 SHA512 109fe04fd9c072f6abfd31ba64c91b79dc6ef56562086bfb0db5d05feda436917eaf4d01b3b6e542bf2c6e1a56ab395a215fd0a1611cc0c2f87db925a14cf0e5 WHIRLPOOL 696d2595e96ebd0253879b8a6e376f634fe52baedc4d1496f97341415eb09bd20589ef4d7c6fdfb3ad8d6e68bec5cc96305ed1fa4199d0be38036cba307ec83b
--- a/www-apps/guacamole/guacamole-0.8.3.ebuild
+++ b/www-apps/guacamole/guacamole-0.8.3.ebuild
@@ -1,93 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit eutils
-DESCRIPTION="Guacamole is a html5 vnc client as servlet"
-HOMEPAGE="http://guacamole.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}-client-${PV}.tar.gz
-	mysql? ( http://sourceforge.net/projects/${PN}/files/current/extensions/${PN}-auth-mysql-0.8.2.tar.gz )
-	ldap? ( http://sourceforge.net/projects/guacamole/files/current/extensions/guacamole-auth-ldap-0.8.0.tar.gz )"
-S="${WORKDIR}/${PN}-client-${PV}"
-
-LICENSE="AGPL-3"
-
-SLOT="0"
-
-KEYWORDS="~x86"
-
-IUSE="ldap mysql"
-
-DEPEND="dev-java/maven-bin"
-
-RDEPEND="${DEPEND}
-	www-servers/tomcat
-	>virtual/jre-1.6
-	net-misc/guacamole-server
-	mysql? ( virtual/mysql )
-	ldap? ( net-nds/openldap )"
-
-src_compile() {
-	mkdir "${HOME}"/.m2
-	cat /usr/share/`readlink /usr/bin/mvn | sed 's:mvn:maven-bin:'`/conf/settings.xml | \
-	sed -e 's:/path/to/local/repo:'${HOME}/.m2':g' -e 's:<!-- localRepo::' >"${S}"/settings.xml
-	mvn -s "${S}"/settings.xml package
-}
-
-src_install() {
-	if use mysql; then
-		echo lib-directory: "/var/lib/${PN}/classpath" >>"${S}/${PN}/doc/example/${PN}.properties"
-		echo auth-provider: net.sourceforge.guacamole.net.auth.mysql.MySQLAuthenticationProvider >>"${S}/${PN}/doc/example/${PN}.properties"
-		echo mysql-hostname: localhost >>"${S}/${PN}/doc/example/${PN}.properties"
-		echo mysql-port: 3306 >>"${S}/${PN}/doc/example/${PN}.properties"
-		echo mysql-database: guacamole >>"${S}/${PN}/doc/example/${PN}.properties"
-		echo mysql-username: guacamole >>"${S}/${PN}/doc/example/${PN}.properties"
-		echo mysql-password: some_password >>"${S}/${PN}/doc/example/${PN}.properties"
-		sed -e 's:basic-user-mapping:#basic-user-mapping:' -i "${S}/${PN}/doc/example/${PN}.properties"
-		insinto "/var/lib/${PN}/classpath"
-		find "${WORKDIR}/${PN}-auth-mysql-0.8.2/lib/" -name '*.jar' -exec doins '{}' +
-		insinto "/usr/share/${PN}/schema"
-		find "${WORKDIR}/${PN}-auth-mysql-0.8.2/schema/" -name '*.sql' -exec doins '{}' +
-		insinto "/usr/share/${PN}/schema/upgrade"
-		find "${WORKDIR}/${PN}-auth-mysql-0.8.2/schema/upgrade/" -name '*.sql' -exec doins '{}' +
-		elog "Please add a mysql database and a user and load the sql files in /usr/share/guacamole/schema/ into it."
-		elog "You will also need to adjust the DB propeties in /etc/guacamole.properties!"
-		elog "The default user and it's password is \"guacadmin\"."
-		elog "You will also need to download the mysql-connector from here http://dev.mysql.com/downloads/connector/j/"
-		elog "and put the contained .jar file into /var/lib/guacamole/classpath!"
-		elog "-"
-	fi
-	if use ldap; then
-		echo lib-directory: "/var/lib/${PN}/classpath" >>"${S}/${PN}/doc/example/${PN}.properties"
-		echo auth-provider: net.sourceforge.guacamole.net.auth.ldap.LDAPAuthenticationProvider >>"${S}/${PN}/doc/example/${PN}.properties"
-		echo ldap-hostname: localhost >>"${S}/${PN}/doc/example/${PN}.properties"
-		echo ldap-port: 389 >>"${S}/${PN}/doc/example/${PN}.properties"
-		echo ldap-user-base-dn: ou=people,dc=example,dc=net >>"${S}/${PN}/doc/example/${PN}.properties"
-		echo ldap-username-attribute: uid >>"${S}/${PN}/doc/example/${PN}.properties"
-		echo ldap-config-base-dn: ou=groups,dc=example,dc=net >>"${S}/${PN}/doc/example/${PN}.properties"
-		sed -e 's:basic-user-mapping:#basic-user-mapping:' -i "${S}/${PN}/doc/example/${PN}.properties"
-		insinto "/var/lib/${PN}/classpath"
-		find "${WORKDIR}/${PN}-auth-ldap-0.8.0/lib/" -name '*.jar' -exec doins '{}' +
-		insinto "/usr/share/${PN}/schema"
-		doins "${WORKDIR}/${PN}-auth-ldap-0.8.0/schema/guacConfigGroup.ldif"  "${WORKDIR}/${PN}-auth-ldap-0.8.0/schema/guacConfigGroup.schema"
-		elog "You will need to add and load the .schema file in /usr/share/guacamole/schema/ to your ldap server."
-		elog "There is also an example .lidf file for creating the users."
-		elog "-"
-	fi
-	sed -e 's:/path/to:/etc/guacamole:g' -i "${S}/${PN}/doc/example/${PN}.properties" || die "properties sed failed"
-	insinto /etc/"${PN}"
-	doins "${S}/${PN}/doc/example/guacamole.properties"
-	doins "${S}/${PN}/doc/example/user-mapping.xml"
-	insinto "/var/lib/${PN}"
-	newins "${S}/${PN}/target/${P}.war" "${PN}.war"
-	elog "Please unpack /var/lib/"${PN}"/"${PN}".war in to your servlet container! If it is an update,"
-	elog "delete the old content first!"
-	elog "Read: if you use the command below, delete everything within /var/lib/guacamole/guacamole first!"
-	elog "Please also link /etc/guacamole in to the lib directory of your servlet container."
-	elog "like this:"
-	elog "cd /var/lib/guacamole && mkdir guacamole && cd guacamole && jar -xvf ../guacamole.war && cd .. && mv guacamole /var/lib/tomcat-7/webapps/"
-	elog "ln -sf /etc/guacamole/guacamole.properties /usr/share/tomcat-7/lib/"
-	elog "You will also need to define users and connectrions in /etc/guacamole/user-mapping.xml if mysql is not used!"
-}
--- a/www-apps/guacamole/guacamole-0.9.9.ebuild
+++ b/www-apps/guacamole/guacamole-0.9.9.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils
+DESCRIPTION="Guacamole is a html5 vnc client as servlet"
+HOMEPAGE="http://guac-dev.org/"
+SRC_URI="mirror://sourceforge/${PN}/${PN}-client-${PV}.tar.gz"
+S="${WORKDIR}/${PN}-client-${PV}"
+
+LICENSE="MIT"
+
+SLOT="0"
+
+KEYWORDS="~x86 ~amd64"
+
+IUSE="ldap mysql noauth postgres"
+
+REQUIRED_USE="|| ( ldap mysql noauth postgres )"
+
+DEPEND="dev-java/maven-bin:*"
+
+RDEPEND="${DEPEND}
+	www-servers/tomcat[websockets]
+	>virtual/jre-1.6
+	net-misc/guacamole-server
+	mysql? ( virtual/mysql )
+	postgres? ( dev-db/postgresql )
+	ldap? ( net-nds/openldap )"
+
+src_compile() {
+	mkdir "${HOME}"/.m2
+	cat /usr/share/`readlink /usr/bin/mvn | sed 's:mvn:maven-bin:'`/conf/settings.xml | \
+	sed -e 's:/path/to/local/repo:'${HOME}/.m2':g' -e 's:<!-- localRepo::' >"${S}"/settings.xml
+	mvn -s "${S}"/settings.xml package
+}
+
+src_install() {
+	echo guacd-hostname: localhost >>"${S}/${PN}/doc/example/${PN}.properties"
+	echo guacd-port:     4822 >>"${S}/${PN}/doc/example/${PN}.properties"
+	echo basic-user-mapping: /etc/guacamole/user-mapping.xml >>"${S}/${PN}/doc/example/${PN}.properties"
+	if use mysql || use postgres; then
+		insinto "/etc/${PN}/extensions"
+		find "${WORKDIR}/${PN}-client-${PV}/extensions/${PN}-auth-jdbc/modules/${PN}-auth-jdbc-base/" -name '*.jar' -exec doins '{}' +
+	fi
+	if use noauth; then
+		sed -e 's:basic-user-mapping:#basic-user-mapping:' -i "${S}/${PN}/doc/example/${PN}.properties"
+		echo noauth-config: /etc/guacamole/noauth-config.xml  >>"${S}/${PN}/doc/example/${PN}.properties"
+		insinto "/etc/${PN}/extensions"
+		find "${WORKDIR}/${PN}-client-${PV}/extensions/${PN}-auth-noauth/" -name '*.jar' -exec doins '{}' +
+		insinto "/etc/guacamole"
+		find "${WORKDIR}/${PN}-client-${PV}/extensions/${PN}-auth-noauth/doc/example/" -name '*.xml' -exec doins '{}' +
+		elog "Warning: Setting No Authentication is obviously very insecure! Only use it if you know what you are doing!"
+	fi
+	if use mysql; then
+		echo mysql-hostname: localhost >>"${S}/${PN}/doc/example/${PN}.properties"
+		echo mysql-port: 3306 >>"${S}/${PN}/doc/example/${PN}.properties"
+		echo mysql-database: guacamole >>"${S}/${PN}/doc/example/${PN}.properties"
+		echo mysql-username: guacamole >>"${S}/${PN}/doc/example/${PN}.properties"
+		echo mysql-password: some_password >>"${S}/${PN}/doc/example/${PN}.properties"
+		sed -e 's:basic-user-mapping:#basic-user-mapping:' -i "${S}/${PN}/doc/example/${PN}.properties"
+		insinto "/etc/${PN}/extensions"
+		find "${WORKDIR}/${PN}-client-${PV}/extensions/${PN}-auth-jdbc/modules/${PN}-auth-jdbc-mysql/" -name '*.jar' -exec doins '{}' +
+		insinto "/usr/share/${PN}/schema/mysql"
+		find "${WORKDIR}/${PN}-client-${PV}/extensions/${PN}-auth-jdbc/modules/${PN}-auth-jdbc-mysql/schema/" -name '*.sql' -exec doins '{}' +
+		elog "Please add a mysql database and a user and load the sql files in /usr/share/guacamole/schema/ into it."
+		elog "If this is an update, then you will need to apply the appropriate update script in the location above."
+		elog "You will also need to adjust the DB propeties in /etc/guacamole.properties!"
+		elog "The default user and it's password is \"guacadmin\"."
+		elog "You will also need to download the mysql-connector from here http://dev.mysql.com/downloads/connector/j/"
+		elog "and put the contained .jar file into /etc/guacamole/lib!"
+		elog "-"
+	fi
+	if use postgres; then
+		echo postgresql-hostname: localhost >>"${S}/${PN}/doc/example/${PN}.properties"
+		echo postgresql-port: 5432 >>"${S}/${PN}/doc/example/${PN}.properties"
+		echo postgresql-database: guacamole >>"${S}/${PN}/doc/example/${PN}.properties"
+		echo postgresql-username: guacamole >>"${S}/${PN}/doc/example/${PN}.properties"
+		echo postgresql-password: some_password >>"${S}/${PN}/doc/example/${PN}.properties"
+		sed -e 's:basic-user-mapping:#basic-user-mapping:' -i "${S}/${PN}/doc/example/${PN}.properties"
+		insinto "/etc/${PN}/extensions"
+		find "${WORKDIR}/${PN}-client-${PV}/extensions/${PN}-auth-jdbc/modules/${PN}-auth-jdbc-postgresql/" -name '*.jar' -exec doins '{}' +
+		insinto "/usr/share/${PN}/schema/postgres"
+		find "${WORKDIR}/${PN}-client-${PV}/extensions/${PN}-auth-jdbc/modules/${PN}-auth-jdbc-postgresql/schema/" -name '*.sql' -exec doins '{}' +
+		elog "Please add a postgresql database and a user and load the sql files in /usr/share/guacamole/schema/ into it."
+		elog "If this is an update, then you will need to apply the appropriate update script in the location above."
+		elog "You will also need to adjust the DB propeties in /etc/guacamole.properties!"
+		elog "The default user and it's password is \"guacadmin\"."
+		elog "You will also need to download the postgresql-connector from here https://jdbc.postgresql.org/download.html#current"
+		elog "and put the contained .jar file into /etc/guacamole/lib!"
+		elog "-"
+	fi
+	if use ldap; then
+		echo ldap-hostname: localhost >>"${S}/${PN}/doc/example/${PN}.properties"
+		echo ldap-port: 389 >>"${S}/${PN}/doc/example/${PN}.properties"
+		echo ldap-user-base-dn: ou=people,dc=example,dc=net >>"${S}/${PN}/doc/example/${PN}.properties"
+		echo ldap-username-attribute: uid >>"${S}/${PN}/doc/example/${PN}.properties"
+		echo ldap-config-base-dn: ou=groups,dc=example,dc=net >>"${S}/${PN}/doc/example/${PN}.properties"
+		sed -e 's:basic-user-mapping:#basic-user-mapping:' -i "${S}/${PN}/doc/example/${PN}.properties"
+		insinto "/etc/${PN}/extensions"
+		find "${WORKDIR}/${PN}-client-${PV}/extensions/${PN}-auth-ldap" -name '*.jar' -exec doins '{}' +
+		insinto "/usr/share/${PN}/schema"
+		doins "${WORKDIR}/${PN}-client-${PV}/extensions/${PN}-auth-ldap/schema/guacConfigGroup.ldif" "${WORKDIR}/${PN}-client-${PV}/extensions/${PN}-auth-ldap/schema/guacConfigGroup.schema"
+		elog "You will need to add and load the .schema file in /usr/share/guacamole/schema/ to your ldap server."
+		elog "There is also an example .lidf file for creating the users."
+		elog "-"
+	fi
+	insinto "/etc/${PN}"
+	doins "${WORKDIR}/${PN}-client-${PV}/${PN}/doc/example/user-mapping.xml"
+	insinto "/etc/${PN}"
+	doins "${S}/${PN}/doc/example/guacamole.properties"
+	echo "GUACAMOLE_HOME=/etc/guacamole" >98guacamole
+	doenvd 98guacamole
+	insinto "/var/lib/${PN}"
+	newins "${S}/${PN}/target/${P}.war" "${PN}.war"
+	elog "If it is an update, please make sure to delete the old webapp in /var/lib/tomcat-7/webapps/ first!"
+	elog "To deploy guacamole with tomcat, you will need to link the war file and create the configuration!"
+	elog "ln -sf /var/lib/${PN}/${PN}.war /var/lib/tomcat-7-main/webapps/"
+	elog "You will also need to adjust the configuration in /etc/${PN}/${PN}.properties"
+	elog "See http://guac-dev.org/doc/${PV}/gug/configuring-guacamole.html#initial-setup for a basic setup"
+	elog "or http://guac-dev.org/doc/${PV}/gug/jdbc-auth.html for a database for authentication and host definitions."
+}
--- a/x11-libs/flowcanvas/flowcanvas-0.7.1-r2.ebuild
+++ b/x11-libs/flowcanvas/flowcanvas-0.7.1-r2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='threads(+)'
+
+inherit waf-utils python-any-r1 eutils flag-o-matic
+
+DESCRIPTION="Gtkmm/Gnomecanvasmm widget for boxes and lines environments"
+HOMEPAGE="http://wiki.drobilla.net/FlowCanvas"
+SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc"
+
+RDEPEND="dev-libs/boost
+	>=dev-cpp/gtkmm-2.4:2.4
+	>=dev-cpp/libgnomecanvasmm-2.6:2.6
+	media-gfx/graphviz"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )"
+
+DOCS=( AUTHORS README ChangeLog )
+
+src_prepare() {
+	epatch "${FILESDIR}/ldconfig2.patch"
+	has_version '>=media-gfx/graphviz-2.34' && epatch "${FILESDIR}/gv234.patch"
+	append-cxxflags -std=c++11
+}
+
+src_configure() {
+	waf-utils_src_configure \
+		--htmldir=/usr/share/doc/${PF}/html \
+		$(use debug && echo "--debug") \
+		$(use doc && echo "--doc")
+}
--- a/x11-libs/gdk-pixbuf/Manifest
+++ b/x11-libs/gdk-pixbuf/Manifest
@@ -1,2 +1,3 @@
 DIST gdk-pixbuf-2.32.1.tar.xz 2427908 SHA256 4432b74f25538c7d6bcb3ca51adabdd666168955f25812a2568dc9637697f3bc SHA512 4c744f166e86c17cafebe0db9434794666b64850a60597e34675cf9b902e48e89c3ff45032a10899944ae59b6c0db63c1ff33c4d2c50846393e77bad3a3adec2 WHIRLPOOL 566b73752c1e478fdf7011c3d2222ea39eb13052741c70a0dffd6a0800e892e951207856b90e0d20c352981565682dec28c51fc4951f2236767e97c838d239a2
 DIST gdk-pixbuf-2.32.2.tar.xz 2429268 SHA256 d3ab06fc123b13effed4c27c77cebdfad2173ff20628d82c397b7660ae926145 SHA512 146cbddc1b4a68715a827fc53d98f213f5e27f4f4a8b3fe6148b96c866b4ca4ab624613ddf196d4b0a01bbddfc6f8438b96ad436d23dfced02d584ff8c2fdf3d WHIRLPOOL 1866e9892a8c47b38737ab716471a5207fbd07d2d51122b8a2405e46b78ee2ded95fa57f0b35607cb4a72205e7aceea3d3bc8e178807bfddb209b8d19e4c2f7e
+DIST gdk-pixbuf-2.32.3.tar.xz 2430720 SHA256 2b6771f1ac72f687a8971e59810b8dc658e65e7d3086bd2e676e618fd541d031 SHA512 9eb9b87c8104cff9292bebc41c411d2ba4b7fcd9d24c1b99e6dfc8281b5a202a53045dd3095666e3614eba59d417a7c0f69789b2a9dd52ed53bb5df4a0dfd117 WHIRLPOOL 053c48d7f0890ed0f324225ccf4d16f9afd4fd70b878acc6b9ec1bfd9c0c732bc290447cce25ba37cbbdded89a183d112b6e9b4b53141c62690bf45846f675e1
--- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.32.3.ebuild
+++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.32.3.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit eutils flag-o-matic gnome2 multilib libtool multilib-minimal
+
+DESCRIPTION="Image loading library for GTK+"
+HOMEPAGE="https://git.gnome.org/browse/gdk-pixbuf"
+
+LICENSE="LGPL-2+"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="X debug +introspection jpeg jpeg2k tiff test"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.37.6:2[${MULTILIB_USEDEP}]
+	>=media-libs/libpng-1.4:0=[${MULTILIB_USEDEP}]
+	introspection? ( >=dev-libs/gobject-introspection-0.9.3:= )
+	jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
+	jpeg2k? ( media-libs/jasper:=[${MULTILIB_USEDEP}] )
+	tiff? ( >=media-libs/tiff-3.9.2:0=[${MULTILIB_USEDEP}] )
+	X? ( x11-libs/libX11[${MULTILIB_USEDEP}] )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/gtk-doc-am-1.20
+	>=sys-devel/gettext-0.19
+	virtual/pkgconfig
+"
+# librsvg blocker is for the new pixbuf loader API, you lose icons otherwise
+RDEPEND="${COMMON_DEPEND}
+	!<gnome-base/gail-1000
+	!<gnome-base/librsvg-2.31.0
+	!<x11-libs/gtk+-2.21.3:2
+	!<x11-libs/gtk+-2.90.4:3
+"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/gdk-pixbuf-query-loaders
+)
+
+src_prepare() {
+	# This will avoid polluting the pkg-config file with versioned libpng,
+	# which is causing problems with libpng14 -> libpng15 upgrade
+	# See upstream bug #667068
+	# First check that the pattern is present, to catch upstream changes on bumps,
+	# because sed doesn't return failure code if it doesn't do any replacements
+	grep -q  'l in libpng16' configure || die "libpng check order has changed upstream"
+	sed -e 's:l in libpng16:l in libpng libpng16:' -i configure || die
+	[[ ${CHOST} == *-solaris* ]] && append-libs intl
+
+	gnome2_src_prepare
+}
+
+multilib_src_configure() {
+	# png always on to display icons
+	ECONF_SOURCE="${S}" \
+	gnome2_src_configure \
+		$(usex debug --enable-debug=yes "") \
+		$(use_with jpeg libjpeg) \
+		$(use_with jpeg2k libjasper) \
+		$(use_with tiff libtiff) \
+		$(multilib_native_use_enable introspection) \
+		$(use_with X x11) \
+		--with-libpng
+
+	# work-around gtk-doc out-of-source brokedness
+	if multilib_is_native_abi; then
+		ln -s "${S}"/docs/reference/${PN}/html docs/reference/${PN}/html || die
+	fi
+}
+
+multilib_src_install() {
+	# Parallel install fails when no gdk-pixbuf is already installed, bug #481372
+	MAKEOPTS="${MAKEOPTS} -j1" gnome2_src_install
+}
+
+pkg_preinst() {
+	gnome2_pkg_preinst
+
+	multilib_pkg_preinst() {
+		# Make sure loaders.cache belongs to gdk-pixbuf alone
+		local cache="usr/$(get_libdir)/${PN}-2.0/2.10.0/loaders.cache"
+
+		if [[ -e ${EROOT}${cache} ]]; then
+			cp "${EROOT}"${cache} "${ED}"/${cache} || die
+		else
+			touch "${ED}"/${cache} || die
+		fi
+	}
+
+	multilib_foreach_abi multilib_pkg_preinst
+}
+
+pkg_postinst() {
+	# causes segfault if set, see bug 375615
+	unset __GL_NO_DSO_FINALIZER
+
+	multilib_foreach_abi gnome2_pkg_postinst
+
+	# Migration snippet for when this was handled by gtk+
+	if [ -e "${EROOT}"usr/lib/gtk-2.0/2.*/loaders ]; then
+		elog "You need to rebuild ebuilds that installed into" "${EROOT}"usr/lib/gtk-2.0/2.*/loaders
+		elog "to do that you can use qfile from portage-utils:"
+		elog "emerge -va1 \$(qfile -qC ${EPREFIX}/usr/lib/gtk-2.0/2.*/loaders)"
+	fi
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+
+	if [[ -z ${REPLACED_BY_VERSIONS} ]]; then
+		rm -f "${EROOT}"usr/lib*/${PN}-2.0/2.10.0/loaders.cache
+	fi
+}