diff --git a/app-admin/apachetop/apachetop-0.12.6-r2.ebuild b/app-admin/apachetop/apachetop-0.12.6-r2.ebuild
index f9bd3e3bb349..1a16203909f0 100644
--- a/app-admin/apachetop/apachetop-0.12.6-r2.ebuild
+++ b/app-admin/apachetop/apachetop-0.12.6-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/apachetop/apachetop-0.12.6-r2.ebuild,v 1.4 2015/04/26 17:19:06 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/apachetop/apachetop-0.12.6-r2.ebuild,v 1.5 2015/05/19 10:21:32 nimiux Exp $
 
 EAPI=5
 inherit eutils autotools
@@ -11,7 +11,7 @@ SRC_URI="http://www.webta.org/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 hppa ~mips ppc ~sparc x86"
+KEYWORDS="amd64 hppa ~mips ppc ~sparc x86"
 IUSE="fam pcre"
 
 RDEPEND="
diff --git a/app-emacs/ess/Manifest b/app-emacs/ess/Manifest
index 6219ffd5f65b..f35ea1520780 100644
--- a/app-emacs/ess/Manifest
+++ b/app-emacs/ess/Manifest
@@ -1,2 +1,3 @@
 DIST ess-13.09.tgz 3356969 SHA256 d0625f8ac38831a05d419435d3a6ccf852878c8aea018c3f4a9c9d6bd61e71d2 SHA512 96a91a41c9b390c27646e4b95d7a41e6b22d592c82bf775f2e1b70905c7bc684c3d6645496275d245c9f882030da1b3bd5cd3ba5711acbec3a07cdb2d065a5dd WHIRLPOOL 3560d95bcb43a65ca86787274fa96106611a98041cf63905a4066223247d8557405b7557da2c468d836d4570d4e791aa36e84e76585fc9668729926ef0759598
 DIST ess-14.09.tgz 3350987 SHA256 b6f1badd065e2e42f1d9d75a4e7a04290849d6f7a2bdb8413f73e0eae4014571 SHA512 91e275810f7a8c856f3392194ad3fb3d5f5b966e887568b22c133a362164e71ff5306d1d1a70e97f9d10261fe82eecb5f14e99a0dad4a4e239f5b810d7bba8ac WHIRLPOOL 5eabe6d65d7b5d420a7c6989b82d9901ac20d7b6376223f5aee39da7212ea395d15a98ce86c49fb2782706ba524532ceb38fd23dafaae5891a55958d1c676221
+DIST ess-15.03-1.tgz 3177102 SHA256 ad2f1b48dd4671848709d226aab72427129ac2fd5f85c0c0b39b96be24eee66f SHA512 5260d8afa10e1382cac3c70a4b6f753dd77e9f24bb2f68247732605b0f5fbb1b06e090dbcb45d747a484333f0779959c9213a4792103839b11c9e239bf35534d WHIRLPOOL eb1e6917a05b7444f4c37949a51554b6b33a0841bad5dae6aa93f575a7914fb36299c7c63ec27ec24944104a39b5844ada12b1c74a64daa04a682d5e97001834
diff --git a/app-emacs/ess/ess-15.03.1.ebuild b/app-emacs/ess/ess-15.03.1.ebuild
new file mode 100644
index 000000000000..db65948397bd
--- /dev/null
+++ b/app-emacs/ess/ess-15.03.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/ess/ess-15.03.1.ebuild,v 1.1 2015/05/19 10:58:56 ulm Exp $
+
+EAPI=5
+
+inherit readme.gentoo elisp
+
+MY_P="${PN}-${PV%.*}-${PV##*.}"
+DESCRIPTION="Emacs Speaks Statistics"
+HOMEPAGE="http://ess.r-project.org/"
+SRC_URI="http://ess.r-project.org/downloads/ess/${MY_P}.tgz"
+
+LICENSE="GPL-2+ GPL-3+ Texinfo-manual"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+
+DEPEND="app-text/texi2html
+	virtual/latex-base"
+
+S="${WORKDIR}/${MY_P}"
+SITEFILE="50${PN}-gentoo.el"
+
+src_compile() {
+	default
+}
+
+src_install() {
+	emake PREFIX="${ED}/usr" \
+		INFODIR="${ED}/usr/share/info" \
+		LISPDIR="${ED}${SITELISP}/ess" \
+		DOCDIR="${ED}/usr/share/doc/${PF}" \
+		install
+
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+
+	# Most documentation is installed by the package's build system.
+	rm -f "${ED}${SITELISP}/${PN}/ChangeLog"
+	dodoc ChangeLog *NEWS doc/{TODO,ess-intro.pdf}
+	newdoc doc/ChangeLog ChangeLog-doc
+	newdoc lisp/ChangeLog ChangeLog-lisp
+
+	DOC_CONTENTS="Please see /usr/share/doc/${PF} for the complete
+		documentation. Usage hints are in ${SITELISP}/${PN}/ess-site.el ."
+	readme.gentoo_create_doc
+}
diff --git a/app-emacs/scala-mode/scala-mode-2.10.3.ebuild b/app-emacs/scala-mode/scala-mode-2.10.3.ebuild
index 0a5ca4a124cb..e8fddc06fcd5 100644
--- a/app-emacs/scala-mode/scala-mode-2.10.3.ebuild
+++ b/app-emacs/scala-mode/scala-mode-2.10.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/scala-mode/scala-mode-2.10.3.ebuild,v 1.2 2014/03/25 19:17:04 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/scala-mode/scala-mode-2.10.3.ebuild,v 1.3 2015/05/19 09:27:28 ago Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ SRC_URI="http://www.scala-lang.org/files/archive/${MY_P}.tgz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 RDEPEND="dev-lang/scala"
 
diff --git a/app-emacs/scss-mode/Manifest b/app-emacs/scss-mode/Manifest
index ac40041dc22b..d5b122b69272 100644
--- a/app-emacs/scss-mode/Manifest
+++ b/app-emacs/scss-mode/Manifest
@@ -1 +1,2 @@
 DIST scss-mode-20130215-git.tar.gz 2632 SHA256 79c5360c7f3e76851d6aeb810d20d9ac66362f4420f967d9847338adb7df5f2a SHA512 2241d7e0c2689ba3997e4ffdf1ed167409c1d99a4f6a11911de39775a409d3299ba7e1bb2f7f0878b5b0d91e46706b65ef8e25cef83278894d8842af8bbc95be WHIRLPOOL 67792f4c20dc370e0dd078dc6212ddfd16030226a1fded057a69b514b984b79168e5a994d2126b32b9e17e4147a2597b16b5c1f788dbd378c71b45bd15772834
+DIST scss-mode-20150107-git.tar.gz 2718 SHA256 6f412eab87db85cdf3172d67c28841b0a0b910c473bf020c3babbb31ddd4ea2f SHA512 68a33d14166289af119625a5609c4dec47a05eb8c8452b42cf8e819368cc7561270c8223ac0624fee989f8c51592f456f91009c153fb857549d9c7e7c7e801a2 WHIRLPOOL 639653ccc9cdba87b7982a04ddd66236eaa4f2c8137839fdf35c5a015611fa01e160d790c9f698d0d1ac3e7033a29eb3f523554bff5ccdecaa8390dc3de13834
diff --git a/app-emacs/scss-mode/scss-mode-20150107.ebuild b/app-emacs/scss-mode/scss-mode-20150107.ebuild
new file mode 100644
index 000000000000..ff40ae78a4b2
--- /dev/null
+++ b/app-emacs/scss-mode/scss-mode-20150107.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/scss-mode/scss-mode-20150107.ebuild,v 1.1 2015/05/19 12:13:40 graaff Exp $
+
+EAPI=5
+
+inherit elisp
+
+GITHUB_SHA1=b010d134f499c4b4ad33fe8a669a81e9a531b0b2
+
+DESCRIPTION="Major mode for editing SCSS files in Emacs"
+HOMEPAGE="https://github.com/antonj/scss-mode"
+SRC_URI="${HOMEPAGE}/archive/${GITHUB_SHA1}.tar.gz -> ${P}-git.tar.gz"
+S="${WORKDIR}/${PN}-${GITHUB_SHA1}"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DOCS="README.org"
+SITEFILE="50${PN}-gentoo.el"
+
+DEPEND="dev-ruby/sass"
diff --git a/app-eselect/eselect-scala/eselect-scala-0.1.1.ebuild b/app-eselect/eselect-scala/eselect-scala-0.1.1.ebuild
index f87358b5abe7..c8c66eb1094b 100644
--- a/app-eselect/eselect-scala/eselect-scala-0.1.1.ebuild
+++ b/app-eselect/eselect-scala/eselect-scala-0.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-eselect/eselect-scala/eselect-scala-0.1.1.ebuild,v 1.1 2015/04/18 02:55:04 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-eselect/eselect-scala/eselect-scala-0.1.1.ebuild,v 1.2 2015/05/19 09:27:24 ago Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ SRC_URI="http://dev.gentoo.org/~gienah/distfiles/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE=""
 
 RDEPEND=">=app-admin/eselect-1.0.2"
diff --git a/app-misc/wcd/Manifest b/app-misc/wcd/Manifest
index 8265bb447ec4..e466dfb1e5da 100644
--- a/app-misc/wcd/Manifest
+++ b/app-misc/wcd/Manifest
@@ -1,2 +1,3 @@
 DIST wcd-5.2.4-src.tar.gz 192124 SHA256 e0e99e8300bb32163a89eafebe75f3f66658113ea4e50391c5f5c16ac5b945b5 SHA512 b4beba3c285fbc0cafe8a145da1e42bf4764e6b5c8e153f34453a1d31578b06ce3db1bb2461c003538999b6b089cca587013d82a30be78a6a5cd1c49b59a9bb4 WHIRLPOOL bf2a7d27db56db6fedfe7f715512ca6a9e5a12e24a2d8df90db688740477c3d9854d912301a0c9b7874610f695fd96ead0121ac486c160a89aa4cd50b485568b
 DIST wcd-5.2.6.tar.gz 624904 SHA256 e23939e9d8aa7ad98d74bc6def1d6eaf405dd442b498984ab0c35b83efb9cfc7 SHA512 f223130a9878d9d62767a2a86dd3ec227f8349eecd149d5a86ff7c5b5cd8a2cf14e3752186ec4617ac25b9c3df6662ccb309cf96dcb9d4ede291dc4a12a33a82 WHIRLPOOL 0d63dbe663fef83c84cc3ca3c284f76d84913986533155a6cb4a1765ed4291886c4a1885b89dc9660d8f0102c74369a97e41ef4375627f843dfef99d3ba72f35
+DIST wcd-5.2.7.tar.gz 622613 SHA256 e5f56824e054c6726186271b20a5de3c5b167116b97785a925907981cf3e3b39 SHA512 9f5b89d8160f685b729234cc8c03f16b795797dd6eaf2d9e1bbf1949b27ef971908b78642679d3bf1d99b128b390cd5dbd211e4ff03b0539dd287c578088e02e WHIRLPOOL 3354e380dceaed394e0eb9bac3f474edc819270a117baf5812a1e7252b2cef207862746af2b21dd71de837459bc6281a45a9099f5a6351def49e3c1ce780960d
diff --git a/app-misc/wcd/wcd-5.2.7.ebuild b/app-misc/wcd/wcd-5.2.7.ebuild
new file mode 100644
index 000000000000..b649f81da9f7
--- /dev/null
+++ b/app-misc/wcd/wcd-5.2.7.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/wcd/wcd-5.2.7.ebuild,v 1.1 2015/05/19 09:19:34 jlec Exp $
+
+EAPI=5
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Wherever Change Directory"
+HOMEPAGE="http://waterlan.home.xs4all.nl/#WCD_ANCHOR"
+SRC_URI="http://waterlan.home.xs4all.nl/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+IUSE="nls unicode"
+
+CDEPEND="
+	sys-libs/ncurses[unicode?]
+	unicode? ( dev-libs/libunistring )"
+DEPEND="${CDEPEND}
+	app-text/ghostscript-gpl"
+RDEPEND="${CDEPEND}"
+
+S="${WORKDIR}"/${P}/src
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-5.2.5-gentoo.patch
+	tc-export CC
+}
+
+src_compile() {
+	local mycompile="LFS=1"
+	use nls || mycompile="${mycompile} ENABLE_NLS="
+	use unicode && mycompile="${mycompile} UCS=1 UNINORM=1"
+	emake \
+		${mycompile}
+}
+
+src_install() {
+	local DOCS="../README.txt"
+	default
+	emake DESTDIR="${D}" DOTWCD=1 install-profile sysconfdir="/etc"
+}
diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest
index b7047cbf4196..57cb2f1f4356 100644
--- a/app-office/scribus/Manifest
+++ b/app-office/scribus/Manifest
@@ -1,3 +1,2 @@
-DIST scribus-1.4.3.tar.xz 70503072 SHA256 c72ef314c32f995895ca5025127e65ffeccbe2d445c358bca334a7249ea0afff SHA512 e4841b346803bc096c2e00b2071d03ce3bae6af8d7317353ebf8e724b5a9b6461d95406bee61c2a316bc6ee5d9e302e3fee7b51dd89eae9adc9e69b3aa40454e WHIRLPOOL fbcbd4ecaadb868d836848ef2656df4a1dba58ce7f7b27a810818604f9a2875c948e91484475a68b034d0cdcd9457b925701a8435a687c7cea0c2606f4d8cfca
 DIST scribus-1.4.4.tar.xz 71274196 SHA256 a43b9d55518ccebdb770d3cdac44ebf75c60ad11c284b210f6b0bd8c7a0217ae SHA512 aafcb0870d4a3054585d79ef7d7e7726dd8bd8eb8a177bcf812a42d00583a1d684a9abb61607e69c64bf9fdb4a98258be4a5b2df5cfb7c953238bc3a6a2d34bb WHIRLPOOL dff4f44ed0600737076a233ef3c7d2fd6b534f30e9d6016b884eadab2512c3f4a8610e932207d95a597795812ec7a45128ca66b6bc294fa1336f3411595c5df9
 DIST scribus-1.4.5.tar.bz2 78251228 SHA256 9f706f0561d26bb11bbe558690ae0507cd3689e381f6e17aa9411d9c4ef58498 SHA512 60db402b0fc4880f795694f3d6823ff2cedd660e7431c311ec7b75d79f09815e790da562c4cd4c080811559d1c16a3e65be8e1a348f655dbc37c3a6cec74650e WHIRLPOOL f53273810ae2b7aa35403d6e622fb0ebb67f35d454aa4667dbbe81efe5fb2de3564d346741b80c5bed33a307e8c58fe7ba695900e45f602b3a14db1cae82d948
diff --git a/app-office/scribus/scribus-1.4.3.ebuild b/app-office/scribus/scribus-1.4.3.ebuild
deleted file mode 100644
index b4d01bd00b79..000000000000
--- a/app-office/scribus/scribus-1.4.3.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-1.4.3.ebuild,v 1.11 2015/04/12 14:51:58 jlec Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="tk?"
-
-inherit cmake-utils fdo-mime python-single-r1
-
-DESCRIPTION="Desktop publishing (DTP) and layout program"
-HOMEPAGE="http://www.scribus.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 hppa ppc ppc64 ~sparc x86"
-IUSE="cairo debug examples hunspell +minimal +pdf scripts templates tk"
-
-# a=$(ls resources/translations/po/scribus.*ts | sed -e 's:\.: :g' | awk '{print $2}'); echo ${a}
-IUSE_LINGUAS=" af ar bg br ca cs_CZ cy da_DK de de_1901 de_CH el en_AU en_GB en_US es_ES et eu fi fr gl hu id it ja ko lt_LT nb_NO nl pl_PL pt pt_BR ru sa sk_SK sl sq sr sv th_TH tr uk zh_CN zh_TW"
-IUSE+=" ${IUSE_LINGUAS// / linguas_}"
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	tk? ( scripts )"
-
-COMMON_DEPEND="
-	${PYTHON_DEPS}
-	dev-libs/boost
-	dev-libs/hyphen
-	dev-libs/libxml2
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	media-libs/fontconfig
-	media-libs/freetype:2
-	media-libs/lcms:2
-	media-libs/libpng:0
-	media-libs/tiff:0
-	net-print/cups
-	sys-libs/zlib[minizip]
-	virtual/jpeg:0=
-	cairo? ( x11-libs/cairo[X,svg] )
-	!cairo? ( media-libs/libart_lgpl )
-	hunspell? ( app-text/hunspell )
-	pdf? ( app-text/podofo )
-	scripts? ( virtual/python-imaging[tk?,${PYTHON_USEDEP}] )
-	tk? ( virtual/python-imaging[tk?,${PYTHON_USEDEP}] )
-"
-RDEPEND="${COMMON_DEPEND}
-	app-text/ghostscript-gpl"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.4.2-docs.patch
-	"${FILESDIR}"/${PN}-1.4.0-minizip.patch
-	)
-
-src_prepare() {
-	cat > cmake/modules/FindZLIB.cmake <<- EOF
-	find_package(PkgConfig)
-	pkg_check_modules(ZLIB minizip zlib)
-	SET( ZLIB_LIBRARY \${ZLIB_LIBRARIES} )
-	SET( ZLIB_INCLUDE_DIR \${ZLIB_INCLUDE_DIRS} )
-	MARK_AS_ADVANCED( ZLIB_LIBRARY ZLIB_INCLUDE_DIR )
-	EOF
-
-	rm scribus/{ioapi,unzip}.[ch] || die
-
-	sed \
-		-e 's:\(${CMAKE_INSTALL_PREFIX}\):./\1:g' \
-		-i resources/templates/CMakeLists.txt || die
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local lang langs
-	for lang in ${IUSE_LINGUAS}; do
-		if use linguas_${lang}; then
-			langs+=",${lang}"
-		else
-			sed -e "/${lang}/d" -i scribus/doc/CMakeLists.txt || die
-		fi
-	done
-
-	local mycmakeargs=(
-		-DHAVE_PYTHON=ON
-		-DPYTHON_INCLUDE_PATH="$(python_get_includedir)"
-		-DPYTHON_LIBRARY="$(python_get_library_path)"
-		-DWANT_NORPATH=ON
-		-DWANT_QT3SUPPORT=OFF
-		-DGENTOOVERSION=${PVR}
-		-DWANT_GUI_LANG=${langs#,}
-		$(cmake-utils_use_with pdf PODOFO)
-		$(cmake-utils_use_want cairo)
-		$(cmake-utils_use_want !cairo QTARTHUR)
-		$(cmake-utils_use_want debug DEBUG)
-		$(cmake-utils_use_want minimal NOHEADERINSTALL)
-		$(cmake-utils_use_want hunspell HUNSPELL)
-		$(cmake-utils_use_want !examples NOEXAMPLES)
-		$(cmake-utils_use_want !templates NOTEMPLATES)
-		)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	local lang file
-	for lang in ${IUSE_LINGUAS}; do
-		file="${ED}"/usr/share/scribus/translations/scribus.${lang}.qm
-		if ! use linguas_${lang} && [[ -f "${file}" ]]; then
-			rm "${file}" || die
-		fi
-	done
-
-	if ! use scripts; then
-		rm "${ED}"/usr/share/scribus/scripts/*.py || die
-	elif ! use tk; then
-		rm "${ED}"/usr/share/scribus/scripts/{FontSample,CalendarWizard}.py || die
-	fi
-
-	python_fix_shebang "${ED}"/usr/share/scribus/scripts
-	python_optimize "${ED}"/usr/share/scribus/scripts
-
-	mv "${ED}"/usr/share/doc/${PF}/{en,html} || die
-	ln -sf html "${ED}"/usr/share/doc/${PF}/en || die
-	docompress -x /usr/share/doc/${PF}/en
-	doicon resources/icons/scribus.png
-	domenu scribus.desktop
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-}
diff --git a/app-office/scribus/scribus-1.4.5-r1.ebuild b/app-office/scribus/scribus-1.4.5-r1.ebuild
index 24acf5ee6b73..d10e21936f7e 100644
--- a/app-office/scribus/scribus-1.4.5-r1.ebuild
+++ b/app-office/scribus/scribus-1.4.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-1.4.5-r1.ebuild,v 1.1 2015/05/18 16:56:51 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-1.4.5-r1.ebuild,v 1.2 2015/05/19 06:57:27 jlec Exp $
 
 EAPI=5
 
@@ -56,6 +56,7 @@ DEPEND="${COMMON_DEPEND}
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.4.2-docs.patch
 	"${FILESDIR}"/${PN}-1.4.0-minizip.patch
+	"${FILESDIR}"/${PN}-1.4.4-ppc64-fpic.patch
 	)
 
 src_prepare() {
diff --git a/app-text/convmv/Manifest b/app-text/convmv/Manifest
index b02a9080819c..825f41d8d8ce 100644
--- a/app-text/convmv/Manifest
+++ b/app-text/convmv/Manifest
@@ -1 +1,2 @@
 DIST convmv-1.15.tar.gz 27180 SHA256 c315aec78490b588000467d1c51081b36e629de0537c5a17fd48b1acaf8a5135 SHA512 b809f103da48d43f9c7fb6cb3e08a88e1c9b2a2ad691f9fcc4422b4e597c247b86fd0446c777e4c9911b4fad551cdc9fc88eff3a1d8cb4b001e164cc8387b900 WHIRLPOOL d7c3e3fbe918472d96f1cbc40b70f280a179a3c99cef07953c0723dfcba0e81ff383d918382b196d0525724dde650c4a480e5cc91c07f9452308a3eebd1567cc
+DIST convmv-2.0.tar.gz 29534 SHA256 170cf675be1fca77868ff472e9340ca828b1463865a63d4f4b7b3bf4053db93f SHA512 9f452551ab4ea7a45ec4e5d4e4d3c4fdb60cae49f048953d16df9ecd9ee3271c2d6748704f010af6ef312d7ce2079ae9c502e04d936419e29257f68596fc4f58 WHIRLPOOL c907bf99805e2afa7590043a291c7eaa19b681fecf9eb38314d41952edcea381f7e8bf1442226bd9c72122c3b0840e4c376f3947c4b2f65495287155a1353026
diff --git a/app-text/convmv/convmv-2.0.ebuild b/app-text/convmv/convmv-2.0.ebuild
new file mode 100644
index 000000000000..fd7722effc44
--- /dev/null
+++ b/app-text/convmv/convmv-2.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/convmv/convmv-2.0.ebuild,v 1.1 2015/05/19 09:50:32 polynomial-c Exp $
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="convert filenames to utf8 or any other charset"
+HOMEPAGE="http://j3e.de/linux/convmv"
+SRC_URI="http://j3e.de/linux/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+DEPEND="dev-lang/perl"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	sed -i -e "1s|#!/usr|#!${EPREFIX}/usr|" convmv || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}"/usr install
+	dodoc CREDITS Changes TODO VERSION
+}
+
+src_test() {
+	unpack ./testsuite.tar
+
+	cd "${S}"/suite
+	./dotests.sh || die "Tests failed"
+}
diff --git a/app-text/t1utils/t1utils-1.39.ebuild b/app-text/t1utils/t1utils-1.39.ebuild
index 57ce9e9e7507..18d6fb792e20 100644
--- a/app-text/t1utils/t1utils-1.39.ebuild
+++ b/app-text/t1utils/t1utils-1.39.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/t1utils/t1utils-1.39.ebuild,v 1.6 2015/05/15 10:57:23 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/t1utils/t1utils-1.39.ebuild,v 1.7 2015/05/19 07:25:23 ago Exp $
 
 IUSE=""
 
 DESCRIPTION="Type 1 Font utilities"
 SRC_URI="http://www.lcdf.org/type/${P}.tar.gz"
 HOMEPAGE="http://www.lcdf.org/type/#t1utils"
-KEYWORDS="~alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 LICENSE="BSD"
 
diff --git a/dev-db/mariadb/mariadb-10.0.19.ebuild b/dev-db/mariadb/mariadb-10.0.19.ebuild
index 7b211488a79f..237bf56caccf 100644
--- a/dev-db/mariadb/mariadb-10.0.19.ebuild
+++ b/dev-db/mariadb/mariadb-10.0.19.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-10.0.19.ebuild,v 1.1 2015/05/09 18:53:27 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-10.0.19.ebuild,v 1.2 2015/05/19 07:13:50 ago Exp $
 
 EAPI="5"
 MY_EXTRAS_VER="20141215-0144Z"
@@ -10,7 +10,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=''
diff --git a/dev-db/sqlite/sqlite-3.8.10.1.ebuild b/dev-db/sqlite/sqlite-3.8.10.1.ebuild
index 717116b89fed..2ff81af8fa6d 100644
--- a/dev-db/sqlite/sqlite-3.8.10.1.ebuild
+++ b/dev-db/sqlite/sqlite-3.8.10.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-3.8.10.1.ebuild,v 1.8 2015/05/15 23:55:33 jmorgan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-3.8.10.1.ebuild,v 1.9 2015/05/19 07:23:01 ago Exp $
 
 EAPI="5"
 
@@ -20,7 +20,7 @@ SRC_URI="doc? ( http://sqlite.org/2015/${PN}-doc-${DOC_PV}.zip )
 
 LICENSE="public-domain"
 SLOT="3"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug doc icu +readline secure-delete static-libs tcl test tools"
 
 RDEPEND="icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] )
diff --git a/dev-go/go-sys/Manifest b/dev-go/go-sys/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/dev-go/go-sys/go-sys-9999.ebuild b/dev-go/go-sys/go-sys-9999.ebuild
new file mode 100644
index 000000000000..df888d78a3ee
--- /dev/null
+++ b/dev-go/go-sys/go-sys-9999.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-go/go-sys/go-sys-9999.ebuild,v 1.1 2015/05/19 07:24:08 zmedico Exp $
+
+EAPI=5
+inherit git-r3
+
+KEYWORDS=""
+DESCRIPTION="Go packages for low-level interaction with the operating system"
+GO_PN=golang.org/x/${PN##*-}
+HOMEPAGE="https://godoc.org/${GO_PN}"
+EGIT_REPO_URI="https://go.googlesource.com/${PN##*-}"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+DEPEND=">=dev-lang/go-1.4"
+RDEPEND=""
+S="${WORKDIR}/src/${GO_PN}"
+EGIT_CHECKOUT_DIR="${S}"
+STRIP_MASK="*.a"
+
+src_compile() {
+	# Create a writable GOROOT in order to avoid sandbox violations.
+	GOROOT="${WORKDIR}/goroot"
+	cp -sR "${EPREFIX}"/usr/lib/go "${GOROOT}" || die
+	rm -rf "${GOROOT}/src/${GO_PN%%/*}" \
+		"${GOROOT}/pkg/linux_${ARCH}/${GO_PN%%/*}" || die
+	GOROOT="${GOROOT}" GOPATH=${WORKDIR} \
+		go install -x -v -work ${GO_PN}/unix/... || die
+}
+
+src_test() {
+	GOROOT="${GOROOT}" GOPATH=${WORKDIR} \
+		go test -x -v golang.org/x/sys/unix/... || die
+}
+
+src_install() {
+	insinto /usr/lib/go
+	doins -r "${WORKDIR}"/pkg
+	insinto /usr/lib/go/src/${GO_PN}
+	find "${WORKDIR}"/src/${GO_PN} -name '.git*' -exec \
+		rm -rf {} \; 2>/dev/null
+	doins -r "${WORKDIR}"/src/${GO_PN}/unix
+}
diff --git a/dev-go/go-sys/metadata.xml b/dev-go/go-sys/metadata.xml
new file mode 100644
index 000000000000..059d713e41ed
--- /dev/null
+++ b/dev-go/go-sys/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>zmedico@gentoo.org</email>
+  </maintainer>
+</pkgmetadata>
diff --git a/dev-java/bcmail/bcmail-1.50.ebuild b/dev-java/bcmail/bcmail-1.50.ebuild
index 7afcf989c0c1..0c90ebae76a4 100644
--- a/dev-java/bcmail/bcmail-1.50.ebuild
+++ b/dev-java/bcmail/bcmail-1.50.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/bcmail/bcmail-1.50.ebuild,v 1.3 2015/05/17 20:18:38 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/bcmail/bcmail-1.50.ebuild,v 1.4 2015/05/19 09:27:13 ago Exp $
 
 EAPI="5"
 
@@ -16,7 +16,7 @@ SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ppc ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ppc ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
 
 COMMON_DEPEND=">=dev-java/bcprov-${PV}:0[test?]
 		~dev-java/bcpkix-${PV}:0[test?]
diff --git a/dev-java/bcpkix/bcpkix-1.50.ebuild b/dev-java/bcpkix/bcpkix-1.50.ebuild
index 911a380464e7..e28eb75ae4bf 100644
--- a/dev-java/bcpkix/bcpkix-1.50.ebuild
+++ b/dev-java/bcpkix/bcpkix-1.50.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/bcpkix/bcpkix-1.50.ebuild,v 1.3 2015/05/17 20:09:15 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/bcpkix/bcpkix-1.50.ebuild,v 1.5 2015/05/19 09:06:13 ago Exp $
 
 EAPI="5"
 
@@ -16,7 +16,7 @@ SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ppc ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
 
 # Tests are currently broken. Needs further investigation.
 #
diff --git a/dev-java/bcprov/bcprov-1.50.ebuild b/dev-java/bcprov/bcprov-1.50.ebuild
index cdb345fa95e4..e40b3c014336 100644
--- a/dev-java/bcprov/bcprov-1.50.ebuild
+++ b/dev-java/bcprov/bcprov-1.50.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/bcprov/bcprov-1.50.ebuild,v 1.3 2015/05/17 20:08:46 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/bcprov/bcprov-1.50.ebuild,v 1.5 2015/05/19 09:06:09 ago Exp $
 
 EAPI="5"
 
@@ -15,7 +15,7 @@ SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ppc ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos"
 
 # Tests are currently broken. Needs further investigation.
 # java.security.NoSuchAlgorithmException: Cannot find any provider supporting McElieceFujisakiWithSHA256
diff --git a/dev-java/hamcrest-integration/Manifest b/dev-java/hamcrest-integration/Manifest
index f971ff7e5a72..2bc825020bed 100644
--- a/dev-java/hamcrest-integration/Manifest
+++ b/dev-java/hamcrest-integration/Manifest
@@ -1,3 +1 @@
-DIST hamcrest-1.1.tgz 1670123 SHA256 a76cca2dbb38ac185f51f8551c964a356009c7adf1a19b5407f87352e2e438c8 SHA512 07b55c539ffcd3b1d33e94bec518164b95cefa39d96e0c3d02fc97c0a20f71bd8d1dea90a59ffd163e748ed1007b087c3d0d355876a68a429e8e564d0cfd3595 WHIRLPOOL 937d4fcde43a36eb19efb1b45e255389dcd18a853f90cc96e6421cec4db176708047e4c6de53ad7f3c11b29e4bc77725c3b70992239d9da420fa95c682615011
-DIST hamcrest-1.2.tgz 1824622 SHA256 461fcf87afbf85f0879c283ec59810433797dc9f3040b7c2d58494da4aaf2a94 SHA512 e211fee64ef8acce48d2ae572a669fcb1f5e7d05c4ec5d1149a7d42ad64fabd655b24da1a328028cbcc12ef1500907c416513af08168c7b3c22999a00998336e WHIRLPOOL c16fec727dd38ee0e5ee4ae938ba57f6e7b648359df41a99573f65a436dff5601f404e035bdd205baa293581970bb4b0355cfe8fc03f212185f88ef29a2175cd
 DIST hamcrest-1.3.tgz 3686096 SHA256 c6428e40d069fff3f99780efaae96c35ebdbf7cbfd475504254ebffcc19620c2 SHA512 5672bc627bc71d6fd64b6f776b89ac16ed68819fa4a0748c1250b57f1065c1e7e18ba184d9fe3392e54000ddeb353d0d8d67f4eecdf464974563f05c6b226fc2 WHIRLPOOL 9edc85f8d988ba9e7d080e3240d02956775bb73857903a2ec2a72e80d5a1b8570111c97d7b9906951273a1a1db6213a77de9cc2c55a6c73246d45157fed11ed9
diff --git a/dev-java/hamcrest-integration/hamcrest-integration-1.1.ebuild b/dev-java/hamcrest-integration/hamcrest-integration-1.1.ebuild
deleted file mode 100644
index 63ceab821fb5..000000000000
--- a/dev-java/hamcrest-integration/hamcrest-integration-1.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/hamcrest-integration/hamcrest-integration-1.1.ebuild,v 1.1 2014/03/02 16:26:05 ercpe Exp $
-
-EAPI="5"
-
-JAVA_PKG_IUSE="source"
-
-inherit java-pkg-2 java-ant-2
-
-MY_PN=${PN/-integration}
-MY_P="${MY_PN}-${PV}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Integration library of hamcrest"
-HOMEPAGE="http://code.google.com/p/${MY_PN}/"
-SRC_URI="http://${MY_PN}.googlecode.com/files/${MY_P}.tgz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-CDEPEND="dev-java/hamcrest-core:${SLOT}
-		dev-java/qdox:1.6
-		dev-java/easymock:3.2
-		dev-java/jmock:1.0"
-
-DEPEND=">=virtual/jdk-1.5
-	userland_GNU? ( sys-apps/findutils )
-	${CDEPEND}"
-
-RDEPEND=">=virtual/jre-1.5
-	${CDEPEND}"
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-JAVA_ANT_CLASSPATH_TAGS="${JAVA_ANT_CLASSPATH_TAGS} java java-to-jar"
-EANT_GENTOO_CLASSPATH="hamcrest-core,qdox-1.6,easymock-3.2,jmock:1.0"
-EANT_BUILD_TARGET="integration"
-EANT_EXTRA_ARGS="-Dversion=${PV}"
-EANT_GENTOO_CLASSPATH_EXTRA="build/${P}.jar"
-
-java_prepare() {
-	# remove core+generator target as they are already built.
-	epatch "${FILESDIR}/${PV}-remove-targets.patch"
-
-	find -iname "*.jar" -exec rm -v {} + || die "Unable to clean bundled JAR files"
-}
-
-src_install() {
-	java-pkg_newjar build/${P}.jar ${PN}.jar
-
-	use source && java-pkg_dosrc ${PN}/src/main/java/org
-}
diff --git a/dev-java/hamcrest-integration/hamcrest-integration-1.2.ebuild b/dev-java/hamcrest-integration/hamcrest-integration-1.2.ebuild
deleted file mode 100644
index e0b3e0839da3..000000000000
--- a/dev-java/hamcrest-integration/hamcrest-integration-1.2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/hamcrest-integration/hamcrest-integration-1.2.ebuild,v 1.1 2014/03/02 16:26:04 ercpe Exp $
-
-EAPI="5"
-
-JAVA_PKG_IUSE="source"
-
-inherit java-pkg-2 java-ant-2
-
-MY_PN=${PN/-integration}
-MY_P="${MY_PN}-${PV}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Integration library of hamcrest"
-HOMEPAGE="http://code.google.com/p/${MY_PN}/"
-SRC_URI="http://${MY_PN}.googlecode.com/files/${MY_P}.tgz"
-
-LICENSE="BSD-2"
-SLOT="${PV}"
-KEYWORDS="~amd64 ~x86"
-
-CDEPEND="dev-java/hamcrest-core:${SLOT}
-		dev-java/qdox:1.6
-		dev-java/easymock:3.2
-		dev-java/jmock:1.0"
-
-DEPEND=">=virtual/jdk-1.5
-	userland_GNU? ( sys-apps/findutils )
-	${CDEPEND}"
-
-RDEPEND=">=virtual/jre-1.5
-	${CDEPEND}"
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-JAVA_ANT_CLASSPATH_TAGS="${JAVA_ANT_CLASSPATH_TAGS} java java-to-jar"
-EANT_GENTOO_CLASSPATH="hamcrest-core,qdox-1.6,easymock-3.2,jmock:1.0"
-EANT_BUILD_TARGET="integration"
-EANT_EXTRA_ARGS="-Dversion=${PV}"
-EANT_GENTOO_CLASSPATH_EXTRA="build/${P}.jar"
-
-java_prepare() {
-	# remove core+generator target as they are already built.
-	epatch "${FILESDIR}/${PV}-remove-targets.patch"
-
-	find -iname "*.jar" -exec rm -v {} + || die "Unable to clean bundled JAR files"
-}
-
-src_install() {
-	java-pkg_newjar build/${P}.jar ${PN}.jar
-
-	use source && java-pkg_dosrc ${PN}/src/main/java/org
-}
diff --git a/dev-java/hamcrest-integration/hamcrest-integration-1.3.ebuild b/dev-java/hamcrest-integration/hamcrest-integration-1.3.ebuild
index cc4ea9606f4c..d2ae8255724a 100644
--- a/dev-java/hamcrest-integration/hamcrest-integration-1.3.ebuild
+++ b/dev-java/hamcrest-integration/hamcrest-integration-1.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/hamcrest-integration/hamcrest-integration-1.3.ebuild,v 1.1 2014/03/02 16:26:04 ercpe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/hamcrest-integration/hamcrest-integration-1.3.ebuild,v 1.2 2015/05/19 09:47:38 monsieurp Exp $
 
 EAPI="5"
 
@@ -34,7 +34,8 @@ RDEPEND=">=virtual/jre-1.5
 
 JAVA_ANT_REWRITE_CLASSPATH="true"
 JAVA_ANT_CLASSPATH_TAGS="${JAVA_ANT_CLASSPATH_TAGS} java java-to-jar"
-EANT_GENTOO_CLASSPATH="hamcrest-core,qdox-1.6,easymock-3.2,jmock:1.0"
+
+EANT_GENTOO_CLASSPATH="hamcrest-core:${SLOT},qdox:1.6,easymock:3.2,jmock:1.0"
 EANT_BUILD_TARGET="integration"
 EANT_EXTRA_ARGS="-Dversion=${PV}"
 EANT_GENTOO_CLASSPATH_EXTRA="build/${P}.jar"
diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index ffd9b127c62d..edf140f26890 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -1,8 +1,11 @@
 DIST php-5.4.39.tar.bz2 12271717 SHA256 7ceb76538e709c74533210ae41148d5c01c330ac8a73220954bbc4fcae69d77e SHA512 b944517b754fbdfc0b50dd18d2644edc9abe3a66ac9806c748b7b98f5c5c07eeaabdf7990799bb39ebf716b90b4e8b34e5fedb3379c1b05bce5530d3cdf4e42d WHIRLPOOL 28fdea55684c99b53545c83fffa686a76714846d2a0af0fa514f450fdf86faa3541f752113a51189a0ec7786a5d55171eaa7be3a8d0418b60fe920be552fcf22
 DIST php-5.4.40.tar.bz2 12272787 SHA256 4898ffe8ac3ccb2d8cc94f7d76a9ea0414d954f5d4479895ddfccdc2e158a51a SHA512 23fc43a310d8f05078c5a0fdc574a49d7037385f6c6fb154c1cb900d87b9f356d2fe8a708d7f20cb1304c4715f1c5bdd64063049f4d7fe157621e36e83cf7535 WHIRLPOOL b74c868e5991562ff0a019f438bc52d228fb17de95e252a7f1e2c323c0cf21da0be8a72f7f44f18051d7bb295974fc1ee605415658e2d5657eddb1e3726a233d
+DIST php-5.4.41.tar.bz2 12487089 SHA256 5bc4b45a1280ff80a3cf5b8563716f325cfd0121d7fd25aa54d56ff38b3b8272 SHA512 3034adab5e47bd4dedb207d305fcbbdc9ca5bc0869fa1c55c43841101c54e8fd73d36b9ac80a84f74c71f2a23ad390cda7bf60e2347570e542b1db8c3aefa2f7 WHIRLPOOL 68af528ef069c7b6cb3bdc07e25b9bdd2af31dc248ad023a3f7948bfc49886bc7a803e9656fa12e860dd6338da1817fd3d8ca91b066e4e329e255626434e2016
 DIST php-5.5.22.tar.bz2 13305486 SHA256 c218c184bef2905bc79fcdda6040f3d1738261395fb706396935d1c6f6e162bb SHA512 3eabd6fa2cd10e83fc3c00fb43313feefbb8c2772778dc6f176612fcb449761e22b55053e5b0b7f6954c0c141ab6c799f08bdca1851078511b7ef9376dadefac WHIRLPOOL 7c36ba90ed40d315475d721a3827065ee0e8748315f100383d4481b8ff1fb9af2b2a25f4dec5f3c5d8f378ff2213ce80fdc4c624c8a51cc312d51d505118b514
 DIST php-5.5.23.tar.bz2 13308115 SHA256 a99ab264dcd40181baa9defeaa4b21eb2c20d4e9316b904cc05f628762e6ada7 SHA512 b72f74d91afa9d9cc2d7b24468a37382cce47d337c63cd6a4abeea0a1c1d4d4df4245fe085a685a16cc0197fb342211653d41007ff1a4439a664ee33a1525896 WHIRLPOOL b6668a847d4d8b984c2fae8187d81206af010d8334df46f99978a4ad59854f3909dbd8d462d2ad4d52b290abdeb77562cec691aa21432aefbd88474d9b4584a9
 DIST php-5.5.24.tar.bz2 13337043 SHA256 801b5cf2e0c01b07314d4ac3c8a7c28d524bdd8263ebdd0e33a99008251316a2 SHA512 c43f03a93d0199cc174f1b00b4a34717a82500d5f2cd408d8e39f31cff171f8a2019f31beed044524a795e54fab344e55c41f5d1f3b9e9fea98e2cd04aba6152 WHIRLPOOL 8179016a5d6ebf4993137433bd92a01f162880b373b165be7b1702c5a3ddedd11c308e0e4c0c0b64f84a3cc9083e7e0647d2488997c59ebb126c4bff59d216de
+DIST php-5.5.25.tar.bz2 13422002 SHA256 68df37e725ddd05675c0df906041038127938ecc52113a54d10e1e4029262c63 SHA512 961e1c48c591bf3c4c6068b2dca9f3cab41925b0845e4886128e75272622ee6e24ca94e2f4cd18874e27d61de7ad7aa238c6040d57c6696f62b77ffa33fec26a WHIRLPOOL efddc221988eb9e46adf2301cc1f1a39740efb27f7a5ba9673b9021d6fd6ee2b894cfe38c3d3af2098afa3f0c92fb9ab31f7cd8abebbacfb3180406f11b48e9a
 DIST php-5.6.7.tar.bz2 13697400 SHA256 02954fb74c61a7879d48ebdcd4ecb78aa0056f4215ca9b096232de28eb8f17bc SHA512 594b306cd2bb1dd2034a39b13d3642d957869b305c5e169e6020472b659feb6d1a7a1d1a75bf71965335450caf4762d9a0db2585d68e95606e34e9d03580830f WHIRLPOOL a6155be31975d9e0af039e3974ede650c920dcfef9bd4224f1f997c190762838541bf9f3747ce52516aee40860833babf31f1fdadf86f81531ce6877cbbd0d9b
 DIST php-5.6.8.tar.bz2 13724681 SHA256 0af0045745d61eeb74a3ea744529a2481b27cb689da720e6c0250675043724e4 SHA512 1d2466411b3704db8af5db5ed6b0a073510fbeda3c01036fda2b0f9cf6c8ccfb2039ea9ea2ff51769d228c06f9c43ad83c080d164c6981df46d48904e767e939 WHIRLPOOL 27600e85ece76e923b405c8402ebd54bcb738e23e0d646b13c1c656f24d724bc51e062fba0d307e88b0160ff357d0b29c8d4384695e11492b1cb04589d2c1fee
+DIST php-5.6.9.tar.bz2 14037070 SHA256 19d3b87b7b8bba3be24cf6d757d16b723a98881c3af8d15469fd25501e9abcb9 SHA512 c00e0fdfc60a84e0a9ebe4702907b86b86a65efc72c26fa86abc1ed79afa21fb1eb10052c1fc2326f5cb9858878f62e1a39c1cd02ea2a96fb8f14c515b26389e WHIRLPOOL e561f0c183314e05ffb34f633eac0f638d1f81d6d0a1445390ffde7baad9ce8798605bdd9a51b1227177e6b0849f752cb342d7168cc94a465406149bfad45947
 DIST php-patchset-5.4-r2.tar.bz2 5824 SHA256 4a47f4d31f50a244f85349486cdb3474cf315562e097ed4c116c2b9b5730ecef SHA512 3c2523458a627373da7acb93fb2cd621f50b19fe2ba1d30beb62eeaaa39045262b917cfd0b631046fec9c8027cfa99bd0426a079ab45eb172b21d25d6e085dde WHIRLPOOL fe4f015e2f0dc66cc23ef16fb5bb33117952593ae0770d4bcd37ecc1c431cbcc7874189d265696305c60b4e395e7ce902667e38203db46867304868271affdea
diff --git a/dev-lang/php/php-5.4.41.ebuild b/dev-lang/php/php-5.4.41.ebuild
new file mode 100644
index 000000000000..3bc40f73097e
--- /dev/null
+++ b/dev-lang/php/php-5.4.41.ebuild
@@ -0,0 +1,802 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.4.41.ebuild,v 1.1 2015/05/19 14:36:46 olemarkus Exp $
+
+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"
+
+function php_get_uri ()
+{
+	case "${1}" in
+		"php-pre")
+			echo "http://downloads.php.net/stas/${2}"
+		;;
+		"php")
+			echo "http://www.php.net/distributions/${2}"
+		;;
+		"olemarkus")
+			echo "http://dev.gentoo.org/~olemarkus/php/${2}"
+		;;
+		"gentoo")
+			echo "mirror://gentoo/${2}"
+		;;
+		*)
+			die "unhandled case in php_get_uri"
+		;;
+	esac
+}
+
+PHP_MV="$(get_major_version)"
+SLOT="$(get_version_component_range 1-2)"
+
+# alias, so we can handle different types of releases (finals, rcs, alphas,
+# betas, ...) w/o changing the whole ebuild
+PHP_PV="${PV/_rc/RC}"
+PHP_PV="${PHP_PV/_alpha/alpha}"
+PHP_PV="${PHP_PV/_beta/beta}"
+PHP_RELEASE="php"
+[[ ${PV} == ${PV/_alpha/} ]] || PHP_RELEASE="php-pre"
+[[ ${PV} == ${PV/_beta/} ]] || PHP_RELEASE="php-pre"
+[[ ${PV} == ${PV/_rc/} ]] || PHP_RELEASE="php-pre"
+PHP_P="${PN}-${PHP_PV}"
+
+PHP_PATCHSET_LOC="olemarkus"
+
+PHP_SRC_URI="$(php_get_uri "${PHP_RELEASE}" "${PHP_P}.tar.bz2")"
+
+PHP_PATCHSET="2"
+PHP_PATCHSET_URI="
+	$(php_get_uri "${PHP_PATCHSET_LOC}" "php-patchset-${SLOT}-r${PHP_PATCHSET}.tar.bz2")"
+
+PHP_FPM_INIT_VER="4"
+PHP_FPM_CONF_VER="1"
+
+SRC_URI="
+	${PHP_SRC_URI}
+	${PHP_PATCHSET_URI}"
+
+DESCRIPTION="The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs"
+HOMEPAGE="http://php.net/"
+LICENSE="PHP-3"
+
+S="${WORKDIR}/${PHP_P}"
+
+# We can build the following SAPIs in the given order
+SAPIS="embed cli cgi fpm apache2"
+
+# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
+IUSE="${IUSE}
+	${SAPIS/cli/+cli}
+	threads"
+
+IUSE="${IUSE} bcmath berkdb bzip2 calendar cdb cjk
+	crypt +ctype curl curlwrappers debug
+	enchant exif +fileinfo +filter firebird
+	flatfile ftp gd gdbm gmp +hash +iconv imap inifile
+	intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash
+	mssql mysql mysqlnd mysqli nls
+	oci8-instant-client odbc pcntl pdo +phar +posix postgres qdbm
+	readline recode selinux +session sharedmem
+	+simplexml snmp soap sockets spell sqlite ssl
+	sybase-ct sysvipc systemd tidy +tokenizer truetype unicode wddx
+	+xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib"
+
+DEPEND="
+	>=app-eselect/eselect-php-0.7.1-r3[apache2?,fpm?]
+	>=dev-libs/libpcre-8.32[unicode]
+	apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=]
+		<www-servers/apache-2.4[threads=] ) )
+	berkdb? ( =sys-libs/db-4* )
+	bzip2? ( app-arch/bzip2 )
+	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
+	cjk? ( !gd? (
+		virtual/jpeg:0
+		media-libs/libpng:0=
+		sys-libs/zlib
+	) )
+	crypt? ( >=dev-libs/libmcrypt-2.4 )
+	curl? ( >=net-misc/curl-7.10.5 )
+	enchant? ( app-text/enchant )
+	exif? ( !gd? (
+		virtual/jpeg:0
+		media-libs/libpng:0=
+		sys-libs/zlib
+	) )
+	firebird? ( dev-db/firebird )
+	gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
+	gdbm? ( >=sys-libs/gdbm-1.8.0 )
+	gmp? ( >=dev-libs/gmp-4.1.2 )
+	iconv? ( virtual/libiconv )
+	imap? ( virtual/imap-c-client[ssl=] )
+	intl? ( dev-libs/icu:= )
+	iodbc? ( dev-db/libiodbc )
+	kerberos? ( virtual/krb5 )
+	ldap? ( >=net-nds/openldap-1.2.11 )
+	ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 )
+	libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) )
+	mssql? ( dev-db/freetds[mssql] )
+	!mysqlnd? (
+		mysql? ( virtual/mysql )
+		mysqli? ( >=virtual/mysql-4.1 )
+	)
+	nls? ( sys-devel/gettext )
+	oci8-instant-client? ( dev-db/oracle-instantclient-basic )
+	odbc? ( >=dev-db/unixODBC-1.8.13 )
+	postgres? ( dev-db/postgresql )
+	qdbm? ( dev-db/qdbm )
+	readline? ( sys-libs/readline )
+	recode? ( app-text/recode )
+	sharedmem? ( dev-libs/mm )
+	simplexml? ( >=dev-libs/libxml2-2.6.8 )
+	snmp? ( >=net-analyzer/net-snmp-5.2 )
+	soap? ( >=dev-libs/libxml2-2.6.8 )
+	spell? ( >=app-text/aspell-0.50 )
+	sqlite? ( >=dev-db/sqlite-3.7.6.3 )
+	ssl? ( >=dev-libs/openssl-0.9.7 )
+	sybase-ct? ( dev-db/freetds )
+	tidy? ( app-text/htmltidy )
+	truetype? (
+		=media-libs/freetype-2*
+		>=media-libs/t1lib-5.0.0
+		!gd? (
+			virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
+	)
+	unicode? ( dev-libs/oniguruma )
+	wddx? ( >=dev-libs/libxml2-2.6.8 )
+	xml? ( >=dev-libs/libxml2-2.6.8 )
+	xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv )
+	xmlreader? ( >=dev-libs/libxml2-2.6.8 )
+	xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
+	xpm? (
+		x11-libs/libXpm
+		virtual/jpeg:0
+		media-libs/libpng:0= sys-libs/zlib
+	)
+	xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
+	zip? ( sys-libs/zlib )
+	zlib? ( sys-libs/zlib )
+	virtual/mta
+"
+
+php="=${CATEGORY}/${PF}"
+
+REQUIRED_USE="
+	truetype? ( gd )
+	cjk? ( gd )
+	exif? ( gd )
+
+	xpm? ( gd )
+	gd? ( zlib )
+	simplexml? ( xml )
+	soap? ( xml )
+	wddx? ( xml )
+	xmlrpc? ( || ( xml iconv ) )
+	xmlreader? ( xml )
+	xslt? ( xml )
+	ldap-sasl? ( ldap )
+	mhash? ( hash )
+	phar? ( hash )
+	mysqlnd? ( || (
+		mysql
+		mysqli
+		pdo
+	) )
+
+	qdbm? ( !gdbm )
+	readline? ( !libedit )
+	recode? ( !imap !mysql !mysqli )
+	sharedmem? ( !threads )
+
+	!cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )"
+
+RDEPEND="${DEPEND}"
+
+RDEPEND="${RDEPEND}
+	fpm? (
+		selinux? ( sec-policy/selinux-phpfpm )
+		systemd? ( sys-apps/systemd ) )"
+
+DEPEND="${DEPEND}
+	sys-devel/flex
+	>=sys-devel/m4-1.4.3
+	>=sys-devel/libtool-1.5.18"
+
+# Allow users to install production version if they want to
+
+case "${PHP_INI_VERSION}" in
+	production|development)
+		;;
+	*)
+		PHP_INI_VERSION="development"
+		;;
+esac
+
+PHP_INI_UPSTREAM="php.ini-${PHP_INI_VERSION}"
+PHP_INI_FILE="php.ini"
+
+want_apache
+
+pkg_setup() {
+	depend.apache_pkg_setup
+}
+
+php_install_ini() {
+	local phpsapi="${1}"
+
+	# work out where we are installing the ini file
+	php_set_ini_dir "${phpsapi}"
+
+	local phpinisrc="${PHP_INI_UPSTREAM}-${phpsapi}"
+	cp "${PHP_INI_UPSTREAM}" "${phpinisrc}"
+
+	# default to /tmp for save_path, bug #282768
+	sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}"
+
+	# Set the extension dir
+	sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" -i "${phpinisrc}"
+
+	# Set the include path to point to where we want to find PEAR packages
+	sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}"
+
+	if use_if_iuse opcache; then
+		elog "Adding opcache to ${phpinisrc}"
+		echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> ${phpinisrc}
+	fi
+
+	dodir "${PHP_INI_DIR#${EPREFIX}}"
+	insinto "${PHP_INI_DIR#${EPREFIX}}"
+	newins "${phpinisrc}" "${PHP_INI_FILE}"
+
+	elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
+	elog
+
+	dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
+	dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
+
+	# SAPI-specific handling
+
+	if [[ "${sapi}" == "fpm" ]] ; then
+		[[ -z ${PHP_FPM_CONF_VER} ]] && PHP_FPM_CONF_VER=0
+		einfo "Installing FPM CGI config file php-fpm.conf"
+		insinto "${PHP_INI_DIR#${EPREFIX}}"
+		newins "${FILESDIR}/php-fpm-r${PHP_FPM_CONF_VER}.conf" php-fpm.conf
+
+		# Remove bogus /etc/php-fpm.conf.default (bug 359906)
+		[[ -f "${ED}/etc/php-fpm.conf.default" ]] && rm "${ED}/etc/php-fpm.conf.default"
+	fi
+
+	# Install PHP ini files into /usr/share/php
+
+	dodoc php.ini-development
+	dodoc php.ini-production
+
+}
+
+php_set_ini_dir() {
+	PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
+	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
+	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
+}
+
+src_prepare() {
+	# USE=sharedmem (session/mod_mm to be exact) tries to mmap() this path
+	# ([empty session.save_path]/session_mm_[sapi][gid].sem)
+	# there is no easy way to circumvent that, all php calls during
+	# install use -n, so no php.ini file will be used.
+	# As such, this is the easiest way to get around
+	addpredict /session_mm_cli250.sem
+	addpredict /session_mm_cli0.sem
+
+	# Change PHP branding
+	# Get the alpha/beta/rc version
+	sed -re	"s|^(PHP_EXTRA_VERSION=\").*(\")|\1-pl${PR/r/}-gentoo\2|g" \
+		-i configure.in || die "Unable to change PHP branding"
+
+	# Patch PHP to show Gentoo as the server platform
+	sed -e 's/PHP_UNAME=`uname -a | xargs`/PHP_UNAME=`uname -s -n -r -v | xargs`/g' \
+		-i configure.in || die "Failed to fix server platform name"
+
+	# Prevent PHP from activating the Apache config,
+	# as we will do that ourselves
+	sed -i \
+		-e "s,-i -a -n php${PHP_MV},-i -n php${PHP_MV},g" \
+		-e "s,-i -A -n php${PHP_MV},-i -n php${PHP_MV},g" \
+		configure sapi/apache2filter/config.m4 sapi/apache2handler/config.m4
+
+	# Patch PHP to support heimdal instead of mit-krb5
+	if has_version "app-crypt/heimdal" ; then
+		sed -e 's|gssapi_krb5|gssapi|g' -i acinclude.m4 \
+			|| die "Failed to fix heimdal libname"
+		sed -e 's|PHP_ADD_LIBRARY(k5crypto, 1, $1)||g' -i acinclude.m4 \
+			|| die "Failed to fix heimdal crypt library reference"
+	fi
+
+	#Add user patches #357637
+	epatch_user
+
+	#force rebuilding aclocal.m4
+	rm aclocal.m4
+	eautoreconf
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# http://bugs.php.net/bug.php?id=48795, bug #343481
+		sed -i -e '/BUILD_CGI="\\$(CC)/s/CC/CXX/' configure || die
+	fi
+}
+
+src_configure() {
+	addpredict /usr/share/snmp/mibs/.index
+	addpredict /var/lib/net-snmp/mib_indexes
+
+	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
+
+	# This is a global variable and should be in caps. It isn't because the
+	# phpconfutils eclass relies on exactly this name...
+	# for --with-libdir see bug #327025
+	my_conf="
+		--prefix="${PHP_DESTDIR}"
+		--mandir="${PHP_DESTDIR}"/man
+		--infodir="${PHP_DESTDIR}"/info
+		--libdir="${PHP_DESTDIR}"/lib
+		--with-libdir=$(get_libdir)
+		--without-pear
+		$(use_enable threads maintainer-zts)"
+
+	#                             extension		  USE flag        shared
+	my_conf+="
+	$(use_enable bcmath bcmath )
+	$(use_with bzip2 bz2 "${EPREFIX}"/usr)
+	$(use_enable calendar calendar )
+	$(use_enable ctype ctype )
+	$(use_with curl curl "${EPREFIX}"/usr)
+	$(use_with curlwrappers curlwrappers "${EPREFIX}"/usr)
+	$(use_enable xml dom )
+	$(use_with enchant enchant "${EPREFIX}"/usr)
+	$(use_enable exif exif )
+	$(use_enable fileinfo fileinfo )
+	$(use_enable filter filter )
+	$(use_enable ftp ftp )
+	$(use_with nls gettext "${EPREFIX}"/usr)
+	$(use_with gmp gmp "${EPREFIX}"/usr)
+	$(use_enable hash hash )
+	$(use_with mhash mhash "${EPREFIX}"/usr)
+	$(use_with iconv iconv $(use elibc_glibc || use elibc_musl || echo "${EPREFIX}"/usr))
+	$(use_enable intl intl )
+	$(use_enable ipv6 ipv6 )
+	$(use_enable json json )
+	$(use_with kerberos kerberos "${EPREFIX}"/usr)
+	$(use_enable xml libxml )
+	$(use_with xml libxml-dir "${EPREFIX}"/usr)
+	$(use_enable unicode mbstring )
+	$(use_with crypt mcrypt "${EPREFIX}"/usr)
+	$(use_with mssql mssql "${EPREFIX}"/usr)
+	$(use_with unicode onig "${EPREFIX}"/usr)
+	$(use_with ssl openssl "${EPREFIX}"/usr)
+	$(use_with ssl openssl-dir "${EPREFIX}"/usr)
+	$(use_enable pcntl pcntl )
+	$(use_enable phar phar )
+	$(use_enable pdo pdo )
+	$(use_with postgres pgsql "${EPREFIX}"/usr)
+	$(use_enable posix posix )
+	$(use_with spell pspell "${EPREFIX}"/usr)
+	$(use_with recode recode "${EPREFIX}"/usr)
+	$(use_enable simplexml simplexml )
+	$(use_enable sharedmem shmop )
+	$(use_with snmp snmp "${EPREFIX}"/usr)
+	$(use_enable soap soap )
+	$(use_enable sockets sockets )
+	$(use_with sqlite sqlite3 "${EPREFIX}"/usr)
+	$(use_with sybase-ct sybase-ct "${EPREFIX}"/usr)
+	$(use_enable sysvipc sysvmsg )
+	$(use_enable sysvipc sysvsem )
+	$(use_enable sysvipc sysvshm )
+	$(use_with systemd fpm-systemd)
+	$(use_with tidy tidy "${EPREFIX}"/usr)
+	$(use_enable tokenizer tokenizer )
+	$(use_enable wddx wddx )
+	$(use_enable xml xml )
+	$(use_enable xmlreader xmlreader )
+	$(use_enable xmlwriter xmlwriter )
+	$(use_with xmlrpc xmlrpc)
+	$(use_with xslt xsl "${EPREFIX}"/usr)
+	$(use_enable zip zip )
+	$(use_with zlib zlib "${EPREFIX}"/usr)
+	$(use_enable debug debug )"
+
+	# DBA support
+	if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
+		|| use qdbm ; then
+		my_conf="${my_conf} --enable-dba${shared}"
+	fi
+
+	# DBA drivers support
+	my_conf+="
+	$(use_with cdb cdb)
+	$(use_with berkdb db4 ${EPREFIX}/usr)
+	$(use_enable flatfile flatfile )
+	$(use_with gdbm gdbm ${EPREFIX}/usr)
+	$(use_enable inifile inifile )
+	$(use_with qdbm qdbm ${EPREFIX}/usr)"
+
+	# Support for the GD graphics library
+	my_conf+="
+	$(use_with truetype freetype-dir ${EPREFIX}/usr)
+	$(use_with truetype t1lib ${EPREFIX}/usr)
+	$(use_enable cjk gd-jis-conv )
+	$(use_with gd jpeg-dir ${EPREFIX}/usr)
+	$(use_with gd png-dir ${EPREFIX}/usr)
+	$(use_with xpm xpm-dir ${EPREFIX}/usr)"
+	# enable gd last, so configure can pick up the previous settings
+	my_conf+="
+	$(use_with gd gd)"
+
+	# IMAP support
+	if use imap ; then
+		my_conf+="
+		$(use_with imap imap ${EPREFIX}/usr)
+		$(use_with ssl imap-ssl ${EPREFIX}/usr)"
+	fi
+
+	# Interbase/firebird support
+
+	if use firebird ; then
+		my_conf+="
+		$(use_with firebird interbase ${EPREFIX}/usr)"
+	fi
+
+	# LDAP support
+	if use ldap ; then
+		my_conf+="
+		$(use_with ldap ldap ${EPREFIX}/usr)
+		$(use_with ldap-sasl ldap-sasl ${EPREFIX}/usr)"
+	fi
+
+	# MySQL support
+	if use mysql ; then
+		if use mysqlnd ; then
+			my_conf+="
+			$(use_with mysql mysql mysqlnd)"
+		else
+			my_conf+="
+			$(use_with mysql mysql ${EPREFIX}/usr)"
+		fi
+		my_conf+="
+		$(use_with mysql mysql-sock ${EPREFIX}/var/run/mysqld/mysqld.sock)"
+	fi
+
+	# MySQLi support
+	if use mysqlnd ; then
+		my_conf+="
+		$(use_with mysqli mysqli mysqlnd)"
+	else
+		my_conf+="
+		$(use_with mysqli mysqli ${EPREFIX}/usr/bin/mysql_config)"
+	fi
+
+	# ODBC support
+	if use odbc ; then
+		my_conf+="
+		$(use_with odbc unixODBC ${EPREFIX}/usr)"
+	fi
+
+	if use iodbc ; then
+		my_conf+="
+		$(use_with iodbc iodbc ${EPREFIX}/usr)"
+	fi
+
+	# Oracle support
+	if use oci8-instant-client ; then
+		my_conf+="
+		$(use_with oci8-instant-client oci8)"
+	fi
+
+	# PDO support
+	if use pdo ; then
+		my_conf+="
+		$(use_with mssql pdo-dblib )"
+		if use mysqlnd ; then
+			my_conf+="
+			$(use_with mysqlnd pdo-mysql mysqlnd)"
+		else
+			my_conf+="
+			$(use_with mysql pdo-mysql ${EPREFIX}/usr)"
+		fi
+		my_conf+="
+		$(use_with postgres pdo-pgsql )
+		$(use_with sqlite pdo-sqlite ${EPREFIX}/usr)
+		$(use_with odbc pdo-odbc unixODBC,${EPREFIX}/usr)"
+		if use oci8-instant-client ; then
+			my_conf+="
+			$(use_with oci8-instant-client pdo-oci)"
+		fi
+	fi
+
+	# readline/libedit support
+	my_conf+="
+	$(use_with readline readline ${EPREFIX}/usr)
+	$(use_with libedit libedit ${EPREFIX}/usr)"
+
+	# Session support
+	if use session ; then
+		my_conf+="
+		$(use_with sharedmem mm ${EPREFIX}/usr)"
+	else
+		my_conf+="
+		$(use_enable session session )"
+	fi
+
+	# Use pic for shared modules such as apache2's mod_php
+	my_conf="${my_conf} --with-pic"
+
+	# we use the system copy of pcre
+	# --with-pcre-regex affects ext/pcre
+	# --with-pcre-dir affects ext/filter and ext/zip
+	my_conf="${my_conf} --with-pcre-regex=${EPREFIX}/usr --with-pcre-dir=${EPREFIX}/usr"
+
+	# Catch CFLAGS problems
+	# Fixes bug #14067.
+	# Changed order to run it in reverse for bug #32022 and #12021.
+	replace-cpu-flags "k6*" "i586"
+
+	# Support user-passed configuration parameters
+	my_conf="${my_conf} ${EXTRA_ECONF:-}"
+
+	# Support the Apache2 extras, they must be set globally for all
+	# SAPIs to work correctly, especially for external PHP extensions
+
+	mkdir -p "${WORKDIR}/sapis-build"
+	for one_sapi in $SAPIS ; do
+		use "${one_sapi}" || continue
+		php_set_ini_dir "${one_sapi}"
+
+		cp -r "${S}" "${WORKDIR}/sapis-build/${one_sapi}"
+		cd "${WORKDIR}/sapis-build/${one_sapi}"
+
+		sapi_conf="${my_conf} --with-config-file-path=${PHP_INI_DIR}
+			--with-config-file-scan-dir=${PHP_EXT_INI_DIR_ACTIVE}"
+
+		for sapi in $SAPIS ; do
+			case "$sapi" in
+				cli|cgi|embed|fpm)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf="${sapi_conf} --enable-${sapi}"
+					else
+						sapi_conf="${sapi_conf} --disable-${sapi}"
+					fi
+					;;
+
+				apache2)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf="${sapi_conf} --with-apxs2=${EPREFIX}/usr/sbin/apxs"
+					else
+						sapi_conf="${sapi_conf} --without-apxs2"
+					fi
+					;;
+			esac
+		done
+
+		econf ${sapi_conf}
+	done
+}
+
+src_compile() {
+	# snmp seems to run during src_compile, too (bug #324739)
+	addpredict /usr/share/snmp/mibs/.index
+	addpredict /var/lib/net-snmp/mib_indexes
+
+	for sapi in ${SAPIS} ; do
+		if use "${sapi}"; then
+			cd "${WORKDIR}/sapis-build/$sapi" || "Failed to change dir to ${WORKDIR}/sapis-build/$1"
+			emake || die "emake failed"
+		fi
+	done
+}
+
+src_install() {
+	# see bug #324739 for what happens when we don't have that
+	addpredict /usr/share/snmp/mibs/.index
+
+	# grab the first SAPI that got built and install common files from there
+	local first_sapi=""
+	for sapi in $SAPIS ; do
+		if use $sapi ; then
+			first_sapi=$sapi
+			break
+		fi
+	done
+
+	# Makefile forgets to create this before trying to write to it...
+	dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
+
+	# Install php environment (without any sapis)
+	cd "${WORKDIR}/sapis-build/$first_sapi"
+	emake INSTALL_ROOT="${D}" \
+		install-build install-headers install-programs \
+		|| die "emake install failed"
+
+	local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
+
+	# Create the directory where we'll put version-specific php scripts
+	keepdir /usr/share/php${PHP_MV}
+
+	local sapi="", file=""
+	local sapi_list=""
+
+	for sapi in ${SAPIS}; do
+		if use "${sapi}" ; then
+			einfo "Installing SAPI: ${sapi}"
+			cd "${WORKDIR}/sapis-build/${sapi}"
+
+			if [[ "${sapi}" == "apache2" ]] ; then
+				# We're specifically not using emake install-sapi as libtool
+				# may cause unnecessary relink failures (see bug #351266)
+				insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
+				newins ".libs/libphp5$(get_libname)" "libphp${PHP_MV}$(get_libname)"
+				keepdir "/usr/$(get_libdir)/apache2/modules"
+			else
+				# needed each time, php_install_ini would reset it
+				local dest="${PHP_DESTDIR#${EPREFIX}}"
+				into "${dest}"
+				case "$sapi" in
+					cli)
+						source="sapi/cli/php"
+						;;
+					cgi)
+						source="sapi/cgi/php-cgi"
+						;;
+					fpm)
+						source="sapi/fpm/php-fpm"
+						;;
+					embed)
+						source="libs/libphp${PHP_MV}$(get_libname)"
+						;;
+					*)
+						die "unhandled sapi in src_install"
+						;;
+				esac
+
+				if [[ "${source}" == *"$(get_libname)" ]]; then
+					dolib.so "${source}" || die "Unable to install ${sapi} sapi"
+				else
+					dobin "${source}" || die "Unable to install ${sapi} sapi"
+					local name="$(basename ${source})"
+					dosym "${dest}/bin/${name}" "/usr/bin/${name}${SLOT}"
+				fi
+			fi
+
+			php_install_ini "${sapi}"
+
+			# construct correct SAPI string for php-config
+			# thanks to ferringb for the bash voodoo
+			if [[ "${sapi}" == "apache2" ]]; then
+				sapi_list="${sapi_list:+${sapi_list} }apache2handler"
+			else
+				sapi_list="${sapi_list:+${sapi_list} }${sapi}"
+			fi
+		fi
+	done
+
+	# Installing opcache module
+	if use_if_iuse opcache ; then
+		dolib.so "modules/opcache$(get_libname)" || die "Unable to install opcache module"
+	fi
+
+	# Install env.d files
+	newenvd "${FILESDIR}/20php5-envd" \
+		"20php${SLOT}"
+	sed -e "s|/lib/|/$(get_libdir)/|g" -i \
+		"${ED}/etc/env.d/20php${SLOT}"
+	sed -e "s|php5|php${SLOT}|g" -i \
+		"${ED}/etc/env.d/20php${SLOT}"
+
+	# set php-config variable correctly (bug #278439)
+	sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
+		"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config"
+
+	if use fpm ; then
+		if use systemd; then
+			systemd_newunit "${FILESDIR}/php-fpm_at.service" "php-fpm@${SLOT}.service"
+		else
+			systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" "php-fpm@${SLOT}.service"
+		fi
+	fi
+}
+
+src_test() {
+	echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+	PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
+	if [[ ! -x "${PHP_BIN}" ]] ; then
+		ewarn "Test phase requires USE=cli, skipping"
+		return
+	else
+		export TEST_PHP_EXECUTABLE="${PHP_BIN}"
+	fi
+
+	if [[ -x "${WORKDIR}/sapis/cgi/php-cgi" ]] ; then
+		export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis/cgi/php-cgi"
+	fi
+
+	REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n  -d "session.save_path=${T}" \
+		"${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d "session.save_path=${T}"
+
+	for name in ${EXPECTED_TEST_FAILURES}; do
+		mv "${name}.out" "${name}.out.orig" 2>/dev/null
+	done
+
+	local failed="$(find -name '*.out')"
+	if [[ ${failed} != "" ]] ; then
+		ewarn "The following test cases failed unexpectedly:"
+		for name in ${failed}; do
+			ewarn "  ${name/.out/}"
+		done
+	else
+		einfo "No unexpected test failures, all fine"
+	fi
+
+	if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
+		local passed=""
+		for name in ${EXPECTED_TEST_FAILURES}; do
+			[[ -f "${name}.diff" ]] && continue
+			passed="${passed} ${name}"
+		done
+		if [[ ${passed} != "" ]] ; then
+			einfo "The following test cases passed unexpectedly:"
+			for name in ${passed}; do
+				ewarn "  ${passed}"
+			done
+		else
+			einfo "None of the known-to-fail tests passed, all fine"
+		fi
+	fi
+}
+
+pkg_postinst() {
+	# Output some general info to the user
+	if use apache2 ; then
+		APACHE2_MOD_DEFINE="PHP5"
+		APACHE2_MOD_CONF="70_mod_php5"  # actually provided by app-eselect/eselect-php
+		apache-module_pkg_postinst
+	fi
+
+	# Create the symlinks for php
+	for m in ${SAPIS}; do
+		[[ ${m} == 'embed' ]] && continue;
+		if use $m ; then
+			local ci=$(eselect php show $m)
+			if [[ -z $ci ]]; then
+				eselect php set $m php${SLOT}
+				einfo "Switched ${m} to use php:${SLOT}"
+				einfo
+			elif [[ $ci != "php${SLOT}" ]] ; then
+				elog "To switch $m to use php:${SLOT}, run"
+				elog "    eselect php set $m php${SLOT}"
+				elog
+			fi
+		fi
+	done
+
+	elog "Make sure that PHP_TARGETS in ${EPREFIX}/etc/make.conf includes php${SLOT/./-} in order"
+	elog "to compile extensions for the ${SLOT} ABI"
+	elog
+	if ! use readline && use cli ; then
+		ewarn "Note that in order to use php interactivly, you need to enable"
+		ewarn "the readline USE flag or php -a will hang"
+	fi
+	elog
+	elog "This ebuild installed a version of php.ini based on php.ini-${PHP_INI_VERSION} version."
+	elog "You can chose which version of php.ini to install by default by setting PHP_INI_VERSION to either"
+	elog "'production' or 'development' in ${EPREFIX}/etc/make.conf"
+	elog "Both versions of php.ini can be found in ${EPREFIX}/usr/share/doc/${PF}"
+
+	elog
+	elog "For more details on how minor version slotting works (PHP_TARGETS) please read the upgrade guide:"
+	elog "http://www.gentoo.org/proj/en/php/php-upgrading.xml"
+	elog
+}
+
+pkg_prerm() {
+	eselect php cleanup
+}
diff --git a/dev-lang/php/php-5.5.25.ebuild b/dev-lang/php/php-5.5.25.ebuild
new file mode 100644
index 000000000000..f48f35101e5b
--- /dev/null
+++ b/dev-lang/php/php-5.5.25.ebuild
@@ -0,0 +1,784 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.5.25.ebuild,v 1.1 2015/05/19 14:36:46 olemarkus Exp $
+
+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"
+
+function php_get_uri ()
+{
+	case "${1}" in
+		"php-pre")
+			echo "http://downloads.php.net/dsp/${2}"
+		;;
+		"php")
+			echo "http://www.php.net/distributions/${2}"
+		;;
+		"olemarkus")
+			echo "http://dev.gentoo.org/~olemarkus/php/${2}"
+		;;
+		"gentoo")
+			echo "mirror://gentoo/${2}"
+		;;
+		*)
+			die "unhandled case in php_get_uri"
+		;;
+	esac
+}
+
+PHP_MV="$(get_major_version)"
+SLOT="$(get_version_component_range 1-2)"
+
+# alias, so we can handle different types of releases (finals, rcs, alphas,
+# betas, ...) w/o changing the whole ebuild
+PHP_PV="${PV/_rc/RC}"
+PHP_PV="${PHP_PV/_alpha/alpha}"
+PHP_PV="${PHP_PV/_beta/beta}"
+PHP_RELEASE="php"
+[[ ${PV} == ${PV/_alpha/} ]] || PHP_RELEASE="php-pre"
+[[ ${PV} == ${PV/_beta/} ]] || PHP_RELEASE="php-pre"
+[[ ${PV} == ${PV/_rc/} ]] || PHP_RELEASE="php-pre"
+PHP_P="${PN}-${PHP_PV}"
+
+PHP_SRC_URI="$(php_get_uri "${PHP_RELEASE}" "${PHP_P}.tar.bz2")"
+
+PHP_FPM_CONF_VER="1"
+
+SRC_URI="${PHP_SRC_URI}"
+
+DESCRIPTION="The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs"
+HOMEPAGE="http://php.net/"
+LICENSE="PHP-3"
+
+S="${WORKDIR}/${PHP_P}"
+
+# We can build the following SAPIs in the given order
+SAPIS="embed cli cgi fpm apache2"
+
+# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
+IUSE="${IUSE}
+	${SAPIS/cli/+cli}
+	threads"
+
+IUSE="${IUSE} bcmath berkdb bzip2 calendar cdb cjk
+	crypt +ctype curl debug
+	enchant exif frontbase +fileinfo +filter firebird
+	flatfile ftp gd gdbm gmp +hash +iconv imap inifile
+	intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash
+	mssql mysql libmysqlclient mysqli nls
+	oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
+	readline recode selinux +session sharedmem
+	+simplexml snmp soap sockets spell sqlite ssl
+	sybase-ct sysvipc systemd tidy +tokenizer truetype unicode vpx wddx
+	+xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib"
+
+DEPEND="
+	>=app-eselect/eselect-php-0.7.1-r3[apache2?,fpm?]
+	>=dev-libs/libpcre-8.32[unicode]
+	apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=]
+		<www-servers/apache-2.4[threads=] ) )
+	berkdb? ( =sys-libs/db-4* )
+	bzip2? ( app-arch/bzip2 )
+	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
+	cjk? ( !gd? (
+		virtual/jpeg:0
+		media-libs/libpng:0=
+		sys-libs/zlib
+	) )
+	crypt? ( >=dev-libs/libmcrypt-2.4 )
+	curl? ( >=net-misc/curl-7.10.5 )
+	enchant? ( app-text/enchant )
+	exif? ( !gd? (
+		virtual/jpeg:0
+		media-libs/libpng:0=
+		sys-libs/zlib
+	) )
+	firebird? ( dev-db/firebird )
+	gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
+	gdbm? ( >=sys-libs/gdbm-1.8.0 )
+	gmp? ( >=dev-libs/gmp-4.1.2 )
+	iconv? ( virtual/libiconv )
+	imap? ( virtual/imap-c-client[ssl=] )
+	intl? ( dev-libs/icu:= )
+	iodbc? ( dev-db/libiodbc )
+	kerberos? ( virtual/krb5 )
+	ldap? ( >=net-nds/openldap-1.2.11 )
+	ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 )
+	libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) )
+	mssql? ( dev-db/freetds[mssql] )
+	libmysqlclient? (
+		mysql? ( virtual/mysql )
+		mysqli? ( >=virtual/mysql-4.1 )
+	)
+	nls? ( sys-devel/gettext )
+	oci8-instant-client? ( dev-db/oracle-instantclient-basic )
+	odbc? ( >=dev-db/unixODBC-1.8.13 )
+	postgres? ( dev-db/postgresql )
+	qdbm? ( dev-db/qdbm )
+	readline? ( sys-libs/readline )
+	recode? ( app-text/recode )
+	sharedmem? ( dev-libs/mm )
+	simplexml? ( >=dev-libs/libxml2-2.6.8 )
+	snmp? ( >=net-analyzer/net-snmp-5.2 )
+	soap? ( >=dev-libs/libxml2-2.6.8 )
+	spell? ( >=app-text/aspell-0.50 )
+	sqlite? ( >=dev-db/sqlite-3.7.6.3 )
+	ssl? ( >=dev-libs/openssl-0.9.7 )
+	sybase-ct? ( dev-db/freetds )
+	tidy? ( app-text/htmltidy )
+	truetype? (
+		=media-libs/freetype-2*
+		>=media-libs/t1lib-5.0.0
+		!gd? (
+			virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
+	)
+	unicode? ( dev-libs/oniguruma )
+	vpx? ( media-libs/libvpx )
+	wddx? ( >=dev-libs/libxml2-2.6.8 )
+	xml? ( >=dev-libs/libxml2-2.6.8 )
+	xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv )
+	xmlreader? ( >=dev-libs/libxml2-2.6.8 )
+	xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
+	xpm? (
+		x11-libs/libXpm
+		virtual/jpeg:0
+		media-libs/libpng:0= sys-libs/zlib
+	)
+	xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
+	zip? ( sys-libs/zlib )
+	zlib? ( sys-libs/zlib )
+	virtual/mta
+"
+
+php="=${CATEGORY}/${PF}"
+
+REQUIRED_USE="
+	truetype? ( gd )
+	vpx? ( gd )
+	cjk? ( gd )
+	exif? ( gd )
+
+	xpm? ( gd )
+	gd? ( zlib )
+	simplexml? ( xml )
+	soap? ( xml )
+	wddx? ( xml )
+	xmlrpc? ( || ( xml iconv ) )
+	xmlreader? ( xml )
+	xslt? ( xml )
+	ldap-sasl? ( ldap )
+	mhash? ( hash )
+	phar? ( hash )
+	libmysqlclient? ( || (
+		mysql
+		mysqli
+		pdo
+	) )
+
+	qdbm? ( !gdbm )
+	readline? ( !libedit )
+	recode? ( !imap !mysql !mysqli )
+	sharedmem? ( !threads )
+
+	!cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )"
+
+RDEPEND="${DEPEND}"
+
+RDEPEND="${RDEPEND}
+	fpm? (
+		selinux? ( sec-policy/selinux-phpfpm )
+		systemd? ( sys-apps/systemd ) )"
+
+DEPEND="${DEPEND}
+	sys-devel/flex
+	>=sys-devel/m4-1.4.3
+	>=sys-devel/libtool-1.5.18"
+
+# Allow users to install production version if they want to
+
+case "${PHP_INI_VERSION}" in
+	production|development)
+		;;
+	*)
+		PHP_INI_VERSION="development"
+		;;
+esac
+
+PHP_INI_UPSTREAM="php.ini-${PHP_INI_VERSION}"
+PHP_INI_FILE="php.ini"
+
+want_apache
+
+pkg_setup() {
+	depend.apache_pkg_setup
+}
+
+php_install_ini() {
+	local phpsapi="${1}"
+
+	# work out where we are installing the ini file
+	php_set_ini_dir "${phpsapi}"
+
+	local phpinisrc="${PHP_INI_UPSTREAM}-${phpsapi}"
+	cp "${PHP_INI_UPSTREAM}" "${phpinisrc}"
+
+	# default to /tmp for save_path, bug #282768
+	sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}"
+
+	# Set the extension dir
+	sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" -i "${phpinisrc}"
+
+	# Set the include path to point to where we want to find PEAR packages
+	sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}"
+
+	dodir "${PHP_INI_DIR#${EPREFIX}}"
+	insinto "${PHP_INI_DIR#${EPREFIX}}"
+	newins "${phpinisrc}" "${PHP_INI_FILE}"
+
+	elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
+	elog
+
+	dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
+	dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
+
+	if use_if_iuse opcache; then
+		elog "Adding opcache to $PHP_EXT_INI_DIR"
+		echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
+		dosym "${PHP_EXT_INI_DIR#${EPREFIX}}/opcache.ini" "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
+	fi
+
+	# SAPI-specific handling
+
+	if [[ "${sapi}" == "fpm" ]] ; then
+		[[ -z ${PHP_FPM_CONF_VER} ]] && PHP_FPM_CONF_VER=0
+		einfo "Installing FPM CGI config file php-fpm.conf"
+		insinto "${PHP_INI_DIR#${EPREFIX}}"
+		newins "${FILESDIR}/php-fpm-r${PHP_FPM_CONF_VER}.conf" php-fpm.conf
+
+		# Remove bogus /etc/php-fpm.conf.default (bug 359906)
+		[[ -f "${ED}/etc/php-fpm.conf.default" ]] && rm "${ED}/etc/php-fpm.conf.default"
+	fi
+
+	# Install PHP ini files into /usr/share/php
+
+	dodoc php.ini-development
+	dodoc php.ini-production
+
+}
+
+php_set_ini_dir() {
+	PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
+	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
+	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
+}
+
+src_prepare() {
+	# USE=sharedmem (session/mod_mm to be exact) tries to mmap() this path
+	# ([empty session.save_path]/session_mm_[sapi][gid].sem)
+	# there is no easy way to circumvent that, all php calls during
+	# install use -n, so no php.ini file will be used.
+	# As such, this is the easiest way to get around
+	addpredict /session_mm_cli250.sem
+	addpredict /session_mm_cli0.sem
+
+	# Change PHP branding
+	# Get the alpha/beta/rc version
+	sed -re	"s|^(PHP_EXTRA_VERSION=\").*(\")|\1-pl${PR/r/}-gentoo\2|g" \
+		-i configure.in || die "Unable to change PHP branding"
+
+	# Patch PHP to show Gentoo as the server platform
+	sed -e 's/PHP_UNAME=`uname -a | xargs`/PHP_UNAME=`uname -s -n -r -v | xargs`/g' \
+		-i configure.in || die "Failed to fix server platform name"
+
+	# Prevent PHP from activating the Apache config,
+	# as we will do that ourselves
+	sed -i \
+		-e "s,-i -a -n php${PHP_MV},-i -n php${PHP_MV},g" \
+		-e "s,-i -A -n php${PHP_MV},-i -n php${PHP_MV},g" \
+		configure sapi/apache2filter/config.m4 sapi/apache2handler/config.m4
+
+	# Patch PHP to support heimdal instead of mit-krb5
+	if has_version "app-crypt/heimdal" ; then
+		sed -e 's|gssapi_krb5|gssapi|g' -i acinclude.m4 \
+			|| die "Failed to fix heimdal libname"
+		sed -e 's|PHP_ADD_LIBRARY(k5crypto, 1, $1)||g' -i acinclude.m4 \
+			|| die "Failed to fix heimdal crypt library reference"
+	fi
+
+	#Add user patches #357637
+	epatch_user
+
+	#force rebuilding aclocal.m4
+	rm aclocal.m4
+	eautoreconf
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# http://bugs.php.net/bug.php?id=48795, bug #343481
+		sed -i -e '/BUILD_CGI="\\$(CC)/s/CC/CXX/' configure || die
+	fi
+}
+
+src_configure() {
+	addpredict /usr/share/snmp/mibs/.index
+	addpredict /var/lib/net-snmp/mib_indexes
+
+	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
+
+	# This is a global variable and should be in caps. It isn't because the
+	# phpconfutils eclass relies on exactly this name...
+	# for --with-libdir see bug #327025
+	my_conf="
+		--prefix="${PHP_DESTDIR}"
+		--mandir="${PHP_DESTDIR}"/man
+		--infodir="${PHP_DESTDIR}"/info
+		--libdir="${PHP_DESTDIR}"/lib
+		--with-libdir=$(get_libdir)
+		--without-pear
+		$(use_enable threads maintainer-zts)"
+
+	#                             extension		  USE flag        shared
+	my_conf+="
+	$(use_enable bcmath bcmath )
+	$(use_with bzip2 bz2 "${EPREFIX}"/usr)
+	$(use_enable calendar calendar )
+	$(use_enable ctype ctype )
+	$(use_with curl curl "${EPREFIX}"/usr)
+	$(use_enable xml dom )
+	$(use_with enchant enchant "${EPREFIX}"/usr)
+	$(use_enable exif exif )
+	$(use_enable fileinfo fileinfo )
+	$(use_enable filter filter )
+	$(use_enable ftp ftp )
+	$(use_with nls gettext "${EPREFIX}"/usr)
+	$(use_with gmp gmp "${EPREFIX}"/usr)
+	$(use_enable hash hash )
+	$(use_with mhash mhash "${EPREFIX}"/usr)
+	$(use_with iconv iconv $(use elibc_glibc || use elibc_musl || echo "${EPREFIX}"/usr))
+	$(use_enable intl intl )
+	$(use_enable ipv6 ipv6 )
+	$(use_enable json json )
+	$(use_with kerberos kerberos "${EPREFIX}"/usr)
+	$(use_enable xml libxml )
+	$(use_with xml libxml-dir "${EPREFIX}"/usr)
+	$(use_enable unicode mbstring )
+	$(use_with crypt mcrypt "${EPREFIX}"/usr)
+	$(use_with mssql mssql "${EPREFIX}"/usr)
+	$(use_with unicode onig "${EPREFIX}"/usr)
+	$(use_with ssl openssl "${EPREFIX}"/usr)
+	$(use_with ssl openssl-dir "${EPREFIX}"/usr)
+	$(use_enable pcntl pcntl )
+	$(use_enable phar phar )
+	$(use_enable pdo pdo )
+	$(use_enable opcache opcache )
+	$(use_with postgres pgsql "${EPREFIX}"/usr)
+	$(use_enable posix posix )
+	$(use_with spell pspell "${EPREFIX}"/usr)
+	$(use_with recode recode "${EPREFIX}"/usr)
+	$(use_enable simplexml simplexml )
+	$(use_enable sharedmem shmop )
+	$(use_with snmp snmp "${EPREFIX}"/usr)
+	$(use_enable soap soap )
+	$(use_enable sockets sockets )
+	$(use_with sqlite sqlite3 "${EPREFIX}"/usr)
+	$(use_with sybase-ct sybase-ct "${EPREFIX}"/usr)
+	$(use_enable sysvipc sysvmsg )
+	$(use_enable sysvipc sysvsem )
+	$(use_enable sysvipc sysvshm )
+	$(use_with systemd fpm-systemd)
+	$(use_with tidy tidy "${EPREFIX}"/usr)
+	$(use_enable tokenizer tokenizer )
+	$(use_enable wddx wddx )
+	$(use_enable xml xml )
+	$(use_enable xmlreader xmlreader )
+	$(use_enable xmlwriter xmlwriter )
+	$(use_with xmlrpc xmlrpc)
+	$(use_with xslt xsl "${EPREFIX}"/usr)
+	$(use_enable zip zip )
+	$(use_with zlib zlib "${EPREFIX}"/usr)
+	$(use_enable debug debug )"
+
+	# DBA support
+	if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
+		|| use qdbm ; then
+		my_conf="${my_conf} --enable-dba${shared}"
+	fi
+
+	# DBA drivers support
+	my_conf+="
+	$(use_with cdb cdb)
+	$(use_with berkdb db4 ${EPREFIX}/usr)
+	$(use_enable flatfile flatfile )
+	$(use_with gdbm gdbm ${EPREFIX}/usr)
+	$(use_enable inifile inifile )
+	$(use_with qdbm qdbm ${EPREFIX}/usr)"
+
+	# Support for the GD graphics library
+	my_conf+="
+	$(use_with truetype freetype-dir ${EPREFIX}/usr)
+	$(use_with truetype t1lib ${EPREFIX}/usr)
+	$(use_enable cjk gd-jis-conv )
+	$(use_with gd jpeg-dir ${EPREFIX}/usr)
+	$(use_with gd png-dir ${EPREFIX}/usr)
+	$(use_with xpm xpm-dir ${EPREFIX}/usr)
+	$(use_with vpx vpx-dir ${EPREFIX}/usr)"
+	# enable gd last, so configure can pick up the previous settings
+	my_conf+="
+	$(use_with gd gd)"
+
+	# IMAP support
+	if use imap ; then
+		my_conf+="
+		$(use_with imap imap ${EPREFIX}/usr)
+		$(use_with ssl imap-ssl ${EPREFIX}/usr)"
+	fi
+
+	# Interbase/firebird support
+
+	if use firebird ; then
+		my_conf+="
+		$(use_with firebird interbase ${EPREFIX}/usr)"
+	fi
+
+	# LDAP support
+	if use ldap ; then
+		my_conf+="
+		$(use_with ldap ldap ${EPREFIX}/usr)
+		$(use_with ldap-sasl ldap-sasl ${EPREFIX}/usr)"
+	fi
+
+	# MySQL support
+	local mysqllib="mysqlnd"
+	local mysqlilib="mysqlnd"
+	use libmysqlclient && mysqllib="${EPREFIX}/usr"
+	use libmysqlclient && mysqlilib="${EPREFIX}/usr/bin/mysql_config"
+
+	my_conf+=" $(use_with mysql mysql $mysqllib)"
+	my_conf+=" $(use_with mysqli mysqli $mysqlilib)"
+
+	local mysqlsock=" $(use_with mysql mysql-sock ${EPREFIX}/var/run/mysqld/mysqld.sock)"
+	if use mysql ; then
+		my_conf+="${mysqlsock}"
+	elif use mysqli ; then
+		my_conf+="${mysqlsock}"
+	fi
+
+	# ODBC support
+	if use odbc ; then
+		my_conf+="
+		$(use_with odbc unixODBC ${EPREFIX}/usr)"
+	fi
+
+	if use iodbc ; then
+		my_conf+="
+		$(use_with iodbc iodbc ${EPREFIX}/usr)"
+	fi
+
+	# Oracle support
+	if use oci8-instant-client ; then
+		my_conf+="
+		$(use_with oci8-instant-client oci8)"
+	fi
+
+	# PDO support
+	if use pdo ; then
+		my_conf+="
+		$(use_with mssql pdo-dblib )
+		$(use_with mysql pdo-mysql ${mysqllib})
+		$(use_with postgres pdo-pgsql )
+		$(use_with sqlite pdo-sqlite ${EPREFIX}/usr)
+		$(use_with odbc pdo-odbc unixODBC,${EPREFIX}/usr)"
+		if use oci8-instant-client ; then
+			my_conf+="
+			$(use_with oci8-instant-client pdo-oci)"
+		fi
+	fi
+
+	# readline/libedit support
+	my_conf+="
+	$(use_with readline readline ${EPREFIX}/usr)
+	$(use_with libedit libedit ${EPREFIX}/usr)"
+
+	# Session support
+	if use session ; then
+		my_conf+="
+		$(use_with sharedmem mm ${EPREFIX}/usr)"
+	else
+		my_conf+="
+		$(use_enable session session )"
+	fi
+
+	# Use pic for shared modules such as apache2's mod_php
+	my_conf="${my_conf} --with-pic"
+
+	# we use the system copy of pcre
+	# --with-pcre-regex affects ext/pcre
+	# --with-pcre-dir affects ext/filter and ext/zip
+	my_conf="${my_conf} --with-pcre-regex=${EPREFIX}/usr --with-pcre-dir=${EPREFIX}/usr"
+
+	# Catch CFLAGS problems
+	# Fixes bug #14067.
+	# Changed order to run it in reverse for bug #32022 and #12021.
+	replace-cpu-flags "k6*" "i586"
+
+	# Support user-passed configuration parameters
+	my_conf="${my_conf} ${EXTRA_ECONF:-}"
+
+	# Support the Apache2 extras, they must be set globally for all
+	# SAPIs to work correctly, especially for external PHP extensions
+
+	mkdir -p "${WORKDIR}/sapis-build"
+	for one_sapi in $SAPIS ; do
+		use "${one_sapi}" || continue
+		php_set_ini_dir "${one_sapi}"
+
+		cp -r "${S}" "${WORKDIR}/sapis-build/${one_sapi}"
+		cd "${WORKDIR}/sapis-build/${one_sapi}"
+
+		sapi_conf="${my_conf} --with-config-file-path=${PHP_INI_DIR}
+			--with-config-file-scan-dir=${PHP_EXT_INI_DIR_ACTIVE}"
+
+		for sapi in $SAPIS ; do
+			case "$sapi" in
+				cli|cgi|embed|fpm)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf="${sapi_conf} --enable-${sapi}"
+					else
+						sapi_conf="${sapi_conf} --disable-${sapi}"
+					fi
+					;;
+
+				apache2)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf="${sapi_conf} --with-apxs2=${EPREFIX}/usr/sbin/apxs"
+					else
+						sapi_conf="${sapi_conf} --without-apxs2"
+					fi
+					;;
+			esac
+		done
+
+		econf ${sapi_conf}
+	done
+}
+
+src_compile() {
+	# snmp seems to run during src_compile, too (bug #324739)
+	addpredict /usr/share/snmp/mibs/.index
+	addpredict /var/lib/net-snmp/mib_indexes
+
+	for sapi in ${SAPIS} ; do
+		if use "${sapi}"; then
+			cd "${WORKDIR}/sapis-build/$sapi" || "Failed to change dir to ${WORKDIR}/sapis-build/$1"
+			emake || die "emake failed"
+		fi
+	done
+}
+
+src_install() {
+	# see bug #324739 for what happens when we don't have that
+	addpredict /usr/share/snmp/mibs/.index
+
+	# grab the first SAPI that got built and install common files from there
+	local first_sapi=""
+	for sapi in $SAPIS ; do
+		if use $sapi ; then
+			first_sapi=$sapi
+			break
+		fi
+	done
+
+	# Makefile forgets to create this before trying to write to it...
+	dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
+
+	# Install php environment (without any sapis)
+	cd "${WORKDIR}/sapis-build/$first_sapi"
+	emake INSTALL_ROOT="${D}" \
+		install-build install-headers install-programs \
+		|| die "emake install failed"
+
+	local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
+
+	# Create the directory where we'll put version-specific php scripts
+	keepdir /usr/share/php${PHP_MV}
+
+	local sapi="", file=""
+	local sapi_list=""
+
+	for sapi in ${SAPIS}; do
+		if use "${sapi}" ; then
+			einfo "Installing SAPI: ${sapi}"
+			cd "${WORKDIR}/sapis-build/${sapi}"
+
+			if [[ "${sapi}" == "apache2" ]] ; then
+				# We're specifically not using emake install-sapi as libtool
+				# may cause unnecessary relink failures (see bug #351266)
+				insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
+				newins ".libs/libphp5$(get_libname)" "libphp${PHP_MV}$(get_libname)"
+				keepdir "/usr/$(get_libdir)/apache2/modules"
+			else
+				# needed each time, php_install_ini would reset it
+				local dest="${PHP_DESTDIR#${EPREFIX}}"
+				into "${dest}"
+				case "$sapi" in
+					cli)
+						source="sapi/cli/php"
+						;;
+					cgi)
+						source="sapi/cgi/php-cgi"
+						;;
+					fpm)
+						source="sapi/fpm/php-fpm"
+						;;
+					embed)
+						source="libs/libphp${PHP_MV}$(get_libname)"
+						;;
+					*)
+						die "unhandled sapi in src_install"
+						;;
+				esac
+
+				if [[ "${source}" == *"$(get_libname)" ]]; then
+					dolib.so "${source}" || die "Unable to install ${sapi} sapi"
+				else
+					dobin "${source}" || die "Unable to install ${sapi} sapi"
+					local name="$(basename ${source})"
+					dosym "${dest}/bin/${name}" "/usr/bin/${name}${SLOT}"
+				fi
+			fi
+
+			php_install_ini "${sapi}"
+
+			# construct correct SAPI string for php-config
+			# thanks to ferringb for the bash voodoo
+			if [[ "${sapi}" == "apache2" ]]; then
+				sapi_list="${sapi_list:+${sapi_list} }apache2handler"
+			else
+				sapi_list="${sapi_list:+${sapi_list} }${sapi}"
+			fi
+		fi
+	done
+
+	# Installing opcache module
+	if use_if_iuse opcache ; then
+		dolib.so "modules/opcache$(get_libname)" || die "Unable to install opcache module"
+	fi
+
+	# Install env.d files
+	newenvd "${FILESDIR}/20php5-envd" \
+		"20php${SLOT}"
+	sed -e "s|/lib/|/$(get_libdir)/|g" -i \
+		"${ED}/etc/env.d/20php${SLOT}"
+	sed -e "s|php5|php${SLOT}|g" -i \
+		"${ED}/etc/env.d/20php${SLOT}"
+
+	# set php-config variable correctly (bug #278439)
+	sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
+		"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config"
+
+	if use fpm ; then
+		if use systemd; then
+			systemd_newunit "${FILESDIR}/php-fpm_at.service" "php-fpm@${SLOT}.service"
+		else
+			systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" "php-fpm@${SLOT}.service"
+		fi
+	fi
+}
+
+src_test() {
+	echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+	PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
+	if [[ ! -x "${PHP_BIN}" ]] ; then
+		ewarn "Test phase requires USE=cli, skipping"
+		return
+	else
+		export TEST_PHP_EXECUTABLE="${PHP_BIN}"
+	fi
+
+	if [[ -x "${WORKDIR}/sapis/cgi/php-cgi" ]] ; then
+		export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis/cgi/php-cgi"
+	fi
+
+	REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n  -d "session.save_path=${T}" \
+		"${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d "session.save_path=${T}"
+
+	for name in ${EXPECTED_TEST_FAILURES}; do
+		mv "${name}.out" "${name}.out.orig" 2>/dev/null
+	done
+
+	local failed="$(find -name '*.out')"
+	if [[ ${failed} != "" ]] ; then
+		ewarn "The following test cases failed unexpectedly:"
+		for name in ${failed}; do
+			ewarn "  ${name/.out/}"
+		done
+	else
+		einfo "No unexpected test failures, all fine"
+	fi
+
+	if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
+		local passed=""
+		for name in ${EXPECTED_TEST_FAILURES}; do
+			[[ -f "${name}.diff" ]] && continue
+			passed="${passed} ${name}"
+		done
+		if [[ ${passed} != "" ]] ; then
+			einfo "The following test cases passed unexpectedly:"
+			for name in ${passed}; do
+				ewarn "  ${passed}"
+			done
+		else
+			einfo "None of the known-to-fail tests passed, all fine"
+		fi
+	fi
+}
+
+pkg_postinst() {
+	# Output some general info to the user
+	if use apache2 ; then
+		APACHE2_MOD_DEFINE="PHP5"
+		APACHE2_MOD_CONF="70_mod_php5"  # actually provided by app-eselect/eselect-php
+		apache-module_pkg_postinst
+	fi
+
+	# Create the symlinks for php
+	for m in ${SAPIS}; do
+		[[ ${m} == 'embed' ]] && continue;
+		if use $m ; then
+			local ci=$(eselect php show $m)
+			if [[ -z $ci ]]; then
+				eselect php set $m php${SLOT}
+				einfo "Switched ${m} to use php:${SLOT}"
+				einfo
+			elif [[ $ci != "php${SLOT}" ]] ; then
+				elog "To switch $m to use php:${SLOT}, run"
+				elog "    eselect php set $m php${SLOT}"
+				elog
+			fi
+		fi
+	done
+
+	elog "Make sure that PHP_TARGETS in ${EPREFIX}/etc/make.conf includes php${SLOT/./-} in order"
+	elog "to compile extensions for the ${SLOT} ABI"
+	elog
+	if ! use readline && use cli ; then
+		ewarn "Note that in order to use php interactivly, you need to enable"
+		ewarn "the readline USE flag or php -a will hang"
+	fi
+	elog
+	elog "This ebuild installed a version of php.ini based on php.ini-${PHP_INI_VERSION} version."
+	elog "You can chose which version of php.ini to install by default by setting PHP_INI_VERSION to either"
+	elog "'production' or 'development' in ${EPREFIX}/etc/make.conf"
+	elog "Both versions of php.ini can be found in ${EPREFIX}/usr/share/doc/${PF}"
+
+	elog
+	elog "For more details on how minor version slotting works (PHP_TARGETS) please read the upgrade guide:"
+	elog "http://www.gentoo.org/proj/en/php/php-upgrading.xml"
+	elog
+}
+
+pkg_prerm() {
+	eselect php cleanup
+}
diff --git a/dev-lang/php/php-5.6.9.ebuild b/dev-lang/php/php-5.6.9.ebuild
new file mode 100644
index 000000000000..8effdf14a397
--- /dev/null
+++ b/dev-lang/php/php-5.6.9.ebuild
@@ -0,0 +1,787 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.6.9.ebuild,v 1.1 2015/05/19 14:36:46 olemarkus Exp $
+
+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"
+
+function php_get_uri ()
+{
+	case "${1}" in
+		"php-pre")
+			echo "http://downloads.php.net/dsp/${2}"
+		;;
+		"php")
+			echo "http://www.php.net/distributions/${2}"
+		;;
+		"olemarkus")
+			echo "http://dev.gentoo.org/~olemarkus/php/${2}"
+		;;
+		"gentoo")
+			echo "mirror://gentoo/${2}"
+		;;
+		*)
+			die "unhandled case in php_get_uri"
+		;;
+	esac
+}
+
+PHP_MV="$(get_major_version)"
+SLOT="$(get_version_component_range 1-2)"
+
+# alias, so we can handle different types of releases (finals, rcs, alphas,
+# betas, ...) w/o changing the whole ebuild
+PHP_PV="${PV/_rc/RC}"
+PHP_PV="${PHP_PV/_alpha/alpha}"
+PHP_PV="${PHP_PV/_beta/beta}"
+PHP_RELEASE="php"
+[[ ${PV} == ${PV/_alpha/} ]] || PHP_RELEASE="php-pre"
+[[ ${PV} == ${PV/_beta/} ]] || PHP_RELEASE="php-pre"
+[[ ${PV} == ${PV/_rc/} ]] || PHP_RELEASE="php-pre"
+PHP_P="${PN}-${PHP_PV}"
+
+PHP_SRC_URI="$(php_get_uri "${PHP_RELEASE}" "${PHP_P}.tar.bz2")"
+
+PHP_FPM_CONF_VER="1"
+
+SRC_URI="${PHP_SRC_URI}"
+
+DESCRIPTION="The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs"
+HOMEPAGE="http://php.net/"
+LICENSE="PHP-3"
+
+S="${WORKDIR}/${PHP_P}"
+
+# We can build the following SAPIs in the given order
+SAPIS="embed cli cgi fpm apache2"
+
+# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
+IUSE="${IUSE}
+	${SAPIS/cli/+cli}
+	threads"
+
+IUSE="${IUSE} bcmath berkdb bzip2 calendar cdb cjk
+	crypt +ctype curl debug
+	enchant exif frontbase +fileinfo +filter firebird
+	flatfile ftp gd gdbm gmp +hash +iconv imap inifile
+	intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash
+	mssql mysql libmysqlclient mysqli nls
+	oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
+	readline recode selinux +session sharedmem
+	+simplexml snmp soap sockets spell sqlite ssl
+	sybase-ct sysvipc systemd tidy +tokenizer truetype unicode vpx wddx
+	+xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib"
+
+DEPEND="
+	>=app-eselect/eselect-php-0.7.1-r3[apache2?,fpm?]
+	>=dev-libs/libpcre-8.32[unicode]
+	apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=]
+		<www-servers/apache-2.4[threads=] ) )
+	berkdb? ( =sys-libs/db-4* )
+	bzip2? ( app-arch/bzip2 )
+	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
+	cjk? ( !gd? (
+		virtual/jpeg:0
+		media-libs/libpng:0=
+		sys-libs/zlib
+	) )
+	crypt? ( >=dev-libs/libmcrypt-2.4 )
+	curl? ( >=net-misc/curl-7.10.5 )
+	enchant? ( app-text/enchant )
+	exif? ( !gd? (
+		virtual/jpeg:0
+		media-libs/libpng:0=
+		sys-libs/zlib
+	) )
+	firebird? ( dev-db/firebird )
+	gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
+	gdbm? ( >=sys-libs/gdbm-1.8.0 )
+	gmp? ( >=dev-libs/gmp-4.1.2 )
+	iconv? ( virtual/libiconv )
+	imap? ( virtual/imap-c-client[ssl=] )
+	intl? ( dev-libs/icu:= )
+	iodbc? ( dev-db/libiodbc )
+	kerberos? ( virtual/krb5 )
+	ldap? ( >=net-nds/openldap-1.2.11 )
+	ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 )
+	libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) )
+	mssql? ( dev-db/freetds[mssql] )
+	libmysqlclient? (
+		mysql? ( virtual/mysql )
+		mysqli? ( >=virtual/mysql-4.1 )
+	)
+	nls? ( sys-devel/gettext )
+	oci8-instant-client? ( dev-db/oracle-instantclient-basic )
+	odbc? ( >=dev-db/unixODBC-1.8.13 )
+	postgres? ( dev-db/postgresql )
+	qdbm? ( dev-db/qdbm )
+	readline? ( sys-libs/readline )
+	recode? ( app-text/recode )
+	sharedmem? ( dev-libs/mm )
+	simplexml? ( >=dev-libs/libxml2-2.6.8 )
+	snmp? ( >=net-analyzer/net-snmp-5.2 )
+	soap? ( >=dev-libs/libxml2-2.6.8 )
+	spell? ( >=app-text/aspell-0.50 )
+	sqlite? ( >=dev-db/sqlite-3.7.6.3 )
+	ssl? ( >=dev-libs/openssl-0.9.7 )
+	sybase-ct? ( dev-db/freetds )
+	tidy? ( app-text/htmltidy )
+	truetype? (
+		=media-libs/freetype-2*
+		>=media-libs/t1lib-5.0.0
+		!gd? (
+			virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
+	)
+	unicode? ( dev-libs/oniguruma )
+	vpx? ( media-libs/libvpx )
+	wddx? ( >=dev-libs/libxml2-2.6.8 )
+	xml? ( >=dev-libs/libxml2-2.6.8 )
+	xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv )
+	xmlreader? ( >=dev-libs/libxml2-2.6.8 )
+	xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
+	xpm? (
+		x11-libs/libXpm
+		virtual/jpeg:0
+		media-libs/libpng:0= sys-libs/zlib
+	)
+	xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
+	zip? ( sys-libs/zlib )
+	zlib? ( sys-libs/zlib )
+	virtual/mta
+"
+
+php="=${CATEGORY}/${PF}"
+
+REQUIRED_USE="
+	truetype? ( gd )
+	vpx? ( gd )
+	cjk? ( gd )
+	exif? ( gd )
+
+	xpm? ( gd )
+	gd? ( zlib )
+	simplexml? ( xml )
+	soap? ( xml )
+	wddx? ( xml )
+	xmlrpc? ( || ( xml iconv ) )
+	xmlreader? ( xml )
+	xslt? ( xml )
+	ldap-sasl? ( ldap )
+	mhash? ( hash )
+	phar? ( hash )
+	libmysqlclient? ( || (
+		mysql
+		mysqli
+		pdo
+	) )
+
+	qdbm? ( !gdbm )
+	readline? ( !libedit )
+	recode? ( !imap !mysql !mysqli )
+	sharedmem? ( !threads )
+
+	!cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )"
+
+RDEPEND="${DEPEND}"
+
+RDEPEND="${RDEPEND}
+	fpm? (
+		selinux? ( sec-policy/selinux-phpfpm )
+		systemd? ( sys-apps/systemd ) )"
+
+DEPEND="${DEPEND}
+	sys-devel/flex
+	>=sys-devel/m4-1.4.3
+	>=sys-devel/libtool-1.5.18"
+
+# Allow users to install production version if they want to
+
+case "${PHP_INI_VERSION}" in
+	production|development)
+		;;
+	*)
+		PHP_INI_VERSION="development"
+		;;
+esac
+
+PHP_INI_UPSTREAM="php.ini-${PHP_INI_VERSION}"
+PHP_INI_FILE="php.ini"
+
+want_apache
+
+pkg_setup() {
+	depend.apache_pkg_setup
+}
+
+php_install_ini() {
+	local phpsapi="${1}"
+
+	# work out where we are installing the ini file
+	php_set_ini_dir "${phpsapi}"
+
+	local phpinisrc="${PHP_INI_UPSTREAM}-${phpsapi}"
+	cp "${PHP_INI_UPSTREAM}" "${phpinisrc}"
+
+	# default to /tmp for save_path, bug #282768
+	sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}"
+
+	# Set the extension dir
+	sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" -i "${phpinisrc}"
+
+	# Set the include path to point to where we want to find PEAR packages
+	sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}"
+
+	dodir "${PHP_INI_DIR#${EPREFIX}}"
+	insinto "${PHP_INI_DIR#${EPREFIX}}"
+	newins "${phpinisrc}" "${PHP_INI_FILE}"
+
+	elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
+	elog
+
+	dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
+	dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
+
+	if use_if_iuse opcache; then
+		elog "Adding opcache to $PHP_EXT_INI_DIR"
+		echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
+		dosym "${PHP_EXT_INI_DIR#${EPREFIX}}/opcache.ini" "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
+	fi
+
+	# SAPI-specific handling
+
+	if [[ "${sapi}" == "fpm" ]] ; then
+		[[ -z ${PHP_FPM_CONF_VER} ]] && PHP_FPM_CONF_VER=0
+		einfo "Installing FPM CGI config file php-fpm.conf"
+		insinto "${PHP_INI_DIR#${EPREFIX}}"
+		newins "${FILESDIR}/php-fpm-r${PHP_FPM_CONF_VER}.conf" php-fpm.conf
+
+		# Remove bogus /etc/php-fpm.conf.default (bug 359906)
+		[[ -f "${ED}/etc/php-fpm.conf.default" ]] && rm "${ED}/etc/php-fpm.conf.default"
+	fi
+
+	# Install PHP ini files into /usr/share/php
+
+	dodoc php.ini-development
+	dodoc php.ini-production
+
+}
+
+php_set_ini_dir() {
+	PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
+	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
+	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
+}
+
+src_prepare() {
+	# USE=sharedmem (session/mod_mm to be exact) tries to mmap() this path
+	# ([empty session.save_path]/session_mm_[sapi][gid].sem)
+	# there is no easy way to circumvent that, all php calls during
+	# install use -n, so no php.ini file will be used.
+	# As such, this is the easiest way to get around
+	addpredict /session_mm_cli250.sem
+	addpredict /session_mm_cli0.sem
+
+	# Change PHP branding
+	# Get the alpha/beta/rc version
+	sed -re	"s|^(PHP_EXTRA_VERSION=\").*(\")|\1-pl${PR/r/}-gentoo\2|g" \
+		-i configure.in || die "Unable to change PHP branding"
+
+	# Patch PHP to show Gentoo as the server platform
+	sed -e 's/PHP_UNAME=`uname -a | xargs`/PHP_UNAME=`uname -s -n -r -v | xargs`/g' \
+		-i configure.in || die "Failed to fix server platform name"
+
+	# Prevent PHP from activating the Apache config,
+	# as we will do that ourselves
+	sed -i \
+		-e "s,-i -a -n php${PHP_MV},-i -n php${PHP_MV},g" \
+		-e "s,-i -A -n php${PHP_MV},-i -n php${PHP_MV},g" \
+		configure sapi/apache2filter/config.m4 sapi/apache2handler/config.m4
+
+	# Patch PHP to support heimdal instead of mit-krb5
+	if has_version "app-crypt/heimdal" ; then
+		sed -e 's|gssapi_krb5|gssapi|g' -i acinclude.m4 \
+			|| die "Failed to fix heimdal libname"
+		sed -e 's|PHP_ADD_LIBRARY(k5crypto, 1, $1)||g' -i acinclude.m4 \
+			|| die "Failed to fix heimdal crypt library reference"
+	fi
+
+	# Fix build with libvpx-1.4.0, bug #545952 .
+	epatch "${FILESDIR}/${PN}-libvpx.patch"
+
+	#Add user patches #357637
+	epatch_user
+
+	#force rebuilding aclocal.m4
+	rm aclocal.m4
+	eautoreconf
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# http://bugs.php.net/bug.php?id=48795, bug #343481
+		sed -i -e '/BUILD_CGI="\\$(CC)/s/CC/CXX/' configure || die
+	fi
+}
+
+src_configure() {
+	addpredict /usr/share/snmp/mibs/.index
+	addpredict /var/lib/net-snmp/mib_indexes
+
+	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
+
+	# This is a global variable and should be in caps. It isn't because the
+	# phpconfutils eclass relies on exactly this name...
+	# for --with-libdir see bug #327025
+	my_conf="
+		--prefix="${PHP_DESTDIR}"
+		--mandir="${PHP_DESTDIR}"/man
+		--infodir="${PHP_DESTDIR}"/info
+		--libdir="${PHP_DESTDIR}"/lib
+		--with-libdir=$(get_libdir)
+		--without-pear
+		$(use_enable threads maintainer-zts)"
+
+	#                             extension		  USE flag        shared
+	my_conf+="
+	$(use_enable bcmath bcmath )
+	$(use_with bzip2 bz2 "${EPREFIX}"/usr)
+	$(use_enable calendar calendar )
+	$(use_enable ctype ctype )
+	$(use_with curl curl "${EPREFIX}"/usr)
+	$(use_enable xml dom )
+	$(use_with enchant enchant "${EPREFIX}"/usr)
+	$(use_enable exif exif )
+	$(use_enable fileinfo fileinfo )
+	$(use_enable filter filter )
+	$(use_enable ftp ftp )
+	$(use_with nls gettext "${EPREFIX}"/usr)
+	$(use_with gmp gmp "${EPREFIX}"/usr)
+	$(use_enable hash hash )
+	$(use_with mhash mhash "${EPREFIX}"/usr)
+	$(use_with iconv iconv $(use elibc_glibc || use elibc_musl || echo "${EPREFIX}"/usr))
+	$(use_enable intl intl )
+	$(use_enable ipv6 ipv6 )
+	$(use_enable json json )
+	$(use_with kerberos kerberos "${EPREFIX}"/usr)
+	$(use_enable xml libxml )
+	$(use_with xml libxml-dir "${EPREFIX}"/usr)
+	$(use_enable unicode mbstring )
+	$(use_with crypt mcrypt "${EPREFIX}"/usr)
+	$(use_with mssql mssql "${EPREFIX}"/usr)
+	$(use_with unicode onig "${EPREFIX}"/usr)
+	$(use_with ssl openssl "${EPREFIX}"/usr)
+	$(use_with ssl openssl-dir "${EPREFIX}"/usr)
+	$(use_enable pcntl pcntl )
+	$(use_enable phar phar )
+	$(use_enable pdo pdo )
+	$(use_enable opcache opcache )
+	$(use_with postgres pgsql "${EPREFIX}"/usr)
+	$(use_enable posix posix )
+	$(use_with spell pspell "${EPREFIX}"/usr)
+	$(use_with recode recode "${EPREFIX}"/usr)
+	$(use_enable simplexml simplexml )
+	$(use_enable sharedmem shmop )
+	$(use_with snmp snmp "${EPREFIX}"/usr)
+	$(use_enable soap soap )
+	$(use_enable sockets sockets )
+	$(use_with sqlite sqlite3 "${EPREFIX}"/usr)
+	$(use_with sybase-ct sybase-ct "${EPREFIX}"/usr)
+	$(use_enable sysvipc sysvmsg )
+	$(use_enable sysvipc sysvsem )
+	$(use_enable sysvipc sysvshm )
+	$(use_with systemd fpm-systemd)
+	$(use_with tidy tidy "${EPREFIX}"/usr)
+	$(use_enable tokenizer tokenizer )
+	$(use_enable wddx wddx )
+	$(use_enable xml xml )
+	$(use_enable xmlreader xmlreader )
+	$(use_enable xmlwriter xmlwriter )
+	$(use_with xmlrpc xmlrpc)
+	$(use_with xslt xsl "${EPREFIX}"/usr)
+	$(use_enable zip zip )
+	$(use_with zlib zlib "${EPREFIX}"/usr)
+	$(use_enable debug debug )"
+
+	# DBA support
+	if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
+		|| use qdbm ; then
+		my_conf="${my_conf} --enable-dba${shared}"
+	fi
+
+	# DBA drivers support
+	my_conf+="
+	$(use_with cdb cdb)
+	$(use_with berkdb db4 ${EPREFIX}/usr)
+	$(use_enable flatfile flatfile )
+	$(use_with gdbm gdbm ${EPREFIX}/usr)
+	$(use_enable inifile inifile )
+	$(use_with qdbm qdbm ${EPREFIX}/usr)"
+
+	# Support for the GD graphics library
+	my_conf+="
+	$(use_with truetype freetype-dir ${EPREFIX}/usr)
+	$(use_with truetype t1lib ${EPREFIX}/usr)
+	$(use_enable cjk gd-jis-conv )
+	$(use_with gd jpeg-dir ${EPREFIX}/usr)
+	$(use_with gd png-dir ${EPREFIX}/usr)
+	$(use_with xpm xpm-dir ${EPREFIX}/usr)
+	$(use_with vpx vpx-dir ${EPREFIX}/usr)"
+	# enable gd last, so configure can pick up the previous settings
+	my_conf+="
+	$(use_with gd gd)"
+
+	# IMAP support
+	if use imap ; then
+		my_conf+="
+		$(use_with imap imap ${EPREFIX}/usr)
+		$(use_with ssl imap-ssl ${EPREFIX}/usr)"
+	fi
+
+	# Interbase/firebird support
+
+	if use firebird ; then
+		my_conf+="
+		$(use_with firebird interbase ${EPREFIX}/usr)"
+	fi
+
+	# LDAP support
+	if use ldap ; then
+		my_conf+="
+		$(use_with ldap ldap ${EPREFIX}/usr)
+		$(use_with ldap-sasl ldap-sasl ${EPREFIX}/usr)"
+	fi
+
+	# MySQL support
+	local mysqllib="mysqlnd"
+	local mysqlilib="mysqlnd"
+	use libmysqlclient && mysqllib="${EPREFIX}/usr"
+	use libmysqlclient && mysqlilib="${EPREFIX}/usr/bin/mysql_config"
+
+	my_conf+=" $(use_with mysql mysql $mysqllib)"
+	my_conf+=" $(use_with mysqli mysqli $mysqlilib)"
+
+	local mysqlsock=" $(use_with mysql mysql-sock ${EPREFIX}/var/run/mysqld/mysqld.sock)"
+	if use mysql ; then
+		my_conf+="${mysqlsock}"
+	elif use mysqli ; then
+		my_conf+="${mysqlsock}"
+	fi
+
+	# ODBC support
+	if use odbc ; then
+		my_conf+="
+		$(use_with odbc unixODBC ${EPREFIX}/usr)"
+	fi
+
+	if use iodbc ; then
+		my_conf+="
+		$(use_with iodbc iodbc ${EPREFIX}/usr)"
+	fi
+
+	# Oracle support
+	if use oci8-instant-client ; then
+		my_conf+="
+		$(use_with oci8-instant-client oci8)"
+	fi
+
+	# PDO support
+	if use pdo ; then
+		my_conf+="
+		$(use_with mssql pdo-dblib )
+		$(use_with mysql pdo-mysql ${mysqllib})
+		$(use_with postgres pdo-pgsql )
+		$(use_with sqlite pdo-sqlite ${EPREFIX}/usr)
+		$(use_with odbc pdo-odbc unixODBC,${EPREFIX}/usr)"
+		if use oci8-instant-client ; then
+			my_conf+="
+			$(use_with oci8-instant-client pdo-oci)"
+		fi
+	fi
+
+	# readline/libedit support
+	my_conf+="
+	$(use_with readline readline ${EPREFIX}/usr)
+	$(use_with libedit libedit ${EPREFIX}/usr)"
+
+	# Session support
+	if use session ; then
+		my_conf+="
+		$(use_with sharedmem mm ${EPREFIX}/usr)"
+	else
+		my_conf+="
+		$(use_enable session session )"
+	fi
+
+	# Use pic for shared modules such as apache2's mod_php
+	my_conf="${my_conf} --with-pic"
+
+	# we use the system copy of pcre
+	# --with-pcre-regex affects ext/pcre
+	# --with-pcre-dir affects ext/filter and ext/zip
+	my_conf="${my_conf} --with-pcre-regex=${EPREFIX}/usr --with-pcre-dir=${EPREFIX}/usr"
+
+	# Catch CFLAGS problems
+	# Fixes bug #14067.
+	# Changed order to run it in reverse for bug #32022 and #12021.
+	replace-cpu-flags "k6*" "i586"
+
+	# Support user-passed configuration parameters
+	my_conf="${my_conf} ${EXTRA_ECONF:-}"
+
+	# Support the Apache2 extras, they must be set globally for all
+	# SAPIs to work correctly, especially for external PHP extensions
+
+	mkdir -p "${WORKDIR}/sapis-build"
+	for one_sapi in $SAPIS ; do
+		use "${one_sapi}" || continue
+		php_set_ini_dir "${one_sapi}"
+
+		cp -r "${S}" "${WORKDIR}/sapis-build/${one_sapi}"
+		cd "${WORKDIR}/sapis-build/${one_sapi}"
+
+		sapi_conf="${my_conf} --with-config-file-path=${PHP_INI_DIR}
+			--with-config-file-scan-dir=${PHP_EXT_INI_DIR_ACTIVE}"
+
+		for sapi in $SAPIS ; do
+			case "$sapi" in
+				cli|cgi|embed|fpm)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf="${sapi_conf} --enable-${sapi}"
+					else
+						sapi_conf="${sapi_conf} --disable-${sapi}"
+					fi
+					;;
+
+				apache2)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf="${sapi_conf} --with-apxs2=${EPREFIX}/usr/sbin/apxs"
+					else
+						sapi_conf="${sapi_conf} --without-apxs2"
+					fi
+					;;
+			esac
+		done
+
+		econf ${sapi_conf}
+	done
+}
+
+src_compile() {
+	# snmp seems to run during src_compile, too (bug #324739)
+	addpredict /usr/share/snmp/mibs/.index
+	addpredict /var/lib/net-snmp/mib_indexes
+
+	for sapi in ${SAPIS} ; do
+		if use "${sapi}"; then
+			cd "${WORKDIR}/sapis-build/$sapi" || "Failed to change dir to ${WORKDIR}/sapis-build/$1"
+			emake || die "emake failed"
+		fi
+	done
+}
+
+src_install() {
+	# see bug #324739 for what happens when we don't have that
+	addpredict /usr/share/snmp/mibs/.index
+
+	# grab the first SAPI that got built and install common files from there
+	local first_sapi=""
+	for sapi in $SAPIS ; do
+		if use $sapi ; then
+			first_sapi=$sapi
+			break
+		fi
+	done
+
+	# Makefile forgets to create this before trying to write to it...
+	dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
+
+	# Install php environment (without any sapis)
+	cd "${WORKDIR}/sapis-build/$first_sapi"
+	emake INSTALL_ROOT="${D}" \
+		install-build install-headers install-programs \
+		|| die "emake install failed"
+
+	local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
+
+	# Create the directory where we'll put version-specific php scripts
+	keepdir /usr/share/php${PHP_MV}
+
+	local sapi="", file=""
+	local sapi_list=""
+
+	for sapi in ${SAPIS}; do
+		if use "${sapi}" ; then
+			einfo "Installing SAPI: ${sapi}"
+			cd "${WORKDIR}/sapis-build/${sapi}"
+
+			if [[ "${sapi}" == "apache2" ]] ; then
+				# We're specifically not using emake install-sapi as libtool
+				# may cause unnecessary relink failures (see bug #351266)
+				insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
+				newins ".libs/libphp5$(get_libname)" "libphp${PHP_MV}$(get_libname)"
+				keepdir "/usr/$(get_libdir)/apache2/modules"
+			else
+				# needed each time, php_install_ini would reset it
+				local dest="${PHP_DESTDIR#${EPREFIX}}"
+				into "${dest}"
+				case "$sapi" in
+					cli)
+						source="sapi/cli/php"
+						;;
+					cgi)
+						source="sapi/cgi/php-cgi"
+						;;
+					fpm)
+						source="sapi/fpm/php-fpm"
+						;;
+					embed)
+						source="libs/libphp${PHP_MV}$(get_libname)"
+						;;
+					*)
+						die "unhandled sapi in src_install"
+						;;
+				esac
+
+				if [[ "${source}" == *"$(get_libname)" ]]; then
+					dolib.so "${source}" || die "Unable to install ${sapi} sapi"
+				else
+					dobin "${source}" || die "Unable to install ${sapi} sapi"
+					local name="$(basename ${source})"
+					dosym "${dest}/bin/${name}" "/usr/bin/${name}${SLOT}"
+				fi
+			fi
+
+			php_install_ini "${sapi}"
+
+			# construct correct SAPI string for php-config
+			# thanks to ferringb for the bash voodoo
+			if [[ "${sapi}" == "apache2" ]]; then
+				sapi_list="${sapi_list:+${sapi_list} }apache2handler"
+			else
+				sapi_list="${sapi_list:+${sapi_list} }${sapi}"
+			fi
+		fi
+	done
+
+	# Installing opcache module
+	if use_if_iuse opcache ; then
+		dolib.so "modules/opcache$(get_libname)" || die "Unable to install opcache module"
+	fi
+
+	# Install env.d files
+	newenvd "${FILESDIR}/20php5-envd" \
+		"20php${SLOT}"
+	sed -e "s|/lib/|/$(get_libdir)/|g" -i \
+		"${ED}/etc/env.d/20php${SLOT}"
+	sed -e "s|php5|php${SLOT}|g" -i \
+		"${ED}/etc/env.d/20php${SLOT}"
+
+	# set php-config variable correctly (bug #278439)
+	sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
+		"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config"
+
+	if use fpm ; then
+		if use systemd; then
+			systemd_newunit "${FILESDIR}/php-fpm_at.service" "php-fpm@${SLOT}.service"
+		else
+			systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" "php-fpm@${SLOT}.service"
+		fi
+	fi
+}
+
+src_test() {
+	echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+	PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
+	if [[ ! -x "${PHP_BIN}" ]] ; then
+		ewarn "Test phase requires USE=cli, skipping"
+		return
+	else
+		export TEST_PHP_EXECUTABLE="${PHP_BIN}"
+	fi
+
+	if [[ -x "${WORKDIR}/sapis/cgi/php-cgi" ]] ; then
+		export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis/cgi/php-cgi"
+	fi
+
+	REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n  -d "session.save_path=${T}" \
+		"${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d "session.save_path=${T}"
+
+	for name in ${EXPECTED_TEST_FAILURES}; do
+		mv "${name}.out" "${name}.out.orig" 2>/dev/null
+	done
+
+	local failed="$(find -name '*.out')"
+	if [[ ${failed} != "" ]] ; then
+		ewarn "The following test cases failed unexpectedly:"
+		for name in ${failed}; do
+			ewarn "  ${name/.out/}"
+		done
+	else
+		einfo "No unexpected test failures, all fine"
+	fi
+
+	if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
+		local passed=""
+		for name in ${EXPECTED_TEST_FAILURES}; do
+			[[ -f "${name}.diff" ]] && continue
+			passed="${passed} ${name}"
+		done
+		if [[ ${passed} != "" ]] ; then
+			einfo "The following test cases passed unexpectedly:"
+			for name in ${passed}; do
+				ewarn "  ${passed}"
+			done
+		else
+			einfo "None of the known-to-fail tests passed, all fine"
+		fi
+	fi
+}
+
+pkg_postinst() {
+	# Output some general info to the user
+	if use apache2 ; then
+		APACHE2_MOD_DEFINE="PHP5"
+		APACHE2_MOD_CONF="70_mod_php5"  # actually provided by app-eselect/eselect-php
+		apache-module_pkg_postinst
+	fi
+
+	# Create the symlinks for php
+	for m in ${SAPIS}; do
+		[[ ${m} == 'embed' ]] && continue;
+		if use $m ; then
+			local ci=$(eselect php show $m)
+			if [[ -z $ci ]]; then
+				eselect php set $m php${SLOT}
+				einfo "Switched ${m} to use php:${SLOT}"
+				einfo
+			elif [[ $ci != "php${SLOT}" ]] ; then
+				elog "To switch $m to use php:${SLOT}, run"
+				elog "    eselect php set $m php${SLOT}"
+				elog
+			fi
+		fi
+	done
+
+	elog "Make sure that PHP_TARGETS in ${EPREFIX}/etc/make.conf includes php${SLOT/./-} in order"
+	elog "to compile extensions for the ${SLOT} ABI"
+	elog
+	if ! use readline && use cli ; then
+		ewarn "Note that in order to use php interactivly, you need to enable"
+		ewarn "the readline USE flag or php -a will hang"
+	fi
+	elog
+	elog "This ebuild installed a version of php.ini based on php.ini-${PHP_INI_VERSION} version."
+	elog "You can chose which version of php.ini to install by default by setting PHP_INI_VERSION to either"
+	elog "'production' or 'development' in ${EPREFIX}/etc/make.conf"
+	elog "Both versions of php.ini can be found in ${EPREFIX}/usr/share/doc/${PF}"
+
+	elog
+	elog "For more details on how minor version slotting works (PHP_TARGETS) please read the upgrade guide:"
+	elog "http://www.gentoo.org/proj/en/php/php-upgrading.xml"
+	elog
+}
+
+pkg_prerm() {
+	eselect php cleanup
+}
diff --git a/dev-lang/scala/scala-2.11.4-r1.ebuild b/dev-lang/scala/scala-2.11.4-r1.ebuild
index 6e7e24eb4779..c1486680ca2a 100644
--- a/dev-lang/scala/scala-2.11.4-r1.ebuild
+++ b/dev-lang/scala/scala-2.11.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/scala/scala-2.11.4-r1.ebuild,v 1.3 2015/05/18 21:15:40 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/scala/scala-2.11.4-r1.ebuild,v 1.4 2015/05/19 09:27:21 ago Exp $
 
 EAPI="5"
 
@@ -63,7 +63,7 @@ binary? ( http://dev.gentoo.org/~gienah/files/dist/${P}-gentoo-binary.tar.bz2 )"
 
 LICENSE="BSD"
 SLOT="${SV}/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~x86-macos"
 
 IUSE="binary emacs"
 
diff --git a/dev-libs/libksba/libksba-1.3.3.ebuild b/dev-libs/libksba/libksba-1.3.3.ebuild
index 07465b63cc61..a315cad1a3b6 100644
--- a/dev-libs/libksba/libksba-1.3.3.ebuild
+++ b/dev-libs/libksba/libksba-1.3.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libksba/libksba-1.3.3.ebuild,v 1.5 2015/05/18 08:45:54 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libksba/libksba-1.3.3.ebuild,v 1.6 2015/05/19 07:22:28 ago Exp $
 
 EAPI="4"
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://gnupg/libksba/${P}.tar.bz2"
 
 LICENSE="LGPL-3+ GPL-2+ GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND=">=dev-libs/libgpg-error-1.8"
diff --git a/dev-libs/libtasn1/libtasn1-4.5.ebuild b/dev-libs/libtasn1/libtasn1-4.5.ebuild
index fb1a1192ff8e..3254b0a43b1a 100644
--- a/dev-libs/libtasn1/libtasn1-4.5.ebuild
+++ b/dev-libs/libtasn1/libtasn1-4.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libtasn1/libtasn1-4.5.ebuild,v 1.7 2015/05/13 06:48:38 jmorgan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libtasn1/libtasn1-4.5.ebuild,v 1.8 2015/05/19 07:25:19 ago Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3 LGPL-2.1"
 SLOT="0/6" # subslot = libtasn1 soname version
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc static-libs"
 
 DEPEND=">=dev-lang/perl-5.6
diff --git a/dev-ruby/rubygems/Manifest b/dev-ruby/rubygems/Manifest
index 50e74873f702..ffed099abc00 100644
--- a/dev-ruby/rubygems/Manifest
+++ b/dev-ruby/rubygems/Manifest
@@ -1,2 +1,4 @@
 DIST rubygems-2.2.2.tgz 414111 SHA256 572dd13baa1dfb9756db9fbfeb629be1634efddb7014c552845c0e9a5a643009 SHA512 574d72436356ae66834ee6991e4a886e37babc98ca5b270086f43b5a85f8fdb50365f5a2109e937163dad5a1b8a4d66f16d2308ed27438c99be036b3e56d3dd1 WHIRLPOOL 442efa9ed4bf4e39802f5c9307e0d4ae55372daf47e7a3d98d55a3d9e79afdb10f8e32e95ea0166d2fa264dc0c8d2bc01b8ec4de31fc022ef950b0cb8794a4bd
+DIST rubygems-2.2.4.tgz 416708 SHA256 31a9e25a7ce8c4d6547cdd31cb504af8f643bb26c865227a66113673853fa5cb SHA512 f7e345698f09cf6148fc7a3ccedcb4914a234f40baca8e03c9fb37b1209ae7aa0d48e8b20a6868289759df5b5c05b79ff308dd8f1b0de41c916b8550ba7f2978 WHIRLPOOL b561651ed96ac9c525104d6a785f88e19dda475cb38b04687ecdf64f1683659750bc84b85f87bbddd0436710bd0d985641f6417bb249dd9be29317c8fff1ca05
 DIST rubygems-2.4.6.tgz 447588 SHA256 76d3f3b10aa824d23a511f098ab777c6473b98ffa733f7be4222408897b68db9 SHA512 2cf5447e0de8e8f85916e91774eba1f2113397d3ed7147671b74443696574ba0478d8f2aec789d024eabcd5afc1c4910dbe71f389b30045fa50bde14d2bb1cb1 WHIRLPOOL e901f4354c706666b8f85cd0d345c8ad04eecb88914927e9b213bd7a83fd9be42c3d1082da87cafce0cc05deafa70436250a2fee92b62f91e6e113fbfa66c1b0
+DIST rubygems-2.4.7.tgz 447941 SHA256 62fabf8b1a3009cf65f0fc9c2bad68754aa229780d7139232c4ca9f4708ad6ec SHA512 28de22094c2815a70484f4362b5fc77ee225362e9736f88b25dceea724c567bc2d4135dcb809f298c9a2f49395995486e6131bde7e502882e27f87f482bce110 WHIRLPOOL a1f008cf54d176199a49134227bd324a0ccec9337f0e03b49a44616a7704a42753ebf34b74bba20679980398c73a7b6179d9dd575185b8d2dc13f117cf1db823
diff --git a/dev-ruby/rubygems/rubygems-2.2.4.ebuild b/dev-ruby/rubygems/rubygems-2.2.4.ebuild
new file mode 100644
index 000000000000..a0e282ccc1b9
--- /dev/null
+++ b/dev-ruby/rubygems/rubygems-2.2.4.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubygems/rubygems-2.2.4.ebuild,v 1.1 2015/05/19 05:37:22 graaff Exp $
+
+EAPI=5
+
+USE_RUBY="ruby19 ruby20"
+
+inherit ruby-ng prefix
+
+DESCRIPTION="Centralized Ruby extension management system"
+HOMEPAGE="http://rubyforge.org/projects/rubygems/"
+LICENSE="|| ( Ruby MIT )"
+
+SRC_URI="http://production.cf.rubygems.org/rubygems/${P}.tgz"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+SLOT="0"
+IUSE="server test"
+
+PDEPEND="server? ( >=dev-ruby/builder-2.1 )"
+
+ruby_add_bdepend "
+	test? (
+		>=dev-ruby/minitest-4:0
+		dev-ruby/rdoc
+	)"
+
+all_ruby_prepare() {
+	mkdir -p lib/rubygems/defaults || die
+	cp "${FILESDIR}/gentoo-defaults.rb" lib/rubygems/defaults/operating_system.rb || die
+
+	eprefixify lib/rubygems/defaults/operating_system.rb
+
+	# Disable broken tests when changing default values:
+	sed -i -e '/test_check_executable_overwrite_default_bin_dir/,/^  end/ s:^:#:' test/rubygems/test_gem_installer.rb || die
+
+	# Remove a test that fails when yard is installed.
+	sed -i -e '/test_self_attribute_names/,/^  end/ s:^:#:' test/rubygems/test_gem_specification.rb || die
+
+	# Skip tests for default gems that all fail
+	sed -i -e '/test_default_gems_use_full_paths/,/^  end/ s:^:#:' test/rubygems/test_gem.rb || die
+	sed -i -e '/test_execute_ignore_default_gem_verbose/,/^  end/ s:^:#:' test/rubygems/test_gem_commands_cleanup_command.rb || die
+	sed -i -e '/test_execute_default_gem/,/^  end/ s:^:#:' test/rubygems/test_gem_commands_contents_command.rb test/rubygems/test_gem_commands_pristine_command.rb || die
+	sed -i -e '/test_execute_default_details/,/^  end/ s:^:#:' test/rubygems/test_gem_commands_query_command.rb || die
+	sed -i -e '/test_execute_all/,/^  end/ s:^:#:' test/rubygems/test_gem_commands_uninstall_command.rb || die
+	sed -i -e '/test_load_default_gem/,/^  end/ s:^:#:' test/rubygems/test_gem_specification.rb || die
+	sed -i -e '/test_uninstall_default_gem/,/^  end/ s:^:#:' test/rubygems/test_gem_uninstaller.rb || die
+	sed -i -e '/test_alien_default/,/^  end/ s:^:#:' test/rubygems/test_gem_validator.rb || die
+
+	# Avoid tests playing tricks with ruby engine that don't seem to
+	# work for us.
+	rm test/rubygems/test_gem_request_set_gem_dependency_api.rb || die
+
+	# Avoid test requiring network access
+	sed -i -e '/test_download_to_cache/askip "requires network access"' test/rubygems/test_gem_remote_fetcher.rb || die
+}
+
+each_ruby_compile() {
+	# Not really a build but...
+	sed -i -e 's:#!.*:#!'"${RUBY}"':' bin/gem
+}
+
+each_ruby_test() {
+	# Unset RUBYOPT to avoid interferences, bug #158455 et. al.
+	#unset RUBYOPT
+
+	if [[ "${EUID}" -ne "0" ]]; then
+		RUBYLIB="$(pwd)/lib${RUBYLIB+:${RUBYLIB}}" ${RUBY} -I.:lib:test \
+			-e 'Dir["test/**/test_*.rb"].each { |tu| require tu }' || die "tests failed"
+	else
+		ewarn "The userpriv feature must be enabled to run tests, bug 408951."
+		eerror "Testsuite will not be run."
+	fi
+}
+
+each_ruby_install() {
+	# Unset RUBYOPT to avoid interferences, bug #158455 et. al.
+	unset RUBYOPT
+	export RUBYLIB="$(pwd)/lib${RUBYLIB+:${RUBYLIB}}"
+
+	pushd lib &>/dev/null
+	doruby -r *
+	popd &>/dev/null
+
+	local sld=$(ruby_rbconfig_value 'sitelibdir')
+	insinto "${sld#${EPREFIX}}"  # bug #320813
+	newins "${FILESDIR}/auto_gem.rb.ruby19" auto_gem.rb || die
+
+	newbin bin/gem $(basename ${RUBY} | sed -e 's:ruby:gem:') || die
+}
+
+all_ruby_install() {
+	dodoc History.txt README.rdoc
+
+	if use server; then
+		newinitd "${FILESDIR}/init.d-gem_server2" gem_server || die "newinitd failed"
+		newconfd "${FILESDIR}/conf.d-gem_server" gem_server || die "newconfd failed"
+	fi
+}
+
+pkg_postinst() {
+	if [[ ! -n $(readlink "${ROOT}"usr/bin/gem) ]] ; then
+		eselect ruby set $(eselect --brief --no-color ruby show | head -n1)
+	fi
+
+	ewarn
+	ewarn "To switch between available Ruby profiles, execute as root:"
+	ewarn "\teselect ruby set ruby(19|20|...)"
+	ewarn
+}
+
+pkg_postrm() {
+	ewarn "If you have uninstalled dev-ruby/rubygems, Ruby applications are unlikely"
+	ewarn "to run in current shells because of missing auto_gem."
+	ewarn "Please run \"unset RUBYOPT\" in your shells before using ruby"
+	ewarn "or start new shells"
+	ewarn
+	ewarn "If you have not uninstalled dev-ruby/rubygems, please do not unset "
+	ewarn "RUBYOPT"
+}
diff --git a/dev-ruby/rubygems/rubygems-2.4.7.ebuild b/dev-ruby/rubygems/rubygems-2.4.7.ebuild
new file mode 100644
index 000000000000..7c3399e36e67
--- /dev/null
+++ b/dev-ruby/rubygems/rubygems-2.4.7.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubygems/rubygems-2.4.7.ebuild,v 1.1 2015/05/19 05:37:22 graaff Exp $
+
+EAPI=5
+
+USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+
+inherit ruby-ng prefix
+
+DESCRIPTION="Centralized Ruby extension management system"
+HOMEPAGE="http://rubyforge.org/projects/rubygems/"
+LICENSE="|| ( Ruby MIT )"
+
+SRC_URI="http://production.cf.rubygems.org/rubygems/${P}.tgz"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+SLOT="0"
+IUSE="server test"
+
+PDEPEND="server? ( >=dev-ruby/builder-2.1 )"
+
+ruby_add_bdepend "
+	test? (
+		>=dev-ruby/minitest-4:0
+		dev-ruby/rdoc
+	)"
+
+all_ruby_prepare() {
+
+	mkdir -p lib/rubygems/defaults || die
+	cp "${FILESDIR}/gentoo-defaults.rb" lib/rubygems/defaults/operating_system.rb || die
+
+	eprefixify lib/rubygems/defaults/operating_system.rb
+
+	# Disable broken tests when changing default values:
+	sed -i -e '/test_check_executable_overwrite_default_bin_dir/,/^  end/ s:^:#:' test/rubygems/test_gem_installer.rb || die
+	sed -i -e '/test_default_path/,/^  end/ s:^:#:' test/rubygems/test_gem.rb || die
+
+	# Remove a test that fails when yard is installed.
+	sed -i -e '/test_self_attribute_names/,/^  end/ s:^:#:' test/rubygems/test_gem_specification.rb || die
+
+	# Skip tests for default gems that all fail
+	sed -i -e '/test_default_gems_use_full_paths/,/^  end/ s:^:#:' test/rubygems/test_gem.rb || die
+	sed -i -e '/test_execute_ignore_default_gem_verbose/,/^  end/ s:^:#:' test/rubygems/test_gem_commands_cleanup_command.rb || die
+	sed -i -e '/test_execute_default_gem/,/^  end/ s:^:#:' test/rubygems/test_gem_commands_contents_command.rb test/rubygems/test_gem_commands_pristine_command.rb || die
+	sed -i -e '/test_execute_default_details/,/^  end/ s:^:#:' test/rubygems/test_gem_commands_query_command.rb || die
+	sed -i -e '/test_execute_all/,/^  end/ s:^:#:' test/rubygems/test_gem_commands_uninstall_command.rb || die
+	sed -i -e '/test_load_default_gem/,/^  end/ s:^:#:' test/rubygems/test_gem_specification.rb || die
+	sed -i -e '/test_uninstall_default_gem/,/^  end/ s:^:#:' test/rubygems/test_gem_uninstaller.rb || die
+	sed -i -e '/test_alien_default/,/^  end/ s:^:#:' test/rubygems/test_gem_validator.rb || die
+
+	# Avoid tests playing tricks with ruby engine that don't seem to
+	# work for us.
+	rm test/rubygems/test_gem_request_set_gem_dependency_api.rb || die
+
+	# Avoid test requiring network access
+	sed -i -e '/test_download_to_cache/askip "requires network access"' test/rubygems/test_gem_remote_fetcher.rb || die
+}
+
+each_ruby_compile() {
+	# Not really a build but...
+	sed -i -e 's:#!.*:#!'"${RUBY}"':' bin/gem
+}
+
+each_ruby_test() {
+	# Unset RUBYOPT to avoid interferences, bug #158455 et. al.
+	#unset RUBYOPT
+
+	if [[ "${EUID}" -ne "0" ]]; then
+		RUBYLIB="$(pwd)/lib${RUBYLIB+:${RUBYLIB}}" ${RUBY} -I.:lib:test \
+			-e 'Dir["test/**/test_*.rb"].each { |tu| require tu }' || die "tests failed"
+	else
+		ewarn "The userpriv feature must be enabled to run tests, bug 408951."
+		eerror "Testsuite will not be run."
+	fi
+}
+
+each_ruby_install() {
+	# Unset RUBYOPT to avoid interferences, bug #158455 et. al.
+	unset RUBYOPT
+	export RUBYLIB="$(pwd)/lib${RUBYLIB+:${RUBYLIB}}"
+
+	pushd lib &>/dev/null
+	doruby -r *
+	popd &>/dev/null
+
+	local sld=$(ruby_rbconfig_value 'sitelibdir')
+	insinto "${sld#${EPREFIX}}"  # bug #320813
+	newins "${FILESDIR}/auto_gem.rb.ruby19" auto_gem.rb || die
+
+	newbin bin/gem $(basename ${RUBY} | sed -e 's:ruby:gem:') || die
+}
+
+all_ruby_install() {
+	dodoc History.txt README.rdoc
+
+	if use server; then
+		newinitd "${FILESDIR}/init.d-gem_server2" gem_server || die "newinitd failed"
+		newconfd "${FILESDIR}/conf.d-gem_server" gem_server || die "newconfd failed"
+	fi
+}
+
+pkg_postinst() {
+	if [[ ! -n $(readlink "${ROOT}"usr/bin/gem) ]] ; then
+		eselect ruby set $(eselect --brief --no-color ruby show | head -n1)
+	fi
+
+	ewarn
+	ewarn "To switch between available Ruby profiles, execute as root:"
+	ewarn "\teselect ruby set ruby(20|21|...)"
+	ewarn
+}
diff --git a/games-strategy/glob2/glob2-0.9.4.4-r1.ebuild b/games-strategy/glob2/glob2-0.9.4.4-r1.ebuild
index 33cf73dd1960..6b70cd5be184 100644
--- a/games-strategy/glob2/glob2-0.9.4.4-r1.ebuild
+++ b/games-strategy/glob2/glob2-0.9.4.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/glob2/glob2-0.9.4.4-r1.ebuild,v 1.5 2015/05/04 21:21:32 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/glob2/glob2-0.9.4.4-r1.ebuild,v 1.6 2015/05/19 15:54:53 mr_bones_ Exp $
 
 EAPI=5
 inherit eutils gnome2-utils scons-utils games
@@ -27,7 +27,9 @@ RDEPEND="
 	virtual/opengl"
 DEPEND="${RDEPEND}"
 
-PATCHES=( "${FILESDIR}"/${P}-{gcc44,scons-blows,underlinking,gcc49}.patch )
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-{gcc44,scons-blows,underlinking,gcc49}.patch
+}
 
 src_configure() {
 	myesconsargs=(
diff --git a/java-virtuals/interceptor-api/interceptor-api-0.ebuild b/java-virtuals/interceptor-api/interceptor-api-0.ebuild
index 1d877afc0982..3bc443b501b9 100644
--- a/java-virtuals/interceptor-api/interceptor-api-0.ebuild
+++ b/java-virtuals/interceptor-api/interceptor-api-0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/java-virtuals/interceptor-api/interceptor-api-0.ebuild,v 1.2 2014/03/10 21:05:51 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/java-virtuals/interceptor-api/interceptor-api-0.ebuild,v 1.3 2015/05/19 09:30:05 ago Exp $
 
 EAPI="5"
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.gentoo.org"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 DEPEND=""
 RDEPEND="dev-java/glassfish-interceptor-api:0"
diff --git a/kde-frameworks/sonnet/sonnet-5.10.0.ebuild b/kde-frameworks/sonnet/sonnet-5.10.0.ebuild
index 0ef2b93ffe0b..3ae231490b0a 100644
--- a/kde-frameworks/sonnet/sonnet-5.10.0.ebuild
+++ b/kde-frameworks/sonnet/sonnet-5.10.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-frameworks/sonnet/sonnet-5.10.0.ebuild,v 1.1 2015/05/09 10:36:04 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-frameworks/sonnet/sonnet-5.10.0.ebuild,v 1.2 2015/05/19 13:29:18 kensington Exp $
 
 EAPI=5
 
@@ -9,7 +9,7 @@ inherit kde5
 DESCRIPTION="Framework for providing spell-checking capabilities through abstraction of popular backends"
 LICENSE="LGPL-2+ LGPL-2.1+"
 KEYWORDS="~amd64 ~x86"
-IUSE="aspell hunspell nls"
+IUSE="+aspell hunspell nls"
 
 RDEPEND="
 	dev-qt/qtgui:5
diff --git a/kde-frameworks/sonnet/sonnet-5.9.0.ebuild b/kde-frameworks/sonnet/sonnet-5.9.0.ebuild
index ef2b5be93405..ea5c1f828349 100644
--- a/kde-frameworks/sonnet/sonnet-5.9.0.ebuild
+++ b/kde-frameworks/sonnet/sonnet-5.9.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-frameworks/sonnet/sonnet-5.9.0.ebuild,v 1.1 2015/04/11 17:09:48 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-frameworks/sonnet/sonnet-5.9.0.ebuild,v 1.2 2015/05/19 13:29:18 kensington Exp $
 
 EAPI=5
 
@@ -9,7 +9,7 @@ inherit kde5
 DESCRIPTION="Framework for providing spell-checking capabilities through abstraction of popular backends"
 LICENSE="LGPL-2+ LGPL-2.1+"
 KEYWORDS="~amd64 ~x86"
-IUSE="aspell hunspell nls"
+IUSE="+aspell hunspell nls"
 
 RDEPEND="
 	dev-qt/qtgui:5
diff --git a/media-libs/lensfun/lensfun-0.2.8.ebuild b/media-libs/lensfun/lensfun-0.2.8.ebuild
deleted file mode 100644
index e495837b6bf5..000000000000
--- a/media-libs/lensfun/lensfun-0.2.8.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/lensfun/lensfun-0.2.8.ebuild,v 1.14 2015/04/08 17:59:35 mgorny Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit multilib python-single-r1 cmake-utils
-
-DESCRIPTION="lensfun: A library for rectifying and simulating photographic lens distortions"
-HOMEPAGE="http://lensfun.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="LGPL-3 CC-BY-SA-3.0" # See README for reasoning.
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
-IUSE="doc cpu_flags_x86_sse cpu_flags_x86_sse2"
-
-RDEPEND=">=dev-libs/glib-2.28
-	media-libs/libpng:0=
-	sys-libs/zlib:="
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-build.patch
-	"${FILESDIR}"/${P}-x32.patch
-)
-
-DOCS=( README docs/mounts.txt )
-
-src_configure() {
-	local mycmakeargs=(
-		-DDOCDIR="${EPREFIX}"/usr/share/doc/${PF}/html
-		-DLIBDIR=$(get_libdir)
-		-DBUILD_AUXFUN=ON
-		$(cmake-utils_use_build doc)
-		$(cmake-utils_use_build cpu_flags_x86_sse FOR_SSE)
-		$(cmake-utils_use_build cpu_flags_x86_sse2 FOR_SSE2)
-		-DBUILD_STATIC=OFF
-		-DBUILD_TESTS=OFF
-		)
-
-	cmake-utils_src_configure
-}
diff --git a/media-libs/x265/Manifest b/media-libs/x265/Manifest
index 07e0c007a110..ff456413d5c6 100644
--- a/media-libs/x265/Manifest
+++ b/media-libs/x265/Manifest
@@ -1,3 +1,2 @@
-DIST x265-1.3.tar.bz2 562401 SHA256 3807090a99bc351894d58eb037db4f1487b2dba3489eb2c38ab43dd6b7c9b09d SHA512 6743ba5796e032e3b814a2702b88d08c8228da5b0d7cc97f5e38052427f56ba101d63f6076c2438377b72de8d57bb26c350a908920e78faadfe84a14fdafa655 WHIRLPOOL 03114c0f719dfaecc7c970f89ee4eb5cfb46f1f94619bd80f0721ddb32b48f34f1e75ee727168035126edd6355101786b89ae718a786803f26dcca2f102793d8
-DIST x265-1.4.tar.bz2 561381 SHA256 e818cacd6a963d49813dbe6c041888311a237da95896e604b4c91b2ddfac83a5 SHA512 f095fe75d60db15a01af66e60fb3bb880b58f43cdd08fe264e30732a8a6532015bde716a13d06dfe5aad821c95f984dc4b967bb40c4f7a752848c8f81ccae749 WHIRLPOOL d66ee36315f61f7a46c00b49caa4000fc04f742864b189ba45c570c741275f5a37c659f70d7d5d139a410639a0e4ab2f4b4160b6bf28e27735ed628648ea307c
 DIST x265-1.5.tar.bz2 588263 SHA256 da226cbe56938f85d5a3d123d1f5ca895795f2eac794e45af4b70047e03d8648 SHA512 e5db8c3428b7b393c5c3049041de152b43821a083bc1988903ade8d6ce5fdc71a2fe0ad9efa0564aa3c2c6f1ec31659fcd2b338f6b53d22a202811be7071f077 WHIRLPOOL 9e1256832a3ece06d68a872b44337285afbbeebbd149ac71fda25524d60310f595adedce1b28f0ed5a59feadef39848d797bd58f4b0d7c7d707bcddca7520f6d
+DIST x265_1.7.tar.gz 844212 SHA256 a52ca95e8e64219c1e8e73a9abf0bb7151ced2c93756a623cf2b7e5cf8226585 SHA512 cf6fce24b008d36bbc79e2488ab5fb3010aa588113645597ffc66959088a73b3ba72f6bb81bd16e36847a73b50b8f264cff0899162552418ae499170c286eb89 WHIRLPOOL 9c932fd85fbc06a63802f8aabdbb5f44fe4bee6bc2d0996df8788acad30be965bde7b56f562e4ca8ae87856fbcf728b6938a701afb397ef2195437b73a60c744
diff --git a/media-libs/x265/x265-1.3.ebuild b/media-libs/x265/x265-1.3.ebuild
deleted file mode 100644
index 20ae72269caf..000000000000
--- a/media-libs/x265/x265-1.3.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/x265/x265-1.3.ebuild,v 1.1 2014/09/12 07:05:00 ssuominen Exp $
-
-EAPI=5
-
-inherit cmake-multilib multilib flag-o-matic
-
-if [[ ${PV} = 9999* ]]; then
-	inherit mercurial
-	EHG_REPO_URI="http://bitbucket.org/multicoreware/x265"
-else
-	SRC_URI="https://bitbucket.org/multicoreware/x265/get/${PV}.tar.bz2 -> ${P}.tar.bz2"
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="Library for encoding video streams into the H.265/HEVC format"
-HOMEPAGE="http://x265.org/"
-
-LICENSE="GPL-2"
-# subslot = libx265 soname
-SLOT="0/31"
-IUSE="+10bit test"
-
-ASM_DEPEND=">=dev-lang/yasm-1.2.0"
-RDEPEND=""
-DEPEND="${RDEPEND}
-	abi_x86_32? ( ${ASM_DEPEND} )
-	abi_x86_64? ( ${ASM_DEPEND} )"
-
-src_unpack() {
-	if [[ ${PV} = 9999* ]]; then
-		mercurial_src_unpack
-		# Can't set it at global scope due to mercurial.eclass limitations...
-		export S=${WORKDIR}/${P}/source
-	else
-		unpack ${A}
-		export S=$(echo "${WORKDIR}"/*${PN}*/source)
-	fi
-}
-
-multilib_src_configure() {
-	append-cflags -fPIC
-	append-cxxflags -fPIC
-	local mycmakeargs=(
-		$(cmake-utils_use_enable test TESTS)
-		$(multilib_is_native_abi || echo "-DENABLE_CLI=OFF")
-		-DHIGH_BIT_DEPTH=$(usex 10bit "ON" "OFF")
-		-DLIB_INSTALL_DIR="$(get_libdir)"
-	)
-	cmake-utils_src_configure
-}
-
-src_configure() {
-	multilib_parallel_foreach_abi multilib_src_configure
-}
-
-multilib_src_test() {
-	cd "${BUILD_DIR}/test" || die
-	for i in PoolTest TestBench ; do
-		./${i} || die
-	done
-}
-
-src_test() {
-	multilib_foreach_abi multilib_src_test
-}
-
-src_install() {
-	cmake-multilib_src_install
-	dodoc -r "${S}/../doc/"*
-}
diff --git a/media-libs/x265/x265-1.4.ebuild b/media-libs/x265/x265-1.7.ebuild
similarity index 65%
rename from media-libs/x265/x265-1.4.ebuild
rename to media-libs/x265/x265-1.7.ebuild
index a3abfe63a764..6fb781aff68e 100644
--- a/media-libs/x265/x265-1.4.ebuild
+++ b/media-libs/x265/x265-1.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/x265/x265-1.4.ebuild,v 1.2 2015/05/01 18:53:21 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/x265/x265-1.7.ebuild,v 1.1 2015/05/19 09:22:17 aballier Exp $
 
 EAPI=5
 
@@ -10,8 +10,10 @@ if [[ ${PV} = 9999* ]]; then
 	inherit mercurial
 	EHG_REPO_URI="http://bitbucket.org/multicoreware/x265"
 else
-	SRC_URI="https://bitbucket.org/multicoreware/x265/get/${PV}.tar.bz2 -> ${P}.tar.bz2"
-	KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+	SRC_URI="
+		https://bitbucket.org/multicoreware/x265/downloads/${PN}_${PV}.tar.gz
+		http://ftp.videolan.org/pub/videolan/x265/${PN}_${PV}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
 fi
 
 DESCRIPTION="Library for encoding video streams into the H.265/HEVC format"
@@ -19,7 +21,7 @@ HOMEPAGE="http://x265.org/"
 
 LICENSE="GPL-2"
 # subslot = libx265 soname
-SLOT="0/35"
+SLOT="0/48"
 IUSE="+10bit test"
 
 ASM_DEPEND=">=dev-lang/yasm-1.2.0"
@@ -35,7 +37,7 @@ src_unpack() {
 		export S=${WORKDIR}/${P}/source
 	else
 		unpack ${A}
-		export S=$(echo "${WORKDIR}"/*${PN}*/source)
+		export S="${WORKDIR}/${PN}_${PV}/source"
 	fi
 }
 
@@ -48,6 +50,12 @@ multilib_src_configure() {
 		-DHIGH_BIT_DEPTH=$(usex 10bit "ON" "OFF")
 		-DLIB_INSTALL_DIR="$(get_libdir)"
 	)
+
+	if [ "${ABI}" = x86 ] ; then
+		use 10bit && ewarn "Disabling 10bit support on x86 as it does not build (or requires to disable assembly optimizations)"
+		mycmakeargs+=( -DHIGH_BIT_DEPTH=OFF )
+	fi
+
 	cmake-utils_src_configure
 }
 
@@ -56,10 +64,12 @@ src_configure() {
 }
 
 multilib_src_test() {
-	cd "${BUILD_DIR}/test" || die
-	for i in PoolTest TestBench ; do
-		./${i} || die
-	done
+	if has ${MULTILIB_ABI_FLAG} abi_x86_32 abi_x86_64 ; then
+		cd "${BUILD_DIR}/test" || die
+		for i in TestBench ; do
+			./${i} || die
+		done
+	fi
 }
 
 src_test() {
diff --git a/media-libs/x265/x265-9999.ebuild b/media-libs/x265/x265-9999.ebuild
index 3e63460e487b..8a28e311cf63 100644
--- a/media-libs/x265/x265-9999.ebuild
+++ b/media-libs/x265/x265-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/x265/x265-9999.ebuild,v 1.13 2015/03/17 15:24:52 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/x265/x265-9999.ebuild,v 1.14 2015/05/19 09:22:17 aballier Exp $
 
 EAPI=5
 
@@ -10,8 +10,10 @@ if [[ ${PV} = 9999* ]]; then
 	inherit mercurial
 	EHG_REPO_URI="http://bitbucket.org/multicoreware/x265"
 else
-	SRC_URI="https://bitbucket.org/multicoreware/x265/get/${PV}.tar.bz2 -> ${P}.tar.bz2"
-	KEYWORDS="~amd64 ~arm ~x86"
+	SRC_URI="
+		https://bitbucket.org/multicoreware/x265/downloads/${PN}_${PV}.tar.gz
+		http://ftp.videolan.org/pub/videolan/x265/${PN}_${PV}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
 fi
 
 DESCRIPTION="Library for encoding video streams into the H.265/HEVC format"
@@ -35,7 +37,7 @@ src_unpack() {
 		export S=${WORKDIR}/${P}/source
 	else
 		unpack ${A}
-		export S=$(echo "${WORKDIR}"/*${PN}*/source)
+		export S="${WORKDIR}/${PN}_${PV}/source"
 	fi
 }
 
@@ -48,6 +50,12 @@ multilib_src_configure() {
 		-DHIGH_BIT_DEPTH=$(usex 10bit "ON" "OFF")
 		-DLIB_INSTALL_DIR="$(get_libdir)"
 	)
+
+	if [ "${ABI}" = x86 ] ; then
+		use 10bit && ewarn "Disabling 10bit support on x86 as it does not build (or requires to disable assembly optimizations)"
+		mycmakeargs+=( -DHIGH_BIT_DEPTH=OFF )
+	fi
+
 	cmake-utils_src_configure
 }
 
diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild
index ecc9ccc4c0df..af52a78b8caf 100644
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.188 2015/03/17 08:15:35 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.189 2015/05/19 09:24:10 aballier Exp $
 
 EAPI="5"
 
@@ -172,7 +172,7 @@ RDEPEND="
 		wavpack? ( >=media-sound/wavpack-4.60.1-r1[${MULTILIB_USEDEP}] )
 		webp? ( >=media-libs/libwebp-0.3.0[${MULTILIB_USEDEP}] )
 		x264? ( >=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}] )
-		x265? ( >=media-libs/x265-1.2:=[${MULTILIB_USEDEP}] )
+		x265? ( >=media-libs/x265-1.6:=[${MULTILIB_USEDEP}] )
 		xvid? ( >=media-libs/xvid-1.3.2-r1[${MULTILIB_USEDEP}] )
 	)
 	fdk? ( >=media-libs/fdk-aac-0.1.3:=[${MULTILIB_USEDEP}] )
diff --git a/media-video/mpv/Manifest b/media-video/mpv/Manifest
index b2c312be3af3..4ae72e631c09 100644
--- a/media-video/mpv/Manifest
+++ b/media-video/mpv/Manifest
@@ -1,5 +1,6 @@
 DIST mpv-0.3.10.tar.gz 2520710 SHA256 ec1d9751f9c43f66e13a988c94748ee2e1d8188498001f905213c9ccdf573fce SHA512 fdf84439747e24b4278f09427fc22d6497d2105cf94cd3c45dfb134af917f81c4748d618e962fb13a9db2b7a260a88a409590d10aae71ac987831bc3d293196e WHIRLPOOL d9a4eb6f01ee965b915e9064d75f710dd922a0db1e8a6b9655c844548bbde37c1cca1efd495c5d0f160b4b3823947c13e08e4634c6907fbd44abe758d0a6c552
 DIST mpv-0.8.3.tar.gz 2664730 SHA256 091038c802866848e3647f2a50215fa64ead0dc36f9114457db8b353528689cf SHA512 6b0e1f86032f4f594cee7af7ee7bd577821e948ace442987747a089d32374495abb5cf6bb88c4a1a63db8a36bb4182b30a728f976224263b6a9b4d51e62b1a40 WHIRLPOOL e6de6ff24a0e07cc1dc08f0de585aeb8ef44d1d01d729e088f7d9402b82b5e5318b958083781168ae3e7cc67fce13125d41d79fac997bff5d5888268a52480ba
 DIST mpv-0.9.1.tar.gz 2698031 SHA256 5d23688575d2cc4484f7feef628c690f68016e385622201894d02cb238ea179e SHA512 8abba7e3b2e9f2bf71edc0d772a1910b29f6acdd9c2d33de34ef4ee3fe4b57f3a145aff9dadfe9d9806059cc022fd19237a25e5a3976b8a7c01f8915f020c86b WHIRLPOOL ce35c41a3e2956ba43e8a906992c515722eb7708d7403741ab0099ce9110895b7b62e8b0952a0fbb6e2cc5cf3102ec93c8e2974f2fec6af06bf6bbd80f66dafc
+DIST mpv-0.9.2.tar.gz 2701306 SHA256 c0148f55dbd17705f49bb496d0ce374419de62e1b17195d91409d7727cbd4751 SHA512 4f652a8e78d65b0ef44a06287b05250dfdfbce4cf5a6e21d3b446eedec268d83cf98afcc687272e2da2cfac9e9f69a303847dffdfd45cecdd4273b943ce50967 WHIRLPOOL 1512bacc2ce50e875770c76106a1bb2bc1d0cc5f6e2bdce91ff8c5cfc8bf13ffb48519858a5fa2a7d57880820dc12e5eb20f34ab71eca5d76ec303618da8f3fe
 DIST waf-1.7.15 90909 SHA256 e5ae7028f9b2d8ce1acb9fe1092e8010a90ba764d3ac065ea4e846743290b1d6 SHA512 5d6f75a7a81d369512c6bf70ae14c5275cfdc2b273a5801d7ee928a829ca472aac5ee9f9f2542af6369f34c1648dd12e42112efc29d602527b9ba58a311b4c17 WHIRLPOOL 84048737d1ba746454212e13696ba34d9fc722c74823f719503e29123e33869a49742fba02e24212e3f67e045c5499cf1893bbd191bf8df1dd5cae05a517a17c
 DIST waf-1.8.4 96179 SHA256 f02035fa5d8814f33f19b2b20d43822ddef6bb39b955ca196c2a247a1f9ffaa8 SHA512 3a132d8b1cba0af0e3df046c0204c5df706fae4e0fac41cf74b53f6cdea6210ed798671c7a3cb3fee70573aacab16d4c0cc699cc4b7aa74c8a416346c5513f4c WHIRLPOOL fe8d7f42e5118a1f9490a0c9add1355c969185376b57d0bab024068dd6e7364632d862bf9432e1209165c5313ae843479ef334f4bd6285db05dfebff9a1b640e
diff --git a/media-video/mpv/mpv-0.9.2.ebuild b/media-video/mpv/mpv-0.9.2.ebuild
new file mode 100644
index 000000000000..b4dfe930e806
--- /dev/null
+++ b/media-video/mpv/mpv-0.9.2.ebuild
@@ -0,0 +1,266 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpv/mpv-0.9.2.ebuild,v 1.1 2015/05/19 12:46:19 yngwin Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_REQ_USE='threads(+)'
+inherit eutils python-any-r1 waf-utils pax-utils fdo-mime gnome2-utils
+
+WAF_V="1.8.4"
+
+DESCRIPTION="Media player based on MPlayer and mplayer2"
+HOMEPAGE="http://mpv.io/"
+SRC_URI="http://ftp.waf.io/pub/release/waf-${WAF_V}"
+DOCS=( README.md etc/example.conf etc/input.conf )
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/mpv-player/mpv.git"
+	inherit git-r3
+else
+	SRC_URI+=" https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
+	DOCS+=( RELEASE_NOTES )
+fi
+
+# See Copyright in source tarball and bug #506946. Waf is BSD, libmpv is ISC.
+LICENSE="GPL-2+ BSD ISC"
+SLOT="0"
+IUSE="+alsa bluray bs2b cdio +cli doc-pdf drm dvb +dvd dvdnav egl +enca encode
++iconv jack jpeg ladspa lcms +libass libav libcaca libguess libmpv lua luajit
+openal +opengl oss pulseaudio pvr raspberry-pi rubberband samba sdl selinux v4l
+vaapi vdpau vf-dlopen wayland +X xinerama +xscreensaver xv"
+
+REQUIRED_USE="
+	|| ( cli libmpv )
+	dvdnav? ( dvd )
+	egl? ( opengl X )
+	enca? ( iconv )
+	lcms? ( opengl )
+	libguess? ( iconv )
+	luajit? ( lua )
+	opengl? ( || ( wayland X ) )
+	pvr? ( v4l )
+	vaapi? ( X )
+	vdpau? ( X )
+	wayland? ( opengl )
+	xinerama? ( X )
+	xscreensaver? ( X )
+	xv? ( X )
+"
+
+RDEPEND="
+	libav? ( >=media-video/libav-11:0=[encode?,threads,vaapi?,vdpau?] )
+	!libav? ( >=media-video/ffmpeg-2.4.0:0=[encode?,threads,vaapi?,vdpau?] )
+	sys-libs/zlib
+	X? (
+		x11-libs/libX11
+		x11-libs/libXext
+		>=x11-libs/libXrandr-1.2.0
+		opengl? (
+			virtual/opengl
+			egl? ( media-libs/mesa[egl] )
+		)
+		lcms? ( >=media-libs/lcms-2.6:2 )
+		vaapi? ( >=x11-libs/libva-0.34.0[X(+)] )
+		vdpau? ( >=x11-libs/libvdpau-0.2 )
+		xinerama? ( x11-libs/libXinerama )
+		xscreensaver? ( x11-libs/libXScrnSaver )
+		xv? ( x11-libs/libXv )
+	)
+	alsa? ( >=media-libs/alsa-lib-1.0.18 )
+	bluray? ( >=media-libs/libbluray-0.3.0 )
+	bs2b? ( media-libs/libbs2b )
+	cdio? (
+		dev-libs/libcdio
+		dev-libs/libcdio-paranoia
+	)
+	drm? ( x11-libs/libdrm )
+	dvb? ( virtual/linuxtv-dvb-headers )
+	dvd? (
+		>=media-libs/libdvdread-4.1.3
+		dvdnav? ( >=media-libs/libdvdnav-4.2.0 )
+	)
+	enca? ( app-i18n/enca )
+	iconv? ( virtual/libiconv )
+	jack? ( media-sound/jack-audio-connection-kit )
+	jpeg? ( virtual/jpeg:0 )
+	ladspa? ( media-libs/ladspa-sdk )
+	libass? (
+		>=media-libs/libass-0.12.1:=[enca?,fontconfig]
+		virtual/ttf-fonts
+	)
+	libcaca? ( >=media-libs/libcaca-0.99_beta18 )
+	libguess? ( >=app-i18n/libguess-1.0 )
+	lua? (
+		!luajit? ( || ( =dev-lang/lua-5.1*:= =dev-lang/lua-5.2*:= ) )
+		luajit? ( dev-lang/luajit:2 )
+	)
+	openal? ( >=media-libs/openal-1.13 )
+	pulseaudio? ( media-sound/pulseaudio )
+	rubberband? ( >=media-libs/rubberband-1.8.0 )
+	samba? ( net-fs/samba )
+	sdl? ( media-libs/libsdl2[threads] )
+	v4l? ( media-libs/libv4l )
+	wayland? (
+		>=dev-libs/wayland-1.6.0
+		media-libs/mesa[egl,wayland]
+		>=x11-libs/libxkbcommon-0.3.0
+	)
+"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+	>=dev-lang/perl-5.8
+	dev-python/docutils
+	doc-pdf? ( dev-python/rst2pdf )
+	X? (
+		x11-proto/videoproto
+		xinerama? ( x11-proto/xineramaproto )
+		xscreensaver? ( x11-proto/scrnsaverproto )
+	)
+"
+RDEPEND+="
+	selinux? ( sec-policy/selinux-mplayer )
+"
+
+pkg_setup() {
+	if ! use libass; then
+		ewarn "You have disabled the libass flag. No OSD or subtitles will be displayed."
+	fi
+
+	if use openal; then
+		ewarn "You have enabled the openal audio output which is a fallback"
+		ewarn "and disabled by upstream."
+	fi
+
+	if use sdl; then
+		ewarn "You have enabled the sdl video and audio outputs which are fallbacks"
+		ewarn "and disabled by upstream."
+	fi
+
+	if use libav; then
+		einfo "You have enabled media-video/libav instead of media-video/ffmpeg."
+		einfo "Upstream recommends media-video/ffmpeg, as some functionality is not"
+		einfo "provided by media-video/libav."
+	fi
+
+	einfo "For additional format support you need to enable the support on your"
+	einfo "libavcodec/libavformat provider:"
+	einfo "    media-video/ffmpeg or media-video/libav"
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cp "${DISTDIR}"/waf-${WAF_V} "${S}"/waf || die
+	chmod 0755 "${S}"/waf || die
+	epatch_user
+}
+
+src_configure() {
+	local mywafargs=(
+		--confdir="${EPREFIX}"/etc/${PN}
+		--docdir="${EPREFIX}"/usr/share/doc/${PF}
+		$(usex cli '' '--disable-cplayer')
+		$(use_enable libmpv libmpv-shared)
+		--disable-libmpv-static
+		--disable-build-date	# keep build reproducible
+		--disable-optimize	# do not add '-O2' to CFLAGS
+		--disable-debug-build	# do not add '-g' to CFLAGS
+		--disable-test		# avoid dev-util/cmocka automagic
+		$(use_enable doc-pdf pdf-build)
+		$(use_enable vf-dlopen vf-dlopen-filters)
+		$(use_enable cli zsh-comp)
+
+		# optional features
+		$(use_enable iconv)
+		$(use_enable libguess)
+		$(use_enable samba libsmbclient)
+		$(use_enable lua)
+		$(use_enable libass)
+		$(use_enable libass libass-osd)
+		$(use_enable encode encoding)
+		$(use_enable bluray libbluray)
+		$(use_enable dvd dvdread)
+		$(use_enable dvdnav)
+		$(use_enable cdio cdda)
+		$(use_enable enca)
+		$(use_enable ladspa)
+		$(use_enable rubberband)
+		$(use_enable bs2b libbs2b)
+		$(use_enable lcms lcms2)
+		--disable-vapoursynth	# vapoursynth is not packaged
+		--disable-vapoursynth-lazy
+		--enable-libavfilter
+		--enable-libavdevice
+		$(usex luajit '--lua=luajit' '')
+
+		# audio outputs
+		$(use_enable sdl sdl2)	# SDL output is fallback for platforms where nothing better is available
+		--disable-sdl1
+		$(use_enable oss oss-audio)
+		--disable-rsound	# media-sound/rsound is in pro-audio overlay only
+		$(use_enable pulseaudio pulse)
+		$(use_enable jack)
+		$(use_enable openal)
+		$(use_enable alsa)
+
+		# video outputs
+		$(use_enable wayland)
+		$(use_enable X x11)
+		$(use_enable xscreensaver xss)
+		$(use_enable X xext)
+		$(use_enable xv)
+		$(use_enable xinerama)
+		$(use_enable X xrandr)
+		$(usex X "$(use_enable opengl gl-x11)" '--disable-gl-x11')
+		$(use_enable egl egl-x11)
+		$(usex wayland "$(use_enable opengl gl-wayland)" '--disable-gl-wayland')
+		$(use_enable opengl gl)
+		$(use_enable vdpau)
+		$(usex vdpau "$(use_enable opengl vdpau-gl-x11)" '--disable-vdpau-gl-x11')
+		$(use_enable vaapi)
+		$(use_enable vaapi vaapi-vpp)
+		$(usex vaapi "$(use_enable opengl vaapi-glx)" '--disable-vaapi-glx')
+		$(use_enable libcaca caca)
+		$(use_enable drm)
+		$(use_enable jpeg)
+		$(use_enable raspberry-pi rpi)
+		$(use_enable raspberry-pi rpi-gles)
+
+		# hwaccels
+		$(use_enable vaapi vaapi-hwaccel)
+		$(use_enable vdpau vdpau-hwaccel)
+
+		# tv features
+		$(use_enable v4l tv)
+		$(use_enable v4l tv-v4l2)
+		$(use_enable v4l libv4l2)
+		$(use_enable pvr)
+		$(use_enable dvb dvbin)
+	)
+	waf-utils_src_configure "${mywafargs[@]}"
+}
+
+src_install() {
+	waf-utils_src_install
+
+	if use cli && use luajit; then
+		pax-mark -m "${ED}"usr/bin/mpv
+	fi
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 53b1135fd64b..29418b4cc7de 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Tue, 19 May 2015 05:36:49 +0000
+Tue, 19 May 2015 17:47:20 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 53b1135fd64b..29418b4cc7de 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Tue, 19 May 2015 05:36:49 +0000
+Tue, 19 May 2015 17:47:20 +0000
diff --git a/metadata/md5-cache/app-admin/apachetop-0.12.6-r2 b/metadata/md5-cache/app-admin/apachetop-0.12.6-r2
index dfee9982419d..f7244f2eb9ad 100644
--- a/metadata/md5-cache/app-admin/apachetop-0.12.6-r2
+++ b/metadata/md5-cache/app-admin/apachetop-0.12.6-r2
@@ -4,10 +4,10 @@ DESCRIPTION=A realtime Apache log analyzer
 EAPI=5
 HOMEPAGE=http://www.webta.org/projects/apachetop
 IUSE=fam pcre
-KEYWORDS=~amd64 hppa ~mips ppc ~sparc x86
+KEYWORDS=amd64 hppa ~mips ppc ~sparc x86
 LICENSE=GPL-2
 RDEPEND=fam? ( virtual/fam ) pcre? ( dev-libs/libpcre )
 SLOT=0
 SRC_URI=http://www.webta.org/apachetop/apachetop-0.12.6.tar.gz
 _eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
-_md5_=3b54a3df80e315aabf199e026f454386
+_md5_=125b98f44f2f5cc09678b3b8b996bc78
diff --git a/metadata/md5-cache/app-emacs/ess-15.03.1 b/metadata/md5-cache/app-emacs/ess-15.03.1
new file mode 100644
index 000000000000..1e2cb225278c
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/ess-15.03.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DEPEND=app-text/texi2html virtual/latex-base >=virtual/emacs-23
+DESCRIPTION=Emacs Speaks Statistics
+EAPI=5
+HOMEPAGE=http://ess.r-project.org/
+KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x86-macos
+LICENSE=GPL-2+ GPL-3+ Texinfo-manual
+RDEPEND=>=virtual/emacs-23
+SLOT=0
+SRC_URI=http://ess.r-project.org/downloads/ess/ess-15.03-1.tgz
+_eclasses_=elisp	b7ff113c97bf466ace6f3235f80af600	elisp-common	82fe92893adf25f1e5d0db48b0ec4cb3	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
+_md5_=ea8dcdce011cdbcde7877c39654fe664
diff --git a/metadata/md5-cache/app-emacs/scala-mode-2.10.3 b/metadata/md5-cache/app-emacs/scala-mode-2.10.3
index 6a9b89cd1758..2bb99fe29387 100644
--- a/metadata/md5-cache/app-emacs/scala-mode-2.10.3
+++ b/metadata/md5-cache/app-emacs/scala-mode-2.10.3
@@ -3,10 +3,10 @@ DEPEND=>=virtual/emacs-23
 DESCRIPTION=Scala mode for Emacs
 EAPI=5
 HOMEPAGE=http://www.scala-lang.org/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=BSD
 RDEPEND=dev-lang/scala >=virtual/emacs-23
 SLOT=0
 SRC_URI=http://www.scala-lang.org/files/archive/scala-tool-support-2.10.3.tgz
 _eclasses_=elisp	b7ff113c97bf466ace6f3235f80af600	elisp-common	82fe92893adf25f1e5d0db48b0ec4cb3	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
-_md5_=c255730558f650fe2118a680de74de00
+_md5_=81bb50df540731d211f406cf8aebc7f3
diff --git a/metadata/md5-cache/app-emacs/scss-mode-20150107 b/metadata/md5-cache/app-emacs/scss-mode-20150107
new file mode 100644
index 000000000000..6d6f3670e396
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/scss-mode-20150107
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DEPEND=dev-ruby/sass >=virtual/emacs-23
+DESCRIPTION=Major mode for editing SCSS files in Emacs
+EAPI=5
+HOMEPAGE=https://github.com/antonj/scss-mode
+KEYWORDS=~amd64
+LICENSE=GPL-2+
+RDEPEND=>=virtual/emacs-23
+SLOT=0
+SRC_URI=https://github.com/antonj/scss-mode/archive/b010d134f499c4b4ad33fe8a669a81e9a531b0b2.tar.gz -> scss-mode-20150107-git.tar.gz
+_eclasses_=elisp	b7ff113c97bf466ace6f3235f80af600	elisp-common	82fe92893adf25f1e5d0db48b0ec4cb3	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
+_md5_=b990f2a42fbca400e10ae9f7e67e7cab
diff --git a/metadata/md5-cache/app-eselect/eselect-scala-0.1.1 b/metadata/md5-cache/app-eselect/eselect-scala-0.1.1
index c2615e1d2360..64605cec44ed 100644
--- a/metadata/md5-cache/app-eselect/eselect-scala-0.1.1
+++ b/metadata/md5-cache/app-eselect/eselect-scala-0.1.1
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
 DESCRIPTION=Manages multiple Scala versions
 EAPI=5
 HOMEPAGE=http://www.gentoo.org
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-macos
+KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux ~x86-macos
 LICENSE=GPL-2
 RDEPEND=>=app-admin/eselect-1.0.2
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~gienah/distfiles/eselect-scala-0.1.1.tar.gz
-_md5_=86c673e1db5356bec703cae9ad2710a3
+_md5_=fc3cec17ed894cc41e331be548669356
diff --git a/metadata/md5-cache/app-misc/wcd-5.2.7 b/metadata/md5-cache/app-misc/wcd-5.2.7
new file mode 100644
index 000000000000..457e6bc2f860
--- /dev/null
+++ b/metadata/md5-cache/app-misc/wcd-5.2.7
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=sys-libs/ncurses[unicode?] unicode? ( dev-libs/libunistring ) app-text/ghostscript-gpl
+DESCRIPTION=Wherever Change Directory
+EAPI=5
+HOMEPAGE=http://waterlan.home.xs4all.nl/#WCD_ANCHOR
+IUSE=nls unicode
+KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=sys-libs/ncurses[unicode?] unicode? ( dev-libs/libunistring )
+SLOT=0
+SRC_URI=http://waterlan.home.xs4all.nl/wcd/wcd-5.2.7.tar.gz
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
+_md5_=9839b6c9900ea77f8c6bb51fe4f06560
diff --git a/metadata/md5-cache/app-office/scribus-1.4.3 b/metadata/md5-cache/app-office/scribus-1.4.3
deleted file mode 100644
index 47a91b1f7b2e..000000000000
--- a/metadata/md5-cache/app-office/scribus-1.4.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-lang/python-2.7.5-r2:2.7[tk?] >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] dev-libs/boost dev-libs/hyphen dev-libs/libxml2 dev-qt/qtcore:4 dev-qt/qtgui:4 media-libs/fontconfig media-libs/freetype:2 media-libs/lcms:2 media-libs/libpng:0 media-libs/tiff:0 net-print/cups sys-libs/zlib[minizip] virtual/jpeg:0= cairo? ( x11-libs/cairo[X,svg] ) !cairo? ( media-libs/libart_lgpl ) hunspell? ( app-text/hunspell ) pdf? ( app-text/podofo ) scripts? ( virtual/python-imaging[tk?,python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] ) tk? ( virtual/python-imaging[tk?,python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
-DESCRIPTION=Desktop publishing (DTP) and layout program
-EAPI=5
-HOMEPAGE=http://www.scribus.net/
-IUSE=cairo debug examples hunspell +minimal +pdf scripts templates tk linguas_af linguas_ar linguas_bg linguas_br linguas_ca linguas_cs_CZ linguas_cy linguas_da_DK linguas_de linguas_de_1901 linguas_de_CH linguas_el linguas_en_AU linguas_en_GB linguas_en_US linguas_es_ES linguas_et linguas_eu linguas_fi linguas_fr linguas_gl linguas_hu linguas_id linguas_it linguas_ja linguas_ko linguas_lt_LT linguas_nb_NO linguas_nl linguas_pl_PL linguas_pt linguas_pt_BR linguas_ru linguas_sa linguas_sk_SK linguas_sl linguas_sq linguas_sr linguas_sv linguas_th_TH linguas_tr linguas_uk linguas_zh_CN linguas_zh_TW python_targets_python2_7
-KEYWORDS=amd64 hppa ppc ppc64 ~sparc x86
-LICENSE=GPL-2
-RDEPEND=>=dev-lang/python-2.7.5-r2:2.7[tk?] >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] dev-libs/boost dev-libs/hyphen dev-libs/libxml2 dev-qt/qtcore:4 dev-qt/qtgui:4 media-libs/fontconfig media-libs/freetype:2 media-libs/lcms:2 media-libs/libpng:0 media-libs/tiff:0 net-print/cups sys-libs/zlib[minizip] virtual/jpeg:0= cairo? ( x11-libs/cairo[X,svg] ) !cairo? ( media-libs/libart_lgpl ) hunspell? ( app-text/hunspell ) pdf? ( app-text/podofo ) scripts? ( virtual/python-imaging[tk?,python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] ) tk? ( virtual/python-imaging[tk?,python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] ) app-text/ghostscript-gpl
-REQUIRED_USE=python_targets_python2_7 tk? ( scripts )
-SLOT=0
-SRC_URI=mirror://sourceforge/scribus/1.4.3/scribus-1.4.3.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	5d5921a298e95441da2f85be419894c0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
-_md5_=32bcb9ccc6ca27dcd2a4a75d0f15b7b9
diff --git a/metadata/md5-cache/app-office/scribus-1.4.5-r1 b/metadata/md5-cache/app-office/scribus-1.4.5-r1
index 60c091f9efe5..f66f8efdeefa 100644
--- a/metadata/md5-cache/app-office/scribus-1.4.5-r1
+++ b/metadata/md5-cache/app-office/scribus-1.4.5-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=python_targets_python2_7 tk? ( scripts )
 SLOT=0
 SRC_URI=mirror://sourceforge/scribus/1.4.5/scribus-1.4.5.tar.bz2
 _eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	5d5921a298e95441da2f85be419894c0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
-_md5_=49a9d3d701c3495478a5efc35f6a6642
+_md5_=987653e1a9e9b69dc7e53806669ffa22
diff --git a/metadata/md5-cache/app-text/convmv-2.0 b/metadata/md5-cache/app-text/convmv-2.0
new file mode 100644
index 000000000000..b1524d0dff3d
--- /dev/null
+++ b/metadata/md5-cache/app-text/convmv-2.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=convert filenames to utf8 or any other charset
+EAPI=5
+HOMEPAGE=http://j3e.de/linux/convmv
+KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=dev-lang/perl
+SLOT=0
+SRC_URI=http://j3e.de/linux/convmv/convmv-2.0.tar.gz
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
+_md5_=a6070790d40f581bf17294f8f6dcb674
diff --git a/metadata/md5-cache/app-text/t1utils-1.39 b/metadata/md5-cache/app-text/t1utils-1.39
index 5b6668c05b6f..4630e1ef12db 100644
--- a/metadata/md5-cache/app-text/t1utils-1.39
+++ b/metadata/md5-cache/app-text/t1utils-1.39
@@ -1,9 +1,9 @@
 DEFINED_PHASES=install
 DESCRIPTION=Type 1 Font utilities
 HOMEPAGE=http://www.lcdf.org/type/#t1utils
-KEYWORDS=~alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD
 RDEPEND=!<media-libs/freetype-1.4_pre20080316
 SLOT=0
 SRC_URI=http://www.lcdf.org/type/t1utils-1.39.tar.gz
-_md5_=9cef8bdaa04466b73f1a8b25a7176080
+_md5_=e299863c3a4aabcc2acc77dc55a441cb
diff --git a/metadata/md5-cache/dev-db/mariadb-10.0.19 b/metadata/md5-cache/dev-db/mariadb-10.0.19
index bb66f7d8ecbe..48e9e854022b 100644
--- a/metadata/md5-cache/dev-db/mariadb-10.0.19
+++ b/metadata/md5-cache/dev-db/mariadb-10.0.19
@@ -4,7 +4,7 @@ DESCRIPTION=An enhanced, drop-in replacement for MySQL
 EAPI=5
 HOMEPAGE=http://mariadb.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 bindist +community cluster debug embedded extraengine jemalloc latin1 minimal +perl profiling selinux ssl systemtap static static-libs tcmalloc test oqgraph pam sphinx tokudb odbc xml
-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
 LICENSE=GPL-2
 PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 ) ~virtual/mysql-5.6
 RDEPEND=ssl? ( >=dev-libs/openssl-1.0.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) sys-libs/ncurses >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/zlib-1.2.3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] !dev-db/mariadb-native-client[mysqlcompat] jemalloc? ( dev-libs/jemalloc:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) !bindist? ( >=sys-libs/readline-4.1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) oqgraph? ( >=dev-libs/boost-1.40.0:0= ) !minimal? ( pam? ( virtual/pam:0= ) ) perl? ( !dev-db/mytop ) extraengine? ( odbc? ( dev-db/unixODBC:0= ) xml? ( dev-libs/libxml2:2= ) ) oqgraph? ( dev-libs/judy:0= ) >=dev-libs/libpcre-8.35:3=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster !minimal? ( !prefix? ( dev-db/mysql-init-scripts ) ) selinux? ( sec-policy/selinux-mysql ) abi_x86_32? ( !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] ) perl? ( virtual/perl-Getopt-Long dev-perl/TermReadKey virtual/perl-Term-ANSIColor virtual/perl-Time-HiRes )
@@ -13,4 +13,4 @@ RESTRICT=!bindist? ( bindist )
 SLOT=0
 SRC_URI=http://ftp.osuosl.org/pub/mariadb/mariadb-10.0.19/kvm-tarbake-jaunty-x86/mariadb-10.0.19.tar.gz http://ftp.osuosl.org/pub/mariadb/mariadb-10.0.19/source/mariadb-10.0.19.tar.gz http://mirror.jmu.edu/pub/mariadb/mariadb-10.0.19/kvm-tarbake-jaunty-x86/mariadb-10.0.19.tar.gz http://mirrors.coreix.net/mariadb/mariadb-10.0.19/kvm-tarbake-jaunty-x86/mariadb-10.0.19.tar.gz http://mirrors.syringanetworks.net/mariadb/mariadb-10.0.19/kvm-tarbake-jaunty-x86/mariadb-10.0.19.tar.gz http://mirrors.fe.up.pt/pub/mariadb/mariadb-10.0.19/kvm-tarbake-jaunty-x86/mariadb-10.0.19.tar.gz http://mirror2.hs-esslingen.de/mariadb/mariadb-10.0.19/kvm-tarbake-jaunty-x86/mariadb-10.0.19.tar.gz mirror://gentoo/mysql-extras-20141215-0144Z.tar.bz2 http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20141215-0144Z.tar.bz2 http://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20141215-0144Z.tar.bz2 http://dev.gentoo.org/~grknight/distfiles/mysql-extras-20141215-0144Z.tar.bz2
 _eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	5d5921a298e95441da2f85be419894c0	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	mysql-cmake	0b183f1f008c40a3df7ab3dbfdfc14d5	mysql-multilib	13530f46a0963261ecce2a32978fdd21	mysql_fx	ab94d85c3c822792c72f7eeff96f2365	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=87847614d83d02f8493b3658600c7359
+_md5_=b5f121cc9b2746580319475c32f0174d
diff --git a/metadata/md5-cache/dev-db/sqlite-3.8.10.1 b/metadata/md5-cache/dev-db/sqlite-3.8.10.1
index 59cc7d16a184..83fecd840bdc 100644
--- a/metadata/md5-cache/dev-db/sqlite-3.8.10.1
+++ b/metadata/md5-cache/dev-db/sqlite-3.8.10.1
@@ -4,10 +4,10 @@ DESCRIPTION=A SQL Database Engine in a C Library
 EAPI=5
 HOMEPAGE=http://sqlite.org/
 IUSE=debug doc icu +readline secure-delete static-libs tcl test tools abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=public-domain
 RDEPEND=icu? ( dev-libs/icu:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) readline? ( sys-libs/readline:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tcl? ( dev-lang/tcl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20131008-r14 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=3
 SRC_URI=doc? ( http://sqlite.org/2015/sqlite-doc-3081001.zip ) tcl? ( http://sqlite.org/2015/sqlite-src-3081001.zip ) test? ( http://sqlite.org/2015/sqlite-src-3081001.zip ) tools? ( http://sqlite.org/2015/sqlite-src-3081001.zip ) !tcl? ( !test? ( !tools? ( http://sqlite.org/2015/sqlite-autoconf-3081001.tar.gz ) ) )
 _eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	5d5921a298e95441da2f85be419894c0	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=c8b23c3017a97685e05d961c48a155fa
+_md5_=97e15fd196c0f4302533801d92f78689
diff --git a/metadata/md5-cache/dev-go/go-sys-9999 b/metadata/md5-cache/dev-go/go-sys-9999
new file mode 100644
index 000000000000..3d89a8f0f5a9
--- /dev/null
+++ b/metadata/md5-cache/dev-go/go-sys-9999
@@ -0,0 +1,9 @@
+DEFINED_PHASES=compile install test unpack
+DEPEND=>=dev-lang/go-1.4 >=dev-vcs/git-1.8.2.1
+DESCRIPTION=Go packages for low-level interaction with the operating system
+EAPI=5
+HOMEPAGE=https://godoc.org/golang.org/x/sys
+LICENSE=BSD
+SLOT=0
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	git-r3	3a2bd0ae504c33a50061885480f3def3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
+_md5_=d9f1dfb2aab07a7f96c4d58f8ea7dede
diff --git a/metadata/md5-cache/dev-java/bcmail-1.50 b/metadata/md5-cache/dev-java/bcmail-1.50
index 9f5d3b4e169c..8f52940cea80 100644
--- a/metadata/md5-cache/dev-java/bcmail-1.50
+++ b/metadata/md5-cache/dev-java/bcmail-1.50
@@ -4,11 +4,11 @@ DESCRIPTION=Java cryptography APIs
 EAPI=5
 HOMEPAGE=http://www.bouncycastle.org/java.html
 IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=~amd64 ppc ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=amd64 ppc ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=BSD
 RDEPEND=>=virtual/jre-1.5 >=dev-java/bcprov-1.50:0[test?] ~dev-java/bcpkix-1.50:0[test?] dev-java/sun-jaf:0 java-virtuals/javamail:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.bouncycastle.org/download/bcmail-jdk15on-150.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	f7dce580d4098b526be3fa17d4242820	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=7419a9b257433e7f0f6e6290b51c57cb
+_md5_=ae8c5db4c1b48310229fa43e15c4d47f
diff --git a/metadata/md5-cache/dev-java/bcpkix-1.50 b/metadata/md5-cache/dev-java/bcpkix-1.50
index 68679458f92c..acb5049235d0 100644
--- a/metadata/md5-cache/dev-java/bcpkix-1.50
+++ b/metadata/md5-cache/dev-java/bcpkix-1.50
@@ -4,11 +4,11 @@ DESCRIPTION=Java cryptography APIs
 EAPI=5
 HOMEPAGE=http://www.bouncycastle.org/java.html
 IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=~amd64 ppc ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=amd64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=BSD
 RDEPEND=>=virtual/jre-1.5 >=dev-java/bcprov-1.50:0[test?] >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.bouncycastle.org/download/bcpkix-jdk15on-150.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	f7dce580d4098b526be3fa17d4242820	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=6fd58e8a0a6d0643812d26785631d1b9
+_md5_=4ddbc1f25385724afcfc42ec0ef701f7
diff --git a/metadata/md5-cache/dev-java/bcprov-1.50 b/metadata/md5-cache/dev-java/bcprov-1.50
index 85079da949b7..d924b6594774 100644
--- a/metadata/md5-cache/dev-java/bcprov-1.50
+++ b/metadata/md5-cache/dev-java/bcprov-1.50
@@ -4,11 +4,11 @@ DESCRIPTION=Java cryptography APIs
 EAPI=5
 HOMEPAGE=http://www.bouncycastle.org/java.html
 IUSE=userland_GNU elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=~amd64 ppc ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=amd64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=BSD
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.bouncycastle.org/download/bcprov-jdk15on-150.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	f7dce580d4098b526be3fa17d4242820	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=1b56a55935c1cea97606718f551f9f46
+_md5_=afbcdbf57cf1f3fce87a81f26aaa5429
diff --git a/metadata/md5-cache/dev-java/hamcrest-integration-1.1 b/metadata/md5-cache/dev-java/hamcrest-integration-1.1
deleted file mode 100644
index 5a27dfec38b2..000000000000
--- a/metadata/md5-cache/dev-java/hamcrest-integration-1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.5 userland_GNU? ( sys-apps/findutils ) dev-java/hamcrest-core:0 dev-java/qdox:1.6 dev-java/easymock:3.2 dev-java/jmock:1.0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Integration library of hamcrest
-EAPI=5
-HOMEPAGE=http://code.google.com/p/hamcrest/
-IUSE=elibc_FreeBSD source elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2
-RDEPEND=>=virtual/jre-1.5 dev-java/hamcrest-core:0 dev-java/qdox:1.6 dev-java/easymock:3.2 dev-java/jmock:1.0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=http://hamcrest.googlecode.com/files/hamcrest-1.1.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	f7dce580d4098b526be3fa17d4242820	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=5a27686d2af6644c16876e0d0ee8f279
diff --git a/metadata/md5-cache/dev-java/hamcrest-integration-1.2 b/metadata/md5-cache/dev-java/hamcrest-integration-1.2
deleted file mode 100644
index 8a4995909cd6..000000000000
--- a/metadata/md5-cache/dev-java/hamcrest-integration-1.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.5 userland_GNU? ( sys-apps/findutils ) dev-java/hamcrest-core:1.2 dev-java/qdox:1.6 dev-java/easymock:3.2 dev-java/jmock:1.0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Integration library of hamcrest
-EAPI=5
-HOMEPAGE=http://code.google.com/p/hamcrest/
-IUSE=elibc_FreeBSD source elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2
-RDEPEND=>=virtual/jre-1.5 dev-java/hamcrest-core:1.2 dev-java/qdox:1.6 dev-java/easymock:3.2 dev-java/jmock:1.0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
-SLOT=1.2
-SRC_URI=http://hamcrest.googlecode.com/files/hamcrest-1.2.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	f7dce580d4098b526be3fa17d4242820	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=0390779b787b46a3a4e882587de3414f
diff --git a/metadata/md5-cache/dev-java/hamcrest-integration-1.3 b/metadata/md5-cache/dev-java/hamcrest-integration-1.3
index 5940b6131a0b..21edc5ed3b6e 100644
--- a/metadata/md5-cache/dev-java/hamcrest-integration-1.3
+++ b/metadata/md5-cache/dev-java/hamcrest-integration-1.3
@@ -10,4 +10,4 @@ RDEPEND=>=virtual/jre-1.5 dev-java/hamcrest-core:1.3 dev-java/qdox:1.6 dev-java/
 SLOT=1.3
 SRC_URI=http://hamcrest.googlecode.com/files/hamcrest-1.3.tgz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	f7dce580d4098b526be3fa17d4242820	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=326dac9f016eb56fcde6c2c870a9a87d
+_md5_=1d92dc0596bfffe4460a663299b02696
diff --git a/metadata/md5-cache/dev-lang/php-5.4.41 b/metadata/md5-cache/dev-lang/php-5.4.41
new file mode 100644
index 000000000000..5ac6dac0a10a
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/php-5.4.41
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare prerm setup test
+DEPEND=>=app-eselect/eselect-php-0.7.1-r3[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[threads=] ) ) berkdb? ( =sys-libs/db-4* ) bzip2? ( app-arch/bzip2 ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) cjk? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) crypt? ( >=dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) exif? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) gmp? ( >=dev-libs/gmp-4.1.2 ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) !mysqlnd? ( mysql? ( virtual/mysql ) mysqli? ( >=virtual/mysql-4.1 ) ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( >=dev-libs/openssl-0.9.7 ) sybase-ct? ( dev-db/freetds ) tidy? ( app-text/htmltidy ) truetype? ( =media-libs/freetype-2* >=media-libs/t1lib-5.0.0 !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) unicode? ( dev-libs/oniguruma ) wddx? ( >=dev-libs/libxml2-2.6.8 ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib ) zlib? ( sys-libs/zlib ) virtual/mta sys-devel/flex >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 apache2? ( =www-servers/apache-2* ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DESCRIPTION=The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs
+EAPI=5
+HOMEPAGE=http://php.net/
+IUSE=embed +cli cgi fpm apache2 threads bcmath berkdb bzip2 calendar cdb cjk crypt +ctype curl curlwrappers debug enchant exif +fileinfo +filter firebird flatfile ftp gd gdbm gmp +hash +iconv imap inifile intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash mssql mysql mysqlnd mysqli nls oci8-instant-client odbc pcntl pdo +phar +posix postgres qdbm readline recode selinux +session sharedmem +simplexml snmp soap sockets spell sqlite ssl sybase-ct sysvipc systemd tidy +tokenizer truetype unicode wddx +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib apache2
+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
+LICENSE=PHP-3
+RDEPEND=>=app-eselect/eselect-php-0.7.1-r3[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[threads=] ) ) berkdb? ( =sys-libs/db-4* ) bzip2? ( app-arch/bzip2 ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) cjk? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) crypt? ( >=dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) exif? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) gmp? ( >=dev-libs/gmp-4.1.2 ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) !mysqlnd? ( mysql? ( virtual/mysql ) mysqli? ( >=virtual/mysql-4.1 ) ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( >=dev-libs/openssl-0.9.7 ) sybase-ct? ( dev-db/freetds ) tidy? ( app-text/htmltidy ) truetype? ( =media-libs/freetype-2* >=media-libs/t1lib-5.0.0 !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) unicode? ( dev-libs/oniguruma ) wddx? ( >=dev-libs/libxml2-2.6.8 ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib ) zlib? ( sys-libs/zlib ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) ) apache2? ( =www-servers/apache-2* )
+REQUIRED_USE=truetype? ( gd ) cjk? ( gd ) exif? ( gd ) xpm? ( gd ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) mhash? ( hash ) phar? ( hash ) mysqlnd? ( || ( mysql mysqli pdo ) ) qdbm? ( !gdbm ) readline? ( !libedit ) recode? ( !imap !mysql !mysqli ) sharedmem? ( !threads ) !cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )
+SLOT=5.4
+SRC_URI=http://www.php.net/distributions/php-5.4.41.tar.bz2 http://dev.gentoo.org/~olemarkus/php/php-patchset-5.4-r2.tar.bz2
+_eclasses_=apache-module	5c4c90da2d68c2dc8391666824f1293c	autotools	999c8f6cf5d91495cb0779588f20716c	db-use	82d0e62839f20e1e0d5a2259abd5316f	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	5d5921a298e95441da2f85be419894c0	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=550586640d33ae1e23dcc723fb575fc9
diff --git a/metadata/md5-cache/dev-lang/php-5.5.25 b/metadata/md5-cache/dev-lang/php-5.5.25
new file mode 100644
index 000000000000..004592dcfa60
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/php-5.5.25
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare prerm setup test
+DEPEND=>=app-eselect/eselect-php-0.7.1-r3[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[threads=] ) ) berkdb? ( =sys-libs/db-4* ) bzip2? ( app-arch/bzip2 ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) cjk? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) crypt? ( >=dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) exif? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) gmp? ( >=dev-libs/gmp-4.1.2 ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) libmysqlclient? ( mysql? ( virtual/mysql ) mysqli? ( >=virtual/mysql-4.1 ) ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( >=dev-libs/openssl-0.9.7 ) sybase-ct? ( dev-db/freetds ) tidy? ( app-text/htmltidy ) truetype? ( =media-libs/freetype-2* >=media-libs/t1lib-5.0.0 !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) unicode? ( dev-libs/oniguruma ) vpx? ( media-libs/libvpx ) wddx? ( >=dev-libs/libxml2-2.6.8 ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib ) zlib? ( sys-libs/zlib ) virtual/mta sys-devel/flex >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 apache2? ( =www-servers/apache-2* ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DESCRIPTION=The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs
+EAPI=5
+HOMEPAGE=http://php.net/
+IUSE=embed +cli cgi fpm apache2 threads bcmath berkdb bzip2 calendar cdb cjk crypt +ctype curl debug enchant exif frontbase +fileinfo +filter firebird flatfile ftp gd gdbm gmp +hash +iconv imap inifile intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash mssql mysql libmysqlclient mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline recode selinux +session sharedmem +simplexml snmp soap sockets spell sqlite ssl sybase-ct sysvipc systemd tidy +tokenizer truetype unicode vpx wddx +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib apache2
+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
+LICENSE=PHP-3
+RDEPEND=>=app-eselect/eselect-php-0.7.1-r3[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[threads=] ) ) berkdb? ( =sys-libs/db-4* ) bzip2? ( app-arch/bzip2 ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) cjk? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) crypt? ( >=dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) exif? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) gmp? ( >=dev-libs/gmp-4.1.2 ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) libmysqlclient? ( mysql? ( virtual/mysql ) mysqli? ( >=virtual/mysql-4.1 ) ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( >=dev-libs/openssl-0.9.7 ) sybase-ct? ( dev-db/freetds ) tidy? ( app-text/htmltidy ) truetype? ( =media-libs/freetype-2* >=media-libs/t1lib-5.0.0 !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) unicode? ( dev-libs/oniguruma ) vpx? ( media-libs/libvpx ) wddx? ( >=dev-libs/libxml2-2.6.8 ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib ) zlib? ( sys-libs/zlib ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) ) apache2? ( =www-servers/apache-2* )
+REQUIRED_USE=truetype? ( gd ) vpx? ( gd ) cjk? ( gd ) exif? ( gd ) xpm? ( gd ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) mhash? ( hash ) phar? ( hash ) libmysqlclient? ( || ( mysql mysqli pdo ) ) qdbm? ( !gdbm ) readline? ( !libedit ) recode? ( !imap !mysql !mysqli ) sharedmem? ( !threads ) !cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )
+SLOT=5.5
+SRC_URI=http://www.php.net/distributions/php-5.5.25.tar.bz2
+_eclasses_=apache-module	5c4c90da2d68c2dc8391666824f1293c	autotools	999c8f6cf5d91495cb0779588f20716c	db-use	82d0e62839f20e1e0d5a2259abd5316f	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	5d5921a298e95441da2f85be419894c0	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=5f98ff7f23b7e3ff4a2c56892cb81f5f
diff --git a/metadata/md5-cache/dev-lang/php-5.6.9 b/metadata/md5-cache/dev-lang/php-5.6.9
new file mode 100644
index 000000000000..7822bdf1d79c
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/php-5.6.9
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare prerm setup test
+DEPEND=>=app-eselect/eselect-php-0.7.1-r3[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[threads=] ) ) berkdb? ( =sys-libs/db-4* ) bzip2? ( app-arch/bzip2 ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) cjk? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) crypt? ( >=dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) exif? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) gmp? ( >=dev-libs/gmp-4.1.2 ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) libmysqlclient? ( mysql? ( virtual/mysql ) mysqli? ( >=virtual/mysql-4.1 ) ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( >=dev-libs/openssl-0.9.7 ) sybase-ct? ( dev-db/freetds ) tidy? ( app-text/htmltidy ) truetype? ( =media-libs/freetype-2* >=media-libs/t1lib-5.0.0 !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) unicode? ( dev-libs/oniguruma ) vpx? ( media-libs/libvpx ) wddx? ( >=dev-libs/libxml2-2.6.8 ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib ) zlib? ( sys-libs/zlib ) virtual/mta sys-devel/flex >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 apache2? ( =www-servers/apache-2* ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DESCRIPTION=The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs
+EAPI=5
+HOMEPAGE=http://php.net/
+IUSE=embed +cli cgi fpm apache2 threads bcmath berkdb bzip2 calendar cdb cjk crypt +ctype curl debug enchant exif frontbase +fileinfo +filter firebird flatfile ftp gd gdbm gmp +hash +iconv imap inifile intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash mssql mysql libmysqlclient mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline recode selinux +session sharedmem +simplexml snmp soap sockets spell sqlite ssl sybase-ct sysvipc systemd tidy +tokenizer truetype unicode vpx wddx +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib apache2
+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
+LICENSE=PHP-3
+RDEPEND=>=app-eselect/eselect-php-0.7.1-r3[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[threads=] ) ) berkdb? ( =sys-libs/db-4* ) bzip2? ( app-arch/bzip2 ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) cjk? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) crypt? ( >=dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) exif? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) gmp? ( >=dev-libs/gmp-4.1.2 ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) libmysqlclient? ( mysql? ( virtual/mysql ) mysqli? ( >=virtual/mysql-4.1 ) ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( >=dev-libs/openssl-0.9.7 ) sybase-ct? ( dev-db/freetds ) tidy? ( app-text/htmltidy ) truetype? ( =media-libs/freetype-2* >=media-libs/t1lib-5.0.0 !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) unicode? ( dev-libs/oniguruma ) vpx? ( media-libs/libvpx ) wddx? ( >=dev-libs/libxml2-2.6.8 ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib ) zlib? ( sys-libs/zlib ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) ) apache2? ( =www-servers/apache-2* )
+REQUIRED_USE=truetype? ( gd ) vpx? ( gd ) cjk? ( gd ) exif? ( gd ) xpm? ( gd ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) mhash? ( hash ) phar? ( hash ) libmysqlclient? ( || ( mysql mysqli pdo ) ) qdbm? ( !gdbm ) readline? ( !libedit ) recode? ( !imap !mysql !mysqli ) sharedmem? ( !threads ) !cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )
+SLOT=5.6
+SRC_URI=http://www.php.net/distributions/php-5.6.9.tar.bz2
+_eclasses_=apache-module	5c4c90da2d68c2dc8391666824f1293c	autotools	999c8f6cf5d91495cb0779588f20716c	db-use	82d0e62839f20e1e0d5a2259abd5316f	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	5d5921a298e95441da2f85be419894c0	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=8dcbfca1a9a978469e76fceee9897aff
diff --git a/metadata/md5-cache/dev-lang/scala-2.11.4-r1 b/metadata/md5-cache/dev-lang/scala-2.11.4-r1
index dd53826dfede..8115d077d914 100644
--- a/metadata/md5-cache/dev-lang/scala-2.11.4-r1
+++ b/metadata/md5-cache/dev-lang/scala-2.11.4-r1
@@ -4,11 +4,11 @@ DESCRIPTION=The Scala Programming Language
 EAPI=5
 HOMEPAGE=http://www.scala-lang.org/
 IUSE=binary emacs elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-macos
+KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux ~x86-macos
 LICENSE=BSD
 PDEPEND=emacs? ( app-emacs/scala-mode:0 )
 RDEPEND=dev-java/ant-core:0 dev-java/hawtjni-runtime:0 >=virtual/jre-1.6 app-eselect/eselect-scala !dev-lang/scala-bin:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2.11/2.11.4
 SRC_URI=!binary? ( https://github.com/scala/scala/archive/v2.11.4.tar.gz -> scala-2.11.4.tar.gz http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/943cd5c8802b2a3a64a010efb86ec19bac142e40/lib/ant/ant-contrib.jar -> scala-2.11.4-ant-contrib.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/3fc1e35ca8c991fc3488548f7a276bd9053c179d/lib/ant/ant-dotnet-1.0.jar -> scala-2.11.4-ant-dotnet-1.0.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/7b456ca6b93900f96e58cc8371f03d90a9c1c8d1/lib/ant/ant.jar -> scala-2.11.4-ant.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/7e50e3e227d834695f1e0bf018a7326e06ee4c86/lib/ant/maven-ant-tasks-2.1.1.jar -> scala-2.11.4-maven-ant-tasks-2.1.1.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/2c61d6e9a912b3253194d5d6d3e1db7e2545ac4b/lib/ant/vizant.jar -> scala-2.11.4-vizant.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/ddd7d5398733c4fbbb8355c049e258d47af636cf/lib/forkjoin.jar -> scala-2.11.4-forkjoin.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/0392ecdeb306263c471ce51fa368223388b82b61/test/benchmarks/lib/jsr166_and_extra.jar -> scala-2.11.4-jsr166_and_extra.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/e737b123d31eede5594ceda07caafed1673ec472/test/files/codelib/code.jar -> scala-2.11.4-code.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/02fe2ed93766323a13f22c7a7e2ecdcd84259b6c/test/files/lib/annotations.jar -> scala-2.11.4-annotations.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/981392dbd1f727b152cd1c908c5fce60ad9d07f7/test/files/lib/enums.jar -> scala-2.11.4-enums.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/b1ec8a095cec4902b3609d74d274c04365c59c04/test/files/lib/genericNest.jar -> scala-2.11.4-genericNest.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/346d3dff4088839d6b4d163efa2892124039d216/test/files/lib/jsoup-1.3.1.jar -> scala-2.11.4-jsoup-1.3.1.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/3794ec22d9b27f2b179bd34e9b46db771b934ec3/test/files/lib/macro210.jar -> scala-2.11.4-macro210.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/be8454d5e7751b063ade201c225dcedefd252775/test/files/lib/methvsfield.jar -> scala-2.11.4-methvsfield.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/cd33e0a0ea249eb42363a2f8ba531186345ff68c/test/files/lib/nest.jar -> scala-2.11.4-nest.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/1b11ac773055c1e942c6b5eb4aabdf02292a7194/test/files/speclib/instrumented.jar -> scala-2.11.4-instrumented.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/a1883f4304d5aa65e1f6ee6aad5900c62dd81079/tools/push.jar -> scala-2.11.4-push.jar http://dev.gentoo.org/~gienah/snapshots/scala-2.11.4-maven-deps.tar.gz ) binary? ( http://dev.gentoo.org/~gienah/files/dist/scala-2.11.4-gentoo-binary.tar.bz2 )
 _eclasses_=check-reqs	a7f404bfb16e0a996700c5d3ac4edad3	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	f7dce580d4098b526be3fa17d4242820	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=62199b820a69faa280afb7c6050fde0d
+_md5_=6a7f702275fec326d30c679a6f583006
diff --git a/metadata/md5-cache/dev-libs/libksba-1.3.3 b/metadata/md5-cache/dev-libs/libksba-1.3.3
index 4cfc56d60b03..ac29e7a88e5d 100644
--- a/metadata/md5-cache/dev-libs/libksba-1.3.3
+++ b/metadata/md5-cache/dev-libs/libksba-1.3.3
@@ -4,10 +4,10 @@ DESCRIPTION=X.509 and CMS (PKCS#7) library
 EAPI=4
 HOMEPAGE=http://www.gnupg.org/related_software/libksba
 IUSE=static-libs
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-3+ GPL-2+ GPL-3
 RDEPEND=>=dev-libs/libgpg-error-1.8
 SLOT=0
 SRC_URI=mirror://gnupg/libksba/libksba-1.3.3.tar.bz2
 _eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	autotools-utils	3727db64c7b960903d5033280f108080	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
-_md5_=37f5f6054b50deb68e4e1671e56cbc86
+_md5_=5a1fc7679bce1952fb7d2e845df73b36
diff --git a/metadata/md5-cache/dev-libs/libtasn1-4.5 b/metadata/md5-cache/dev-libs/libtasn1-4.5
index df2611603566..5911317cd76f 100644
--- a/metadata/md5-cache/dev-libs/libtasn1-4.5
+++ b/metadata/md5-cache/dev-libs/libtasn1-4.5
@@ -4,10 +4,10 @@ DESCRIPTION=ASN.1 library
 EAPI=5
 HOMEPAGE=http://www.gnu.org/software/libtasn1/
 IUSE=doc static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=GPL-3 LGPL-2.1
 RDEPEND=abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20131008-r16 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=0/6
 SRC_URI=mirror://gnu/libtasn1/libtasn1-4.5.tar.gz
 _eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	3727db64c7b960903d5033280f108080	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
-_md5_=cb2b6005bf50585252134840121c05be
+_md5_=b3b387ee4c3f9b461d20a1f84ffd1bd5
diff --git a/metadata/md5-cache/dev-ruby/rubygems-2.2.4 b/metadata/md5-cache/dev-ruby/rubygems-2.2.4
new file mode 100644
index 000000000000..5c884493ddfe
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/rubygems-2.2.4
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DEPEND=ruby_targets_ruby19? ( test? ( >=dev-ruby/minitest-4:0[ruby_targets_ruby19] dev-ruby/rdoc[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( >=dev-ruby/minitest-4:0[ruby_targets_ruby20] dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 )
+DESCRIPTION=Centralized Ruby extension management system
+EAPI=5
+HOMEPAGE=http://rubyforge.org/projects/rubygems/
+IUSE=server test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=|| ( Ruby MIT )
+PDEPEND=server? ( >=dev-ruby/builder-2.1 )
+RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 )
+REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
+SLOT=0
+SRC_URI=http://production.cf.rubygems.org/rubygems/rubygems-2.2.4.tgz
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	f7dce580d4098b526be3fa17d4242820	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	prefix	21058c21ca48453d771df15500873ede	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=c9f0f8a1d2caf036abd3c646fdbe595c
diff --git a/metadata/md5-cache/dev-ruby/rubygems-2.4.7 b/metadata/md5-cache/dev-ruby/rubygems-2.4.7
new file mode 100644
index 000000000000..da27f3ff60ac
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/rubygems-2.4.7
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test unpack
+DEPEND=ruby_targets_ruby19? ( test? ( >=dev-ruby/minitest-4:0[ruby_targets_ruby19] dev-ruby/rdoc[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( >=dev-ruby/minitest-4:0[ruby_targets_ruby20] dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/minitest-4:0[ruby_targets_ruby21] dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/minitest-4:0[ruby_targets_ruby22] dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
+DESCRIPTION=Centralized Ruby extension management system
+EAPI=5
+HOMEPAGE=http://rubyforge.org/projects/rubygems/
+IUSE=server test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=|| ( Ruby MIT )
+PDEPEND=server? ( >=dev-ruby/builder-2.1 )
+RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
+REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
+SLOT=0
+SRC_URI=http://production.cf.rubygems.org/rubygems/rubygems-2.4.7.tgz
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	f7dce580d4098b526be3fa17d4242820	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	prefix	21058c21ca48453d771df15500873ede	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=e9c4211d45ae207d0b8e5b6ee224bab7
diff --git a/metadata/md5-cache/games-strategy/glob2-0.9.4.4-r1 b/metadata/md5-cache/games-strategy/glob2-0.9.4.4-r1
index 4eb819de1d9f..ef645b70533d 100644
--- a/metadata/md5-cache/games-strategy/glob2-0.9.4.4-r1
+++ b/metadata/md5-cache/games-strategy/glob2-0.9.4.4-r1
@@ -9,4 +9,4 @@ RDEPEND=>=dev-libs/boost-1.34[threads] dev-libs/fribidi media-libs/libsdl[opengl
 SLOT=0
 SRC_URI=mirror://nongnu/glob2/0.9.4/glob2-0.9.4.4.tar.gz
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	games	1ad3205dbf62a2c98249f2f59b0a2d39	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	scons-utils	988e24b9e2e4642189b4e97c03e5ae71	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=5c13d90b8401214555405f322299e6e8
+_md5_=b25d878ef32be87447384b262c2701f7
diff --git a/metadata/md5-cache/java-virtuals/interceptor-api-0 b/metadata/md5-cache/java-virtuals/interceptor-api-0
index 01e07d6da0f9..e3943fd2f9d8 100644
--- a/metadata/md5-cache/java-virtuals/interceptor-api-0
+++ b/metadata/md5-cache/java-virtuals/interceptor-api-0
@@ -4,9 +4,9 @@ DESCRIPTION=Virtual for Interceptor API (javax.interceptor)
 EAPI=5
 HOMEPAGE=http://www.gentoo.org
 IUSE=elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=public-domain
 RDEPEND=dev-java/glassfish-interceptor-api:0 >=dev-java/java-config-2.2.0
 SLOT=0
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	f7dce580d4098b526be3fa17d4242820	java-virtuals-2	3f6b3450d42c285ae53f6b9da9fb5ba3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=3389dba3fa30e606aa14e39d8d7bc95e
+_md5_=f25230f40e4af815c595362a303a0a0f
diff --git a/metadata/md5-cache/kde-frameworks/sonnet-5.10.0 b/metadata/md5-cache/kde-frameworks/sonnet-5.10.0
index 50cdb81065b1..779a81e550f3 100644
--- a/metadata/md5-cache/kde-frameworks/sonnet-5.10.0
+++ b/metadata/md5-cache/kde-frameworks/sonnet-5.10.0
@@ -3,11 +3,11 @@ DEPEND=dev-qt/qtgui:5 dev-qt/qtwidgets:5 aspell? ( app-text/aspell ) hunspell? (
 DESCRIPTION=Framework for providing spell-checking capabilities through abstraction of popular backends
 EAPI=5
 HOMEPAGE=http://www.kde.org/
-IUSE=aspell hunspell nls doc debug test
+IUSE=+aspell hunspell nls doc debug test
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2+ LGPL-2.1+
 RDEPEND=dev-qt/qtgui:5 dev-qt/qtwidgets:5 aspell? ( app-text/aspell ) hunspell? ( app-text/hunspell ) >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.1:5
 SLOT=5/5.10
 SRC_URI=mirror://kde/stable/frameworks/5.10/sonnet-5.10.0.tar.xz
 _eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	5d5921a298e95441da2f85be419894c0	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	d330552b299715078c6dd6198a3e1a54	kde5-functions	b41e30a82db452e044358d4ec4a2f142	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=0205cf61156d5ffa35342ffde69ba72a
+_md5_=f0144f342bb230d8d343eaed66ea1e14
diff --git a/metadata/md5-cache/kde-frameworks/sonnet-5.9.0 b/metadata/md5-cache/kde-frameworks/sonnet-5.9.0
index d44927c5b6fb..05b68d065d8b 100644
--- a/metadata/md5-cache/kde-frameworks/sonnet-5.9.0
+++ b/metadata/md5-cache/kde-frameworks/sonnet-5.9.0
@@ -3,11 +3,11 @@ DEPEND=dev-qt/qtgui:5 dev-qt/qtwidgets:5 aspell? ( app-text/aspell ) hunspell? (
 DESCRIPTION=Framework for providing spell-checking capabilities through abstraction of popular backends
 EAPI=5
 HOMEPAGE=http://www.kde.org/
-IUSE=aspell hunspell nls doc debug test
+IUSE=+aspell hunspell nls doc debug test
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2+ LGPL-2.1+
 RDEPEND=dev-qt/qtgui:5 dev-qt/qtwidgets:5 aspell? ( app-text/aspell ) hunspell? ( app-text/hunspell ) >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.1:5
 SLOT=5/5.9
 SRC_URI=mirror://kde/stable/frameworks/5.9/sonnet-5.9.0.tar.xz
 _eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	5d5921a298e95441da2f85be419894c0	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	d330552b299715078c6dd6198a3e1a54	kde5-functions	b41e30a82db452e044358d4ec4a2f142	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=7b3ac819890ea3be71cc12416f642159
+_md5_=522a737f56fe7526ae217ea017333dc6
diff --git a/metadata/md5-cache/media-libs/lensfun-0.2.8 b/metadata/md5-cache/media-libs/lensfun-0.2.8
deleted file mode 100644
index a7c7e926844a..000000000000
--- a/metadata/md5-cache/media-libs/lensfun-0.2.8
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-libs/glib-2.28 media-libs/libpng:0= sys-libs/zlib:= doc? ( app-doc/doxygen ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
-DESCRIPTION=lensfun: A library for rectifying and simulating photographic lens distortions
-EAPI=5
-HOMEPAGE=http://lensfun.sourceforge.net/
-IUSE=doc cpu_flags_x86_sse cpu_flags_x86_sse2 python_targets_python2_7
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux
-LICENSE=LGPL-3 CC-BY-SA-3.0
-RDEPEND=>=dev-libs/glib-2.28 media-libs/libpng:0= sys-libs/zlib:=
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=mirror://sourceforge/lensfun/lensfun-0.2.8.tar.bz2
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	5d5921a298e95441da2f85be419894c0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
-_md5_=56aa9b3ff4c244440511c1b6cd24877f
diff --git a/metadata/md5-cache/media-libs/x265-1.3 b/metadata/md5-cache/media-libs/x265-1.3
deleted file mode 100644
index cddc3c14658b..000000000000
--- a/metadata/md5-cache/media-libs/x265-1.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=abi_x86_32? ( >=dev-lang/yasm-1.2.0 ) abi_x86_64? ( >=dev-lang/yasm-1.2.0 ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
-DESCRIPTION=Library for encoding video streams into the H.265/HEVC format
-EAPI=5
-HOMEPAGE=http://x265.org/
-IUSE=+10bit test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-SLOT=0/31
-SRC_URI=https://bitbucket.org/multicoreware/x265/get/1.3.tar.bz2 -> x265-1.3.tar.bz2
-_eclasses_=cmake-multilib	ca4c6ecda3062bf851d951987568fdae	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	5d5921a298e95441da2f85be419894c0	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
-_md5_=6b70286e2f00a1b6dac9664c565923c1
diff --git a/metadata/md5-cache/media-libs/x265-1.4 b/metadata/md5-cache/media-libs/x265-1.7
similarity index 80%
rename from metadata/md5-cache/media-libs/x265-1.4
rename to metadata/md5-cache/media-libs/x265-1.7
index 15f30d384d2f..9601acc93878 100644
--- a/metadata/md5-cache/media-libs/x265-1.4
+++ b/metadata/md5-cache/media-libs/x265-1.7
@@ -4,9 +4,9 @@ DESCRIPTION=Library for encoding video streams into the H.265/HEVC format
 EAPI=5
 HOMEPAGE=http://x265.org/
 IUSE=+10bit test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ~hppa ~ppc64 ~x86
 LICENSE=GPL-2
-SLOT=0/35
-SRC_URI=https://bitbucket.org/multicoreware/x265/get/1.4.tar.bz2 -> x265-1.4.tar.bz2
+SLOT=0/48
+SRC_URI=https://bitbucket.org/multicoreware/x265/downloads/x265_1.7.tar.gz http://ftp.videolan.org/pub/videolan/x265/x265_1.7.tar.gz
 _eclasses_=cmake-multilib	ca4c6ecda3062bf851d951987568fdae	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	5d5921a298e95441da2f85be419894c0	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
-_md5_=c863e01274e3ce4f642c6b11412d5d9e
+_md5_=d03c433aac5932046fd76547141d6afa
diff --git a/metadata/md5-cache/media-libs/x265-9999 b/metadata/md5-cache/media-libs/x265-9999
index 5151accab89e..16883c65969d 100644
--- a/metadata/md5-cache/media-libs/x265-9999
+++ b/metadata/md5-cache/media-libs/x265-9999
@@ -7,4 +7,4 @@ IUSE=+10bit test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi
 LICENSE=GPL-2
 SLOT=0/48
 _eclasses_=cmake-multilib	ca4c6ecda3062bf851d951987568fdae	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	5d5921a298e95441da2f85be419894c0	mercurial	2fbda5894dda6392b71334ee9a92de0b	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
-_md5_=72a9d77a896215b0f4db23c9f051f40e
+_md5_=e936c9bbf2e7c469139c9faae1145077
diff --git a/metadata/md5-cache/media-video/ffmpeg-9999 b/metadata/md5-cache/media-video/ffmpeg-9999
index 4ff0a5baae21..dc7d50f636be 100644
--- a/metadata/md5-cache/media-video/ffmpeg-9999
+++ b/metadata/md5-cache/media-video/ffmpeg-9999
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) amr? ( >=media-libs/opencore-amr-0.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bluray? ( >=media-libs/libbluray-0.3.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bs2b? ( >=media-libs/libbs2b-3.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) celt? ( >=media-libs/celt-0.11.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) encode? ( aac? ( >=media-libs/vo-aacenc-0.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) aacplus? ( >=media-libs/libaacplus-2.0.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) faac? ( >=media-libs/faac-1.28-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/lame-3.99.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) theora? ( >=media-libs/libtheora-1.1.1[encode,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) twolame? ( >=media-sound/twolame-0.3.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wavpack? ( >=media-sound/wavpack-4.60.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( >=media-libs/libwebp-0.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x264? ( >=media-libs/x264-0.0.20130506:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x265? ( >=media-libs/x265-1.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xvid? ( >=media-libs/xvid-1.3.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) fdk? ( >=media-libs/fdk-aac-0.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) flite? ( >=app-accessibility/flite-1.4-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) frei0r? ( media-plugins/frei0r-plugins ) fribidi? ( >=dev-libs/fribidi-0.19.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gme? ( >=media-libs/game-music-emu-0.6.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gnutls? ( >=net-libs/gnutls-2.12.23-r6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iconv? ( >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iec61883? ( >=media-libs/libiec61883-1.2.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libavc1394-0.5.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ieee1394? ( >=media-libs/libdc1394-2.2.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jack? ( >=media-sound/jack-audio-connection-kit-0.121.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg2k? ( >=media-libs/openjpeg-1.5.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libass? ( >=media-libs/libass-0.10.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libsoxr? ( >=media-libs/soxr-0.1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libv4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openssl? ( >=dev-libs/openssl-1.0.1h-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opus? ( >=media-libs/opus-1.0.2-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) quvi? ( media-libs/libquvi:0.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rtmp? ( >=media-video/rtmpdump-2.4_p20131018[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) samba? ( >=net-fs/samba-3.6.23-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( >=media-libs/libsdl-1.2.15-r4[sound,video,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) speex? ( >=media-libs/speex-1.2_rc1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssh? ( >=net-libs/libssh-0.5.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.5.0.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=x11-libs/libva-1.2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-0.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vorbis? ( >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vpx? ( >=media-libs/libvpx-1.2.0_pre20130625[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !xcb? ( >=x11-libs/libXfixes-5.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=x11-libs/libXv-1.0.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcb? ( >=x11-libs/libxcb-1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zvbi? ( >=media-libs/zvbi-0.2.35[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !media-video/qt-faststart postproc? ( !media-libs/libpostproc ) >=sys-devel/make-3.81 doc? ( app-text/texi2html ) fontconfig? ( >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gnutls? ( >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ieee1394? ( >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ladspa? ( >=media-libs/ladspa-sdk-1.13-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libv4l? ( >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cpu_flags_x86_mmx? ( >=dev-lang/yasm-1.2 ) rtmp? ( >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) schroedinger? ( >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) test? ( net-misc/wget sys-devel/bc ) truetype? ( >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( sys-kernel/linux-headers ) dev-vcs/git
+DEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) amr? ( >=media-libs/opencore-amr-0.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bluray? ( >=media-libs/libbluray-0.3.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bs2b? ( >=media-libs/libbs2b-3.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) celt? ( >=media-libs/celt-0.11.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) encode? ( aac? ( >=media-libs/vo-aacenc-0.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) aacplus? ( >=media-libs/libaacplus-2.0.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) faac? ( >=media-libs/faac-1.28-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/lame-3.99.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) theora? ( >=media-libs/libtheora-1.1.1[encode,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) twolame? ( >=media-sound/twolame-0.3.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wavpack? ( >=media-sound/wavpack-4.60.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( >=media-libs/libwebp-0.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x264? ( >=media-libs/x264-0.0.20130506:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x265? ( >=media-libs/x265-1.6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xvid? ( >=media-libs/xvid-1.3.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) fdk? ( >=media-libs/fdk-aac-0.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) flite? ( >=app-accessibility/flite-1.4-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) frei0r? ( media-plugins/frei0r-plugins ) fribidi? ( >=dev-libs/fribidi-0.19.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gme? ( >=media-libs/game-music-emu-0.6.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gnutls? ( >=net-libs/gnutls-2.12.23-r6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iconv? ( >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iec61883? ( >=media-libs/libiec61883-1.2.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libavc1394-0.5.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ieee1394? ( >=media-libs/libdc1394-2.2.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jack? ( >=media-sound/jack-audio-connection-kit-0.121.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg2k? ( >=media-libs/openjpeg-1.5.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libass? ( >=media-libs/libass-0.10.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libsoxr? ( >=media-libs/soxr-0.1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libv4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openssl? ( >=dev-libs/openssl-1.0.1h-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opus? ( >=media-libs/opus-1.0.2-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) quvi? ( media-libs/libquvi:0.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rtmp? ( >=media-video/rtmpdump-2.4_p20131018[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) samba? ( >=net-fs/samba-3.6.23-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( >=media-libs/libsdl-1.2.15-r4[sound,video,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) speex? ( >=media-libs/speex-1.2_rc1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssh? ( >=net-libs/libssh-0.5.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.5.0.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=x11-libs/libva-1.2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-0.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vorbis? ( >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vpx? ( >=media-libs/libvpx-1.2.0_pre20130625[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !xcb? ( >=x11-libs/libXfixes-5.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=x11-libs/libXv-1.0.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcb? ( >=x11-libs/libxcb-1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zvbi? ( >=media-libs/zvbi-0.2.35[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !media-video/qt-faststart postproc? ( !media-libs/libpostproc ) >=sys-devel/make-3.81 doc? ( app-text/texi2html ) fontconfig? ( >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gnutls? ( >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ieee1394? ( >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ladspa? ( >=media-libs/ladspa-sdk-1.13-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libv4l? ( >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cpu_flags_x86_mmx? ( >=dev-lang/yasm-1.2 ) rtmp? ( >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) schroedinger? ( >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) test? ( net-misc/wget sys-devel/bc ) truetype? ( >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( sys-kernel/linux-headers ) dev-vcs/git
 DESCRIPTION=Complete solution to record, convert and stream audio and video. Includes libavcodec
 EAPI=5
 HOMEPAGE=http://ffmpeg.org/
 IUSE=alsa +encode examples jack oss pic static-libs test v4l +bzip2 cpudetection debug doc gnutls +gpl +hardcoded-tables +iconv lzma +network openssl +postproc samba sdl vaapi vdpau X xcb xcb xcb +zlib cdio iec61883 ieee1394 libcaca openal opengl libv4l pulseaudio amr amr fdk jpeg2k bluray celt gme gsm modplug opus quvi rtmp ssh schroedinger speex vorbis vpx zvbi bs2b flite frei0r fribidi fontconfig ladspa libass truetype libsoxr +threads aac amrenc mp3 aacplus faac theora twolame wavpack webp x264 x265 xvid armv5te armv6 armv6t2 neon armvfp mipsdspr1 mipsdspr2 mipsfpu altivec cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_mmx cpu_flags_x86_mmxext cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_xop +fftools_aviocat +fftools_cws2fws +fftools_ffescape +fftools_ffeval +fftools_ffhash +fftools_fourcc2pixfmt +fftools_graph2dot +fftools_ismindex +fftools_pktdumper +fftools_qt-faststart +fftools_trasher abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
 LICENSE=!gpl? ( LGPL-2.1 ) gpl? ( GPL-2 ) amr? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) encode? ( aac? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) amrenc? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) ) samba? ( GPL-3 )
-RDEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) amr? ( >=media-libs/opencore-amr-0.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bluray? ( >=media-libs/libbluray-0.3.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bs2b? ( >=media-libs/libbs2b-3.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) celt? ( >=media-libs/celt-0.11.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) encode? ( aac? ( >=media-libs/vo-aacenc-0.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) aacplus? ( >=media-libs/libaacplus-2.0.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) faac? ( >=media-libs/faac-1.28-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/lame-3.99.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) theora? ( >=media-libs/libtheora-1.1.1[encode,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) twolame? ( >=media-sound/twolame-0.3.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wavpack? ( >=media-sound/wavpack-4.60.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( >=media-libs/libwebp-0.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x264? ( >=media-libs/x264-0.0.20130506:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x265? ( >=media-libs/x265-1.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xvid? ( >=media-libs/xvid-1.3.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) fdk? ( >=media-libs/fdk-aac-0.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) flite? ( >=app-accessibility/flite-1.4-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) frei0r? ( media-plugins/frei0r-plugins ) fribidi? ( >=dev-libs/fribidi-0.19.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gme? ( >=media-libs/game-music-emu-0.6.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gnutls? ( >=net-libs/gnutls-2.12.23-r6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iconv? ( >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iec61883? ( >=media-libs/libiec61883-1.2.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libavc1394-0.5.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ieee1394? ( >=media-libs/libdc1394-2.2.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jack? ( >=media-sound/jack-audio-connection-kit-0.121.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg2k? ( >=media-libs/openjpeg-1.5.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libass? ( >=media-libs/libass-0.10.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libsoxr? ( >=media-libs/soxr-0.1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libv4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openssl? ( >=dev-libs/openssl-1.0.1h-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opus? ( >=media-libs/opus-1.0.2-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) quvi? ( media-libs/libquvi:0.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rtmp? ( >=media-video/rtmpdump-2.4_p20131018[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) samba? ( >=net-fs/samba-3.6.23-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( >=media-libs/libsdl-1.2.15-r4[sound,video,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) speex? ( >=media-libs/speex-1.2_rc1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssh? ( >=net-libs/libssh-0.5.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.5.0.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=x11-libs/libva-1.2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-0.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vorbis? ( >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vpx? ( >=media-libs/libvpx-1.2.0_pre20130625[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !xcb? ( >=x11-libs/libXfixes-5.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=x11-libs/libXv-1.0.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcb? ( >=x11-libs/libxcb-1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zvbi? ( >=media-libs/zvbi-0.2.35[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !media-video/qt-faststart postproc? ( !media-libs/libpostproc ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )
+RDEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) amr? ( >=media-libs/opencore-amr-0.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bluray? ( >=media-libs/libbluray-0.3.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bs2b? ( >=media-libs/libbs2b-3.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) celt? ( >=media-libs/celt-0.11.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) encode? ( aac? ( >=media-libs/vo-aacenc-0.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) aacplus? ( >=media-libs/libaacplus-2.0.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) faac? ( >=media-libs/faac-1.28-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/lame-3.99.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) theora? ( >=media-libs/libtheora-1.1.1[encode,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) twolame? ( >=media-sound/twolame-0.3.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wavpack? ( >=media-sound/wavpack-4.60.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( >=media-libs/libwebp-0.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x264? ( >=media-libs/x264-0.0.20130506:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x265? ( >=media-libs/x265-1.6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xvid? ( >=media-libs/xvid-1.3.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) fdk? ( >=media-libs/fdk-aac-0.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) flite? ( >=app-accessibility/flite-1.4-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) frei0r? ( media-plugins/frei0r-plugins ) fribidi? ( >=dev-libs/fribidi-0.19.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gme? ( >=media-libs/game-music-emu-0.6.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gnutls? ( >=net-libs/gnutls-2.12.23-r6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iconv? ( >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iec61883? ( >=media-libs/libiec61883-1.2.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libavc1394-0.5.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ieee1394? ( >=media-libs/libdc1394-2.2.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jack? ( >=media-sound/jack-audio-connection-kit-0.121.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg2k? ( >=media-libs/openjpeg-1.5.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libass? ( >=media-libs/libass-0.10.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libsoxr? ( >=media-libs/soxr-0.1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libv4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openssl? ( >=dev-libs/openssl-1.0.1h-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opus? ( >=media-libs/opus-1.0.2-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) quvi? ( media-libs/libquvi:0.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rtmp? ( >=media-video/rtmpdump-2.4_p20131018[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) samba? ( >=net-fs/samba-3.6.23-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( >=media-libs/libsdl-1.2.15-r4[sound,video,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) speex? ( >=media-libs/speex-1.2_rc1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssh? ( >=net-libs/libssh-0.5.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.5.0.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=x11-libs/libva-1.2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-0.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vorbis? ( >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vpx? ( >=media-libs/libvpx-1.2.0_pre20130625[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !xcb? ( >=x11-libs/libXfixes-5.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=x11-libs/libXv-1.0.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcb? ( >=x11-libs/libxcb-1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zvbi? ( >=media-libs/zvbi-0.2.35[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !media-video/qt-faststart postproc? ( !media-libs/libpostproc ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )
 REQUIRED_USE=libv4l? ( v4l ) fftools_cws2fws? ( zlib ) test? ( encode ) postproc? ( gpl ) frei0r? ( gpl ) cdio? ( gpl ) samba? ( gpl ) zvbi? ( gpl ) encode? ( x264? ( gpl ) x265? ( gpl ) xvid? ( gpl ) X? ( !xcb? ( gpl ) ) ) cpu_flags_x86_avx2? ( cpu_flags_x86_avx ) cpu_flags_x86_fma4? ( cpu_flags_x86_avx ) cpu_flags_x86_fma3? ( cpu_flags_x86_avx ) cpu_flags_x86_xop? ( cpu_flags_x86_avx ) cpu_flags_x86_avx? ( cpu_flags_x86_sse4_2 ) cpu_flags_x86_sse4_2? ( cpu_flags_x86_sse4_1 ) cpu_flags_x86_sse4_1? ( cpu_flags_x86_ssse3 ) cpu_flags_x86_ssse3? ( cpu_flags_x86_sse3 ) cpu_flags_x86_sse3? ( cpu_flags_x86_sse2 ) cpu_flags_x86_sse2? ( cpu_flags_x86_sse ) cpu_flags_x86_sse? ( cpu_flags_x86_mmxext ) cpu_flags_x86_mmxext? ( cpu_flags_x86_mmx ) cpu_flags_x86_3dnowext? ( cpu_flags_x86_3dnow ) cpu_flags_x86_3dnow? ( cpu_flags_x86_mmx )
 RESTRICT=encode? ( faac? ( bindist ) aacplus? ( bindist ) ) gpl? ( openssl? ( bindist ) fdk? ( bindist ) )
 SLOT=0/54.56.56
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	5d5921a298e95441da2f85be419894c0	git-2	e28f0d8a9b321431b1e699782851b827	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
-_md5_=8af2a7f573220b9f5798e462a2fcd2f5
+_md5_=c2933b829df6e76ba693ea1fbcba24c6
diff --git a/metadata/md5-cache/media-video/mpv-0.9.2 b/metadata/md5-cache/media-video/mpv-0.9.2
new file mode 100644
index 000000000000..188cf0c33849
--- /dev/null
+++ b/metadata/md5-cache/media-video/mpv-0.9.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
+DEPEND=libav? ( >=media-video/libav-11:0=[encode?,threads,vaapi?,vdpau?] ) !libav? ( >=media-video/ffmpeg-2.4.0:0=[encode?,threads,vaapi?,vdpau?] ) sys-libs/zlib X? ( x11-libs/libX11 x11-libs/libXext >=x11-libs/libXrandr-1.2.0 opengl? ( virtual/opengl egl? ( media-libs/mesa[egl] ) ) lcms? ( >=media-libs/lcms-2.6:2 ) vaapi? ( >=x11-libs/libva-0.34.0[X(+)] ) vdpau? ( >=x11-libs/libvdpau-0.2 ) xinerama? ( x11-libs/libXinerama ) xscreensaver? ( x11-libs/libXScrnSaver ) xv? ( x11-libs/libXv ) ) alsa? ( >=media-libs/alsa-lib-1.0.18 ) bluray? ( >=media-libs/libbluray-0.3.0 ) bs2b? ( media-libs/libbs2b ) cdio? ( dev-libs/libcdio dev-libs/libcdio-paranoia ) drm? ( x11-libs/libdrm ) dvb? ( virtual/linuxtv-dvb-headers ) dvd? ( >=media-libs/libdvdread-4.1.3 dvdnav? ( >=media-libs/libdvdnav-4.2.0 ) ) enca? ( app-i18n/enca ) iconv? ( virtual/libiconv ) jack? ( media-sound/jack-audio-connection-kit ) jpeg? ( virtual/jpeg:0 ) ladspa? ( media-libs/ladspa-sdk ) libass? ( >=media-libs/libass-0.12.1:=[enca?,fontconfig] virtual/ttf-fonts ) libcaca? ( >=media-libs/libcaca-0.99_beta18 ) libguess? ( >=app-i18n/libguess-1.0 ) lua? ( !luajit? ( || ( =dev-lang/lua-5.1*:= =dev-lang/lua-5.2*:= ) ) luajit? ( dev-lang/luajit:2 ) ) openal? ( >=media-libs/openal-1.13 ) pulseaudio? ( media-sound/pulseaudio ) rubberband? ( >=media-libs/rubberband-1.8.0 ) samba? ( net-fs/samba ) sdl? ( media-libs/libsdl2[threads] ) v4l? ( media-libs/libv4l ) wayland? ( >=dev-libs/wayland-1.6.0 media-libs/mesa[egl,wayland] >=x11-libs/libxkbcommon-0.3.0 ) || ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] dev-lang/python:3.4[threads(+)] >=dev-lang/python-3.3.2-r2:3.3[threads(+)] ) virtual/pkgconfig >=dev-lang/perl-5.8 dev-python/docutils doc-pdf? ( dev-python/rst2pdf ) X? ( x11-proto/videoproto xinerama? ( x11-proto/xineramaproto ) xscreensaver? ( x11-proto/scrnsaverproto ) ) dev-lang/python !dev-lang/python[-threads] >=sys-apps/sed-4
+DESCRIPTION=Media player based on MPlayer and mplayer2
+EAPI=5
+HOMEPAGE=http://mpv.io/
+IUSE=+alsa bluray bs2b cdio +cli doc-pdf drm dvb +dvd dvdnav egl +enca encode +iconv jack jpeg ladspa lcms +libass libav libcaca libguess libmpv lua luajit openal +opengl oss pulseaudio pvr raspberry-pi rubberband samba sdl selinux v4l vaapi vdpau vf-dlopen wayland +X xinerama +xscreensaver xv
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux
+LICENSE=GPL-2+ BSD ISC
+RDEPEND=libav? ( >=media-video/libav-11:0=[encode?,threads,vaapi?,vdpau?] ) !libav? ( >=media-video/ffmpeg-2.4.0:0=[encode?,threads,vaapi?,vdpau?] ) sys-libs/zlib X? ( x11-libs/libX11 x11-libs/libXext >=x11-libs/libXrandr-1.2.0 opengl? ( virtual/opengl egl? ( media-libs/mesa[egl] ) ) lcms? ( >=media-libs/lcms-2.6:2 ) vaapi? ( >=x11-libs/libva-0.34.0[X(+)] ) vdpau? ( >=x11-libs/libvdpau-0.2 ) xinerama? ( x11-libs/libXinerama ) xscreensaver? ( x11-libs/libXScrnSaver ) xv? ( x11-libs/libXv ) ) alsa? ( >=media-libs/alsa-lib-1.0.18 ) bluray? ( >=media-libs/libbluray-0.3.0 ) bs2b? ( media-libs/libbs2b ) cdio? ( dev-libs/libcdio dev-libs/libcdio-paranoia ) drm? ( x11-libs/libdrm ) dvb? ( virtual/linuxtv-dvb-headers ) dvd? ( >=media-libs/libdvdread-4.1.3 dvdnav? ( >=media-libs/libdvdnav-4.2.0 ) ) enca? ( app-i18n/enca ) iconv? ( virtual/libiconv ) jack? ( media-sound/jack-audio-connection-kit ) jpeg? ( virtual/jpeg:0 ) ladspa? ( media-libs/ladspa-sdk ) libass? ( >=media-libs/libass-0.12.1:=[enca?,fontconfig] virtual/ttf-fonts ) libcaca? ( >=media-libs/libcaca-0.99_beta18 ) libguess? ( >=app-i18n/libguess-1.0 ) lua? ( !luajit? ( || ( =dev-lang/lua-5.1*:= =dev-lang/lua-5.2*:= ) ) luajit? ( dev-lang/luajit:2 ) ) openal? ( >=media-libs/openal-1.13 ) pulseaudio? ( media-sound/pulseaudio ) rubberband? ( >=media-libs/rubberband-1.8.0 ) samba? ( net-fs/samba ) sdl? ( media-libs/libsdl2[threads] ) v4l? ( media-libs/libv4l ) wayland? ( >=dev-libs/wayland-1.6.0 media-libs/mesa[egl,wayland] >=x11-libs/libxkbcommon-0.3.0 ) selinux? ( sec-policy/selinux-mplayer )
+REQUIRED_USE=|| ( cli libmpv ) dvdnav? ( dvd ) egl? ( opengl X ) enca? ( iconv ) lcms? ( opengl ) libguess? ( iconv ) luajit? ( lua ) opengl? ( || ( wayland X ) ) pvr? ( v4l ) vaapi? ( X ) vdpau? ( X ) wayland? ( opengl ) xinerama? ( X ) xscreensaver? ( X ) xv? ( X )
+SLOT=0
+SRC_URI=http://ftp.waf.io/pub/release/waf-1.8.4 https://github.com/mpv-player/mpv/archive/v0.9.2.tar.gz -> mpv-0.9.2.tar.gz
+_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	pax-utils	dfe060cb70d89757fde5c1ff8405e950	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	waf-utils	b5ddb40c4095c9a1a3f6fd49d32fd922
+_md5_=df87a1935358f39cdd880e0a26a1b59b
diff --git a/metadata/md5-cache/net-analyzer/greenbone-security-assistant-5.0.7 b/metadata/md5-cache/net-analyzer/greenbone-security-assistant-5.0.7
new file mode 100644
index 000000000000..b2d9b2e26aba
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/greenbone-security-assistant-5.0.7
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=net-analyzer/openvas-libraries-7.0.10 dev-libs/libxslt net-libs/libmicrohttpd[messages] virtual/pkgconfig sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) virtual/pkgconfig
+DESCRIPTION=Greenbone Security Assistant for openvas
+EAPI=5
+HOMEPAGE=http://www.openvas.org/
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=>=net-analyzer/openvas-libraries-7.0.10 dev-libs/libxslt net-libs/libmicrohttpd[messages]
+SLOT=0
+SRC_URI=http://wald.intevation.org/frs/download.php/2039/greenbone-security-assistant-5.0.7.tar.gz
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	5d5921a298e95441da2f85be419894c0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
+_md5_=1edfb4485939f25ab52f92e045e285f4
diff --git a/metadata/md5-cache/net-analyzer/greenbone-security-assistant-6.0.3 b/metadata/md5-cache/net-analyzer/greenbone-security-assistant-6.0.3
new file mode 100644
index 000000000000..bdcd6d1040a9
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/greenbone-security-assistant-6.0.3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/libgcrypt:0 dev-libs/libxslt >=net-analyzer/openvas-libraries-8.0.3 net-libs/libmicrohttpd[messages] virtual/pkgconfig sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) virtual/pkgconfig
+DESCRIPTION=Greenbone Security Assistant for openvas
+EAPI=5
+HOMEPAGE=http://www.openvas.org/
+KEYWORDS=~amd64 ~arm ~ppc ~x86
+LICENSE=GPL-2+ BSD MIT
+RDEPEND=dev-libs/libgcrypt:0 dev-libs/libxslt >=net-analyzer/openvas-libraries-8.0.3 net-libs/libmicrohttpd[messages]
+SLOT=0
+SRC_URI=http://wald.intevation.org/frs/download.php/2079/greenbone-security-assistant-6.0.3.tar.gz
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	5d5921a298e95441da2f85be419894c0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
+_md5_=7f45c16f9328ea10fe757aa190978bec
diff --git a/metadata/md5-cache/net-analyzer/openvas-7.0.10 b/metadata/md5-cache/net-analyzer/openvas-7.0.10
new file mode 100644
index 000000000000..71f807204e97
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/openvas-7.0.10
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst
+DEPEND=>=net-analyzer/openvas-libraries-7.0.10 >=net-analyzer/openvas-scanner-4.0.6 >=net-analyzer/openvas-manager-5.0.10 >=net-analyzer/openvas-cli-1.3.1 net-analyzer/openvas-tools pdf? ( app-text/htmldoc dev-texlive/texlive-latexextra virtual/latex-base )
+DESCRIPTION=A remote security scanner
+EAPI=5
+HOMEPAGE=http://www.openvas.org/
+IUSE=+pdf
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=net-analyzer/openvas-libraries-7.0.10 >=net-analyzer/openvas-scanner-4.0.6 >=net-analyzer/openvas-manager-5.0.10 >=net-analyzer/openvas-cli-1.3.1 net-analyzer/openvas-tools pdf? ( app-text/htmldoc dev-texlive/texlive-latexextra virtual/latex-base )
+SLOT=0
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
+_md5_=d7d86c8d6de81704f5bc7482e2203c39
diff --git a/metadata/md5-cache/net-analyzer/openvas-8.0.3 b/metadata/md5-cache/net-analyzer/openvas-8.0.3
new file mode 100644
index 000000000000..9ddd09ad15c2
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/openvas-8.0.3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst
+DEPEND=>=net-analyzer/openvas-libraries-8.0.3 >=net-analyzer/openvas-scanner-5.0.3 >=net-analyzer/openvas-manager-6.0.3 >=net-analyzer/openvas-cli-1.4.0 net-analyzer/openvas-tools pdf? ( app-text/htmldoc dev-texlive/texlive-latexextra virtual/latex-base )
+DESCRIPTION=A remote security scanner
+EAPI=5
+HOMEPAGE=http://www.openvas.org/
+IUSE=+pdf
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=net-analyzer/openvas-libraries-8.0.3 >=net-analyzer/openvas-scanner-5.0.3 >=net-analyzer/openvas-manager-6.0.3 >=net-analyzer/openvas-cli-1.4.0 net-analyzer/openvas-tools pdf? ( app-text/htmldoc dev-texlive/texlive-latexextra virtual/latex-base )
+SLOT=0
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
+_md5_=556eaa29610c5ccb09401b092458c63c
diff --git a/metadata/md5-cache/net-analyzer/openvas-libraries-7.0.10 b/metadata/md5-cache/net-analyzer/openvas-libraries-7.0.10
new file mode 100644
index 000000000000..724edaad5342
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/openvas-libraries-7.0.10
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=app-crypt/gpgme >=dev-libs/glib-2.12 dev-libs/libksba !net-analyzer/openvas-libnasl =net-libs/gnutls-2* net-libs/libpcap net-libs/libssh ldap? ( net-nds/openldap ) sys-devel/bison sys-devel/flex virtual/pkgconfig sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+DESCRIPTION=A remote security scanner for Linux (openvas-libraries)
+EAPI=5
+HOMEPAGE=http://www.openvas.org/
+IUSE=ldap
+KEYWORDS=~amd64 ~arm ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=app-crypt/gpgme >=dev-libs/glib-2.12 dev-libs/libksba !net-analyzer/openvas-libnasl =net-libs/gnutls-2* net-libs/libpcap net-libs/libssh ldap? ( net-nds/openldap )
+SLOT=0
+SRC_URI=http://wald.intevation.org/frs/download.php/2031/openvas-libraries-7.0.10.tar.gz
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	5d5921a298e95441da2f85be419894c0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
+_md5_=a2d8c4a4aa53cafa4f433f111d4d968e
diff --git a/metadata/md5-cache/net-analyzer/openvas-libraries-8.0.3 b/metadata/md5-cache/net-analyzer/openvas-libraries-8.0.3
new file mode 100644
index 000000000000..155dec685079
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/openvas-libraries-8.0.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=app-crypt/gpgme >=dev-libs/glib-2.16 >=dev-libs/hiredis-0.10.1 dev-libs/libgcrypt:0 dev-libs/libksba !net-analyzer/openvas-libnasl =net-libs/gnutls-2* net-libs/libpcap >=net-libs/libssh-0.5.0 net-analyzer/net-snmp ldap? ( net-nds/openldap ) sys-devel/bison sys-devel/flex virtual/pkgconfig sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+DESCRIPTION=A remote security scanner for Linux (openvas-libraries)
+EAPI=5
+HOMEPAGE=http://www.openvas.org/
+IUSE=ldap
+KEYWORDS=~amd64 ~arm ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=app-crypt/gpgme >=dev-libs/glib-2.16 >=dev-libs/hiredis-0.10.1 dev-libs/libgcrypt:0 dev-libs/libksba !net-analyzer/openvas-libnasl =net-libs/gnutls-2* net-libs/libpcap >=net-libs/libssh-0.5.0 net-analyzer/net-snmp ldap? ( net-nds/openldap )
+SLOT=0
+SRC_URI=http://wald.intevation.org/frs/download.php/2067/openvas-libraries-8.0.3.tar.gz
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	5d5921a298e95441da2f85be419894c0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
+_md5_=d4765cfa4a47706dce515178037dea10
diff --git a/metadata/md5-cache/net-analyzer/openvas-manager-5.0.10 b/metadata/md5-cache/net-analyzer/openvas-manager-5.0.10
new file mode 100644
index 000000000000..0e5e443a54af
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/openvas-manager-5.0.10
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=net-analyzer/openvas-libraries-7.0.10 >=dev-db/sqlite-3 !net-analyzer/openvas-administrator virtual/pkgconfig sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) virtual/pkgconfig
+DESCRIPTION=A remote security scanner for Linux (openvas-manager)
+EAPI=5
+HOMEPAGE=http://www.openvas.org/
+KEYWORDS=~amd64 ~arm ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=>=net-analyzer/openvas-libraries-7.0.10 >=dev-db/sqlite-3 !net-analyzer/openvas-administrator
+SLOT=0
+SRC_URI=http://wald.intevation.org/frs/download.php/2035/openvas-manager-5.0.10.tar.gz
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	5d5921a298e95441da2f85be419894c0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
+_md5_=37f686f008274dd03bbb74075850a12d
diff --git a/metadata/md5-cache/net-analyzer/openvas-manager-6.0.3 b/metadata/md5-cache/net-analyzer/openvas-manager-6.0.3
new file mode 100644
index 000000000000..ed52afbd5707
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/openvas-manager-6.0.3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=net-analyzer/openvas-libraries-8.0.3 >=dev-db/sqlite-3 !net-analyzer/openvas-administrator virtual/pkgconfig sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) virtual/pkgconfig
+DESCRIPTION=A remote security scanner for Linux (openvas-manager)
+EAPI=5
+HOMEPAGE=http://www.openvas.org/
+KEYWORDS=~amd64 ~arm ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=>=net-analyzer/openvas-libraries-8.0.3 >=dev-db/sqlite-3 !net-analyzer/openvas-administrator
+SLOT=0
+SRC_URI=http://wald.intevation.org/frs/download.php/2075/openvas-manager-6.0.3.tar.gz
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	5d5921a298e95441da2f85be419894c0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
+_md5_=1f39bd995323e3aa2b7dedaa0e7baf20
diff --git a/metadata/md5-cache/net-analyzer/openvas-scanner-5.0.3 b/metadata/md5-cache/net-analyzer/openvas-scanner-5.0.3
new file mode 100644
index 000000000000..c4ccef7e39f1
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/openvas-scanner-5.0.3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=app-crypt/gpgme >=dev-libs/glib-2.16:2 dev-libs/libgcrypt:0 >=net-analyzer/openvas-libraries-8.0.2 !net-analyzer/openvas-plugins !net-analyzer/openvas-server virtual/pkgconfig sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) virtual/pkgconfig
+DESCRIPTION=A remote security scanner for Linux (OpenVAS-scanner)
+EAPI=5
+HOMEPAGE=http://www.openvas.org/
+KEYWORDS=~amd64 ~arm ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=app-crypt/gpgme >=dev-libs/glib-2.16:2 dev-libs/libgcrypt:0 >=net-analyzer/openvas-libraries-8.0.2 !net-analyzer/openvas-plugins !net-analyzer/openvas-server
+SLOT=0
+SRC_URI=http://wald.intevation.org/frs/download.php/2071/openvas-scanner-5.0.3.tar.gz
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	5d5921a298e95441da2f85be419894c0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
+_md5_=a0cb5500fb1402c062f020812ebf9c6d
diff --git a/metadata/md5-cache/net-libs/gnutls-3.3.15 b/metadata/md5-cache/net-libs/gnutls-3.3.15
index e909ceb4139f..ebd4af2eb004 100644
--- a/metadata/md5-cache/net-libs/gnutls-3.3.15
+++ b/metadata/md5-cache/net-libs/gnutls-3.3.15
@@ -4,10 +4,10 @@ DESCRIPTION=A TLS 1.2 and SSL 3.0 implementation for the GNU project
 EAPI=5
 HOMEPAGE=http://www.gnutls.org/
 IUSE=+cxx +crywrap dane doc examples guile nls +openssl pkcs11 static-libs test zlib linguas_en linguas_cs linguas_de linguas_fi linguas_fr linguas_it linguas_ms linguas_nl linguas_pl linguas_sv linguas_uk linguas_vi linguas_zh_CN abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-3 LGPL-3
 RDEPEND=>=dev-libs/libtasn1-3.9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/nettle-2.7[gmp,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <dev-libs/nettle-3[gmp,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/gmp-5.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/autogen crywrap? ( net-dns/libidn ) dane? ( >=net-dns/unbound-1.4.20[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) guile? ( >=dev-scheme/guile-1.8:*[networking] ) nls? ( >=virtual/libintl-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pkcs11? ( >=app-crypt/p11-kit-0.20.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=mirror://gnupg/gnutls/v3.3/gnutls-3.3.15.tar.xz
 _eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=576b67dc412ab41b3ffb2b900ebaa2b2
+_md5_=1caeb05b46b6adb754892dfc38e2b03e
diff --git a/metadata/md5-cache/net-libs/libssh-0.6.4 b/metadata/md5-cache/net-libs/libssh-0.6.4
deleted file mode 100644
index 11a297c0a603..000000000000
--- a/metadata/md5-cache/net-libs/libssh-0.6.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !gcrypt? ( >=dev-libs/openssl-1.0.1h-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) doc? ( app-doc/doxygen ) test? ( >=dev-util/cmocka-0.3.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
-DESCRIPTION=Access a working SSH implementation by means of a library
-EAPI=5
-HOMEPAGE=http://www.libssh.org/
-IUSE=debug doc examples gcrypt gssapi pcap +sftp ssh1 server static-libs test zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux
-LICENSE=LGPL-2.1
-RDEPEND=zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !gcrypt? ( >=dev-libs/openssl-1.0.1h-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-SLOT=0/4
-SRC_URI=https://red.libssh.org/attachments/download/107/libssh-0.6.4.tar.gz -> libssh-0.6.4.tar.gz http://git.libssh.org/projects/libssh.git/patch/?id=3880a8ed80a4b1e2c052bd62f328bba2f869d5ae -> libssh-0.6.4-libgcrypt_build_fix.patch
-_eclasses_=cmake-multilib	ca4c6ecda3062bf851d951987568fdae	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	5d5921a298e95441da2f85be419894c0	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
-_md5_=cdd4cd5283a51f83c25f4ce6c2460ef3
diff --git a/metadata/md5-cache/net-libs/libssh-0.6.5 b/metadata/md5-cache/net-libs/libssh-0.6.5
index 73db0c3258be..1077b64808d6 100644
--- a/metadata/md5-cache/net-libs/libssh-0.6.5
+++ b/metadata/md5-cache/net-libs/libssh-0.6.5
@@ -4,10 +4,10 @@ DESCRIPTION=Access a working SSH implementation by means of a library
 EAPI=5
 HOMEPAGE=http://www.libssh.org/
 IUSE=debug doc examples gcrypt gssapi pcap +sftp ssh1 server static-libs test zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ppc ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1
 RDEPEND=zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !gcrypt? ( >=dev-libs/openssl-1.0.1h-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0/4
 SRC_URI=https://red.libssh.org/attachments/download/121/libssh-0.6.5.tar.xz -> libssh-0.6.5.tar.xz https://git.libssh.org/projects/libssh.git/patch/?id=6e0dee7845cea22f59bd353ef42b31cb67170030 -> libssh-0.6.5-compilefix.patch
 _eclasses_=cmake-multilib	ca4c6ecda3062bf851d951987568fdae	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	5d5921a298e95441da2f85be419894c0	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
-_md5_=1af5cec7ed7212c8a1b63ca91b73f9b3
+_md5_=d86a1e4534dba1e33d28f032511c66a8
diff --git a/metadata/md5-cache/net-libs/libvncserver-0.9.10-r1 b/metadata/md5-cache/net-libs/libvncserver-0.9.10-r1
index b37079d57e20..2e434acd7efd 100644
--- a/metadata/md5-cache/net-libs/libvncserver-0.9.10-r1
+++ b/metadata/md5-cache/net-libs/libvncserver-0.9.10-r1
@@ -4,10 +4,10 @@ DESCRIPTION=library for creating vnc servers
 EAPI=5
 HOMEPAGE=http://libvncserver.sourceforge.net/
 IUSE=+24bpp gcrypt gnutls ipv6 +jpeg +png ssl static-libs test threads vaapi +zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
+KEYWORDS=alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gnutls? ( >=net-libs/gnutls-2.12.23-r6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libgcrypt-1.5.3:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !gnutls? ( ssl? ( >=dev-libs/openssl-1.0.1h-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( >=media-libs/libpng-1.6.10:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=x11-libs/libva-1.2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
 SRC_URI=https://github.com/LibVNC/libvncserver/archive/LibVNCServer-0.9.10.tar.gz
 _eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
-_md5_=c8425f9e43de29ff3facac2514945d92
+_md5_=ca22ee540807d82afb9b00b72bec72f3
diff --git a/metadata/md5-cache/net-mail/dovecot-2.2.16-r1 b/metadata/md5-cache/net-mail/dovecot-2.2.16-r1
index f3aa36ddd003..2e3fe21bb470 100644
--- a/metadata/md5-cache/net-mail/dovecot-2.2.16-r1
+++ b/metadata/md5-cache/net-mail/dovecot-2.2.16-r1
@@ -4,10 +4,10 @@ DESCRIPTION=An IMAP and POP3 server written with security primarily in mind
 EAPI=5
 HOMEPAGE=http://www.dovecot.org/
 IUSE=kerberos ldap mysql pam postgres sqlite vpopmail cydir imapc +maildir mbox mdbox pop3c sdbox bzip2 lzma lz4 zlib caps doc ipv6 lucene managesieve selinux sieve solr +ssl static-libs suid tcpd ssl
-KEYWORDS=~alpha amd64 ~arm hppa ia64 ppc ppc64 ~x86
+KEYWORDS=~alpha amd64 ~arm hppa ia64 ppc ppc64 x86
 LICENSE=LGPL-2.1 MIT
 RDEPEND=bzip2? ( app-arch/bzip2 ) caps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lucene? ( >=dev-cpp/clucene-2.3 ) lzma? ( app-arch/xz-utils ) lz4? ( app-arch/lz4 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] ) selinux? ( sec-policy/selinux-dovecot ) solr? ( net-misc/curl dev-libs/expat ) sqlite? ( dev-db/sqlite:* ) ssl? ( dev-libs/openssl:* ) tcpd? ( sys-apps/tcp-wrappers ) vpopmail? ( net-mail/vpopmail ) zlib? ( sys-libs/zlib ) virtual/libiconv net-mail/mailbase
 SLOT=0
 SRC_URI=http://dovecot.org/releases/2.2/dovecot-2.2.16.tar.gz sieve? ( http://pigeonhole.dovecot.org/releases/2.2/dovecot-2.2-pigeonhole-0.4.7.tar.gz ) managesieve? ( http://pigeonhole.dovecot.org/releases/2.2/dovecot-2.2-pigeonhole-0.4.7.tar.gz )
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ssl-cert	b53367370fde96e19beca78050a47c61	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=8dfb1b7075aaa18988401a819d0082f2
+_md5_=0b39b5066cf288b961faffbf9f33c8a6
diff --git a/metadata/md5-cache/net-proxy/squid-3.5.4 b/metadata/md5-cache/net-proxy/squid-3.5.4
index d8c0b2721a42..1bae55466b9c 100644
--- a/metadata/md5-cache/net-proxy/squid-3.5.4
+++ b/metadata/md5-cache/net-proxy/squid-3.5.4
@@ -4,11 +4,11 @@ DESCRIPTION=A full-featured web proxy cache
 EAPI=5
 HOMEPAGE=http://www.squid-cache.org/
 IUSE=caps ipv6 pam ldap samba sasl kerberos nis radius ssl snmp selinux logrotate test ecap esi ssl-crtd mysql postgres sqlite qos tproxy +htcp +wccp +wccpv2 pf-transparent ipf-transparent kqueue elibc_uclibc kernel_linux
-KEYWORDS=~alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~sparc ~x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=caps? ( >=sys-libs/libcap-2.16 ) pam? ( virtual/pam ) ldap? ( net-nds/openldap ) kerberos? ( virtual/krb5 ) qos? ( net-libs/libnetfilter_conntrack ) ssl? ( dev-libs/openssl:* dev-libs/nettle >=net-libs/gnutls-3.1.5 ) sasl? ( dev-libs/cyrus-sasl ) ecap? ( net-libs/libecap:1 ) esi? ( dev-libs/expat dev-libs/libxml2 ) !x86-fbsd? ( logrotate? ( app-admin/logrotate ) ) >=sys-libs/db-4:* dev-lang/perl dev-libs/libltdl:0 samba? ( net-fs/samba ) mysql? ( dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg ) selinux? ( sec-policy/selinux-squid ) sqlite? ( dev-perl/DBD-SQLite ) !<=sci-biology/meme-4.8.1-r1
 REQUIRED_USE=tproxy? ( caps ) qos? ( caps )
 SLOT=0
 SRC_URI=http://www.squid-cache.org/Versions/v3/3.5/squid-3.5.4.tar.xz
 _eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	5d5921a298e95441da2f85be419894c0	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	25e9476cdec14dfb0af32f4c83c3f297	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=4cf5709aa4b2dde3c2f4fb4a0d421895
+_md5_=75ad4c952a971be4d680515e7983a5b5
diff --git a/metadata/md5-cache/net-wireless/hostapd-2.4-r2 b/metadata/md5-cache/net-wireless/hostapd-2.4-r2
index 7a794f8cf305..cc9fc4bf0e07 100644
--- a/metadata/md5-cache/net-wireless/hostapd-2.4-r2
+++ b/metadata/md5-cache/net-wireless/hostapd-2.4-r2
@@ -4,10 +4,10 @@ DESCRIPTION=IEEE 802.11 wireless LAN Host AP daemon
 EAPI=4
 HOMEPAGE=http://hostap.epitest.fi
 IUSE=ipv6 logwatch netlink sqlite +ssl +wps +crda
-KEYWORDS=amd64 ~arm ~mips ppc ~x86
+KEYWORDS=amd64 ~arm ~mips ppc x86
 LICENSE=|| ( GPL-2 BSD )
 RDEPEND=ssl? ( dev-libs/openssl[-bindist] ) kernel_linux? ( dev-libs/libnl:3 crda? ( net-wireless/crda ) ) netlink? ( net-libs/libnfnetlink ) sqlite? ( >=dev-db/sqlite-3 )
 SLOT=0
 SRC_URI=http://hostap.epitest.fi/releases/hostapd-2.4.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
-_md5_=36379d60d45aca6dfa6f71e30c363f01
+_md5_=bc0a84e76b5d4b6faf3d1df6a849a34b
diff --git a/metadata/md5-cache/sys-apps/dtc-1.4.1 b/metadata/md5-cache/sys-apps/dtc-1.4.1
index bea47b6ec5b6..0ee21ac7a5b5 100644
--- a/metadata/md5-cache/sys-apps/dtc-1.4.1
+++ b/metadata/md5-cache/sys-apps/dtc-1.4.1
@@ -4,9 +4,9 @@ DESCRIPTION=Open Firmware device tree compiler
 EAPI=4
 HOMEPAGE=http://devicetree.org/Device_Tree_Compiler
 IUSE=static-libs
-KEYWORDS=~amd64 ~arm ~arm64 ppc ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://kernel/software/utils/dtc/dtc-1.4.1.tar.xz
 _eclasses_=multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
-_md5_=3a4c6c69d304908351604d1e9cad918e
+_md5_=46d0c5932b02283ad79393c297ec6f7d
diff --git a/metadata/md5-cache/sys-apps/irqbalance-1.0.9 b/metadata/md5-cache/sys-apps/irqbalance-1.0.9
new file mode 100644
index 000000000000..68b13385c228
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/irqbalance-1.0.9
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-libs/glib:2 caps? ( sys-libs/libcap-ng ) numa? ( sys-process/numactl ) virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DESCRIPTION=Distribute hardware interrupts across processors on a multiprocessor system
+EAPI=5
+HOMEPAGE=https://github.com/Irqbalance/irqbalance
+IUSE=caps +numa selinux
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/glib:2 caps? ( sys-libs/libcap-ng ) numa? ( sys-process/numactl ) selinux? ( sec-policy/selinux-irqbalance )
+SLOT=0
+SRC_URI=https://github.com/Irqbalance/irqbalance/archive/v1.0.9.tar.gz -> irqbalance-1.0.9.tar.gz
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	autotools-utils	3727db64c7b960903d5033280f108080	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	25e9476cdec14dfb0af32f4c83c3f297	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=436a0dae83dbbd82b24a0f2f16b35eef
diff --git a/metadata/md5-cache/sys-block/di-4.31 b/metadata/md5-cache/sys-block/di-4.31
deleted file mode 100644
index 525e791dac1e..000000000000
--- a/metadata/md5-cache/sys-block/di-4.31
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DESCRIPTION=Disk Information Utility
-EAPI=4
-HOMEPAGE=http://www.gentoo.com/di/
-KEYWORDS=amd64 ppc ppc64 x86 ~x86-fbsd
-LICENSE=ZLIB
-SLOT=0
-SRC_URI=http://www.gentoo.com/di/di-4.31.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
-_md5_=783698e7d87ff7465718f186960fce10
diff --git a/metadata/md5-cache/sys-block/di-4.32 b/metadata/md5-cache/sys-block/di-4.32
deleted file mode 100644
index a542629e6e4d..000000000000
--- a/metadata/md5-cache/sys-block/di-4.32
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DESCRIPTION=Disk Information Utility
-EAPI=4
-HOMEPAGE=http://www.gentoo.com/di/
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd
-LICENSE=ZLIB
-RESTRICT=test
-SLOT=0
-SRC_URI=http://www.gentoo.com/di/di-4.32.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
-_md5_=4325738c99626d3055ce32603b38b440
diff --git a/metadata/md5-cache/sys-block/di-4.34 b/metadata/md5-cache/sys-block/di-4.34
deleted file mode 100644
index bf456e1491a5..000000000000
--- a/metadata/md5-cache/sys-block/di-4.34
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DESCRIPTION=Disk Information Utility
-EAPI=4
-HOMEPAGE=http://www.gentoo.com/di/
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd
-LICENSE=ZLIB
-RESTRICT=test
-SLOT=0
-SRC_URI=http://www.gentoo.com/di/di-4.34.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
-_md5_=b614d221ea2f22672abe583b2fd52a77
diff --git a/metadata/md5-cache/sys-block/di-4.33 b/metadata/md5-cache/sys-block/di-4.36
similarity index 79%
rename from metadata/md5-cache/sys-block/di-4.33
rename to metadata/md5-cache/sys-block/di-4.36
index 9f31ee86432b..0b4c52b0ec63 100644
--- a/metadata/md5-cache/sys-block/di-4.33
+++ b/metadata/md5-cache/sys-block/di-4.36
@@ -6,6 +6,6 @@ KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd
 LICENSE=ZLIB
 RESTRICT=test
 SLOT=0
-SRC_URI=http://www.gentoo.com/di/di-4.33.tar.gz
+SRC_URI=http://www.gentoo.com/di/di-4.36.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
-_md5_=249533bc25d9a7f182a9f904605d8b0a
+_md5_=86e4a7e457dcd465a37a6637c18fa015
diff --git a/metadata/md5-cache/sys-block/mbuffer-20150412 b/metadata/md5-cache/sys-block/mbuffer-20150412
new file mode 100644
index 000000000000..0ffbd78956fb
--- /dev/null
+++ b/metadata/md5-cache/sys-block/mbuffer-20150412
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure prepare
+DEPEND=ssl? ( dev-libs/openssl )
+DESCRIPTION=M(easuring)buffer is a replacement for buffer with additional functionality
+EAPI=4
+HOMEPAGE=http://www.maier-komor.de/mbuffer.html
+IUSE=debug ssl
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=ssl? ( dev-libs/openssl )
+SLOT=0
+SRC_URI=http://www.maier-komor.de/software/mbuffer/mbuffer-20150412.tgz
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
+_md5_=3f61fc18802731ee1baeee7fdfaaf4ee
diff --git a/metadata/md5-cache/sys-fs/e2fsprogs-1.42.10 b/metadata/md5-cache/sys-fs/e2fsprogs-1.42.10
deleted file mode 100644
index 927b769a4c83..000000000000
--- a/metadata/md5-cache/sys-fs/e2fsprogs-1.42.10
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=~sys-libs/e2fsprogs-libs-1.42.10 >=sys-apps/util-linux-2.16 nls? ( virtual/libintl ) nls? ( sys-devel/gettext ) virtual/pkgconfig sys-apps/texinfo !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Standard EXT2/EXT3/EXT4 filesystem utilities
-EAPI=4
-HOMEPAGE=http://e2fsprogs.sourceforge.net/
-IUSE=nls static-libs elibc_FreeBSD
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 -x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
-LICENSE=GPL-2 BSD
-RDEPEND=~sys-libs/e2fsprogs-libs-1.42.10 >=sys-apps/util-linux-2.16 nls? ( virtual/libintl )
-SLOT=0
-SRC_URI=mirror://sourceforge/e2fsprogs/e2fsprogs-1.42.10.tar.gz
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	5d5921a298e95441da2f85be419894c0	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
-_md5_=074a6adb617b379236d3233b64c6806c
diff --git a/metadata/md5-cache/sys-fs/e2fsprogs-1.42.11 b/metadata/md5-cache/sys-fs/e2fsprogs-1.42.13
similarity index 80%
rename from metadata/md5-cache/sys-fs/e2fsprogs-1.42.11
rename to metadata/md5-cache/sys-fs/e2fsprogs-1.42.13
index d3e8d496a29e..3f2bc82f0c67 100644
--- a/metadata/md5-cache/sys-fs/e2fsprogs-1.42.11
+++ b/metadata/md5-cache/sys-fs/e2fsprogs-1.42.13
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=~sys-libs/e2fsprogs-libs-1.42.11 >=sys-apps/util-linux-2.16 nls? ( virtual/libintl ) nls? ( sys-devel/gettext ) virtual/pkgconfig sys-apps/texinfo !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=~sys-libs/e2fsprogs-libs-1.42.13 >=sys-apps/util-linux-2.16 nls? ( virtual/libintl ) nls? ( sys-devel/gettext ) virtual/pkgconfig sys-apps/texinfo !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Standard EXT2/EXT3/EXT4 filesystem utilities
 EAPI=4
 HOMEPAGE=http://e2fsprogs.sourceforge.net/
 IUSE=nls static-libs elibc_FreeBSD
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 -x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~m68k-mint
 LICENSE=GPL-2 BSD
-RDEPEND=~sys-libs/e2fsprogs-libs-1.42.11 >=sys-apps/util-linux-2.16 nls? ( virtual/libintl )
+RDEPEND=~sys-libs/e2fsprogs-libs-1.42.13 >=sys-apps/util-linux-2.16 nls? ( virtual/libintl )
 SLOT=0
-SRC_URI=mirror://sourceforge/e2fsprogs/e2fsprogs-1.42.11.tar.gz elibc_mintlib? ( mirror://gentoo/e2fsprogs-1.42.9-mint-r1.patch.xz )
+SRC_URI=mirror://sourceforge/e2fsprogs/e2fsprogs-1.42.13.tar.gz elibc_mintlib? ( mirror://gentoo/e2fsprogs-1.42.9-mint-r1.patch.xz )
 _eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	5d5921a298e95441da2f85be419894c0	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
-_md5_=ea0bbaf9197fedeaebad08b735ece6a0
+_md5_=48eb0a8f756dbb0ceb59830cf7fbf28b
diff --git a/metadata/md5-cache/sys-fs/e2fsprogs-1.42.7 b/metadata/md5-cache/sys-fs/e2fsprogs-1.42.7
deleted file mode 100644
index ddfa33e7d586..000000000000
--- a/metadata/md5-cache/sys-fs/e2fsprogs-1.42.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=~sys-libs/e2fsprogs-libs-1.42.7 >=sys-apps/util-linux-2.16 nls? ( virtual/libintl ) nls? ( sys-devel/gettext ) virtual/pkgconfig sys-apps/texinfo
-DESCRIPTION=Standard EXT2/EXT3/EXT4 filesystem utilities
-EAPI=3
-HOMEPAGE=http://e2fsprogs.sourceforge.net/
-IUSE=nls static-libs elibc_FreeBSD
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 -x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint
-LICENSE=GPL-2 BSD
-RDEPEND=~sys-libs/e2fsprogs-libs-1.42.7 >=sys-apps/util-linux-2.16 nls? ( virtual/libintl )
-SLOT=0
-SRC_URI=mirror://sourceforge/e2fsprogs/e2fsprogs-1.42.7.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	5d5921a298e95441da2f85be419894c0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
-_md5_=7df2de5a06a4d77f8012459445036312
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.0.4 b/metadata/md5-cache/sys-kernel/ck-sources-4.0.4
new file mode 100644
index 000000000000..a74fed70342c
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/ck-sources-4.0.4
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
+DESCRIPTION=Full Linux 4.0 kernel sources with Con Kolivas' high performance patchset and Gentoo's genpatches
+EAPI=5
+HOMEPAGE=http://www.kernel.org/ http://www.gentoo.org/ http://dev.gentoo.org/~mpagano/genpatches/ http://users.on.net/~ckolivas/kernel/ http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags
+IUSE=bfsonly symlink build deblob
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 !deblob? ( freedist )
+PDEPEND=!build? ( virtual/dev-manager )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=4.0.4
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.0.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.0-gnu/deblob-4.0 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.0-gnu/deblob-check -> deblob-check-4.0 ) mirror://gentoo/genpatches-4.0-6.base.tar.xz mirror://gentoo/genpatches-4.0-6.extras.tar.xz mirror://gentoo/genpatches-4.0-6.experimental.tar.xz !bfsonly? ( http://ck.kolivas.org/patches/4.0/4.0/4.0-ck1/patch-4.0-ck1.bz2 ) bfsonly? ( http://ck.kolivas.org/patches/4.0/4.0/4.0-ck1/patches/4.0-sched-bfs-462.patch )
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	c301713d773578dc856a813c0901896f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=dcd84882395510028c1ed99c8d91a4fe
diff --git a/metadata/md5-cache/sys-libs/e2fsprogs-libs-1.42.10 b/metadata/md5-cache/sys-libs/e2fsprogs-libs-1.42.10
deleted file mode 100644
index e1edc5963fa8..000000000000
--- a/metadata/md5-cache/sys-libs/e2fsprogs-libs-1.42.10
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=nls? ( sys-devel/gettext ) virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=e2fsprogs libraries (common error and subsystem)
-EAPI=4
-HOMEPAGE=http://e2fsprogs.sourceforge.net/
-IUSE=nls static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~m68k-mint ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=!sys-libs/com_err !sys-libs/ss !<sys-fs/e2fsprogs-1.41.8 abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r12 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
-SLOT=0
-SRC_URI=mirror://sourceforge/e2fsprogs/e2fsprogs-libs-1.42.10.tar.gz
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
-_md5_=a1a7cb9ae7435383e6a816857105082a
diff --git a/metadata/md5-cache/sys-libs/e2fsprogs-libs-1.42.11 b/metadata/md5-cache/sys-libs/e2fsprogs-libs-1.42.13
similarity index 92%
rename from metadata/md5-cache/sys-libs/e2fsprogs-libs-1.42.11
rename to metadata/md5-cache/sys-libs/e2fsprogs-libs-1.42.13
index 663d716edb9a..6d442143f909 100644
--- a/metadata/md5-cache/sys-libs/e2fsprogs-libs-1.42.11
+++ b/metadata/md5-cache/sys-libs/e2fsprogs-libs-1.42.13
@@ -8,6 +8,6 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh
 LICENSE=GPL-2
 RDEPEND=!sys-libs/com_err !sys-libs/ss !<sys-fs/e2fsprogs-1.41.8 abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r12 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=0
-SRC_URI=mirror://sourceforge/e2fsprogs/e2fsprogs-libs-1.42.11.tar.gz
+SRC_URI=mirror://sourceforge/e2fsprogs/e2fsprogs-libs-1.42.13.tar.gz
 _eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
-_md5_=7135aa5365face8d36ee7abf2d9b6c28
+_md5_=df9e66aa6dc90580542af367074f00ec
diff --git a/metadata/md5-cache/sys-libs/e2fsprogs-libs-1.42.7 b/metadata/md5-cache/sys-libs/e2fsprogs-libs-1.42.7
deleted file mode 100644
index 781a87f68a55..000000000000
--- a/metadata/md5-cache/sys-libs/e2fsprogs-libs-1.42.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=nls? ( sys-devel/gettext ) virtual/pkgconfig
-DESCRIPTION=e2fsprogs libraries (common error and subsystem)
-EAPI=2
-HOMEPAGE=http://e2fsprogs.sourceforge.net/
-IUSE=nls static-libs
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=!sys-libs/com_err !sys-libs/ss !<sys-fs/e2fsprogs-1.41.8
-SLOT=0
-SRC_URI=mirror://sourceforge/e2fsprogs/e2fsprogs-libs-1.42.7.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
-_md5_=1f44681336382df7e9e0ab6c823440f5
diff --git a/metadata/md5-cache/www-apps/rt-4.2.11 b/metadata/md5-cache/www-apps/rt-4.2.11
new file mode 100644
index 000000000000..89b281e11935
--- /dev/null
+++ b/metadata/md5-cache/www-apps/rt-4.2.11
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst prepare prerm setup
+DEPEND=>=dev-lang/perl-5.10.1 >=dev-perl/Apache-Session-1.53 >=dev-perl/CSS-Squish-0.06 >=dev-perl/Class-Accessor-0.34 >=dev-perl/Class-ReturnValue-0.550.0-r1 >=dev-perl/DBI-1.37 >=dev-perl/Date-Extract-0.02 >=dev-perl/DateTime-Format-Natural-0.67 >=dev-perl/Devel-StackTrace-1.19 >=dev-perl/HTML-FormatText-WithLinks-0.14 >=dev-perl/HTML-Mason-1.43 >=dev-perl/HTML-Scrubber-0.08 >=dev-perl/HTTP-Server-Simple-0.34 >=dev-perl/HTTP-Server-Simple-Mason-0.14 >=dev-perl/Log-Dispatch-2.410.0 >=dev-perl/MIME-tools-5.425 >=dev-perl/MailTools-1.60 >=dev-perl/Module-Versions-Report-1.05 >=dev-perl/Role-Basic-0.12 >=dev-perl/Symbol-Global-Name-0.04 >=dev-perl/Text-Quoted-2.80.0 >=dev-perl/Text-WikiFormat-0.76 >=dev-perl/Tree-Simple-1.04 >=dev-perl/XML-RSS-1.05 >=dev-perl/dbix-searchbuilder-1.660.0 >=dev-perl/locale-maketext-lexicon-0.32 >=virtual/perl-CGI-4 >=virtual/perl-Digest-MD5-2.27 >=virtual/perl-Encode-2.730.0 >=virtual/perl-File-Spec-0.8 >=virtual/perl-Getopt-Long-2.24 >=virtual/perl-Locale-Maketext-1.06 >=virtual/perl-Storable-2.08 dev-perl/CGI-Emulate-PSGI dev-perl/CGI-PSGI dev-perl/Cache-Simple-TimedExpiry dev-perl/Calendar-Simple dev-perl/Convert-Color dev-perl/Crypt-Eksblowfish dev-perl/Crypt-SSLeay dev-perl/Crypt-X509 dev-perl/DBD-SQLite dev-perl/Data-GUID dev-perl/Data-ICal dev-perl/DateManip dev-perl/Devel-GlobalDestruction dev-perl/Email-Address dev-perl/Email-Address-List dev-perl/File-ShareDir dev-perl/File-Which dev-perl/GD dev-perl/GDGraph dev-perl/GDTextUtil dev-perl/GnuPG-Interface dev-perl/GraphViz dev-perl/HTML-Format dev-perl/HTML-FormatText-WithLinks-AndTables dev-perl/HTML-Mason-PSGIHandler dev-perl/HTML-Parser dev-perl/HTML-Quoted dev-perl/HTML-RewriteAttributes dev-perl/HTML-Tree dev-perl/IPC-Run3 dev-perl/JSON dev-perl/JavaScript-Minifier dev-perl/MIME-Types dev-perl/Module-Refresh dev-perl/Mozilla-CA dev-perl/Net-CIDR dev-perl/PerlIO-eol dev-perl/Plack dev-perl/Regexp-Common-net-CIDR dev-perl/Regexp-IPv6 dev-perl/Starlet dev-perl/String-ShellQuote dev-perl/TermReadKey dev-perl/Text-Password-Pronounceable dev-perl/Time-modules dev-perl/TimeDate dev-perl/UNIVERSAL-require dev-perl/libwww-perl dev-perl/locale-maketext-fuzzy dev-perl/net-server dev-perl/regexp-common dev-perl/text-autoformat dev-perl/text-template dev-perl/text-wrapper virtual/perl-Digest virtual/perl-File-Temp virtual/perl-Scalar-List-Utils virtual/perl-Time-HiRes virtual/perl-libnet fastcgi? ( dev-perl/FCGI dev-perl/FCGI-ProcManager ) !lighttpd? ( dev-perl/Apache-DBI !fastcgi? ( >=www-apache/mod_perl-2 ) ) lighttpd? ( dev-perl/FCGI ) mysql? ( >=dev-perl/DBD-mysql-2.1018 ) postgres? ( >=dev-perl/DBD-Pg-1.43 ) || ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15
+DESCRIPTION=RT is an enterprise-grade ticketing system
+EAPI=5
+HOMEPAGE=http://www.bestpractical.com/rt/
+IUSE=mysql +postgres fastcgi lighttpd vhosts
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=>=dev-lang/perl-5.10.1 >=dev-perl/Apache-Session-1.53 >=dev-perl/CSS-Squish-0.06 >=dev-perl/Class-Accessor-0.34 >=dev-perl/Class-ReturnValue-0.550.0-r1 >=dev-perl/DBI-1.37 >=dev-perl/Date-Extract-0.02 >=dev-perl/DateTime-Format-Natural-0.67 >=dev-perl/Devel-StackTrace-1.19 >=dev-perl/HTML-FormatText-WithLinks-0.14 >=dev-perl/HTML-Mason-1.43 >=dev-perl/HTML-Scrubber-0.08 >=dev-perl/HTTP-Server-Simple-0.34 >=dev-perl/HTTP-Server-Simple-Mason-0.14 >=dev-perl/Log-Dispatch-2.410.0 >=dev-perl/MIME-tools-5.425 >=dev-perl/MailTools-1.60 >=dev-perl/Module-Versions-Report-1.05 >=dev-perl/Role-Basic-0.12 >=dev-perl/Symbol-Global-Name-0.04 >=dev-perl/Text-Quoted-2.80.0 >=dev-perl/Text-WikiFormat-0.76 >=dev-perl/Tree-Simple-1.04 >=dev-perl/XML-RSS-1.05 >=dev-perl/dbix-searchbuilder-1.660.0 >=dev-perl/locale-maketext-lexicon-0.32 >=virtual/perl-CGI-4 >=virtual/perl-Digest-MD5-2.27 >=virtual/perl-Encode-2.730.0 >=virtual/perl-File-Spec-0.8 >=virtual/perl-Getopt-Long-2.24 >=virtual/perl-Locale-Maketext-1.06 >=virtual/perl-Storable-2.08 dev-perl/CGI-Emulate-PSGI dev-perl/CGI-PSGI dev-perl/Cache-Simple-TimedExpiry dev-perl/Calendar-Simple dev-perl/Convert-Color dev-perl/Crypt-Eksblowfish dev-perl/Crypt-SSLeay dev-perl/Crypt-X509 dev-perl/DBD-SQLite dev-perl/Data-GUID dev-perl/Data-ICal dev-perl/DateManip dev-perl/Devel-GlobalDestruction dev-perl/Email-Address dev-perl/Email-Address-List dev-perl/File-ShareDir dev-perl/File-Which dev-perl/GD dev-perl/GDGraph dev-perl/GDTextUtil dev-perl/GnuPG-Interface dev-perl/GraphViz dev-perl/HTML-Format dev-perl/HTML-FormatText-WithLinks-AndTables dev-perl/HTML-Mason-PSGIHandler dev-perl/HTML-Parser dev-perl/HTML-Quoted dev-perl/HTML-RewriteAttributes dev-perl/HTML-Tree dev-perl/IPC-Run3 dev-perl/JSON dev-perl/JavaScript-Minifier dev-perl/MIME-Types dev-perl/Module-Refresh dev-perl/Mozilla-CA dev-perl/Net-CIDR dev-perl/PerlIO-eol dev-perl/Plack dev-perl/Regexp-Common-net-CIDR dev-perl/Regexp-IPv6 dev-perl/Starlet dev-perl/String-ShellQuote dev-perl/TermReadKey dev-perl/Text-Password-Pronounceable dev-perl/Time-modules dev-perl/TimeDate dev-perl/UNIVERSAL-require dev-perl/libwww-perl dev-perl/locale-maketext-fuzzy dev-perl/net-server dev-perl/regexp-common dev-perl/text-autoformat dev-perl/text-template dev-perl/text-wrapper virtual/perl-Digest virtual/perl-File-Temp virtual/perl-Scalar-List-Utils virtual/perl-Time-HiRes virtual/perl-libnet fastcgi? ( dev-perl/FCGI dev-perl/FCGI-ProcManager ) !lighttpd? ( dev-perl/Apache-DBI !fastcgi? ( >=www-apache/mod_perl-2 ) ) lighttpd? ( dev-perl/FCGI ) mysql? ( >=dev-perl/DBD-mysql-2.1018 ) postgres? ( >=dev-perl/DBD-Pg-1.43 ) virtual/mta !lighttpd? ( =www-servers/apache-2* ) lighttpd? ( >=www-servers/lighttpd-1.3.13 sys-apps/openrc ) >=app-admin/webapp-config-1.50.15
+REQUIRED_USE=^^ ( mysql postgres )
+RESTRICT=test
+SLOT=4.2.11
+SRC_URI=http://download.bestpractical.com/pub/rt/release/rt-4.2.11.tar.gz
+_eclasses_=depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	webapp	6621f8b5df9f14800054a5953065efeb
+_md5_=e698323dadad96e3b6e9fb5b93cb3937
diff --git a/metadata/md5-cache/www-apps/rt-4.2.9-r1 b/metadata/md5-cache/www-apps/rt-4.2.9-r1
deleted file mode 100644
index a469fc8cd31e..000000000000
--- a/metadata/md5-cache/www-apps/rt-4.2.9-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare prerm setup
-DEPEND=>=dev-lang/perl-5.10.1 >=dev-perl/Apache-Session-1.53 >=dev-perl/CSS-Squish-0.06 >=dev-perl/Class-Accessor-0.34 >=dev-perl/DBI-1.37 >=dev-perl/Date-Extract-0.02 >=dev-perl/DateTime-Format-Natural-0.67 >=dev-perl/dbix-searchbuilder-1.660.0 >=dev-perl/Devel-StackTrace-1.19 >=dev-perl/HTML-FormatText-WithLinks-0.14 >=dev-perl/HTML-Mason-1.43 >=dev-perl/HTML-Scrubber-0.08 >=dev-perl/HTTP-Server-Simple-0.34 >=dev-perl/HTTP-Server-Simple-Mason-0.14 >=dev-perl/MIME-tools-5.425 >=dev-perl/MailTools-1.60 >=dev-perl/Module-Versions-Report-1.05 >=dev-perl/Role-Basic-0.12 >=dev-perl/Symbol-Global-Name-0.04 >=dev-perl/Text-Quoted-2.80.0 >=dev-perl/Text-WikiFormat-0.76 >=dev-perl/Tree-Simple-1.04 >=dev-perl/XML-RSS-1.05 >=dev-perl/Class-ReturnValue-0.40 >=dev-perl/dbix-searchbuilder-1.59 >=dev-perl/locale-maketext-lexicon-0.32 >=dev-perl/Log-Dispatch-2.230.0 >=virtual/perl-CGI-4 >=virtual/perl-Digest-MD5-2.27 >=virtual/perl-File-Spec-0.8 >=virtual/perl-Getopt-Long-2.24 >=virtual/perl-Storable-2.08 >=virtual/perl-Locale-Maketext-1.06 dev-perl/CGI-Emulate-PSGI dev-perl/CGI-PSGI dev-perl/Cache-Simple-TimedExpiry dev-perl/Calendar-Simple dev-perl/Convert-Color dev-perl/Crypt-Eksblowfish dev-perl/Crypt-SSLeay dev-perl/Crypt-X509 dev-perl/DBD-SQLite dev-perl/Data-GUID dev-perl/Data-ICal dev-perl/DateManip dev-perl/Devel-GlobalDestruction dev-perl/Email-Address dev-perl/Email-Address-List dev-perl/File-ShareDir dev-perl/File-Which dev-perl/GD dev-perl/GDGraph dev-perl/GDTextUtil dev-perl/GnuPG-Interface dev-perl/GraphViz dev-perl/HTML-Format dev-perl/HTML-FormatText-WithLinks-AndTables dev-perl/HTML-Mason-PSGIHandler dev-perl/HTML-Parser dev-perl/HTML-Quoted dev-perl/HTML-RewriteAttributes dev-perl/HTML-Tree dev-perl/IPC-Run3 dev-perl/JSON dev-perl/JavaScript-Minifier dev-perl/MIME-Types dev-perl/Module-Refresh dev-perl/Mozilla-CA dev-perl/Net-CIDR dev-perl/PerlIO-eol dev-perl/Plack dev-perl/Regexp-Common-net-CIDR dev-perl/Regexp-IPv6 dev-perl/String-ShellQuote dev-perl/Starlet dev-perl/TermReadKey dev-perl/Text-Password-Pronounceable dev-perl/Time-modules dev-perl/TimeDate dev-perl/UNIVERSAL-require dev-perl/libwww-perl dev-perl/locale-maketext-fuzzy dev-perl/net-server dev-perl/regexp-common dev-perl/text-autoformat dev-perl/text-template dev-perl/text-wrapper virtual/perl-File-Temp virtual/perl-Scalar-List-Utils virtual/perl-Time-HiRes virtual/perl-Digest virtual/perl-libnet fastcgi? ( dev-perl/FCGI dev-perl/FCGI-ProcManager ) !lighttpd? ( dev-perl/Apache-DBI !fastcgi? ( >=www-apache/mod_perl-2 ) ) lighttpd? ( dev-perl/FCGI ) mysql? ( >=dev-perl/DBD-mysql-2.1018 ) postgres? ( >=dev-perl/DBD-Pg-1.43 ) || ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15
-DESCRIPTION=RT is an enterprise-grade ticketing system
-EAPI=5
-HOMEPAGE=http://www.bestpractical.com/rt/
-IUSE=mysql +postgres fastcgi lighttpd vhosts
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=>=dev-lang/perl-5.10.1 >=dev-perl/Apache-Session-1.53 >=dev-perl/CSS-Squish-0.06 >=dev-perl/Class-Accessor-0.34 >=dev-perl/DBI-1.37 >=dev-perl/Date-Extract-0.02 >=dev-perl/DateTime-Format-Natural-0.67 >=dev-perl/dbix-searchbuilder-1.660.0 >=dev-perl/Devel-StackTrace-1.19 >=dev-perl/HTML-FormatText-WithLinks-0.14 >=dev-perl/HTML-Mason-1.43 >=dev-perl/HTML-Scrubber-0.08 >=dev-perl/HTTP-Server-Simple-0.34 >=dev-perl/HTTP-Server-Simple-Mason-0.14 >=dev-perl/MIME-tools-5.425 >=dev-perl/MailTools-1.60 >=dev-perl/Module-Versions-Report-1.05 >=dev-perl/Role-Basic-0.12 >=dev-perl/Symbol-Global-Name-0.04 >=dev-perl/Text-Quoted-2.80.0 >=dev-perl/Text-WikiFormat-0.76 >=dev-perl/Tree-Simple-1.04 >=dev-perl/XML-RSS-1.05 >=dev-perl/Class-ReturnValue-0.40 >=dev-perl/dbix-searchbuilder-1.59 >=dev-perl/locale-maketext-lexicon-0.32 >=dev-perl/Log-Dispatch-2.230.0 >=virtual/perl-CGI-4 >=virtual/perl-Digest-MD5-2.27 >=virtual/perl-File-Spec-0.8 >=virtual/perl-Getopt-Long-2.24 >=virtual/perl-Storable-2.08 >=virtual/perl-Locale-Maketext-1.06 dev-perl/CGI-Emulate-PSGI dev-perl/CGI-PSGI dev-perl/Cache-Simple-TimedExpiry dev-perl/Calendar-Simple dev-perl/Convert-Color dev-perl/Crypt-Eksblowfish dev-perl/Crypt-SSLeay dev-perl/Crypt-X509 dev-perl/DBD-SQLite dev-perl/Data-GUID dev-perl/Data-ICal dev-perl/DateManip dev-perl/Devel-GlobalDestruction dev-perl/Email-Address dev-perl/Email-Address-List dev-perl/File-ShareDir dev-perl/File-Which dev-perl/GD dev-perl/GDGraph dev-perl/GDTextUtil dev-perl/GnuPG-Interface dev-perl/GraphViz dev-perl/HTML-Format dev-perl/HTML-FormatText-WithLinks-AndTables dev-perl/HTML-Mason-PSGIHandler dev-perl/HTML-Parser dev-perl/HTML-Quoted dev-perl/HTML-RewriteAttributes dev-perl/HTML-Tree dev-perl/IPC-Run3 dev-perl/JSON dev-perl/JavaScript-Minifier dev-perl/MIME-Types dev-perl/Module-Refresh dev-perl/Mozilla-CA dev-perl/Net-CIDR dev-perl/PerlIO-eol dev-perl/Plack dev-perl/Regexp-Common-net-CIDR dev-perl/Regexp-IPv6 dev-perl/String-ShellQuote dev-perl/Starlet dev-perl/TermReadKey dev-perl/Text-Password-Pronounceable dev-perl/Time-modules dev-perl/TimeDate dev-perl/UNIVERSAL-require dev-perl/libwww-perl dev-perl/locale-maketext-fuzzy dev-perl/net-server dev-perl/regexp-common dev-perl/text-autoformat dev-perl/text-template dev-perl/text-wrapper virtual/perl-File-Temp virtual/perl-Scalar-List-Utils virtual/perl-Time-HiRes virtual/perl-Digest virtual/perl-libnet fastcgi? ( dev-perl/FCGI dev-perl/FCGI-ProcManager ) !lighttpd? ( dev-perl/Apache-DBI !fastcgi? ( >=www-apache/mod_perl-2 ) ) lighttpd? ( dev-perl/FCGI ) mysql? ( >=dev-perl/DBD-mysql-2.1018 ) postgres? ( >=dev-perl/DBD-Pg-1.43 ) virtual/mta !lighttpd? ( =www-servers/apache-2* ) lighttpd? ( >=www-servers/lighttpd-1.3.13 sys-apps/openrc ) >=app-admin/webapp-config-1.50.15
-REQUIRED_USE=^^ ( mysql postgres )
-RESTRICT=test
-SLOT=4.2.9-r1
-SRC_URI=http://download.bestpractical.com/pub/rt/release/rt-4.2.9.tar.gz
-_eclasses_=depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	webapp	6621f8b5df9f14800054a5953065efeb
-_md5_=72c609ec851bdf508d963f5a5ff54541
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-352.09 b/metadata/md5-cache/x11-drivers/nvidia-drivers-352.09
new file mode 100644
index 000000000000..21b4db1d6027
--- /dev/null
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-352.09
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare prerm pretend setup unpack
+DEPEND=app-eselect/eselect-opencl kernel_linux? ( >=sys-libs/glibc-2.6.1 ) X? ( >=app-eselect/eselect-opengl-1.0.9 ) app-arch/xz-utils kernel_linux? ( virtual/linux-sources ) kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) sys-apps/pciutils virtual/pkgconfig
+DESCRIPTION=NVIDIA Accelerated Graphics Driver
+EAPI=5
+HOMEPAGE=http://www.nvidia.com/
+IUSE=acpi multilib kernel_FreeBSD kernel_linux pax_kernel +tools gtk2 gtk3 +X uvm kernel_linux
+KEYWORDS=-* ~amd64 ~x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=GPL-2 NVIDIA-r2
+RDEPEND=app-eselect/eselect-opencl kernel_linux? ( >=sys-libs/glibc-2.6.1 ) X? ( >=app-eselect/eselect-opengl-1.0.9 ) acpi? ( sys-power/acpid ) tools? ( dev-libs/atk dev-libs/glib:2 x11-libs/gdk-pixbuf gtk2? ( >=x11-libs/gtk+-2.4:2 ) gtk3? ( x11-libs/gtk+:3 ) x11-libs/libX11 x11-libs/libXext x11-libs/pango[X] ) X? ( <x11-base/xorg-server-1.17.99:= >=x11-libs/libvdpau-0.3-r1 multilib? ( || ( ( >=x11-libs/libX11-1.6.2[abi_x86_32] >=x11-libs/libXext-1.3.2[abi_x86_32] ) app-emulation/emul-linux-x86-xlibs ) ) ) kernel_linux? ( virtual/modutils )
+REQUIRED_USE=tools? ( X || ( gtk2 gtk3 ) )
+RESTRICT=bindist mirror strip
+SLOT=0
+SRC_URI=amd64-fbsd? ( http://us.download.nvidia.com/XFree86/FreeBSD-x86_64/352.09/NVIDIA-FreeBSD-x86_64-352.09.tar.gz ) amd64? ( http://us.download.nvidia.com/XFree86/Linux-x86_64/352.09/NVIDIA-Linux-x86_64-352.09.run ) x86-fbsd? ( http://us.download.nvidia.com/XFree86/FreeBSD-x86/352.09/NVIDIA-FreeBSD-x86-352.09.tar.gz ) x86? ( http://us.download.nvidia.com/XFree86/Linux-x86/352.09/NVIDIA-Linux-x86-352.09.run )
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	5d5921a298e95441da2f85be419894c0	linux-info	25e9476cdec14dfb0af32f4c83c3f297	linux-mod	101302d4b7b694ea9622bbffb187d0de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	nvidia-driver	800f567ff607d5d5171a8149456e294e	portability	a45c088f246ef5091e029f6285d7ce42	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	udev	da001465a2e939c93f7ae16947ce3438	unpacker	f300a7ca9131b1024a79762e8edd3c52	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=d38e69882a252d9ca8ad4ae63b0e59d6
diff --git a/metadata/md5-cache/x11-misc/x11vnc-0.9.13_p20150111 b/metadata/md5-cache/x11-misc/x11vnc-0.9.13_p20150111
index 7486bcac422a..fcf371d447d1 100644
--- a/metadata/md5-cache/x11-misc/x11vnc-0.9.13_p20150111
+++ b/metadata/md5-cache/x11-misc/x11vnc-0.9.13_p20150111
@@ -4,10 +4,10 @@ DESCRIPTION=A VNC server for real X displays
 EAPI=5
 HOMEPAGE=http://www.karlrunge.com/x11vnc/
 IUSE=avahi crypt fbcon ssl xinerama
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr >=x11-libs/libXtst-1.1.0 avahi? ( >=net-dns/avahi-0.6.4 ) ssl? ( dev-libs/openssl:= ) >=net-libs/libvncserver-0.9.8 xinerama? ( x11-libs/libXinerama )
 SLOT=0
 SRC_URI=https://github.com/LibVNC/x11vnc/archive/82eb9752485db87c9c6d3d6bb4aa1ae7ac81174a.zip
 _eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
-_md5_=5dd08507fa79707d29f22c2eab326523
+_md5_=f49ba643dcc955d4a160a8868457a0b3
diff --git a/metadata/md5-cache/x11-terms/gnome-terminal-3.14.2-r2 b/metadata/md5-cache/x11-terms/gnome-terminal-3.14.2-r2
index d252b608316f..4442a7662db3 100644
--- a/metadata/md5-cache/x11-terms/gnome-terminal-3.14.2-r2
+++ b/metadata/md5-cache/x11-terms/gnome-terminal-3.14.2-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=>=dev-libs/glib-2.40:2[dbus] >=x11-libs/gtk+-3.10:3[X] >=x11-libs/vte-0.38:2.91 >=gnome-base/dconf-0.14 >=gnome-base/gsettings-desktop-schemas-0.1.0 sys-apps/util-linux x11-libs/libSM x11-libs/libICE gnome-shell? ( gnome-base/gnome-shell ) nautilus? ( >=gnome-base/nautilus-3 ) app-text/yelp-tools dev-util/appdata-tools dev-util/gdbus-codegen || ( dev-util/gtk-builder-convert <=x11-libs/gtk+-2.24.10:2 ) >=dev-util/intltool-0.50 sys-devel/gettext virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=>=dev-libs/glib-2.40:2[dbus] >=x11-libs/gtk+-3.10:3[X] >=x11-libs/vte-0.38:2.91 >=gnome-base/dconf-0.14 >=gnome-base/gsettings-desktop-schemas-0.1.0 sys-apps/util-linux x11-libs/libSM x11-libs/libICE gnome-shell? ( gnome-base/gnome-shell ) nautilus? ( >=gnome-base/nautilus-3 ) app-text/yelp-tools dev-libs/libxml2 dev-util/appdata-tools dev-util/gdbus-codegen || ( dev-util/gtk-builder-convert <=x11-libs/gtk+-2.24.10:2 ) dev-util/itstool >=dev-util/intltool-0.50 sys-devel/gettext virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4
 DESCRIPTION=The Gnome Terminal
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Apps/Terminal/
@@ -10,4 +10,4 @@ RDEPEND=>=dev-libs/glib-2.40:2[dbus] >=x11-libs/gtk+-3.10:3[X] >=x11-libs/vte-0.
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-terminal/3.14/gnome-terminal-3.14.2.tar.xz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=8aa280dc06700814e3867a1caaa35be0
+_md5_=cf8f66cb45339528d8ebf53198894c34
diff --git a/metadata/md5-cache/x11-terms/gnome-terminal-3.14.3 b/metadata/md5-cache/x11-terms/gnome-terminal-3.14.3
index 6e9722fc98e2..0461cb59e23d 100644
--- a/metadata/md5-cache/x11-terms/gnome-terminal-3.14.3
+++ b/metadata/md5-cache/x11-terms/gnome-terminal-3.14.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=>=dev-libs/glib-2.40:2[dbus] >=x11-libs/gtk+-3.10:3[X] >=x11-libs/vte-0.38:2.91 >=gnome-base/dconf-0.14 >=gnome-base/gsettings-desktop-schemas-0.1.0 sys-apps/util-linux x11-libs/libSM x11-libs/libICE gnome-shell? ( gnome-base/gnome-shell ) nautilus? ( >=gnome-base/nautilus-3 ) app-text/yelp-tools dev-util/appdata-tools dev-util/gdbus-codegen dev-util/gtk-builder-convert >=dev-util/intltool-0.50 sys-devel/gettext virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=>=dev-libs/glib-2.40:2[dbus] >=x11-libs/gtk+-3.10:3[X] >=x11-libs/vte-0.38:2.91 >=gnome-base/dconf-0.14 >=gnome-base/gsettings-desktop-schemas-0.1.0 sys-apps/util-linux x11-libs/libSM x11-libs/libICE gnome-shell? ( gnome-base/gnome-shell ) nautilus? ( >=gnome-base/nautilus-3 ) app-text/yelp-tools dev-libs/libxml2 dev-util/appdata-tools dev-util/gdbus-codegen dev-util/gtk-builder-convert dev-util/itstool >=dev-util/intltool-0.50 sys-devel/gettext virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4
 DESCRIPTION=The Gnome Terminal
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Apps/Terminal/
@@ -10,4 +10,4 @@ RDEPEND=>=dev-libs/glib-2.40:2[dbus] >=x11-libs/gtk+-3.10:3[X] >=x11-libs/vte-0.
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-terminal/3.14/gnome-terminal-3.14.3.tar.xz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=f484ba12e898fc4f748e60838a1b93b0
+_md5_=58778d47db694f4cff3784850cfe4141
diff --git a/metadata/md5-cache/xfce-extra/thunar-archive-plugin-0.3.1-r1 b/metadata/md5-cache/xfce-extra/thunar-archive-plugin-0.3.1-r1
new file mode 100644
index 000000000000..ba06eeea4169
--- /dev/null
+++ b/metadata/md5-cache/xfce-extra/thunar-archive-plugin-0.3.1-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst postrm preinst prepare setup
+DEPEND=>=xfce-base/libxfce4util-4.8:= >=xfce-base/exo-0.6:= >=xfce-base/thunar-1.2:= dev-util/intltool sys-devel/gettext virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 >=dev-util/xfce4-dev-tools-4.10
+DESCRIPTION=Archive plug-in for the Thunar filemanager
+EAPI=5
+HOMEPAGE=http://goodies.xfce.org/projects/thunar-plugins/thunar-archive-plugin
+IUSE=debug
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux
+LICENSE=LGPL-2
+RDEPEND=>=xfce-base/libxfce4util-4.8:= >=xfce-base/exo-0.6:= >=xfce-base/thunar-1.2:=
+SLOT=0
+SRC_URI=mirror://xfce/src/thunar-plugins/thunar-archive-plugin/0.3/thunar-archive-plugin-0.3.1.tar.bz2
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	xfconf	eee85b2bc9e9826f5a9c1349a75a69fe
+_md5_=3bd482a1b0f0f8f654ddcdda4165d1db
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 8e3f99e48c8a..85c025fef562 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Tue, 19 May 2015 05:36:52 +0000
+Tue, 19 May 2015 17:47:24 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 12b761e7b532..c91e5f5acbe8 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Tue May 19 05:36:49 UTC 2015
+Tue May 19 17:47:20 UTC 2015
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index f416985ed277..b7fdaf3d60cf 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Tue, 19 May 2015 06:00:01 +0000
+Tue, 19 May 2015 18:00:01 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 5430c401f418..f20e9fc3f115 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1432013701 Tue 19 May 2015 05:35:01 AM UTC
+1432057501 Tue 19 May 2015 05:45:01 PM UTC
diff --git a/net-analyzer/greenbone-security-assistant/Manifest b/net-analyzer/greenbone-security-assistant/Manifest
index 13c6a66ee382..caba2eafa59e 100644
--- a/net-analyzer/greenbone-security-assistant/Manifest
+++ b/net-analyzer/greenbone-security-assistant/Manifest
@@ -1,3 +1,5 @@
 DIST greenbone-security-assistant-5.0.5.tar.gz 1051230 SHA256 ed112b87e905e47f15a33472377dc16010167d45e99457716aac1a81b0ca261e SHA512 c5ef44d327db170046465bcd65c9ce3d88bc3e62863b6f7ff8046a9bfea6662c6452a040d69aa7e06146d9e3ba950aba3de2e5dfe3be530d128c217ce3f5b362 WHIRLPOOL a4fba81d61877a0785251d7499591af26f2e527fc48235025d106c8d5c3a8bbaada124dcee5762f4119438654d3a4bf496e4a1dbf1729ef8357395497bae5a9e
 DIST greenbone-security-assistant-5.0.6.tar.gz 1051659 SHA256 c3247ca4db61a6cfb5312495e32239ff678060f2a6186901fd5e2d328b3462d2 SHA512 f51383ec521301d9b2f1432282bfba34bb610100e3a1ad04f1158201335b4422c94ede882630c5a25a5d30cea34687a411b07aef67d7f03856e43e9fffc2ef3e WHIRLPOOL d313fd5f230813f9bb917308e9925af42688a0f0774024286a2630aa6c0e2b6a20e2aba71038d0e2cc14a8d34c937fe11eb999aa2639c8e95e1567e8e170a45e
+DIST greenbone-security-assistant-5.0.7.tar.gz 1052493 SHA256 11a27f7b54e8fa8f546d0757c57664d1ec094a4a4f040ac1ddb7360a80f17732 SHA512 c3c0a0b2bb3dd011d3599ca081d24d1eb6be2808e4eded04b4e2996633a8ddd3ad851549e4f0c35c27500db2958bbbe69d9868855e215f977a1fbae0931d063a WHIRLPOOL c3a5bd985b2c378ae71a695ba43c48df180bf4d6d7acc3b3907e3de200a2433c91e61f459e8010791816011c69a30a659526009d48d9e413cde3219551a6217c
 DIST greenbone-security-assistant-6.0.1.tar.gz 1208975 SHA256 79fe695525a5a292cd8daa936f30347a12c2b78f90a6ce56a64355957c518a73 SHA512 e33988a6cc6b409cd853318a6ec4bf84156aa866b88ee14b91393ba941fa0e53bbfdd25b49e90952cc85622520c98410960e2ba6d1581778639f33abb0dac884 WHIRLPOOL 3e4bf05c55354a45317b6b9e01455e57dc94c051e3d527bd6b76f420e21fb9a987375965044c2bcb8d48e253f1be1aa414f90e14fbbbdb18acd395889ff99661
+DIST greenbone-security-assistant-6.0.3.tar.gz 1219593 SHA256 731f490186f917dcbacc52157e2906e66be69a20c6e69dc179d23b828413c0f3 SHA512 fde8edc5c925040f5713f257939882a9a682ea0378106f61bdd62ae3e81cc2a8e2be57f0fb7449aec5b80680e22b7d58a512f7e88dc332d206297e38cd7c18e2 WHIRLPOOL d5cb2a89a802df05a130a026fb4feb30b7ba09c7bad7e071684035b275c4a8c289f599ee9eef3f8c9e467d2ecf2044dec2b19212da4c983bc4183ee3eec018a4
diff --git a/net-analyzer/greenbone-security-assistant/greenbone-security-assistant-5.0.7.ebuild b/net-analyzer/greenbone-security-assistant/greenbone-security-assistant-5.0.7.ebuild
new file mode 100644
index 000000000000..1aa56c3e4bb6
--- /dev/null
+++ b/net-analyzer/greenbone-security-assistant/greenbone-security-assistant-5.0.7.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/greenbone-security-assistant/greenbone-security-assistant-5.0.7.ebuild,v 1.1 2015/05/19 09:02:52 jlec Exp $
+
+EAPI=5
+
+inherit cmake-utils systemd
+
+MY_PN=gsad
+
+DL_ID=2039
+
+DESCRIPTION="Greenbone Security Assistant for openvas"
+HOMEPAGE="http://www.openvas.org/"
+SRC_URI="http://wald.intevation.org/frs/download.php/${DL_ID}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND="
+	>=net-analyzer/openvas-libraries-7.0.10
+	dev-libs/libxslt
+	net-libs/libmicrohttpd[messages]"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.0.3-run.patch
+	)
+
+src_prepare() {
+	sed \
+		-e '/^install.*OPENVAS_CACHE_DIR.*/d' \
+		-i CMakeLists.txt || die
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DLOCALSTATEDIR="${EPREFIX}/var"
+		-DSYSCONFDIR="${EPREFIX}/etc"
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	newinitd "${FILESDIR}"/${MY_PN}.init ${MY_PN}
+
+	insinto /etc/openvas
+	doins "${FILESDIR}"/${MY_PN}-daemon.conf
+	dosym ../openvas/${MY_PN}-daemon.conf /etc/conf.d/${PN}
+
+	insinto /etc/logrotate.d
+	doins "${FILESDIR}"/${MY_PN}.logrotate
+
+	systemd_newtmpfilesd "${FILESDIR}"/${MY_PN}.tmpfiles.d ${MY_PN}.conf
+	systemd_dounit "${FILESDIR}"/${MY_PN}.service
+}
diff --git a/net-analyzer/greenbone-security-assistant/greenbone-security-assistant-6.0.3.ebuild b/net-analyzer/greenbone-security-assistant/greenbone-security-assistant-6.0.3.ebuild
new file mode 100644
index 000000000000..47fbef25e9bb
--- /dev/null
+++ b/net-analyzer/greenbone-security-assistant/greenbone-security-assistant-6.0.3.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/greenbone-security-assistant/greenbone-security-assistant-6.0.3.ebuild,v 1.1 2015/05/19 09:02:52 jlec Exp $
+
+EAPI=5
+
+inherit cmake-utils systemd
+
+MY_PN=gsad
+
+DL_ID=2079
+
+DESCRIPTION="Greenbone Security Assistant for openvas"
+HOMEPAGE="http://www.openvas.org/"
+SRC_URI="http://wald.intevation.org/frs/download.php/${DL_ID}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2+ BSD MIT"
+KEYWORDS=" ~amd64 ~arm ~ppc ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-libs/libgcrypt:0
+	dev-libs/libxslt
+	>=net-analyzer/openvas-libraries-8.0.3
+	net-libs/libmicrohttpd[messages]"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.0.3-run.patch
+	)
+
+S="${WORKDIR}"/${P}
+
+src_prepare() {
+	sed \
+		-e '/^install.*OPENVAS_CACHE_DIR.*/d' \
+		-i CMakeLists.txt || die
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DLOCALSTATEDIR="${EPREFIX}/var"
+		-DSYSCONFDIR="${EPREFIX}/etc"
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	newinitd "${FILESDIR}"/${MY_PN}.init ${MY_PN}
+
+	insinto /etc/openvas
+	doins "${FILESDIR}"/${MY_PN}-daemon.conf
+	dosym ../openvas/${MY_PN}-daemon.conf /etc/conf.d/${PN}
+
+	insinto /etc/logrotate.d
+	doins "${FILESDIR}"/${MY_PN}.logrotate
+
+	systemd_newtmpfilesd "${FILESDIR}"/${MY_PN}.tmpfiles.d ${MY_PN}.conf
+	systemd_dounit "${FILESDIR}"/${MY_PN}.service
+}
diff --git a/net-analyzer/openvas-libraries/Manifest b/net-analyzer/openvas-libraries/Manifest
index 6a33e6518e69..a77b577cbd97 100644
--- a/net-analyzer/openvas-libraries/Manifest
+++ b/net-analyzer/openvas-libraries/Manifest
@@ -1,3 +1,5 @@
+DIST openvas-libraries-7.0.10.tar.gz 581409 SHA256 5093d08182cec065ee8945599a1295080bb1657d95a3f587dff3e4d0bbc1c339 SHA512 9796e9ae51b8f2ba69fcda7d5f782b70ec8c6a346403628d6d37d255c3c1eb90f5a4fdc38fd9436a3232060155b90ebbfd7b626f4777d3204048f1c8c0e6c53c WHIRLPOOL 45753cbcff0cb7fc5bcffbaa3d7a65401d8a4531cb14155e9a76ed91fc59e166c8339a91e5f2d8ba8839ac7d5d7be273dc61ebe124b5b3f5cbb99f9df444e2a2
 DIST openvas-libraries-7.0.7.tar.gz 578578 SHA256 d04563d620952618af69e2db7afef8539f6aae8dffe1e8c0f4127abe9e33d20f SHA512 6960b8ae65bb2f4182bd8c4a513c723c92990d76b4deb3c1a42d5cffb6731ab918aabfad816a7e138be3f5d4fa042c0c98a3e03ea0c4a2d4e30e60115d3df4a0 WHIRLPOOL 0c0fbcddbcbfd4c6c06428a6863b25deece4b4306f867f03a283a7916838073f94d5b9cea6983d0fd86e9066f4bf6d98ada59c24776a7c3f677375334d5012b3
 DIST openvas-libraries-7.0.9.tar.gz 579066 SHA256 a1d074f8fb75de8fdfe8c97e752ddf26775c0232685785277074bf29bfb68503 SHA512 87ca47d12a9293ea891090f73aa698dddb8c1ea18ee0bb2c03e0aa5f2c9af302e1502c32b5d3e94454db9e2113440262051cb81c7e2cd5b3433f4073ddb4576c WHIRLPOOL 9d2cc7dd929aa7908ca9394d9ffad19b99766bf1fb3672f380e686fb4e0defc5499aac26a3272fa4974c23fe3b026fd61e8d9649c2101fc47b2ea8f79d10129c
 DIST openvas-libraries-8.0.1.tar.gz 593421 SHA256 3377d8302c4d9155cb5af7eec10fb575dc6b1920850779747adc99d98b48040c SHA512 4ef573b342a53c1e8f5a3574f2b8a4a763bf8a1ffafe505fd543381ad2f17d72d26e03c61fce76f1ca322cf4d4485de0d2475c395bbc3612cb53558e0254b507 WHIRLPOOL d3fdb507672a1578dbbabfbd93eeb1643f1bcba2347bcb33a96a254d6dbddc506f13d5a8e48c9fac4a006b7907d2dbea4c4e67a63f0bb4243de169068eb64292
+DIST openvas-libraries-8.0.3.tar.gz 600412 SHA256 552c7f4de11e5f4678a39c27837db168f4063778e9806d999cfad36f8504d870 SHA512 88afc8828eca45bfa74f6a1b14e4381d837e965b8b69e32eecb794814142cbca75078da1a753a42fc1ace5fb51b200c4f05cd03ad2d7c1450ba70db84c3fb21c WHIRLPOOL 665410157656f53462795b867405ec3f826921613eb3cfb142d68354eaf428110689a86def836bf6fa472aed0dcf5d2850658f1ca2b29a46bcda96bd52fc656e
diff --git a/net-analyzer/openvas-libraries/openvas-libraries-7.0.10.ebuild b/net-analyzer/openvas-libraries/openvas-libraries-7.0.10.ebuild
new file mode 100644
index 000000000000..78889ea8942f
--- /dev/null
+++ b/net-analyzer/openvas-libraries/openvas-libraries-7.0.10.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/openvas-libraries/openvas-libraries-7.0.10.ebuild,v 1.1 2015/05/19 08:50:49 jlec Exp $
+
+EAPI=5
+
+inherit cmake-utils
+
+DL_ID=2031
+
+DESCRIPTION="A remote security scanner for Linux (openvas-libraries)"
+HOMEPAGE="http://www.openvas.org/"
+SRC_URI="http://wald.intevation.org/frs/download.php/${DL_ID}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+IUSE="ldap"
+
+RDEPEND="
+	app-crypt/gpgme
+	>=dev-libs/glib-2.12
+	dev-libs/libksba
+	!net-analyzer/openvas-libnasl
+	=net-libs/gnutls-2*
+	net-libs/libpcap
+	net-libs/libssh
+	ldap? (	net-nds/openldap )"
+DEPEND="${RDEPEND}
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+	"
+
+DOCS="ChangeLog CHANGES README"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-7.0.4-libssh.patch
+	"${FILESDIR}"/${PN}-7.0.4-bsdsource.patch
+	"${FILESDIR}"/${PN}-7.0.4-run.patch
+	"${FILESDIR}"/${PN}-7.0.6-underlinking.patch
+	)
+
+src_prepare() {
+	sed \
+		-e '/^install.*OPENVAS_CACHE_DIR.*/d' \
+		-i CMakeLists.txt || die
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		"-DLOCALSTATEDIR=${EPREFIX}/var"
+		"-DSYSCONFDIR=${EPREFIX}/etc"
+		$(usex ldap -DBUILD_WITHOUT_LDAP=0 -DBUILD_WITHOUT_LDAP=1)
+	)
+	cmake-utils_src_configure
+}
diff --git a/net-analyzer/openvas-libraries/openvas-libraries-8.0.3.ebuild b/net-analyzer/openvas-libraries/openvas-libraries-8.0.3.ebuild
new file mode 100644
index 000000000000..3577c893a613
--- /dev/null
+++ b/net-analyzer/openvas-libraries/openvas-libraries-8.0.3.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/openvas-libraries/openvas-libraries-8.0.3.ebuild,v 1.1 2015/05/19 08:50:49 jlec Exp $
+
+EAPI=5
+
+inherit cmake-utils
+
+DL_ID=2067
+
+DESCRIPTION="A remote security scanner for Linux (openvas-libraries)"
+HOMEPAGE="http://www.openvas.org/"
+SRC_URI="http://wald.intevation.org/frs/download.php/${DL_ID}/${P/_beta/+beta}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+IUSE="ldap"
+
+RDEPEND="
+	app-crypt/gpgme
+	>=dev-libs/glib-2.16
+	>=dev-libs/hiredis-0.10.1
+	dev-libs/libgcrypt:0
+	dev-libs/libksba
+	!net-analyzer/openvas-libnasl
+	=net-libs/gnutls-2*
+	net-libs/libpcap
+	>=net-libs/libssh-0.5.0
+	net-analyzer/net-snmp
+	ldap? (	net-nds/openldap )"
+DEPEND="${RDEPEND}
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+	"
+
+S="${WORKDIR}"/${P}
+
+DOCS=( ChangeLog CHANGES README )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-7.0.4-libssh.patch
+	"${FILESDIR}"/${PN}-8.0.1-include.patch
+	)
+
+src_prepare() {
+	sed \
+		-e '/^install.*OPENVAS_CACHE_DIR.*/d' \
+		-i CMakeLists.txt || die
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		"-DLOCALSTATEDIR=${EPREFIX}/var"
+		"-DSYSCONFDIR=${EPREFIX}/etc"
+		$(usex ldap -DBUILD_WITHOUT_LDAP=0 -DBUILD_WITHOUT_LDAP=1)
+	)
+	cmake-utils_src_configure
+}
diff --git a/net-analyzer/openvas-manager/Manifest b/net-analyzer/openvas-manager/Manifest
index 3cb812c5a7c5..80b3b68a24d3 100644
--- a/net-analyzer/openvas-manager/Manifest
+++ b/net-analyzer/openvas-manager/Manifest
@@ -1,3 +1,5 @@
+DIST openvas-manager-5.0.10.tar.gz 1744247 SHA256 60b73e42939db1bb82c026c872a8dc51d65e421150dc7686bc6ef6e9a2cfc29f SHA512 946fcf3b4a977cca9d0f39795eac28fdc4c6dd9a56ea65d1be579b4735232634bd95284f07e8cd9849bde81bbaf690ee6c0a801e1500a8b1ddba2f6dc1033800 WHIRLPOOL 7dcd6d547f484df2a3f25eec2a669e6d6f37770e8e0b81c05a7b62a03e28608596c09c3f7b870445b7146213e47ea595866582f389e2ba2bfed150bbb2678497
 DIST openvas-manager-5.0.8.tar.gz 1742551 SHA256 06fb91bf2edb43f0d16809386bfb4061a4ea603c2710a6e9b187de863d2a40a6 SHA512 fca883b6c7c8361735578797b90d238a1beb590ec91348f2350769b580c38b9ef1e09c1a381e9a59d791f067e7ceb47dd44d7417ededb71e30b2a69ee4bac47b WHIRLPOOL ac6736477c08ac914d70d6be8d46890b20e9836169181d4731fb8d314b54849fba6e22b4fe79b2761452e4ea09309636ca339da47d72202fba8c441926dedc71
 DIST openvas-manager-5.0.9.tar.gz 1743841 SHA256 52ebbb0b798d8cf41de9414c71a80dc385b03afd1d7dfdeb5bdce80258b020a0 SHA512 a7af73783dfee12309b496254890938b88507a0f442b3fc5421b8e2803a70fc4bc477055071e70e1eed3e879bd890b4e7fe8d529e2cadbf57ac0490cd9231eeb WHIRLPOOL 15e6c28a384c4b626cab60179464c773b9c527162917aa8b5d188f9ca5ed454f5ad71cd17054003fa9167cf7ad1492e5f63953370fad9e96c003d1c098e1b700
 DIST openvas-manager-6.0.1.tar.gz 1904064 SHA256 cf0a21f70ce56ad5f17402c4360c31791b0763e78a963a75f1d569f648bd8735 SHA512 5044c326bde695e2a1e72cec03f6dca3e20cc0524dc13676910d573544f4a43cb09c4ba81a9fc370c76422a88ded06ed46320bc2c70669adfe78dd0374ab160e WHIRLPOOL a5dd725e331cb7fe33900ce595f17df9f8c8b66dfe7172eed9a3c1c5608b3d5526cb8964e8e3ba9c9e3fb1b4e863a2a3a87c21e8da5f46a880603ac45c0c4c5b
+DIST openvas-manager-6.0.3.tar.gz 1914785 SHA256 cdad83b6745ac77657c569b6196559cdeb71a95a8d63e3c54ae30e0ce26c79c6 SHA512 53f671b21c91fb621244498974d97e2682dcdd19d6da1ace5d150a5ec5dd9553df93484b723890fde5e673063739c5cc081c4ecad25bcdb1cbee2352c8442b76 WHIRLPOOL 9d58fee8a67ba1c87931e43d3b294194dc4ee50c6a1756cdec835dcd8c2dd2663262a197cc45e769f1842b6fa991a274eb67974f1510af9521a98834797c0ce2
diff --git a/net-analyzer/openvas-manager/openvas-manager-5.0.10.ebuild b/net-analyzer/openvas-manager/openvas-manager-5.0.10.ebuild
new file mode 100644
index 000000000000..bc9d0c435d9f
--- /dev/null
+++ b/net-analyzer/openvas-manager/openvas-manager-5.0.10.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/openvas-manager/openvas-manager-5.0.10.ebuild,v 1.1 2015/05/19 08:56:44 jlec Exp $
+
+EAPI=5
+
+inherit cmake-utils systemd
+
+MY_PN=openvasmd
+
+DL_ID=2035
+
+DESCRIPTION="A remote security scanner for Linux (openvas-manager)"
+HOMEPAGE="http://www.openvas.org/"
+SRC_URI="http://wald.intevation.org/frs/download.php/${DL_ID}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+IUSE=""
+
+RDEPEND="
+	>=net-analyzer/openvas-libraries-7.0.10
+	>=dev-db/sqlite-3
+	!net-analyzer/openvas-administrator"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.0.4-gpgerror.patch
+	"${FILESDIR}"/${PN}-5.0.4-bsdsource.patch
+	"${FILESDIR}"/${PN}-5.0.4-run.patch
+	)
+
+src_prepare() {
+	sed \
+		-e '/^install.*OPENVAS_CACHE_DIR.*/d' \
+		-i CMakeLists.txt || die
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DLOCALSTATEDIR="${EPREFIX}/var"
+		-DSYSCONFDIR="${EPREFIX}/etc"
+		)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	insinto /etc/openvas/
+	doins "${FILESDIR}"/${MY_PN}-daemon.conf
+	dosym ../openvas/${MY_PN}-daemon.conf /etc/conf.d/${PN}
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${MY_PN}.logrotate ${MY_PN}
+
+	newinitd "${FILESDIR}"/${MY_PN}.init ${MY_PN}
+	systemd_dounit "${FILESDIR}"/${MY_PN}.service
+}
diff --git a/net-analyzer/openvas-manager/openvas-manager-6.0.3.ebuild b/net-analyzer/openvas-manager/openvas-manager-6.0.3.ebuild
new file mode 100644
index 000000000000..489dd443e1b0
--- /dev/null
+++ b/net-analyzer/openvas-manager/openvas-manager-6.0.3.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/openvas-manager/openvas-manager-6.0.3.ebuild,v 1.1 2015/05/19 08:56:44 jlec Exp $
+
+EAPI=5
+
+inherit cmake-utils systemd
+
+MY_PN=openvasmd
+
+DL_ID=2075
+
+DESCRIPTION="A remote security scanner for Linux (openvas-manager)"
+HOMEPAGE="http://www.openvas.org/"
+SRC_URI="http://wald.intevation.org/frs/download.php/${DL_ID}/${P/_beta/+beta}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS=" ~amd64 ~arm ~ppc ~x86"
+IUSE=""
+
+RDEPEND="
+	>=net-analyzer/openvas-libraries-8.0.3
+	>=dev-db/sqlite-3
+	!net-analyzer/openvas-administrator"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S="${WORKDIR}"/${P}
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.0.1-bsdsource.patch
+	)
+
+src_prepare() {
+	sed \
+		-e '/^install.*OPENVAS_CACHE_DIR.*/d' \
+		-i CMakeLists.txt || die
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DLOCALSTATEDIR="${EPREFIX}/var"
+		-DSYSCONFDIR="${EPREFIX}/etc"
+		)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	insinto /etc/openvas/
+	doins "${FILESDIR}"/${MY_PN}-daemon.conf
+	dosym ../openvas/${MY_PN}-daemon.conf /etc/conf.d/${PN}
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${MY_PN}.logrotate ${MY_PN}
+
+	newinitd "${FILESDIR}"/${MY_PN}.init ${MY_PN}
+	systemd_dounit "${FILESDIR}"/${MY_PN}.service
+}
diff --git a/net-analyzer/openvas-scanner/Manifest b/net-analyzer/openvas-scanner/Manifest
index 6f98903e2638..7fd50aa6bfe4 100644
--- a/net-analyzer/openvas-scanner/Manifest
+++ b/net-analyzer/openvas-scanner/Manifest
@@ -1,3 +1,4 @@
 DIST openvas-scanner-4.0.5.tar.gz 215519 SHA256 046bd4a3f475d913645cc748ff0579318b7976648545ba68f98188aa73694b80 SHA512 f2f6d98fd31f6015ac4a04e986264ee6b42c8572e15a5e3ff359f3ac7176952c48276a9074c72f6e1c88e661964021a64124bd962cfef3d9e13a2071f2505099 WHIRLPOOL d83e2917ddb7ecdf5bb6234298737ba14da8713113615b4881b39721596aadbbd5b1c103792c0695ed081275a1c2cd5d9dddba37285d62bdbb12e72dcf7c4bb2
 DIST openvas-scanner-4.0.6.tar.gz 215715 SHA256 2e851f3766eed9ca19e06258ceca1b1e9d7a8d88c017dab69707697baca6bf17 SHA512 609cd1d423b233b40233e3292d17ce6839a07739a39015e1bd7fbc688ecce6d8dbec414999010c11b6dd4a7313c7dd307e4d91d0eb89ede8fe25659080dab20c WHIRLPOOL ab246e81141de722a5a301817ba52b3b02da84c9261d5e75b241fdf3f8a9e8102180a40b6b708d0c71692165302f56ff5de54afe847d43adf3db2f72fe1711f1
 DIST openvas-scanner-5.0.1.tar.gz 229055 SHA256 028a913d2888b360e48933de45059597e54878c6c1fb904c72a2ccf1b1bf647f SHA512 21c93c4d55142da7e982eb7ba9af168477751dcce16042123f990547fdeeeec60d697160f5a334bc50ac4d8fcb3a3dde953f91a1bfe959f7efdb6e11b826f6e6 WHIRLPOOL edb1f7e6beb95042b69d43a7dbcabb9e6e9a4e4d3c3edcf77f2fb865374c0f8e8499720a6536f4593524fd884cefb70dbe772e3a254e5ab8625c6d7e75b01c81
+DIST openvas-scanner-5.0.3.tar.gz 235795 SHA256 e5d3bfcfdc8955195b60ae643d81484dc2a800179392dbd71cb8d0f7d183356b SHA512 bfa76b328aec663fe13cf9e65412d7cbc729b66bcae76b34a295125d6f8586bb7873c3c1eebd897c82a549191baa8c6b9cf08f0a8aa148f70097eb76e944ef5b WHIRLPOOL d4dabd73faf96d353809763f4896ea6991fa5e2a05be5734ad8f64a6080c7346c96ab6db76d15046d2c29ea6b34fc50dd92a694748e7bfa60c67c080fce7e675
diff --git a/net-analyzer/openvas-scanner/openvas-scanner-5.0.3.ebuild b/net-analyzer/openvas-scanner/openvas-scanner-5.0.3.ebuild
new file mode 100644
index 000000000000..bf722722350e
--- /dev/null
+++ b/net-analyzer/openvas-scanner/openvas-scanner-5.0.3.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/openvas-scanner/openvas-scanner-5.0.3.ebuild,v 1.1 2015/05/19 08:53:15 jlec Exp $
+
+EAPI=5
+
+inherit cmake-utils systemd
+
+MY_PN=openvassd
+
+DL_ID=2071
+
+DESCRIPTION="A remote security scanner for Linux (OpenVAS-scanner)"
+HOMEPAGE="http://www.openvas.org/"
+SRC_URI="http://wald.intevation.org/frs/download.php/${DL_ID}/${P/_beta/+beta}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS=" ~amd64 ~arm ~ppc ~x86"
+IUSE=""
+
+RDEPEND="
+	app-crypt/gpgme
+	>=dev-libs/glib-2.16:2
+	dev-libs/libgcrypt:0
+	>=net-analyzer/openvas-libraries-8.0.2
+	!net-analyzer/openvas-plugins
+	!net-analyzer/openvas-server"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S="${WORKDIR}"/${P/_beta/+beta}
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.0.3-mkcertclient.patch
+	"${FILESDIR}"/${PN}-4.0.3-rulesdir.patch
+	"${FILESDIR}"/${PN}-4.0.3-run.patch
+	)
+
+src_prepare() {
+	sed \
+		-e '/^install.*OPENVAS_CACHE_DIR.*/d' \
+		-i CMakeLists.txt || die
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DLOCALSTATEDIR="${EPREFIX}/var"
+		-DSYSCONFDIR="${EPREFIX}/etc"
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	newinitd "${FILESDIR}"/${MY_PN}.init ${MY_PN}
+
+	insinto /etc/openvas
+	doins "${FILESDIR}"/${MY_PN}.conf "${FILESDIR}"/${MY_PN}-daemon.conf
+	dosym ../openvas/${MY_PN}-daemon.conf /etc/conf.d/${PN}
+
+	insinto /etc/logrotate.d
+	doins "${FILESDIR}"/${MY_PN}.logrotate
+
+	dodoc "${FILESDIR}"/openvas-nvt-sync-cron
+
+	systemd_newtmpfilesd "${FILESDIR}"/${MY_PN}.tmpfiles.d ${MY_PN}.conf
+	systemd_dounit "${FILESDIR}"/${MY_PN}.service
+}
diff --git a/net-analyzer/openvas/openvas-7.0.10.ebuild b/net-analyzer/openvas/openvas-7.0.10.ebuild
new file mode 100644
index 000000000000..9acc2d0ee735
--- /dev/null
+++ b/net-analyzer/openvas/openvas-7.0.10.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/openvas/openvas-7.0.10.ebuild,v 1.1 2015/05/19 09:05:18 jlec Exp $
+
+EAPI=5
+
+inherit readme.gentoo
+
+DESCRIPTION="A remote security scanner"
+HOMEPAGE="http://www.openvas.org/"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="+pdf"
+
+DEPEND="
+	>=net-analyzer/openvas-libraries-7.0.10
+	>=net-analyzer/openvas-scanner-4.0.6
+	>=net-analyzer/openvas-manager-5.0.10
+	>=net-analyzer/openvas-cli-1.3.1
+	net-analyzer/openvas-tools
+	pdf? (
+		app-text/htmldoc
+		dev-texlive/texlive-latexextra
+		virtual/latex-base
+	)"
+# greenbone-security-desktop is broken and unsupported upstream
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"
+
+pkg_postinst() {
+	elog "Additional support for extra checks can be get from"
+	optfeature "Nikto — a web server scanning and testing tool" net-analyzer/nikto
+	optfeature "NMAP — a portscanner" net-analyzer/nmap
+	optfeature "ike-scan - an IPsec VPN scanning, fingerprinting and testing tool" net-analyzer/ike-scan
+	optfeature "amap — an application protocol detection tool" net-analyzer/amap
+	optfeature "ldapsearch from OpenLDAP utilities — retrieves information from LDAP dictionaries" net-nds/openldap
+	optfeature "ovaldi (OVAL) — an OVAL Interpreter" app-forensics/ovaldi
+	optfeature "portbunny — a Linux-kernel-based portscanner" net-analyzer/portbunny
+	optfeature "w3af — a web application attack and audit framework" net-analyzer/w3af
+	optfeature "The Greenbone Security Assistant as alternative to the plain scanner" net-analyzer/greenbone-security-assistant
+}
diff --git a/net-analyzer/openvas/openvas-8.0.3.ebuild b/net-analyzer/openvas/openvas-8.0.3.ebuild
new file mode 100644
index 000000000000..63746465d7e3
--- /dev/null
+++ b/net-analyzer/openvas/openvas-8.0.3.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/openvas/openvas-8.0.3.ebuild,v 1.1 2015/05/19 09:05:18 jlec Exp $
+
+EAPI=5
+
+inherit readme.gentoo
+
+DESCRIPTION="A remote security scanner"
+HOMEPAGE="http://www.openvas.org/"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS=" ~amd64 ~x86"
+IUSE="+pdf"
+
+DEPEND="
+	>=net-analyzer/openvas-libraries-8.0.3
+	>=net-analyzer/openvas-scanner-5.0.3
+	>=net-analyzer/openvas-manager-6.0.3
+	>=net-analyzer/openvas-cli-1.4.0
+	net-analyzer/openvas-tools
+	pdf? (
+		app-text/htmldoc
+		dev-texlive/texlive-latexextra
+		virtual/latex-base
+	)"
+# greenbone-security-desktop is broken and unsupported upstream
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"
+
+pkg_postinst() {
+	elog "Additional support for extra checks can be get from"
+	optfeature "Nikto — a web server scanning and testing tool" net-analyzer/nikto
+	optfeature "NMAP — a portscanner" net-analyzer/nmap
+	optfeature "ike-scan - an IPsec VPN scanning, fingerprinting and testing tool" net-analyzer/ike-scan
+	optfeature "amap — an application protocol detection tool" net-analyzer/amap
+	optfeature "ldapsearch from OpenLDAP utilities — retrieves information from LDAP dictionaries" net-nds/openldap
+	optfeature "ovaldi (OVAL) — an OVAL Interpreter" app-forensics/ovaldi
+	optfeature "portbunny — a Linux-kernel-based portscanner" net-analyzer/portbunny
+	optfeature "w3af — a web application attack and audit framework" net-analyzer/w3af
+	optfeature "The Greenbone Security Assistant as alternative to the plain scanner" net-analyzer/greebone-security-assistant
+}
diff --git a/net-libs/gnutls/gnutls-3.3.15.ebuild b/net-libs/gnutls/gnutls-3.3.15.ebuild
index 766a79e415e9..508c4f91406c 100644
--- a/net-libs/gnutls/gnutls-3.3.15.ebuild
+++ b/net-libs/gnutls/gnutls-3.3.15.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-3.3.15.ebuild,v 1.6 2015/05/15 10:56:42 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-3.3.15.ebuild,v 1.7 2015/05/19 07:22:54 ago Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://gnupg/gnutls/v$(get_version_component_range 1-2)/${P}.tar.xz"
 # soon to be relicensed as LGPL-2.1 unless heartbeat extension enabled.
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE_LINGUAS=" en cs de fi fr it ms nl pl sv uk vi zh_CN"
 IUSE="+cxx +crywrap dane doc examples guile nls +openssl pkcs11 static-libs test zlib ${IUSE_LINGUAS// / linguas_}"
 # heartbeat support is not disabled until re-licensing happens fullyf
diff --git a/net-libs/libssh/Manifest b/net-libs/libssh/Manifest
index 17ba8518399c..3c202503b5e6 100644
--- a/net-libs/libssh/Manifest
+++ b/net-libs/libssh/Manifest
@@ -1,5 +1,3 @@
-DIST libssh-0.6.4-libgcrypt_build_fix.patch 1660 SHA256 729e6c4aeacb0c066906b320c426b624b3f437b456969e1830d367800016c304 SHA512 90d4d371463ef6a0669fe363c2750fa1320586b14e1dcaf1d7e6789d2e2732fc8dcbe70c11b4a81675c443c30465e6a7b056a40192ff6245f59308bab760b216 WHIRLPOOL 6ee0dce20b262a758b921483151f12fc483c8370c4eeb2c99c6fd94a44a55a54af997a3ab4dfad99ab714a6d6602392843e0bdb5383180d2d84a947a457a88eb
-DIST libssh-0.6.4.tar.gz 381835 SHA256 7e3205e2e95bf35b23b83a6485a7d59abe7c7546d01b728f691cf0c374216b52 SHA512 02c1879d7afed9cc8404366c343ea770e97fcdcc7cc467f15b762b2c5724399de3efe69fdf6ee86a607c0f4d2337586f34150b9e0dcc8ccd8e86de79f574cba5 WHIRLPOOL e086afbe604905bdc024a1ce7503644285fdb394a168b6049e44751c64cdf51ba9e036a32f568d749252ad537fe9f874eadb8aea92de580f9c93a9d91a6ef457
 DIST libssh-0.6.5-compilefix.patch 668 SHA256 90eb8bd3e31c4df5a5aa40d4e0d440c290190be8524396c979dc2fe5005c9b61 SHA512 8ade351e6499922bc983cfb1b7042a8eca4322b64a5fd1eb9d4afc0baba311f0af970dc3f43b864d510d3a4668f58e83e6214a6e90ddbf4199ab9fea6c73d036 WHIRLPOOL d65f3505eae97feb16f5b0cdfc83a6638dcdca2916facedd05b9987797b72231725c0834355048e48bc38413ad1b9c718cfbdad410fbd13573b38c919ccbac0b
 DIST libssh-0.6.5.tar.xz 281564 SHA256 0fd52763e033d5e9b1cd55f60a74e619731c5ba630938eec95682dbe4cf7dc2c SHA512 55d614ff311a29a20b93094ac1dd16a2ad1345368b874a0e385f0c235e8defde8816948ab04eab68ade477a0a6901b317c7884df1ba3078cf12db89dfc4169cc WHIRLPOOL 9801eee45a178306b0645d75c268df381d206a8c566695d8b6c228ea7f5638a313bdbdf990ad7bd299c24d280595007b44fd16449ee3a0643b6e2084bb148d09
 DIST libssh-0.7.0.tar.xz 349548 SHA256 0551bc341f33641ddc349b31730b3010870ad26a4dbfad3d090a1738fe3e402b SHA512 2ef897f7295d2b4ba63f0d797c51ba2c8cb7d8569152d34ec982d2b88adccc97c8f2aabea3bbc88b72421256d3d0be661f82bbcf5c4b151018b5a695be445568 WHIRLPOOL 1337ca1fc69c5de60f2d33ce1d66f04b0d2807b01794af6787a5d4b7ca84715afe00ff72d8b1bb21590186b7af9058fa90c69af865a0534402735076dec51397
diff --git a/net-libs/libssh/libssh-0.6.4.ebuild b/net-libs/libssh/libssh-0.6.4.ebuild
deleted file mode 100644
index bed67dc80921..000000000000
--- a/net-libs/libssh/libssh-0.6.4.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh/libssh-0.6.4.ebuild,v 1.8 2015/04/02 16:22:14 jer Exp $
-
-EAPI=5
-
-MY_P=${PN}-${PV/_rc/rc}
-inherit eutils cmake-multilib multilib
-
-DESCRIPTION="Access a working SSH implementation by means of a library"
-HOMEPAGE="http://www.libssh.org/"
-SRC_URI="https://red.libssh.org/attachments/download/107/${MY_P}.tar.gz -> ${P}.tar.gz
-	http://git.libssh.org/projects/libssh.git/patch/?id=3880a8ed80a4b1e2c052bd62f328bba2f869d5ae -> ${PN}-0.6.4-libgcrypt_build_fix.patch"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
-SLOT="0/4" # subslot = soname major version
-IUSE="debug doc examples gcrypt gssapi pcap +sftp ssh1 server static-libs test zlib"
-# Maintainer: check IUSE-defaults at DefineOptions.cmake
-
-RDEPEND="
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
-	!gcrypt? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] )
-	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] )
-	gssapi? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	test? ( >=dev-util/cmocka-0.3.1[${MULTILIB_USEDEP}] )
-"
-
-DOCS=( AUTHORS README ChangeLog )
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.5.0-tests.patch
-	"${DISTDIR}"/${P}-libgcrypt_build_fix.patch
-)
-
-src_prepare() {
-	# just install the examples do not compile them
-	sed -i \
-		-e '/add_subdirectory(examples)/s/^/#DONOTWANT/' \
-		CMakeLists.txt || die
-
-	cmake-utils_src_prepare
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_with debug DEBUG_CALLTRACE)
-		$(cmake-utils_use_with debug DEBUG_CRYPTO)
-		$(cmake-utils_use_with gcrypt)
-		$(cmake-utils_use_with gssapi)
-		$(cmake-utils_use_with pcap)
-		$(cmake-utils_use_with server)
-		$(cmake-utils_use_with sftp)
-		$(cmake-utils_use_with ssh1)
-		$(cmake-utils_use_with static-libs STATIC_LIB)
-		$(cmake-utils_use_with test STATIC_LIB)
-		$(cmake-utils_use_with test TESTING)
-		$(cmake-utils_use_with zlib)
-	)
-
-	cmake-utils_src_configure
-}
-
-multilib_src_compile() {
-	cmake-utils_src_compile
-	multilib_is_native_abi && use doc && cmake-utils_src_compile doc
-}
-
-multilib_src_install() {
-	cmake-utils_src_install
-
-	multilib_is_native_abi && use doc && dohtml -r doc/html/.
-
-	use static-libs || rm -f "${D}"/usr/$(get_libdir)/libssh{,_threads}.a
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	if use examples; then
-		docinto examples
-		dodoc examples/*.{c,h,cpp}
-	fi
-}
diff --git a/net-libs/libssh/libssh-0.6.5.ebuild b/net-libs/libssh/libssh-0.6.5.ebuild
index 84375e044e91..f59dc97b2338 100644
--- a/net-libs/libssh/libssh-0.6.5.ebuild
+++ b/net-libs/libssh/libssh-0.6.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh/libssh-0.6.5.ebuild,v 1.5 2015/05/15 11:21:33 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh/libssh-0.6.5.ebuild,v 1.6 2015/05/19 07:24:59 ago Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ SRC_URI="https://red.libssh.org/attachments/download/121/${MY_P}.tar.xz -> ${P}.
 	https://git.libssh.org/projects/libssh.git/patch/?id=6e0dee7845cea22f59bd353ef42b31cb67170030 -> ${PN}-0.6.5-compilefix.patch"
 
 LICENSE="LGPL-2.1"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ppc ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 SLOT="0/4" # subslot = soname major version
 IUSE="debug doc examples gcrypt gssapi pcap +sftp ssh1 server static-libs test zlib"
 # Maintainer: check IUSE-defaults at DefineOptions.cmake
diff --git a/net-libs/libvncserver/libvncserver-0.9.10-r1.ebuild b/net-libs/libvncserver/libvncserver-0.9.10-r1.ebuild
index dd1703cb7c13..b3e548d1bdcd 100644
--- a/net-libs/libvncserver/libvncserver-0.9.10-r1.ebuild
+++ b/net-libs/libvncserver/libvncserver-0.9.10-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libvncserver/libvncserver-0.9.10-r1.ebuild,v 1.4 2015/05/13 05:59:42 jmorgan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libvncserver/libvncserver-0.9.10-r1.ebuild,v 1.5 2015/05/19 07:25:14 ago Exp $
 
 EAPI="5"
 
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/LibVNC/libvncserver/archive/LibVNCServer-${PV}.tar.g
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 IUSE="+24bpp gcrypt gnutls ipv6 +jpeg +png ssl static-libs test threads vaapi +zlib"
 
 DEPEND="
diff --git a/net-mail/dovecot/dovecot-2.2.16-r1.ebuild b/net-mail/dovecot/dovecot-2.2.16-r1.ebuild
index c7406a811efd..9e21b6a54c86 100644
--- a/net-mail/dovecot/dovecot-2.2.16-r1.ebuild
+++ b/net-mail/dovecot/dovecot-2.2.16-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-2.2.16-r1.ebuild,v 1.5 2015/05/15 10:59:51 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-2.2.16-r1.ebuild,v 1.6 2015/05/19 07:22:24 ago Exp $
 
 EAPI=5
 inherit eutils multilib ssl-cert systemd user versionator
@@ -25,7 +25,7 @@ HOMEPAGE="http://www.dovecot.org/"
 
 SLOT="0"
 LICENSE="LGPL-2.1 MIT"
-KEYWORDS="~alpha amd64 ~arm hppa ia64 ppc ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~arm hppa ia64 ppc ppc64 x86"
 
 IUSE_DOVECOT_AUTH="kerberos ldap mysql pam postgres sqlite vpopmail"
 IUSE_DOVECOT_STORAGE="cydir imapc +maildir mbox mdbox pop3c sdbox"
diff --git a/net-proxy/squid/squid-3.5.4.ebuild b/net-proxy/squid/squid-3.5.4.ebuild
index 43eb37ed7b90..a5f13e107841 100644
--- a/net-proxy/squid/squid-3.5.4.ebuild
+++ b/net-proxy/squid/squid-3.5.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.5.4.ebuild,v 1.5 2015/05/13 06:48:12 jmorgan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.5.4.ebuild,v 1.6 2015/05/19 07:22:41 ago Exp $
 
 EAPI=5
 inherit autotools eutils linux-info pam toolchain-funcs user versionator
@@ -11,7 +11,7 @@ SRC_URI="http://www.squid-cache.org/Versions/v3/3.5/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="caps ipv6 pam ldap samba sasl kerberos nis radius ssl snmp selinux logrotate test \
 	ecap esi ssl-crtd \
 	mysql postgres sqlite \
diff --git a/net-wireless/hostapd/hostapd-2.4-r2.ebuild b/net-wireless/hostapd/hostapd-2.4-r2.ebuild
index 6bfde2cc4a0d..d841910c8142 100644
--- a/net-wireless/hostapd/hostapd-2.4-r2.ebuild
+++ b/net-wireless/hostapd/hostapd-2.4-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/hostapd-2.4-r2.ebuild,v 1.3 2015/05/18 08:46:00 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/hostapd-2.4-r2.ebuild,v 1.4 2015/05/19 07:22:46 ago Exp $
 
 EAPI="4"
 
@@ -12,7 +12,7 @@ SRC_URI="http://hostap.epitest.fi/releases/${P}.tar.gz"
 
 LICENSE="|| ( GPL-2 BSD )"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~mips ppc ~x86"
+KEYWORDS="amd64 ~arm ~mips ppc x86"
 IUSE="ipv6 logwatch netlink sqlite +ssl +wps +crda"
 
 DEPEND="ssl? ( dev-libs/openssl[-bindist] )
diff --git a/sys-apps/dtc/dtc-1.4.1.ebuild b/sys-apps/dtc/dtc-1.4.1.ebuild
index 430a196df5b5..7e9dc4ecbed4 100644
--- a/sys-apps/dtc/dtc-1.4.1.ebuild
+++ b/sys-apps/dtc/dtc-1.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dtc/dtc-1.4.1.ebuild,v 1.5 2015/05/15 11:18:57 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dtc/dtc-1.4.1.ebuild,v 1.6 2015/05/19 08:46:40 nimiux Exp $
 
 EAPI="4"
 
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-2
 else
 	SRC_URI="mirror://kernel/software/utils/${PN}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ppc ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 ~x86"
 fi
 
 DESCRIPTION="Open Firmware device tree compiler"
diff --git a/sys-apps/irqbalance/Manifest b/sys-apps/irqbalance/Manifest
index 33622c894c38..2713c27bb9d6 100644
--- a/sys-apps/irqbalance/Manifest
+++ b/sys-apps/irqbalance/Manifest
@@ -3,3 +3,4 @@ DIST irqbalance-1.0.4.tar.bz2 286985 SHA256 15725edf4a6f20258620cbd05ebf02d0c25a
 DIST irqbalance-1.0.5.tar.gz 350213 SHA256 1123e75224b9c0b63ac85892e920bc4a9c76211278ea3d5d4bcbbde44815685c SHA512 333587c16221532be6a353d628b5f8cc557f7917fb423cfac0092f9a5000cc82b042d37b9c3160f5d37d931e8e50a313278e8e30f2dc65f7db60fdf95664bc06 WHIRLPOOL 7fd5e93c0549011c593dbcad9fd9fe94706ac78d4e394a098b0eb63f6de33225f2358aaf84863c662fb392463dfa97777587753df69c041033dee06f91844aa8
 DIST irqbalance-1.0.6.tar.gz 352325 SHA256 95ac79992e6de501f613c781b0fc8aa17a4aaf6a3d865bb6e15ac6a46c6ab1fd SHA512 be14f89c0f137a0cb9c572bc7fb2360941751e4676b147a9d4a44aeb6242577b7dfaa4aa4810ded05244da59fc6d24f22ab88740a8751685a3177b010259a6f0 WHIRLPOOL dcc51bec29eb78a0e9e777a7c5d254ff338390e44dfc4019edb2a1f1eb85f6eafd9bdd7fdc60903b1f94f70194cc1ab1d61cac68da429a009d1f26bee7d357ef
 DIST irqbalance-1.0.7.tar.gz 41209 SHA256 8c3916780d254b74fb1c7ec22876d63ac01f1b32776d9204a604b73c8f591d2a SHA512 388f982fe620d8df850e6e298a194a5ba1393f29f1b25897bfa79e34f3acb32e762b86e31154e7af614d5d84a38a61b85ff07c0dd2032e1eb6b0e30ea9010612 WHIRLPOOL fdbaa8817aae91bc1960115aa457e4dc92b36f62ba7680e9aac35459072d73f2e30015c616c86ce451ac6cd335406ac2423328232768c893e17e17537c3c951e
+DIST irqbalance-1.0.9.tar.gz 44661 SHA256 f1b8115948bb9f0bc36b9d7143ee8be751a294bc189d311408e753acc37169c3 SHA512 ef3ce9eeec11ec86291e2e3cd701e782ee1fb4ba256e2ea5ea0ea04b373f97ff2eae0a44919127c4dbd7fd805e9e3df3a5e62a3528e4d1c9bbab4db39186b5c5 WHIRLPOOL 7bed3d8dd868b4ad697b997143a59b9101815d0bfc08d1d594248c1fcfeaec22045fbe779605583a89aa7d2c8a54e079317bf8a6e4ef8135fc887e2d1518e706
diff --git a/sys-apps/irqbalance/irqbalance-1.0.9.ebuild b/sys-apps/irqbalance/irqbalance-1.0.9.ebuild
new file mode 100644
index 000000000000..cb517735c06c
--- /dev/null
+++ b/sys-apps/irqbalance/irqbalance-1.0.9.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/irqbalance/irqbalance-1.0.9.ebuild,v 1.1 2015/05/19 12:46:33 chainsaw Exp $
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=true
+
+inherit autotools-utils systemd linux-info
+
+DESCRIPTION="Distribute hardware interrupts across processors on a multiprocessor system"
+HOMEPAGE="https://github.com/Irqbalance/irqbalance"
+SRC_URI="https://github.com/Irqbalance/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="caps +numa selinux"
+
+CDEPEND="dev-libs/glib:2
+	caps? ( sys-libs/libcap-ng )
+	numa? ( sys-process/numactl )
+"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig
+"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-irqbalance )
+"
+
+pkg_setup() {
+	CONFIG_CHECK="~PCI_MSI"
+	linux-info_pkg_setup
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_with caps libcap-ng)
+		$(use_enable numa)
+		)
+	autotools-utils_src_configure
+}
+
+src_install() {
+	autotools-utils_src_install
+	newinitd "${FILESDIR}"/irqbalance.init.3 irqbalance
+	newconfd "${FILESDIR}"/irqbalance.confd-1 irqbalance
+	systemd_dounit "${FILESDIR}"/irqbalance.service
+}
diff --git a/sys-block/di/Manifest b/sys-block/di/Manifest
index 4db8fcd78d52..a159789e5748 100644
--- a/sys-block/di/Manifest
+++ b/sys-block/di/Manifest
@@ -1,5 +1,2 @@
-DIST di-4.31.tar.gz 184703 SHA256 148c263a1058f6643bd7e347d8f34e59caa9fcb71d1938f1344b077784f7f8fb SHA512 1386660eb74fb42d02890f0071c449d4308e9c1601b7c9f0a29e5f70bfa675259bba160311e9bae636f927be940dced3c5af81d88ba3e3ff29fdbb00384b70ca WHIRLPOOL 7a9c533d526e7f7a88f737201e3b6bc8df82752a72b525b85bd66210be9ecdc91d015398fc8f6d1b3e8f229c33cadba09fa5c96a7268015884d1a7c660e28991
-DIST di-4.32.tar.gz 212774 SHA256 b6483327484b9bd5a63eb7d3c51bdfa9f5614c06a1fc37b3b05ad710821a0dc8 SHA512 ecd48c241dead0c0e7b5f37759b6103b046226abb3b922e691c24ee60dc3988ffd79e69d5e910dca8ced6fc3193421519d18e8f10767f00b93d8e9e0060f7402 WHIRLPOOL 0a41837eae28778be91711fb79cec9c1415f0de4efda258c780526b429ee0c888a5c7d258448d9481bd4cdb9bfd7ef01f2bfdac6d67b6eaddb75ef43a2c74900
-DIST di-4.33.tar.gz 211519 SHA256 9887921ee518840c06c0372622b8c4e7f2651cbef4a9b14868b1ae23c463bcde SHA512 0f69399b0fee13e7824c6c66218839e7dc2bf803877dd609ccd5b1f569193bcfc8e53a1bd889276209f4d1eb536e6d46782251bc8136d3428b4e45366540d82a WHIRLPOOL 098a61b41441ac736d7e9eef602f9a63b071088036236973a7e24add352ccc7626999526ead1f5c6893a9f0b745cae453d76bf6a42b03c6ac1a1c1af4982378d
-DIST di-4.34.tar.gz 213367 SHA256 c2bdb2aab01da3fadd45037b37e11532316237c8bd8103e9c6307571c5876feb SHA512 34ba4bb800a5153aa1e4a2c2807f4a828e3e76817e2591847f29afcb79c4249ad77fbce0d9ceb00416c14b66cb6cde0daf9c8062d50f5e8cd3ba2a17f55e8f40 WHIRLPOOL 0378bf470a5f817b4c2644ef3dd4c7b28056dfe5d8d5c621deee3196fae82c9ad3123b1f820942a7028efed9ebb5f2641002f500593c479a69125d45bb7b4c62
 DIST di-4.35.tar.gz 212325 SHA256 2cdfface7a85e3a359cb228277b090a0648cabe18520e43b09919bdaf67b71d2 SHA512 5b7e7bd347b1ea285c4410e864f29cf475015a560baf450e558d3f8e1994b10822d6c3e18c04447c6a229d6d5e991194a4a3b155f3b36a8acfee866c8d048cec WHIRLPOOL 2891f70976f5818aa73ec3a07dc4afda678ae02c63b5a018cfb538a78d25f0432d70a7104ef1fe5f6e23e8e5f301430f4cc39b1538a83ea35d1a4748d4e55929
+DIST di-4.36.tar.gz 212957 SHA256 eb03d2ac0a3df531cdcb64b3667dbaebede60a4d3a4626393639cecb954c6d86 SHA512 ce7d38d3e23e68caa70bc85b623b7f4f633e2abf11b5df66b7104be49f1a1b2e64754d51ed00dd9ae629409e2a4760424f781e0351697b077e6aafb64bedad78 WHIRLPOOL 8f2c486d02dbe3f41d74d8a4e1df006ef0fa690bd0e5f3d71c6c47813724a899088fe51da2cdbb5407c27626949b1d048dc0bc1f20a8d964288c0abd8bbdb058
diff --git a/sys-block/di/di-4.31.ebuild b/sys-block/di/di-4.31.ebuild
deleted file mode 100644
index b79573e75f2c..000000000000
--- a/sys-block/di/di-4.31.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/di/di-4.31.ebuild,v 1.6 2012/05/23 00:31:01 jdhore Exp $
-
-EAPI=4
-
-inherit toolchain-funcs eutils
-
-DESCRIPTION="Disk Information Utility"
-HOMEPAGE="http://www.gentoo.com/di/"
-SRC_URI="http://www.gentoo.com/di/${P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
-IUSE=""
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-mkdir.patch
-}
-
-src_compile() {
-	emake prefix=/usr CC="$(tc-getCC)"
-}
-
-src_install() {
-	emake install prefix="${D}/usr"
-	# default symlink is broken
-	dosym di /usr/bin/mi
-	dodoc README
-}
diff --git a/sys-block/di/di-4.32.ebuild b/sys-block/di/di-4.32.ebuild
deleted file mode 100644
index 9f0678da0f4d..000000000000
--- a/sys-block/di/di-4.32.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/di/di-4.32.ebuild,v 1.1 2012/10/24 07:01:52 ssuominen Exp $
-
-EAPI=4
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Disk Information Utility"
-HOMEPAGE="http://www.gentoo.com/di/"
-SRC_URI="http://www.gentoo.com/di/${P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE=""
-
-RESTRICT="test" #405205, #405471
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-4.31-mkdir.patch \
-		"${FILESDIR}"/${PN}-4.32-build.patch
-}
-
-src_compile() {
-	emake prefix=/usr CC="$(tc-getCC)"
-}
-
-src_install() {
-	emake install prefix="${D}/usr"
-	# default symlink is broken
-	dosym di /usr/bin/mi
-	dodoc README
-}
diff --git a/sys-block/di/di-4.34.ebuild b/sys-block/di/di-4.34.ebuild
deleted file mode 100644
index 5ed18e6bd1c1..000000000000
--- a/sys-block/di/di-4.34.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/di/di-4.34.ebuild,v 1.1 2013/01/24 08:48:23 radhermit Exp $
-
-EAPI=4
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Disk Information Utility"
-HOMEPAGE="http://www.gentoo.com/di/"
-SRC_URI="http://www.gentoo.com/di/${P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE=""
-
-RESTRICT="test" #405205, #405471
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-4.33-build.patch
-}
-
-src_configure() {
-	emake checkbuild
-	emake -C C config.h
-}
-
-src_compile() {
-	emake prefix=/usr CC="$(tc-getCC)"
-}
-
-src_install() {
-	emake install prefix="${D}/usr"
-	# default symlink is broken
-	dosym di /usr/bin/mi
-	dodoc README
-}
diff --git a/sys-block/di/di-4.33.ebuild b/sys-block/di/di-4.36.ebuild
similarity index 81%
rename from sys-block/di/di-4.33.ebuild
rename to sys-block/di/di-4.36.ebuild
index d7ae5915f864..76ab6dfa684d 100644
--- a/sys-block/di/di-4.33.ebuild
+++ b/sys-block/di/di-4.36.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/di/di-4.33.ebuild,v 1.1 2013/01/06 21:26:32 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/di/di-4.36.ebuild,v 1.1 2015/05/19 07:33:33 polynomial-c Exp $
 
 EAPI=4
 inherit eutils toolchain-funcs
diff --git a/sys-block/di/files/di-4.31-mkdir.patch b/sys-block/di/files/di-4.31-mkdir.patch
deleted file mode 100644
index 05fc923e7820..000000000000
--- a/sys-block/di/files/di-4.31-mkdir.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- Makefile
-+++ Makefile
-@@ -134,8 +134,8 @@
- 
- .PHONY: install-prog
- install-prog:
--	$(TEST) -d $(INSTALL_DIR) || $(MKDIR) $(INSTALL_DIR)
--	$(TEST) -d $(INSTALL_BIN_DIR) || $(MKDIR) $(INSTALL_BIN_DIR)
-+	$(TEST) -d $(INSTALL_DIR) || $(MKDIR) -p $(INSTALL_DIR)
-+	$(TEST) -d $(INSTALL_BIN_DIR) || $(MKDIR) -p $(INSTALL_BIN_DIR)
- 	$(CP) -f ./$(FROMDIR)/$(PROG)$(EXE_EXT) $(TARGET)
- 	-$(RM) -f $(MTARGET) > /dev/null 2>&1
- 	-$(LN) -s $(PROG)$(EXE_EXT) $(MTARGET)
diff --git a/sys-block/di/files/di-4.32-build.patch b/sys-block/di/files/di-4.32-build.patch
deleted file mode 100644
index 501cdfbe26fc..000000000000
--- a/sys-block/di/files/di-4.32-build.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-These are the first errors occuring:
-
-di.h:82:4: error: unknown type name ‘error’
-di.h:82:19: error: expected ‘=’, ‘,’, ‘;’, ‘asm’ or ‘__attribute__’ before ‘/’ token
-di.h:143:5: error: unknown type name ‘_fs_size_t’
-
-Then there is a lot more errors after above.
-
---- C/di.h
-+++ C/di.h
-@@ -9,6 +9,8 @@
- 
- #include "config.h"
- 
-+#include <string.h>
-+
- /*****************************************************/
- 
- #include <stdio.h>
-@@ -79,7 +81,7 @@
- 
- #if ! _lib_memcpy && ! defined (memcpy)
- # if ! _lib_bcopy
--   error No_memcpy/bcopy_available.
-+   //error No_memcpy/bcopy_available.
- # else
- #  define memcpy(dst, src, cnt)     (bcopy((src), (dst), (cnt)), dst)
- # endif
-@@ -87,7 +89,7 @@
- 
- #if ! _lib_memset && ! defined (memset)
- # if ! _lib_bzero
--   error No_memset/bzero_available.
-+   //error No_memset/bzero_available.
- # else
- #  define memset(s,c,n)    (bzero ((s), (n)), s)
- # endif
diff --git a/sys-block/mbuffer/Manifest b/sys-block/mbuffer/Manifest
index 99ac93c173ba..24e1d582bb37 100644
--- a/sys-block/mbuffer/Manifest
+++ b/sys-block/mbuffer/Manifest
@@ -4,3 +4,4 @@ DIST mbuffer-20120505.tgz 117404 SHA256 c8e828056eef1237b08a0581ba4b99b72f850520
 DIST mbuffer-20121111.tgz 120137 SHA256 38359fc57ffbb874c787f337033c833ebf835bc15f430c59b0481dd1bb653c72 SHA512 0d1fce7d6ecbae48f9f782ad969dc742f5672a243b039a740c4be28f358160bf1dfd6d55f89d8562d9dced2eb33c47b25cb85203d39ac3ba4874d96b19b8e8ca WHIRLPOOL ba191cf461c383828439edf2381b55c62082fb1d7c0b941d93679131a570c00b3abad444c39ec71f5f4ba12563c4ff3325c7c70dfffb24ca146c9aad728b070b
 DIST mbuffer-20130220.tgz 120519 SHA256 1d549c3ac7e29c6064b63195141a61253095831cf5d16f419ae6cc342f12c512 SHA512 c7bc866fa465868ceced68c6089b4c666beee43ce5c79d1d712a0ef75559dc3e12c4809fc46bedfa0b44c4f75131c0770ece3cbb75356c860e441dbdd986b899 WHIRLPOOL 4adb204009555574e785cf5f949c802ee1352c6e3111e3126b21ad747e2ac5faeb3d328796d5eb6362dad786aaf7e823f6fbdef1fa97d2d8c0d3c28928dabb1e
 DIST mbuffer-20140126.tgz 122322 SHA256 33d60e2be120f51c04880c334eb5d38dab31129a181775185f7c83eb333659c8 SHA512 5b23637926e1d1c726fd93c0363fcea860c7636f9cec7a40a0b941baf2038663c19b444fcdfdaada21b911e220b6add1bbe7404b8b8f9fcf1f0eb9a3b36bb0ba WHIRLPOOL b686d5ab76b9e218d8bf03bcf16b03f3248da7bc2bcd41098bb3f49f22b6e806c068d8f2429e04f81699ee0c772854e7ed0d1e04ca41e850e08dd3314a29be18
+DIST mbuffer-20150412.tgz 122935 SHA256 0c78dcb194d1f0316c51f277ea09ec20efd175bbd45f0a3f81bf1202c33301e4 SHA512 cef64f1229872e2207e678aa77dc95e0c24f54e4a88a57a0e797d10b07a16d1f5fa96c8cfa3876ff65dd97c114eff87b683917fa1d39cdb4f08c864325e4223c WHIRLPOOL cdd82ef4d036438b36c4ecc0058e3757116e5f01897eee89870e08e73323dc135accf4d69fc57cac87082a2a78bfb1841af62bced56f93388870bc1c3b8590cd
diff --git a/sys-block/mbuffer/mbuffer-20150412.ebuild b/sys-block/mbuffer/mbuffer-20150412.ebuild
new file mode 100644
index 000000000000..0999a76ad35a
--- /dev/null
+++ b/sys-block/mbuffer/mbuffer-20150412.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-block/mbuffer/mbuffer-20150412.ebuild,v 1.1 2015/05/19 12:55:25 chainsaw Exp $
+
+EAPI="4"
+
+inherit eutils
+
+DESCRIPTION="M(easuring)buffer is a replacement for buffer with additional functionality"
+HOMEPAGE="http://www.maier-komor.de/mbuffer.html"
+SRC_URI="http://www.maier-komor.de/software/mbuffer/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug ssl"
+
+DEPEND="ssl? ( dev-libs/openssl )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	ln -s "${DISTDIR}"/${P}.tgz test.tar #258881
+	# work around "multi off" in /etc/host.conf and "::1 localhost"
+	# *not* being the *first* "localhost" entry in /etc/hosts
+	epatch "${FILESDIR}/${PN}-20121111-resolv-multi-order-issue.patch"
+}
+
+src_configure() {
+	econf \
+		$(use_enable ssl md5) \
+		$(use_enable debug)
+}
diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest
index 2445c23780db..ed319e26019b 100644
--- a/sys-fs/e2fsprogs/Manifest
+++ b/sys-fs/e2fsprogs/Manifest
@@ -1,6 +1,4 @@
 DIST e2fsprogs-1.41.7.tar.gz 4425159 SHA256 2e2eeb5201e952dd02b77f609a0e630acdbce5d2b823ec11668e34f6bfde2f2c SHA512 c17c5f23feb7747941e7f019f197cca1cd4a84c067ad27d1a578ae213c7d7274aa79f3a64c7d69515f3f94db80df01ca71d4af83e9ea84c578a7257205395f7c WHIRLPOOL f760d7e658a1c78835ca470d077c7076a21f727f7d0a2411f5428363d12b7cd1676e2f221be9d9d1f5843c25320f7ef2f896ea47c9d4dc91190e0bc7df89ef36
-DIST e2fsprogs-1.42.10.tar.gz 6126111 SHA256 7b6e85c666d8fdd6062c75ba953de0e5481673bebef5f40f749a52a46476e29f SHA512 9ac99152722af3a9de03cdbb49a3095df59c488978da825527c99c86959a6ef8edd4953a03beba491fd281cb2fc3e917504682e36c3bc7208463812788807826 WHIRLPOOL ecebefeccbb8b68ca816d02a272a882c69daeec70e8ee8260e2c021ce307509225d91da11397627cfd28258a6dcc58dbd3a6e628eb3de3882bdeafb9c99a8e4a
-DIST e2fsprogs-1.42.11.tar.gz 6353078 SHA256 4bd8a770b6925c3f4ec5dce82c55774e4566cd6f3ffb5805177e3c92c8910b76 SHA512 633e686d5bc8d8d195c4522bfa206ef751ba6ab01117338523998caadfecba7fbc47ecb231d0d5518b0deef2fd587c021ad2d8fdb0eeede1ab6c90e28a709615 WHIRLPOOL 4aa1566bbba25e6d3bfb04333f2651ed199f20300a9ab34b6cfe12bdaf4db4a08df1ec95b631b6eda03cda33f87b9c489495a4f4f521daedd7bb1b2fdaf60aae
 DIST e2fsprogs-1.42.12.tar.gz 6381695 SHA256 e17846d91a0edd89fa59b064bde8f8e5cec5851e35f587bcccb4014dbd63186c SHA512 a4b03470ed8f3e6c353250d80807070b8d5529ce219f7ec3076af89bd7cd674fbd443aab4d07dccff74606c9f620e349da32b451e3896a0635f6c700419f7cbf WHIRLPOOL 15f85fe969b174a99f06d875afafc83cc3e85cde0d8f1d833cb045c30259b3bfa9293ee84eeb793d9c60ece2cba4ca6bacbb8c861f11f3b56bd863ca1a2296f2
-DIST e2fsprogs-1.42.7.tar.gz 5981006 SHA256 dc6501b2e75d205e425196d753d92b129c568525d8aad08085c0aa69ee9e7345 SHA512 954dbb832c2614d20cfaa5233033b469f16bf96612cf25074a66da79a5b3abf5eb1b340781e351bde06daf13bbbf5db4643774858aa494b8a8394ea742b6f07b WHIRLPOOL dd48dd13acb485eb8b8646bf4198e45e3ad8e8c6bd53b8186011a1cd2ee4a8ae7db75b6de982fd0d2f9d252f480645bd882cc95d76e614bd8bc10a36755d679c
+DIST e2fsprogs-1.42.13.tar.gz 6511931 SHA256 59993ff3a44f82e504561e0ebf95e8c8fa9f9f5746eb6a7182239605d2a4e2d4 SHA512 d341790f55c3bff34425369063757280b9ba6ac08f405e14f94f299345ae76c0dc6e90871b746cc98c73467448d888fe5bc029688b5eed5fd22c3c37bf285cd0 WHIRLPOOL 2b26e355ad8e378cc7402be5fd5f5abe0af2aa6a1214b357dca682b922aa07c97af427b369ef21ddb3ee731768234a5f5faf488b92a68b0175d07845dbe7783f
 DIST e2fsprogs-1.42.9-mint-r1.patch.xz 9012 SHA256 3904654080b7f7776e97b703d17e1b59ae1d6f5e0cf32193b86e986bc0a9b396 SHA512 591a7c80d65082eebcdc455028be6ade05c9aae96c94f654106be0facef330a8875dae82891e6e3ad2b48dece2b4e1c1940dbc47cd3eba3e6eea3b5ddba9a8fc WHIRLPOOL ae6fc015fa77bfbde7a4ba2205c014b655e736c4ed5cb63a913245c6c40fa0637b65fa3eec6399dd1793c494892b76e0bbc12ffa6ac9c39d4da27333d8bbf6c7
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.42.10.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.42.10.ebuild
deleted file mode 100644
index f6a270cd9d91..000000000000
--- a/sys-fs/e2fsprogs/e2fsprogs-1.42.10.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.42.10.ebuild,v 1.21 2015/02/22 17:18:20 vapier Exp $
-
-EAPI=4
-
-case ${PV} in
-*_pre*) UP_PV="${PV%_pre*}-WIP-${PV#*_pre}" ;;
-*)      UP_PV=${PV} ;;
-esac
-
-inherit autotools eutils flag-o-matic multilib toolchain-funcs
-
-DESCRIPTION="Standard EXT2/EXT3/EXT4 filesystem utilities"
-HOMEPAGE="http://e2fsprogs.sourceforge.net/"
-SRC_URI="mirror://sourceforge/e2fsprogs/${PN}-${UP_PV}.tar.gz"
-
-LICENSE="GPL-2 BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 -x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
-IUSE="nls static-libs elibc_FreeBSD"
-
-RDEPEND="~sys-libs/${PN}-libs-${PV}
-	>=sys-apps/util-linux-2.16
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-	virtual/pkgconfig
-	sys-apps/texinfo"
-
-S=${WORKDIR}/${P%_pre*}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.41.8-makefile.patch
-	epatch "${FILESDIR}"/${PN}-1.40-fbsd.patch
-	epatch "${FILESDIR}"/${P}-e2fsck-fix-makefile-dependency.patch
-	epatch "${FILESDIR}"/${P}-fix-build-cflags.patch
-
-	# blargh ... trick e2fsprogs into using e2fsprogs-libs
-	rm -rf doc
-	sed -i -r \
-		-e 's:@LIBINTL@:@LTLIBINTL@:' \
-		-e '/^(STATIC_)?LIB(COM_ERR|SS)/s:[$][(]LIB[)]/lib([^@]*)@(STATIC_)?LIB_EXT@:-l\1:' \
-		-e '/^DEP(STATIC_)?LIB(COM_ERR|SS)/s:=.*:=:' \
-		MCONFIG.in || die "muck libs" #122368
-	sed -i -r \
-		-e '/^LIB_SUBDIRS/s:lib/(et|ss)::g' \
-		Makefile.in || die "remove subdirs"
-	ln -s $(which mk_cmds) lib/ss/ || die
-
-	# Avoid rebuild
-	echo '#include_next <ss/ss_err.h>' > lib/ss/ss_err.h
-	eautoreconf
-}
-
-src_configure() {
-	# Keep the package from doing silly things #261411
-	export VARTEXFONTS=${T}/fonts
-
-	# needs open64() prototypes and friends
-	append-cppflags -D_GNU_SOURCE
-
-	ac_cv_path_LDCONFIG=: \
-	econf \
-		--with-root-prefix="${EPREFIX}/" \
-		--enable-symlink-install \
-		$(tc-is-static-only || echo --enable-elf-shlibs) \
-		$(tc-has-tls || echo --disable-tls) \
-		--without-included-gettext \
-		$(use_enable nls) \
-		--disable-libblkid \
-		--disable-libuuid \
-		--disable-quota \
-		--disable-fsck \
-		--disable-uuidd
-	if [[ ${CHOST} != *-uclibc ]] && grep -qs 'USE_INCLUDED_LIBINTL.*yes' config.{log,status} ; then
-		eerror "INTL sanity check failed, aborting build."
-		eerror "Please post your ${S}/config.log file as an"
-		eerror "attachment to http://bugs.gentoo.org/show_bug.cgi?id=81096"
-		die "Preventing included intl cruft from building"
-	fi
-}
-
-src_compile() {
-	emake V=1 COMPILE_ET=compile_et MK_CMDS=mk_cmds
-
-	# Build the FreeBSD helper
-	if use elibc_FreeBSD ; then
-		cp "${FILESDIR}"/fsck_ext2fs.c .
-		emake V=1 fsck_ext2fs
-	fi
-}
-
-src_install() {
-	# need to set root_libdir= manually as any --libdir options in the
-	# econf above (i.e. multilib) will screw up the default #276465
-	emake \
-		STRIP=: \
-		root_libdir="${EPREFIX}/usr/$(get_libdir)" \
-		DESTDIR="${D}" \
-		install install-libs
-	dodoc README RELEASE-NOTES
-
-	insinto /etc
-	doins "${FILESDIR}"/e2fsck.conf
-
-	# Move shared libraries to /lib/, install static libraries to
-	# /usr/lib/, and install linker scripts to /usr/lib/.
-	gen_usr_ldscript -a e2p ext2fs
-	# configure doesn't have an option to disable static libs :/
-	use static-libs || find "${D}" -name '*.a' -delete
-
-	if use elibc_FreeBSD ; then
-		# Install helpers for us
-		into /
-		dosbin "${S}"/fsck_ext2fs
-		doman "${FILESDIR}"/fsck_ext2fs.8
-
-		# filefrag is linux only
-		rm \
-			"${ED}"/usr/sbin/filefrag \
-			"${ED}"/usr/share/man/man8/filefrag.8 || die
-	fi
-}
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.42.11.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.42.13.ebuild
similarity index 95%
rename from sys-fs/e2fsprogs/e2fsprogs-1.42.11.ebuild
rename to sys-fs/e2fsprogs/e2fsprogs-1.42.13.ebuild
index 28e7eff19bfc..7fbeb3f08d34 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.42.11.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.42.13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.42.11.ebuild,v 1.6 2015/02/22 17:18:20 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.42.13.ebuild,v 1.1 2015/05/19 09:18:22 polynomial-c Exp $
 
 EAPI=4
 
@@ -37,8 +37,7 @@ src_prepare() {
 	if [[ ${CHOST} == *-mint* ]] ; then
 		epatch "${WORKDIR}"/${PN}-1.42.9-mint-r1.patch
 	fi
-	epatch "${FILESDIR}"/${PN}-1.42.10-fix-build-cflags.patch
-	epatch "${FILESDIR}"/${PN}-1.42.11-prototypes.patch
+	epatch "${FILESDIR}"/${PN}-1.42.13-fix-build-cflags.patch
 
 	# blargh ... trick e2fsprogs into using e2fsprogs-libs
 	rm -rf doc
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.42.7.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.42.7.ebuild
deleted file mode 100644
index f41bb432cee7..000000000000
--- a/sys-fs/e2fsprogs/e2fsprogs-1.42.7.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.42.7.ebuild,v 1.15 2014/01/18 05:15:33 vapier Exp $
-
-EAPI=3
-
-case ${PV} in
-*_pre*) UP_PV="${PV%_pre*}-WIP-${PV#*_pre}" ;;
-*)      UP_PV=${PV} ;;
-esac
-
-inherit eutils flag-o-matic multilib toolchain-funcs
-
-DESCRIPTION="Standard EXT2/EXT3/EXT4 filesystem utilities"
-HOMEPAGE="http://e2fsprogs.sourceforge.net/"
-SRC_URI="mirror://sourceforge/e2fsprogs/${PN}-${UP_PV}.tar.gz"
-
-LICENSE="GPL-2 BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 -x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint"
-IUSE="nls static-libs elibc_FreeBSD"
-
-RDEPEND="~sys-libs/${PN}-libs-${PV}
-	>=sys-apps/util-linux-2.16
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-	virtual/pkgconfig
-	sys-apps/texinfo"
-
-S=${WORKDIR}/${P%_pre*}
-
-pkg_setup() {
-	if [[ ! -e ${EROOT}/etc/mtab ]] ; then
-		# add some crap to deal with missing /etc/mtab #217719
-		ewarn "No /etc/mtab file, creating one temporarily"
-		echo "${PN} crap for src_test" > "${EROOT}"/etc/mtab
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.41.8-makefile.patch
-	epatch "${FILESDIR}"/${PN}-1.40-fbsd.patch
-	epatch "${FILESDIR}"/${PN}-1.41.12-darwin-makefile.patch
-	epatch "${FILESDIR}"/${PN}-1.42.7-libext2fs-fix-return-value.patch #467986
-	if [[ ${CHOST} == *-mint* ]] ; then
-		epatch "${FILESDIR}"/${PN}-1.41-mint.patch
-		epatch "${FILESDIR}"/${PN}-1.41.12-mint-blkid.patch
-	fi
-	# blargh ... trick e2fsprogs into using e2fsprogs-libs
-	rm -rf doc
-	sed -i -r \
-		-e 's:@LIBINTL@:@LTLIBINTL@:' \
-		-e '/^LIB(COM_ERR|SS)/s:[$][(]LIB[)]/lib([^@]*)@LIB_EXT@:-l\1:' \
-		-e '/^DEPLIB(COM_ERR|SS)/s:=.*:=:' \
-		MCONFIG.in || die "muck libs" #122368
-	sed -i -r \
-		-e '/^LIB_SUBDIRS/s:lib/(et|ss)::g' \
-		Makefile.in || die "remove subdirs"
-
-	# Avoid rebuild
-	touch lib/ss/ss_err.h
-}
-
-src_configure() {
-	# Keep the package from doing silly things #261411
-	export VARTEXFONTS=${T}/fonts
-
-	# needs open64() prototypes and friends
-	append-cppflags -D_GNU_SOURCE
-
-	# We want to use the "bsd" libraries while building on Darwin, but while
-	# building on other Gentoo/*BSD we prefer elf-naming scheme.
-	local libtype
-	case ${CHOST} in
-		*-darwin*) libtype=--enable-bsd-shlibs  ;;
-		*-mint*)   libtype=                     ;;
-		*)         libtype=--enable-elf-shlibs  ;;
-	esac
-
-	ac_cv_path_LDCONFIG=: \
-	econf \
-		--with-root-prefix="${EPREFIX}/" \
-		--enable-symlink-install \
-		${libtype} \
-		$(tc-has-tls || echo --disable-tls) \
-		--without-included-gettext \
-		$(use_enable nls) \
-		--disable-libblkid \
-		--disable-libuuid \
-		--disable-quota \
-		--disable-fsck \
-		--disable-uuidd
-	if [[ ${CHOST} != *-uclibc ]] && grep -qs 'USE_INCLUDED_LIBINTL.*yes' config.{log,status} ; then
-		eerror "INTL sanity check failed, aborting build."
-		eerror "Please post your ${S}/config.log file as an"
-		eerror "attachment to http://bugs.gentoo.org/show_bug.cgi?id=81096"
-		die "Preventing included intl cruft from building"
-	fi
-}
-
-src_compile() {
-	emake COMPILE_ET=compile_et MK_CMDS=mk_cmds || die
-
-	# Build the FreeBSD helper
-	if use elibc_FreeBSD ; then
-		cp "${FILESDIR}"/fsck_ext2fs.c .
-		emake fsck_ext2fs || die
-	fi
-}
-
-pkg_preinst() {
-	if [[ -r ${EROOT}/etc/mtab ]] ; then
-		if [[ $(<"${EROOT}"/etc/mtab) == "${PN} crap for src_test" ]] ; then
-			rm -f "${EROOT}"/etc/mtab
-		fi
-	fi
-}
-
-src_install() {
-	# need to set root_libdir= manually as any --libdir options in the
-	# econf above (i.e. multilib) will screw up the default #276465
-	emake \
-		STRIP=: \
-		root_libdir="${EPREFIX}/usr/$(get_libdir)" \
-		DESTDIR="${D}" \
-		install install-libs || die
-	dodoc README RELEASE-NOTES
-
-	insinto /etc
-	doins "${FILESDIR}"/e2fsck.conf || die
-
-	# Move shared libraries to /lib/, install static libraries to
-	# /usr/lib/, and install linker scripts to /usr/lib/.
-	gen_usr_ldscript -a e2p ext2fs
-	# configure doesn't have an option to disable static libs :/
-	use static-libs || find "${D}" -name '*.a' -delete
-
-	if use elibc_FreeBSD ; then
-		# Install helpers for us
-		into /
-		dosbin "${S}"/fsck_ext2fs || die
-		doman "${FILESDIR}"/fsck_ext2fs.8 || die
-
-		# filefrag is linux only
-		rm \
-			"${ED}"/usr/sbin/filefrag \
-			"${ED}"/usr/share/man/man8/filefrag.8 || die
-	fi
-}
diff --git a/sys-fs/e2fsprogs/files/e2fsprogs-1.41-mint.patch b/sys-fs/e2fsprogs/files/e2fsprogs-1.41-mint.patch
deleted file mode 100644
index 43ed92d959c8..000000000000
--- a/sys-fs/e2fsprogs/files/e2fsprogs-1.41-mint.patch
+++ /dev/null
@@ -1,1947 +0,0 @@
-http://bugs.gentoo.org/show_bug.cgi?id=256234
-http://sourceforge.net/tracker/?func=detail&aid=2550325&group_id=2406&atid=302406
-
-diff -ur --new-file e2fsprogs-1.41.3/lib/ext2fs/Makefile.in e2fsprogs-1.41.3-mint/lib/ext2fs/Makefile.in
---- e2fsprogs-1.41.3/lib/ext2fs/Makefile.in	2008-10-07 14:22:39.000000000 +0000
-+++ e2fsprogs-1.41.3-mint/lib/ext2fs/Makefile.in	2009-01-23 10:48:50.000000000 +0000
-@@ -74,7 +74,9 @@
- 	unix_io.o \
- 	unlink.o \
- 	valid_blk.o \
--	version.o
-+	version.o \
-+	mint_io.o \
-+	xhdi.o
- 
- SRCS= ext2_err.c \
- 	$(srcdir)/alloc.c \
-@@ -146,6 +148,8 @@
- 	$(srcdir)/unlink.c \
- 	$(srcdir)/valid_blk.c \
- 	$(srcdir)/version.c \
-+ 	$(srcdir)/mint_io.c \
-+ 	$(srcdir)/xhdi.c \
- 	$(srcdir)/write_bb_file.c
- 
- HFILES= bitops.h ext2fs.h ext2_io.h ext2_fs.h ext2_ext_attr.h ext3_extents.h \
-diff -ur --new-file e2fsprogs-1.41.3/lib/ext2fs/bitops.h e2fsprogs-1.41.3-mint/lib/ext2fs/bitops.h
---- e2fsprogs-1.41.3/lib/ext2fs/bitops.h	2008-10-07 14:22:39.000000000 +0000
-+++ e2fsprogs-1.41.3-mint/lib/ext2fs/bitops.h	2009-01-23 10:47:35.000000000 +0000
-@@ -125,7 +125,7 @@
-  */
- #ifdef NO_INLINE_FUNCS
- #if (defined(__GNUC__) && (defined(__i386__) || defined(__i486__) || \
--			   defined(__i586__) || defined(__mc68000__)))
-+			   defined(__i586__) || defined(__mc68020__)))
- 	/* This prevents bitops.c from trying to include the C */
- 	/* function version of these functions */
- #define _EXT2_HAVE_ASM_BITOPS_
-@@ -246,7 +246,7 @@
- #endif	/* i386 */
- 
- #if ((defined __GNUC__) && !defined(_EXT2_USE_C_VERSIONS_) && \
--     (defined(__mc68000__)))
-+     (defined(__mc68020__)))
- 
- #define _EXT2_HAVE_ASM_BITOPS_
- 
-@@ -280,6 +280,50 @@
- 	return retval;
- }
- 
-+#elif  defined(__mc68000__)
-+
-+#define _EXT2_HAVE_ASM_BITOPS_
-+
-+_INLINE_ int
-+ext2fs_set_bit (unsigned int nr, void *addr)
-+{
-+	int mask, retval;
-+	unsigned char *ADDR = (unsigned char *) addr;
-+	
-+	ADDR += nr >> 3;
-+	mask = 1UL << (nr & 0x07);
-+	retval = (mask & *ADDR) != 0;
-+	*ADDR |= mask;
-+	
-+	return retval;
-+}
-+
-+_INLINE_ int
-+ext2fs_clear_bit (unsigned int nr, void *addr)
-+{
-+	int mask, retval;
-+	unsigned char *ADDR = (unsigned char *) addr;
-+	
-+	ADDR += nr >> 3;
-+	mask = 1UL << (nr & 0x07);
-+	retval = (mask & *ADDR) != 0;
-+	*ADDR &= ~mask;
-+	
-+	return retval;
-+}
-+
-+_INLINE_ int
-+ext2fs_test_bit (unsigned int nr, const void *addr)
-+{
-+	int mask;
-+	const unsigned char *ADDR = (const unsigned char *) addr;
-+	
-+	ADDR += nr >> 3;
-+	mask = 1UL << (nr & 0x07);
-+	
-+	return ((mask & *ADDR) != 0);
-+}
-+
- #endif /* __mc68000__ */
- 
- 
-diff -ur --new-file e2fsprogs-1.41.3/lib/ext2fs/ext2_fs.h e2fsprogs-1.41.3-mint/lib/ext2fs/ext2_fs.h
---- e2fsprogs-1.41.3/lib/ext2fs/ext2_fs.h	2009-01-23 10:01:34.000000000 +0000
-+++ e2fsprogs-1.41.3-mint/lib/ext2fs/ext2_fs.h	2009-01-23 10:49:44.000000000 +0000
-@@ -307,6 +307,7 @@
- #define _IOT_ext2_new_group_input _IOT (_IOTS(__u32), 5, _IOTS(__u16), 2, 0, 0)
- #endif
- 
-+#ifndef __MINT__
- #define EXT2_IOC_GETFLAGS		_IOR('f', 1, long)
- #define EXT2_IOC_SETFLAGS		_IOW('f', 2, long)
- #define EXT2_IOC_GETVERSION		_IOR('v', 1, long)
-@@ -316,6 +317,9 @@
- #define EXT2_IOC_GROUP_EXTEND		_IOW('f', 7, unsigned long)
- #define EXT2_IOC_GROUP_ADD		_IOW('f', 8,struct ext2_new_group_input)
- #define EXT4_IOC_GROUP_ADD		_IOW('f', 8,struct ext4_new_group_input)
-+#else
-+#include <mint/dcntl.h>
-+#endif
- 
- /*
-  * Structure of an inode on the disk
-diff -ur --new-file e2fsprogs-1.41.3/lib/ext2fs/getsize.c e2fsprogs-1.41.3-mint/lib/ext2fs/getsize.c
---- e2fsprogs-1.41.3/lib/ext2fs/getsize.c	2008-10-07 14:22:39.000000000 +0000
-+++ e2fsprogs-1.41.3-mint/lib/ext2fs/getsize.c	2009-01-23 10:47:35.000000000 +0000
-@@ -58,6 +58,11 @@
- #define BLKGETSIZE DKIOCGETBLOCKCOUNT32
- #endif /* APPLE_DARWIN */
- 
-+#ifdef __MINT__
-+#include <sys/ioctl.h>
-+#include "mint_io.h"
-+#endif
-+
- #include "ext2_fs.h"
- #include "ext2fs.h"
- 
-diff -ur --new-file e2fsprogs-1.41.3/lib/ext2fs/llseek.c e2fsprogs-1.41.3-mint/lib/ext2fs/llseek.c
---- e2fsprogs-1.41.3/lib/ext2fs/llseek.c	2008-10-07 14:22:39.000000000 +0000
-+++ e2fsprogs-1.41.3-mint/lib/ext2fs/llseek.c	2009-01-23 10:47:35.000000000 +0000
-@@ -115,6 +115,8 @@
- 
- #else /* !linux */
- 
-+#ifndef __MINT__
-+
- #ifndef EINVAL
- #define EINVAL EXT2_ET_INVALID_ARGUMENT
- #endif
-@@ -133,6 +135,8 @@
- #endif
- }
- 
-+#endif /* __MINT__ */
-+
- #endif 	/* linux */
- 
- 
-diff -ur --new-file e2fsprogs-1.41.3/lib/ext2fs/mint_io.c e2fsprogs-1.41.3-mint/lib/ext2fs/mint_io.c
---- e2fsprogs-1.41.3/lib/ext2fs/mint_io.c	1970-01-01 00:00:00.000000000 +0000
-+++ e2fsprogs-1.41.3-mint/lib/ext2fs/mint_io.c	2009-01-23 10:49:51.000000000 +0000
-@@ -0,0 +1,858 @@
-+/*
-+ * $Id: e2fsprogs-1.41-mint.patch,v 1.1 2010/11/19 18:49:02 jlec Exp $
-+ * 
-+ * This file belongs to FreeMiNT. It's not in the original MiNT 1.12
-+ * distribution. See the file CHANGES for a detailed log of changes.
-+ * 
-+ * 
-+ * Copyright 2000 Frank Naumann <fnaumann@freemint.de>
-+ * All rights reserved.
-+ * 
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2, or (at your option)
-+ * any later version.
-+ * 
-+ * This file is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ * 
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-+ * 
-+ * 
-+ * Author: Frank Naumann <fnaumann@freemint.de>
-+ * Started: 200-06-14
-+ * 
-+ * Please send suggestions, patches or bug reports to me or
-+ * the MiNT mailing list.
-+ * 
-+ */
-+
-+# ifdef __MINT__
-+
-+# include <assert.h>
-+# include <ctype.h>
-+# include <errno.h>
-+# include <fcntl.h>
-+# include <limits.h>
-+# include <stdarg.h>
-+# include <stdlib.h>
-+# include <stdio.h>
-+# include <string.h>
-+# include <time.h>
-+# include <unistd.h>
-+
-+# include "et/com_err.h"
-+# include "ext2fs/ext2_io.h"
-+# include <sys/ioctl.h>
-+# include <sys/stat.h>
-+# define loff_t ext2_loff_t
-+# define llseek ext2fs_llseek
-+
-+# include <mintbind.h>
-+# include "mint_io.h"
-+# include "xhdi.h"
-+
-+
-+# if 0
-+# define DEBUG(x)	printf x
-+# else
-+# define DEBUG(x)
-+# endif
-+
-+
-+/* prototypes */
-+
-+int __open_v(const char *_filename, int iomode, va_list argp);
-+
-+int open(__const char *__file, int __oflag, ...) __THROW;
-+int __open(__const char *__file, int __oflag, ...) __THROW;
-+
-+int ioctl(int fd, int cmd, void *arg);
-+int __ioctl(int fd, int cmd, void *arg);
-+
-+int fsync(int __fd) __THROW;
-+int __fsync(int __fd) __THROW;
-+
-+__off_t lseek(int __fd, __off_t __offset, int __whence) __THROW;
-+__off_t __lseek(int __fd, __off_t __offset, int __whence) __THROW;
-+
-+int close(int __fd) __THROW;
-+int __close(int __fd) __THROW;
-+
-+ssize_t read(int __fd, void *__buf, size_t __nbytes) __THROW;
-+ssize_t __read(int __fd, void *__buf, size_t __nbytes) __THROW;
-+
-+ssize_t write(int __fd, __const void *__buf, size_t __n) __THROW;
-+ssize_t __write(int __fd, __const void *__buf, size_t __n) __THROW;
-+
-+int fstat(int __fd, struct stat *__buf) __THROW;
-+int __fstat(int __fd, struct stat *__buf) __THROW;
-+
-+int stat(const char *filename, struct stat *st) __THROW;
-+
-+
-+struct device
-+{
-+	int used;
-+	
-+	int drv;
-+	int open_flags;
-+	
-+	ushort xhdi_maj;
-+	ushort xhdi_min;
-+	ulong xhdi_start;
-+	ulong xhdi_blocks;
-+	ulong xhdi_blocksize;
-+	char xhdi_id[4];
-+	
-+	loff_t pos;
-+};
-+
-+# define DEVS 16
-+static struct device devs[DEVS];
-+
-+static void
-+init_device(struct device *dev)
-+{
-+	dev->used = 0;
-+	
-+	dev->drv = -1;
-+	dev->open_flags = 0;
-+	dev->xhdi_maj = 0;
-+	dev->xhdi_min = 0;
-+	dev->xhdi_start = 0;
-+	dev->xhdi_blocks = 0;
-+	dev->xhdi_blocksize = 0;
-+	
-+	dev->pos = 0;
-+}
-+
-+static inline void
-+init(void)
-+{
-+	static int done = 0;
-+	int i;
-+	
-+	if (done)
-+		return;
-+	
-+	assert(sizeof(loff_t) == sizeof(long long));
-+	
-+	for (i = 0; i < DEVS; i++)
-+		init_device (&devs[i]);
-+	
-+	init_XHDI();
-+	
-+	/* we are now initialized */
-+	done = 1;
-+}
-+
-+static struct device *
-+get_device(int fd)
-+{
-+	struct device *dev;
-+	
-+	if ((fd < 1024) || (fd >= (1024 + DEVS)))
-+		return NULL;
-+	
-+	fd -= 1024;
-+	dev = &devs[fd];
-+	
-+	assert(dev->used);
-+	
-+	return dev;
-+}
-+
-+static int
-+alloc_device(void)
-+{
-+	int i;
-+	
-+	for (i = 0; i < DEVS; i++)
-+	{
-+		struct device *dev = &devs[i];
-+		
-+		if (!dev->used)
-+		{
-+			dev->used = 1;
-+			return (i + 1024);
-+		}
-+	}
-+	
-+	__set_errno(ENOMEM);
-+	return -1;
-+}
-+
-+static void
-+free_device(struct device *dev)
-+{
-+	assert(dev->used);
-+	
-+	init_device (dev);
-+}
-+
-+
-+int
-+open(const char *filename, int iomode, ...)
-+{
-+	const char *f = filename;
-+	struct device *mydev = NULL;
-+	int dev = -1;
-+	long ret;
-+	
-+	init();
-+	
-+	if (!filename)
-+	{
-+		__set_errno(EINVAL);
-+		return -1;
-+	}
-+	
-+	if ((f[1] == ':') && (f[2] == '\0'))
-+	{
-+		int c = tolower(f[0]);
-+		
-+		if (c >= 'a' && c <= 'z')
-+			c = c - 'a';
-+		else if (c >= '1' && c <= '6')
-+			c = 26 + (c - '1');
-+		
-+		if ((c >= 0) && (c < 32))
-+		{
-+			dev = alloc_device();
-+			if (dev != -1)
-+			{
-+				mydev = get_device(dev);
-+				assert(mydev);
-+				
-+				mydev->drv = c;
-+				mydev->open_flags = iomode;
-+			}
-+		}
-+	}
-+	
-+	if (dev == -1)
-+	{
-+		/* fall through */
-+		
-+		va_list args;
-+		int retval;
-+		
-+		va_start(args, iomode);
-+		retval = __open_v(filename, iomode, args);
-+		va_end(args);
-+		
-+		return retval;
-+	}
-+	
-+	if (mydev->open_flags == O_RDONLY)
-+	{
-+		DEBUG(("readonly mode!\n"));
-+		sync();
-+	}
-+	else if (Dlock(1, mydev->drv))
-+	{
-+		printf("Can't lock partition %c:!\n", mydev->drv+'A');
-+		
-+		if (mydev)
-+			free_device(mydev);
-+		
-+		__set_errno(EACCES);
-+		return -1;
-+	}
-+	
-+	__set_errno(EERROR);
-+	
-+	ret = XHGetVersion ();
-+	DEBUG(("XHDI version: %lx\n", ret));
-+	
-+	ret = XHInqDev2(mydev->drv,
-+			&mydev->xhdi_maj, &mydev->xhdi_min,
-+			&mydev->xhdi_start, NULL,
-+			&mydev->xhdi_blocks, mydev->xhdi_id);
-+	if (ret)
-+	{
-+		printf("XHInqDev2 [%c] fail (ret = %li, errno = %i)\n",
-+			mydev->drv+'A', ret, errno);
-+		ret = -1;
-+	}
-+	else
-+	{
-+		ret = XHInqTarget(mydev->xhdi_maj, mydev->xhdi_min,
-+				  &mydev->xhdi_blocksize, NULL, NULL);
-+		if (ret)
-+		{
-+			printf("XHInqTarget [%i:%i] fail (ret = %li, errno = %i)\n",
-+				mydev->xhdi_maj, mydev->xhdi_min, ret, errno);
-+			ret = -1;
-+		}
-+		else
-+		{
-+			char *xhdi_id = mydev->xhdi_id;
-+			
-+			if (       0
-+			        || ((xhdi_id[0] == 'G') && (xhdi_id[1] == 'E') && (xhdi_id[2] == 'M')) /* GEM */
-+				|| ((xhdi_id[0] == 'B') && (xhdi_id[1] == 'G') && (xhdi_id[2] == 'M')) /* BGM */
-+				|| ((xhdi_id[0] == 'F') && (xhdi_id[1] == '3') && (xhdi_id[2] == '2')) /* F32 */
-+				|| ((xhdi_id[0] == 'M') && (xhdi_id[1] == 'I') && (xhdi_id[2] == 'X')) /* MIX */
-+				|| ((xhdi_id[0] == 'R') && (xhdi_id[1] == 'A') && (xhdi_id[2] == 'W')) /* RAW */
-+				|| ((xhdi_id[0] == 'L') && (xhdi_id[1] == 'N') && (xhdi_id[2] == 'X')) /* LNX */
-+				|| ((xhdi_id[0] == '\0') && (xhdi_id[1] == 'D')))                  /* any DOS */
-+			{
-+				DEBUG(("Partition ok and accepted!\n"));
-+				DEBUG(("start = %lu, blocks = %lu, blocksize = %lu\n",
-+					mydev->xhdi_start, mydev->xhdi_blocks,
-+					mydev->xhdi_blocksize));
-+			}
-+			else
-+			{
-+				xhdi_id [3] = '\0';
-+				printf("Wrong partition ID [%s]!\n", xhdi_id);
-+				printf("Only 'RAW', 'LNX' and DOS partitions are supported.\n");
-+				
-+				__set_errno(EPERM);
-+				ret = -1;
-+			}
-+		}
-+	}
-+	
-+	if (ret)
-+	{
-+		if (mydev)
-+			free_device(mydev);
-+		
-+		dev = -1;
-+	}
-+	
-+	return dev;
-+}
-+
-+int
-+close(int fd)
-+{
-+	struct device *mydev = get_device(fd);
-+	int ret = 0;
-+	
-+	if (!mydev)
-+		/* fall through */
-+		return __close(fd);
-+	
-+	if (mydev->open_flags == O_RDONLY)
-+	{
-+		;
-+	}
-+	else if (Dlock(0, mydev->drv))
-+	{
-+		printf("Can't unlock partition %c:!\n", 'A'+mydev->drv);
-+		
-+		__set_errno(EACCES);
-+		ret = -1;
-+	}
-+	
-+	free_device(mydev);
-+	return ret;
-+}
-+
-+/* simple buffer */
-+static char buffer[1024L * 128];
-+static ulong buf_recno = 0;
-+static long buf_n = 0;
-+
-+static long
-+rwabs_xhdi(struct device *mydev, ushort rw, void *buf, ulong size, ulong recno)
-+{
-+	ulong n = size / mydev->xhdi_blocksize;
-+	long r;
-+	
-+	assert((size % mydev->xhdi_blocksize) == 0);
-+	
-+	if (!n || (recno + n) > mydev->xhdi_blocks)
-+	{
-+		printf("rwabs_xhdi: access outside partition (drv = %c:)\n", 'A'+mydev->drv);
-+		exit(2);
-+	}
-+	
-+	if (n > 65535UL)
-+	{
-+		printf("rwabs_xhdi: n to large (drv = %c)\n", 'A'+mydev->drv);
-+		exit(2);
-+	}
-+	
-+	if (!rw && (buf_recno == recno) && (buf_n == n))
-+	{
-+		bcopy(buffer, buf, buf_n * mydev->xhdi_blocksize);
-+		return 0;
-+	}
-+	
-+	r = XHReadWrite (mydev->xhdi_maj, mydev->xhdi_min, rw, mydev->xhdi_start + recno, n, buf);
-+	
-+	if (!r && (n * mydev->xhdi_blocksize) <= sizeof(buffer))
-+	{
-+		bcopy(buf, buffer, n * mydev->xhdi_blocksize);
-+		
-+		buf_recno = recno;
-+		buf_n = n;
-+	}
-+	else
-+		buf_n = 0;
-+	
-+	return r;
-+}
-+
-+# define max(a,b)	(a > b ? a : b)
-+# define min(a,b)	(a > b ? b : a)
-+
-+int
-+read(int fd, void *_buf, size_t size)
-+{
-+	struct device *mydev = get_device(fd);
-+	
-+	if (!mydev)
-+		/* fall through */
-+		return __read(fd, _buf, size);
-+		
-+{
-+	char *buf = _buf;
-+	long todo;		/* characters remaining */
-+	long done;		/* characters processed */
-+	
-+	todo = size;
-+	done = 0;
-+	
-+	if (todo == 0)
-+		return 0;
-+	
-+	/* partial block copy
-+	 */
-+	if (mydev->pos % mydev->xhdi_blocksize)
-+	{
-+		char tmp[mydev->xhdi_blocksize];
-+		
-+		ulong recno = mydev->pos / mydev->xhdi_blocksize;
-+		ulong offset = mydev->pos % mydev->xhdi_blocksize;
-+		ulong data;
-+		long ret;
-+		
-+		ret = rwabs_xhdi(mydev, 0, tmp, mydev->xhdi_blocksize, recno);
-+		if (ret)
-+		{
-+			DEBUG(("read: partial part: read failure (r = %li, errno = %i)\n", ret, errno));
-+			goto out;
-+		}
-+		
-+		data = mydev->xhdi_blocksize - offset;
-+		data = min (todo, data);
-+		
-+		memcpy(buf, tmp + offset, data);
-+		
-+		buf += data;
-+		todo -= data;
-+		done += data;
-+		mydev->pos += data;
-+	}
-+	
-+	if (todo)
-+	{
-+		assert((todo > 0));
-+		assert((mydev->pos % mydev->xhdi_blocksize) == 0);
-+	}
-+	
-+	
-+	/* full blocks
-+	 */
-+	if (todo / mydev->xhdi_blocksize)
-+	{
-+		ulong recno = mydev->pos / mydev->xhdi_blocksize;
-+		ulong data = (todo / mydev->xhdi_blocksize) * mydev->xhdi_blocksize;
-+		long ret;
-+		
-+		ret = rwabs_xhdi (mydev, 0, buf, data, recno);
-+		if (ret)
-+		{
-+			DEBUG(("read: full blocks: read failure (r = %li, errno = %i)\n", ret, errno));
-+			goto out;
-+		}
-+		
-+		buf += data;
-+		todo -= data;
-+		done += data;
-+		mydev->pos += data;
-+	}
-+	
-+	if (todo)
-+	{
-+		assert((todo > 0) && (todo < mydev->xhdi_blocksize));
-+		assert((mydev->pos % mydev->xhdi_blocksize) == 0);
-+	}
-+	
-+	/* anything left?
-+	 */
-+	if (todo)
-+	{
-+		char tmp[mydev->xhdi_blocksize];
-+		
-+		ulong recno = mydev->pos / mydev->xhdi_blocksize;
-+		long ret;
-+		
-+		ret = rwabs_xhdi (mydev, 0, tmp, mydev->xhdi_blocksize, recno);
-+		if (ret)
-+		{
-+			DEBUG(("read: left part: read failure (r = %li, errno = %i)]\n", ret, errno));
-+			goto out;
-+		}
-+		
-+		memcpy(buf, tmp, todo);
-+		
-+		done += todo;
-+		mydev->pos += todo;
-+	}
-+	
-+	assert(done == size);
-+	
-+out:
-+	return done;
-+}
-+}
-+
-+int
-+write(int fd, const void *_buf, size_t size)
-+{
-+	struct device *mydev = get_device(fd);
-+	
-+	if (!mydev)
-+		/* fall through */
-+		return __write(fd, _buf, size);
-+	
-+	if (mydev->open_flags == O_RDONLY)
-+	{
-+		__set_errno(EPERM);
-+		return -1;
-+	}
-+{
-+	const char *buf = _buf;
-+	long todo;		/* characters remaining */
-+	long done;		/* characters processed */
-+	
-+	todo = size;
-+	done = 0;
-+	
-+	if (todo == 0)
-+		return 0;
-+	
-+	/* partial block copy
-+	 */
-+	if (mydev->pos % mydev->xhdi_blocksize)
-+	{
-+		char tmp[mydev->xhdi_blocksize];
-+		
-+		ulong recno = mydev->pos / mydev->xhdi_blocksize;
-+		ulong offset = mydev->pos % mydev->xhdi_blocksize;
-+		ulong data;
-+		long ret;
-+		
-+		ret = rwabs_xhdi(mydev, 0, tmp, mydev->xhdi_blocksize, recno);
-+		if (ret)
-+		{
-+			DEBUG(("write: partial part: read failure (r = %li, errno = %i)\n", ret, errno));
-+			goto out;
-+		}
-+		
-+		data = mydev->xhdi_blocksize - offset;
-+		data = min (todo, data);
-+		
-+		memcpy(tmp + offset, buf, data);
-+		
-+		ret = rwabs_xhdi(mydev, 1, tmp, mydev->xhdi_blocksize, recno);
-+		if (ret)
-+		{
-+			DEBUG(("write: partial part: write failure (r = %li, errno = %i)\n", ret, errno));
-+			goto out;
-+		}
-+		
-+		buf += data;
-+		todo -= data;
-+		done += data;
-+		mydev->pos += data;
-+	}
-+	
-+	if (todo)
-+	{
-+		assert((todo > 0));
-+		assert((mydev->pos % mydev->xhdi_blocksize) == 0);
-+	}
-+	
-+	/* full blocks
-+	 */
-+	if (todo / mydev->xhdi_blocksize)
-+	{
-+		ulong recno = mydev->pos / mydev->xhdi_blocksize;
-+		ulong data = (todo / mydev->xhdi_blocksize) * mydev->xhdi_blocksize;
-+		long ret;
-+		
-+		ret = rwabs_xhdi(mydev, 1, (void *)buf, data, recno);
-+		if (ret)
-+		{
-+			DEBUG(("write: full blocks: write failure (r = %li, errno = %i)\n", ret, errno));
-+			goto out;
-+		}
-+		
-+		buf += data;
-+		todo -= data;
-+		done += data;
-+		mydev->pos += data;
-+	}
-+	
-+	if (todo)
-+	{
-+		assert((todo > 0) && (todo < mydev->xhdi_blocksize));
-+		assert((mydev->pos % mydev->xhdi_blocksize) == 0);
-+	}
-+	
-+	/* anything left?
-+	 */
-+	if (todo)
-+	{
-+		char tmp[mydev->xhdi_blocksize];
-+		
-+		ulong recno = mydev->pos / mydev->xhdi_blocksize;
-+		long ret;
-+		
-+		ret = rwabs_xhdi(mydev, 0, tmp, mydev->xhdi_blocksize, recno);
-+		if (ret)
-+		{
-+			DEBUG(("write: left part: read failure (r = %li, errno = %i)]\n", ret, errno));
-+			goto out;
-+		}
-+		
-+		memcpy(tmp, buf, todo);
-+		
-+		ret = rwabs_xhdi(mydev, 1, tmp, mydev->xhdi_blocksize, recno);
-+		if (ret)
-+		{
-+			DEBUG(("write: partial part: write failure (r = %li, errno = %i)\n", ret, errno));
-+			goto out;
-+		}
-+		
-+		done += todo;
-+		mydev->pos += todo;
-+	}
-+	
-+	assert(done == size);
-+	
-+out:
-+	return done;
-+}
-+}
-+
-+int
-+ioctl(int fd, int cmd, void *arg)
-+{
-+	struct device *mydev = get_device(fd);
-+	
-+	if (!mydev)
-+		/* fall through */
-+		return __ioctl(fd, cmd, arg);
-+	
-+	DEBUG(("ioctl: cmd = %i\n", cmd));
-+	
-+	switch (cmd)
-+	{
-+		case BLKGETSIZE:
-+		{
-+			ulong *size = arg;
-+			*size = mydev->xhdi_blocks * (mydev->xhdi_blocksize / 512);
-+			break;
-+		}
-+		case BLOCKSIZE:
-+		{
-+			ulong *block_size = arg;
-+			*block_size = mydev->xhdi_blocksize;
-+			break;
-+		}
-+		default:
-+			__set_errno(EINVAL);
-+			return -1;
-+	}
-+	
-+	return 0;
-+}
-+
-+int
-+fstat(int fd, struct stat *st)
-+{
-+	struct device *mydev = get_device(fd);
-+	
-+	if (!mydev)
-+		/* fall through */
-+		return __fstat(fd, st);
-+	
-+	bzero(st, sizeof(*st));
-+	
-+	st->st_dev	= mydev->xhdi_maj;
-+	st->st_ino	= mydev->drv;
-+	st->st_mode	= S_IFBLK | S_IRUSR | S_IWUSR;
-+	st->st_nlink	= 1;
-+	st->st_uid	= 0;
-+	st->st_gid	= 0;
-+	st->st_rdev	= mydev->xhdi_min;
-+	st->st_atime	= time (NULL);
-+	st->st_mtime	= time (NULL);
-+	st->st_ctime	= time (NULL);
-+	st->st_size	= (int64_t) mydev->xhdi_blocks * mydev->xhdi_blocksize;
-+	st->st_blocks	= (int64_t) mydev->xhdi_blocks * mydev->xhdi_blocksize / 512;
-+	st->st_blksize	= mydev->xhdi_blocksize;
-+	st->st_flags	= 0;
-+	st->st_gen	= 0;
-+	
-+	return 0;
-+}
-+
-+int
-+stat(const char *filename, struct stat *st)
-+{
-+	struct device *mydev;
-+	int fd, res;
-+	
-+	fd = open(filename, O_RDONLY);
-+	if (fd == -1)
-+		return -1;
-+
-+	mydev = get_device(fd);
-+	if (!mydev)
-+	{
-+		close(fd);
-+		
-+		/* fall through */
-+		return __stat(filename, st);
-+	}
-+	
-+	res = fstat(fd, st); 
-+	close(fd);
-+	
-+	return res;
-+}
-+
-+int
-+fsync(int fd)
-+{
-+	struct device *mydev = get_device(fd);
-+	
-+	if (!mydev)
-+		/* fall through */
-+		return __fsync(fd);
-+	
-+	/* nothing todo */
-+	return 0;
-+}
-+
-+loff_t llseek(int fd, loff_t offset, int origin);
-+
-+loff_t
-+llseek(int fd, loff_t offset, int origin)
-+{
-+	struct device *mydev = get_device(fd);
-+	
-+	if (!mydev)
-+		/* fall through */
-+		return __lseek(fd, (off_t) offset, origin);
-+	
-+	
-+	switch (origin)
-+	{
-+		case SEEK_SET:
-+			break;
-+		case SEEK_CUR:
-+			offset += mydev->pos;
-+			break;
-+		case SEEK_END:
-+			offset += (int64_t) mydev->xhdi_blocks * mydev->xhdi_blocksize;
-+			break;
-+		default:
-+			return -1;
-+	}
-+	
-+	if (offset > (loff_t) mydev->xhdi_blocks * mydev->xhdi_blocksize)
-+	{
-+		__set_errno(EINVAL);
-+		return -1;
-+	}
-+	
-+	mydev->pos = offset;
-+	return mydev->pos;
-+}
-+
-+loff_t lseek64(int fd, loff_t offset, int origin);
-+
-+loff_t
-+lseek64(int fd, loff_t offset, int origin)
-+{
-+	return llseek(fd, offset, origin);
-+}
-+
-+__off_t
-+lseek(int fd, __off_t offset, int mode)
-+{
-+	struct device *mydev = get_device(fd);
-+	
-+	if (!mydev)
-+		/* fall through */
-+		return __lseek(fd, offset, mode);
-+	
-+{
-+	loff_t _offset = offset;
-+	
-+	switch (mode)
-+	{
-+		case SEEK_SET:
-+			break;
-+		case SEEK_CUR:
-+			_offset += mydev->pos;
-+			break;
-+		case SEEK_END:
-+			_offset += (loff_t) mydev->xhdi_blocks * mydev->xhdi_blocksize;
-+			break;
-+		default:
-+			return -1;
-+	}
-+	
-+	if (_offset > LONG_MAX)
-+	{
-+		__set_errno(EINVAL);
-+		return -1;
-+	}
-+	
-+	if (_offset > (loff_t) mydev->xhdi_blocks * mydev->xhdi_blocksize)
-+	{
-+		__set_errno(EINVAL);
-+		return -1;
-+	}
-+	
-+	mydev->pos = _offset;
-+	return (off_t) mydev->pos;
-+}
-+}
-+
-+int gettype(int fd);
-+
-+int
-+gettype(int fd)
-+{
-+	struct device *mydev = get_device(fd);
-+	char *xhdi_id;
-+	
-+	if (!mydev)
-+		return -1;
-+
-+	/* Get filesystem type by XHDI ID */
-+	xhdi_id = mydev->xhdi_id;
-+	if ((xhdi_id[0] == '\0') && (xhdi_id[1] == 'D'))
-+		return 0;   /* DOS (\0D*) */
-+	else
-+		return 1;   /* Atari (GEM/GBM) */
-+}
-+
-+# endif /* __MINT__ */
-diff -ur --new-file e2fsprogs-1.41.3/lib/ext2fs/mint_io.h e2fsprogs-1.41.3-mint/lib/ext2fs/mint_io.h
---- e2fsprogs-1.41.3/lib/ext2fs/mint_io.h	1970-01-01 00:00:00.000000000 +0000
-+++ e2fsprogs-1.41.3-mint/lib/ext2fs/mint_io.h	2009-01-23 10:49:53.000000000 +0000
-@@ -0,0 +1,22 @@
-+/*
-+ * mint_io.h
-+ *
-+ * Copyright (C) 2000 Frank Naumann <fnaumann@freemint.de>.
-+ *
-+ * %Begin-Header%
-+ * This file may be redistributed under the terms of the GNU Public
-+ * License.
-+ * %End-Header%
-+ */
-+
-+# ifdef __MINT__
-+
-+# ifndef _mint_io_h
-+# define _mint_io_h
-+
-+# define BLKGETSIZE		(('b'<< 8) | 1)
-+# define BLOCKSIZE		(('b'<< 8) | 2)
-+
-+# endif /* _mint_io_h */
-+
-+# endif /* __MINT__ */
-diff -ur --new-file e2fsprogs-1.41.3/lib/ext2fs/unix_io.c e2fsprogs-1.41.3-mint/lib/ext2fs/unix_io.c
---- e2fsprogs-1.41.3/lib/ext2fs/unix_io.c	2008-10-13 03:12:22.000000000 +0000
-+++ e2fsprogs-1.41.3-mint/lib/ext2fs/unix_io.c	2009-01-23 10:47:35.000000000 +0000
-@@ -51,9 +51,15 @@
- #define BLKROGET   _IO(0x12, 94) /* Get read-only status (0 = read_write).  */
- #endif
- 
-+#ifdef __MINT__
-+#include <sys/ioctl.h>
-+#include "mint_io.h"
-+#endif
-+
- #include "ext2_fs.h"
- #include "ext2fs.h"
- 
-+
- /*
-  * For checking structure magic numbers...
-  */
-@@ -512,6 +518,16 @@
- 		}
- 	}
- #endif
-+	
-+#ifdef __MINT__
-+	{
-+		unsigned long block_size;
-+		retval = ioctl(data->dev, BLOCKSIZE, &block_size);
-+		if (retval == 0)
-+			io->block_size = block_size;
-+	}
-+#endif
-+	
- 	*channel = io;
- 	return 0;
- 
-diff -ur --new-file e2fsprogs-1.41.3/lib/ext2fs/xhdi.c e2fsprogs-1.41.3-mint/lib/ext2fs/xhdi.c
---- e2fsprogs-1.41.3/lib/ext2fs/xhdi.c	1970-01-01 00:00:00.000000000 +0000
-+++ e2fsprogs-1.41.3-mint/lib/ext2fs/xhdi.c	2009-01-23 10:49:55.000000000 +0000
-@@ -0,0 +1,577 @@
-+/*
-+ * Copyright 2000 Frank Naumann <fnaumann@freemint.de>
-+ * All rights reserved.
-+ * 
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2, or (at your option)
-+ * any later version.
-+ * 
-+ * This file is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ * 
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-+ * 
-+ * 
-+ * Started:      2000-05-02
-+ * 
-+ * Changes:
-+ * 
-+ * 0.1:
-+ * 
-+ * fix: Cookie handling stuff; use Getcookie from MiNT-Lib now
-+ *      requires an actual MiNT-Lib (>= PL49)
-+ * 
-+ * 0.0:
-+ * 
-+ * - inital version
-+ * 
-+ */
-+
-+# include "xhdi.h"
-+
-+# include <stdio.h>
-+# include <stdlib.h>
-+# include <errno.h>
-+# include <mintbind.h>
-+# include <mint/cookie.h>
-+
-+
-+/*
-+ * internal usage
-+ */
-+
-+/* dummy routine */
-+static long
-+XHDIfail (void)
-+{
-+	return -ENOSYS;
-+}
-+
-+/* XHDI handler function */
-+static long (*XHDI)() = XHDIfail;
-+
-+ushort XHDI_installed = 0;
-+
-+
-+# define C_XHDI		0x58484449L
-+# define XHDIMAGIC	0x27011992L
-+
-+/* initalize flag */
-+static ushort init = 1;
-+
-+long
-+init_XHDI (void)
-+{
-+	long *val;
-+	long r;
-+	
-+	init = 0;
-+	
-+	r = Getcookie (C_XHDI, (long *) &val);
-+	if (r == C_FOUND)
-+	{
-+		long *magic_test = val;
-+		
-+		/* check magic */
-+		if (magic_test)
-+		{
-+			magic_test--;
-+			if (*magic_test == XHDIMAGIC)
-+			{
-+				XHDI = val;
-+			}
-+		}
-+	}
-+	
-+	r = XHGetVersion ();
-+	if (r < 0)
-+	{
-+		perror ("XHGetVersion");
-+		
-+		XHDI = XHDIfail;
-+		return r;
-+	}
-+	
-+	/* we need at least XHDI 1.10 */
-+	if (r >= 0x110)
-+	{
-+		XHDI_installed = r;
-+		return 0;
-+	}
-+	
-+	XHDI = XHDIfail;
-+	return -1;
-+}
-+
-+
-+/*
-+ * XHDI wrapper routines
-+ */
-+
-+# define CALL \
-+	long oldstack = 0;		\
-+	long r;				\
-+					\
-+	if (init) init_XHDI ();		\
-+					\
-+	if (!Super (1L))		\
-+		oldstack = Super (0L);	\
-+					\
-+	r = XHDI (args);		\
-+	if (r < 0)			\
-+	{				\
-+		__set_errno (-r);	\
-+		r = -1;			\
-+	}				\
-+					\
-+	if (oldstack)			\
-+		Super (oldstack);	\
-+					\
-+	return r
-+
-+long
-+XHGetVersion (void)
-+{
-+	struct args_XHGetVersion
-+	{
-+		ushort	opcode;
-+	}
-+	args = 
-+	{
-+		0
-+	};
-+	
-+	CALL;
-+}
-+
-+long
-+XHInqTarget (ushort major, ushort minor, ulong *block_size, ulong *device_flags, char *product_name)
-+{
-+	struct args_XHInqTarget
-+	{
-+		ushort	opcode;
-+		ushort	major;
-+		ushort	minor;
-+		ulong	*block_size;
-+		ulong	*device_flags;
-+		char	*product_name;
-+	}
-+	args =
-+	{
-+		1,
-+		major,
-+		minor,
-+		block_size,
-+		device_flags,
-+		product_name
-+	};
-+	
-+	CALL;
-+}
-+
-+long
-+XHReserve (ushort major, ushort minor, ushort do_reserve, ushort key)
-+{
-+	struct args_XHReserve
-+	{
-+		ushort	opcode;
-+		ushort	major;
-+		ushort	minor;
-+		ushort	do_reserve;
-+		ushort	key;
-+	}
-+	args =
-+	{
-+		2,
-+		major,
-+		minor,
-+		do_reserve,
-+		key
-+	};
-+	
-+	CALL;
-+}
-+
-+long
-+XHLock (ushort major, ushort minor, ushort do_lock, ushort key)
-+{
-+	struct args_XHLock
-+	{
-+		ushort	opcode;
-+		ushort	major;
-+		ushort	minor;
-+		ushort	do_lock;
-+		ushort	key;
-+	}
-+	args =
-+	{
-+		3,
-+		major,
-+		minor,
-+		do_lock,
-+		key
-+	};
-+	
-+	CALL;
-+}
-+
-+long
-+XHStop (ushort major, ushort minor, ushort do_stop, ushort key)
-+{
-+	struct args_XHStop
-+	{
-+		ushort	opcode;
-+		ushort	major;
-+		ushort	minor;
-+		ushort	do_stop;
-+		ushort	key;
-+	}
-+	args =
-+	{
-+		4,
-+		major,
-+		minor,
-+		do_stop,
-+		key
-+	};
-+	
-+	CALL;
-+}
-+
-+long
-+XHEject (ushort major, ushort minor, ushort do_eject, ushort key)
-+{
-+	struct args_XHEject
-+	{
-+		ushort	opcode;
-+		ushort	major;
-+		ushort	minor;
-+		ushort	do_eject;
-+		ushort	key;
-+	}
-+	args =
-+	{
-+		5,
-+		major,
-+		minor,
-+		do_eject,
-+		key
-+	};
-+	
-+	CALL;
-+}
-+
-+long
-+XHDrvMap (void)
-+{
-+	struct args_XHDrvMap
-+	{
-+		ushort	opcode;
-+	}
-+	args =
-+	{
-+		6
-+	};
-+	
-+	CALL;
-+}
-+
-+long
-+XHInqDev (ushort bios, ushort *major, ushort *minor, ulong *start, __BPB *bpb)
-+{
-+	struct args_XHInqDev
-+	{
-+		ushort	opcode;
-+		ushort	bios;
-+		ushort	*major;
-+		ushort	*minor;
-+		ulong	*start;
-+		__BPB	*bpb;
-+	}
-+	args =
-+	{
-+		7,
-+		bios,
-+		major,
-+		minor,
-+		start,
-+		bpb
-+	};
-+	
-+	CALL;
-+}
-+
-+long
-+XHInqDriver (ushort bios, char *name, char *version, char *company, ushort *ahdi_version, ushort *maxIPL)
-+{
-+	struct args_XHInqDriver
-+	{
-+		ushort	opcode;
-+		ushort	bios;
-+		char	*name;
-+		char	*version;
-+		char	*company;
-+		ushort	*ahdi_version;
-+		ushort	*maxIPL;
-+	}
-+	args =
-+	{
-+		8,
-+		bios,
-+		name,
-+		version,
-+		company,
-+		ahdi_version,
-+		maxIPL
-+	};
-+	
-+	CALL;
-+}
-+
-+long
-+XHNewCookie (void *newcookie)
-+{
-+	struct args_XHNewCookie
-+	{
-+		ushort	opcode;
-+		void	*newcookie;
-+	}
-+	args =
-+	{
-+		9,
-+		newcookie
-+	};
-+	
-+	CALL;
-+}
-+
-+long
-+XHReadWrite (ushort major, ushort minor, ushort rwflag, ulong recno, ushort count, void *buf)
-+{
-+	struct args_XHReadWrite
-+	{
-+		ushort	opcode;
-+		ushort	major;
-+		ushort	minor;
-+		ushort	rwflag;
-+		ulong	recno;
-+		ushort	count;
-+		void	*buf;
-+	}
-+	args =
-+	{
-+		10,
-+		major,
-+		minor,
-+		rwflag,
-+		recno,
-+		count,
-+		buf
-+	};
-+	
-+	CALL;
-+}
-+
-+long
-+XHInqTarget2 (ushort major, ushort minor, ulong *block_size, ulong *device_flags, char *product_name, ushort stringlen)
-+{
-+	struct args_XHInqTarget2
-+	{
-+		ushort	opcode;
-+		ushort	major;
-+		ushort	minor;
-+		ulong	*block_size;
-+		ulong	*device_flags;
-+		char	*product_name;
-+		ushort	stringlen;
-+	}
-+	args =
-+	{
-+		11,
-+		major,
-+		minor,
-+		block_size,
-+		device_flags,
-+		product_name,
-+		stringlen
-+	};
-+	
-+	CALL;
-+}
-+
-+long
-+XHInqDev2 (ushort bios, ushort *major, ushort *minor, ulong *start, __BPB *bpb, ulong *blocks, char *partid)
-+{
-+	struct args_XHInqDev2
-+	{
-+		ushort	opcode;
-+		ushort	bios;
-+		ushort	*major;
-+		ushort	*minor;
-+		ulong	*start;
-+		__BPB	*bpb;
-+		ulong	*blocks;
-+		char	*partid;
-+	}
-+	args =
-+	{
-+		12,
-+		bios,
-+		major,
-+		minor,
-+		start,
-+		bpb,
-+		blocks,
-+		partid
-+	};
-+	
-+	CALL;
-+}
-+
-+long
-+XHDriverSpecial (ulong key1, ulong key2, ushort subopcode, void *data)
-+{
-+	struct args_XHDriverSpecial
-+	{
-+		ushort	opcode;
-+		ulong	key1;
-+		ulong	key2;
-+		ushort	subopcode;
-+		void 	*data;
-+	}
-+	args =
-+	{
-+		13,
-+		key1,
-+		key2,
-+		subopcode,
-+		data
-+	};
-+	
-+	CALL;
-+}
-+
-+long
-+XHGetCapacity (ushort major, ushort minor, ulong *blocks, ulong *bs)
-+{
-+	struct args_XHGetCapacity
-+	{
-+		ushort	opcode;
-+		ushort	major;
-+		ushort	minor;
-+		ulong	*blocks;
-+		ulong	*bs;
-+	}
-+	args =
-+	{
-+		14,
-+		major,
-+		minor,
-+		blocks,
-+		bs
-+	};
-+	
-+	CALL;
-+}
-+
-+long
-+XHMediumChanged (ushort major, ushort minor)
-+{
-+	struct args_XHMediumChanged
-+	{
-+		ushort	opcode;
-+		ushort	major;
-+		ushort	minor;
-+	}
-+	args =
-+	{
-+		15,
-+		major,
-+		minor
-+	};
-+	
-+	CALL;
-+}
-+
-+long
-+XHMiNTInfo (ushort op, void *data)
-+{
-+	struct args_XHMiNTInfo
-+	{
-+		ushort	opcode;
-+		ushort	op;
-+		void	*data;
-+	}
-+	args =
-+	{
-+		16,
-+		op,
-+		data
-+	};
-+	
-+	CALL;
-+}
-+
-+long
-+XHDOSLimits (ushort which, ulong limit)
-+{
-+	struct args_XHDOSLimits
-+	{
-+		ushort	opcode;
-+		ushort	which;
-+		ulong	limit;
-+	}
-+	args =
-+	{
-+		17,
-+		which,
-+		limit
-+	};
-+	
-+	CALL;
-+}
-+
-+long
-+XHLastAccess (ushort major, ushort minor, ulong *ms)
-+{
-+	struct args_XHLastAccess
-+	{
-+		ushort	opcode;
-+		ushort	major;
-+		ushort	minor;
-+		ulong	*ms;
-+	}
-+	args =
-+	{
-+		18,
-+		major,
-+		minor,
-+		ms
-+	};
-+	
-+	CALL;
-+}
-+
-+long
-+XHReaccess (ushort major, ushort minor)
-+{
-+	struct args_XHReaccess
-+	{
-+		ushort	opcode;
-+		ushort	major;
-+		ushort	minor;
-+	}
-+	args =
-+	{
-+		19,
-+		major,
-+		minor
-+	};
-+	
-+	CALL;
-+}
-diff -ur --new-file e2fsprogs-1.41.3/lib/ext2fs/xhdi.h e2fsprogs-1.41.3-mint/lib/ext2fs/xhdi.h
---- e2fsprogs-1.41.3/lib/ext2fs/xhdi.h	1970-01-01 00:00:00.000000000 +0000
-+++ e2fsprogs-1.41.3-mint/lib/ext2fs/xhdi.h	2009-01-23 10:49:56.000000000 +0000
-@@ -0,0 +1,144 @@
-+/*
-+ * Copyright 2000 Frank Naumann <fnaumann@freemint.de>
-+ * All rights reserved.
-+ * 
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2, or (at your option)
-+ * any later version.
-+ * 
-+ * This file is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ * 
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-+ * 
-+ */
-+
-+# ifndef _xhdi_h
-+# define _xhdi_h
-+
-+# include <sys/types.h>
-+
-+typedef unsigned char uchar;
-+
-+
-+/*
-+ * BIOS parameter block (osbind.h is buggy)
-+ */
-+
-+typedef struct
-+{
-+	ushort	recsiz;		/* bytes per sector */
-+	short	clsiz;		/* sectors per cluster */
-+	ushort	clsizb;		/* bytes per cluster */
-+	short	rdlen;		/* root directory size */
-+	short	fsiz;		/* size of FAT */
-+	short	fatrec;		/* startsector of second FAT */
-+	short	datrec;		/* first data sector */
-+	ushort	numcl;		/* total number of clusters */
-+	short	bflags;		/* some flags */
-+	
-+} __BPB;
-+
-+
-+/*
-+ * Extended BIOS Parameter Block (XHDI)
-+ */
-+
-+typedef struct
-+{
-+	ushort	recsiz;		/* bytes per sector */
-+	short	clsiz;		/* sectors per cluster */
-+	ushort	clsizb;		/* bytes per cluster */
-+	short	rdlen;		/* root directory size or 0 if FAT32 */
-+	short	fsiz;		/* size of FAT or 0 if FAT32 */
-+	short	fatrec;		/* startsector of second FAT or 0 if FAT32 */
-+	short	datrec;		/* first data sector or 0 if FAT32 */
-+	ushort	numcl;		/* total number of clusters or 0 if FAT32 */
-+	short	bflags;		/* bit 0: 0 = FAT12, 1 = FAT16
-+				 * bit 1: 0 = 2 FATs, 1 = 1 FAT
-+				 * bit 2: 0 = BPB, 1 = EXTENDED_BPB
-+				 */
-+	
-+	/* Ab hier undokumentiert, nur A: und B:! */
-+	short	ntracks;	/* Anzahl Spuren */
-+	short	nsides;		/* Anzahl Seiten */
-+	short	spc;		/* Sektoren pro Zylinder */
-+	short	spt;		/* Sektoren pro Spur */
-+	ushort	nhid;		/* Anzahl versteckte Sektoren */
-+	uchar	ser[3];		/* Seriennummer */
-+	uchar	serms[4];	/* ab TOS 2.06: MS-DOS-4.0-Seriennummer */
-+	char	unused;
-+	
-+	/* if bit 2 of bflags are set */
-+	long	l_recsiz;	/* bytes per sector */
-+	long	l_clsiz;	/* sectors per cluster */
-+	long	l_clsizb;	/* bytes per cluster */
-+	long	l_rdlen;	/* root directory size */
-+	long	l_fsiz;		/* size of FAT */
-+	long	l_fatrec;	/* startsector of second FAT */
-+	long	l_datrec;	/* first data sector */
-+	long	l_numcl;	/* total number of clusters */
-+	long	l_rdstcl;	/* if FAT32: startcluster of root directory
-+				 * otherwise 0
-+				 */
-+} __xhdi_BPB;
-+
-+
-+# define XH_TARGET_STOPPABLE	0x00000001L
-+# define XH_TARGET_REMOVABLE	0x00000002L
-+# define XH_TARGET_LOCKABLE	0x00000004L
-+# define XH_TARGET_EJECTABLE	0x00000008L
-+# define XH_TARGET_LOCKED	0x20000000L
-+# define XH_TARGET_STOPPED	0x40000000L
-+# define XH_TARGET_RESERVED	0x80000000L
-+
-+# define XH_MI_SETKERINFO	0
-+# define XH_MI_GETKERINFO	1
-+
-+# define XH_DL_SECSIZ		0
-+# define XH_DL_MINFAT		1
-+# define XH_DL_MAXFAT		2
-+# define XH_DL_MINSPC		3
-+# define XH_DL_MAXSPC		4
-+# define XH_DL_CLUSTS		5
-+# define XH_DL_MAXSEC		6
-+# define XH_DL_DRIVES		7
-+# define XH_DL_CLSIZB		8
-+# define XH_DL_RDLEN		9
-+# define XH_DL_CLUSTS12		12
-+# define XH_DL_CLUSTS32		13
-+# define XH_DL_BFLAGS		14
-+
-+
-+extern ushort XHDI_installed;
-+
-+long	init_XHDI	(void);
-+
-+long	XHGetVersion	(void);
-+long	XHInqTarget	(ushort major, ushort minor, ulong *block_size, ulong *device_flags, char *product_name);
-+long	XHReserve	(ushort major, ushort minor, ushort do_reserve, ushort key);
-+long	XHLock		(ushort major, ushort minor, ushort do_lock, ushort key);
-+long	XHStop		(ushort major, ushort minor, ushort do_stop, ushort key);
-+long	XHEject		(ushort major, ushort minor, ushort do_eject, ushort key);
-+long	XHDrvMap	(void);
-+long	XHInqDev	(ushort bios, ushort *major, ushort *minor, ulong *start, __BPB *bpb);
-+long	XHInqDriver	(ushort bios, char *name, char *version, char *company, ushort *ahdi_version, ushort *maxIPL);
-+long	XHNewCookie	(void *newcookie);
-+long	XHReadWrite	(ushort major, ushort minor, ushort rwflag, ulong recno, ushort count, void *buf);
-+long	XHInqTarget2	(ushort major, ushort minor, ulong *block_size, ulong *device_flags, char *product_name, ushort stringlen);
-+long	XHInqDev2	(ushort bios, ushort *major, ushort *minor, ulong *start, __BPB *bpb, ulong *blocks, char *partid);
-+long	XHDriverSpecial	(ulong key1, ulong key2, ushort subopcode, void *data);
-+long	XHGetCapacity	(ushort major, ushort minor, ulong *blocks, ulong *bs);
-+long	XHMediumChanged	(ushort major, ushort minor);
-+long	XHMiNTInfo	(ushort op, void *data);
-+long	XHDOSLimits	(ushort which, ulong limit);
-+long	XHLastAccess	(ushort major, ushort minor, ulong *ms);
-+long	XHReaccess	(ushort major, ushort minor);
-+
-+
-+# endif /* _xhdi_h */
-diff -ur --new-file e2fsprogs-1.41.3/misc/e2undo.c e2fsprogs-1.41.3-mint/misc/e2undo.c
---- e2fsprogs-1.41.3/misc/e2undo.c	2009-01-23 12:59:44.000000000 +0000
-+++ e2fsprogs-1.41.3-mint/misc/e2undo.c	2009-01-23 12:56:40.000000000 +0000
-@@ -19,6 +19,7 @@
- #if HAVE_ERRNO_H
- #include <errno.h>
- #endif
-+#include <sys/types.h>
- #include "ext2fs/tdb.h"
- #include "ext2fs/ext2fs.h"
- #include "nls-enable.h"
-diff -ur --new-file e2fsprogs-1.41.3/misc/e2initrd_helper.c e2fsprogs-1.41.3-mint/misc/e2initrd_helper.c
---- e2fsprogs-1.41.3/misc/e2initrd_helper.c	2009-01-23 12:58:29.000000000 +0000
-+++ e2fsprogs-1.41.3-mint/misc/e2initrd_helper.c	2009-01-23 12:59:11.000000000 +0000
-@@ -50,7 +50,7 @@
- 	int	ptr;
- };
- 
--struct fs_info {
-+struct _fs_info {
- 	char  *device;
- 	char  *mountpt;
- 	char  *type;
-@@ -58,7 +58,7 @@
- 	int   freq;
- 	int   passno;
- 	int   flags;
--	struct fs_info *next;
-+	struct _fs_info *next;
- };
- 
- static void usage(void)
-@@ -230,7 +230,7 @@
- 	*q = 0;
- }
- 
--static int parse_fstab_line(char *line, struct fs_info *fs)
-+static int parse_fstab_line(char *line, struct _fs_info *fs)
- {
- 	char	*dev, *device, *mntpnt, *type, *opts, *freq, *passno, *cp;
- 
-@@ -280,7 +280,7 @@
- 	return 0;
- }
- 
--static void free_fstab_line(struct fs_info *fs)
-+static void free_fstab_line(struct _fs_info *fs)
- {
- 	if (fs->device)
- 		fs->device = 0;
-@@ -290,7 +290,7 @@
- 		fs->type = 0;
- 	if (fs->opts)
- 		fs->opts = 0;
--	memset(fs, 0, sizeof(struct fs_info));
-+	memset(fs, 0, sizeof(struct _fs_info));
- }
- 
- 
-@@ -334,7 +334,7 @@
- 	errcode_t retval;
- 	struct mem_file file;
- 	char 		*buf;
--	struct fs_info fs_info;
-+	struct _fs_info _fs_info;
- 	int		ret;
- 
- 	retval = get_file(fs, "/etc/fstab", &file);
-@@ -344,14 +344,14 @@
- 		if (!buf)
- 			continue;
- 
--		ret = parse_fstab_line(buf, &fs_info);
-+		ret = parse_fstab_line(buf, &_fs_info);
- 		if (ret < 0)
- 			goto next_line;
- 
--		if (!strcmp(fs_info.mountpt, "/"))
--			printf("%s\n", fs_info.type);
-+		if (!strcmp(_fs_info.mountpt, "/"))
-+			printf("%s\n", _fs_info.type);
- 
--		free_fstab_line(&fs_info);
-+		free_fstab_line(&_fs_info);
- 
- 	next_line:
- 		free(buf);
-diff -ur --new-file e2fsprogs-1.41.3/misc/mke2fs.c e2fsprogs-1.41.3-mint/misc/mke2fs.c
---- e2fsprogs-1.41.3/misc/mke2fs.c	2008-10-07 14:22:39.000000000 +0000
-+++ e2fsprogs-1.41.3-mint/misc/mke2fs.c	2009-01-23 10:47:35.000000000 +0000
-@@ -1819,6 +1819,36 @@
- 	return retval;
- }
- 
-+#ifdef __MINT__
-+void
-+warn (const char *drv)
-+{
-+	char c;
-+	int check;
-+	
-+	check = open (drv, O_RDONLY);
-+	if (check == -1)
-+		return;
-+	
-+	close (check);
-+	
-+	if (check < 1024)
-+		return;
-+	
-+	fprintf (stderr, "\n");
-+	fprintf (stderr, "WARNING: THIS WILL TOTALLY DESTROY ANY DATA ON %s:\n", drv);
-+	fprintf (stderr, "Are you ABSOLUTELY SURE you want to do this? (y/n) ");
-+	scanf ("%c", &c);
-+	fprintf (stderr, "\n");
-+	
-+	if (c == 'y' || c == 'Y')
-+		return;
-+	
-+	fprintf (stderr, "Aborted\n");
-+	exit (1);
-+}
-+#endif
-+
- int main (int argc, char *argv[])
- {
- 	errcode_t	retval = 0;
-@@ -1839,6 +1869,11 @@
- #endif
- 	PRS(argc, argv);
- 
-+#ifdef __MINT__
-+	if (!quiet)
-+		warn (device_name);
-+#endif
-+
- #ifdef CONFIG_TESTIO_DEBUG
- 	if (getenv("TEST_IO_FLAGS") || getenv("TEST_IO_BLOCK")) {
- 		io_ptr = test_io_manager;
diff --git a/sys-fs/e2fsprogs/files/e2fsprogs-1.41.12-darwin-makefile.patch b/sys-fs/e2fsprogs/files/e2fsprogs-1.41.12-darwin-makefile.patch
deleted file mode 100644
index 84440671aef0..000000000000
--- a/sys-fs/e2fsprogs/files/e2fsprogs-1.41.12-darwin-makefile.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-On Darwin, create dylibs with a versioning scheme like Linux/ELF, not
-like BSD/ELF.
-This patch uses intentionally ELF_* vars to make it easier to diff
-against the ELF Makefile.
-
-http://sourceforge.net/tracker/index.php?func=detail&aid=2555389&group_id=2406&atid=302406
-
---- lib/Makefile.darwin-lib
-+++ lib/Makefile.darwin-lib
-@@ -1,14 +1,15 @@
- #
--# This is a Makefile stub which handles the creation of Darwin BSD shared
--# libraries.
-+# This is a Makefile stub which handles the creation of Darwin shared
-+# libraries based on the ELF scheme.
- #
- # In order to use this stub, the following makefile variables must be defined.
--#
--# BSDLIB_VERSION = 1.0
--# BSDLIB_IMAGE = libce
--# BSDLIB_MYDIR = et
--# BSDLIB_INSTALL_DIR = $(SHLIBDIR)
--#
-+# 
-+# ELF_VERSION = 1.0
-+# ELF_SO_VERSION = 1
-+# ELF_IMAGE = libce
-+# ELF_MYDIR = et
-+# ELF_INSTALL_DIR = $(SHLIBDIR)
-+# ELF_OTHER_LIBS = -lc
- 
- all:: image
- 
-@@ -16,36 +17,58 @@
- 	$(E) "	MKDIR pic"
- 	$(Q) mkdir -p pic
- 
--BSD_LIB = $(BSDLIB_IMAGE).$(BSDLIB_VERSION).dylib
--BSDLIB_PIC_FLAG = -fPIC
-+ELF_LIB = $(ELF_IMAGE).$(ELF_VERSION).dylib
-+ELF_SONAME = $(ELF_IMAGE).$(ELF_SO_VERSION).dylib
- 
--image:		$(BSD_LIB)
-+image:		$(ELF_LIB)
- 
--$(BSD_LIB): $(OBJS)
--	$(E) "	GEN_BSD_SOLIB $(BSD_LIB)"
--	$(Q) (cd pic; $(CC) -dynamiclib -compatibility_version 1.0 -current_version $(BSDLIB_VERSION) \
--		-flat_namespace -undefined warning -o $(BSD_LIB) $(OBJS))
--	$(Q) $(MV) pic/$(BSD_LIB) .
--	$(Q) $(RM) -f ../$(BSD_LIB)
-+$(ELF_LIB): $(OBJS)
-+	$(E) "	GEN_ELF_SOLIB $(ELF_LIB)"
-+	$(Q) (cd pic; $(CC) -dynamiclib -o $(ELF_LIB) $(LDFLAGS) \
-+		-Wl,-install_name,$(libdir)/$(ELF_SONAME) $(OBJS) $(ELF_OTHER_LIBS))
-+	$(Q) $(MV) pic/$(ELF_LIB) .
-+	$(Q) $(RM) -f ../$(ELF_LIB) ../$(ELF_IMAGE).dylib ../$(ELF_SONAME)
- 	$(Q) (cd ..; $(LN) $(LINK_BUILD_FLAGS) \
--		`echo $(my_dir) | sed -e 's;lib/;;'`/$(BSD_LIB) $(BSD_LIB))
--	$(Q) (cd ..; $(LN) $(LINK_BUILD_FLAGS) $(BSD_LIB) $(BSDLIB_IMAGE).dylib)
--
--install-shlibs install:: $(BSD_LIB)
--	$(E) "	INSTALL_PROGRAM $(BSDLIB_INSTALL_DIR)/$(BSD_LIB)"
--	$(Q) $(INSTALL_PROGRAM) $(BSD_LIB) \
--		$(DESTDIR)$(BSDLIB_INSTALL_DIR)/$(BSD_LIB)
--	-$(Q) $(LDCONFIG)
-+		`echo $(my_dir) | sed -e 's;lib/;;'`/$(ELF_LIB) $(ELF_LIB))
-+	$(Q) (cd ..; $(LN) $(LINK_BUILD_FLAGS) $(ELF_LIB) $(ELF_IMAGE).dylib)
-+	$(Q) (cd ..; $(LN) $(LINK_BUILD_FLAGS) $(ELF_LIB) $(ELF_SONAME))
-+
-+installdirs-elf-lib::
-+	$(E) "	MKINSTALLDIRS $(ELF_INSTALL_DIR) $(libdir)"
-+	$(Q) $(MKINSTALLDIRS) $(DESTDIR)$(ELF_INSTALL_DIR) \
-+		$(DESTDIR)$(libdir)
-+
-+installdirs:: installdirs-elf-lib
-+
-+install-shlibs install:: $(ELF_LIB) installdirs-elf-lib
-+	$(E) "	INSTALL-ELF-LIB $(ELF_INSTALL_DIR)/$(ELF_LIB)"
-+	$(Q) $(INSTALL_PROGRAM) $(ELF_LIB) $(DESTDIR)$(ELF_INSTALL_DIR)/$(ELF_LIB)
-+	$(E) "	SYMLINK $(ELF_INSTALL_DIR)/$(ELF_SONAME)"
-+	$(Q) $(LN_S) -f $(ELF_LIB) $(DESTDIR)$(ELF_INSTALL_DIR)/$(ELF_SONAME)
-+	$(E) "	SYMLINK $(libdir)/$(ELF_IMAGE).dylib"
-+	$(Q) if test "$(ELF_INSTALL_DIR)" = "$(libdir)"; then \
-+		$(LN_S) -f $(ELF_SONAME) $(DESTDIR)$(libdir)/$(ELF_IMAGE).dylib ; \
-+	else \
-+		$(LN_S) -f $(ELF_INSTALL_DIR)/$(ELF_SONAME) \
-+			$(DESTDIR)$(libdir)/$(ELF_IMAGE).dylib; \
-+	fi			
- 
- install-strip: install
-+	$(E) "	STRIP-LIB $(ELF_INSTALL_DIR)/$(ELF_LIB)"
-+	$(Q) $(STRIP) --strip-unneeded --remove-section=.comment \
-+		--remove-section=.note $(DESTDIR)$(ELF_INSTALL_DIR)/$(ELF_LIB)
- 
- install-shlibs-strip: install-shlibs
-+	$(E) "	STRIP-LIB $(ELF_INSTALL_DIR)/$(ELF_LIB)"
-+	$(Q) $(STRIP) --strip-unneeded --remove-section=.comment \
-+		--remove-section=.note $(DESTDIR)$(ELF_INSTALL_DIR)/$(ELF_LIB)
- 
- uninstall-shlibs uninstall::
--	$(RM) -f $(DESTDIR)$(BSDLIB_INSTALL_DIR)/$(BSD_LIB)
-+	$(RM) -f $(DESTDIR)$(ELF_INSTALL_DIR)/$(ELF_LIB) \
-+		$(DESTDIR)$(ELF_INSTALL_DIR)/$(ELF_SONAME) \
-+		$(DESTDIR)$(libdir)/$(ELF_IMAGE).dylib
- 
- clean::
- 	$(RM) -rf pic
--	$(RM) -f $(BSD_LIB)
--	$(RM) -f ../$(BSD_LIB)
--	$(RM) -f ../$(BSDLIB_IMAGE).dylib
-+	$(RM) -f $(ELF_LIB)
-+	$(RM) -f ../$(ELF_LIB) ../$(ELF_IMAGE).dylib ../$(ELF_SONAME)
diff --git a/sys-fs/e2fsprogs/files/e2fsprogs-1.41.12-mint-blkid.patch b/sys-fs/e2fsprogs/files/e2fsprogs-1.41.12-mint-blkid.patch
deleted file mode 100644
index 886ece5b7199..000000000000
--- a/sys-fs/e2fsprogs/files/e2fsprogs-1.41.12-mint-blkid.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-http://bugs.gentoo.org/276055
-
-<alanh@fairlite.co.uk>:
-The configure test program links against libblkid to test. This works
-fine on shared library systems as libblkid automatically depends on
-libuuid. But on static systems it needs explicit linking.
-
-
---- configure.in
-+++ configure.in
-@@ -398,8 +398,8 @@
- 	fi
- 
- 	AC_CHECK_LIB(blkid, blkid_get_cache,
--		[LIBBLKID=`$PKG_CONFIG --libs blkid`;
--		 STATIC_LIBBLKID=`$PKG_CONFIG --static --libs blkid`],
-+		[LIBBLKID=`$PKG_CONFIG --libs blkid --libs uuid`;
-+		 STATIC_LIBBLKID=`$PKG_CONFIG --static --libs blkid --libs uuid`],
- 		[AC_MSG_ERROR([external blkid library not found])],
- 		[$LIBBLKID])
- 	BLKID_CMT=#
---- configure.old	2011-01-01 14:20:07.000000000 +0000
-+++ configure	2011-01-01 14:22:01.000000000 +0000
-@@ -5228,7 +5228,7 @@
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lblkid $LIBBLKID $LIBS"
-+LIBS="-lblkid -luuid $LIBBLKID $LIBS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
-@@ -5259,8 +5259,8 @@
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_blkid_blkid_get_cache" >&5
- $as_echo "$ac_cv_lib_blkid_blkid_get_cache" >&6; }
- if test "x$ac_cv_lib_blkid_blkid_get_cache" = x""yes; then :
--  LIBBLKID=`$PKG_CONFIG --libs blkid`;
--		 STATIC_LIBBLKID=`$PKG_CONFIG --static --libs blkid`
-+  LIBBLKID=`$PKG_CONFIG --libs blkid --libs uuid`;
-+                 STATIC_LIBBLKID=`$PKG_CONFIG --static --libs blkid --libs uuid`
- else
-   as_fn_error "external blkid library not found" "$LINENO" 5
- fi
diff --git a/sys-fs/e2fsprogs/files/e2fsprogs-1.42.10-e2fsck-fix-makefile-dependency.patch b/sys-fs/e2fsprogs/files/e2fsprogs-1.42.10-e2fsck-fix-makefile-dependency.patch
deleted file mode 100644
index 033084706f42..000000000000
--- a/sys-fs/e2fsprogs/files/e2fsprogs-1.42.10-e2fsck-fix-makefile-dependency.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 5c15bf5f978bae01f1ca3cbe6414ab1d355a6adf Mon Sep 17 00:00:00 2001
-From: Theodore Ts'o <tytso@mit.edu>
-Date: Thu, 22 May 2014 18:52:27 -0400
-Subject: e2fsck: fix Makefile dependency for quota.o
-
-Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
-
-diff --git a/e2fsck/Makefile.in b/e2fsck/Makefile.in
-index 4b10f6f..f773fea 100644
---- a/e2fsck/Makefile.in
-+++ b/e2fsck/Makefile.in
-@@ -552,3 +552,13 @@ logfile.o: $(srcdir)/logfile.c $(top_builddir)/lib/config.h \
-  $(top_srcdir)/lib/quota/dqblk_v2.h $(top_srcdir)/lib/quota/quotaio_tree.h \
-  $(top_srcdir)/lib/../e2fsck/dict.h
- prof_err.o: prof_err.c
-+quota.o: $(srcdir)/quota.c $(top_builddir)/lib/config.h \
-+ $(top_builddir)/lib/dirpaths.h $(srcdir)/e2fsck.h \
-+ $(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_builddir)/lib/ext2fs/ext2_types.h \
-+ $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.h \
-+ $(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_io.h \
-+ $(top_builddir)/lib/ext2fs/ext2_err.h \
-+ $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \
-+ $(srcdir)/profile.h prof_err.h $(top_srcdir)/lib/quota/quotaio.h \
-+ $(top_srcdir)/lib/quota/dqblk_v2.h $(top_srcdir)/lib/quota/quotaio_tree.h \
-+ $(top_srcdir)/lib/../e2fsck/dict.h $(srcdir)/problem.h
--- 
-cgit v0.10.1
-
diff --git a/sys-fs/e2fsprogs/files/e2fsprogs-1.42.11-prototypes.patch b/sys-fs/e2fsprogs/files/e2fsprogs-1.42.11-prototypes.patch
deleted file mode 100644
index 45f10710fdb2..000000000000
--- a/sys-fs/e2fsprogs/files/e2fsprogs-1.42.11-prototypes.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-From 8b90ab2b1cfa3974097b0466d8f7563323dda0c2 Mon Sep 17 00:00:00 2001
-From: Andreas Dilger <adilger@dilger.ca>
-Date: Fri, 25 Jul 2014 21:43:08 -0400
-Subject: [PATCH] build: fix unused/uninitialized variable warnings
-
-Fix a few warnings about unused and uninitialized variables.
-
-Also fix util/subst.c to include <sys/time.h> to avoid using
-undeclared functions gettimeofday() and futimes().
-
-Signed-off-by: Andreas Dilger <adilger@dilger.ca>
-Signed-off-by: Theodore Ts'o <tytso@mit.edu>
----
- debugfs/debugfs.c        | 3 ---
- e2fsck/pass5.c           | 3 ---
- lib/ext2fs/blkmap64_rb.c | 2 +-
- lib/quota/mkquota.c      | 1 -
- misc/mk_hugefiles.c      | 2 +-
- util/subst.c             | 3 +++
- 6 files changed, 5 insertions(+), 9 deletions(-)
-
-diff --git a/debugfs/debugfs.c b/debugfs/debugfs.c
-index b41626c..b6ba1da 100644
---- a/debugfs/debugfs.c
-+++ b/debugfs/debugfs.c
-@@ -2347,7 +2347,6 @@ try_again:
- 
- void do_dump_mmp(int argc EXT2FS_ATTR((unused)), char *argv[])
- {
--	struct ext2_super_block *sb;
- 	struct mmp_struct *mmp_s;
- 	time_t t;
- 	errcode_t retval = 0;
-@@ -2355,8 +2354,6 @@ void do_dump_mmp(int argc EXT2FS_ATTR((unused)), char *argv[])
- 	if (check_fs_open(argv[0]))
- 		return;
- 
--	sb  = current_fs->super;
--
- 	if (current_fs->mmp_buf == NULL) {
- 		retval = ext2fs_get_mem(current_fs->blocksize,
- 					&current_fs->mmp_buf);
-diff --git a/e2fsck/pass5.c b/e2fsck/pass5.c
-index b31490f..d0b1ced 100644
---- a/e2fsck/pass5.c
-+++ b/e2fsck/pass5.c
-@@ -206,7 +206,6 @@ static void check_block_bitmaps(e2fsck_t ctx)
- 	problem_t	problem, save_problem;
- 	int		fixit, had_problem;
- 	errcode_t	retval;
--	int		csum_flag;
- 	int	old_desc_blocks = 0;
- 	int	count = 0;
- 	int	cmp_block = 0;
-@@ -253,8 +252,6 @@ static void check_block_bitmaps(e2fsck_t ctx)
- 		goto errout;
- 	}
- 
--	csum_flag = EXT2_HAS_RO_COMPAT_FEATURE(fs->super,
--					       EXT4_FEATURE_RO_COMPAT_GDT_CSUM);
- redo_counts:
- 	had_problem = 0;
- 	save_problem = 0;
-diff --git a/lib/ext2fs/blkmap64_rb.c b/lib/ext2fs/blkmap64_rb.c
-index 4dcb03f..a1dde6d 100644
---- a/lib/ext2fs/blkmap64_rb.c
-+++ b/lib/ext2fs/blkmap64_rb.c
-@@ -83,7 +83,7 @@ static void print_tree(struct rb_root *root)
- 
- static void check_tree(struct rb_root *root, const char *msg)
- {
--	struct rb_node *new_node, *node, *next;
-+	struct rb_node *node;
- 	struct bmap_rb_extent *ext, *old = NULL;
- 
- 	for (node = ext2fs_rb_first(root); node;
-diff --git a/lib/quota/mkquota.c b/lib/quota/mkquota.c
-index 58803d0..0ece088 100644
---- a/lib/quota/mkquota.c
-+++ b/lib/quota/mkquota.c
-@@ -580,7 +580,6 @@ out:
- errcode_t quota_compare_and_update(quota_ctx_t qctx, int qtype,
- 				   int *usage_inconsistent)
- {
--	ext2_filsys fs = qctx->fs;
- 	struct quota_handle qh;
- 	struct scan_dquots_data scan_data;
- 	struct dquot *dq;
-diff --git a/misc/mk_hugefiles.c b/misc/mk_hugefiles.c
-index 6bc25e6..7f1be2e 100644
---- a/misc/mk_hugefiles.c
-+++ b/misc/mk_hugefiles.c
-@@ -468,7 +468,7 @@ errcode_t mk_hugefiles(ext2_filsys fs, const char *device_name)
- 	unsigned long	i;
- 	ext2_ino_t	dir;
- 	errcode_t	retval;
--	blk64_t		fs_blocks, part_offset;
-+	blk64_t		fs_blocks, part_offset = 0;
- 	unsigned long	align;
- 	int		d, dsize;
- 	char		*t;
-diff --git a/util/subst.c b/util/subst.c
-index 6244831..36eaa94 100644
---- a/util/subst.c
-+++ b/util/subst.c
-@@ -14,6 +14,9 @@
- #include <unistd.h>
- #include <string.h>
- #include <ctype.h>
-+#ifdef HAVE_SYS_TIME_H
-+#include <sys/time.h>
-+#endif
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <fcntl.h>
--- 
-2.0.0
-
diff --git a/sys-fs/e2fsprogs/files/e2fsprogs-1.42.13-fix-build-cflags.patch b/sys-fs/e2fsprogs/files/e2fsprogs-1.42.13-fix-build-cflags.patch
new file mode 100644
index 000000000000..1656cd5a1f23
--- /dev/null
+++ b/sys-fs/e2fsprogs/files/e2fsprogs-1.42.13-fix-build-cflags.patch
@@ -0,0 +1,11 @@
+--- e2fsprogs-1.42.13/configure.in
++++ e2fsprogs-1.42.13/configure.in
+@@ -1315,6 +1315,8 @@
+ if test $cross_compiling = no; then
+    BUILD_CFLAGS="$CFLAGS $CPPFLAGS $INCLUDES -DHAVE_CONFIG_H"
+    BUILD_LDFLAGS="$LDFLAGS"
++else
++   BUILD_CFLAGS="$INCLUDES"
+ fi
+ AC_SUBST(BUILD_CFLAGS)
+ AC_SUBST(BUILD_LDFLAGS)
diff --git a/sys-fs/e2fsprogs/files/e2fsprogs-1.42.7-libext2fs-fix-return-value.patch b/sys-fs/e2fsprogs/files/e2fsprogs-1.42.7-libext2fs-fix-return-value.patch
deleted file mode 100644
index 2d48fdf4c635..000000000000
--- a/sys-fs/e2fsprogs/files/e2fsprogs-1.42.7-libext2fs-fix-return-value.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 266eb87990025e82a8884e30993ce93c00d19db3 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Sat, 4 May 2013 01:00:58 -0400
-Subject: [PATCH] libext2fs: fix return value
-
-The ext2fs_test_block_bitmap_range2 func is not a void, so make sure we
-return a value.  I picked EINVAL as it looks like what other things in
-this func use.
-
-URL: http://bugs.gentoo.org/467986
-Reported-by: Vicente Olivert Riera <vincent@gentoo.org>
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- lib/ext2fs/gen_bitmap64.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/ext2fs/gen_bitmap64.c b/lib/ext2fs/gen_bitmap64.c
-index 42a97d4..44ac499 100644
---- a/lib/ext2fs/gen_bitmap64.c
-+++ b/lib/ext2fs/gen_bitmap64.c
-@@ -658,7 +658,7 @@ int ext2fs_test_block_bitmap_range2(ext2fs_block_bitmap bmap,
- 	if ((block < bmap->start) || (block+num-1 > bmap->end)) {
- 		ext2fs_warn_bitmap(EXT2_ET_BAD_BLOCK_TEST, block,
- 				   bmap->description);
--		return;
-+		return EINVAL;
- 	}
- 
- 	return bmap->bitmap_ops->test_clear_bmap_extent(bmap, block, num);
--- 
-1.8.2.1
-
diff --git a/sys-kernel/ck-sources/Manifest b/sys-kernel/ck-sources/Manifest
index 15716071b4c9..d96643452302 100644
--- a/sys-kernel/ck-sources/Manifest
+++ b/sys-kernel/ck-sources/Manifest
@@ -60,6 +60,9 @@ DIST genpatches-4.0-4.extras.tar.xz 16280 SHA256 f0b77c7754741f000933a1450c39027
 DIST genpatches-4.0-5.base.tar.xz 97864 SHA256 ab7495373dccfb2c3977fd52af4b2c3fc364b4d602e0d893320b4518542ffb79 SHA512 fe39613740e753a7c45dc1e5efbcbd8759a983c7ee076e520645bfe69a4f0f6a893a7fa7b7ddcb86759226c76c2be18caf372a6dbbe592b28a0990e2b899a857 WHIRLPOOL 8f7dabc6c12e7e0cd9a6f2a25e1d3cfc90a42d7a480781663c966c973e08d6b2cd0c05921ab4c8f5cf23aaae12135d54928c0318e09165efbad932f204cbfb07
 DIST genpatches-4.0-5.experimental.tar.xz 61652 SHA256 9b810a3b50e13ec8a289ee75bea9030a50bc7ebf847f2206a8e461ae0d153655 SHA512 3c5f092d21f7b8cbd02dcac39327bda03603e9075ea9507726908c94e7b2dfbf7ad7cc4f2c743737c39dd6da6e58a973451946c952dd328305e9b1963621e852 WHIRLPOOL 6d16adff806d15cd083a2bbb934bdd74b7bff7fa6fe5ca9401e9b0522d4b8406e609a5180f33606e523db5aea6cd6e10f12aeefefc426f518a782eb88500cb36
 DIST genpatches-4.0-5.extras.tar.xz 16276 SHA256 813ed84f4ed97ba09c2f8a59196c19250dd5e12891d6616f41168017f82b94c0 SHA512 23ecde7bc34fc6b58f05feb38d79eba48732d493231737271b70f1533bac18d77d1b0f36e0c275818f98d7249d032684f5fbd13dbf4254ffc535f410c431446f WHIRLPOOL 9202e028db421ab53c44e40e045ed8f1c52fba938ea2c3bd4498edd1478f53da8c9e28ad664ef061dcb28ddbac48b1f1c811f8d5437e31a8d3910efb14a349f3
+DIST genpatches-4.0-6.base.tar.xz 118672 SHA256 228c38e1e691fc3b3862a5de627c71ba9bcf1aafd10317a9ece83a13e041ed24 SHA512 02c3cbe7982173121f03ca9424e5fa04b27f985c2f81b7469559eda4d8824e4bb348a0b9b341a9e34c7803ea341161ff306aee5d6cb73617e01fe7aad327e05f WHIRLPOOL 685c62001c6e29efbf800471ed95f8413368c6dc194689c04dea44c5b9148e09d3d79e026f91a2054a84a991bd741dc8de08838c3cd9b9c94fb8dc981db9e953
+DIST genpatches-4.0-6.experimental.tar.xz 61620 SHA256 ea7359c8a3e4e8c53ccfa0573158f080e4ed2a458f6de654097cf21134c0910d SHA512 69b0f51e43c2a5712fd8eff3f8292fe31109e33a24b51bb0e637d15bbf2329767896d6c56f3f178ad6e9d1f69ebe6875108941f18a4a10747405be385e47ce86 WHIRLPOOL 657758e5a8b7a9c764f1d8a875be71ee079907aa6ab79c90ae2632c4ab8445a86ad97cb3ef70e424a6bd62d4c937de577cf44a10aeea4a41d8dd6d1bcf803952
+DIST genpatches-4.0-6.extras.tar.xz 16280 SHA256 205c87c3d133a57d6ca42e2ce107cf64cbedd64fd356c601ca0af29248af5c1e SHA512 61cea7f5a8919418bbea96599f7decf804d97d9e6b8729e7e5dc4f077d54c86db7b0087f70b87183420798f16c1036242f1b857ff2598edf0902ff4fa6bd2890 WHIRLPOOL fde8c4c909a26d7bf2d00e35d1ee45e03c4710871f0a2cffdfbcd1109aac0b4f3215bf0ef5dc6562e9fb9d7447c1330f91a08ffa78912b3857cd3ddab5d10a3b
 DIST linux-3.10.tar.xz 73175088 SHA256 df27fa92d27a9c410bfe6c4a89f141638500d7eadcca5cce578954efc2ad3544 SHA512 5fb109fcbd59bf3dffc911b853894f0a84afa75151368f783a1252c5ff60c7a1504de216c0012be446df983e2dea400ad8eeed3ce04f24dc61d0ef76c174dc35 WHIRLPOOL e7c0ccc2231e430b831218fc66f1940d095d2d5447d391329c6a7373d4a1d16708f64778b32e4847802ee2dae4fcf7cb67a1238fd4eb204fd0c4bce2d8134053
 DIST linux-3.14.tar.xz 78399152 SHA256 61558aa490855f42b6340d1a1596be47454909629327c49a5e4e10268065dffa SHA512 5730d83a7a81134c1e77c0bf89e42dee4f8251ad56c1ac2be20c59e26fdfaa7bea55f277e7af156b637f22e1584914a46089af85039177cb43485089c74ac26e WHIRLPOOL 5ad07b78c362ba0b21c50b4abb99407cae06bd08576f3fd8f36047b01409eba096263208020da3dcad4977eefc61d66502276754097bc127635df1d7a5817d41
 DIST linux-3.18.tar.xz 80934708 SHA256 becc413cc9e6d7f5cc52a3ce66d65c3725bc1d1cc1001f4ce6c32b69eb188cbd SHA512 2f0b72466e9bc538a675738aa416573d41bbbd7e3e2ffd5b5b127afde609ebc278cec5a3c37e73479607e957c13f1b4ed9782a3795e0dcc2cf8e550228594009 WHIRLPOOL 81634af631b7d30ccd1f4798f96f44d9aa0ba6609b73f2747eb6aebaf7a99487fb2dbd45767605186182533cb222bfd9236e8dd5e11a04fdb67c211e4e0a91d6
diff --git a/sys-kernel/ck-sources/ck-sources-4.0.4.ebuild b/sys-kernel/ck-sources/ck-sources-4.0.4.ebuild
new file mode 100644
index 000000000000..90abeb577b8b
--- /dev/null
+++ b/sys-kernel/ck-sources/ck-sources-4.0.4.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ck-sources/ck-sources-4.0.4.ebuild,v 1.1 2015/05/19 12:28:01 yngwin Exp $
+
+EAPI="5"
+ETYPE="sources"
+KEYWORDS="~amd64 ~x86"
+IUSE="bfsonly"
+
+HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches/
+	http://users.on.net/~ckolivas/kernel/"
+
+K_WANT_GENPATCHES="base extras experimental"
+K_EXP_GENPATCHES_PULL="1"
+K_EXP_GENPATCHES_NOUSE="1"
+K_GENPATCHES_VER="6"
+K_SECURITY_UNSUPPORTED="1"
+K_DEBLOB_AVAILABLE="1"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+K_BRANCH_ID="${KV_MAJOR}.${KV_MINOR}"
+
+DESCRIPTION="Full Linux ${K_BRANCH_ID} kernel sources with Con Kolivas' high performance patchset and Gentoo's genpatches"
+
+#-- If Gentoo-Sources don't follow then extra incremental patches are needed -
+
+XTRA_INCP_MIN=""
+XTRA_INCP_MAX=""
+
+#--
+
+CK_VERSION="1"
+BFS_VERSION="462"
+
+CK_FILE="patch-${K_BRANCH_ID}-ck${CK_VERSION}.bz2"
+BFS_FILE="${K_BRANCH_ID}-sched-bfs-${BFS_VERSION}.patch"
+
+CK_BASE_URL="http://ck.kolivas.org/patches/4.0"
+CK_LVER_URL="${CK_BASE_URL}/${K_BRANCH_ID}/${K_BRANCH_ID}-ck${CK_VERSION}"
+CK_URI="${CK_LVER_URL}/${CK_FILE}"
+BFS_URI="${CK_LVER_URL}/patches/${BFS_FILE}"
+
+#-- Build extra incremental patches list --------------------------------------
+
+LX_INCP_URI=""
+LX_INCP_LIST=""
+if [ -n "${XTRA_INCP_MIN}" ]; then
+	LX_INCP_URL="${KERNEL_BASE_URI}/incr"
+	for i in `seq ${XTRA_INCP_MIN} ${XTRA_INCP_MAX}`; do
+		LX_INCP[i]="patch-${K_BRANCH_ID}.${i}-$(($i+1)).bz2"
+		LX_INCP_URI="${LX_INCP_URI} ${LX_INCP_URL}/${LX_INCP[i]}"
+		LX_INCP_LIST="${LX_INCP_LIST} ${DISTDIR}/${LX_INCP[i]}"
+	done
+fi
+
+#-- CK needs sometimes to patch itself... (3.7/3.13)---------------------------
+
+CK_INCP_URI=""
+CK_INCP_LIST=""
+
+#-- Local patches needed for the ck-patches to apply smoothly (3.4/3.5) -------
+
+PRE_CK_FIX=""
+POST_CK_FIX=""
+
+#--
+
+SRC_URI="${KERNEL_URI} ${LX_INCP_URI} ${GENPATCHES_URI} ${ARCH_URI} ${CK_INCP_URI}
+	!bfsonly? ( ${CK_URI} )
+	bfsonly? ( ${BFS_URI} )"
+
+UNIPATCH_LIST="${LX_INCP_LIST} ${PRE_CK_FIX} ${DISTDIR}"
+
+if ! use bfsonly ; then
+	UNIPATCH_LIST="${UNIPATCH_LIST}/${CK_FILE}"
+else
+	UNIPATCH_LIST="${UNIPATCH_LIST}/${BFS_FILE}"
+fi
+
+UNIPATCH_LIST="${UNIPATCH_LIST} ${CK_INCP_LIST} ${POST_CK_FIX}"
+
+UNIPATCH_STRICTORDER="yes"
+
+#-- Since experimental genpatches && we want BFQ irrespective of experimental -
+
+K_EXP_GENPATCHES_LIST="50*_*.patch*"
+
+src_prepare() {
+
+#-- Comment out CK's EXTRAVERSION in Makefile ---------------------------------
+
+	sed -i -e 's/\(^EXTRAVERSION :=.*$\)/# \1/' "${S}/Makefile"
+}
+
+pkg_postinst() {
+
+	kernel-2_pkg_postinst
+
+	elog
+	elog "For more info on this patchset, see: http://forums.gentoo.org/viewtopic-t-941030-start-0.html"
+	elog
+}
diff --git a/sys-libs/e2fsprogs-libs/Manifest b/sys-libs/e2fsprogs-libs/Manifest
index e9245d5fee9a..f289e0b29ec0 100644
--- a/sys-libs/e2fsprogs-libs/Manifest
+++ b/sys-libs/e2fsprogs-libs/Manifest
@@ -1,5 +1,3 @@
 DIST e2fsprogs-libs-1.41.7.tar.gz 494463 SHA256 b6d9c9ec405ad1d644cf35d57f0f1e878fa6af6ad45b97683de847ff49cbdf84 SHA512 01bf6571efc3b63b985bb45190553cbf0e486ddcf022715a2bdf36eb3e45ffada603ed52bf17d6920b9dc3e98ffc6758d2481a83b68bbf5d946c76173f7d14a8 WHIRLPOOL 058fc1278ff2427d956728ad2d132652e80b60570c20c904c6d6e2a15c4a9d00ec13340ad56114f82dd703ee87cd576c2f69eb3d40f1f16743430476c3e383b1
-DIST e2fsprogs-libs-1.42.10.tar.gz 575703 SHA256 236ea5124ae7c2a0d0bc4bc5927e614a52da2635fbc3b2187ca8bc415bb3644d SHA512 97be305df2debad3378f53ffa702e0719e76f9541c38468c78c32e77765fb0ae95b927dca4d5032268346792e759cf02ab9542c9e08c0b9f58ddd5276e2e0362 WHIRLPOOL 30b8df6b6fa29449d5ec90c435fc1f234d0e59d6012015a00c603139f400ad46708cd444c88e3693247703171d3e65275c3204d7d5f53305b7a412fc7d6cfbd5
-DIST e2fsprogs-libs-1.42.11.tar.gz 604886 SHA256 8b52d20c6571155d2adffafbbd5d215b08cc5b54a7f1a6d2ca7995d2a29dc518 SHA512 4b3201c6c7f5dd556ea8585065cacad9254c84f2428f88abeed7ef7586c941221086e4781de67721ec66d055c50a4c182b2a496326f7a7733397d0aabfe3c334 WHIRLPOOL 9243625785957e4b3f9ca0aa58132e24fb5c21018191d53398f937b59404f3413d053420d5abbbcde02b4ea31461798bb8b998b476468806cb57f8d21e98b027
 DIST e2fsprogs-libs-1.42.12.tar.gz 604947 SHA256 ca0a562b9b35f340d849f68977d1158ac9d92d9e77d97e2a85b8383e949dcd7b SHA512 2de9e828b5f123236505ae83cbfef906ca23f875dd15f5b7d8cbac9f59722e31c7304e5a92a326b42b71186ea5eb18550aac2986c45e70176047a5b1774b260a WHIRLPOOL 177ef831b978ea5febce5b87c98216843463df5a292705f93129dd8609f6ada345b45910c85248f1f70685b073d95531c63512366e4e407158bf1467781c9f24
-DIST e2fsprogs-libs-1.42.7.tar.gz 571544 SHA256 21ce9cd879c401d08b057a9abda2b56d70557239d1f5e42674fa2c20509c2145 SHA512 2ffd37edd156730d2cc5c685e0d082c171ada626ced40a86623d937522fd020c9215fa287de909968cab366ad8a1aa84a6de8e4eaf3fc1effb103000448bae0b WHIRLPOOL 12d4f309feadd957317f97f44c9c8cf5552ed27e0f22e2061d39e8abd2732fd512f38127a0806bc913ba92c64894218efcebda1316d74b6a814bf7f6f94152df
+DIST e2fsprogs-libs-1.42.13.tar.gz 605222 SHA256 79ad28c14ffd12083d8c4efea04cff7d175faf070de03d29bc580b5f1b669a14 SHA512 803ec87f9b3926c1f423cac424dc7fe2bfbaa3237a93023fe0213b88e35b933090299304be1c47d876d9d14487acadea3e8b9a926dab24733dbe6ee3f1d846e0 WHIRLPOOL 0adb43e1dd0ea476729dfd455430d1b803e96985c6a190ec518e57f628da6c9a85e2389f877026492f3b757db2d470a175e54db9d608ec586536854e21c7462f
diff --git a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.10.ebuild b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.10.ebuild
deleted file mode 100644
index 56bc178cc50f..000000000000
--- a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.10.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.10.ebuild,v 1.13 2014/10/27 01:55:09 vapier Exp $
-
-EAPI="4"
-
-case ${PV} in
-*_pre*) UP_PV="${PV%_pre*}-WIP-${PV#*_pre}" ;;
-*)      UP_PV=${PV} ;;
-esac
-
-inherit autotools toolchain-funcs eutils multilib-minimal
-
-DESCRIPTION="e2fsprogs libraries (common error and subsystem)"
-HOMEPAGE="http://e2fsprogs.sourceforge.net/"
-SRC_URI="mirror://sourceforge/e2fsprogs/${PN}-${UP_PV}.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 ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~m68k-mint ~x86-solaris"
-IUSE="nls static-libs"
-
-RDEPEND="!sys-libs/com_err
-	!sys-libs/ss
-	!<sys-fs/e2fsprogs-1.41.8
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20130224-r12
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-	)"
-DEPEND="nls? ( sys-devel/gettext )
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${P%_pre*}
-
-src_prepare() {
-	printf 'all:\n%%:;@:\n' > doc/Makefile.in # don't bother with docs #305613
-	epatch "${FILESDIR}"/${PN}-1.42.9-no-quota.patch
-	epatch "${FILESDIR}"/${P}-fix-build-cflags.patch
-	eautoreconf
-}
-
-multilib_src_configure() {
-	# we use blkid/uuid from util-linux now
-	ac_cv_lib_uuid_uuid_generate=yes \
-	ac_cv_lib_blkid_blkid_get_cache=yes \
-	ac_cv_path_LDCONFIG=: \
-	ECONF_SOURCE="${S}" \
-	CC="$(tc-getCC)" \
-	BUILD_CC="$(tc-getBUILD_CC)" \
-	BUILD_LD="$(tc-getBUILD_LD)" \
-	econf \
-		--disable-lib{blkid,uuid} \
-		--disable-quota \
-		$(tc-is-static-only || echo --enable-elf-shlibs) \
-		$(tc-has-tls || echo --disable-tls) \
-		$(use_enable nls)
-}
-
-multilib_src_compile() {
-	emake V=1
-}
-
-multilib_src_install() {
-	emake V=1 STRIP=: DESTDIR="${D}" install || die
-	multilib_is_native_abi && gen_usr_ldscript -a com_err ss
-	# configure doesn't have an option to disable static libs :/
-	use static-libs || find "${ED}" -name '*.a' -delete
-}
diff --git a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.11.ebuild b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.13.ebuild
similarity index 90%
rename from sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.11.ebuild
rename to sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.13.ebuild
index 58cba38b7f01..eaca4c25ea1b 100644
--- a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.11.ebuild
+++ b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.13.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.11.ebuild,v 1.4 2014/08/12 05:57:34 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.13.ebuild,v 1.1 2015/05/19 09:18:00 polynomial-c Exp $
 
 EAPI="4"
 
@@ -35,8 +35,7 @@ S=${WORKDIR}/${P%_pre*}
 src_prepare() {
 	printf 'all:\n%%:;@:\n' > doc/Makefile.in # don't bother with docs #305613
 	epatch "${FILESDIR}"/${PN}-1.42.9-no-quota.patch
-	epatch "${FILESDIR}"/${PN}-1.42.10-fix-build-cflags.patch
-	epatch "${FILESDIR}"/${PN}-1.42.11-prototypes.patch
+	epatch "${FILESDIR}"/${PN}-1.42.13-fix-build-cflags.patch
 	# Not everyone has gettext installed (like USE=-nls).
 	echo 'm4_ifndef([AM_GNU_GETTEXT],[m4_define([AM_GNU_GETTEXT])])' >> acinclude.m4
 	eautoreconf
diff --git a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.7.ebuild b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.7.ebuild
deleted file mode 100644
index 0123f5e0bf22..000000000000
--- a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.7.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.7.ebuild,v 1.14 2014/01/18 02:37:17 vapier Exp $
-
-EAPI="2"
-
-case ${PV} in
-*_pre*) UP_PV="${PV%_pre*}-WIP-${PV#*_pre}" ;;
-*)      UP_PV=${PV} ;;
-esac
-
-inherit toolchain-funcs eutils
-
-DESCRIPTION="e2fsprogs libraries (common error and subsystem)"
-HOMEPAGE="http://e2fsprogs.sourceforge.net/"
-SRC_URI="mirror://sourceforge/e2fsprogs/${PN}-${UP_PV}.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 ~amd64-linux ~arm-linux ~x86-linux"
-IUSE="nls static-libs"
-
-RDEPEND="!sys-libs/com_err
-	!sys-libs/ss
-	!<sys-fs/e2fsprogs-1.41.8"
-DEPEND="nls? ( sys-devel/gettext )
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${P%_pre*}
-
-src_prepare() {
-	printf 'all:\n%%:;@:\n' > doc/Makefile.in # don't bother with docs #305613
-}
-
-src_configure() {
-	# We want to use the "bsd" libraries while building on Darwin, but while
-	# building on other Gentoo/*BSD we prefer elf-naming scheme.
-	local libtype
-	case ${CHOST} in
-		*-darwin*) libtype=bsd;;
-		*)         libtype=elf;;
-	esac
-
-	# we use blkid/uuid from util-linux now
-	ac_cv_lib_uuid_uuid_generate=yes \
-	ac_cv_lib_blkid_blkid_get_cache=yes \
-	ac_cv_path_LDCONFIG=: \
-	QUOTA_CMT='#' \
-	econf \
-		--disable-lib{blkid,uuid} \
-		--disable-quota \
-		--enable-${libtype}-shlibs \
-		$(tc-has-tls || echo --disable-tls) \
-		$(use_enable nls)
-}
-
-src_install() {
-	emake STRIP=: DESTDIR="${D}" install || die
-	gen_usr_ldscript -a com_err ss
-	# configure doesn't have an option to disable static libs :/
-	use static-libs || find "${D}" -name '*.a' -delete
-}
diff --git a/sys-libs/e2fsprogs-libs/files/e2fsprogs-libs-1.42.11-prototypes.patch b/sys-libs/e2fsprogs-libs/files/e2fsprogs-libs-1.42.11-prototypes.patch
deleted file mode 100644
index 7aa309225b29..000000000000
--- a/sys-libs/e2fsprogs-libs/files/e2fsprogs-libs-1.42.11-prototypes.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 8b90ab2b1cfa3974097b0466d8f7563323dda0c2 Mon Sep 17 00:00:00 2001
-From: Andreas Dilger <adilger@dilger.ca>
-Date: Fri, 25 Jul 2014 21:43:08 -0400
-Subject: [PATCH] build: fix unused/uninitialized variable warnings
-
-Fix a few warnings about unused and uninitialized variables.
-
-Also fix util/subst.c to include <sys/time.h> to avoid using
-undeclared functions gettimeofday() and futimes().
-
-Signed-off-by: Andreas Dilger <adilger@dilger.ca>
-Signed-off-by: Theodore Ts'o <tytso@mit.edu>
----
- debugfs/debugfs.c        | 3 ---
- e2fsck/pass5.c           | 3 ---
- lib/ext2fs/blkmap64_rb.c | 2 +-
- lib/quota/mkquota.c      | 1 -
- misc/mk_hugefiles.c      | 2 +-
- util/subst.c             | 3 +++
- 6 files changed, 5 insertions(+), 9 deletions(-)
-
-diff --git a/lib/quota/mkquota.c b/lib/quota/mkquota.c
-index 58803d0..0ece088 100644
---- a/lib/quota/mkquota.c
-+++ b/lib/quota/mkquota.c
-@@ -580,7 +580,6 @@ out:
- errcode_t quota_compare_and_update(quota_ctx_t qctx, int qtype,
- 				   int *usage_inconsistent)
- {
--	ext2_filsys fs = qctx->fs;
- 	struct quota_handle qh;
- 	struct scan_dquots_data scan_data;
- 	struct dquot *dq;
-diff --git a/util/subst.c b/util/subst.c
-index 6244831..36eaa94 100644
---- a/util/subst.c
-+++ b/util/subst.c
-@@ -14,6 +14,9 @@
- #include <unistd.h>
- #include <string.h>
- #include <ctype.h>
-+#ifdef HAVE_SYS_TIME_H
-+#include <sys/time.h>
-+#endif
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <fcntl.h>
--- 
-2.0.0
-
diff --git a/sys-libs/e2fsprogs-libs/files/e2fsprogs-libs-1.42.13-fix-build-cflags.patch b/sys-libs/e2fsprogs-libs/files/e2fsprogs-libs-1.42.13-fix-build-cflags.patch
new file mode 100644
index 000000000000..bce8ed006e3d
--- /dev/null
+++ b/sys-libs/e2fsprogs-libs/files/e2fsprogs-libs-1.42.13-fix-build-cflags.patch
@@ -0,0 +1,11 @@
+--- e2fsprogs-libs-1.42.13/configure.in
++++ e2fsprogs-libs-1.42.13/configure.in
+@@ -1315,6 +1315,8 @@
+ if test $cross_compiling = no; then
+    BUILD_CFLAGS="$CFLAGS $CPPFLAGS $INCLUDES -DHAVE_CONFIG_H"
+    BUILD_LDFLAGS="$LDFLAGS"
++else
++   BUILD_CFLAGS="$INCLUDES"
+ fi
+ AC_SUBST(BUILD_CFLAGS)
+ AC_SUBST(BUILD_LDFLAGS)
diff --git a/www-apps/rt/Manifest b/www-apps/rt/Manifest
index 24457357f2a6..7ce37abd846a 100644
--- a/www-apps/rt/Manifest
+++ b/www-apps/rt/Manifest
@@ -1 +1 @@
-DIST rt-4.2.9.tar.gz 7496950 SHA256 1cbfe4f824637de45cc093ab87260ef9bbac11ba724b93c01f39a6d4e9592613 SHA512 a5a8b4cd1ca59a8e99a78634bd0fb6f4c9ac428b3088f5b3a8c87312a49b69273f332d3a6370c7be2d394ed2cd834f8b85b4bc1537f27e3687d79b17513d1aaa WHIRLPOOL 17799292d6700f28e7a462afbab64a2b7dae2e06e34992506a7c51efe9d9f9fe37e65cf76e0ca04130d2c49d7221185d6115040656e4d9d9d06cff281ff2f190
+DIST rt-4.2.11.tar.gz 7537515 SHA256 dc07f32dd04a50bd9d0ff86a1f9fe3cd1a128f01cbbd018e5fa23a41ddfb87e6 SHA512 dec4db4c2e3ec8c167e6fde16817fb07441a297cbdf6e035f100aa94d9eb1831f11b8d4dbfb8376a5da689ff2378647de2a52683692f91d3ab6b1044aecd9c43 WHIRLPOOL aefeac9dd7cbf343f5a20f467a5b86d10a07e742475dc4d397b61c7499245862d9c67bd3406e419bccefa069a69aa3375b0e9fe0879d7a67899f99f978fb782a
diff --git a/www-apps/rt/files/rt-makefile-serialize-install-prereqs.patch b/www-apps/rt/files/rt-makefile-serialize-install-prereqs.patch
new file mode 100644
index 000000000000..d0488918d5f9
--- /dev/null
+++ b/www-apps/rt/files/rt-makefile-serialize-install-prereqs.patch
@@ -0,0 +1,12 @@
+diff -Naruw rt-4.2.11.orig/Makefile.in rt-4.2.11/Makefile.in
+--- rt-4.2.11.orig/Makefile.in	2015-04-27 20:56:16.000000000 -0400
++++ rt-4.2.11/Makefile.in	2015-05-14 13:50:05.279292835 -0400
+@@ -359,6 +359,8 @@
+ 	rm -rf $(DESTDIR)$(MASON_DATA_PATH)/etc/*
+ 	rm -rf $(DESTDIR)$(MASON_DATA_PATH)/obj/*
+ 
++.NOTPARALLEL: testdeps config-install dirs files-install fixperms instruct
++
+ install: testdeps config-install dirs files-install fixperms instruct
+ 
+ files-install: libs-install etc-install config-install bin-install sbin-install html-install doc-install font-install po-install static-install
diff --git a/www-apps/rt/files/rt_apache2.conf b/www-apps/rt/files/rt_apache2.conf
deleted file mode 100644
index bab0a2951c16..000000000000
--- a/www-apps/rt/files/rt_apache2.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copy the contents of this file to the appropriate location in your
-# Apache configuration.
-
-# Adjust the Location path if you have RT being served from a
-# subdirectory instead of from root. (i.e., example.com/rt instead of
-# rt.example.com)
-<Location />
-    SetHandler modperl
-    PerlResponseHandler Plack::Handler::Apache2
-    PerlSetVar psgi_app RT_DIR/sbin/rt-server
-</Location>
-
-<Perl>
-    use Plack::Handler::Apache2;
-    Plack::Handler::Apache2->preload("RT_DIR/sbin/rt-server");
-</Perl>
diff --git a/www-apps/rt/files/rt_apache2_fcgi.conf b/www-apps/rt/files/rt_apache2_fcgi.conf
deleted file mode 100644
index 2a93f8cea2b7..000000000000
--- a/www-apps/rt/files/rt_apache2_fcgi.conf
+++ /dev/null
@@ -1,38 +0,0 @@
-<IfDefine FASTCGI>
-# Tell FastCGI to put its temporary files somewhere sane.
-FastCgiIpcDir /tmp
-
-# Tell FastCGI that it should use apache's "suexec" binary to call any FastCGI script.
-# This is a GLOBAL setting
-FastCgiWrapper /usr/sbin/suexec2
-
-# Apache 1.3 discards the user and group parameters on the FastCgiServer line.
-# Apache 2.0 requires them.
-FastCgiServer RT_DIR/bin/mason_handler.fcgi -idle-timeout 120 -user rt -group rt -processes 4
-
-<VirtualHost MY_RT_DOMAIN:80>
-	ServerName MY_RT_DOMAIN
-	DocumentRoot HTDOCS
-	ServerAdmin YOUR_EMAIL_HERE
-
-	AddDefaultCharset UTF-8
-
-	<IfDefine USERDIR>
-		UserDir disabled
-	</IfDefine>
-
-	# Set the rt user and group as the executing user for this virtual host
-	SuexecUserGroup rt rt
-	AddHandler fastcgi-script fcgi
-	ScriptAlias / RT_DIR/bin/mason_handler.fcgi/
-
-	<Directory "HTDOCS">
-		Options Indexes FollowSymLinks
-		AllowOverride None
-		Order allow,deny
-		Allow from all
-	</Directory>
-</VirtualHost>
-</IfDefine>
-
-# vim: ts=4 filetype=apache
diff --git a/www-apps/rt/rt-4.2.9-r1.ebuild b/www-apps/rt/rt-4.2.11.ebuild
similarity index 93%
rename from www-apps/rt/rt-4.2.9-r1.ebuild
rename to www-apps/rt/rt-4.2.11.ebuild
index 0bb0349a0f6e..c6765dd756ba 100644
--- a/www-apps/rt/rt-4.2.9-r1.ebuild
+++ b/www-apps/rt/rt-4.2.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/rt/rt-4.2.9-r1.ebuild,v 1.4 2015/05/03 10:53:47 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/rt/rt-4.2.11.ebuild,v 1.1 2015/05/19 15:49:08 titanofold Exp $
 
 EAPI=5
 
@@ -23,16 +23,17 @@ DEPEND="
 	>=dev-perl/Apache-Session-1.53
 	>=dev-perl/CSS-Squish-0.06
 	>=dev-perl/Class-Accessor-0.34
+	>=dev-perl/Class-ReturnValue-0.550.0-r1
 	>=dev-perl/DBI-1.37
 	>=dev-perl/Date-Extract-0.02
 	>=dev-perl/DateTime-Format-Natural-0.67
-	>=dev-perl/dbix-searchbuilder-1.660.0
 	>=dev-perl/Devel-StackTrace-1.19
 	>=dev-perl/HTML-FormatText-WithLinks-0.14
 	>=dev-perl/HTML-Mason-1.43
 	>=dev-perl/HTML-Scrubber-0.08
 	>=dev-perl/HTTP-Server-Simple-0.34
 	>=dev-perl/HTTP-Server-Simple-Mason-0.14
+	>=dev-perl/Log-Dispatch-2.410.0
 	>=dev-perl/MIME-tools-5.425
 	>=dev-perl/MailTools-1.60
 	>=dev-perl/Module-Versions-Report-1.05
@@ -42,16 +43,15 @@ DEPEND="
 	>=dev-perl/Text-WikiFormat-0.76
 	>=dev-perl/Tree-Simple-1.04
 	>=dev-perl/XML-RSS-1.05
-	>=dev-perl/Class-ReturnValue-0.40
-	>=dev-perl/dbix-searchbuilder-1.59
+	>=dev-perl/dbix-searchbuilder-1.660.0
 	>=dev-perl/locale-maketext-lexicon-0.32
-	>=dev-perl/Log-Dispatch-2.230.0
 	>=virtual/perl-CGI-4
 	>=virtual/perl-Digest-MD5-2.27
+	>=virtual/perl-Encode-2.730.0
 	>=virtual/perl-File-Spec-0.8
 	>=virtual/perl-Getopt-Long-2.24
-	>=virtual/perl-Storable-2.08
 	>=virtual/perl-Locale-Maketext-1.06
+	>=virtual/perl-Storable-2.08
 	dev-perl/CGI-Emulate-PSGI
 	dev-perl/CGI-PSGI
 	dev-perl/Cache-Simple-TimedExpiry
@@ -92,8 +92,8 @@ DEPEND="
 	dev-perl/Plack
 	dev-perl/Regexp-Common-net-CIDR
 	dev-perl/Regexp-IPv6
-	dev-perl/String-ShellQuote
 	dev-perl/Starlet
+	dev-perl/String-ShellQuote
 	dev-perl/TermReadKey
 	dev-perl/Text-Password-Pronounceable
 	dev-perl/Time-modules
@@ -106,10 +106,10 @@ DEPEND="
 	dev-perl/text-autoformat
 	dev-perl/text-template
 	dev-perl/text-wrapper
+	virtual/perl-Digest
 	virtual/perl-File-Temp
 	virtual/perl-Scalar-List-Utils
 	virtual/perl-Time-HiRes
-	virtual/perl-Digest
 	virtual/perl-libnet
 
 	fastcgi? (
@@ -195,10 +195,13 @@ src_prepare() {
 	sed -e "s|PREFIX|${ED}/${MY_HOSTROOTDIR}/${PF}|g" \
 		-e "s|HTMLDIR|${ED}/${MY_HTDOCSDIR}|g" \
 		-e 's|/\+|/|g' \
-		-i ./config.layout || die
+		-i ./config.layout || die 'config sed failed'
 
 	# don't need to check dev dependencies
-	sed -e "s|\$args{'with-DEV'} =1;|#\$args{'with-DEV'} =1;|" -i sbin/rt-test-dependencies.in || die
+	sed -e "s|\$args{'with-DEV'} =1;|#\$args{'with-DEV'} =1;|" \
+		-i sbin/rt-test-dependencies.in || die 'dev sed failed'
+
+	epatch "${FILESDIR}/rt-makefile-serialize-install-prereqs.patch"
 }
 
 src_configure() {
@@ -258,7 +261,7 @@ src_install() {
 	webapp_src_preinst
 	emake install
 
-	dodoc -r docs
+	dodoc -r docs/*
 	# Disable compression because `perldoc` doesn't decompress transparently
 	docompress -x /usr/share/doc
 
@@ -276,8 +279,6 @@ src_install() {
 		newinitd "${FILESDIR}"/${PN}.init.d.2 ${PN}
 		newconfd "${FILESDIR}"/${PN}.conf.d.2 ${PN}
 		sed -i -e "s/@@PF@@/${PF}/g" "${ED}"/etc/conf.d/${PN} || die
-	else
-		doins "${FILESDIR}"/rt_apache2{,_fcgi}.conf
 	fi
 
 	# require the web server's permissions
diff --git a/www-servers/tornado/metadata.xml b/www-servers/tornado/metadata.xml
index cc570cc2dd93..735a0f7a47aa 100644
--- a/www-servers/tornado/metadata.xml
+++ b/www-servers/tornado/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
   <herd>python</herd>
   <maintainer>
-	<email>alunduil@genoo.org></email>
+	<email>alunduil@gentoo.org></email>
 	<name>Alex Brandt</name>
   </maintainer>
 </pkgmetadata>
diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
index 73b4691241c0..9a7d1521efe6 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -6,6 +6,7 @@ DIST NVIDIA-FreeBSD-x86-343.36.tar.gz 59205879 SHA256 8634e7537eca778790296f8355
 DIST NVIDIA-FreeBSD-x86-346.59.tar.gz 57992895 SHA256 6cb7ad1b38f4f01fea898f335452e95ebe350285c9dfe1bf83c73f450231c9ae SHA512 2e421047dc850c6d3071df17f1507ce4f925ba05adca8efd01e3b6c2451cc45231e077aa4df29b398b99a44ff054b84555803b4d9bf6c11fb681706d3b5c1e50 WHIRLPOOL 88c965f850d6c9daaa27d95124ca456f0484581c1901026fe1becf2c6932cd2ee4e8bffaeca7c0239971f7418bee4565af96ba7e2eebd3b6e60dcc244df20abb
 DIST NVIDIA-FreeBSD-x86-346.72.tar.gz 57987372 SHA256 2a630e349f20795b5660542e3f22c595826779ed7c92d8bac4e11c8418e8fd79 SHA512 6b49597b7fc7c6bbbf1d2a65573f8dcb30f84e648a2ef756a4377a4caa1633c36f87bf2b456d33f52ec310f1598d760177f5b7afe3728e01285d4cede89803d6 WHIRLPOOL 86da1cdbdab5dc6fc6b362d8492b4f7b00dd33dff064a2ea13a8eaaddf8e426f2de57b4369b3e551914d9afc627be1b8e3a5b4bdf88aecd323f7ac51b4e6f833
 DIST NVIDIA-FreeBSD-x86-349.16.tar.gz 59441939 SHA256 d8b633790036f032b48196503bc6a85ca82de54edd2409f7c1ec86c053e89e07 SHA512 7d914c74b8b4b50931f27f085ca587fab9a4ba0dafab1cdbb751605cdf702b84e2e31b999b374c7adaa096d6dac6268e9b2ff6fcde5ac37b6dbdfd0ebf4a1422 WHIRLPOOL ab68e75c05a0cf2df803fcf3755c366a04cf6f973bb02b673df58dcdee6cb13a4cb5e6fec5270918c725603780b2fefbb89927789b92ddd01647852d34562b9a
+DIST NVIDIA-FreeBSD-x86-352.09.tar.gz 54961099 SHA256 888499b825e46e5a479828204ef1492dfbf2d9ce2bef9ba5c75ef228f8e17173 SHA512 002bb20ef61bbdd7af0cce70cfae1f8b627acaaf0b47be71cf428c9216b842e6f23c7c8a5f19d52ed4c9d9a091f3a7a4a3739d592970e6067e6d30e5239527cf WHIRLPOOL 2913ee8ec74692754de9583854a2b0875da55449bdce2b1d17f36d2739f273a97eeb82d724e5ecd287134a70e4ea1513762d629cd0f2f11b8e4e5b8aebec5375
 DIST NVIDIA-FreeBSD-x86-96.43.23.tar.gz 15463464 SHA256 18d855db8381eda1a6cf548c9e5095fc5bb8694bf1d6e24fc1072fba4e54cd78 SHA512 42d7b1b76cdb3b23680363e565614a22112162a5dd3639cb804fe670c0c3f3f23595bbefa3f78afdc6a8ca848446dee853c7a355f2c96a0d01b354753ba2785c WHIRLPOOL f8e59ce521990cd9edee441e73f973f074db492952807a0931e362102874cddbb47604ff5c5eb20a0cbde27f9b6d4e440dd12cc2e5a20c9cb65bf3c0b3e62511
 DIST NVIDIA-FreeBSD-x86_64-304.125.tar.gz 35498616 SHA256 46b14b8c5ee1c02ff5e30afc9c99f4dd2edc426ccb2b73764093a1787639699d SHA512 34d48f24b1f5019b23c2937f8b5280fcc596764e1f5833cfe33db5e4d8395a0d69aa4c4214a5b97620dbaade73ac0fa333c36cceb4a137bb26d3ba37c31a0eb7 WHIRLPOOL 82677bd2aec3a60fe64211170573ef702b1dd1ab5a71ec922fb56b8d40f2163c0151a7c7f8bdace9127c8afcaf278f8f23a1cb585a8ad3bb7a0d42787ab17fb2
 DIST NVIDIA-FreeBSD-x86_64-331.113.tar.gz 47509194 SHA256 c848e187c79064ea3f52406312aa09d06f0aaef5063be7522b2b2319c43c872c SHA512 4e206719afcee47179e0756ac67fc4e61d513efb1cd0264b28726d6de16846feee873a2df362bf645b0527d395b6d82f5b54dbc447bccb74128d7bff37bb7b1b WHIRLPOOL a51b0bd9f7301d9bb76b54ffa44337ad4d875125281c4b9921e66a76d434879832f542df9c6ba436ef83fb3fa0afe5197f3425f1b7aa16274aca5080259f343d
@@ -14,6 +15,7 @@ DIST NVIDIA-FreeBSD-x86_64-343.36.tar.gz 60045074 SHA256 aa189d9fd6448ed49ff4a8d
 DIST NVIDIA-FreeBSD-x86_64-346.59.tar.gz 58735813 SHA256 074840aeacb8965f14bc312db432efa320f97380bb8b21bb9cf1b242384d6651 SHA512 23c74f4ee9268b0583cee06b4e2109d33547a0e8789a67d7450b056f657d745930b834a5831a8709b9a095bcc63dbc76cbee219240519490ece1e40e2bf413eb WHIRLPOOL 985fe2fc59b38f3babaf534d7d04924b1d43ce3bc42b71420ea426f99ecbaed98aed5224bb5d30fbcc2b44978f38d8e812767a2bb7ee41c1d551c32bb345dc8d
 DIST NVIDIA-FreeBSD-x86_64-346.72.tar.gz 58751579 SHA256 efdf4536b0689a65e95fae28c9f8fc27dad817bae8a3101a52c07d0191245ae2 SHA512 c52a51766cd96f5f80f808f8e173a2d8816cf896bcc1be5c6dcb8c0d834c2978fe5a46b78bd2c022cc22f513578d6e9c5ded6677b5e43df03ad7a2c19c89c936 WHIRLPOOL 856caa2dfe040a2a807d55300d2b365ad349c5beb752cf579067c45e987a118fe205bf1e0d12ccc241e7e982c0a31283f95cd6a81bb553d63355f44031c6ceb0
 DIST NVIDIA-FreeBSD-x86_64-349.16.tar.gz 60290477 SHA256 b4cb3f3738f8a68b90fb7830ff9b48d9f1e51d3aa6e2dd555b690b4848101a86 SHA512 47c3f59f76b644e5ac69197a22ec8d17d764aa9090049633d274c579d59af8b36780e7a1aa97fa92414eb3c0e76d36e7bdf317f20ed2647482866cd5575f134d WHIRLPOOL a5455b5329211f92ca8f6e87fb796d9844e293878d4a64d2ef6a40a15b57687e66ab81baefb0132790d922b6b4e0c577469c75f98ad208433e14760cc77c6bf7
+DIST NVIDIA-FreeBSD-x86_64-352.09.tar.gz 56595665 SHA256 3235bd2f73eb183fa23efdceabcf7057d9887acf42aa0450b545e04ff6512a27 SHA512 a89fe101bab5e393975fd509fb107358b139130fba88e5aaa5910b4f40b87729a9e1b383416308c90618d74b807b2ac6bf00e5db01057a32e564ed2bed3b03fd WHIRLPOOL 3ed28a2d72429a80787421d0a10073ad8c0dbb64ae7bbf99787711bf3179e4fc98b01ae4688f6b10d89a08db2310ede9eb5df7c2c627385d30ae95da96d3290a
 DIST NVIDIA-Linux-x86-173.14.39-pkg0.run 15134997 SHA256 a09935f37121ed3db8ae3da63a0d8e9d4348a19c859811c9fe44d6ce8e3eab23 SHA512 e24e15ccec725d3cbca502c2b77061776a81ef92917a950adec4ff6bdc34f10903aa654433177ea74be0dade4af81c5380d5710d375a5ea445940d06154bde93 WHIRLPOOL fce3d8e4f6cdf698f5a057514b6fe220bb1011025bdce5bd4cf0e424fb4d306d38251b6726bda03f290ea8137d5a95ed418cf8751722879f9042462abd9181b6
 DIST NVIDIA-Linux-x86-304.125.run 40589395 SHA256 aec5b3a792910e152d5af756ef6fd7224c448c564564c7c448ab8ec3fc78c4f7 SHA512 cd77736790876b66c1e88bf30b7a93f755c0f94118edda8fde1701dc07dc4eb60f89a27b0ed432db74729f269cb239f32f3c5e045d701f60baf69da7fc0d0ea7 WHIRLPOOL 85cd375e1b67bbabe9a8119affec20b7a9a258f8b5be89d755f7ea596a94f98df053e8ade33f1aba1f74f753dcb636268c4f2074a09eaf68d858241f1482552c
 DIST NVIDIA-Linux-x86-331.113.run 37300924 SHA256 42535a99ab68452d30d9c3fad2fb162db01d1f6821115a3c1733ed203efd588b SHA512 bc820609e0379cc5805a5428cc364795b8a5d9e5a2a4395a1ddaa1dda85e6acc59368f87f5974a39fb42bd272458627b2c742fbf1f7fedddb17102439883b111 WHIRLPOOL 1d7b5cb8be5bb76dbe1b238aab4e39ccda0e5b07da268f0652966e79d5e0d2192773316d8f22a2d6a551305b17b610242918822e94e43263c9dbfba8a48bf49b
@@ -22,6 +24,7 @@ DIST NVIDIA-Linux-x86-343.36.run 41073259 SHA256 8cc1c99fbda29b3258f57dbdacef119
 DIST NVIDIA-Linux-x86-346.59.run 41370855 SHA256 65cf83fccc02399d54212cbeea1c2364e4974687c3ad6cba87cc109476ad2129 SHA512 f7fd76cd4c73528c9476494e1a35b27dedbbbdc4a190ae5909c27b8e1b0c3ef5c446ef40c199b245eaf39621eda55ef8d4f4adbe8d2d75b8d5f1ba14f703c56c WHIRLPOOL 2895275d549084c596396f6dd7a25f040a4af52c70090ed393f3eb409edb2cbfc17c622d0fd200b44e1ba3e4d4e3f2f6ea11a8c379e81e8c2bc514eb8e0fafcf
 DIST NVIDIA-Linux-x86-346.72.run 41349283 SHA256 1c3de9895809eb4a61306a46902d12ddfc6c6305ac99d369c56270a962200c2e SHA512 3db4221dd6e0be90023b29d626026756003b90321d84e5b65c2ec3872f2b8571ab39289497a90fe2b196acacafbbf3b6d364ef6adea129942672667ce9689eb4 WHIRLPOOL 9bdf95ba10913f961cc20c4c676654fda6edd44439cdac370f5fd06fae3934f3de18082b31e4e478a386d49055851a7211d11abf0543e33f55e9039ca8fbf810
 DIST NVIDIA-Linux-x86-349.16.run 42751511 SHA256 35c8d00ece6a450e8e72aac2bff45e89ce40ffbe3278802e8a0b4ff65c793d11 SHA512 d3609c4ccfbf6b005a8c58dc5bc3091c7b603229bb27bf48c545fafd9d7175a06ab4d5b414586a5234f2699bed4f613b809c058dff4e1f5fe4416adc53c4d3ab WHIRLPOOL ff4ff2f83e50c6675ec35035a2bd0d534acfb2f8fbb4d5b2d00770dae3b4f48db83fa789c57a6f958f13d8bdbb68971c5ba10cf2fc7b0c4a5a8cb836a09d4586
+DIST NVIDIA-Linux-x86-352.09.run 42942607 SHA256 a799e5e9016f23dd7f69a74844652dcebdf0f655bf2d8b72370e22b19e8b98d3 SHA512 07426cfccc526c0d701050bad71c6d16d2b702e03b0287c9205fd0c7642e0072bdd28ad771b5e8f4e949a5826989ed340ed44eb2e23653db2af3d58dce928583 WHIRLPOOL fcdac943b5fcc70a0d8586d5914377bff6681556d497edea6f670f26a93d0add5ff9efbb45b4cb9ca69a03d0d2a93c5de23b9bb2e344cdea52bcd06825b57fdd
 DIST NVIDIA-Linux-x86-96.43.23-pkg0.run 11504817 SHA256 51e6adf4ba73071622045fc37169f80db3ae3e784dff53b29d35146a04042142 SHA512 bed5726e57637481fe4e3c03a65ec14fe949f00860e729ebde408f4fd861d7bfdc296a78bc2f5d42e8b282db09f4bbde1e0545df7228fa20227080dc4b868ba7 WHIRLPOOL 6d4fd1786c11f4e326cc3101d0bb1a2f8b63c25c3dd59f10188f8355759e2861ce44fd53d60258b513d5a1d6124d0f91ba8edf4d3668b6feabfb3e8d585f14fe
 DIST NVIDIA-Linux-x86_64-173.14.39-pkg2.run 21100833 SHA256 15a953666d5681ba54c97498b578ffd286a1dc96d605f3b02110f3f99813100e SHA512 a65cd496e6ed57f771c3d99f37f616a1242d97844f6faef7a807825ad899c0e536a99fde397020839f0857883b934032f9491024f3047a6b06d3eea1f5d77713 WHIRLPOOL dc5f243b7d1de7e2d1b7f005e018a2940d63335b11a7c83c234b348b7a1839e9131169d2ea928bd8c2f549a4535149b03e16e6c94d59dfa745f7f904ff790a45
 DIST NVIDIA-Linux-x86_64-304.125.run 69108272 SHA256 c654889b85a18326f2c610260a8fbc3b1bb6f9b8be1c052a46a213f60bd62262 SHA512 75bd5700281b0aa4e19be5b779e3484711ce3db92641a32f3bf5e890601b353b23113f6218d5a2fa6b2c8d93702fac92810013c7c0f8efe484b0a39d09b1b073 WHIRLPOOL d8b9794253b1ab270680da7420f50df5ab6aa4d5123bad695be5b7891b2df55bf06ecdd0b221fd29e799077c0a64da8059df16ebea9a3535e402f2c0cf482dcf
@@ -31,4 +34,5 @@ DIST NVIDIA-Linux-x86_64-343.36.run 73775989 SHA256 2285efa2c0e6675d8724e47a0940
 DIST NVIDIA-Linux-x86_64-346.59.run 73468725 SHA256 231020548431569c0172605815ba131a18f969966b4abf82129f974740bc64ca SHA512 a8d2cfcf750c4f0f155450a50132e1c2a6736212d654ab5539f1dd17233ed6f9ed64777f73f2b394e236d27abee4f4c7a344855372a641552ea40a8973fddfe9 WHIRLPOOL 0e919b147c9088106a8a3bf138262998a02b0da71c8e656d6b888f952e19b11ad8a0b6b4eee6e7181a8421aa2f0b4be86b82c0a14282e56e135f80e1c00aa659
 DIST NVIDIA-Linux-x86_64-346.72.run 74095832 SHA256 2ae3777bcff6bf4883b6a903c82b82257bf8fc323fe174992df96a3208c50cef SHA512 22c665be4d4f784029e148e907ef9d747b9cff55904fe64a0893ac8675fd97e9b6100791aba82974ee6bde03e3917b5521d1487c325b2c0f7011cd78b00f7347 WHIRLPOOL 6f73ba2b0557997056113e64820dd1d92afc5bec2ea98374bcde8ade6c1754b041943e4208b984c1ca190f46e4cb32efb8059df6411f478627c10464cba63798
 DIST NVIDIA-Linux-x86_64-349.16.run 77513301 SHA256 f980b22729b20c9eb3a3a800af524da181afbc78e2409a3f83845894983f8322 SHA512 143999f5401ac8634049786073203fab7e8d23dc9e0d4d62d4c6ba9945c20f7d4034c37d0f721aae540503f6bcffbf200a0af70520ae7ee10a2529ed92a14866 WHIRLPOOL 9a6817c03d11253ed606294d2cc2b5f2c4c612af2f8b6f72228a9e21d4991f8bcf248a28ff70d6f477860a64bcf795ec0ee2f73c34904e5cdf0979d41e370042
+DIST NVIDIA-Linux-x86_64-352.09.run 77584888 SHA256 a3ec271896b775c936e1a14e7af2e8ebf02b0bd59381217510185b313c5a5fd6 SHA512 36c3aecbf0cec492d29905c0b1d0bfa09e93d596d6a49dde1ddebae917de3c2e4941591b520729cd1f8139d1cf66c3bc86144213fbe04c264fa1120aebdd0dbc WHIRLPOOL 9f49beafa66b2f2d124aa2f2f42a876e9b10ae88da75062f02ccd7d471feffccf10ff13212f805dd86f20ede53da27dd1fe45a26586edda3bd3d0d72e8aa8b76
 DIST NVIDIA-Linux-x86_64-96.43.23-pkg2.run 15962375 SHA256 ce8d8253e7dab7da63fbdac449ebf190cd0c10cbfffea0f8d0165515f851bc64 SHA512 04bec1187a6024a2b9839f008ec829281f1f2602dae2e639030bc385943186506bcaa2b46a230b2ab87f9217190841abc62f9e2d6395ab5559623389c31c6563 WHIRLPOOL 0651c44a51a1a06fcff5bfddbf9c3e408977e03263c7fe806cb6c01f9fe92f716dfe4e5190ffe1048bde72fcffdc8bca8267e74dd43ba5c9dfb22b6201fcc2bb
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-352.09.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-352.09.ebuild
new file mode 100644
index 000000000000..d9bee1cd2a90
--- /dev/null
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-352.09.ebuild
@@ -0,0 +1,494 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-352.09.ebuild,v 1.1 2015/05/19 05:52:25 jer Exp $
+
+EAPI=5
+
+inherit eutils flag-o-matic linux-info linux-mod multilib nvidia-driver \
+	portability toolchain-funcs unpacker user udev
+
+NV_URI="http://us.download.nvidia.com/XFree86/"
+X86_NV_PACKAGE="NVIDIA-Linux-x86-${PV}"
+AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
+X86_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86-${PV}"
+AMD64_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86_64-${PV}"
+
+DESCRIPTION="NVIDIA Accelerated Graphics Driver"
+HOMEPAGE="http://www.nvidia.com/"
+SRC_URI="
+	amd64-fbsd? ( ${NV_URI}FreeBSD-x86_64/${PV}/${AMD64_FBSD_NV_PACKAGE}.tar.gz )
+	amd64? ( ${NV_URI}Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}.run )
+	x86-fbsd? ( ${NV_URI}FreeBSD-x86/${PV}/${X86_FBSD_NV_PACKAGE}.tar.gz )
+	x86? ( ${NV_URI}Linux-x86/${PV}/${X86_NV_PACKAGE}.run )
+"
+
+LICENSE="GPL-2 NVIDIA-r2"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86 ~amd64-fbsd ~x86-fbsd"
+RESTRICT="bindist mirror strip"
+EMULTILIB_PKG="true"
+
+IUSE="acpi multilib kernel_FreeBSD kernel_linux pax_kernel +tools gtk2 gtk3 +X uvm"
+REQUIRED_USE="
+	tools? ( X || ( gtk2 gtk3 ) )
+"
+
+COMMON="
+	app-eselect/eselect-opencl
+	kernel_linux? ( >=sys-libs/glibc-2.6.1 )
+	X? (
+		>=app-eselect/eselect-opengl-1.0.9
+	)
+"
+DEPEND="
+	${COMMON}
+	app-arch/xz-utils
+	kernel_linux? ( virtual/linux-sources )
+"
+RDEPEND="
+	${COMMON}
+	acpi? ( sys-power/acpid )
+	tools? (
+		dev-libs/atk
+		dev-libs/glib:2
+		x11-libs/gdk-pixbuf
+		gtk2? ( >=x11-libs/gtk+-2.4:2 )
+		gtk3? ( x11-libs/gtk+:3 )
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/pango[X]
+	)
+	X? (
+		<x11-base/xorg-server-1.17.99:=
+		>=x11-libs/libvdpau-0.3-r1
+		multilib? (
+			|| (
+				 (
+					>=x11-libs/libX11-1.6.2[abi_x86_32]
+					>=x11-libs/libXext-1.3.2[abi_x86_32]
+				 )
+				app-emulation/emul-linux-x86-xlibs
+			)
+		)
+	)
+"
+
+QA_PREBUILT="opt/* usr/lib*"
+
+S=${WORKDIR}/
+
+pkg_pretend() {
+	if use amd64 && has_multilib_profile && \
+		[ "${DEFAULT_ABI}" != "amd64" ]; then
+		eerror "This ebuild doesn't currently support changing your default ABI"
+		die "Unexpected \${DEFAULT_ABI} = ${DEFAULT_ABI}"
+	fi
+
+	if use kernel_linux && kernel_is ge 4 1 ; then
+		ewarn "Gentoo supports kernels which are supported by NVIDIA"
+		ewarn "which are limited to the following kernels:"
+		ewarn "<sys-kernel/gentoo-sources-4.1"
+		ewarn "<sys-kernel/vanilla-sources-4.1"
+		ewarn ""
+		ewarn "You are free to utilize epatch_user to provide whatever"
+		ewarn "support you feel is appropriate, but will not receive"
+		ewarn "support as a result of those changes."
+		ewarn ""
+		ewarn "Do not file a bug report about this."
+	fi
+
+	# Since Nvidia ships 3 different series of drivers, we need to give the user
+	# some kind of guidance as to what version they should install. This tries
+	# to point the user in the right direction but can't be perfect. check
+	# nvidia-driver.eclass
+	nvidia-driver-check-warning
+
+	# Kernel features/options to check for
+	CONFIG_CHECK="~ZONE_DMA ~MTRR ~SYSVIPC ~!LOCKDEP"
+	use x86 && CONFIG_CHECK+=" ~HIGHMEM"
+
+	# Now do the above checks
+	use kernel_linux && check_extra_config
+}
+
+pkg_setup() {
+	# try to turn off distcc and ccache for people that have a problem with it
+	export DISTCC_DISABLE=1
+	export CCACHE_DISABLE=1
+
+	if use kernel_linux; then
+		MODULE_NAMES="nvidia(video:${S}/kernel)"
+		use uvm && MODULE_NAMES+=" nvidia-uvm(video:${S}/kernel/uvm)"
+
+		# This needs to run after MODULE_NAMES (so that the eclass checks
+		# whether the kernel supports loadable modules) but before BUILD_PARAMS
+		# is set (so that KV_DIR is populated).
+		linux-mod_pkg_setup
+
+		BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} \
+		SYSOUT=${KV_OUT_DIR} CC=$(tc-getBUILD_CC)"
+
+		# linux-mod_src_compile calls set_arch_to_kernel, which
+		# sets the ARCH to x86 but NVIDIA's wrapping Makefile
+		# expects x86_64 or i386 and then converts it to x86
+		# later on in the build process
+		BUILD_FIXES="ARCH=$(uname -m | sed -e 's/i.86/i386/')"
+	fi
+
+	# set variables to where files are in the package structure
+	if use kernel_FreeBSD; then
+		use x86-fbsd   && S="${WORKDIR}/${X86_FBSD_NV_PACKAGE}"
+		use amd64-fbsd && S="${WORKDIR}/${AMD64_FBSD_NV_PACKAGE}"
+		NV_DOC="${S}/doc"
+		NV_OBJ="${S}/obj"
+		NV_SRC="${S}/src"
+		NV_MAN="${S}/x11/man"
+		NV_X11="${S}/obj"
+		NV_SOVER=1
+	elif use kernel_linux; then
+		NV_DOC="${S}"
+		NV_OBJ="${S}"
+		NV_SRC="${S}/kernel"
+		NV_MAN="${S}"
+		NV_X11="${S}"
+		NV_SOVER=${PV}
+	else
+		die "Could not determine proper NVIDIA package"
+	fi
+}
+
+src_prepare() {
+	# Please add a brief description for every added patch
+
+	if use kernel_linux; then
+		if kernel_is lt 2 6 9 ; then
+			eerror "You must build this against 2.6.9 or higher kernels."
+		fi
+
+		# If greater than 2.6.5 use M= instead of SUBDIR=
+#		convert_to_m "${NV_SRC}"/Makefile.kbuild
+	fi
+
+	if use pax_kernel; then
+		ewarn "Using PAX patches is not supported. You will be asked to"
+		ewarn "use a standard kernel should you have issues. Should you"
+		ewarn "need support with these patches, contact the PaX team."
+		epatch "${FILESDIR}"/${PN}-346.16-pax-usercopy.patch
+		epatch "${FILESDIR}"/${PN}-346.16-pax-constify.patch
+	fi
+
+	# Allow user patches so they can support RC kernels and whatever else
+	epatch_user
+}
+
+src_compile() {
+	# This is already the default on Linux, as there's no toplevel Makefile, but
+	# on FreeBSD there's one and triggers the kernel module build, as we install
+	# it by itself, pass this.
+
+	cd "${NV_SRC}"
+	if use kernel_FreeBSD; then
+		MAKE="$(get_bmake)" CFLAGS="-Wno-sign-compare" emake CC="$(tc-getCC)" \
+			LD="$(tc-getLD)" LDFLAGS="$(raw-ldflags)" || die
+	elif use kernel_linux; then
+		MAKEOPTS=-j1
+		linux-mod_src_compile
+	fi
+}
+
+# Install nvidia library:
+# the first parameter is the library to install
+# the second parameter is the provided soversion
+# the third parameter is the target directory if its not /usr/lib
+donvidia() {
+	# Full path to library minus SOVER
+	MY_LIB="$1"
+
+	# SOVER to use
+	MY_SOVER="$2"
+
+	# Where to install
+	MY_DEST="$3"
+
+	if [[ -z "${MY_DEST}" ]]; then
+		MY_DEST="/usr/$(get_libdir)"
+		action="dolib.so"
+	else
+		exeinto ${MY_DEST}
+		action="doexe"
+	fi
+
+	# Get just the library name
+	libname=$(basename $1)
+
+	# Install the library with the correct SOVER
+	${action} ${MY_LIB}.${MY_SOVER} || \
+		die "failed to install ${libname}"
+
+	# If SOVER wasn't 1, then we need to create a .1 symlink
+	if [[ "${MY_SOVER}" != "1" ]]; then
+		dosym ${libname}.${MY_SOVER} \
+			${MY_DEST}/${libname}.1 || \
+			die "failed to create ${libname} symlink"
+	fi
+
+	# Always create the symlink from the raw lib to the .1
+	dosym ${libname}.1 \
+		${MY_DEST}/${libname} || \
+		die "failed to create ${libname} symlink"
+}
+
+src_install() {
+	if use kernel_linux; then
+		linux-mod_src_install
+
+		# Add the aliases
+		# This file is tweaked with the appropriate video group in
+		# pkg_preinst, see bug #491414
+		insinto /etc/modprobe.d
+		newins "${FILESDIR}"/nvidia-169.07 nvidia.conf
+		use uvm && doins "${FILESDIR}"/nvidia-uvm.conf
+
+		# Ensures that our device nodes are created when not using X
+		exeinto "$(get_udevdir)"
+		doexe "${FILESDIR}"/nvidia-udev.sh
+		udev_newrules "${FILESDIR}"/nvidia.udev-rule 99-nvidia.rules
+	elif use kernel_FreeBSD; then
+		if use x86-fbsd; then
+			insinto /boot/modules
+			doins "${S}/src/nvidia.kld"
+		fi
+
+		exeinto /boot/modules
+		doexe "${S}/src/nvidia.ko"
+	fi
+
+	# NVIDIA kernel <-> userspace driver config lib
+	donvidia ${NV_OBJ}/libnvidia-cfg.so ${NV_SOVER}
+
+	# NVIDIA framebuffer capture library
+	donvidia ${NV_OBJ}/libnvidia-fbc.so ${NV_SOVER}
+
+	# NVIDIA video encode/decode <-> CUDA
+	if use kernel_linux; then
+		donvidia ${NV_OBJ}/libnvcuvid.so ${NV_SOVER}
+		donvidia ${NV_OBJ}/libnvidia-encode.so ${NV_SOVER}
+	fi
+
+	if use X; then
+		# Xorg DDX driver
+		insinto /usr/$(get_libdir)/xorg/modules/drivers
+		doins ${NV_X11}/nvidia_drv.so
+
+		# Xorg GLX driver
+		donvidia ${NV_X11}/libglx.so ${NV_SOVER} \
+			/usr/$(get_libdir)/opengl/nvidia/extensions
+
+		# Xorg nvidia.conf
+		if has_version '>=x11-base/xorg-server-1.16'; then
+			insinto /usr/share/X11/xorg.conf.d
+			newins {,50-}nvidia-drm-outputclass.conf
+		fi
+	fi
+
+	# OpenCL ICD for NVIDIA
+	if use kernel_linux; then
+		insinto /etc/OpenCL/vendors
+		doins ${NV_OBJ}/nvidia.icd
+	fi
+
+	# Documentation
+	dohtml ${NV_DOC}/html/*
+	if use kernel_FreeBSD; then
+		dodoc "${NV_DOC}/README"
+		use X && doman "${NV_MAN}/nvidia-xconfig.1"
+		use tools && doman "${NV_MAN}/nvidia-settings.1"
+	else
+		# Docs
+		newdoc "${NV_DOC}/README.txt" README
+		dodoc "${NV_DOC}/NVIDIA_Changelog"
+		doman "${NV_MAN}/nvidia-smi.1.gz"
+		use X && doman "${NV_MAN}/nvidia-xconfig.1.gz"
+		use tools && doman "${NV_MAN}/nvidia-settings.1.gz"
+		doman "${NV_MAN}/nvidia-cuda-mps-control.1.gz"
+	fi
+
+	# Helper Apps
+	exeinto /opt/bin/
+
+	if use X; then
+		doexe ${NV_OBJ}/nvidia-xconfig
+	fi
+
+	if use kernel_linux ; then
+		doexe ${NV_OBJ}/nvidia-cuda-mps-control
+		doexe ${NV_OBJ}/nvidia-cuda-mps-server
+		doexe ${NV_OBJ}/nvidia-debugdump
+		doexe ${NV_OBJ}/nvidia-persistenced
+		doexe ${NV_OBJ}/nvidia-smi
+
+		# install nvidia-modprobe setuid and symlink in /usr/bin (bug #505092)
+		doexe ${NV_OBJ}/nvidia-modprobe
+		fowners root:video /opt/bin/nvidia-modprobe
+		fperms 4710 /opt/bin/nvidia-modprobe
+		dosym /{opt,usr}/bin/nvidia-modprobe
+
+		doman nvidia-cuda-mps-control.1.gz
+		doman nvidia-modprobe.1.gz
+		doman nvidia-persistenced.1.gz
+		newinitd "${FILESDIR}/nvidia-smi.init" nvidia-smi
+		newconfd "${FILESDIR}/nvidia-persistenced.conf" nvidia-persistenced
+		newinitd "${FILESDIR}/nvidia-persistenced.init" nvidia-persistenced
+	fi
+
+	if use tools; then
+		doexe ${NV_OBJ}/nvidia-settings
+		use gtk2 && donvidia libnvidia-gtk2.so ${PV}
+		use gtk3 && donvidia libnvidia-gtk3.so ${PV}
+		insinto /usr/share/nvidia/
+		doins nvidia-application-profiles-${PV}-key-documentation
+		insinto /etc/nvidia
+		newins nvidia-application-profiles-${PV}-rc nvidia-application-profiles-rc
+	fi
+
+	dobin ${NV_OBJ}/nvidia-bug-report.sh
+
+	# Desktop entries for nvidia-settings
+	if use tools ; then
+		# There is no icon in the FreeBSD tarball.
+		use kernel_FreeBSD || newicon ${NV_OBJ}/nvidia-settings.png ${PN}-settings.png
+		domenu "${FILESDIR}"/${PN}-settings.desktop
+		exeinto /etc/X11/xinit/xinitrc.d
+		doexe "${FILESDIR}"/95-nvidia-settings
+	fi
+
+	#doenvd "${FILESDIR}"/50nvidia-prelink-blacklist
+
+	if has_multilib_profile && use multilib ; then
+		local OABI=${ABI}
+		for ABI in $(get_install_abis) ; do
+			src_install-libs
+		done
+		ABI=${OABI}
+		unset OABI
+	else
+		src_install-libs
+	fi
+
+	is_final_abi || die "failed to iterate through all ABIs"
+
+	readme.gentoo_create_doc
+}
+
+src_install-libs() {
+	local inslibdir=$(get_libdir)
+	local GL_ROOT="/usr/$(get_libdir)/opengl/nvidia/lib"
+	local CL_ROOT="/usr/$(get_libdir)/OpenCL/vendors/nvidia"
+	local libdir=${NV_OBJ}
+
+	if use kernel_linux && has_multilib_profile && \
+			[[ ${ABI} == "x86" ]] ; then
+		libdir=${NV_OBJ}/32
+	fi
+
+	if use X; then
+		# The GLX libraries
+		donvidia ${libdir}/libEGL.so ${NV_SOVER} ${GL_ROOT}
+		donvidia ${libdir}/libGL.so ${NV_SOVER} ${GL_ROOT}
+		donvidia ${libdir}/libGLESv1_CM.so ${NV_SOVER} ${GL_ROOT}
+		donvidia ${libdir}/libnvidia-eglcore.so ${NV_SOVER}
+		donvidia ${libdir}/libnvidia-glcore.so ${NV_SOVER}
+		donvidia ${libdir}/libnvidia-glsi.so ${NV_SOVER}
+		donvidia ${libdir}/libnvidia-ifr.so ${NV_SOVER}
+		if use kernel_FreeBSD; then
+			donvidia ${libdir}/libnvidia-tls.so ${NV_SOVER}
+		else
+			donvidia ${libdir}/tls/libnvidia-tls.so ${NV_SOVER}
+		fi
+
+		# VDPAU
+		donvidia ${libdir}/libvdpau_nvidia.so ${NV_SOVER}
+
+		# GLES v2 libraries
+		insinto ${GL_ROOT}
+		doexe ${libdir}/libGLESv2.so.${PV}
+		dosym libGLESv2.so.${PV} ${GL_ROOT}/libGLESv2.so.2
+		dosym libGLESv2.so.2 ${GL_ROOT}/libGLESv2.so
+	fi
+
+	# NVIDIA monitoring library
+	if use kernel_linux ; then
+		donvidia ${libdir}/libnvidia-ml.so ${NV_SOVER}
+	fi
+
+	# CUDA & OpenCL
+	if use kernel_linux; then
+		donvidia ${libdir}/libcuda.so ${NV_SOVER}
+		donvidia ${libdir}/libnvidia-compiler.so ${NV_SOVER}
+		donvidia ${libdir}/libOpenCL.so 1.0.0 ${CL_ROOT}
+		donvidia ${libdir}/libnvidia-opencl.so ${NV_SOVER}
+	fi
+}
+
+pkg_preinst() {
+	if use kernel_linux; then
+		linux-mod_pkg_preinst
+
+		local videogroup="$(egetent group video | cut -d ':' -f 3)"
+		if [ -z "${videogroup}" ]; then
+			eerror "Failed to determine the video group gid"
+			die "Failed to determine the video group gid"
+		else
+			sed -i \
+				-e "s:PACKAGE:${PF}:g" \
+				-e "s:VIDEOGID:${videogroup}:" \
+				"${D}"/etc/modprobe.d/nvidia.conf || die
+		fi
+	fi
+
+	# Clean the dynamic libGL stuff's home to ensure
+	# we dont have stale libs floating around
+	if [ -d "${ROOT}"/usr/lib/opengl/nvidia ] ; then
+		rm -rf "${ROOT}"/usr/lib/opengl/nvidia/*
+	fi
+	# Make sure we nuke the old nvidia-glx's env.d file
+	if [ -e "${ROOT}"/etc/env.d/09nvidia ] ; then
+		rm -f "${ROOT}"/etc/env.d/09nvidia
+	fi
+}
+
+pkg_postinst() {
+	use kernel_linux && linux-mod_pkg_postinst
+
+	# Switch to the nvidia implementation
+	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old nvidia
+	"${ROOT}"/usr/bin/eselect opencl set --use-old nvidia
+
+	readme.gentoo_print_elog
+
+	if ! use X; then
+		elog "You have elected to not install the X.org driver. Along with"
+		elog "this the OpenGL libraries and VDPAU libraries were not"
+		elog "installed. Additionally, once the driver is loaded your card"
+		elog "and fan will run at max speed which may not be desirable."
+		elog "Use the 'nvidia-smi' init script to have your card and fan"
+		elog "speed scale appropriately."
+		elog
+	fi
+	if ! use tools; then
+		elog "USE=tools controls whether the nvidia-settings application"
+		elog "is installed. If you would like to use it, enable that"
+		elog "flag and re-emerge this ebuild. Optionally you can install"
+		elog "media-video/nvidia-settings"
+		elog
+	fi
+}
+
+pkg_prerm() {
+	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
+}
+
+pkg_postrm() {
+	use kernel_linux && linux-mod_pkg_postrm
+	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
+}
diff --git a/x11-misc/x11vnc/x11vnc-0.9.13_p20150111.ebuild b/x11-misc/x11vnc/x11vnc-0.9.13_p20150111.ebuild
index b199085c766e..fa14390261c9 100644
--- a/x11-misc/x11vnc/x11vnc-0.9.13_p20150111.ebuild
+++ b/x11-misc/x11vnc/x11vnc-0.9.13_p20150111.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/x11vnc/x11vnc-0.9.13_p20150111.ebuild,v 1.5 2015/05/15 11:54:45 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/x11vnc/x11vnc-0.9.13_p20150111.ebuild,v 1.6 2015/05/19 07:25:10 ago Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/LibVNC/x11vnc/archive/82eb9752485db87c9c6d3d6bb4aa1a
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="avahi crypt fbcon ssl xinerama"
 
 RDEPEND="
diff --git a/x11-terms/gnome-terminal/gnome-terminal-3.14.2-r2.ebuild b/x11-terms/gnome-terminal/gnome-terminal-3.14.2-r2.ebuild
index f90bb0008730..d4def482f4b7 100644
--- a/x11-terms/gnome-terminal/gnome-terminal-3.14.2-r2.ebuild
+++ b/x11-terms/gnome-terminal/gnome-terminal-3.14.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/gnome-terminal-3.14.2-r2.ebuild,v 1.3 2015/03/15 13:34:24 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/gnome-terminal-3.14.2-r2.ebuild,v 1.4 2015/05/19 14:10:09 tetromino Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -30,11 +30,15 @@ RDEPEND="
 	nautilus? ( >=gnome-base/nautilus-3 )
 "
 # gtk+:2 needed for gtk-builder-convert, bug 356239
+# itstool required for help/* with non-en LINGUAS, see bug #549358
+# xmllint required for glib-compile-resources, see bug #549304
 DEPEND="${RDEPEND}
 	app-text/yelp-tools
+	dev-libs/libxml2
 	dev-util/appdata-tools
 	dev-util/gdbus-codegen
 	|| ( dev-util/gtk-builder-convert <=x11-libs/gtk+-2.24.10:2 )
+	dev-util/itstool
 	>=dev-util/intltool-0.50
 	sys-devel/gettext
 	virtual/pkgconfig
@@ -62,9 +66,6 @@ src_configure() {
 		$(use_enable gnome-shell search-provider) \
 		$(use_with nautilus nautilus-extension) \
 		VALAC=$(type -P true)
-		# Docs are broken in this release.
-		#ITSTOOL=$(type -P true) \
-		#XMLLINT=$(type -P true)
 }
 
 src_install() {
diff --git a/x11-terms/gnome-terminal/gnome-terminal-3.14.3.ebuild b/x11-terms/gnome-terminal/gnome-terminal-3.14.3.ebuild
index f36a8e691663..a4c91904e5a4 100644
--- a/x11-terms/gnome-terminal/gnome-terminal-3.14.3.ebuild
+++ b/x11-terms/gnome-terminal/gnome-terminal-3.14.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/gnome-terminal-3.14.3.ebuild,v 1.1 2015/03/28 09:38:20 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/gnome-terminal-3.14.3.ebuild,v 1.2 2015/05/19 14:10:09 tetromino Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -29,12 +29,15 @@ RDEPEND="
 	gnome-shell? ( gnome-base/gnome-shell )
 	nautilus? ( >=gnome-base/nautilus-3 )
 "
-# gtk+:2 needed for gtk-builder-convert, bug 356239
+# itstool required for help/* with non-en LINGUAS, see bug #549358
+# xmllint required for glib-compile-resources, see bug #549304
 DEPEND="${RDEPEND}
 	app-text/yelp-tools
+	dev-libs/libxml2
 	dev-util/appdata-tools
 	dev-util/gdbus-codegen
 	dev-util/gtk-builder-convert
+	dev-util/itstool
 	>=dev-util/intltool-0.50
 	sys-devel/gettext
 	virtual/pkgconfig
@@ -52,9 +55,6 @@ src_configure() {
 		$(use_enable gnome-shell search-provider) \
 		$(use_with nautilus nautilus-extension) \
 		VALAC=$(type -P true)
-		# Docs are broken in this release.
-		#ITSTOOL=$(type -P true) \
-		#XMLLINT=$(type -P true)
 }
 
 src_install() {
diff --git a/xfce-extra/thunar-archive-plugin/files/0.3.1-add-engrampa-support.patch b/xfce-extra/thunar-archive-plugin/files/0.3.1-add-engrampa-support.patch
new file mode 100644
index 000000000000..becccda1ac59
--- /dev/null
+++ b/xfce-extra/thunar-archive-plugin/files/0.3.1-add-engrampa-support.patch
@@ -0,0 +1,68 @@
+diff --git a/scripts/Makefile.am b/scripts/Makefile.am
+index 4da529c..ec49cba 100644
+--- a/scripts/Makefile.am
++++ b/scripts/Makefile.am
+@@ -3,7 +3,8 @@
+ wrapperdir = $(libexecdir)/thunar-archive-plugin
+ wrapper_SCRIPTS =							\
+ 	ark.tap								\
+-	file-roller.tap
++	file-roller.tap							\
++	engrampa.tap
+ 
+ # Install symlink to 'gnome-file-roller.tap'
+ install-exec-hook:
+diff --git a/scripts/engrampa.tap b/scripts/engrampa.tap
+index e69de29..a9d9c10 100755
+--- a/scripts/engrampa.tap
++++ b/scripts/engrampa.tap
+@@ -0,0 +1,48 @@
++#!/bin/sh
++#
++# engrampa.tap - Wrapper script to create and extract archive files
++#                   in Thunar, via the thunar-archive-plugin, using the
++#                   engrampa archive manager.
++#
++# $Id: 0.3.1-add-engrampa-support.patch,v 1.1 2015/05/19 16:48:22 perfinion Exp $
++#
++# Copyright (c) 2006 Benedikt Meurer <benny@xfce.org>.
++#
++# This program is free software; you can redistribute it and/or modify it
++# under the terms of the GNU General Public License as published by the Free
++# Software Foundation; either version 2 of the License, or (at your option)
++# any later version.
++#
++# This program is distributed in the hope that it will be useful, but WITHOUT
++# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
++# more details.
++#
++# You should have received a copy of the GNU General Public License along with
++# this program; if not, write to the Free Software Foundation, Inc., 59 Temple
++# Place, Suite 330, Boston, MA  02111-1307  USA.
++#
++
++# determine the action and the folder, $@ then contains only the files
++action=$1; shift;
++folder=$1; shift;
++
++# check the action
++case $action in
++create)
++	exec engrampa "--default-dir=$folder" --add "$@"
++	;;
++
++extract-here)
++	exec engrampa "--extract-to=$folder" --force "$@"
++	;;
++
++extract-to)
++	exec engrampa --extract "$@"
++	;;
++
++*)
++	echo "Unsupported action '$action'" >&2
++	exit 1
++esac
++
+
diff --git a/xfce-extra/thunar-archive-plugin/files/0.3.1-fix-file-roller.patch b/xfce-extra/thunar-archive-plugin/files/0.3.1-fix-file-roller.patch
new file mode 100644
index 000000000000..094480212f12
--- /dev/null
+++ b/xfce-extra/thunar-archive-plugin/files/0.3.1-fix-file-roller.patch
@@ -0,0 +1,15 @@
+diff --git a/scripts/Makefile.am b/scripts/Makefile.am
+index 4da529c..2ba8dec 100644
+--- a/scripts/Makefile.am
++++ b/scripts/Makefile.am
+@@ -9,8 +9,8 @@ wrapper_SCRIPTS =							\
+ install-exec-hook:
+ 	$(mkinstalldirs) $(DESTDIR)$(wrapperdir)
+ 	-( cd $(DESTDIR)$(wrapperdir) ; \
+-		test -f gnome-file-roller.tap \
+-		|| ln -sf file-roller.tap gnome-file-roller.tap )
++		ln -sf file-roller.tap gnome-file-roller.tap; \
++		ln -sf file-roller.tap org.gnome.FileRoller.tap; )
+ 
+ EXTRA_DIST =								\
+ 	$(wrapper_SCRIPTS)						\
diff --git a/xfce-extra/thunar-archive-plugin/thunar-archive-plugin-0.3.1-r1.ebuild b/xfce-extra/thunar-archive-plugin/thunar-archive-plugin-0.3.1-r1.ebuild
new file mode 100644
index 000000000000..16685f6d1619
--- /dev/null
+++ b/xfce-extra/thunar-archive-plugin/thunar-archive-plugin-0.3.1-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/thunar-archive-plugin/thunar-archive-plugin-0.3.1-r1.ebuild,v 1.1 2015/05/19 16:48:22 perfinion Exp $
+
+EAPI=5
+
+EAUTORECONF="yes"
+inherit xfconf
+
+DESCRIPTION="Archive plug-in for the Thunar filemanager"
+HOMEPAGE="http://goodies.xfce.org/projects/thunar-plugins/thunar-archive-plugin"
+SRC_URI="mirror://xfce/src/thunar-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
+IUSE="debug"
+
+RDEPEND=">=xfce-base/libxfce4util-4.8:=
+	>=xfce-base/exo-0.6:=
+	>=xfce-base/thunar-1.2:="
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+pkg_setup() {
+	PATCHES=( "${FILESDIR}"/0.3.1-add-engrampa-support.patch "${FILESDIR}"/0.3.1-fix-file-roller.patch )
+	XFCONF=( $(xfconf_use_debug) )
+	DOCS=( AUTHORS ChangeLog NEWS README THANKS )
+}