Merge updates from master

app-admin/apache-tools/apache-tools-2.2.31.ebuild

@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE="ssl"
 RESTRICT="test"
 

app-admin/logrotate/logrotate-3.9.1.ebuild

@@ -12,7 +12,7 @@ SRC_URI="https://fedorahosted.org/releases/l/o/logrotate/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="acl +cron selinux"
 
 CDEPEND="

app-admin/supernova/Manifest

@@ -1,3 +1,3 @@
-DIST supernova-2.0.0.tar.gz 18298 SHA256 43b27ee9ed2ca7b0b5860bf52422750e215b60cb71eca106a57b4f900faef24e SHA512 a5c439cfe489991d5ae7f0f63e858b1200ac8df8f1556871f79f8cfc97862d46aae555aee9c97565308388305bd721ecce1f91221824f425caf19acb92f5ac8a WHIRLPOOL e4514e9c0312c68f1c017a92f1959180db042da0cd38ef83079bcee93344758383b41c06b5c51d1139b970dfdae51fda03f8f041d1788a533f9ca71645a7bcf9
 DIST supernova-2.0.5.tar.gz 18219 SHA256 8219f6e42e364aceba5d1b70211522ba76fafad16374f71319a0e43c7f615489 SHA512 737649bb0d5e7ee21d9721cba8556617afffdd8cfa287f9d08fa3d81bfa98eb35a6aeeded9c13e600d355616cd3983bfc80148c0934d2b7791da2724e420c9c0 WHIRLPOOL b9204b5fb265bd7384b8724c62a5a10a4220f34c9ebe20f8f95945f12399c6fb291abb3086b5a09cb988fca8229ec99377f84394c98f15b6874ae140396ab8a9
 DIST supernova-2.0.7.tar.gz 18516 SHA256 5fc2cc9eaf6a7cd0bd355b867240bae2b15c66b1e3ff4f5206b591c3ae155837 SHA512 f1271cac15c04f8f4dc1e1c4d92bd6214019215a9c2b1f567268a49e122852f1e3e67fb0325720b450176c073358f99fe2cbefb602055ac2d650d41e839202a3 WHIRLPOOL 7392ccf2e1ee8adac46141478c05d1c1f5876d2a1ac0ce9adefa182ece0cb26d3c9e800f9d1d4c7c5c0978512a736da527903c3e7f34bdd45405599b5641927c
+DIST supernova-2.0.8.tar.gz 22569 SHA256 fd1a3dbcf52bba6deceb316baf9f8c6b5733c8e1ab4a6b1977aa6c871190f853 SHA512 43d1c53c71c6901da3d9c8e6160ff04110c76cb52281e10fcd8d339c23b2e5da03074e0fda6df66026d8edd268c6a755aa7e087dc131fdfc2365b5bdeed22be2 WHIRLPOOL 6837cc4d841b362a84b97b2a57d6b0b7e0b9cf13eaeef8e6643d9c96db8bbbed0d8c431cf4ddf54a662992a9b4980c88c86c299bd0efd53a015177c975262cf1

app-admin/supernova/supernova-2.0.8.ebuild

@@ -5,20 +5,21 @@
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
 
-inherit bash-completion-r1 distutils-r1 vcs-snapshot
+inherit bash-completion-r1 distutils-r1
 
 DESCRIPTION="novaclient wrapper for multiple nova environments"
 HOMEPAGE="https://github.com/rackerhacker/supernova"
-SRC_URI="https://github.com/major/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="examples test"
+IUSE="doc examples test"
 
 CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 DEPEND="
 	${CDEPEND}
+	doc? ( >=dev-python/mkdocs-0.14.0[${PYTHON_USEDEP}] )
 	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
 "
 RDEPEND="
@@ -30,6 +31,12 @@ RDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]
 "
 
+python_compile_all() {
+	if use doc; then
+		mkdocs build || die "docs failed to build"
+	fi
+}
+
 python_test() {
 	distutils_install_for_testing
 	cd "${TEST_DIR}"/lib || die
@@ -37,6 +44,7 @@ python_test() {
 }
 
 python_install_all() {
+	use doc && local HTML_DOCS=( site/. )
 	use examples && local EXAMPLES=( example_configs/. )
 
 	distutils-r1_python_install_all

app-crypt/eid-mw/Manifest

@@ -1,2 +1,3 @@
 DIST eid-mw-4.0.6-1480.tar.gz 4292450 SHA256 1ff3a7740a30891df2da12fca66cb5324dc286f9490ee839d61d9f1028b9127c SHA512 4b6ba684a43183e11cf29a73bee7bc6ecda24aa15029e55593d6ad3cc9f58726d551089c3c9f95f07d03847df70f2662a0ea9e3db5dd5591cc9b8b0e839d364b WHIRLPOOL cca8b871a2780dae282f5eed12cd79df0bb9d57c3c968ca740b7063ca3c48425be492d3dfcb7bee5c0037b14571df8b76b825540f52025b14afed8f718d56c22
 DIST eid-mw-4.0.6-1620.tar.gz 4335514 SHA256 1ecb30f9f318bdb61a8d774fe76b948eb5841d4de6fee106029ed78daa7efbf2 SHA512 511bf6cf7a9a4d0a2232d95f1a6ba6f4fa8ee174cf919f88e1fa0c71357b9717544a6006ad412d7a0b4090c4c56ca86f8e6f69dabc6912bfd77a2e948cae8104 WHIRLPOOL b89ae4ba659e8dedd93f70368af1e058468cfd3761bec099276fadc017dcf21d245ceb8db001c3e82f30c7e6f670e13ab6c17e221c8c8ee02a45cc5833f39867
+DIST eid-mw-4.1.4-v4.1.4.tar.gz 3475913 SHA256 2996960ea92504c7cee1953ccf4520ba78979c7771645e2b2c1207f94be0a308 SHA512 efcc4dbd0fa383896df9f5a7492b18beb5259cfa368a919ae18bd996e5976a67d0570c0fbccd5ab38ea95c31f48b92c145c526aa59866217a418a80a550d502f WHIRLPOOL 11e35b3649a0c3bd40e4c901ba4d922305dc2b4098018bd018ee71b963b08898e6295e4f71cb7180b0fc8e64d1afe01ce49bcaa36a60c065c2de84b81d19e398

app-crypt/eid-mw/eid-mw-4.1.4.ebuild

@@ -0,0 +1,79 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils autotools mozextension multilib
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://github.com/Fedict/${PN}.git
+		https://github.com/Fedict/${PN}.git"
+	inherit git-2
+	SRC_URI=""
+else
+	MY_P="${P}-v${PV}"
+	SRC_URI="http://eid.belgium.be/en/binaries/${MY_P}.tar_tcm406-270730.gz -> ${MY_P}.tar.gz"
+	KEYWORDS="~x86 ~amd64 ~arm"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+SLOT="0"
+LICENSE="LGPL-3"
+DESCRIPTION="Belgian Electronic Identity Card middleware supplied by the Belgian Federal Government"
+
+HOMEPAGE="http://eid.belgium.be"
+
+IUSE="+gtk +xpi +dialogs"
+
+REQUIRED_USE="
+	dialogs? ( gtk )"
+
+RDEPEND="gtk? ( x11-libs/gtk+:* )
+	>=sys-apps/pcsc-lite-1.2.9
+	xpi? ( || ( >=www-client/firefox-bin-3.6.24
+		>=www-client/firefox-3.6.20 ) )
+	!app-misc/beid-runtime"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	use gtk || epatch "${FILESDIR}"/gtk_not_required_${PV}.patch
+
+	if [[ ${PV} == "9999" ]] ; then
+		# Only in current git. Hopefully, in next release.
+		sed -i -e 's:/beid/rsaref220:/rsaref220:' configure.ac
+		sed -i -e 's:/beid::' cardcomm/pkcs11/src/libbeidpkcs11.pc.in
+	fi
+
+	if [[ ${PV} == "9999" ]] || ! use gtk ; then
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	econf $(use_enable dialogs) --disable-static
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	if [[ ${PV} != "9999" ]] ; then
+		# Automatically done in current git. Hopefully, in next release.
+		rm doc/sdk/include/rsaref220/win32.h
+		doheader -r doc/sdk/include/*
+	fi
+	if use xpi; then
+		declare MOZILLA_FIVE_HOME
+		if has_version '>=www-client/firefox-3.6.20'; then
+			MOZILLA_FIVE_HOME="/usr/$(get_libdir)/firefox"
+			xpi_install	"${D}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/belgiumeid@eid.belgium.be"
+		fi
+		if has_version '>=www-client/firefox-bin-3.6.24'; then
+			MOZILLA_FIVE_HOME="/opt/firefox"
+			xpi_install	"${D}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/belgiumeid@eid.belgium.be"
+		fi
+	fi
+	rm -r "${D}/usr/share" "${D}"/usr/lib*/*.la
+}

app-crypt/eid-mw/eid-mw-9999.ebuild

@@ -4,18 +4,18 @@
 
 EAPI=5
 
-inherit eutils versionator mozextension multilib
+inherit eutils autotools mozextension multilib
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://github.com/Fedict/${PN}.git
 		https://github.com/Fedict/${PN}.git"
-	inherit git-2 autotools
+	inherit git-2
 	SRC_URI=""
 else
-	MY_P="${PN}-${PV/_p/-}"
-	SRC_URI="http://eid.belgium.be/en/binaries/${MY_P}.tar_tcm406-258906.gz -> ${MY_P}.tar.gz"
-	KEYWORDS="~x86 ~amd64"
-	S="${WORKDIR}/eid-mw-$(get_version_component_range 1-3)"
+	MY_P="${P}-v${PV}"
+	SRC_URI="http://eid.belgium.be/en/binaries/${MY_P}.tar_tcm406-270730.gz -> ${MY_P}.tar.gz"
+	KEYWORDS="~x86 ~amd64 ~arm"
+	S="${WORKDIR}/${MY_P}"
 fi
 
 SLOT="0"
@@ -24,9 +24,12 @@ DESCRIPTION="Belgian Electronic Identity Card middleware supplied by the Belgian
 
 HOMEPAGE="http://eid.belgium.be"
 
-IUSE="+gtk +xpi"
+IUSE="+gtk +xpi +dialogs"
 
-RDEPEND="gtk? ( x11-libs/gtk+:2 )
+REQUIRED_USE="
+	dialogs? ( gtk )"
+
+RDEPEND="gtk? ( x11-libs/gtk+:* )
 	>=sys-apps/pcsc-lite-1.2.9
 	xpi? ( || ( >=www-client/firefox-bin-3.6.24
 		>=www-client/firefox-3.6.20 ) )
@@ -35,18 +38,32 @@ RDEPEND="gtk? ( x11-libs/gtk+:2 )
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
-if [[ ${PV} == "9999" ]]; then
-	src_prepare() {
+src_prepare() {
+	use gtk || epatch "${FILESDIR}"/gtk_not_required_${PV}.patch
+
+	if [[ ${PV} == "9999" ]] ; then
+		# Only in current git. Hopefully, in next release.
+		sed -i -e 's:/beid/rsaref220:/rsaref220:' configure.ac
+		sed -i -e 's:/beid::' cardcomm/pkcs11/src/libbeidpkcs11.pc.in
+	fi
+
+	if [[ ${PV} == "9999" ]] || ! use gtk ; then
 		eautoreconf
-	}
-fi
+	fi
+}
 
 src_configure() {
-	econf $(use_enable gtk dialogs) --disable-static
+	econf $(use_enable dialogs) --disable-static
 }
 
 src_install() {
 	emake DESTDIR="${D}" install
+
+	if [[ ${PV} != "9999" ]] ; then
+		# Automatically done in current git. Hopefully, in next release.
+		rm doc/sdk/include/rsaref220/win32.h
+		doheader -r doc/sdk/include/*
+	fi
 	if use xpi; then
 		declare MOZILLA_FIVE_HOME
 		if has_version '>=www-client/firefox-3.6.20'; then

app-crypt/eid-mw/files/gtk_not_required_4.1.4.patch

@@ -0,0 +1,60 @@
+diff -ur eid-mw-4.1.4-v4.1.4-a/cardcomm/pkcs11/src/Makefile.am eid-mw-4.1.4-v4.1.4-b/cardcomm/pkcs11/src/Makefile.am
+--- eid-mw-4.1.4-v4.1.4-a/cardcomm/pkcs11/src/Makefile.am	2015-07-27 10:30:34.638418958 +0200
++++ eid-mw-4.1.4-v4.1.4-b/cardcomm/pkcs11/src/Makefile.am	2015-08-13 14:12:43.827586821 +0200
+@@ -164,29 +164,3 @@
+ 	dialogs/dialogsgtk/dlgs_gtk.cpp \
+ 	dialogs/dialogsgtk/single_dialog.c
+ endif
+-
+-libexec_PROGRAMS = beid-askpin beid-changepin beid-badpin beid-askaccess beid-spr-askpin beid-spr-changepin
+-
+-beid_askpin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-askpin.c
+-beid_askpin_CPPFLAGS = -I$(srcdir)/dialogsgtk -I$(srcdir)/../common/src -I$(srcdir)/src @GTK_CFLAGS@
+-beid_askpin_LDADD = @GTK_LIBS@
+-
+-beid_changepin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-changepin.c
+-beid_changepin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@
+-beid_changepin_LDADD = @GTK_LIBS@
+-
+-beid_badpin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-badpin.c
+-beid_badpin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@
+-beid_badpin_LDADD = @GTK_LIBS@
+-
+-beid_askaccess_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-askaccess.c
+-beid_askaccess_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@
+-beid_askaccess_LDADD = @GTK_LIBS@
+-
+-beid_spr_askpin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-spr-askpin.c
+-beid_spr_askpin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@
+-beid_spr_askpin_LDADD = @GTK_LIBS@
+-
+-beid_spr_changepin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-spr-changepin.c
+-beid_spr_changepin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@
+-beid_spr_changepin_LDADD = @GTK_LIBS@
+diff -ur eid-mw-4.1.4-v4.1.4-a/configure.ac eid-mw-4.1.4-v4.1.4-b/configure.ac
+--- eid-mw-4.1.4-v4.1.4-a/configure.ac	2015-07-27 10:30:34.641752294 +0200
++++ eid-mw-4.1.4-v4.1.4-b/configure.ac	2015-08-13 14:13:51.456736608 +0200
+@@ -55,11 +55,6 @@
+ 	fi
+ fi
+ 
+-if test x"$have_gtk" = "xno"
+-then
+-	AC_MSG_ERROR([At least one version of GTK is required.])
+-fi
+-
+ ###########################################################################
+ ####### read user-specific requests from --enable directives         ######
+ ###########################################################################
+diff -ur eid-mw-4.1.4-v4.1.4-a/Makefile.am eid-mw-4.1.4-v4.1.4-b/Makefile.am
+--- eid-mw-4.1.4-v4.1.4-a/Makefile.am	2015-07-27 10:30:34.638418958 +0200
++++ eid-mw-4.1.4-v4.1.4-b/Makefile.am	2015-08-13 14:11:43.878340486 +0200
+@@ -1,7 +1,7 @@
+ ACLOCAL_AMFLAGS = -I scripts/m4
+ EXTRA_DIST = scripts/build-aux/config.rpath  debian build-debian.sh rpm doc
+ 
+-SUBDIRS=cardcomm/pkcs11/src tests/unit plugins_tools/xpi plugins_tools/aboutmw/gtk
++SUBDIRS=cardcomm/pkcs11/src tests/unit plugins_tools/xpi
+ 
+ xpipackage:
+ 	$(MAKE) -C plugins_tools/xpi xpipackage

app-crypt/eid-mw/files/gtk_not_required_9999.patch

@@ -0,0 +1,64 @@
+diff --git a/Makefile.am b/Makefile.am
+index 1a605f7..6475886 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,7 +1,7 @@
+ ACLOCAL_AMFLAGS = -I scripts/m4
+ EXTRA_DIST = scripts/build-aux/config.rpath  debian build-debian.sh rpm doc
+ 
+-SUBDIRS=cardcomm/pkcs11/src doc/sdk/include/rsaref220 tests/unit plugins_tools/xpi plugins_tools/aboutmw/gtk
++SUBDIRS=cardcomm/pkcs11/src doc/sdk/include/rsaref220 tests/unit plugins_tools/xpi
+ 
+ xpipackage:
+ 	$(MAKE) -C plugins_tools/xpi xpipackage
+diff --git a/cardcomm/pkcs11/src/Makefile.am b/cardcomm/pkcs11/src/Makefile.am
+index b70e7f2..ac38944 100644
+--- a/cardcomm/pkcs11/src/Makefile.am
++++ b/cardcomm/pkcs11/src/Makefile.am
+@@ -165,30 +165,4 @@ libbeidpkcs11_la_SOURCES += \
+ 	dialogs/dialogsgtk/single_dialog.c
+ endif
+ 
+-libexec_PROGRAMS = beid-askpin beid-changepin beid-badpin beid-askaccess beid-spr-askpin beid-spr-changepin
+-
+-beid_askpin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-askpin.c
+-beid_askpin_CPPFLAGS = -I$(srcdir)/dialogsgtk -I$(srcdir)/../common/src -I$(srcdir)/src @GTK_CFLAGS@
+-beid_askpin_LDADD = @GTK_LIBS@
+-
+-beid_changepin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-changepin.c
+-beid_changepin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@
+-beid_changepin_LDADD = @GTK_LIBS@
+-
+-beid_badpin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-badpin.c
+-beid_badpin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@
+-beid_badpin_LDADD = @GTK_LIBS@
+-
+-beid_askaccess_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-askaccess.c
+-beid_askaccess_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@
+-beid_askaccess_LDADD = @GTK_LIBS@
+-
+-beid_spr_askpin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-spr-askpin.c
+-beid_spr_askpin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@
+-beid_spr_askpin_LDADD = @GTK_LIBS@
+-
+-beid_spr_changepin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-spr-changepin.c
+-beid_spr_changepin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@
+-beid_spr_changepin_LDADD = @GTK_LIBS@
+-
+ pkgconfig_DATA=libbeidpkcs11.pc
+diff --git a/configure.ac b/configure.ac
+index 102c1c7..efdf0e2 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -56,11 +56,6 @@ then
+ 	fi
+ fi
+ 
+-if test x"$have_gtk" = "xno"
+-then
+-	AC_MSG_ERROR([At least one version of GTK is required.])
+-fi
+-
+ ###########################################################################
+ ####### read user-specific requests from --enable directives         ######
+ ###########################################################################

app-crypt/eid-mw/metadata.xml

@@ -20,9 +20,12 @@ These three functions form the basis of the countless applications for your eID.
 </longdescription>
 <use>
   <flag name="gtk">
-    Enable the dialog pages, by using <pkg>x11-libs/gtk+:2</pkg>
+    All dialogs are available, by using <pkg>x11-libs/gtk+:*</pkg>
   </flag>
-  <flag name="xpi">
+  <flag name="dialogs">
+    Enable "askaccess" dialog box, by using <pkg>x11-libs/gtk+:*</pkg>
+  </flag>
+   <flag name="xpi">
     Build and install an extension for Mozilla browsers.
   </flag>
 </use>

app-crypt/heimdal/heimdal-1.5.3-r2.ebuild

@@ -24,7 +24,7 @@ CDEPEND="ssl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] )
 	caps? ( sys-libs/libcap-ng )
 	>=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}]
 	>=sys-libs/e2fsprogs-libs-1.42.9[${MULTILIB_USEDEP}]
-	sys-libs/ncurses
+	sys-libs/ncurses:5=
 	>=sys-libs/readline-6.2_p5-r1[${MULTILIB_USEDEP}]
 	afs? ( net-fs/openafs )
 	hdb-ldap? ( >=net-nds/openldap-2.3.0 )

app-crypt/heimdal/metadata.xml

@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kerberos</herd>
-<longdescription>Kerberos 5 implementation from KTH</longdescription>
-<use>
-	<flag name='otp'>
+	<herd>kerberos</herd>
+	<longdescription>Kerberos 5 implementation from KTH</longdescription>
+	<use>
+		<flag name="otp">
 		Adds support for one-time passwords
 	</flag>
-	<flag name='pkinit'>
+		<flag name="pkinit">
 		Adds support for PKINIT for the initial ticket
 	</flag>
-	<flag name='hdb-ldap'>
+		<flag name="hdb-ldap">
 		Adds support for LDAP as a database backend
 	</flag>
-</use>
+	</use>
 </pkgmetadata>

app-crypt/pinentry/files/pinentry-0.9.4-actually_respect_users_pm.patch

@@ -1,49 +0,0 @@
-From 444598586d0abf70d5a27d2aafcd6c14989621db Mon Sep 17 00:00:00 2001
-From: "Neal H. Walfield" <neal@gnu.org>
-Date: Sun, 7 Jun 2015 14:36:39 +0200
-Subject: [PATCH] gnome3: Actually respect the user's choice of using a
- password manager.
-
-* gnome3/pinentry-gnome3.c (create_prompt) [HAVE_LIBSECRET]: Only show
-the libsecret prompt in this case.
-(gnome3_cmd_handler) [HAVE_LIBSECRET]: Set PE->MAY_CACHE_PASSWORD
-according to the user's choice.
----
- gnome3/pinentry-gnome3.c | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/gnome3/pinentry-gnome3.c b/gnome3/pinentry-gnome3.c
-index 74ec89c..0fea8f0 100644
---- a/gnome3/pinentry-gnome3.c
-+++ b/gnome3/pinentry-gnome3.c
-@@ -145,6 +145,7 @@ create_prompt (pinentry_t pe, int confirm)
-   /* XXX: gcr expects a string; we have a int.  */
-   // gcr_prompt_set_caller_window (prompt, pe->parent_wid);
- 
-+#ifdef HAVE_LIBSECRET
-   if (! confirm && pe->allow_external_password_cache && pe->keyinfo)
-     {
-       if (pe->default_pwmngr)
-@@ -157,6 +158,7 @@ create_prompt (pinentry_t pe, int confirm)
- 	gcr_prompt_set_choice_label
- 	  (prompt, "Automatically unlock this key, whenever I'm logged in");
-     }
-+#endif
- 
-   return prompt;
- }
-@@ -203,6 +205,11 @@ gnome3_cmd_handler (pinentry_t pe)
- 	  if (pe->repeat_passphrase)
- 	    pe->repeat_okay = 1;
- 
-+#ifdef HAVE_LIBSECRET
-+	  if (pe->allow_external_password_cache && pe->keyinfo)
-+	    pe->may_cache_password = gcr_prompt_get_choice_chosen (prompt);
-+#endif
-+
- 	  ret = 1;
- 	}
-     }
--- 
-2.1.4
-

app-crypt/pinentry/metadata.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>crypto</herd>
-<use>
-	<flag name='clipboard'>Enable clipboard integration</flag>
-</use>
+	<herd>crypto</herd>
+	<use>
+		<flag name="clipboard">Enable clipboard integration</flag>
+	</use>
 </pkgmetadata>

app-crypt/pinentry/pinentry-0.9.0-r3.ebuild

@@ -19,9 +19,9 @@ RDEPEND="
 	app-eselect/eselect-pinentry
 	caps? ( sys-libs/libcap )
 	gtk? ( x11-libs/gtk+:2 )
-	ncurses? ( sys-libs/ncurses )
+	ncurses? ( sys-libs/ncurses:5= )
 	qt4? ( >=dev-qt/qtgui-4.4.1:4 )
-	static? ( >=sys-libs/ncurses-5.7-r5[static-libs,-gpm] )
+	static? ( >=sys-libs/ncurses-5.7-r5:5=[static-libs,-gpm] )
 "
 DEPEND="${RDEPEND}
 	sys-devel/gettext

app-crypt/pinentry/pinentry-0.9.0.ebuild

@@ -19,9 +19,9 @@ RDEPEND="
 	app-eselect/eselect-pinentry
 	caps? ( sys-libs/libcap )
 	gtk? ( x11-libs/gtk+:2 )
-	ncurses? ( sys-libs/ncurses )
+	ncurses? ( sys-libs/ncurses:5= )
 	qt4? ( >=dev-qt/qtgui-4.4.1:4 )
-	static? ( >=sys-libs/ncurses-5.7-r5[static-libs,-gpm] )
+	static? ( >=sys-libs/ncurses-5.7-r5:5=[static-libs,-gpm] )
 "
 DEPEND="${RDEPEND}
 	sys-devel/gettext

app-crypt/pinentry/pinentry-0.9.5.ebuild

@@ -21,9 +21,9 @@ RDEPEND="
 	app-eselect/eselect-pinentry
 	caps? ( sys-libs/libcap )
 	gtk? ( x11-libs/gtk+:2 )
-	ncurses? ( sys-libs/ncurses )
+	ncurses? ( sys-libs/ncurses:5= )
 	qt4? ( >=dev-qt/qtgui-4.4.1:4 )
-	static? ( >=sys-libs/ncurses-5.7-r5[static-libs,-gpm] )
+	static? ( >=sys-libs/ncurses-5.7-r5:5=[static-libs,-gpm] )
 "
 DEPEND="${RDEPEND}
 	sys-devel/gettext

app-crypt/zuluCrypt/metadata.xml

@@ -6,18 +6,21 @@
 		<name>Julian Ospald</name>
 	</maintainer>
 	<use>
-		<flag name='gnome'>Enable support for the freedesktop.org
+		<flag name="gnome">Enable support for the freedesktop.org
 			Secret Service API via <pkg>app-crypt/libsecret</pkg>.
 			This does not control the gui!
 		</flag>
-		<flag name='gui'>Whether to build the QT gui. Highly recommended.
+		<flag name="gui">Whether to build the QT gui. Highly recommended.
 		</flag>
-		<flag name='kde'>Enable support for KDE, e.g. via
+		<flag name="kde">Enable support for KDE, e.g. via
 			<pkg>kde-base/kwalletd</pkg>. This does not control the gui,
 			but NEEDS GUI ENABLED!
 		</flag>
-		<flag name='udev'>Whether udev will be consulted when deciding
+		<flag name="udev">Whether udev will be consulted when deciding
 			if a volume is system or not.
 		</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">mhogomchungu/zuluCrypt</remote-id>
+	</upstream>
 </pkgmetadata>

app-emulation/libvirt-glib/libvirt-glib-0.2.1.ebuild

@@ -15,7 +15,7 @@ SRC_URI="ftp://libvirt.org/libvirt/glib/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="+introspection python +vala"
 REQUIRED_USE="
 	python? ( ${PYTHON_REQUIRED_USE} )

app-emulation/qemu/metadata.xml

@@ -1,54 +1,54 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>qemu</herd>
-<use>
-	<flag name='accessibility'>Adds support for braille displays using brltty</flag>
-	<flag name='aio'>Enables support for Linux's Async IO</flag>
-	<flag name='alsa'>Enable alsa output for sound emulation</flag>
-	<flag name='curl'>Support ISOs / -cdrom directives vis HTTP or HTTPS.</flag>
-	<flag name='fdt'>Enables firmware device tree support</flag>
-	<flag name='glusterfs'>Enables GlusterFS cluster fileystem via
+	<herd>qemu</herd>
+	<use>
+		<flag name="accessibility">Adds support for braille displays using brltty</flag>
+		<flag name="aio">Enables support for Linux's Async IO</flag>
+		<flag name="alsa">Enable alsa output for sound emulation</flag>
+		<flag name="curl">Support ISOs / -cdrom directives vis HTTP or HTTPS.</flag>
+		<flag name="fdt">Enables firmware device tree support</flag>
+		<flag name="glusterfs">Enables GlusterFS cluster fileystem via
 			<pkg>sys-cluster/glusterfs</pkg></flag>
-	<flag name='gtk2'>Use gtk-2 instead of gtk-3</flag>
-	<flag name='iscsi'>Enable direct iSCSI support via
+		<flag name="gtk2">Use gtk-2 instead of gtk-3</flag>
+		<flag name="iscsi">Enable direct iSCSI support via
 		<pkg>net-libs/libiscsi</pkg> instead of indirectly via the Linux
 		block layer that <pkg>sys-block/open-iscsi</pkg> does.</flag>
-	<flag name='ncurses'>Enable the ncurses-based console</flag>
-	<flag name='nfs'>Enable NFS support</flag>
-	<flag name='numa'>Enable NUMA support</flag>
-	<flag name='pin-upstream-blobs'>Pin the versions of BIOS firmware to the version included in the upstream release.
+		<flag name="ncurses">Enable the ncurses-based console</flag>
+		<flag name="nfs">Enable NFS support</flag>
+		<flag name="numa">Enable NUMA support</flag>
+		<flag name="pin-upstream-blobs">Pin the versions of BIOS firmware to the version included in the upstream release.
 		This is needed to sanely support migration/suspend/resume/snapshotting/etc... of instances.
 		When the blobs are different, random corruption/bugs/crashes/etc... may be observed.</flag>
-	<flag name='pulseaudio'>Enable pulseaudio output for sound emulation</flag>
-	<flag name='rbd'>Enable rados block device backend support, see http://ceph.newdream.net/wiki/QEMU-RBD</flag>
-	<flag name='sdl'>Enable the SDL-based console</flag>
-	<flag name='sdl2'>Use libsdl2 instead of libsdl</flag>
-	<flag name='spice'>Enable Spice protocol support via <pkg>app-emulation/spice</pkg></flag>
-	<flag name='ssh'>Enable SSH based block device support via <pkg>net-libs/libssh2</pkg></flag>
-	<flag name='static-softmmu'>Builds the Software MMU (system) targets as static binaries</flag>
-	<flag name='static-user'>Build the User targets as static binaries</flag>
-	<flag name='static'>Enables both 'static-softmmu' and 'static-user'</flag>
-	<flag name='snappy'>Enable support for snappy compression</flag>
-	<flag name='systemtap'>Enable SystemTAP/DTrace tracing</flag>
-	<flag name='tci'>Enable the TCG Interpreter which can speed up or slowdown workloads depending on the host and guest CPUs being emulated. In the future it will be a runtime option but for now its compile time.</flag>
-	<flag name='tls'>Enable TLS support for the VNC console server.
+		<flag name="pulseaudio">Enable pulseaudio output for sound emulation</flag>
+		<flag name="rbd">Enable rados block device backend support, see http://ceph.newdream.net/wiki/QEMU-RBD</flag>
+		<flag name="sdl">Enable the SDL-based console</flag>
+		<flag name="sdl2">Use libsdl2 instead of libsdl</flag>
+		<flag name="spice">Enable Spice protocol support via <pkg>app-emulation/spice</pkg></flag>
+		<flag name="ssh">Enable SSH based block device support via <pkg>net-libs/libssh2</pkg></flag>
+		<flag name="static-softmmu">Builds the Software MMU (system) targets as static binaries</flag>
+		<flag name="static-user">Build the User targets as static binaries</flag>
+		<flag name="static">Enables both 'static-softmmu' and 'static-user'</flag>
+		<flag name="snappy">Enable support for snappy compression</flag>
+		<flag name="systemtap">Enable SystemTAP/DTrace tracing</flag>
+		<flag name="tci">Enable the TCG Interpreter which can speed up or slowdown workloads depending on the host and guest CPUs being emulated. In the future it will be a runtime option but for now its compile time.</flag>
+		<flag name="tls">Enable TLS support for the VNC console server.
 		For 1.4 and newer this also enables WebSocket support.
 		For 2.0 through 2.3 also enables disk quorum support.</flag>
-	<flag name='jpeg'>Enable jpeg image support for the VNC console server</flag>
-	<flag name='png'>Enable png image support for the VNC console server</flag>
-	<flag name='usb'>Enable USB passthrough via <pkg>dev-libs/libusb</pkg></flag>
-	<flag name="usbredir">Use <pkg>sys-apps/usbredir</pkg> to redirect USB devices to another machine over TCP</flag>
-	<flag name='uuid'>Enable UUID support in the vdi block driver</flag>
-	<flag name='vde'>Enable VDE-based networking</flag>
-	<flag name='vhost-net'>Enable accelerated networking using vhost-net, see http://www.linux-kvm.org/page/VhostNet</flag>
-	<flag name='virtfs'>Enable VirtFS via virtio-9p-pci / fsdev. See http://wiki.qemu.org/Documentation/9psetup</flag>
-	<flag name='vte'>Enable terminal support (<pkg>x11-libs/vte</pkg>) in the GTK+ interface</flag>
-	<flag name='xattr'>Add support for getting and setting POSIX extended attributes, through
+		<flag name="jpeg">Enable jpeg image support for the VNC console server</flag>
+		<flag name="png">Enable png image support for the VNC console server</flag>
+		<flag name="usb">Enable USB passthrough via <pkg>dev-libs/libusb</pkg></flag>
+		<flag name="usbredir">Use <pkg>sys-apps/usbredir</pkg> to redirect USB devices to another machine over TCP</flag>
+		<flag name="uuid">Enable UUID support in the vdi block driver</flag>
+		<flag name="vde">Enable VDE-based networking</flag>
+		<flag name="vhost-net">Enable accelerated networking using vhost-net, see http://www.linux-kvm.org/page/VhostNet</flag>
+		<flag name="virtfs">Enable VirtFS via virtio-9p-pci / fsdev. See http://wiki.qemu.org/Documentation/9psetup</flag>
+		<flag name="vte">Enable terminal support (<pkg>x11-libs/vte</pkg>) in the GTK+ interface</flag>
+		<flag name="xattr">Add support for getting and setting POSIX extended attributes, through
 		<pkg>sys-apps/attr</pkg>. Requisite for the virtfs backend.
 	</flag>
-	<flag name='xen'>Enables support for Xen backends</flag>
-	<flag name='xfs'>Support xfsctl() notification and syncing for XFS backed
+		<flag name="xen">Enables support for Xen backends</flag>
+		<flag name="xfs">Support xfsctl() notification and syncing for XFS backed
 		virtual disks.</flag>
-</use>
+	</use>
 </pkgmetadata>

app-emulation/qemu/qemu-2.3.0-r4.ebuild

@@ -77,7 +77,7 @@ SOFTMMU_LIB_DEPEND="${COMMON_LIB_DEPEND}
 	infiniband? ( sys-infiniband/librdmacm:=[static-libs(+)] )
 	jpeg? ( virtual/jpeg:=[static-libs(+)] )
 	lzo? ( dev-libs/lzo:2[static-libs(+)] )
-	ncurses? ( sys-libs/ncurses[static-libs(+)] )
+	ncurses? ( sys-libs/ncurses:5=[static-libs(+)] )
 	nfs? ( >=net-fs/libnfs-1.9.3[static-libs(+)] )
 	numa? ( sys-process/numactl[static-libs(+)] )
 	png? ( media-libs/libpng:0=[static-libs(+)] )

app-emulation/qemu/qemu-2.3.0-r5.ebuild

@@ -77,7 +77,7 @@ SOFTMMU_LIB_DEPEND="${COMMON_LIB_DEPEND}
 	infiniband? ( sys-infiniband/librdmacm:=[static-libs(+)] )
 	jpeg? ( virtual/jpeg:=[static-libs(+)] )
 	lzo? ( dev-libs/lzo:2[static-libs(+)] )
-	ncurses? ( sys-libs/ncurses[static-libs(+)] )
+	ncurses? ( sys-libs/ncurses:5=[static-libs(+)] )
 	nfs? ( >=net-fs/libnfs-1.9.3[static-libs(+)] )
 	numa? ( sys-process/numactl[static-libs(+)] )
 	png? ( media-libs/libpng:0=[static-libs(+)] )

app-emulation/qemu/qemu-2.3.0-r6.ebuild

@@ -77,7 +77,7 @@ SOFTMMU_LIB_DEPEND="${COMMON_LIB_DEPEND}
 	infiniband? ( sys-infiniband/librdmacm:=[static-libs(+)] )
 	jpeg? ( virtual/jpeg:=[static-libs(+)] )
 	lzo? ( dev-libs/lzo:2[static-libs(+)] )
-	ncurses? ( sys-libs/ncurses[static-libs(+)] )
+	ncurses? ( sys-libs/ncurses:5=[static-libs(+)] )
 	nfs? ( >=net-fs/libnfs-1.9.3[static-libs(+)] )
 	numa? ( sys-process/numactl[static-libs(+)] )
 	png? ( media-libs/libpng:0=[static-libs(+)] )

app-emulation/qemu/qemu-2.3.1.ebuild

@@ -77,7 +77,7 @@ SOFTMMU_LIB_DEPEND="${COMMON_LIB_DEPEND}
 	infiniband? ( sys-infiniband/librdmacm:=[static-libs(+)] )
 	jpeg? ( virtual/jpeg:=[static-libs(+)] )
 	lzo? ( dev-libs/lzo:2[static-libs(+)] )
-	ncurses? ( sys-libs/ncurses[static-libs(+)] )
+	ncurses? ( sys-libs/ncurses:5=[static-libs(+)] )
 	nfs? ( >=net-fs/libnfs-1.9.3[static-libs(+)] )
 	numa? ( sys-process/numactl[static-libs(+)] )
 	png? ( media-libs/libpng:0=[static-libs(+)] )

app-emulation/qemu/qemu-2.4.0.ebuild

@@ -92,7 +92,7 @@ SOFTMMU_LIB_DEPEND="${COMMON_LIB_DEPEND}
 	iscsi? ( net-libs/libiscsi )
 	jpeg? ( virtual/jpeg:=[static-libs(+)] )
 	lzo? ( dev-libs/lzo:2[static-libs(+)] )
-	ncurses? ( sys-libs/ncurses[static-libs(+)] )
+	ncurses? ( sys-libs/ncurses:5=[static-libs(+)] )
 	nfs? ( >=net-fs/libnfs-1.9.3[static-libs(+)] )
 	numa? ( sys-process/numactl[static-libs(+)] )
 	opengl? (

app-emulation/qemu/qemu-9999.ebuild

@@ -92,7 +92,7 @@ SOFTMMU_LIB_DEPEND="${COMMON_LIB_DEPEND}
 	iscsi? ( net-libs/libiscsi )
 	jpeg? ( virtual/jpeg:=[static-libs(+)] )
 	lzo? ( dev-libs/lzo:2[static-libs(+)] )
-	ncurses? ( sys-libs/ncurses[static-libs(+)] )
+	ncurses? ( sys-libs/ncurses:5=[static-libs(+)] )
 	nfs? ( >=net-fs/libnfs-1.9.3[static-libs(+)] )
 	numa? ( sys-process/numactl[static-libs(+)] )
 	opengl? (

app-emulation/spice-protocol/Manifest

@@ -1,2 +1,2 @@
 DIST spice-protocol-0.12.3.tar.bz2 69854 SHA256 dc8609efe23e6f9b78d56663aa9ca5e8cb10c2b8403b8fc02aa72ae7686cc037 SHA512 55423743cf195459125305c726803db491ebf16a5ef0cb821eed7e0d71ace9d581b9a6a60c11a03d6a17c0ecc31e2b4c649ed117857a050f409844686b7df3e0 WHIRLPOOL 308ced9222f8b43e2455733fc5d311912bc9d10fbf830d8d4eecd0e86bfd6dc6a0ae15c3d94dc5c3d73aa9635247023259642c570e31557e0ba9caf4bd2c7eb6
-DIST spice-protocol-0.12.8.tar.bz2 71681 SHA256 116d57a1893c08f8f7801579dffb4c1568a4fb4566aa75c84a2685f150aae67c SHA512 68f11148f3df420dc86483171330e25966d51495313f9a871e473977e8dcd37ae0002f943e6f8d679ce82e1fd9f69625fe983426575ac9338b12a7dddd89597a WHIRLPOOL 6b15a634c1e6308b6521e6e1835dc292f92d0573aefea445d71cccce14f21424aaa01c60b907a4f7e341eee76b6c8ec399b49f0ff0bcb6bc6c54c5a1e8633eb1
+DIST spice-protocol-0.12.9.tar.bz2 71766 SHA256 290cf834dd156014d229b474e98006265ab9c5f63b4c471ea3b2cf8b2ff37876 SHA512 91dd639459a5f20ac37af5a348dcc085690f66274a005017f68a773d23a063ac2c64430c5c78dcead2a144ad0c367b8b12beed0bf80bd146608c8edb9d8080c0 WHIRLPOOL 1f578924b1539ee0c1405478bdd9f37a2d96b2d2e6868f2141b4730f6d1a70e486965a1266af5b1500eefc4a1ee30974f983f585c9d23a7acb762ed2993a13c7

app-emulation/virtualbox/virtualbox-5.0.0-r1.ebuild

@@ -0,0 +1,425 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+inherit eutils fdo-mime flag-o-matic java-pkg-opt-2 linux-info multilib pax-utils python-single-r1 qt4-r2 toolchain-funcs udev
+
+MY_PV="${PV/beta/BETA}"
+MY_PV="${MY_PV/rc/RC}"
+MY_P=VirtualBox-${MY_PV}
+SRC_URI="http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2
+	http://dev.gentoo.org/~polynomial-c/${PN}/patchsets/${PN}-5.0.0_beta3-patches-01.tar.xz"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="Family of powerful x86 virtualization products for enterprise as well as home use"
+HOMEPAGE="http://www.virtualbox.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa doc headless java pam pulseaudio +opengl python +qt4 +sdk +udev vboxwebsrv vnc"
+
+RDEPEND="!app-emulation/virtualbox-bin
+	~app-emulation/virtualbox-modules-${PV}
+	dev-libs/libIDL
+	>=dev-libs/libxslt-1.1.19
+	net-misc/curl
+	dev-libs/openssl:0=
+	dev-libs/libxml2
+	media-libs/libpng:0=
+	media-libs/libvpx
+	sys-libs/zlib
+	!headless? (
+		qt4? (
+			dev-qt/qtgui:4
+			dev-qt/qtcore:4
+			opengl? ( dev-qt/qtopengl:4 )
+			x11-libs/libXinerama
+		)
+		opengl? ( virtual/opengl media-libs/freeglut )
+		x11-libs/libX11
+		x11-libs/libXcursor
+		x11-libs/libXext
+		x11-libs/libXmu
+		x11-libs/libXt
+		media-libs/libsdl:0[X,video]
+	)
+
+	java? ( >=virtual/jre-1.6 )
+	udev? ( >=virtual/udev-171 )
+	vnc? ( >=net-libs/libvncserver-0.9.9 )"
+DEPEND="${RDEPEND}
+	>=dev-util/kbuild-0.1.9998_pre20131130
+	>=dev-lang/yasm-0.6.2
+	sys-devel/bin86
+	sys-power/iasl
+	pam? ( sys-libs/pam )
+	sys-libs/libcap
+	doc? (
+		dev-texlive/texlive-basic
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexrecommended
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-fontsrecommended
+		dev-texlive/texlive-fontsextra
+	)
+	java? ( >=virtual/jre-1.6 )
+	virtual/pkgconfig
+	alsa? ( >=media-libs/alsa-lib-1.0.13 )
+	!headless? ( x11-libs/libXinerama )
+	pulseaudio? ( media-sound/pulseaudio )
+	vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] )
+	${PYTHON_DEPS}"
+
+QA_TEXTRELS_x86="usr/lib/virtualbox-ose/VBoxGuestPropSvc.so
+	usr/lib/virtualbox/VBoxSDL.so
+	usr/lib/virtualbox/VBoxSharedFolders.so
+	usr/lib/virtualbox/VBoxDD2.so
+	usr/lib/virtualbox/VBoxOGLrenderspu.so
+	usr/lib/virtualbox/VBoxPython.so
+	usr/lib/virtualbox/VBoxDD.so
+	usr/lib/virtualbox/VBoxDDU.so
+	usr/lib/virtualbox/VBoxREM64.so
+	usr/lib/virtualbox/VBoxSharedClipboard.so
+	usr/lib/virtualbox/VBoxHeadless.so
+	usr/lib/virtualbox/VBoxRT.so
+	usr/lib/virtualbox/VBoxREM.so
+	usr/lib/virtualbox/VBoxSettings.so
+	usr/lib/virtualbox/VBoxKeyboard.so
+	usr/lib/virtualbox/VBoxSharedCrOpenGL.so
+	usr/lib/virtualbox/VBoxVMM.so
+	usr/lib/virtualbox/VirtualBox.so
+	usr/lib/virtualbox/VBoxOGLhosterrorspu.so
+	usr/lib/virtualbox/components/VBoxC.so
+	usr/lib/virtualbox/components/VBoxSVCM.so
+	usr/lib/virtualbox/components/VBoxDDU.so
+	usr/lib/virtualbox/components/VBoxRT.so
+	usr/lib/virtualbox/components/VBoxREM.so
+	usr/lib/virtualbox/components/VBoxVMM.so
+	usr/lib/virtualbox/VBoxREM32.so
+	usr/lib/virtualbox/VBoxPython2_4.so
+	usr/lib/virtualbox/VBoxPython2_5.so
+	usr/lib/virtualbox/VBoxPython2_6.so
+	usr/lib/virtualbox/VBoxPython2_7.so
+	usr/lib/virtualbox/VBoxXPCOMC.so
+	usr/lib/virtualbox/VBoxOGLhostcrutil.so
+	usr/lib/virtualbox/VBoxNetDHCP.so
+	usr/lib/virtualbox/VBoxNetNAT.so"
+
+REQUIRED_USE="
+	java? ( sdk )
+	python? (
+		( sdk )
+	)
+	vboxwebsrv? ( java )
+	${PYTHON_REQUIRED_USE}
+"
+
+pkg_setup() {
+	if ! use headless && ! use qt4 ; then
+		einfo "No USE=\"qt4\" selected, this build will not include"
+		einfo "any Qt frontend."
+	elif use headless && use qt4 ; then
+		einfo "You selected USE=\"headless qt4\", defaulting to"
+		einfo "USE=\"headless\", this build will not include any X11/Qt frontend."
+	fi
+
+	if ! use opengl ; then
+		einfo "No USE=\"opengl\" selected, this build will lack"
+		einfo "the OpenGL feature."
+	fi
+	if ! use python ; then
+		einfo "You have disabled the \"python\" USE flag. This will only"
+		einfo "disable the python bindings being installed."
+	fi
+	java-pkg-opt-2_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# Remove shipped binaries (kBuild,yasm), see bug #232775
+	rm -rf kBuild/bin tools
+
+	# Disable things unused or split into separate ebuilds
+	sed -e "s@MY_LIBDIR@$(get_libdir)@" \
+		"${FILESDIR}"/${PN}-5-localconfig > LocalConfig.kmk || die
+
+	# Respect LDFLAGS
+	sed -e "s@_LDFLAGS\.${ARCH}*.*=@& ${LDFLAGS}@g" \
+		-i Config.kmk src/libs/xpcom18a4/Config.kmk || die
+
+	# Use PAM only when pam USE flag is enbaled (bug #376531)
+	if ! use pam ; then
+		elog "Disabling PAM removes the possibility to use the VRDP features."
+		sed -i 's@^.*VBOX_WITH_PAM@#VBOX_WITH_PAM@' Config.kmk || die
+		sed -i 's@\(.*/auth/Makefile.kmk.*\)@#\1@' \
+			src/VBox/HostServices/Makefile.kmk || die
+	fi
+
+	# add correct java path
+	if use java ; then
+		sed "s@/usr/lib/jvm/java-6-sun@$(java-config -O)@" \
+			-i "${S}"/Config.kmk || die
+		java-pkg-opt-2_src_prepare
+	fi
+
+	if ! gcc-specs-pie ; then
+		EPATCH_EXCLUDE="050_${PN}-4.3.14-nopie.patch"
+	fi
+
+	EPATCH_SUFFIX="patch" \
+	EPATCH_FORCE="yes" \
+	epatch "${WORKDIR}/patches"
+
+	#epatch "${FILESDIR}/${PN}-5.0.0_beta1-dont_build_validationkit.patch"
+
+	epatch_user
+}
+
+src_configure() {
+	local myconf
+	use alsa       || myconf+=" --disable-alsa"
+	use doc        || myconf+=" --disable-docs"
+	use java       || myconf+=" --disable-java"
+	use opengl     || myconf+=" --disable-opengl"
+	use pulseaudio || myconf+=" --disable-pulse"
+	use python     || myconf+=" --disable-python"
+	use vboxwebsrv && myconf+=" --enable-webservice"
+	use vnc        && myconf+=" --enable-vnc"
+	if ! use headless ; then
+		use qt4 || myconf+=" --disable-qt4"
+	else
+		myconf+=" --build-headless --disable-opengl"
+	fi
+	if use amd64 && ! has_multilib_profile ; then
+		myconf+=" --disable-vmmraw"
+	fi
+	# not an autoconf script
+	./configure \
+		--with-gcc="$(tc-getCC)" \
+		--with-g++="$(tc-getCXX)" \
+		--disable-kmods \
+		--disable-dbus \
+		--disable-devmapper \
+		${myconf} \
+		|| die "configure failed"
+}
+
+src_compile() {
+	source ./env.sh
+
+	# Force kBuild to respect C[XX]FLAGS and MAKEOPTS (bug #178529)
+	# and strip all flags
+	# strip-flags
+
+	MAKEJOBS=$(echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+')
+	MAKELOAD=$(echo ${MAKEOPTS} | egrep -o '(\-l|\-\-load-average)(=?|[[:space:]]*)[[:digit:]]+')
+	MAKEOPTS="${MAKEJOBS} ${MAKELOAD}"
+	MAKE="kmk" emake \
+		VBOX_BUILD_PUBLISHER=_Gentoo \
+		TOOL_GCC3_CC="$(tc-getCC)" TOOL_GCC3_CXX="$(tc-getCXX)" \
+		TOOL_GCC3_AS="$(tc-getCC)" TOOL_GCC3_AR="$(tc-getAR)" \
+		TOOL_GCC3_LD="$(tc-getCXX)" TOOL_GCC3_LD_SYSMOD="$(tc-getLD)" \
+		TOOL_GCC3_CFLAGS="${CFLAGS}" TOOL_GCC3_CXXFLAGS="${CXXFLAGS}" \
+		VBOX_GCC_OPT="${CXXFLAGS}" \
+		TOOL_YASM_AS=yasm KBUILD_VERBOSE=2 \
+		all
+}
+
+src_install() {
+	cd "${S}"/out/linux.${ARCH}/release/bin || die
+
+	# Create configuration files
+	insinto /etc/vbox
+	newins "${FILESDIR}/${PN}-4-config" vbox.cfg
+
+	# Set the right libdir
+	sed -i \
+		-e "s@MY_LIBDIR@$(get_libdir)@" \
+		"${D}"/etc/vbox/vbox.cfg || die "vbox.cfg sed failed"
+
+	# Symlink binaries to the shipped wrapper
+	exeinto /usr/$(get_libdir)/${PN}
+	newexe "${FILESDIR}/${PN}-ose-3-wrapper" "VBox"
+	fowners root:vboxusers /usr/$(get_libdir)/${PN}/VBox
+	fperms 0750 /usr/$(get_libdir)/${PN}/VBox
+
+	dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VBoxManage
+	dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VBoxVRDP
+	dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VBoxHeadless
+	dosym /usr/$(get_libdir)/${PN}/VBoxTunctl /usr/bin/VBoxTunctl
+
+	# Install binaries and libraries
+	insinto /usr/$(get_libdir)/${PN}
+	doins -r components
+
+	if use sdk ; then
+		doins -r sdk
+	fi
+
+	if use vboxwebsrv ; then
+		doins vboxwebsrv
+		fowners root:vboxusers /usr/$(get_libdir)/${PN}/vboxwebsrv
+		fperms 0750 /usr/$(get_libdir)/${PN}/vboxwebsrv
+		dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/vboxwebsrv
+		newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv
+		newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
+	fi
+
+	#local gcfiles="*gc"
+	#if use amd64 && ! has_multilib_profile ; then
+	#	gcfiles=""
+	#fi
+
+	for each in VBox{Manage,SVC,XPCOMIPCD,Tunctl,ExtPackHelperApp} *so *r0 *.rc ; do
+		doins ${each}
+		fowners root:vboxusers /usr/$(get_libdir)/${PN}/${each}
+		fperms 0750 /usr/$(get_libdir)/${PN}/${each}
+	done
+
+	# VBoxNetAdpCtl and VBoxNetDHCP binaries need to be suid root in any case..
+	for each in VBoxNet{AdpCtl,DHCP,NAT} ; do
+		doins ${each}
+		fowners root:vboxusers /usr/$(get_libdir)/${PN}/${each}
+		fperms 4750 /usr/$(get_libdir)/${PN}/${each}
+	done
+
+	# VBoxSVC and VBoxManage need to be pax-marked (bug #403453)
+	# VBoxXPCOMIPCD (bug #524202)
+	for each in VBox{Manage,SVC,XPCOMIPCD} ; do
+		pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/${each} || die
+	done
+
+	if ! use headless ; then
+		for each in VBox{SDL,Headless} ; do
+			doins ${each}
+			fowners root:vboxusers /usr/$(get_libdir)/${PN}/${each}
+			fperms 4750 /usr/$(get_libdir)/${PN}/${each}
+			pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/${each}
+		done
+
+		if use opengl && use qt4 ; then
+			doins VBoxTestOGL
+			fowners root:vboxusers /usr/$(get_libdir)/${PN}/VBoxTestOGL
+			fperms 0750 /usr/$(get_libdir)/${PN}/VBoxTestOGL
+			pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/VBoxTestOGL
+		fi
+
+		dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VBoxSDL
+
+		if use qt4 ; then
+			doins VirtualBox
+			fowners root:vboxusers /usr/$(get_libdir)/${PN}/VirtualBox
+			fperms 4750 /usr/$(get_libdir)/${PN}/VirtualBox
+			pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/VirtualBox \
+				|| die
+
+			dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VirtualBox
+
+			newmenu "${FILESDIR}"/${PN}-ose.desktop-2 ${PN}.desktop
+		fi
+
+		pushd "${S}"/src/VBox/Resources/OSE &>/dev/null || die
+		for size in 16 32 48 64 128 ; do
+			newicon -s ${size} ${PN}-${size}px.png ${PN}.png
+		done
+		newicon ${PN}-48px.png ${PN}.png
+		popd &>/dev/null || die
+	else
+		doins VBoxHeadless
+		fowners root:vboxusers /usr/$(get_libdir)/${PN}/VBoxHeadless
+		fperms 4750 /usr/$(get_libdir)/${PN}/VBoxHeadless
+		pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/VBoxHeadless || die
+	fi
+
+	insinto /usr/$(get_libdir)/${PN}
+	# Install EFI Firmware files (bug #320757)
+	pushd "${S}"/src/VBox/Devices/EFI/FirmwareBin &>/dev/null || die
+	for fwfile in VBoxEFI{32,64}.fd ; do
+		doins ${fwfile}
+		fowners root:vboxusers /usr/$(get_libdir)/${PN}/${fwfile}
+	done
+	popd &>/dev/null || die
+
+	if use udev ; then
+		# New way of handling USB device nodes for VBox (bug #356215)
+		local udevdir="$(get_udevdir)"
+		insinto ${udevdir}
+		doins VBoxCreateUSBNode.sh
+		fowners root:vboxusers ${udevdir}/VBoxCreateUSBNode.sh
+		fperms 0750 ${udevdir}/VBoxCreateUSBNode.sh
+		insinto ${udevdir}/rules.d
+		doins "${FILESDIR}"/10-virtualbox.rules
+		sed "s@%UDEVDIR%@${udevdir}@" \
+			-i "${D}"${udevdir}/rules.d/10-virtualbox.rules || die
+	fi
+
+	insinto /usr/share/${PN}
+	if ! use headless && use qt4 ; then
+		doins -r nls
+	fi
+
+	# VRDPAuth only works with this (bug #351949)
+	dosym VBoxAuth.so  /usr/$(get_libdir)/${PN}/VRDPAuth.so
+
+	# set an env-variable for 3rd party tools
+	echo -n "VBOX_APP_HOME=/usr/$(get_libdir)/${PN}" > "${T}/90virtualbox"
+	doenvd "${T}/90virtualbox"
+
+	if use java ; then
+		java-pkg_regjar "${D}/usr/$(get_libdir)/${PN}/sdk/bindings/xpcom/java/vboxjxpcom.jar"
+		java-pkg_regso "${D}/usr/$(get_libdir)/${PN}/libvboxjxpcom.so"
+	fi
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+
+	if use udev ; then
+		udevadm control --reload-rules \
+			&& udevadm trigger --subsystem-match=usb
+	fi
+
+	if ! use headless && use qt4 ; then
+		elog "To launch VirtualBox just type: \"VirtualBox\"."
+	fi
+	elog "You must be in the vboxusers group to use VirtualBox."
+	elog ""
+	elog "The latest user manual is available for download at:"
+	elog "http://download.virtualbox.org/virtualbox/${PV}/UserManual.pdf"
+	elog ""
+	elog "For advanced networking setups you should emerge:"
+	elog "net-misc/bridge-utils and sys-apps/usermode-utilities"
+	elog ""
+	elog "IMPORTANT!"
+	elog "If you upgrade from app-emulation/virtualbox-ose make sure to run"
+	elog "\"env-update\" as root and logout and relogin as the user you wish"
+	elog "to run ${PN} as."
+	elog ""
+	elog "Starting with version 4.0.0, ${PN} has USB-1 support."
+	elog "For USB-2 support, PXE-boot ability and VRDP support please emerge"
+	elog "  app-emulation/virtualbox-extpack-oracle"
+	elog "package."
+	elog "Starting with version 5.0.0, ${PN} no longer has the \"additions\" and"
+	elog "the \"extension\" USE flag. For installation of the guest additions ISO"
+	elog "image, please emerge"
+	elog "  app-emulation/virtualbox-additions"
+	elog "and for the USB2, USB3, VRDP and PXE boot ROM modules, please emerge"
+	elog "  app-emulation/virtualbox-extpack-oracle"
+	if ! use udev ; then
+		elog ""
+		elog "WARNING!"
+		elog "Without USE=udev, USB devices will likely not work in ${PN}."
+	elif [ -e "${ROOT}/etc/udev/rules.d/10-virtualbox.rules" ] ; then
+		elog ""
+		elog "Please remove \"${ROOT}/etc/udev/rules.d/10-virtualbox.rules\""
+		elog "or else USB in ${PN} won't work."
+	fi
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}

app-misc/devtodo/devtodo-0.1.20-r3.ebuild

@@ -19,8 +19,8 @@ KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~a
 IUSE=""
 
 RDEPEND="
-	>=sys-libs/ncurses-5.2
-	>=sys-libs/readline-4.1"
+	>=sys-libs/ncurses-5.2:5=
+	>=sys-libs/readline-4.1:0="
 DEPEND="${RDEPEND}"
 
 DOCS=( AUTHORS ChangeLog QuickStart README doc/scripts.sh doc/scripts.tcsh doc/todorc.example )

app-misc/screen/screen-4.2.1-r2.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$
 
@@ -15,7 +15,8 @@ SLOT="0"
 KEYWORDS=" ~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug nethack pam selinux multiuser"
 
-CDEPEND=">=sys-libs/ncurses-5.2
+CDEPEND="
+	>=sys-libs/ncurses-5.2:5=
 	pam? ( virtual/pam )"
 RDEPEND="${CDEPEND}
 	selinux? ( sec-policy/selinux-screen )"

app-misc/screen/screen-4.3.1.ebuild

@@ -15,7 +15,8 @@ SLOT="0"
 KEYWORDS=" ~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug nethack pam selinux multiuser"
 
-CDEPEND=">=sys-libs/ncurses-5.2
+CDEPEND="
+	>=sys-libs/ncurses-5.2:5=
 	pam? ( virtual/pam )"
 RDEPEND="${CDEPEND}
 	selinux? ( sec-policy/selinux-screen )"

app-misc/screen/screen-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$
 
@@ -20,7 +20,8 @@ SLOT="0"
 KEYWORDS=""
 IUSE="debug nethack pam selinux multiuser"
 
-CDEPEND=">=sys-libs/ncurses-5.2
+CDEPEND="
+	>=sys-libs/ncurses-5.2:5=
 	pam? ( virtual/pam )"
 RDEPEND="${CDEPEND}
 	selinux? ( sec-policy/selinux-screen )"

app-portage/ufed/Manifest

@@ -1,5 +1,2 @@
-DIST ufed-0.40.2.tar.bz2 33982 SHA256 d88048e1940ba774d8517e80109cf3f0d93e2113841be9aaad14995da284a3cf SHA512 81b37d92cac9a247c97b8b741410962a5cb55a507d0092863f15d084b00b1482092ab6153277c0d0f4728cdfdbbda41d54431f4d3cf939270ee451f2938a1b3e WHIRLPOOL 36c88488f06b06eea99b1004ee67e69ea579965ae74a37a49e7a9a01fc43dd599a7cc056b270f6f937ab975ce6fd7691acf7ab2a2cde0d4fe0db11dbc01c0fbf
-DIST ufed-0.90_rc1.tar.bz2 51336 SHA256 291c48ed7baa183fac394affaff97d43c448244bfdb0365ac14f650f13e67ee4 SHA512 f1fc03f425d2b7e51d8dba386ae8dfb8b947fb5506270c27f6148d36a8075468b268ef7b0d65f54a44dc9961dc1527050eae310f27472725151468301890d47e WHIRLPOOL ab5a16546171dbea26da098a789baa72c99dcc9bca0e890ae5952478fdcce2e28103e6e20fbad8659ae2addacd3d697d34dbe14df09401ffb46b1f5979163d01
-DIST ufed-0.90_rc2.tar.bz2 51762 SHA256 f85226fffd20e971a9e5c1599e67aa3ae46f10d267eb57f65bba2bfc7321ece8 SHA512 c5ed326596d4c6706ba2a2ad6ecfe0e2700121878fbdb71f4fe7793895649498c3a3bd4e226e5478af6e13d9519ee3e84b3a85dfd47fb986432c6ebb898eae1d WHIRLPOOL 8d639fe966f675b171e420e8ad9b8b30d4beeb62dde6fe4eb0cce7c9a4186035bdedce32d55e9a7a432aafb641e2fb437d72abaa9c64a32337ece961254ae323
 DIST ufed-0.91.tar.bz2 61466 SHA256 1f53be6c2a3dacf3e88f43245fd9775c793236044c85441a6f80bed7ff2f11fd SHA512 34fc57b4d3fd1e8c4226401aec409ce4303294ec9044673ec62053b8dc6ade9d54419a5d208ba6767b75507bc9f8983a401dc258b0bae5b733e7a0c791554c35 WHIRLPOOL 9ee78247430ac3ece6f7e52cadc2305ef409f02c556576a8dea47ba25082b81fc917350854d479363a77558b8b0a312a58d76b233b29510b69e75983bf7515b6
 DIST ufed-0.92.tar.bz2 61606 SHA256 0816d2ba522e1e61ab585c13bb67c33ca037ab3021f958a9e66803d678692405 SHA512 b1a608d026945144653f43ad322e54f0f1192d39fea3da2a4919e07de65445c75aa5e2d1e8cf9b24849c45f891a0de5952c92b3227f6c1200965f3c280611408 WHIRLPOOL 388ed787bf5743fa8d431b3cdbb97fb01106057b74b0dd6bac97fd89b213b400ecd2626f690ae06e7d77edf1cdc72b6a4dfaf07db6eef59a02be0b3e84a4487d

app-portage/ufed/ufed-0.40.2-r1.ebuild

@@ -1,44 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit base multilib autotools prefix
-
-DESCRIPTION="Gentoo Linux USE flags editor"
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2
-	http://dev.gentoo.org/~fuzzyray/distfiles/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND="sys-libs/ncurses"
-RDEPEND="${DEPEND}
-	dev-lang/perl"
-
-# Populate the patches array for patches applied for -rX releases
-# It is an array of patch file names of the form:
-# "${FILESDIR}"/${P}-make.globals-path.patch
-PATCHES=(
-	"${FILESDIR}"/${P}-prefix.patch
-	"${FILESDIR}"/${P}-manpage-URL.patch
-)
-
-src_prepare() {
-	base_src_prepare
-	# Change the version number to reflect the ebuild version
-	sed -i "s:,\[git\],:,\[${PVR}\],:" configure.ac
-	eprefixify ufed.8
-	eautoreconf
-}
-src_configure() {
-	econf --libexecdir="${EPREFIX}"/usr/$(get_libdir)/ufed
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-}

app-portage/ufed/ufed-0.90_rc1.ebuild

@@ -1,37 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit base eutils multilib autotools
-
-DESCRIPTION="Gentoo Linux USE flags editor"
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2
-	http://dev.gentoo.org/~fuzzyray/distfiles/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND="sys-libs/ncurses"
-RDEPEND="${DEPEND}
-	dev-lang/perl"
-
-# Populate the patches array for patches applied for -rX releases
-# It is an array of patch file names of the form:
-# "${FILESDIR}"/${P}-make.globals-path.patch
-PATCHES=()
-
-src_prepare() {
-	base_src_prepare
-	# Change the version number to reflect the ebuild version
-	sed -i "s:,\[git\],:,\[${PVR}\],:" configure.ac
-	eautoreconf
-}
-
-src_configure() {
-	econf --libexecdir="${EPREFIX}"/usr/$(get_libdir)/ufed
-}

app-portage/ufed/ufed-0.90_rc2-r1.ebuild

@@ -1,41 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit base eutils multilib autotools
-
-DESCRIPTION="Gentoo Linux USE flags editor"
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2
-	http://dev.gentoo.org/~fuzzyray/distfiles/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE=""
-
-COMMON_DEPEND="sys-libs/ncurses"
-RDEPEND="${COMMON_DEPEND}
-	dev-lang/perl"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig"
-
-# Populate the patches array for patches applied for -rX releases
-# It is an array of patch file names of the form:
-# "${FILESDIR}"/${P}-make.globals-path.patch
-PATCHES=(
-	"${FILESDIR}"/${P}-get_portdir_from_portageq.patch
-)
-
-src_prepare() {
-	base_src_prepare
-	# Change the version number to reflect the ebuild version
-	sed -i "s:,\[git\],:,\[${PVR}\],:" configure.ac
-	eautoreconf
-}
-
-src_configure() {
-	econf --libexecdir="${EPREFIX}"/usr/$(get_libdir)/ufed
-}

app-portage/ufed/ufed-0.90_rc2.ebuild

@@ -1,39 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit base eutils multilib autotools
-
-DESCRIPTION="Gentoo Linux USE flags editor"
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2
-	http://dev.gentoo.org/~fuzzyray/distfiles/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE=""
-
-COMMON_DEPEND="sys-libs/ncurses"
-RDEPEND="${COMMON_DEPEND}
-	dev-lang/perl"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig"
-
-# Populate the patches array for patches applied for -rX releases
-# It is an array of patch file names of the form:
-# "${FILESDIR}"/${P}-make.globals-path.patch
-PATCHES=()
-
-src_prepare() {
-	base_src_prepare
-	# Change the version number to reflect the ebuild version
-	sed -i "s:,\[git\],:,\[${PVR}\],:" configure.ac
-	eautoreconf
-}
-
-src_configure() {
-	econf --libexecdir="${EPREFIX}"/usr/$(get_libdir)/ufed
-}

app-portage/ufed/ufed-0.91.ebuild

@@ -16,7 +16,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE=""
 
-COMMON_DEPEND="sys-libs/ncurses"
+COMMON_DEPEND="sys-libs/ncurses:5="
 RDEPEND="${COMMON_DEPEND}
 	dev-lang/perl"
 DEPEND="${COMMON_DEPEND}

app-portage/ufed/ufed-0.92.ebuild

@@ -4,7 +4,7 @@
 
 EAPI=5
 
-inherit base eutils multilib autotools
+inherit eutils multilib autotools
 
 DESCRIPTION="Gentoo Linux USE flags editor"
 HOMEPAGE="http://www.gentoo.org/"
@@ -16,7 +16,7 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE=""
 
-COMMON_DEPEND="sys-libs/ncurses"
+COMMON_DEPEND="sys-libs/ncurses:5="
 RDEPEND="${COMMON_DEPEND}
 	dev-lang/perl"
 DEPEND="${COMMON_DEPEND}
@@ -28,7 +28,7 @@ DEPEND="${COMMON_DEPEND}
 PATCHES=()
 
 src_prepare() {
-	base_src_prepare
+	# epatch "${PATCHES[@]}"
 	# Change the version number to reflect the ebuild version
 	sed -i "s:,\[git\],:,\[${PVR}\],:" configure.ac
 	eautoreconf

app-portage/ufed/ufed-9999.ebuild

@@ -2,22 +2,21 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=4
+EAPI=5
 
-inherit eutils multilib git-2 autotools
-
-EGIT_REPO_URI="git://anongit.gentoo.org/proj/ufed.git"
+inherit eutils multilib git-r3 autotools
 
 DESCRIPTION="Gentoo Linux USE flags editor"
 HOMEPAGE="http://www.gentoo.org/"
 SRC_URI=""
+EGIT_REPO_URI="git://anongit.gentoo.org/proj/ufed.git"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
 IUSE=""
 
-COMMON_DEPEND="sys-libs/ncurses"
+COMMON_DEPEND="sys-libs/ncurses:5="
 RDEPEND="${COMMON_DEPEND}
 	dev-lang/perl"
 DEPEND="${COMMON_DEPEND}

app-shells/bash/bash-4.3_p39.ebuild

@@ -38,7 +38,7 @@ SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline vanilla"
 
 DEPEND=">=sys-libs/ncurses-5.2-r2

app-shells/bash/bash-4.4_alpha-r1.ebuild

@@ -43,7 +43,7 @@ SLOT="0"
 #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline vanilla"
 
-DEPEND=">=sys-libs/ncurses-5.2-r2:=
+DEPEND=">=sys-libs/ncurses-5.2-r2:5=
 	readline? ( >=sys-libs/readline-${READLINE_VER}_alpha:0= )
 	nls? ( virtual/libintl )"
 RDEPEND="${DEPEND}

app-text/multitail/multitail-6.2.1.ebuild

@@ -15,7 +15,7 @@ SLOT="0"
 KEYWORDS="amd64 hppa ia64 ppc sparc x86 ~x86-interix ~amd64-linux ~x86-linux"
 IUSE="debug examples unicode"
 
-RDEPEND="sys-libs/ncurses[unicode?]"
+RDEPEND="sys-libs/ncurses:5=[unicode?]"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 RESTRICT="test" # bug #492270

app-text/multitail/multitail-6.3.ebuild

@@ -16,7 +16,7 @@ KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-lin
 IUSE="debug examples unicode"
 
 RDEPEND="
-	sys-libs/ncurses[unicode?]
+	sys-libs/ncurses:5=[unicode?]
 	"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"

app-text/multitail/multitail-6.4.1.ebuild

@@ -15,7 +15,7 @@ KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-lin
 IUSE="debug examples unicode"
 
 RDEPEND="
-	sys-libs/ncurses[unicode?]
+	sys-libs/ncurses:5=[unicode?]
 "
 DEPEND="
 	${RDEPEND}

app-text/pinfo/metadata.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>jer@gentoo.org</email>
-</maintainer>
+	<maintainer>
+		<email>jer@gentoo.org</email>
+	</maintainer>
 </pkgmetadata>

app-text/pinfo/pinfo-0.6.10-r5.ebuild

@@ -3,6 +3,7 @@
 # $Id$
 
 EAPI=5
+
 inherit autotools eutils flag-o-matic
 
 DESCRIPTION="Hypertext info and man viewer based on (n)curses"
@@ -14,7 +15,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="nls readline"
 
-RDEPEND="sys-libs/ncurses:=
+RDEPEND="sys-libs/ncurses:5=
 	sys-libs/readline:0=
 	nls? ( virtual/libintl )
 "

app-text/teseq/Manifest

@@ -0,0 +1 @@
+DIST teseq-1.1.1.tar.xz 240256 SHA256 230d2b4a587542284c415b33557a27774f5ad1580ed9db272bcd1e2034ea0589 SHA512 c7747c734e640f7cc607389e001ab2cb9e368b504bd41406eea4dd7ba8bfead79659c68b148e33e797b843e9a46de38d104172303329b88e3fde0266aa1ffd7c WHIRLPOOL ad8eade357f9bbd6a53acc16d12b8088de4c9297604553edcfb10b9d920d479d92cb422c6c7160f13359b1e7934ec9a630215239d76bbc94118c8e2c3611ae4d

app-text/teseq/metadata.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+<email>jer@gentoo.org</email>
+</maintainer>
+</pkgmetadata>

app-text/teseq/teseq-1.1.1.ebuild

@@ -0,0 +1,13 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+DESCRIPTION="a tool for analyzing files that contain control characters and terminal control sequences"
+HOMEPAGE="http://www.gnu.org/software/teseq/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"

dev-db/lmdb/metadata.xml

@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<longdescription lang="en">
+	<longdescription lang="en">
 	An ultra-fast, ultra-compact key-value embedded data store
 </longdescription>
-<herd>ldap</herd>
-<maintainer>
-	<email>eras@gentoo.org</email>
-	<name>Eray Aslan</name>
-</maintainer>
+	<herd>ldap</herd>
+	<maintainer>
+		<email>eras@gentoo.org</email>
+		<name>Eray Aslan</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">LMDB/lmdb</remote-id>
+	</upstream>
 </pkgmetadata>

dev-db/mariadb/mariadb-10.0.21.ebuild

@@ -11,7 +11,7 @@ inherit toolchain-funcs mysql-multilib
 IUSE="$IUSE"
 
 # REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
 # When MY_EXTRAS is bumped, the index should be revised to exclude these.
 EPATCH_EXCLUDE=''

dev-db/maxscale/metadata.xml

@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>mysql</herd>
-<maintainer>
-	<email>grknight@gentoo.org</email>
-	<name>Brian Evans</name>
-</maintainer>
-<use>
-  <flag name='jemalloc'>Use dev-libs/jemalloc for allocations</flag>
-  <flag name='rabbitmq'>Add support for RabbitMQ message queue</flag>
-</use>
+	<herd>mysql</herd>
+	<maintainer>
+		<email>grknight@gentoo.org</email>
+		<name>Brian Evans</name>
+	</maintainer>
+	<use>
+		<flag name="jemalloc">Use dev-libs/jemalloc for allocations</flag>
+		<flag name="rabbitmq">Add support for RabbitMQ message queue</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">mariadb-corporation/MaxScale</remote-id>
+	</upstream>
 </pkgmetadata>

dev-db/mysql-connector-c/mysql-connector-c-6.1.6-r1.ebuild

@@ -20,7 +20,7 @@ LICENSE="GPL-2"
 
 SRC_URI="mirror://mysql/Downloads/Connector-C/${P}-src.tar.gz"
 S="${WORKDIR}/${P}-src"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ia64 ~x86"
 
 SLOT="0/18"
 IUSE="+ssl static-libs"

dev-dotnet/mono-addins/metadata.xml

@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>dotnet</herd>
+	<herd>dotnet</herd>
+	<upstream>
+		<remote-id type="github">mono/mono-addins</remote-id>
+	</upstream>
 </pkgmetadata>

dev-dotnet/nuget/metadata.xml

@@ -4,4 +4,7 @@
   <herd>dotnet</herd>
   <use>
   </use>
+  <upstream>
+    <remote-id type="github">mrward/nuget</remote-id>
+  </upstream>
 </pkgmetadata>

dev-dotnet/xdt-for-monodevelop/metadata.xml

@@ -4,4 +4,7 @@
   <herd>dotnet</herd>
   <use>
   </use>
+  <upstream>
+    <remote-id type="github">mrward/xdt</remote-id>
+  </upstream>
 </pkgmetadata>

dev-haskell/ekg-json/metadata.xml

@@ -7,4 +7,7 @@
 		ekg package, thus allowing ekg metrics to be served by other HTTP
 		servers than the one used by the ekg package.
 	</longdescription>
+	<upstream>
+		<remote-id type="github">tibbe/ekg-json</remote-id>
+	</upstream>
 </pkgmetadata>

dev-haskell/fdo-notify/metadata.xml

@@ -3,8 +3,11 @@
 <pkgmetadata>
 	<herd>haskell</herd>
 	<longdescription>
-		A library for issuing notifications using FreeDesktop.org&#39;s Desktop
+		A library for issuing notifications using FreeDesktop.org's Desktop
 		Notifications protcol. This protocol is supported by services such
-		as Ubuntu&#39;s NotifyOSD.
+		as Ubuntu's NotifyOSD.
 	</longdescription>
+	<upstream>
+		<remote-id type="bitbucket">taejo/fdo-notify</remote-id>
+	</upstream>
 </pkgmetadata>

dev-haskell/fsnotify/metadata.xml

@@ -8,4 +8,7 @@
 		existing libraries for platform-specific Window, Mac,
 		and Linux filesystem event notification.
 	</longdescription>
+	<upstream>
+		<remote-id type="github">haskell-fswatch/hfsnotify</remote-id>
+	</upstream>
 </pkgmetadata>

dev-java/ant-apache-xalan2/ant-apache-xalan2-1.9.2-r1.ebuild

@@ -8,7 +8,7 @@ ANT_TASK_DEPNAME="xalan"
 
 inherit ant-tasks
 
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND="dev-java/xalan:0
 	dev-java/xalan-serializer:0"

dev-java/ant-apache-xalan2/ant-apache-xalan2-1.9.2.ebuild

@@ -1,18 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-ANT_TASK_DEPNAME="xalan"
-
-inherit ant-tasks
-
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-DEPEND="dev-java/xalan"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	ant-tasks_src_unpack all
-}

dev-java/cofoja/metadata.xml

@@ -4,6 +4,7 @@
 	<herd>java</herd>
 	<upstream>
 		<remote-id type="google-code">cofoja</remote-id>
+		<remote-id type="github">nhatminhle/cofoja</remote-id>
 	</upstream>
 	<maintainer>
 		<email>monsieurp@gentoo.org</email>

dev-java/commons-collections/commons-collections-3.2.1-r1.ebuild

@@ -13,7 +13,7 @@ SRC_URI="mirror://apache/${PN/-//}/source/${P}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="test-framework"
 
 CDEPEND="

dev-java/commons-logging/commons-logging-1.2.ebuild

@@ -13,7 +13,7 @@ SRC_URI="mirror://apache/commons/logging/source/${P}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="avalon-logkit log4j servletapi avalon-framework"
 
 COMMON_DEP="

dev-java/guice/metadata.xml

@@ -4,6 +4,6 @@
 	<herd>java</herd>
 	<upstream>
 		<remote-id type="google-code">google-guice</remote-id>
+		<remote-id type="github">google/guice</remote-id>
 	</upstream>
 </pkgmetadata>
-

dev-java/javacsv/metadata.xml

@@ -6,5 +6,7 @@
 		<email>monsieurp@gentoo.org</email>
 		<name>Patrice Clement</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">javacsv</remote-id>
+	</upstream>
 </pkgmetadata>
-

dev-java/kxml/kxml-2.3.0.ebuild

@@ -9,10 +9,10 @@ JAVA_PKG_IUSE="doc examples source"
 inherit eutils java-pkg-2 java-ant-2
 
 DESCRIPTION="Small XML pull parser for constrained environments such as Applets, Personal Java or MIDP devices"
-HOMEPAGE="http://${PN}.sourceforge.net/"
+HOMEPAGE="http://kxml.org/"
 SRC_URI="mirror://sourceforge/${PN}/${PN}2-src-${PV}.zip"
 
-LICENSE="MIT"
+LICENSE="BSD"
 SLOT="2"
 KEYWORDS="~amd64"
 

dev-java/slf4j-ext/slf4j-ext-1.7.7.ebuild

@@ -14,7 +14,7 @@ SRC_URI="http://www.slf4j.org/dist/${P/-ext/}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 COMMON_DEP="dev-java/slf4j-api:0

dev-java/slf4j-simple/slf4j-simple-1.7.7.ebuild

@@ -13,7 +13,7 @@ SRC_URI="http://www.slf4j.org/dist/${P/-simple/}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 COMMON_DEP="dev-java/slf4j-api:0"

dev-java/tomcat-servlet-api/Manifest

@@ -3,5 +3,7 @@ DIST apache-tomcat-5.5.27-src.tar.gz 7382057 SHA256 90bc8abcddda604e855c37035653
 DIST apache-tomcat-5.5.34-src.tar.gz 3720299 SHA256 a52e7f2abf0fbdd9665ca398d2b39f99b80683b0ee43c72751390e88dcd6114d SHA512 4c8616f839a3c413ffef45b7b6876f123cbda37f4029db96ac1c8f259a75f0d65cdb5709468d89e731e5436b011dac4ee3e9dc397adfc9ad4d0b1bc462c8e519 WHIRLPOOL 25e987b58af5535914b666a5bb8691146d68b2287796ba25b8a5f792df08f55901a7ea3f419602207f7a8168302b080592bde5f4aeb67b58f40e5da00b8049ad
 DIST apache-tomcat-6.0.44-src.tar.gz 3447711 SHA256 c6f01526d58f2ba7b9da496e959d9e68cc49183006077704ab91c36ebebf5a4a SHA512 0d6a1539b28fa8ca3442557889d7d21cc523b18136f6998820ba13f41420536aba65ce78bac526002ee1dd86df3cbc80d9f043a3f765d7cf0b79e58e516030be WHIRLPOOL c65e704466191a0f98ec777e95dda889599ff6a545e7c013fd04bc0b72e0d0edf4491415f243d6a4de60cf76abe5c13ffbcc6d98f78b51490f7b7b43b24ecb97
 DIST apache-tomcat-7.0.59-src.tar.gz 4687344 SHA256 3a1dedda4019db87464fca3aeb4e800a538f0baee96d8b14c9d64967b0d2ea44 SHA512 acc322eee1446dd1bff72910ae9f40a62f88332ee69d6057b3c684e2abf8f28e6df6ab9505900f0b0cf7a5e2e0e80e64b0a790b3b78594ce595ce897706b4bcb WHIRLPOOL 4948964c1746e6ee912ac72c901ba271793610f402bf082455d104e2e8d6dbfa0bf5371d42d48d8ad7c826271fa60d989119a01e700497099022d0cf3564fdff
+DIST apache-tomcat-7.0.63-src.tar.gz 4577737 SHA256 443aa92f2668906fb24cc43ba952068240f445df637a6e5da8d4661527536657 SHA512 677b28aa0131d309aed83afc73a778c16fd27a187e971ea6929b9b6b65268caa2a67cc468b15565a7d5944a60e8528cc26c82437b476ebc41ff9556367349d8a WHIRLPOOL a208ac63ed6f7ce7ac23674d8bb20d523b3fb5d10dfb46d292004f9b296986c4cab690f0252ad53bb4c625c3f58e04b9ddcda5a580fdafea20118b93f544760c
 DIST apache-tomcat-8.0.23-src.tar.gz 4868650 SHA256 6293713e78da9bb803060c8ddff982f8f7aef5a2e4b325340088493ce9957ba4 SHA512 cc83194b2847fc2db5448d548c7e65a1198cda02726b070f913a762d324152315886fba09532b879e26d15ec57e04057cc30b3a686b2a2307d6447d17f84e16c WHIRLPOOL b0559a4ef1b4c1f0683e4cce976d31db175d3c4f4d2b809b127e1074d49a6bf764366cc3e91f9a0818afd6de35e662a7aab89866dfd2e61673327c50535bff88
+DIST apache-tomcat-8.0.24-src.tar.gz 4888751 SHA256 184b0d8bda512204a2e565f9175a13f9772a9d13185e1aa228394b45c641474c SHA512 af5619a63db3d1f6d39eb0290c83a38272c31803ee39a40aebfba5f7a0cf67d830ffcbebe518aff8de4a1f8eb44021975d7e43d45b4bd9804e8ca9cfbfc4904a WHIRLPOOL 4d37f4d1fe3ee138252813bd4a65025d0ccceea8aec57aa0c9474ad4902f85938627277f6e4ece30793326c31d7790b0ca0b8d99d7b21857519d7c22c28794e8
 DIST jakarta-servletapi-src.tar.gz 65342 SHA256 404e2c55423c609122921a91e03f2b67d371fedc0af8996e005862d83d626697 SHA512 7dad5a52ab6bfca4b052d60a48fc89ce22a5eb790584671f24d8d22b163f2dffe93bea58caebc6b4ecb0bd8434a074c88f640aa57daa1cefbf47d74df758c084 WHIRLPOOL beb0e14920a8623d276c8823e6291aacb4b4d5d0539f5de431ce6f94582df9b260d4e04e0d0b650c59f7ca168f4af9352fffbfc0506b2530464a3bcdcf6ac0d1

dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.63.ebuild

@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+JAVA_PKG_IUSE="source"
+
+inherit eutils java-pkg-2 java-ant-2
+
+MY_A="apache-${P}-src"
+MY_P="${MY_A/-servlet-api/}"
+DESCRIPTION="Tomcat's Servlet API 3.0/JSP API 2.2 implementation"
+HOMEPAGE="http://tomcat.apache.org/"
+SRC_URI="mirror://apache/tomcat/tomcat-7/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="3.0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.6"
+RDEPEND=">=virtual/jre-1.6"
+
+S="${WORKDIR}/${MY_P}/"
+
+java_prepare() {
+	cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml"
+	rm -fR */*/build.xml ||die
+	find "${S}" '(' -name '*.class' -o -name '*.jar' ')' -exec rm -frv {} + || die
+}
+
+src_install() {
+	java-pkg_dojar "${S}"/output/build/lib/*.jar
+	use source && java-pkg_dosrc java/javax/servlet/
+}

dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.24.ebuild

@@ -0,0 +1,36 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+JAVA_PKG_IUSE="source"
+
+inherit eutils java-pkg-2 java-ant-2
+
+MY_A="apache-${P}-src"
+MY_P="${MY_A/-servlet-api/}"
+DESCRIPTION="Tomcat's Servlet API 3.1/JSP API 2.3 implementation"
+HOMEPAGE="http://tomcat.apache.org/"
+SRC_URI="mirror://apache/tomcat/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="3.1"
+KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.7"
+RDEPEND=">=virtual/jre-1.7"
+
+S="${WORKDIR}/${MY_P}/"
+
+java_prepare() {
+	cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml"
+	rm -fR */*/build.xml
+	einfo "Removing bundled jars and classes"
+	find "${S}" '(' -name '*.class' -o -name '*.jar' ')' -exec rm -frv {} +
+}
+
+src_install() {
+	java-pkg_dojar "${S}"/output/build/lib/*.jar
+	use source && java-pkg_dosrc java/javax/servlet/
+}

dev-lang/helium/files/helium-1.8.1-ghc-7.10.patch

@@ -0,0 +1,55 @@
+diff --git a/src/Helium/Parser/LexerMonad.hs b/src/Helium/Parser/LexerMonad.hs
+index 75ac077..af35093 100644
+--- a/src/Helium/Parser/LexerMonad.hs
++++ b/src/Helium/Parser/LexerMonad.hs
+@@ -20,2 +20,4 @@ import Helium.Parser.LexerMessage
+ import Text.ParserCombinators.Parsec.Pos
++import Control.Applicative
++import Control.Monad
+ 
+@@ -47,2 +49,9 @@ returnLM x = LM (\_ pos brackets -> Right (x, [], pos, brackets))
+ 
++instance Functor LexerMonad where
++    fmap  = liftM
++
++instance Applicative LexerMonad where
++    pure  = return
++    (<*>) = ap  -- defined in Control.Monad
++
+ instance Monad LexerMonad where
+diff --git a/src/Helium/StaticAnalysis/Heuristics/OnlyResultHeuristics.hs b/src/Helium/StaticAnalysis/Heuristics/OnlyResultHeuristics.hs
+index 880ac0b..90574f0 100644
+--- a/src/Helium/StaticAnalysis/Heuristics/OnlyResultHeuristics.hs
++++ b/src/Helium/StaticAnalysis/Heuristics/OnlyResultHeuristics.hs
+@@ -1 +1,2 @@
++{-# LANGUAGE FlexibleContexts #-}
+ {-| Module      :  OnlyResultHeuristics
+diff --git a/src/Helium/StaticAnalysis/Heuristics/RepairHeuristics.hs b/src/Helium/StaticAnalysis/Heuristics/RepairHeuristics.hs
+index 89e43f2..251406f 100644
+--- a/src/Helium/StaticAnalysis/Heuristics/RepairHeuristics.hs
++++ b/src/Helium/StaticAnalysis/Heuristics/RepairHeuristics.hs
+@@ -1 +1,2 @@
++{-# LANGUAGE FlexibleContexts #-}
+ {-| Module      :  RepairHeuristics
+diff --git a/src/Helium/StaticAnalysis/Heuristics/TieBreakerHeuristics.hs b/src/Helium/StaticAnalysis/Heuristics/TieBreakerHeuristics.hs
+index d0b01a3..ba7ca19 100644
+--- a/src/Helium/StaticAnalysis/Heuristics/TieBreakerHeuristics.hs
++++ b/src/Helium/StaticAnalysis/Heuristics/TieBreakerHeuristics.hs
+@@ -1 +1,2 @@
++{-# LANGUAGE FlexibleContexts #-}
+ {-| Module      :  TieBreakerHeuristics
+diff --git a/src/Helium/StaticAnalysis/Heuristics/UnifierHeuristics.hs b/src/Helium/StaticAnalysis/Heuristics/UnifierHeuristics.hs
+index c2e91f5..493c882 100644
+--- a/src/Helium/StaticAnalysis/Heuristics/UnifierHeuristics.hs
++++ b/src/Helium/StaticAnalysis/Heuristics/UnifierHeuristics.hs
+@@ -1 +1,2 @@
++{-# LANGUAGE FlexibleContexts #-}
+ {-| Module      :  UnifierHeuristics
+diff --git a/src/Helium/Syntax/UHA_Pretty.hs b/src/Helium/Syntax/UHA_Pretty.hs
+index af970dc..ee42a48 100644
+--- a/src/Helium/Syntax/UHA_Pretty.hs
++++ b/src/Helium/Syntax/UHA_Pretty.hs
+@@ -17,2 +17,3 @@ import Control.Monad.Identity (Identity)
+ import qualified Control.Monad.Identity
++import Prelude hiding ((<$>))
+ 

dev-lang/helium/helium-1.8.1.ebuild

@@ -30,3 +30,7 @@ RDEPEND=">=dev-haskell/lvmlib-1.1:=[profile?]
 DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-1.10.1.0
 "
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.8.1-ghc-7.10.patch
+}

dev-lang/mono/mono-3.12.1.ebuild

@@ -115,3 +115,13 @@ src_test() {
 	cd mcs/tests || die
 	emake check
 }
+
+src_install() {
+	autotools-utils_src_install
+
+	# Remove files not respecting LDFLAGS and that we are not supposed to provide, see Fedora
+	# mono.spec and http://www.mail-archive.com/mono-devel-list@lists.ximian.com/msg24870.html
+	# for reference.
+	rm -f "${ED}"/usr/lib/mono/{2.0,4.5}/mscorlib.dll.so || die
+	rm -f "${ED}"/usr/lib/mono/{2.0,4.5}/mcs.exe.so || die
+}

dev-lang/mono/mono-4.0.3.20.ebuild

@@ -104,3 +104,13 @@ src_test() {
 	cd mcs/tests || die
 	emake check
 }
+
+src_install() {
+	autotools-utils_src_install
+
+	# Remove files not respecting LDFLAGS and that we are not supposed to provide, see Fedora
+	# mono.spec and http://www.mail-archive.com/mono-devel-list@lists.ximian.com/msg24870.html
+	# for reference.
+	rm -f "${ED}"/usr/lib/mono/{2.0,4.5}/mscorlib.dll.so || die
+	rm -f "${ED}"/usr/lib/mono/{2.0,4.5}/mcs.exe.so || die
+}

dev-lang/php/php-5.4.44.ebuild

@@ -6,7 +6,7 @@ EAPI=5
 
 inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool systemd
 
-KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 function php_get_uri ()
 {

dev-lang/php/php-5.5.28.ebuild

@@ -6,7 +6,7 @@ EAPI=5
 
 inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool systemd
 
-KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 function php_get_uri ()
 {

dev-lang/php/php-5.6.12.ebuild

@@ -6,7 +6,7 @@ EAPI=5
 
 inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool systemd
 
-KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 function php_get_uri ()
 {

dev-lang/ruby/metadata.xml

@@ -23,7 +23,7 @@
     <flag name="rdoc">
       Install <pkg>dev-ruby/rdoc</pkg> after installing Ruby.
     </flag>
-	<flag name="jemalloc">
+    <flag name="jemalloc">
 	  Use <pkg>dev-libs/jemalloc</pkg> for memory allocation.
 	</flag>
   </use>

dev-lang/ruby/ruby-2.0.0_p645.ebuild

@@ -41,7 +41,7 @@ RDEPEND="
 	gdbm? ( sys-libs/gdbm )
 	ssl? ( dev-libs/openssl:0 )
 	socks5? ( >=net-proxy/dante-1.1.13 )
-	ncurses? ( sys-libs/ncurses )
+	ncurses? ( sys-libs/ncurses:5= )
 	readline?  ( sys-libs/readline:0 )
 	dev-libs/libyaml
 	virtual/libffi

dev-lang/ruby/ruby-2.1.6-r1.ebuild

@@ -42,7 +42,7 @@ RDEPEND="
 	gdbm? ( sys-libs/gdbm )
 	ssl? ( dev-libs/openssl:0 )
 	socks5? ( >=net-proxy/dante-1.1.13 )
-	ncurses? ( sys-libs/ncurses )
+	ncurses? ( sys-libs/ncurses:5= )
 	readline?  ( sys-libs/readline:0 )
 	dev-libs/libyaml
 	virtual/libffi

dev-lang/ruby/ruby-2.2.2-r1.ebuild

@@ -40,7 +40,7 @@ RDEPEND="
 	jemalloc? ( dev-libs/jemalloc )
 	ssl? ( dev-libs/openssl:0 )
 	socks5? ( >=net-proxy/dante-1.1.13 )
-	ncurses? ( sys-libs/ncurses )
+	ncurses? ( sys-libs/ncurses:5= )
 	readline?  ( sys-libs/readline:0 )
 	dev-libs/libyaml
 	virtual/libffi

dev-libs/efl/efl-1.15.0.ebuild

@@ -73,7 +73,7 @@ RDEPEND="
 	tslib? ( x11-libs/tslib )
 	valgrind? ( dev-util/valgrind )
 	wayland? (
-		>=dev-libs/wayland-1.3.0
+		>=dev-libs/wayland-1.8.0
 		>=x11-libs/libxkbcommon-0.3.1
 		media-libs/mesa[gles2,wayland]
 	)

dev-libs/efl/efl-9999.ebuild

@@ -73,7 +73,7 @@ RDEPEND="
 	tslib? ( x11-libs/tslib )
 	valgrind? ( dev-util/valgrind )
 	wayland? (
-		>=dev-libs/wayland-1.3.0
+		>=dev-libs/wayland-1.8.0
 		>=x11-libs/libxkbcommon-0.3.1
 		media-libs/mesa[gles2,wayland]
 	)

dev-libs/grantlee/grantlee-5.0.0.ebuild

@@ -13,7 +13,7 @@ SRC_URI="http://downloads.grantlee.org/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="5"
-KEYWORDS="~amd64 ~arm"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE="debug doc test"
 
 RDEPEND="

dev-libs/iniparser/metadata.xml

@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>samba</herd>
-<maintainer>
-	<email>samba@gentoo.org</email>
-	<name>Samba Team</name>
-</maintainer>
+	<herd>samba</herd>
+	<maintainer>
+		<email>samba@gentoo.org</email>
+		<name>Samba Team</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">ndevilla/iniparser</remote-id>
+	</upstream>
 </pkgmetadata>

dev-libs/libcdio/libcdio-0.92.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$
 
@@ -16,7 +16,7 @@ IUSE="cddb +cxx minimal static-libs test"
 
 RDEPEND="
 	!minimal? (
-		>=sys-libs/ncurses-5.7-r7
+		>=sys-libs/ncurses-5.7-r7:5=
 		cddb? ( >=media-libs/libcddb-1.3.2 )
 	)
 	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]

dev-libs/libcdio/libcdio-0.93.ebuild

@@ -16,7 +16,7 @@ IUSE="cddb +cxx minimal static-libs test"
 
 RDEPEND="
 	!minimal? (
-		>=sys-libs/ncurses-5.7-r7
+		>=sys-libs/ncurses-5.7-r7:5=
 		cddb? ( >=media-libs/libcddb-1.3.2 )
 	)
 	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]

dev-libs/wayland/Manifest

@@ -9,3 +9,4 @@ DIST wayland-1.5.0.tar.xz 404644 SHA256 0069e1e9af888b3e05384380ad8cc6c976ea3e81
 DIST wayland-1.6.0.tar.xz 415192 SHA256 a7d5102dcf53d08c059d24bc62de491d7cd482070abeb6737a20d0d86ba6fc7f SHA512 11fc8cb90f00a07b9952c073f1d18bf53284a46b4cc3aa5c71ed33cf509fca0cdf45afbdb852461a7fae236424b1be0e5314a2bbde8a59de2ab81246960da055 WHIRLPOOL 376a4023e47cf5ce624b4d724386b5b8e6cce0696bed8103301cf72fa816bd144e5f3f346a71a3776a1ee922f52fd26060d5b021bf0c7d2ee68fefbe0fe4ea1e
 DIST wayland-1.6.1.tar.xz 418628 SHA256 d1aeb95b433cab33a928b56cb80efa551802e0a064adb4a8ea1517249d3c10b0 SHA512 28a0980ece2fb4ba0ca688f3913ffba34c2741167d7686be80cfbc9cb56f995282a68173d69d2849eb5c2986684ebe6d5cfaca04518ab74a4512c8dfb4d8d0c2 WHIRLPOOL be307a292c8f939921700fc85c9ad1675c491fdc3e1a16ffc52512e39d971f6afdbd378c60c57a64781cdccb364ed77271e07b64f5c3b7b96abd45a1595dfc4e
 DIST wayland-1.7.0.tar.xz 372004 SHA256 bdea47a2db96f7e53f1ce0351559c0af5b7f7aae7e95f0a884a78af9f1057c9c SHA512 2475a5e8c2ef5c4bc97d90f946a89e4155d840a342886a7634df5423e5764973dbf5d721e1a8a941b7bd2305017cdcb74af7a29bee7bb8b58373306e5c03add7 WHIRLPOOL 152be0d1c3ac314cd3dcd765e6a04eaa71b618b1577c423147ccb5b1d82cdeaf09d09c8933746e6bd100b2d59374749084eede36b9075a153328fda179955ea2
+DIST wayland-1.8.1.tar.xz 374116 SHA256 f17c938d1c24fd0a10f650a623a2775d329db3168b5732e498b08388ec776fc8 SHA512 392edd22203fc44a37a66d7a099d0534f047f49e91b28614092346f0167c07a39431c5919f2ea1deaf460dc53a77fba8504a7a7f5d03af638267c767bb07ae19 WHIRLPOOL f15ea109324c0c84b848f458acb6786248fb1c7ee8dafd6ef945d4f80f5b87b911dd2d2c0485b1ceeeed95454990e186e7d8b04d366f903954dd8998a1f3999f

dev-libs/wayland/wayland-1.8.1.ebuild

@@ -0,0 +1,62 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+if [[ ${PV} == 9999* ]]; then
+	EGIT_REPO_URI="git://anongit.freedesktop.org/git/${PN}/${PN}"
+	GIT_ECLASS="git-r3"
+	EXPERIMENTAL="true"
+	AUTOTOOLS_AUTORECONF=1
+fi
+
+inherit autotools-multilib toolchain-funcs $GIT_ECLASS
+
+DESCRIPTION="Wayland protocol libraries"
+HOMEPAGE="http://wayland.freedesktop.org/"
+
+if [[ ${PV} == 9999* ]]; then
+	SRC_URI="${SRC_PATCHES}"
+else
+	SRC_URI="http://wayland.freedesktop.org/releases/${P}.tar.xz"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="doc static-libs"
+
+RDEPEND=">=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
+	>=virtual/libffi-3.0.13-r1:=[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+	doc? (
+		>=app-doc/doxygen-1.6[dot]
+		app-text/xmlto
+		>=media-gfx/graphviz-2.26.0
+		sys-apps/grep[pcre]
+	)
+	virtual/pkgconfig"
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable static-libs static)
+		$(use_enable doc documentation)
+	)
+	if tc-is-cross-compiler ; then
+		myeconfargs+=( --disable-scanner )
+	fi
+	if ! multilib_is_native_abi; then
+		myeconfargs+=( --disable-documentation )
+	fi
+
+	autotools-multilib_src_configure
+}
+
+src_test() {
+	export XDG_RUNTIME_DIR="${T}/runtime-dir"
+	mkdir "${XDG_RUNTIME_DIR}" || die
+	chmod 0700 "${XDG_RUNTIME_DIR}" || die
+
+	autotools-multilib_src_test
+}

dev-php/PEAR-Archive_Tar/Manifest

@@ -1 +1,2 @@
 DIST Archive_Tar-1.3.15.tgz 19985 SHA256 25e4f296874d208f46a772425e924e9361720b92f6bddb1e1fa0d83669fcb0af SHA512 a4fdbbcc654428242a2123438adfc72b2d24e7d201b2d927a20f4df7952cf23ab9bb395757f4e88f1617a86a2430df4a6508f26b2e3ffdc4eefcbbcf0cf6bd71 WHIRLPOOL c20a77658652316d1a12b1212e54296102fae160bdc64c6a237239dada7f3d0b8aba0d10b823893fabd5937884fbbd525903fca7ee45f935314ffba74a61891b
+DIST Archive_Tar-1.4.0.tgz 20018 SHA256 f1eb4260d09d20de29a3c589019ed53a8be6b8c5832233de9de83984baef96d6 SHA512 d15825f54fb286473e3d96be82818046cbe0cda40f0968ef9e03c7d620cd3ae5db23c93a764cbcb3fb3ca39f41cc6d4a4f782ee2718ffa47c83e1fd9a5aedba9 WHIRLPOOL 4450bb5537285f2b02cad263ab5973c8f18b7489124ea86012a04a21c68b4897f09de92a757c5369baa953ddf9ff009581a74dcc0b4e93db46e0a14a47daed9d

dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.4.0.ebuild

@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+MY_PN="${PN/PEAR-/}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Tar file management class"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+SRC_URI="http://pear.php.net/get/${MY_P}.tgz"
+DEPEND=">=dev-lang/php-5.4:*[pcre(+)]
+		>=dev-php/PEAR-PEAR-1.9.0
+"
+RDEPEND=">=dev-lang/php-5.4:*[bzip2,posix,zlib]
+	${DEPEND}"
+PDEPEND="dev-php/pear"
+HOMEPAGE="http://pear.php.net/package/Archive_Tar"
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+	insinto /usr/share/php/Archive
+	doins Archive/*
+
+	dodoc docs/*
+}

dev-php/PEAR-Console_Getopt/Manifest

@@ -1,2 +1,3 @@
 DIST Console_Getopt-1.3.1.tgz 4471 SHA256 9381ad3f8e48574c38917b55caae2cd20cf152af8e65a31d09931fad829161c4 SHA512 701c2861bcf07c121e573441dec783b4e832b10d439bf807076427cbfa832ebcd80a20c324296e962d7f493e51231f5c54b46fd19e83a431db17f21b7d984876 WHIRLPOOL a2028ae0ea556ce9821249527c1abccc8757425b67cbc7a842487fc86b09cbd075405a1f7477fae802aa0014a7aa2ddbfbb9ad534f907a81a562e71d5e099903
 DIST Console_Getopt-1.4.0.tgz 4534 SHA256 634a8647ce2b343253c57d77f42361464eebe28a3b4c0a321c6675495da88fab SHA512 1da827cb3740de139ba0721c82dbe374b05fbf7e08e0eecfaa4b53f8d0024be1bbaa737a3c9b7a21ac2779dc4036480d3d6d85f7bd83cb07db0cc234ea193a1c WHIRLPOOL f7a36d4898f8c7cc7aff655ebb9a6037eb9cdde03f981ced353fa6e59ddfa6b568f8e56eab14b55ab988408321a4b359353d226f364a42d93ae99c611d8996fe
+DIST Console_Getopt-1.4.1.tgz 5580 SHA256 2ac7b7ad616529b9bb891688459e866aacb3190cb81e208cddfe49e5d0fb5616 SHA512 cbf12a72b33424935f019b17ae8fa55289eae77d3845dcfcbbc1c47b71111992d2c0eb837b0f262ce644809c3cc06ad0c2bb04aa1b6ec89a1e3122f327114dbd WHIRLPOOL 5a5da6e0e977ffd15d69b83ebad079e7fd25d2d38f0cc691dbbe059b92a48fbfdc1169f499aaff045786fb099a993815e5e7c6bc1a41858a7bcf7855696e2fb9

dev-php/PEAR-Console_Getopt/PEAR-Console_Getopt-1.4.1.ebuild

@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MY_PN="${PN/PEAR-/}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Command-line option parser"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+SRC_URI="http://pear.php.net/get/${MY_P}.tgz"
+DEPEND=">=dev-lang/php-5.4:*
+		>=dev-php/PEAR-PEAR-1.8.1"
+RDEPEND="${DEPEND}"
+PDEPEND="dev-php/pear"
+HOMEPAGE="http://pear.php.net/package/Console_Getopt"
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+	insinto /usr/share/php/
+	doins -r Console
+}

dev-php/PEAR-PEAR/Manifest

@@ -1,2 +1,3 @@
+DIST PEAR-1.10.0dev2.tgz 290636 SHA256 6a1c697a0691b1566c251b295846d804e79776f2a7f5b149cfe41b3db75b4493 SHA512 b430f8cfd9858710198fd849ebd91d4c6cf6b5e68d88348a49ddaeb1e7a234ec8a60862a3344810c2ce7d402746fb677e2824b2960d56b290df306905c154523 WHIRLPOOL 83746c0079239350049202f0bc8e60ce58e7f2718fa6af80482b9f4377c246a1e638c9aac47f88c24f8f0b342716216b976fe6e8668925b178ca8def9732c98d
 DIST PEAR-1.9.4.tgz 296332 SHA256 80c329264a0363c6222b2f750e1646015161c9787bb4041f5ab41d95160bb93c SHA512 f4c8c6f24039940254cf774e51087a12e6b17f7cbd7308c814f8b43f1342ae68db6b2d94626a4d7ed05e8b537816da08459e2939689f15aef725504683657f47 WHIRLPOOL a640fa5dff5eda2801698094b3d99c7c63d9028727f323634dc6c17942d4cbf4fe76ddd35b89a11a8187de068201b875642bf90ea705544801d4ffaac3325828
 DIST PEAR-1.9.5.tgz 290006 SHA256 d4c27d7321f76527222eae3972c6ffb62412cc729105c858ae0bb0861d699bdb SHA512 73c5ef84c4ededa7bca81b1d94944e80ddf9dc40101c0727c5975d4ddb72f66a28aecafcefb7af8d1cc3b6fa7e488e704559a7efbebe860adfb8e9796cdf4933 WHIRLPOOL ea42f63e73d680985857f3e8e318e1f7d001edc843d12b94c9b7d3969c0793c0a9709d2dc8940b339be2f9e854cb2a3acb8c0e5cdef7ddc3cd06c9df97a3ee37

dev-php/PEAR-PEAR/PEAR-PEAR-1.10.0_alpha2.ebuild

@@ -0,0 +1,108 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils
+
+PEAR="${PV//_alpha/dev}"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux ~x64-macos ~x86-macos"
+
+DESCRIPTION="PEAR Base System"
+HOMEPAGE="http://pear.php.net/package/PEAR"
+SRC_URI="http://pear.php.net/get/PEAR-${PEAR}.tgz"
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+DEPEND="dev-lang/php:*[cli,pcre(+),xml,zlib]"
+
+RDEPEND="${DEPEND}"
+
+PDEPEND="dev-php/pear"
+
+S="${WORKDIR}"
+
+pkg_setup() {
+	[[ -z "${PEAR_CACHEDIR}" ]] && PEAR_CACHEDIR="${EPREFIX}/var/cache/pear"
+	[[ -z "${PEAR_DOWNLOADDIR}" ]] && PEAR_DOWNLOADDIR="${EPREFIX}/var/tmp/pear"
+	[[ -z "${PEAR_TEMPDIR}" ]] && PEAR_TEMPDIR="${EPREFIX}/tmp"
+
+	elog
+	elog "cache_dir is set to: ${PEAR_CACHEDIR}"
+	elog "download_dir is set to: ${PEAR_DOWNLOADDIR}"
+	elog "temp_dir is set to: ${PEAR_TEMPDIR}"
+	elog
+	elog "If you want to change the above values, you need to set"
+	elog "PEAR_CACHEDIR, PEAR_DOWNLOADDIR and PEAR_TEMPDIR variable(s)"
+	elog "accordingly in /etc/portage/make.conf and re-emerge ${PN}."
+	elog
+}
+
+src_prepare() {
+	cd PEAR-${PEAR}
+	epatch "${FILESDIR}/gentoo-libtool-mismatch-fix-v2.patch"
+	epatch_user
+}
+
+src_install() {
+	# Prevent SNMP related sandbox violoation.
+	addpredict /usr/share/snmp/mibs/.index
+	addpredict /var/lib/net-snmp/
+
+	# install PEAR package
+	cd "${S}"/PEAR-${PEAR}
+
+	insinto /usr/share/php
+	doins -r PEAR/
+	doins -r OS/
+	doins PEAR.php System.php
+	doins scripts/pearcmd.php
+	doins scripts/peclcmd.php
+
+	newbin scripts/pear.sh pear
+	newbin scripts/peardev.sh peardev
+	newbin scripts/pecl.sh pecl
+
+	# adjust some scripts for current version
+	for i in pearcmd.php peclcmd.php ; do
+		sed "s:@pear_version@:${PEAR}:g" -i "${D}/usr/share/php/${i}"
+	done
+
+	for i in pear peardev pecl ; do
+		sed "s:@bin_dir@:${EPREFIX}/usr/bin:g" -i "${D}/usr/bin/${i}"
+		sed "s:@php_dir@:${EPREFIX}/usr/share/php:g" -i "${D}/usr/bin/${i}"
+	done
+	sed "s:-d output_buffering=1:-d output_buffering=1 -d memory_limit=32M:g" -i "${D}/usr/bin/pear"
+
+	sed "s:@package_version@:${PEAR}:g" -i "${D}/usr/share/php/PEAR/Command/Package.php"
+	sed "s:@PEAR-VER@:${PEAR}:g" -i "${D}/usr/share/php/PEAR/Dependency2.php"
+	sed "s:@PEAR-VER@:${PEAR}:g" -i "${D}/usr/share/php/PEAR/PackageFile/Parser/v1.php"
+	sed "s:@PEAR-VER@:${PEAR}:g" -i "${D}/usr/share/php/PEAR/PackageFile/Parser/v2.php"
+
+	# finalize install
+	insinto /etc
+	newins "${FILESDIR}"/pear.conf-r2 pear.conf
+	sed "s|s:PHPCLILEN:\"PHPCLI\"|s:${#PHPCLI}:\"${PHPCLI}\"|g" -i "${D}/etc/pear.conf"
+	sed "s|s:CACHEDIRLEN:\"CACHEDIR\"|s:${#PEAR_CACHEDIR}:\"${PEAR_CACHEDIR}\"|g" -i "${D}/etc/pear.conf"
+	sed "s|s:DOWNLOADDIRLEN:\"DOWNLOADDIR\"|s:${#PEAR_DOWNLOADDIR}:\"${PEAR_DOWNLOADDIR}\"|g" -i "${D}/etc/pear.conf"
+	sed "s|s:TEMPDIRLEN:\"TEMPDIR\"|s:${#PEAR_TEMPDIR}:\"${PEAR_TEMPDIR}\"|g" -i "${D}/etc/pear.conf"
+
+	# Change the paths for eprefix!
+	sed "s|s:19:\"/usr/share/php/docs\"|s:$(( ${#EPREFIX}+19 )):\"${EPREFIX}/usr/share/php/docs\"|g" -i "${D}/etc/pear.conf"
+	sed "s|s:19:\"/usr/share/php/data\"|s:$(( ${#EPREFIX}+19 )):\"${EPREFIX}/usr/share/php/data\"|g" -i "${D}/etc/pear.conf"
+	sed "s|s:20:\"/usr/share/php/tests\"|s:$(( ${#EPREFIX}+20 )):\"${EPREFIX}/usr/share/php/tests\"|g" -i "${D}/etc/pear.conf"
+	sed "s|s:14:\"/usr/share/php\"|s:$(( ${#EPREFIX}+14 )):\"${EPREFIX}/usr/share/php\"|g" -i "${D}/etc/pear.conf"
+	sed "s|s:8:\"/usr/bin\"|s:$(( ${#EPREFIX}+8 )):\"${EPREFIX}/usr/bin\"|g" -i "${D}/etc/pear.conf"
+
+	[[ "${PEAR_TEMPDIR}" != "/tmp" ]] && keepdir "${PEAR_TEMPDIR#${EPREFIX}}"
+	keepdir "${PEAR_CACHEDIR#${EPREFIX}}"
+	diropts -m1777
+	keepdir "${PEAR_DOWNLOADDIR#${EPREFIX}}"
+}
+
+pkg_preinst() {
+	rm -f "${EROOT}/etc/pear.conf"
+}

dev-php/PEAR-Structures_Graph/Manifest

@@ -1 +1,2 @@
 DIST Structures_Graph-1.0.4.tgz 30318 SHA256 3619ac17892855117283e3555b1a156df0eb4d175e70e63d9c6d27d2c31a2e4f SHA512 40d45c932c571e38807fbfdcf1df6d4fcab29ab43f518ed313bac2bd35a55396aa2b87790dc827bd2e9e5c5f721df55eadfe83ff1a106bf325c467e44556c9fe WHIRLPOOL af2df6bc3d23eae990fa9c258c6277ee35fec8c9efb3e737f84278e5a3ba1d41202c66f8ae69cfc8054fb5f6b544b6407300cf25fe5ba32f4c3975c44f160c91
+DIST Structures_Graph-1.1.1.tgz 12402 SHA256 00f18a59e517db8c4eb167ada9f2a8a007c5a14b2adafc0308e5c3fad3ddd8de SHA512 cd4feb265e1aa05de348645dfc0b8e336486cb02c553dd8fcacb0a1eab452bf54108e07864395d55e0c92f4ffd338a5ae846b2dc28804bb23f03c91864ef0284 WHIRLPOOL f832c8be32e18c05ccc6958633c423570ece02cae83b4ce2b9f03ecc3d8ef98795f5e951652b3ffc95756f145435449970c568f550ceb265736a55df60fca568