Sync with portage [Sat Apr 8 14:14:50 MSK 2017].

7 years ago · 1e8aa4597c
parent f84ed504e1
commit 1e8aa4597c
264 changed files with 3126 additions and 1570 deletions
--- a/app-accessibility/espeak/espeak-1.48.04-r1.ebuild
+++ b/app-accessibility/espeak/espeak-1.48.04-r1.ebuild
@ -0,0 +1,100 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+MY_P="${P}-source"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip"
+DESCRIPTION="Speech synthesizer for English and other languages"
+HOMEPAGE="http://espeak.sourceforge.net/"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="portaudio pulseaudio"
+
+COMMON_DEPEND="portaudio? ( >=media-libs/portaudio-19_pre20071207 )
+	pulseaudio? ( media-sound/pulseaudio )"
+
+DEPEND="${COMMON_DEPEND}
+	app-arch/unzip"
+
+RDEPEND="${COMMON_DEPEND}
+	media-sound/sox"
+
+PATCHES=( "${FILESDIR}"/${P}-gcc-6-fix.patch )
+
+S="${WORKDIR}/${MY_P}/src"
+
+get_audio() {
+	if use portaudio && use pulseaudio; then
+		echo runtime
+	elif use portaudio; then
+		echo portaudio
+	elif use pulseaudio; then
+		echo pulseaudio
+	else
+		echo none
+	fi
+}
+
+src_prepare() {
+	default
+	# gentoo uses portaudio 19.
+	mv -f portaudio19.h portaudio.h
+}
+
+src_compile() {
+	emake \
+		PREFIX="${EPREFIX}/usr" \
+		CC="$(tc-getCC)" \
+		CFLAGS="${CFLAGS}" \
+		CXX="$(tc-getCXX)" \
+		CXXFLAGS="${CXXFLAGS}" \
+		AR="$(tc-getAR)" \
+		AUDIO="$(get_audio)" \
+		all
+
+	einfo "Fixing byte order of phoneme data files"
+	pushd ../platforms/big_endian > /dev/null
+	emake \
+		CC="$(tc-getCC)" \
+		CFLAGS="${CFLAGS}"
+	./espeak-phoneme-data \
+		../../espeak-data \
+		. \
+		../../espeak-data/phondata-manifest
+	cp -f phondata phonindex phontab "../../espeak-data"
+}
+
+src_install() {
+	emake \
+		PREFIX="${EPREFIX}/usr" \
+		LIBDIR="\$(PREFIX)/$(get_libdir)" \
+		DESTDIR="${D}" \
+		AUDIO="$(get_audio)" \
+		install
+
+	cd ..
+	insinto /usr/share/espeak-data
+	doins -r dictsource
+	dodoc ChangeLog.txt ReadMe
+	HTML_DOCS="docs/*" einstalldocs
+}
+
+pkg_preinst() {
+	local voicedir="${ROOT}/usr/share/${PN}-data/voices/en"
+	if [ -d "${voicedir}" ]; then
+		rm -rf "${voicedir}"
+	fi
+}
+
+pkg_postinst() {
+	if ! use portaudio && ! use pulseaudio; then
+		ewarn "Since portaudio and pulseaudio are not in your use flags,"
+		ewarn "espeak will only be able to create wav files."
+		ewarn "If this is not what you want, please reemerge ${CATEGORY}/${PN}"
+		ewarn "with either portaudio or pulseaudio USE flag enabled."
+	fi
+}
--- a/app-accessibility/espeak/files/espeak-1.48.04-gcc-6-fix.patch
+++ b/app-accessibility/espeak/files/espeak-1.48.04-gcc-6-fix.patch
@ -0,0 +1,13 @@
+https://src.fedoraproject.org/cgit/rpms/espeak.git/tree/espeak-1.48-gcc-6-fix.patch
+diff --git a/src/tr_languages.cpp b/src/tr_languages.cpp
+--- a/tr_languages.cpp
+++ b/tr_languages.cpp
+@@ -198,7 +198,7 @@ static const unsigned short chars_ignore_zwnj_hyphen[] = {
+ 	0x200d,  1, // zero width joiner
+ 	0, 0 };
+ 
+-const char string_ordinal[] = {0xc2,0xba,0};  // masculine ordinal character, UTF-8
+const char string_ordinal[] = {'\xc2','\xba',0};  // masculine ordinal character, UTF-8
+ 
+ 
+ static Translator* NewTranslator(void)
--- a/app-admin/lib_users/Manifest
+++ b/app-admin/lib_users/Manifest
@ -1,2 +1 @@
 DIST lib_users-0.10.tar.gz 25636 SHA256 2ccee6967c7da935441cb7f57112f15373ddaafe2f2915744caf271c308c9c98 SHA512 dee8203457570f686df69dc91d71614b462845c848a3445fd9b9f94047fdba8171cc2555fa4299bc4c361905d488c1f17cee4ab0e99899f37995377d6011805a WHIRLPOOL 310d5c187c7c3cd6a4be5dd4282709aeeea9941dea0f2466e80156bd8577e72a0cfe2b92df43a26d2198e7dc7d6320eb34e3e86311c9db956517dc48b856b8b4
-DIST lib_users-0.9.tar.gz 22992 SHA256 361db39b14b9512b438cf96b2b9978c6b5c88abbc2c0b7227940e7e816fdcf1c SHA512 d4c10398d69410fc3d48a151c446105ed232fdca9ef68c3f0f1df903739b798762d6bf958dc08472e90151560d8a625b4ab8b5f5d89521918369ceadf2b85b19 WHIRLPOOL 312aaa05b10681a0eff7997ea8d1e359bd757b888fe6fadb29ef3370cc482371d65d14e06dc6887cefda0aee3bd65232ffcd06477e536e4d2c82996c27f60425
--- a/app-admin/lib_users/lib_users-0.10.ebuild
+++ b/app-admin/lib_users/lib_users-0.10.ebuild
@ -13,7 +13,7 @@ SRC_URI="https://github.com/klausman/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ppc ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 hppa ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"

 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
--- a/app-admin/lib_users/lib_users-0.9-r1.ebuild
+++ b/app-admin/lib_users/lib_users-0.9-r1.ebuild
@ -1,32 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-inherit python-r1
-
-DESCRIPTION="Checks /proc for libraries being mapped but marked as deleted"
-HOMEPAGE="http://schwarzvogel.de/software-misc.shtml"
-SRC_URI="http://schwarzvogel.de/pkgs/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-RDEPEND="${PYTHON_DEPS}"
-
-src_test() {
-	python_foreach_impl nosetests --verbosity=2
-}
-
-src_install() {
-	python_foreach_impl python_newscript lib_users.py lib_users
-	dodoc README TODO
-}
--- a/app-admin/lib_users/lib_users-0.9.ebuild
+++ b/app-admin/lib_users/lib_users-0.9.ebuild
@ -1,32 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_4} )
-
-inherit python-r1
-
-DESCRIPTION="Checks /proc for libraries being mapped but marked as deleted"
-HOMEPAGE="http://schwarzvogel.de/software-misc.shtml"
-SRC_URI="http://schwarzvogel.de/pkgs/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-RDEPEND="${PYTHON_DEPS}"
-
-src_test() {
-	python_foreach_impl nosetests --verbosity=2
-}
-
-src_install() {
-	python_foreach_impl python_newscript lib_users.py lib_users
-	dodoc README TODO
-}
--- a/app-admin/sysstat/Manifest
+++ b/app-admin/sysstat/Manifest
@ -1,6 +1,3 @@
 DIST sysstat-11.4.0.tar.xz 343968 SHA256 b8518ca88acfcbc474a406022ee9c0c3210ccef4f0ec80e5b3e8c41dda8c16f2 SHA512 4a5c81d75fdbc8dcaf80685f302688c39bd7143554e5a06cb324532ddb5180caac19b261182d5320f40b317bdb1e81664887acc7cedfeb5a95dc6ad37a898604 WHIRLPOOL 39f48929040405f83a0d3c49dcf2aac471deeadd10d31181ee03809a30573868a7da43df160688ad553d305221bd21c2e253f56913f8f8a53020fb66f62c05ba
-DIST sysstat-11.4.2.tar.xz 344168 SHA256 1fd407f8971f5854bc853d931dd85bcbea08658130f3f8510a730d5561980f39 SHA512 8da43fcaccbce0333c16ba1fd508540213252fbd8f730b0b31edf7450c123377b08a43cc06cc74776d7a54a8bb3e7cb848b6353f17aa6583328ade7f18111fbf WHIRLPOOL bf82fc2eeeb1b9900435d1ed9b06a251c6a1f84713d5e709a831de6c3c7d9d5e4bf19449a988ac62a12e9320d680d41449830b26584595fef41623a556bc229f
 DIST sysstat-11.4.3.tar.xz 344572 SHA256 02e9cafa5557fbae435d33e592373655df929d817ae711d31142dd2f7d4dcee7 SHA512 20862a6fd735aa0a6d571ffe0e1aa755ce9c5d8a704739f0095d19861394ea3a45c93e9f46ac5f42b6719ba1aa21e33261ac28fde643d7f5c315d7f0a7b0d74d WHIRLPOOL 64df9bf1a375ce7ebf727b07b10caa3b72ba3630a5a238e72dca017e09a65dbf3f1623f5e1115fb037974609e39c4fb4e3f2790c444b23eae4fb7af591bfd389
-DIST sysstat-11.5.3.tar.xz 350468 SHA256 f8229d14819e2d461ede83894648e03c8a2ad14a1ba200d68cda9816c42f41ea SHA512 41af196dec7b13e2496ae0a59ec5dfb4da7e996ee38ac633964460dcc8c008f16af7524c79d770a197662add6821b8b60de2b118507e06f0ccb84280aee13cb0 WHIRLPOOL ae8737af473fab427e7710406c207e57526e476915b5bfe19bb8043bf8038da5f887d5a1f99d9270fd4074d7d9c58745a5a397f814ae544396447f7d42b10302
-DIST sysstat-11.5.4.tar.xz 356996 SHA256 1e1008656575e70486b456e79775e98d3b8732d7e2cb408559209bd0318e0807 SHA512 323c6239dadb0608aae0a98407a61ef5a3ef25f181b5442e285fa77c787fafb7a650936d48a5f4e45caabed76e657d956d28a5bc7a53e8f9a607793ed7c0f3f5 WHIRLPOOL 451d2de3adf631183aa28c6c6c4bd99f49ca537412bf5e532edcee8e4d4f470eb69cfab6df2ca20bdb1e9d2c9cebcd2cc23ed0f695f65d4440e91c4785502fae
 DIST sysstat-11.5.5.tar.xz 463656 SHA256 f4c5b333827cb588df1842d7a8f46947f486c95b305edbbce7565925e88e86c3 SHA512 abf96e10a36fa88de8b1431e9c0ce277fbfc3a5ffe84f96c6a46fb8e8f6a15c626cffd3cecac2e78284385447b22c84af30992118b46984d72947a4bda80c9c0 WHIRLPOOL 294b018284ba7a83a67827df28bed6911ab57bbab2d88f68eb1f0a3ad474ec001c37507e19301adeee4188e8c20fc11d8c8a68504bb2d61cbbe2df32dc8510f7
--- a/app-admin/sysstat/sysstat-11.4.2.ebuild
+++ b/app-admin/sysstat/sysstat-11.4.2.ebuild
@ -1,95 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit flag-o-matic multilib systemd toolchain-funcs
-
-DESCRIPTION="System performance tools for Linux"
-HOMEPAGE="http://pagesperso-orange.fr/sebastien.godard/"
-SRC_URI="${HOMEPAGE}${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="debug isag nls lm_sensors selinux static"
-
-CDEPEND="
-	isag? (
-		dev-lang/tk:0
-		dev-vcs/rcs
-		sci-visualization/gnuplot
-	)
-	nls? ( virtual/libintl )
-	lm_sensors? ( sys-apps/lm_sensors )
-"
-DEPEND="
-	${CDEPEND}
-	nls? ( sys-devel/gettext )
-"
-RDEPEND="
-	${CDEPEND}
-	selinux? ( sec-policy/selinux-sysstat )
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-10.0.4-flags.patch
-	"${FILESDIR}"/${PN}-11.0.4-cron.patch
-)
-
-SYSSTAT_FAKE_RC_DIR=Gentoo-does-not-use-rc.d
-
-src_prepare() {
-	if use nls; then
-		strip-linguas -i nls/
-		local lingua pofile
-		for pofile in nls/*.po; do
-			lingua=${pofile/nls\/}
-			lingua=${lingua/.po}
-			if ! has ${lingua} ${LINGUAS}; then
-				rm "nls/${lingua}.po" || die
-			fi
-		done
-	fi
-
-	default
-}
-
-src_configure() {
-	tc-export AR
-	use static && append-ldflags -static
-
-	sa_lib_dir=/usr/$(get_libdir)/sa \
-		conf_dir=/etc \
-		rcdir=${SYSSTAT_FAKE_RC_DIR} \
-		econf \
-			$(use_enable debug debuginfo) \
-			$(use_enable isag install-isag) \
-			$(use_enable lm_sensors sensors) \
-			$(use_enable nls) \
-			--enable-copy-only \
-			--enable-documentation \
-			--enable-install-cron \
-			--with-systemdsystemunitdir=$(systemd_get_systemunitdir)
-}
-
-src_compile() {
-	emake LFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	keepdir /var/log/sa
-
-	emake \
-		CHOWN=true \
-		DESTDIR="${D}" \
-		DOC_DIR=/usr/share/doc/${PF} \
-		MANGRPARG='' \
-		install
-
-	dodoc contrib/sargraph/sargraph
-
-	rm -r "${D}/${SYSSTAT_FAKE_RC_DIR}" || die
-	newinitd "${FILESDIR}"/${PN}.init.d ${PN}
-	systemd_dounit ${PN}.service
-
-	rm -f "${D}"usr/share/doc/${PF}/COPYING
-}
--- a/app-admin/sysstat/sysstat-11.5.3.ebuild
+++ b/app-admin/sysstat/sysstat-11.5.3.ebuild
@ -1,95 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit flag-o-matic multilib systemd toolchain-funcs
-
-DESCRIPTION="System performance tools for Linux"
-HOMEPAGE="http://pagesperso-orange.fr/sebastien.godard/"
-SRC_URI="${HOMEPAGE}${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-IUSE="debug isag nls lm_sensors selinux static"
-
-CDEPEND="
-	isag? (
-		dev-lang/tk:0
-		dev-vcs/rcs
-		sci-visualization/gnuplot
-	)
-	nls? ( virtual/libintl )
-	lm_sensors? ( sys-apps/lm_sensors )
-"
-DEPEND="
-	${CDEPEND}
-	nls? ( sys-devel/gettext )
-"
-RDEPEND="
-	${CDEPEND}
-	selinux? ( sec-policy/selinux-sysstat )
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-10.0.4-flags.patch
-	"${FILESDIR}"/${PN}-11.0.4-cron.patch
-)
-
-SYSSTAT_FAKE_RC_DIR=Gentoo-does-not-use-rc.d
-
-src_prepare() {
-	if use nls; then
-		strip-linguas -i nls/
-		local lingua pofile
-		for pofile in nls/*.po; do
-			lingua=${pofile/nls\/}
-			lingua=${lingua/.po}
-			if ! has ${lingua} ${LINGUAS}; then
-				rm "nls/${lingua}.po" || die
-			fi
-		done
-	fi
-
-	default
-}
-
-src_configure() {
-	tc-export AR
-	use static && append-ldflags -static
-
-	sa_lib_dir=/usr/$(get_libdir)/sa \
-		conf_dir=/etc \
-		rcdir=${SYSSTAT_FAKE_RC_DIR} \
-		econf \
-			$(use_enable debug debuginfo) \
-			$(use_enable isag install-isag) \
-			$(use_enable lm_sensors sensors) \
-			$(use_enable nls) \
-			--enable-copy-only \
-			--enable-documentation \
-			--enable-install-cron \
-			--with-systemdsystemunitdir=$(systemd_get_systemunitdir)
-}
-
-src_compile() {
-	emake LFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	keepdir /var/log/sa
-
-	emake \
-		CHOWN=true \
-		DESTDIR="${D}" \
-		DOC_DIR=/usr/share/doc/${PF} \
-		MANGRPARG='' \
-		install
-
-	dodoc contrib/sargraph/sargraph
-
-	rm -r "${D}/${SYSSTAT_FAKE_RC_DIR}" || die
-	newinitd "${FILESDIR}"/${PN}.init.d ${PN}
-	systemd_dounit ${PN}.service
-
-	rm -f "${D}"usr/share/doc/${PF}/COPYING
-}
--- a/app-admin/sysstat/sysstat-11.5.4.ebuild
+++ b/app-admin/sysstat/sysstat-11.5.4.ebuild
@ -1,95 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit flag-o-matic multilib systemd toolchain-funcs
-
-DESCRIPTION="System performance tools for Linux"
-HOMEPAGE="http://pagesperso-orange.fr/sebastien.godard/"
-SRC_URI="${HOMEPAGE}${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-IUSE="debug isag nls lm_sensors selinux static"
-
-CDEPEND="
-	isag? (
-		dev-lang/tk:0
-		dev-vcs/rcs
-		sci-visualization/gnuplot
-	)
-	nls? ( virtual/libintl )
-	lm_sensors? ( sys-apps/lm_sensors )
-"
-DEPEND="
-	${CDEPEND}
-	nls? ( sys-devel/gettext )
-"
-RDEPEND="
-	${CDEPEND}
-	selinux? ( sec-policy/selinux-sysstat )
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-10.0.4-flags.patch
-	"${FILESDIR}"/${PN}-11.0.4-cron.patch
-)
-
-SYSSTAT_FAKE_RC_DIR=Gentoo-does-not-use-rc.d
-
-src_prepare() {
-	if use nls; then
-		strip-linguas -i nls/
-		local lingua pofile
-		for pofile in nls/*.po; do
-			lingua=${pofile/nls\/}
-			lingua=${lingua/.po}
-			if ! has ${lingua} ${LINGUAS}; then
-				rm "nls/${lingua}.po" || die
-			fi
-		done
-	fi
-
-	default
-}
-
-src_configure() {
-	tc-export AR
-	use static && append-ldflags -static
-
-	sa_lib_dir=/usr/$(get_libdir)/sa \
-		conf_dir=/etc \
-		rcdir=${SYSSTAT_FAKE_RC_DIR} \
-		econf \
-			$(use_enable debug debuginfo) \
-			$(use_enable isag install-isag) \
-			$(use_enable lm_sensors sensors) \
-			$(use_enable nls) \
-			--enable-copy-only \
-			--enable-documentation \
-			--enable-install-cron \
-			--with-systemdsystemunitdir=$(systemd_get_systemunitdir)
-}
-
-src_compile() {
-	emake LFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	keepdir /var/log/sa
-
-	emake \
-		CHOWN=true \
-		DESTDIR="${D}" \
-		DOC_DIR=/usr/share/doc/${PF} \
-		MANGRPARG='' \
-		install
-
-	dodoc contrib/sargraph/sargraph
-
-	rm -r "${D}/${SYSSTAT_FAKE_RC_DIR}" || die
-	newinitd "${FILESDIR}"/${PN}.init.d ${PN}
-	systemd_dounit ${PN}.service
-
-	rm -f "${D}"usr/share/doc/${PF}/COPYING
-}
--- a/app-arch/lrzip/metadata.xml
+++ b/app-arch/lrzip/metadata.xml
@ -1,14 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>Yanestra@gmail.com</email>
-		<name>Yanestra</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<longdescription>
 	This is a compression program optimised for large files. The larger the
 	file and the more memory you have, the better the compression advantage
--- a/app-benchmarks/sysbench/Manifest
+++ b/app-benchmarks/sysbench/Manifest
@ -1,3 +1,3 @@
 DIST sysbench-1.0.3.tar.gz 1450640 SHA256 37e3d1ecd3e3917695bdfa314ebf09201433d3b4c1c7c0bd4a903bde4e69472e SHA512 6680c3d1e0c939bfb27efb2c4982dd4ec92042ad8c3a850f4892dc46bbaaba00a44b2e39d4253a978c49339c275d81fb39a14ddc4c767883fccc89248dd5ca76 WHIRLPOOL c4d1471465abe06fba5e15c7be64e07e3cae7b7e1ca1559b6a3903fd33358835dc246567faecd0fd5465b79c7c0991d59ba69e23de21dc7b719bd602a726b59b
-DIST sysbench-1.0.4.tar.gz 1487125 SHA256 fa8dbc56ddfd095b09b977c321f7ebbb12818cfc872542a0bffa195cab0716a1 SHA512 f2725e8f7a265b1f3c4ec4b1a863d9f15b3aa44a0fb358d5e9064e645fe1717cb6988bdf39570342ba6897635ce616e8ddb91e7d891eb391070335de7d15b6cb WHIRLPOOL 922c36ed0735582b54da58c33c0be24000f5ffc72e0cee0491dd1fa0983371aadd800a397abb36a9b3069bf9194e931529d836d3bf7fa509b6a3a41ed5a5bca8
+DIST sysbench-1.0.5.tar.gz 1488465 SHA256 6a97fa0008c3021ec3ddbe5d2dd5b69e2d1070c872eb914d3ac5134f163954a3 SHA512 8080803a08e8037af01bb87cf1bd1fbac5df4403e89213fa61a4708c43ea4cc5121304a1e8dc3c0b3e800a45727946b08329492cc44e1695370a21e8d1a04cd9 WHIRLPOOL c27a09286bd9036578f963ed99d7d5b31437bc79ce03c9df7782ce6fe6ebaf1e1a81f9ae1a0713b7d35ca35d4e597a648aa051a4ca94b3cc3cb98250601f8508
 DIST sysbench-48124f838b00ff83a044fbf046a9d8d0b1602d90.tar.gz 281484 SHA256 d3619b4399e6a77a679932571402cfae85c9fd17541050a77006184b3cad155a SHA512 2dd9bb78343df27894094829708dc133009d8ee65399beafbf38ea88d42be311180a18bf7b76cd41b22482606b7de13840cbdf5fc5841a0d2ed59dd65e34cebe WHIRLPOOL 67874d43c2a1d6cda45f64edfe0961018c9b8f5b13cc68b35dfbcebc1f5c75d2bc0ecfc1cffdcc62fc783fcc8a4cabd0e1bbccea5546bcd907d649b6f3b17c71
--- a/app-benchmarks/sysbench/sysbench-1.0.3.ebuild
+++ b/app-benchmarks/sysbench/sysbench-1.0.3.ebuild
@ -9,7 +9,7 @@ SRC_URI="https://github.com/akopytov/sysbench/archive/${PV}.tar.gz -> ${P}.tar.g

 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="aio mysql postgres test"

 RDEPEND="aio? ( dev-libs/libaio )
--- a/app-benchmarks/sysbench/sysbench-1.0.5.ebuild
+++ b/app-benchmarks/sysbench/sysbench-1.0.5.ebuild
--- a/app-crypt/eid-mw/files/gtk_not_required_9999.patch
+++ b/app-crypt/eid-mw/files/gtk_not_required_9999.patch
@ -1,60 +1,61 @@
 diff --git a/Makefile.am b/Makefile.am
-index de5416f..8e55277 100644
+index 393ecb3..0e14661 100644
 --- a/Makefile.am
 +++ b/Makefile.am
@@ -1,7 +1,7 @@
 ACLOCAL_AMFLAGS = -I scripts/m4
- EXTRA_DIST = scripts/build-aux/config.rpath  debian rpm doc
+ EXTRA_DIST = scripts/build-aux/config.rpath scripts/build-aux/genver.sh .version debian rpm doc
 
 -SUBDIRS=cardcomm/pkcs11/src doc/sdk/include/rsaref220 plugins_tools/util tests/unit plugins_tools/xpi plugins_tools/aboutmw/gtk plugins_tools/eid-viewer
-+SUBDIRS=cardcomm/pkcs11/src doc/sdk/include/rsaref220 plugins_tools/util tests/unit plugins_tools/xpi 
+SUBDIRS=cardcomm/pkcs11/src doc/sdk/include/rsaref220 plugins_tools/util tests/unit plugins_tools/xpi
 
 xpipackage:
 	$(MAKE) -C plugins_tools/xpi xpipackage
 diff --git a/cardcomm/pkcs11/src/Makefile.am b/cardcomm/pkcs11/src/Makefile.am
-index 6e33315..fce4494 100644
+index 02e4e36..86d607b 100644
 --- a/cardcomm/pkcs11/src/Makefile.am
 +++ b/cardcomm/pkcs11/src/Makefile.am
-@@ -165,8 +165,6 @@ libbeidpkcs11_la_SOURCES += \
+@@ -165,7 +165,6 @@ libbeidpkcs11_la_SOURCES += \
 	dialogs/dialogsgtk/single_dialog.c
 endif
 
 -libexec_PROGRAMS = beid-askpin beid-changepin beid-badpin beid-askaccess beid-spr-askpin beid-spr-changepin
-
+ 
 if P11KIT
 dist_p11kitcf_DATA = beid.module
- install-exec-hook:
-@@ -176,28 +174,4 @@ install-exec-hook:
+@@ -176,30 +175,4 @@ install-exec-hook:
 		$(LN_S) $(libdir)/libbeidpkcs11.so.0 beidpkcs11.so
 endif
 
 -beid_askpin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-askpin.c
-beid_askpin_CPPFLAGS = -I$(srcdir)/dialogsgtk -I$(srcdir)/../common/src -I$(srcdir)/src @GTK_CFLAGS@
+-beid_askpin_CPPFLAGS = -I$(srcdir)/dialogsgtk -I$(srcdir)/../common/src -I$(srcdir)/src @GTK_CFLAGS@ -DDATAROOTDIR='"$(datarootdir)"'
 -beid_askpin_LDADD = @GTK_LIBS@
 -
 -beid_changepin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-changepin.c
-beid_changepin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@
+-beid_changepin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@ -DDATAROOTDIR='"$(datarootdir)"'
 -beid_changepin_LDADD = @GTK_LIBS@
 -
 -beid_badpin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-badpin.c
-beid_badpin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@
+-beid_badpin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@ -DDATAROOTDIR='"$(datarootdir)"'
 -beid_badpin_LDADD = @GTK_LIBS@
 -
 -beid_askaccess_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-askaccess.c
-beid_askaccess_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@
+-beid_askaccess_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@ -DDATAROOTDIR='"$(datarootdir)"'
 -beid_askaccess_LDADD = @GTK_LIBS@
 -
 -beid_spr_askpin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-spr-askpin.c
-beid_spr_askpin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@
+-beid_spr_askpin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@ -DDATAROOTDIR='"$(datarootdir)"'
 -beid_spr_askpin_LDADD = @GTK_LIBS@
 -
 -beid_spr_changepin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-spr-changepin.c
-beid_spr_changepin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@
+-beid_spr_changepin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@ -DDATAROOTDIR='"$(datarootdir)"'
 -beid_spr_changepin_LDADD = @GTK_LIBS@
 -
 pkgconfig_DATA=libbeidpkcs11.pc
+-
+-SUBDIRS = dialogs/dialogsgtk/po
 diff --git a/configure.ac b/configure.ac
-index 92bbb3b..a47e7c2 100644
+index 9bf10f9..f0120b1 100644
 --- a/configure.ac
 +++ b/configure.ac
@@ -59,14 +59,6 @@ fi
--- a/app-emacs/ebuild-mode/Manifest
+++ b/app-emacs/ebuild-mode/Manifest
@ -1,3 +1,3 @@
 DIST ebuild-mode-1.31.tar.xz 29492 SHA256 09bcea9ede052bf33bde402f472340570fb8eff67196cd69d4ea4820d84edf0e SHA512 8e4868a40966d5b56573425fe41d638ef1bc10a1161759218c22d33cbeb67ed3e1c75553c58a1f1c9e3ff0d2d8b25794404909a2bd19e76be93a037f8f3a0581 WHIRLPOOL d256a716baa2a276e62790e8996815e608c22e6bb2072f62a4089cc8b594d9e5470f7d574c33c23cc6817c74d59d1927e7591f8d8150985641ba61c50d6335c2
-DIST ebuild-mode-1.34.tar.xz 30236 SHA256 087a2bd371a187d10e21fee39baf0ac0c679aa31aa919bd2661ab00540bb24b3 SHA512 7c6145dd255edd8a47d4398f19f89f6b1d59aca069f5286daac9b60dcd0ef94b9b0f4454047ecc8c864bf15cee1078d9840486e2eddbd771738e2bbe8ef37341 WHIRLPOOL b630b0f10452d6fe7349552b9a3c1878f93240d63f9699884cad82eb40239c74cb5bbb88d9aafcc2c1bdd349014e02599017ec1588c607458bf1211af33cee2d
 DIST ebuild-mode-1.35.tar.xz 30404 SHA256 d35d67b4332b35aa20f7b4a5827f6bd0a5680df922a65735fa983ec20c9b6999 SHA512 d12ab98d6a0ca46b85de31b9f409e8fbf91343f6104b7b93f78dc7f5356992f48a362227e74f7157f100a28edc197e60aff877574cb6b98d30e707378c70bda9 WHIRLPOOL 7f54709cc4b490bfd9a236ad4e5b541c1434942a816d4e8f6e8602c22f57ca5732eddd316daffc3137fb07712556a575fd0707d149db7c3a713720c07faa931b
+DIST ebuild-mode-1.37.tar.xz 30816 SHA256 f7368a8757036874dde542c69c26b824fe3da5241098f89a6b7d7e2665cbbf1d SHA512 1d570b213ad0c6eef8817f69c99c0862703b9bddc24477234dde542b697ba372a06bbe8e4a91179a7d528b720a7dbfc13bb92c8ea0a4d3b3b8684fa4ee0065c0 WHIRLPOOL 75928f5965bdfe66733e203588f01ab3b5de67a5958d33f41069d0793842bd9617ab0904ab71f95aeae04e0aa2f55646e4c545d6199cc1d357140b8fd1a714ab
--- a/app-emacs/ebuild-mode/ebuild-mode-1.37.ebuild
+++ b/app-emacs/ebuild-mode/ebuild-mode-1.37.ebuild
--- a/app-i18n/uchardet/uchardet-0.0.6.ebuild
+++ b/app-i18n/uchardet/uchardet-0.0.6.ebuild
@ -11,7 +11,7 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/releases/${P}.tar.xz"

 LICENSE="|| ( MPL-1.1 GPL-2+ LGPL-2.1+ )"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ppc ppc64 x86"
+KEYWORDS="alpha amd64 ~arm hppa ppc ppc64 x86"
 IUSE="static-libs test"

 src_prepare() {
--- a/app-xemacs/ebuild-mode/Manifest
+++ b/app-xemacs/ebuild-mode/Manifest
@ -1,2 +1,2 @@
 DIST ebuild-mode-1.24.tar.xz 28816 SHA256 366fa7602d32cda107b560e9a24540a3a5b90fdda58d84a1d108e8a4c6a488ff SHA512 0894ad452b64133c223a4f93755404657eed5cf86667e45ce5c808d2232755bcedd835f1bbab1bd719ce850d56c6d92e339c4262ab0d7cc8aa42e039023db99d WHIRLPOOL ff38c8736051a6f6c34d00103b8f1fa2fe40ce910cc14187e9d95b11d7aa665ba03497b52b324d2e7b0e7c29da1d99e267a1934d5e2434bf986e863afb925801
-DIST gentoo-syntax-1.19.tar.bz2 21385 SHA256 d20b5f13118d7823f5fed194c43decf322fb4ff3a05a7b63c46a9f001307b058 SHA512 ae745375cd4737fe4fa51be2d26c06b0579018b16963cad173af0721cd8a278f7c294fac4eeea9cdd57a41ca20892cdcf988da54049005a2e9aab13c58fdb9fd WHIRLPOOL 1d3883761bb1255021ba7fb2871b7d8edb75785e1a01ab0c5f1165827665dc58e41da6bd89a174c3c38adecd67d1ee6ffaee6648aab3f9c60e52a82b85b5d858
+DIST ebuild-mode-1.37.tar.xz 30816 SHA256 f7368a8757036874dde542c69c26b824fe3da5241098f89a6b7d7e2665cbbf1d SHA512 1d570b213ad0c6eef8817f69c99c0862703b9bddc24477234dde542b697ba372a06bbe8e4a91179a7d528b720a7dbfc13bb92c8ea0a4d3b3b8684fa4ee0065c0 WHIRLPOOL 75928f5965bdfe66733e203588f01ab3b5de67a5958d33f41069d0793842bd9617ab0904ab71f95aeae04e0aa2f55646e4c545d6199cc1d357140b8fd1a714ab
--- a/app-xemacs/ebuild-mode/ebuild-mode-1.19.ebuild
+++ b/app-xemacs/ebuild-mode/ebuild-mode-1.19.ebuild
@ -1,26 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit xemacs-elisp eutils
-
-MY_PN="gentoo-syntax"
-DESCRIPTION="An Emacs mode for editing ebuilds and other Gentoo specific files"
-HOMEPAGE="https://www.gentoo.org/proj/en/lisp/emacs/index.xml"
-SRC_URI="mirror://gentoo/${MY_PN}-${PV}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=app-editors/xemacs-21.4.20-r5
-	app-xemacs/sh-script"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_compile() {
-	${XEMACS_BATCH_CLEAN} -eval "(add-to-list 'load-path \".\")" \
-		-f batch-byte-compile gentoo-syntax.el || die
-	xemacs-elisp-make-autoload-file *.el || die
-}
--- a/app-xemacs/ebuild-mode/ebuild-mode-1.37.ebuild
+++ b/app-xemacs/ebuild-mode/ebuild-mode-1.37.ebuild
@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit xemacs-elisp
+
+DESCRIPTION="Emacs modes for editing ebuilds and other Gentoo specific files"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Emacs"
+SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=app-editors/xemacs-21.4.20-r5
+	app-xemacs/sh-script"
+DEPEND="${RDEPEND}"
+
+src_compile() {
+	${XEMACS_BATCH_CLEAN} -eval "(add-to-list 'load-path \".\")" \
+		-f batch-byte-compile ebuild-mode.el gentoo-newsitem-mode.el || die
+	xemacs-elisp-make-autoload-file *.el || die
+}
--- a/dev-cpp/gtest/gtest-1.7.0-r1.ebuild
+++ b/dev-cpp/gtest/gtest-1.7.0-r1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI="5"
@ -16,7 +16,7 @@ SRC_URI="https://googletest.googlecode.com/files/${P}.zip"

 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="examples static-libs"

 DEPEND="app-arch/unzip
--- a/dev-db/aerospike-server-community/Manifest
+++ b/dev-db/aerospike-server-community/Manifest
@ -1,4 +1,5 @@
 DIST aerospike-server-community-3.10.0.3-debian7.tgz 10347047 SHA256 fb0b47549cbe783317854b0edebe0ec112d8d5b073d7311a54739518bf2ae971 SHA512 1699bc2c8813c4b584eeef4c0edd8481915e9ccac55795717e87e6246894d836365aba2fdf8c884c6f4f4bdb3cc8d2a78141c32b1ef67cbf5efa1dc7340906ce WHIRLPOOL b6bf3a97c0023bb77f19b7cbd58785422551ce66cc7749773a1d8cfb3fa3d3ca1f96a1202718713859c23ccad0c14bded31759f36d0b0fa3039dd86e2ba1d6d2
 DIST aerospike-server-community-3.11.0.2-debian7.tgz 10137448 SHA256 3ede8b3232a8ca0f0e34f2eb9f37fa244dc502020f2d185f96ee3097d88cda21 SHA512 b4603df6de0252adb002ea25ec0ad7d6793ce9fe90e67504bfd43cbe503797471e01816dd9dcc18c2767ff98d80e181d57d91018dfc9a1e943719d24431b6160 WHIRLPOOL b4a48ceb5ee7adacc5a9d1a9baed6ad9812812dab1ded7c4f4236e25a6893d29413e53b8420d2b23d604db1163af19aaf037305f56fbc00e0795605e7c34a009
+DIST aerospike-server-community-3.12.1-debian7.tgz 10454559 SHA256 fc16a5f9fb816dedeb9b5d20c5b9a5bf56eb226ebcd615786473fd4c45620b96 SHA512 31de9c2fe1f781c4feb312c06ccea546b9016e04b750c4af5896e0ec1d5e8d26ffc3c6645ffe1c825773d1e00293359a7d48b2cd6d661644ab65408f5901503c WHIRLPOOL 7ba7708a5ec34968714c9438d64dd4db713f2bd16f0cdc0cecd47a4aa2b941f3889f9792ea85b9ae2c856279297514340310bb0d5ae813cbecfe8683148858e9
 DIST aerospike-server-community-3.9.0.3-debian7.tgz 9783678 SHA256 ec09d7f12c1001b8341892bff50f15a75a7e8f312b510c3627066befb9fc5612 SHA512 82b826fdb6bfdbb8508346accb2b0bf34f55a601b95e214d8b7fd108790a889e64dd5b76b4351285baa3f1c4f9d6a98945737c8ca42f26229364030674a2623b WHIRLPOOL f7bac66a56ad8b9ee47b3eedc16337b13d8674f42dba40f445876fe9c46ec3620dad73a9324f4a33daef98c740643c6361b86733ac6c741a68757b332101eefb
 DIST aerospike-server-community-3.9.1.1-debian7.tgz 9900121 SHA256 62526770c2881b17b928d4d0828f1b8bb5c434f37b0337863f167793f9393258 SHA512 a4ac583220eb15f976cf70a7b57ca3b2f9a0ed5a5fdc4689745b3df45c042a3e43010dda4ff16007455e32b9307474ed24114465c26cfd14be14800cd7b78332 WHIRLPOOL de08f3c057bc06380fd31928b002e611d9a3f0369d071de7bebbf3c079aaed1bc5672fe150f94c11dacfd318545b1d2529ece5eaa9bd584c5e5009192d276234
--- a/dev-db/aerospike-server-community/aerospike-server-community-3.12.1.ebuild
+++ b/dev-db/aerospike-server-community/aerospike-server-community-3.12.1.ebuild
@ -0,0 +1,68 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils user
+
+DESCRIPTION="Flash-optimized, in-memory, nosql database"
+HOMEPAGE="http://www.aerospike.com"
+SRC_URI="http://www.aerospike.com/artifacts/${PN}/${PV}/${P}-debian7.tgz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="app-crypt/gcr"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${P}-debian7"
+
+pkg_setup() {
+	enewgroup aerospike
+	enewuser aerospike -1 /bin/bash /opt/aerospike aerospike
+}
+
+src_prepare() {
+	local server_deb="${P}.debian7.x86_64.deb"
+	local tools_deb="aerospike-tools-3.12.1.debian7.x86_64.deb"
+
+	ar x "${server_deb}" || die
+	tar xzf data.tar.gz && rm data.tar.gz || die
+
+	ar x "${tools_deb}" || die
+	tar xzf data.tar.gz && rm data.tar.gz || die
+
+	rm *.deb asinstall control.tar.gz debian-binary LICENSE SHA256SUMS
+	rm usr/bin/{asfixownership,asmigrate2to3}
+}
+
+src_install() {
+	insinto /opt/
+	doins -r opt/aerospike
+
+	fperms +x -R /opt/aerospike/bin/
+	fperms +x -R /opt/aerospike/lib/python/
+
+	for dir in '/etc' '/var/log'; do
+		keepdir "${dir}/aerospike"
+	done
+
+	insinto /etc/aerospike
+	for conf in 'aerospike.conf' 'aerospike_mesh.conf' 'aerospike_ssd.conf'; do
+		doins "${FILESDIR}/${conf}"
+	done
+
+	insinto /usr/bin
+	doins usr/bin/*
+	fperms +x -R /usr/bin/asd
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/aerospike.logrotate aerospike
+
+	newinitd "${FILESDIR}"/aerospike.init aerospike
+
+	fowners -R aerospike:aerospike /opt/aerospike/
+	fowners aerospike:aerospike /usr/bin/asd
+	fowners -R aerospike:aerospike /var/log/aerospike
+}
--- a/dev-db/kyotocabinet/files/kyotocabinet-1.2.76-gcc6.patch
+++ b/dev-db/kyotocabinet/files/kyotocabinet-1.2.76-gcc6.patch
@ -0,0 +1,11 @@
+--- a/kcdbext.h
+++ b/kcdbext.h
+@@ -1278,7 +1278,7 @@
+     if (omode_ == 0) {
+       set_error(_KCCODELINE_, BasicDB::Error::INVALID, "not opened");
+       *sp = 0;
+-      return false;
+      return NULL;
+     }
+     if (!cache_) return db_.get(kbuf, ksiz, sp);
+     size_t dvsiz = 0;
--- a/dev-db/kyotocabinet/kyotocabinet-1.2.76-r1.ebuild
+++ b/dev-db/kyotocabinet/kyotocabinet-1.2.76-r1.ebuild
@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

-EAPI=5
+EAPI=6

-inherit autotools eutils toolchain-funcs
+inherit autotools ltprune toolchain-funcs

 DESCRIPTION="A straightforward implementation of DBM"
 HOMEPAGE="http://fallabs.com/kyotocabinet/"
@ -18,13 +18,20 @@ DEPEND="sys-libs/zlib[static-libs?]
 	app-arch/xz-utils[static-libs?]"
 RDEPEND="${DEPEND}"

+PATCHES=(
+	"${FILESDIR}"/fix_configure-1.2.62.patch
+	"${FILESDIR}"/${PN}-1.2.76-configure-8-byte-atomics.patch
+	"${FILESDIR}"/${PN}-1.2.76-flags.patch
+	"${FILESDIR}"/${PN}-1.2.76-gcc6.patch
+)
+
 src_prepare() {
-	epatch "${FILESDIR}"/fix_configure-1.2.62.patch
-	epatch "${FILESDIR}"/${PN}-1.2.76-configure-8-byte-atomics.patch
-	epatch "${FILESDIR}"/${PN}-1.2.76-flags.patch
+	default
+
 	sed -i -e "/DOCDIR/d" Makefile.in || die
 	tc-export AR

+	mv configure.in configure.ac || die
 	eautoreconf
 }

@ -32,7 +39,7 @@ src_configure() {
 	econf $(use_enable debug) \
 		$(use_enable static-libs static) \
 		$(use_enable !static-libs shared) \
-		--enable-lzma --docdir=/usr/share/doc/${PF}
+		--enable-lzma
 }

 src_test() {
@ -40,8 +47,7 @@ src_test() {
 }

 src_install() {
-	emake DESTDIR="${D}" install
-
+	default
 	prune_libtool_files

 	if use examples; then
--- a/dev-db/phpmyadmin/phpmyadmin-4.0.10.20.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-4.0.10.20.ebuild
@ -14,7 +14,7 @@ HOMEPAGE="http://www.phpmyadmin.net/"
 SRC_URI="https://files.phpmyadmin.net/${MY_PN}/${MY_PV}/${MY_P}.tar.xz"

 LICENSE="GPL-2"
-KEYWORDS="alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="setup"

 RDEPEND="
--- a/dev-db/phpmyadmin/phpmyadmin-4.7.0.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-4.7.0.ebuild
@ -14,7 +14,7 @@ HOMEPAGE="https://www.phpmyadmin.net/"
 SRC_URI="https://files.phpmyadmin.net/${MY_PN}/${MY_PV}/${MY_P}.tar.xz"

 LICENSE="GPL-2"
-KEYWORDS="alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="setup"

 RDEPEND="
--- a/dev-db/sqlite/sqlite-3.17.0.ebuild
+++ b/dev-db/sqlite/sqlite-3.17.0.ebuild
@ -19,7 +19,7 @@ SRC_URI="doc? ( https://sqlite.org/2017/${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 ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~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 ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~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}] )
--- a/dev-db/xbase/files/xbase-3.1.2-gcc6.patch
+++ b/dev-db/xbase/files/xbase-3.1.2-gcc6.patch
@ -0,0 +1,49 @@
+diff -up xbase64-3.1.2/xbase64/xblock.cpp.gcc6 xbase64-3.1.2/xbase64/xblock.cpp
+--- xbase64-3.1.2/xbase64/xblock.cpp.gcc6	2016-02-16 16:06:40.146864585 -0500
+++ xbase64-3.1.2/xbase64/xblock.cpp	2016-02-16 16:07:51.137342339 -0500
+@@ -84,7 +84,7 @@ xbLock::xbLock(xbDbf * pdbf)
+   TableLockCnt = 0;
+   MemoLockCnt  = 0;
+   IndexLockCnt = 0;
+-  std::cout << "xbLock constructor" << std::cout;
+  std::cout << "xbLock constructor";
+ }
+ /*************************************************************************/
+ xbLock::~xbLock()
+@@ -169,7 +169,7 @@ else if( LockType == XB_LOCK || LockType
+ /*************************************************************************/
+ xbaseLock::xbaseLock( xbDbf * pdbf ) : xbLock( pdbf )
+ {
+-  std::cout << "xbaseLock constructor" << std::cout;
+  std::cout << "xbaseLock constructor";
+ }
+ /*************************************************************************/
+ xbShort xbaseLock::LockTableHeader( xbShort LockType )
+@@ -336,7 +336,7 @@ xbShort xbaseLock::LockInit()
+ /*************************************************************************/
+ dbaseLock::dbaseLock( xbDbf * pdbf ) : xbLock( pdbf )
+ {
+-  std::cout << "dbaseLock constructor" << std::cout;
+  std::cout << "dbaseLock constructor";
+ }
+ /*************************************************************************/
+ xbShort dbaseLock::LockTableHeader( xbShort LockType )
+@@ -460,7 +460,7 @@ xbShort dbaseLock::UnlockAll()
+ /*************************************************************************/
+ clipperLock::clipperLock( xbDbf * pdbf ) : xbLock( pdbf )
+ {
+-  std::cout << "clipperLock constructor" << std::cout;
+  std::cout << "clipperLock constructor";
+ }
+ /*************************************************************************/
+ xbShort clipperLock::LockTableHeader( xbShort LockType )
+@@ -523,7 +523,7 @@ xbShort clipperLock::UnlockAll()
+ /*************************************************************************/
+ foxproLock::foxproLock( xbDbf * pdbf ) : xbLock( pdbf )
+ {
+-  std::cout << "foxproLock constructor" << std::cout;
+  std::cout << "foxproLock constructor";
+ }
+ /*************************************************************************/
+ xbShort foxproLock::LockTableHeader( xbShort LockType )
+diff -up xbase64-3.1.2/xbase64/xblock.h.gcc6 xbase64-3.1.2/xbase64/xblock.h
--- a/dev-db/xbase/files/xbase-3.1.2-gcc7.patch
+++ b/dev-db/xbase/files/xbase-3.1.2-gcc7.patch
@ -0,0 +1,34 @@
+diff -up xbase64-3.1.2/bin/dbfutil1.cpp.gcc7 xbase64-3.1.2/bin/dbfutil1.cpp
+--- xbase64-3.1.2/bin/dbfutil1.cpp.gcc7	2017-02-20 09:59:36.135561103 -0500
+++ xbase64-3.1.2/bin/dbfutil1.cpp	2017-02-20 10:00:32.743218194 -0500
+@@ -157,7 +157,8 @@ void  MyClass::SetFilter()
+   memset( Expression, 0x00, 512 );
+   while( !strlen( Expression )){
+     std::cout << "Enter filter expression (like AMOUNT<5)" << std::endl;
+-    gets( Expression );
+    fgets( Expression, sizeof(Expression), stdin );
+    strtok( Expression, "\n" );
+   }
+   if( xbf )
+     delete xbf;
+@@ -247,7 +248,8 @@ void MyClass::ProcessExpression()
+   while( !strstr( exprsn, "QUIT" ) && !strstr( exprsn, "quit" )){
+ 
+     std::cout << ">";
+-    gets( exprsn );
+    fgets( exprsn, sizeof(exprsn), stdin );
+    strtok( exprsn, "\n" );
+ 
+     if( strstr( exprsn, "HELP" ) || strstr( exprsn, "help" )){
+       std::cout << "** Command Help ***"    << std::endl << std::endl;
+diff -up xbase64-3.1.2/xbase64/xbase64.h.gcc7 xbase64-3.1.2/xbase64/xbase64.h
+--- xbase64-3.1.2/xbase64/xbase64.h.gcc7	2017-02-20 09:49:07.063609482 -0500
+++ xbase64-3.1.2/xbase64/xbase64.h	2017-02-20 09:57:36.586618723 -0500
+@@ -53,6 +53,7 @@
+ #endif
+ 
+ #include <string.h>
+#include <cstdio>
+ 
+ #if defined(__WIN32__)
+ #include "windows.h"
--- a/dev-db/xbase/xbase-3.1.2.ebuild
+++ b/dev-db/xbase/xbase-3.1.2.ebuild
@ -1,9 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

-EAPI=4
-AUTOTOOLS_AUTORECONF=no
-inherit autotools-utils
+EAPI=6
+inherit autotools ltprune

 DESCRIPTION="xbase (i.e. dBase, FoxPro, etc.) compatible C++ class library"
 HOMEPAGE="http://linux.techass.com/projects/xdb/"
@ -17,18 +16,32 @@ IUSE="doc static-libs"
 S="${WORKDIR}"/${PN}64-${PV}

 PATCHES=(
-		"${FILESDIR}"/${P}-fixconfig.patch
-		"${FILESDIR}"/${P}-gcc44.patch
-		"${FILESDIR}"/${PN}-2.0.0-ppc.patch
-		"${FILESDIR}"/${P}-xbnode.patch
-		"${FILESDIR}"/${P}-lesserg.patch
-		"${FILESDIR}"/${P}-outofsource.patch
-		"${FILESDIR}"/${P}-gcc47.patch
-		"${FILESDIR}"/${P}-gcc-version.patch
+	"${FILESDIR}"/${P}-fixconfig.patch
+	"${FILESDIR}"/${P}-gcc44.patch
+	"${FILESDIR}"/${PN}-2.0.0-ppc.patch
+	"${FILESDIR}"/${P}-xbnode.patch
+	"${FILESDIR}"/${P}-lesserg.patch
+	"${FILESDIR}"/${P}-outofsource.patch
+	"${FILESDIR}"/${P}-gcc47.patch
+	"${FILESDIR}"/${P}-gcc-version.patch
+	"${FILESDIR}"/${P}-gcc6.patch
+	"${FILESDIR}"/${P}-gcc7.patch
 )

+src_prepare() {
+	default
+	mv configure.in configure.ac || die
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable static-libs static)
+}
+
 src_install() {
-	autotools-utils_src_install
+	default
+	prune_libtool_files
+
 	# media-tv/linuxtv-dvb-apps collision, bug #208596
 	mv "${ED}/usr/bin/zap" "${ED}/usr/bin/${PN}-zap" || die

--- a/dev-java/dom4j/dom4j-1.6.1-r5.ebuild
+++ b/dev-java/dom4j/dom4j-1.6.1-r5.ebuild
@ -1,77 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Java library for working with XML"
-HOMEPAGE="http://dom4j.sourceforge.net/"
-SRC_URI="
-	mirror://sourceforge/dom4j/${P}.tar.gz
-	mirror://gentoo/${P}-java5.patch.bz2"
-
-LICENSE="dom4j"
-SLOT="1"
-KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-CDEPEND="
-	dev-java/xpp2:0
-	dev-java/xpp3:0
-	dev-java/jaxme:0
-	dev-java/xsdlib:0
-	dev-java/relaxng-datatype:0"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.6"
-
-DEPEND="
-	${CDEPEND}
-	test? (
-		dev-java/ant-junit:0
-		dev-java/junitperf:0
-	)
-	>=virtual/jdk-1.6"
-
-java_prepare() {
-	# Circular deps with jaxen #212993
-	find -name '*.jar' -! -name jaxen-1.1-beta-6.jar -exec rm -v {} + || die
-
-	# Add missing methods to compile on Java 5 #137970
-	epatch "${WORKDIR}/${P}-java5.patch"
-}
-
-# 0 - Requires X11.
-# 1 - Fails with JDK 1.7.
-# 2 - Fails with JDK 1.6.
-JAVA_RM_FILES=(
-	src/test/org/dom4j/bean/BeansTest.java
-	src/test/org/dom4j/io/StaxTest.java
-	src/test/org/dom4j/rule/RuleTest.java
-)
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-JAVA_ANT_CLASSPATH_TAGS+=" javadoc"
-
-JAVA_ANT_ENCODING="ISO-8859-1"
-
-EANT_BUILD_TARGET="clean package"
-EANT_GENTOO_CLASSPATH="jaxme,relaxng-datatype,xpp2,xpp3,xsdlib"
-EANT_GENTOO_CLASSPATH_EXTRA="lib/jaxen-1.1-beta-6.jar"
-EANT_EXTRA_ARGS="-Dbuild.javadocs=build/doc/api"
-
-EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junitperf"
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_dojar "build/${PN}.jar"
-	use doc && java-pkg_dojavadoc build/doc/api
-	use source && java-pkg_dosrc src/java/*
-}
--- a/dev-java/dom4j/dom4j-1.6.1-r6.ebuild
+++ b/dev-java/dom4j/dom4j-1.6.1-r6.ebuild
@ -1,79 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Java library for working with XML"
-HOMEPAGE="http://dom4j.sourceforge.net/"
-SRC_URI="
-	mirror://sourceforge/dom4j/${P}.tar.gz
-	mirror://gentoo/${P}-java5.patch.bz2"
-
-LICENSE="dom4j"
-SLOT="1"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-CDEPEND="
-	dev-java/xpp2:0
-	dev-java/xpp3:0
-	dev-java/xsdlib:0
-	dev-java/relaxng-datatype:0"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.6"
-
-DEPEND="
-	${CDEPEND}
-	test? (
-		dev-java/ant-junit:0
-		dev-java/junitperf:0
-	)
-	>=virtual/jdk-1.6"
-
-PDEPEND="dev-java/jaxen:1.1"
-
-java_prepare() {
-	# Circular deps with jaxen #212993
-	find -name '*.jar' -! -name jaxen-1.1-beta-6.jar -exec rm -v {} + || die
-
-	# Add missing methods to compile on Java 5 #137970
-	epatch "${WORKDIR}/${P}-java5.patch"
-}
-
-# 0 - Requires X11.
-# 1 - Fails with JDK 1.7.
-# 2 - Fails with JDK 1.6.
-JAVA_RM_FILES=(
-	src/test/org/dom4j/bean/BeansTest.java
-	src/test/org/dom4j/io/StaxTest.java
-	src/test/org/dom4j/rule/RuleTest.java
-)
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-JAVA_ANT_CLASSPATH_TAGS+=" javadoc"
-
-JAVA_ANT_ENCODING="ISO-8859-1"
-
-EANT_BUILD_TARGET="clean package"
-EANT_GENTOO_CLASSPATH="relaxng-datatype,xpp2,xpp3,xsdlib"
-EANT_GENTOO_CLASSPATH_EXTRA="lib/jaxen-1.1-beta-6.jar"
-EANT_EXTRA_ARGS="-Dbuild.javadocs=build/doc/api"
-
-EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junitperf"
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_dojar "build/${PN}.jar"
-	java-pkg_register-dependency jaxen-1.1
-	use doc && java-pkg_dojavadoc build/doc/api
-	use source && java-pkg_dosrc src/java/*
-}
--- a/dev-java/dom4j/dom4j-1.6.1-r7.ebuild
+++ b/dev-java/dom4j/dom4j-1.6.1-r7.ebuild
@ -7,7 +7,7 @@ JAVA_PKG_IUSE="doc source test"

 inherit java-pkg-2 java-ant-2

-DESCRIPTION="Java library for working with XML"
+DESCRIPTION="XML Java library"
 HOMEPAGE="http://dom4j.sourceforge.net/"
 SRC_URI="
 	mirror://sourceforge/dom4j/${P}.tar.gz
@ -15,7 +15,7 @@ SRC_URI="

 LICENSE="dom4j"
 SLOT="1"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""

 CDEPEND="
@ -59,10 +59,6 @@ src_prepare() {
 	rm -v "${JAVA_RM_FILES[@]}" || die
 }

-# 0 - Requires X11.
-# 1 - Fails with JDK 1.7.
-# 2 - Fails with JDK 1.6.
-
 JAVA_ANT_REWRITE_CLASSPATH="yes"
 JAVA_ANT_CLASSPATH_TAGS+=" javadoc"

--- a/dev-java/jsr173/jsr173-1.0-r3.ebuild
+++ b/dev-java/jsr173/jsr173-1.0-r3.ebuild
@ -1,51 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-EAPI=6
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Yet another Java library for parsing and writing XML"
-HOMEPAGE="http://dev2dev.bea.com/xml/stax.html"
-SRC_URI="http://ftpna2.bea.com/pub/downloads/${PN}.jar"
-
-LICENSE="bea.ri.jsr173"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-
-CDEPEND="dev-java/jaxme:0"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.6"
-
-DEPEND="
-	${CDEPEND}
-	>=virtual/jdk-1.6"
-
-S="${WORKDIR}"
-
-JAVA_GENTOO_CLASSPATH="jaxme"
-
-DOCS=( README.txt jsr173_1.0.pdf )
-
-src_unpack() {
-	cd "${S}" || die
-	jar xvf "${DISTDIR}/${A}" || die "failed to unpack"
-	jar xvf "${P//-/_}_src.jar" || die "failed to unpack"
-}
-
-src_prepare() {
-	default
-	java-pkg_clean
-}
-
-src_compile() {
-	java-pkg-simple_src_compile
-}
-
-src_install() {
-	java-pkg-simple_src_install
-	use doc && einstalldocs
-}
--- a/dev-java/jsr173/jsr173-1.0-r4.ebuild
+++ b/dev-java/jsr173/jsr173-1.0-r4.ebuild
@ -12,7 +12,7 @@ SRC_URI="http://ftpna2.bea.com/pub/downloads/${PN}.jar"

 LICENSE="bea.ri.jsr173"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"

 RDEPEND="
 	${CDEPEND}
--- a/dev-lang/moarvm/Manifest
+++ b/dev-lang/moarvm/Manifest
@ -3,3 +3,4 @@ DIST MoarVM-2016.11.tar.gz 3402963 SHA256 5eaa8ff47b1c25e023a900947f88222fffe088
 DIST MoarVM-2016.12.tar.gz 3409704 SHA256 70abf2f9aca87fecb73603843137016dd29aa40b92af0e3e06c608561ecf9721 SHA512 af1db57818fbe3f11a0b8fbe329cb81d953da42bb1e4e6284a79620bdd4fb3fdadf44274420f9e2be254e2642adc7a773e7c9e2d0638242077743a35c46a146e WHIRLPOOL 916431a779a5987bd8e74362dff553908c3f5a17e4d4c733c822909264747a307731bef99f0e7e37fc29772e594546bb517b5a1751640de82b9729670af2f1a1
 DIST MoarVM-2017.01.tar.gz 3718510 SHA256 2074693a42a7f31218bf69b70fd5b73d6fd1a1d0e31eaf3f528e204963e94c53 SHA512 d31b292edc4468c4dd26a367944230ce02286cc601c231b175273b0c61d1fb907aced5b63c1f7426eabfd9148b17aee63dea12c74829206fb38250cd4193804f WHIRLPOOL 83a01f8e54b427d1a958df56f13cc780f85978ecb81b01430e074fe1ef948552866ab321131637cc0ffa33b0fb182c4e566c595a8d49775ba262602e4b3dd120
 DIST MoarVM-2017.02.tar.gz 3775575 SHA256 3a486ca5d19a8e6256e379655ec9ed09ff2f1c4f6a57a7969a278819b5bcb4eb SHA512 9b15eb62863f828f4ec3d97c6668b26c51abb50dd277a63e54e919782f5efd1db1a14864b1ac4b8cf1244ee1012ef1c06a802815eaae5dc404d1ece31503ce4a WHIRLPOOL 3878445ef324fb06afce0c962dde5ff1ba0cad9b44d899c3a432b840de7936581bf16d50b5c28c92f9807bc5ac481ebc2b8bdc3e3c6b973e228747662bd163b2
+DIST MoarVM-2017.03.tar.gz 4361623 SHA256 c562a91d462a15f3a964969ddea8b33eae4558e3b25d9e2105f81c259249dbee SHA512 2dfc1a75876d2744d74b1c2df6cbdec1fb73650bde755a534764ca564a3a7c9435691e60ee15f78df798e276c0af3c4db19e4f67df058a79aaa201aab3f96443 WHIRLPOOL 060204b69e91822dc2bb3fe0d6eaeaf9e7331b2e41d058e2025d0c3ffeed5d888acc14ca6ad820bb6f8ea0a652db5096f1598bd11c14c5e3f3699aa9ddb7de23
--- a/dev-lang/moarvm/moarvm-2017.03.ebuild
+++ b/dev-lang/moarvm/moarvm-2017.03.ebuild
@ -0,0 +1,61 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic
+
+MY_PN="MoarVM"
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/${MY_PN}/${MY_PN}.git"
+	inherit git-r3
+	KEYWORDS=""
+	S="${WORKDIR}/${P}"
+else
+	SRC_URI="http://moarvm.org/releases/${MY_PN}-${PV}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/${MY_PN}-${PV}"
+fi
+
+DESCRIPTION="A 6model-based VM for NQP and Rakudo Perl 6"
+HOMEPAGE="http://moarvm.org"
+LICENSE="Artistic-2"
+SLOT="0"
+IUSE="asan clang debug doc +jit static-libs optimize ubsan"
+
+RDEPEND="dev-libs/libatomic_ops
+		dev-libs/libtommath
+		dev-libs/libuv
+		jit? ( dev-lang/lua:0[deprecated]
+			dev-lua/LuaBitOp )
+		virtual/libffi"
+DEPEND="${RDEPEND}
+	clang? ( >=sys-devel/clang-3.1 )
+	dev-lang/perl"
+
+DOCS=( CREDITS README.markdown )
+
+# Tests are conducted via nqp
+RESTRICT=test
+
+src_configure() {
+	use doc && DOCS+=( docs/* )
+	local myconfigargs=(
+		"--prefix=/usr"
+		"--has-libtommath"
+		"--has-libuv"
+		"--has-libatomic_ops"
+		"--has-libffi"
+		"--libdir=$(get_libdir)"
+		"--compiler=$(usex clang clang gcc)"
+		"$(usex asan        --asan)"
+		"$(usex debug       --debug            --no-debug)"
+		"$(usex jit         --lua=/usr/bin/lua --no-jit)"
+		"$(usex optimize    --optimize=        --no-optimize)"
+		"$(usex static-libs --static)"
+		"$(usex ubsan       --ubsan)"
+	)
+	use optimize && filter-flags '-O*'
+
+	perl Configure.pl "${myconfigargs[@]}" || die
+}
--- a/dev-lang/nqp/Manifest
+++ b/dev-lang/nqp/Manifest
@ -3,3 +3,4 @@ DIST nqp-2016.11.tar.gz 3946759 SHA256 08d3eb664ad049e72bd9821755564ee7cbbf0da48
 DIST nqp-2016.12.tar.gz 3643470 SHA256 3dfd71f7f51b78a8266d159a41a4b9d0a3fff1b93b7366054c2daf14ec5df981 SHA512 5967029227b6f527f25cfdc0f27e5466cbff4286e2ef7252b3767fe5f752210d5637d634c4e946f32797e4e380f2f937523a325497214767fae3fa39764eecb2 WHIRLPOOL 67e7138d8d7bd428f77d37721f206a613498cabb07ea0cdfa9afa730505e303709f86373dc36d0ac149f35e08193e85621e41131832e5bafbd5765d1b0d8ed51
 DIST nqp-2017.01.tar.gz 3654574 SHA256 6b407aa2a908cc66dc60b8a1b5a7a76990afcecd25cafd3ecf2ef4c7e8804f62 SHA512 4c32a80df0c982700a2efad8c614efd8595a7dc67ad431fec05e83619e986c9cc8810a8ab80356892e6f42b8c421b38f11a147a3216b7011eb837158b08fdaea WHIRLPOOL b9e5ea5ae91e2964255f6caa9c4aaccc4463cc0427a8056b304e8dcc8b42b143c19840d4dbf77882bf1db0f7e691c91be51e0568034e370778b0e63dc350bbae
 DIST nqp-2017.02.tar.gz 3657637 SHA256 cf2f094296fc7706b2c2f0037331dd624dcdcb2cb41239883c8297b3b1fd38ce SHA512 4781fccfbe0bbcbb4529c8ed540263fc620bfcff2923c39dabd437824353caba6d2627082312bb7841b40b01caaf39282d6af9fcaa18601f9647e769e220d369 WHIRLPOOL d97b5aa9e119bf85fbc8c8da5954466455ff5b26580e61f668ae539ccf6ec4284cdd5be3afa2da053df9459903a3fbe6f0bebc9a47213e9e1e46ecfec943c1ef
+DIST nqp-2017.03.tar.gz 3674277 SHA256 2dce67d6a4388a177a0a3c46b95717a47f31c705b0d8f825f936f65358b655e0 SHA512 8ca0be68785d8f0923d1ef63eca7eb9d7075c475b836911117d62f5030398933e0711bfc5b0ec082e4b4720d6f0fd0f1a74b8c35510f0fffe1e36a972937cd67 WHIRLPOOL 3f2a7b0ea4a7ac5ba1eefd4d4a3453a6c02b10d7c0e93570bdb89e33eadba29f664660024b532ed9a41718db767414b0e1ab362263ecd88490b9a1045d370070
--- a/dev-lang/nqp/nqp-2017.03.ebuild
+++ b/dev-lang/nqp/nqp-2017.03.ebuild
@ -0,0 +1,159 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit java-pkg-opt-2 multibuild
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/perl6/${PN}.git"
+	inherit git-r3
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/perl6/${PN}/tarball/${PV} -> ${P}.tar.gz"
+	inherit vcs-snapshot
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Not Quite Perl, a Perl 6 bootstrapping compiler"
+HOMEPAGE="http://rakudo.org/"
+
+LICENSE="Artistic-2"
+SLOT="0"
+IUSE="doc clang java +moar test"
+REQUIRED_USE="|| ( java moar )"
+
+CDEPEND="java? (
+		dev-java/asm:4
+		dev-java/jline:0
+		dev-java/jna:4
+	)
+	moar? ( ~dev-lang/moarvm-${PV}[clang=] )"
+RDEPEND="${CDEPEND}
+	java? ( >=virtual/jre-1.7 )"
+DEPEND="${CDEPEND}
+	clang? ( sys-devel/clang )
+	java? ( >=virtual/jdk-1.7 )
+	dev-lang/perl"
+
+pkg_pretend() {
+	if has_version dev-lang/rakudo || has_version dev-lang/nqp; then
+		ewarn "NQP is known to fail compilation/installation with Rakudo and/or NQP"
+		ewarn "already being installed. So if it fails, try uninstalling both"
+		ewarn "dev-lang/nqp and dev-lang/rakudo, then do a new installation."
+		ewarn "(see Bug #584394)"
+	fi
+}
+
+java_prepare() {
+	# Don't clean stage0 jars.
+	einfo "Cleaning upstream jars"
+	java-pkg_clean 3rdparty/
+
+	# Don't use jars we just deleted.
+	sed -i -r 's/(:3rdparty[^:]*)+/:${THIRDPARTY_JARS}/g' \
+		src/vm/jvm/runners/nqp-j || die
+}
+
+src_prepare() {
+	MULTIBUILD_VARIANTS=()
+	use moar && MULTIBUILD_VARIANTS+=( moar )
+	use java && MULTIBUILD_VARIANTS+=( jvm )
+
+	multibuild_copy_sources
+
+	# This will pull in conditional java_prepare
+	default
+}
+
+nqp_configure() {
+	pushd "${BUILD_DIR}" > /dev/null || die
+	local myconfargs=(
+		"--backend=${MULTIBUILD_VARIANT}"
+		"--prefix=/usr" )
+
+	perl Configure.pl "${myconfargs[@]}" || die
+	popd || die
+}
+
+nqp_compile() {
+	if [[ "${MULTIBUILD_VARIANT}" = jvm ]]; then
+		emake -j1 \
+			-C "${BUILD_DIR}" \
+			THIRDPARTY_JARS=$(java-pkg_getjars --with-dependencies asm-4,jline,jna-4) \
+			JAVAC="$(java-pkg_get-javac) $(java-pkg_javac-args)"
+	elif [[ "${MULTIBUILD_VARIANT}" = moar ]]; then
+		emake -j1 \
+			-C "${BUILD_DIR}"
+	fi
+}
+
+nqp_test() {
+	emake -j1 \
+		-C "${BUILD_DIR}" \
+		test
+}
+
+nqp_install() {
+	# This is the actual reason we need multibuild.eclass.
+	# We need to distinguish the install procedure for MoarVM and JVM backends.
+	case "${MULTIBUILD_VARIANT}" in
+		moar)
+			emake \
+				DESTDIR="${ED}" \
+				-C "${BUILD_DIR}" \
+				install
+			;;
+		jvm)
+			pushd "${BUILD_DIR}" > /dev/null || die
+			# Set JAVA_PKG_JARDEST early.
+			java-pkg_init_paths_
+
+			# Upstream sets the classpath to this location. Perhaps it's
+			# used to locate the additional libraries?
+			java-pkg_addcp "${JAVA_PKG_JARDEST}"
+
+			insinto "${JAVA_PKG_JARDEST}"
+			local jar
+
+			for jar in *.jar; do
+				if has ${jar} ${PN}.jar ${PN}-runtime.jar; then
+					# jars for NQP itself.
+					java-pkg_dojar ${jar}
+				else
+					# jars used by NQP.
+					doins ${jar}
+				fi
+			done
+
+			# Upstream uses -Xbootclasspath/a, which is faster due to lack
+			# of verification, but gjl isn't flexible enough yet. :(
+			java-pkg_dolauncher ${PN}-j --main ${PN}
+			dosym ${PN}-j /usr/bin/${PN}
+			dobin tools/jvm/eval-client.pl
+			popd > /dev/null || die
+			;;
+		*)
+			die "Unknown MULTIBUILD_VARIANT ${MULTIBUILD_VARIANT}."
+			;;
+	esac
+}
+
+src_configure() {
+	multibuild_foreach_variant nqp_configure
+}
+
+src_compile() {
+	multibuild_foreach_variant nqp_compile
+}
+
+src_test() {
+	multibuild_foreach_variant nqp_test
+}
+
+src_install() {
+	multibuild_foreach_variant nqp_install
+
+	dodoc CREDITS README.pod
+	use doc && dodoc -r docs/*
+}
--- a/dev-lang/rakudo/Manifest
+++ b/dev-lang/rakudo/Manifest
@ -3,3 +3,4 @@ DIST rakudo-2016.11.tar.gz 2824346 SHA256 49c7231032ebeaf32335d8564a65e54d4021a3
 DIST rakudo-2016.12.tar.gz 2843706 SHA256 e5b1b7ed8e6e5eb26eae75691e90a61255d87b73c91c595b412cbd30300e7cb8 SHA512 656c654d893b2ca9cc947711d78d433b462d8bb8cf39c5e8e77dd518c57c4754949f1bb87392d31ee82a412c788bc193c251b1e3d852e87e2c9d2fcb1d71a497 WHIRLPOOL b362392e5965c923538ff57187b4e0dade7a5dc0b8ef6dd09716ced7e8d876d46136a8a93e45388c9a74e725201d3aab8f9b94bbef2e4fd74dbf8367b57c6703
 DIST rakudo-2017.01.tar.gz 2868425 SHA256 2651f60f3123aeb015e9fa11d55c5b506abb88a1725f1fdd801dd3ea34f2a783 SHA512 4de0ce2534cde19676b7f1d88dd80d1c4ad65ba16c86eba97dac09d703fa0aade6d163ec5cbfc2226b6b6bf096121100c2f3fea4202b6e071b5e96077ecaa6bf WHIRLPOOL 1f749eb30121a1480aca749a0c3a9e71f5e9d637c89e3fbe324030797c6bf3566ebc24e394b36d464460419d1bb40bc7feca3ff924086f0552931e8e0a13b4f9
 DIST rakudo-2017.02.tar.gz 2886120 SHA256 475aafbcdaf4c9ed0ac43cafb86e94a204b7124b394b94f3a7657820f3801848 SHA512 67dd0686c0604aebf79e6499c1e6b332e3878a59b8eec25d4993caa00e673597a77391fa69b928b0cec1ab0c6d281a83cfef72f79ed512ee74701712b1446b10 WHIRLPOOL 98fb76e270e36f84f7556aee6a7725f6c8ed2119ae8c12cafa18223ef711b3a5a0a780cfdb8079077214b7e142207dff88ad82b89a1a1bb7ec48a7da40486284
+DIST rakudo-2017.03.tar.gz 2901724 SHA256 2dabc619c7ba3a935dd1b12caa8151cd220f18d516d807e268787dd10eefad09 SHA512 1f38db076cfa6932093d96b08573ffa691f7e68a676ce56826d64fc36828c9712f717df0c569d860b364aff587f974854bd47d5fb77b2d0c49e7e0d986466be0 WHIRLPOOL 8662b740870335d75be2b4089c56be565c3cbde673bcf041130c337edb01cf4c6b025112acfbaf4f616a2cd3f023a08309ec76eb2b54cf25248b09b3e4585f9c
--- a/dev-lang/rakudo/rakudo-2017.03.ebuild
+++ b/dev-lang/rakudo/rakudo-2017.03.ebuild
@ -0,0 +1,72 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit java-pkg-opt-2
+
+DESCRIPTION="A compiler for the Perl 6 programming language"
+HOMEPAGE="http://rakudo.org"
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/rakudo/${PN}.git"
+	inherit git-r3
+	KEYWORDS=""
+else
+	SRC_URI="${HOMEPAGE}/downloads/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="Artistic-2"
+SLOT="0"
+# TODO: add USE="javascript" once that's usable in nqp
+IUSE="clang java +moar test"
+REQUIRED_USE="|| ( java moar )"
+
+CDEPEND="~dev-lang/nqp-${PV}:${SLOT}=[java?,moar?,clang=]"
+RDEPEND="${CDEPEND}
+	java? ( >=virtual/jre-1.7 )"
+DEPEND="${CDEPEND}
+	clang? ( sys-devel/clang )
+	java? ( >=virtual/jdk-1.7 )
+	>=dev-lang/perl-5.10"
+
+pkg_pretend() {
+	if has_version dev-lang/rakudo; then
+		ewarn "Rakudo is known to fail compilation/installation with Rakudo"
+		ewarn "already being installed. So if it fails, try unmerging dev-lang/rakudo,"
+		ewarn "then do a new installation."
+		ewarn "(see Bug #584394)"
+	fi
+}
+
+src_configure() {
+	local backends
+	use moar && backends+="moar,"
+	use java && backends+="jvm"
+
+	local myargs=(
+		"--prefix=/usr"
+		"--sysroot=/"
+		"--sdkroot=/"
+		"--backends=${backends}"
+	)
+
+	perl Configure.pl "${myargs[@]}" || die
+
+	if use java; then
+		NQP=$(java-pkg_getjars --with-dependencies nqp)
+	fi
+}
+
+src_compile() {
+	emake DESTDIR="${D}" NQP_JARS="${NQP}" BLD_NQP_JARS="${NQP}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" NQP_JARS="${NQP}" BLD_NQP_JARS="${NQP}" install
+}
+
+src_test() {
+	RAKUDO_PRECOMP_PREFIX=$(mktemp -d) default
+}
--- a/dev-libs/concurrencykit/concurrencykit-0.6.0.ebuild
+++ b/dev-libs/concurrencykit/concurrencykit-0.6.0.ebuild
@ -12,6 +12,6 @@ SRC_URI="http://concurrencykit.org/releases/${MY_P}.tar.gz -> ${P}.tar.gz"

 LICENSE="Apache-2.0 BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"

 S="${WORKDIR}/${MY_P}"
--- a/dev-libs/geoip/files/geoipupdate-r5.sh
+++ b/dev-libs/geoip/files/geoipupdate-r5.sh
@ -1,46 +0,0 @@
-#!/bin/sh
-
-GEOIP_MIRROR="https://geolite.maxmind.com/download/geoip/database"
-GEOIPDIR=@PREFIX@/usr/share/GeoIP
-TMPDIR=
-
-DATABASES="
-	GeoIPv6
-	GeoLiteCity
-	GeoLiteCityv6-beta/GeoLiteCityv6
-	GeoLiteCountry/GeoIP
-	asnum/GeoIPASNum
-	asnum/GeoIPASNumv6
-"
-
-if [ "${1}" = -f ] || [ "${1}" = --force ]; then
-	force=true
-fi
-
-if [ -d "${GEOIPDIR}" ]; then
-	cd $GEOIPDIR
-	if [ -n "${DATABASES}" ]; then
-		TMPDIR=$(mktemp -d geoipupdate.XXXXXXXXXX)
-
-		echo "Updating GeoIP databases..."
-
-		for db in $DATABASES; do
-			fname=$(basename $db)
-
-			if [ -f "${GEOIPDIR}/${fname}.dat" ] || [ ${force} ]; then
-				wget --no-verbose -t 3 -T 60 \
-					"${GEOIP_MIRROR}/${db}.dat.gz" \
-					-O "${TMPDIR}/${fname}.dat.gz"
-				if [ $? -eq 0 ]; then
-					gunzip -fdc "${TMPDIR}/${fname}.dat.gz" > "${TMPDIR}/${fname}.dat"
-					mv "${TMPDIR}/${fname}.dat" "${GEOIPDIR}/${fname}.dat"
-					chmod 0644 "${GEOIPDIR}/${fname}.dat"
-					case ${fname} in
-						GeoLite*) ln -sf ${fname}.dat `echo ${fname} | sed 's/GeoLite/GeoIP/'`.dat ;;
-					esac
-				fi
-			fi
-		done
-		[ -d "${TMPDIR}" ] && rm -rf $TMPDIR
-	fi
-fi
--- a/dev-libs/geoip/geoip-1.6.9-r1.ebuild
+++ b/dev-libs/geoip/geoip-1.6.9-r1.ebuild
@ -13,7 +13,7 @@ SRC_URI="
 # GPL-2 for md5.c - part of libGeoIPUpdate, MaxMind for GeoLite Country db
 LICENSE="LGPL-2.1 GPL-2 MaxMind2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="static-libs"
 RESTRICT="test"

--- a/dev-libs/geoip/geoip-1.6.9.ebuild
+++ b/dev-libs/geoip/geoip-1.6.9.ebuild
@ -1,51 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils
-
-DESCRIPTION="GeoIP Legacy C API"
-HOMEPAGE="https://github.com/maxmind/geoip-api-c"
-SRC_URI="
-	https://github.com/maxmind/${PN}-api-c/archive/v${PV}.tar.gz -> ${P}.tar.gz
-"
-
-# GPL-2 for md5.c - part of libGeoIPUpdate, MaxMind for GeoLite Country db
-LICENSE="LGPL-2.1 GPL-2 MaxMind2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="static-libs"
-RESTRICT="test"
-
-DEPEND="net-misc/wget"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}-api-c-${PV}"
-
-src_prepare() {
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_enable static-libs static)
-	sed -e "s|@PREFIX@|${ROOT}|g" "${FILESDIR}"/geoipupdate-r5.sh > geoipupdate.sh || die
-}
-
-src_install() {
-	default
-
-	dodoc AUTHORS ChangeLog NEWS.md README*
-
-	prune_libtool_files
-
-	keepdir /usr/share/GeoIP
-
-	dosbin geoipupdate.sh
-}
-
-pkg_postinst() {
-	ewarn "WARNING: Databases are no longer installed by this ebuild."
-	elog "Don't forget to run 'geoipupdate.sh -f' (or geoipupdate from"
-	elog "net-misc/geoipupdate) to populate ${ROOT}/usr/share/GeoIP/"
-	elog "with geo-located IP address databases."
-}
--- a/dev-libs/libdbusmenu-qt/Manifest
+++ b/dev-libs/libdbusmenu-qt/Manifest
@ -1,2 +1 @@
-DIST libdbusmenu-qt_0.9.3+14.10.20140619.orig.tar.gz 46641 SHA256 e531b29388317f48e22c652c7111e9c7750aa7d429a72742c49a1c8af1e61968 SHA512 791c1904a1c960a94bba2c624469d8a9c1c76e14fc40917feb5aeb8c55acc6c68a0b03509037440f35ad8416710cbe705c1b117b23a9a684b6ff0d919d1d5e18 WHIRLPOOL b76294a4c9cdf943594f685aeae13e12db8d6f0b85f4a86031023c15072cdae619ff70c95e8db40eaeb9acb8d234e48e45ca79899c835b068387df040f688160
 DIST libdbusmenu-qt_0.9.3+16.04.20160218.orig.tar.gz 46438 SHA256 a8e6358a31c44ccdf1bfc46c95a77a6bfc7fc1f536aadb913ed4f4405c570cf6 SHA512 dfaba59cedd320e6a3b5a9c0a5e13fb9e0952224e39cdd6ee3b32b03d95ac850a533e2a73835a7c0ead93b2283b9c235472bacb84e3d761ebe9e9398345314a9 WHIRLPOOL 7832fc56c09e232415befdd032db9498499e722a727215d27796db8cfff104ef7e6b11c8534d42496e4be7dcaec33116d7b2cabe443562a5a364fe5a6dc59a3e
--- a/dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.9.3_pre20140619-r1.ebuild
+++ b/dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.9.3_pre20140619-r1.ebuild
@ -1,136 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-EBZR_REPO_URI="lp:libdbusmenu-qt"
-
-[[ ${PV} == 9999* ]] && BZR_ECLASS="bzr"
-inherit multibuild multilib virtualx ${BZR_ECLASS} cmake-multilib
-
-DESCRIPTION="A library providing Qt implementation of DBusMenu specification"
-HOMEPAGE="https://launchpad.net/libdbusmenu-qt/"
-if [[ ${PV} == 9999* ]] ; then
-	KEYWORDS="ppc ppc64 x86"
-else
-	MY_PV=${PV/_pre/+14.10.}
-	SRC_URI="https://launchpad.net/ubuntu/+archive/primary/+files/${PN}_${MY_PV}.orig.tar.gz"
-	# upstream has no permissions to use some kde written code so repack git
-	# repo every time
-	#SRC_URI="https://dev.gentoo.org/~scarabeus/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-	PATCHES=( "${FILESDIR}/${P}-optionaltests.patch" )
-fi
-
-LICENSE="LGPL-2"
-SLOT="0"
-IUSE="debug doc +qt4 qt5"
-S=${WORKDIR}/${PN}-${MY_PV}
-
-REQUIRED_USE="|| ( qt4 qt5 )"
-
-RDEPEND="
-	qt4? (
-		>=dev-qt/qtcore-4.8.6:4[${MULTILIB_USEDEP}]
-		>=dev-qt/qtdbus-4.8.6:4[${MULTILIB_USEDEP}]
-		>=dev-qt/qtgui-4.8.6:4[${MULTILIB_USEDEP}]
-	)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtdbus:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-	)
-"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	test? (
-		dev-libs/qjson[${MULTILIB_USEDEP}]
-		qt4? ( >=dev-qt/qttest-4.8.6:4[${MULTILIB_USEDEP}] )
-		qt5? ( dev-qt/qttest:5 )
-	)
-"
-
-DOCS=( NEWS README )
-
-# tests fail due to missing connection to dbus
-RESTRICT="test"
-
-pkg_setup() {
-	MULTIBUILD_VARIANTS=( $(usex qt4 4) $(usex qt5 5) )
-}
-
-src_prepare() {
-	[[ ${PV} == 9999* ]] && bzr_src_prepare
-	cmake-utils_src_prepare
-
-	comment_add_subdirectory tools
-	use test || comment_add_subdirectory tests
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_with doc)
-		-DUSE_QT${QT_MULTIBUILD_VARIANT}=ON
-		-DQT_QMAKE_EXECUTABLE="/usr/$(get_libdir)/qt${QT_MULTIBUILD_VARIANT}/bin/qmake"
-	)
-	cmake-utils_src_configure
-}
-
-src_configure() {
-	myconfigure() {
-		local QT_MULTIBUILD_VARIANT=${MULTIBUILD_VARIANT}
-		if [[ ${MULTIBUILD_VARIANT} = 4 ]] ; then
-			cmake-multilib_src_configure
-		elif [[ ${MULTIBUILD_VARIANT} = 5 ]] ; then
-			multilib_src_configure
-		fi
-	}
-
-	multibuild_foreach_variant myconfigure
-}
-
-src_compile() {
-	mycompile() {
-		if [[ ${MULTIBUILD_VARIANT} = 4 ]] ; then
-			cmake-multilib_src_compile
-		elif [[ ${MULTIBUILD_VARIANT} = 5 ]] ; then
-			cmake-utils_src_compile
-		fi
-	}
-
-	multibuild_foreach_variant mycompile
-}
-
-src_install() {
-	myinstall() {
-		if [[ ${MULTIBUILD_VARIANT} = 4 ]] ; then
-			cmake-multilib_src_install
-		elif [[ ${MULTIBUILD_VARIANT} = 5 ]] ; then
-			cmake-utils_src_install
-		fi
-	}
-
-	multibuild_foreach_variant myinstall
-}
-
-src_test() {
-	mytest() {
-		if [[ ${MULTIBUILD_VARIANT} = 4 ]] ; then
-			cmake-multilib_src_test
-		elif [[ ${MULTIBUILD_VARIANT} = 5 ]] ; then
-			multilib_src_test
-		fi
-	}
-
-	multibuild_foreach_variant mytest
-}
-
-multilib_src_test() {
-	local builddir=${BUILD_DIR}
-
-	BUILD_DIR=${BUILD_DIR}/tests \
-		VIRTUALX_COMMAND=cmake-utils_src_test virtualmake
-
-	BUILD_DIR=${builddir}
-}
--- a/dev-libs/nettle/nettle-3.3-r1.ebuild
+++ b/dev-libs/nettle/nettle-3.3-r1.ebuild
@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"

 LICENSE="|| ( LGPL-3 LGPL-2.1 )"
 SLOT="0/6.1" # subslot = libnettle soname version, .1 as broke ABI bug#601512
-KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc +gmp neon static-libs test cpu_flags_x86_aes"

 DEPEND="gmp? ( >=dev-libs/gmp-5.0:0=[${MULTILIB_USEDEP}] )"
--- a/dev-libs/npth/Manifest
+++ b/dev-libs/npth/Manifest
@ -1,2 +1 @@
-DIST npth-1.2.tar.bz2 298735 SHA256 6ddbdddb2cf49a4723f9d1ad6563c480d6760dcb63cb7726b8fc3bc2e1b6c08a SHA512 3f02fdf3553c6cda8973ce1a7d6625433a87c891c51d4d7fd64bba375d673a6a874c25d8f272ca14e6b6bf43bf8e7113826f6fe3befadc4b12d5126e8998af57 WHIRLPOOL f9f646cf480e2e27dcdc97dcdf7ceddbed8c23343b44c17ebcdc0223f59c94183d2f4111fc4b6e556ac07f6bfa9fee81afb2d75579518bcc9bae2a1a752a8b04
 DIST npth-1.3.tar.bz2 295998 SHA256 bca81940436aed0734eb8d0ff8b179e04cc8c087f5625204419f5f45d736a82a SHA512 97b0278cc9448adb42c4a83b8e7bafeed939acaf3dd3a201a1b103df4e48f24224d4bdaeb97903ad1884914ce363cbceffe948a7c1db4f19abf87ca5964f5699 WHIRLPOOL 786dd42c0bb097f47c708cae633f32789d9724cfb5d0e0a12667c754ba32a273ddda6b1c061ad10be1fa2e98dbbcf6850d404e909243fd2e566ba17825f63526
--- a/dev-libs/npth/npth-1.2.ebuild
+++ b/dev-libs/npth/npth-1.2.ebuild
@ -1,14 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools-utils
-
-DESCRIPTION="New GNU Portable Threads Library"
-HOMEPAGE="https://git.gnupg.org/cgi-bin/gitweb.cgi?p=npth.git"
-SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
-IUSE="static-libs"
--- a/dev-libs/npth/npth-1.3.ebuild
+++ b/dev-libs/npth/npth-1.3.ebuild
@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"

 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"

 src_prepare() {
--- a/dev-ml/ppx_metaquot/ppx_metaquot-0.9.0.ebuild
+++ b/dev-ml/ppx_metaquot/ppx_metaquot-0.9.0.ebuild
@ -17,6 +17,7 @@ DEPEND="
 	dev-ml/ppx_driver:=
 	dev-ml/ppx_traverse_builtins:=
 	dev-ml/ocaml-migrate-parsetree:=
+	<dev-ml/ppx_core-100
 	"
 RDEPEND="${DEPEND}"
 DEPEND="${DEPEND} dev-ml/opam dev-ml/jbuilder"
--- a/dev-perl/B-OPCheck/B-OPCheck-0.320.0.ebuild
+++ b/dev-perl/B-OPCheck/B-OPCheck-0.320.0.ebuild
@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=ETHER
+DIST_VERSION=0.32
+inherit perl-module
+
+DESCRIPTION="PL_check hacks using Perl callbacks"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	>=dev-perl/B-Utils-0.80.0
+	virtual/perl-Carp
+	virtual/perl-Scalar-List-Utils
+	dev-perl/Scope-Guard
+	virtual/perl-XSLoader
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	>=dev-perl/ExtUtils-Depends-0.302.0
+	test? (
+		virtual/perl-File-Spec
+		virtual/perl-Module-Metadata
+		virtual/perl-Test-Simple
+	)
+"
--- a/dev-perl/B-OPCheck/Manifest
+++ b/dev-perl/B-OPCheck/Manifest
@ -1 +1,2 @@
 DIST B-OPCheck-0.30.tar.gz 74668 SHA256 3a01bb406543cd204453322647fa48fcad2ecd9d5cc689154dfad71a441ad1bd SHA512 09aac95626c2594a1833682b6e1d5fc3f631570ceb0f1773c9d3c3c8a2aff57a903d5d24a51aa117cb8027d9c201153f790546300272c2a0748320f4f49274fc WHIRLPOOL 8aa8b69c367765a5df8d92d59f8a1bae3ab382933d7836adc9080f2dc060097028dec7a1439d0b97e283d825b012cd907c3cb679bce6645ea2a06d3e3e71ae96
+DIST B-OPCheck-0.32.tar.gz 76109 SHA256 2ec23da87f1d10758f75113448d9fb718a4be0b9ed634cffc5fc09b36a1f1a82 SHA512 35ee8f66c1958e5622399538417939f9c705af23faa724845ed5d585afd1b793f2d134dc37265111c9d8370c8c5c33b359b5379e3dd2676b47c8eb2768dd81cd WHIRLPOOL 97e7b8a1d5461ab002e9ba7719d66f1428612f5df646b4a3f1998ac5a1044a2d904eab2c3636d796b37256dabe8f5a8868b96d97cbb5589cf80f14cc8427436c
--- a/dev-perl/Bio-ASN1-EntrezGene/Bio-ASN1-EntrezGene-1.720.0.ebuild
+++ b/dev-perl/Bio-ASN1-EntrezGene/Bio-ASN1-EntrezGene-1.720.0.ebuild
@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=CJFIELDS
+DIST_VERSION=1.72
+DIST_EXAMPLES=("examples/*")
+inherit perl-module
+
+DESCRIPTION="Regular expression-based Perl Parser for NCBI Entrez Gene"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	virtual/perl-Carp
+	virtual/perl-parent
+	>=sci-biology/bioperl-1.6.0
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		virtual/perl-File-Spec
+		virtual/perl-IO
+		virtual/perl-Test-Simple
+	)
+"
+
+src_test() {
+	perl_rm_files t/author-*.t t/release-*.t
+	perl-module_src_test
+}
--- a/dev-perl/Bio-ASN1-EntrezGene/Manifest
+++ b/dev-perl/Bio-ASN1-EntrezGene/Manifest
@ -1,2 +1,3 @@
 DIST Bio-ASN1-EntrezGene-1.091.tgz 36360 SHA256 a053fb71906fa58cbd6a80af1e3d4d9142f6a1fc99b642a6065f9a8ce93ad2bc SHA512 01c58cc3afe1fb9df1e9db43dbf0ed53fe4dcd953728d6363d2488b0319b9cabe444ec2856ae8922cb8eb16fe5709f7353f715681e098498c1a203699fb21960 WHIRLPOOL e1102f45e37c896dae90df58d99b97b8d9af22babc9298b95a4c2f2490a824926db6bd0517c85c42b00b204ff702c761d7ece8f6e3c04e656df858e4f97e033d
 DIST Bio-ASN1-EntrezGene-1.70.tar.gz 46969 SHA256 342ce97702e101da813e76221e15414be3fd608fc9059fcc36a141d939048dfb SHA512 72ab5d1741bfd699bb38496590d267fc29f1d75e462ee9586a3ee01b0a0741bd1de5ad41d8e47a7afce993caa2bbea2ae2e8b7c716f727c1d65a66a860a3f8cf WHIRLPOOL a0d6a8ae24bc8f1d7ddfeb81293fbef491ac39189ec6925662dcd7307bb4c4ab07b42d77f2a756edd1143039e45952985f6bd0194ba62815b3a49a49d4ee1739
+DIST Bio-ASN1-EntrezGene-1.72.tar.gz 49080 SHA256 7f55f69cccfab37d976338ed77d245a62a44b03b7b9954484d8976eab14d575b SHA512 eb8d2c76d0a77febafb7f06e276de3e9d0c9128e1b14e3899edaca25d6c00fffd11a9b0e589ed143bd5ec7807d18c2df599b0cd95e5c77cb20787f6df8c0b315 WHIRLPOOL d09e6f7aca6c0767eb95f04de8f17282200759b68556dbc3cdf815c4b4a66b7680585dec2a23faf39b533a7fac184d706bfe44e538b0da4482419a2627fe089a
--- a/dev-perl/Bio-Graphics/Bio-Graphics-2.390.0.ebuild
+++ b/dev-perl/Bio-Graphics/Bio-Graphics-2.390.0.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=5
@ -17,10 +17,9 @@ RDEPEND="
 	>=dev-perl/GD-2.300.0
 	>=dev-perl/Statistics-Descriptive-2.600.0
 	>=sci-biology/bioperl-1.5.9.1
-
+	dev-perl/CGI
 "
 DEPEND="${RDEPEND}
 	>=dev-perl/Module-Build-0.420.0
 "
-
 SRC_TEST=do
--- a/dev-perl/Business-ISBN/Business-ISBN-2.50.0-r1.ebuild
+++ b/dev-perl/Business-ISBN/Business-ISBN-2.50.0-r1.ebuild
@ -1,34 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=BDFOY
-MODULE_VERSION=2.05
-inherit perl-module
-
-DESCRIPTION="Work with ISBN as objects"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="
-	>=dev-perl/Business-ISBN-Data-20081208.0.0
-"
-DEPEND="${RDEPEND}
-	test? ( virtual/perl-Test-Simple )
-"
-SRC_TEST=do
-
-src_prepare() {
-	perl-module_src_prepare
-	sed -i '/URI/d' Makefile.PL || die # unused dependency
-}
-
-src_test() {
-	perl_rm_files t/pod{,_coverage}.t
-	mv t/xisbn10.t{,.disable} || die # online test
-	sed -i 's,9997022576,9999922579,' t/isbn1{0,3}.t || die # non-existing block
-	perl-module_src_test
-}
--- a/dev-perl/Business-ISBN/Manifest
+++ b/dev-perl/Business-ISBN/Manifest
@ -1,2 +1 @@
-DIST Business-ISBN-2.05.tar.gz 355413 SHA256 d9816bfb7aa6d87843f8484c9aac23e4c5ec1173ebfec458843e89ea5cf375ee SHA512 b5179f891a401f11f1355137e90e14a9f3602c14b181b30da3237bd4ba49b40df41c9c1396242084211a09dfcde8927d1dfe0965602982cb0d50a3b0bbfad694 WHIRLPOOL 7b5b073010e739891b357fb568300452f49e87a3b33ebacdb0205d62ab079117252c6ed112bc3a4a8c1eabc531a9a50125deddd8732a2ce740304f7d576e1568
 DIST Business-ISBN-2.09_02.tar.gz 361751 SHA256 9a40e9d12d108b2def6bda4e4910a44aed5ba7c8ee062c464cd04a40d893b007 SHA512 4a74c708e14d178802adbea846127257fc790b6ddba41c5c468e7df9f8ca25e880d2487d12f0474fa69a5c312354e1856f729c4f598536c053d58c41220fef7d WHIRLPOOL 52864908e7c2d8cc236e29efa300389c8463ff6186d8bdf67677e018dd55e64d043dbf716d8787d6a885c0f2962a1d62e4941268d3b48777759f29a950ee3ef9
--- a/dev-perl/Clone/Clone-0.390.0.ebuild
+++ b/dev-perl/Clone/Clone-0.390.0.ebuild
@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=GARU
+DIST_VERSION=0.39
+inherit perl-module
+
+DESCRIPTION="Recursively copy Perl datatypes"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? ( virtual/perl-Test-Simple )
+"
+mymake='OPTIMIZE=${CFLAGS}'
--- a/dev-perl/Clone/Manifest
+++ b/dev-perl/Clone/Manifest
@ -1 +1,2 @@
 DIST Clone-0.38.tar.gz 13636 SHA256 9fb0534bb7ef6ca1f6cc1dc3f29750d6d424394d14c40efdc77832fad3cebde8 SHA512 6e40547255eab43e7d2e43b745292277951cecc227f92c58246e3959395e6c23b13c25568c90012a851c6ad2e6173b5bc988664cdde54f2ca881c50b0108c766 WHIRLPOOL d36a96a4d5bcef4fd0dc62dd722976217bd61af74556ba1e52c0ae0a8a4d481e96b985ff2b9abd4e61cf47bf016e3e7d2bf88f08f0ccd201f5abb67080691e6f
+DIST Clone-0.39.tar.gz 13785 SHA256 acb046683e49d650b113634ecf57df000816a49e611b0fff70bf3f93568bfa2d SHA512 5e3feeff7646fb2ea075267962f7f7013186310974cdbb87f779ece0f56baf62e7dbb0afa94816e20675dc03bc5fbe271b9594e12ea441863b78860691822b6b WHIRLPOOL 30a3b79c8158d74e1ef4a327981eaf581b1b4f5d503624096b791859e50138925c648a00d320ccd1dce25896f4e53276f3bde938ce7f35e3ccd8e87e9f429fa8
--- a/dev-perl/DateTime-Format-W3CDTF/DateTime-Format-W3CDTF-0.70.0.ebuild
+++ b/dev-perl/DateTime-Format-W3CDTF/DateTime-Format-W3CDTF-0.70.0.ebuild
@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=GWILLIAMS
+DIST_VERSION=0.07
+inherit perl-module
+
+DESCRIPTION="Parse and format W3CDTF datetime strings"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-solaris"
+IUSE="test"
+
+RDEPEND="dev-perl/DateTime"
+DEPEND="${RDEPEND}
+	>=virtual/perl-ExtUtils-MakeMaker-6.360.0
+	test? (
+		>=virtual/perl-Test-Simple-0.610.0
+	)
+"
+src_prepare() {
+	use test && perl_rm_files t/pod.t t/pod_coverage.t
+	perl-module_src_prepare
+}
--- a/dev-perl/DateTime-Format-W3CDTF/Manifest
+++ b/dev-perl/DateTime-Format-W3CDTF/Manifest
@ -1 +1,2 @@
 DIST DateTime-Format-W3CDTF-0.06.tar.gz 29825 SHA256 b9a542bed9c52b0a89dd590a5184e38ee334c824bbe6bac842dd7dd1f88fbd7a SHA512 2c4155850880b9325091a47670b37d90f6d8ef1d89cd62d6d139c2e35e1d185c37b00be1edf47a352b906114e4122e3b45759eee150d3aaaf6bdddc266b87255 WHIRLPOOL 9f740968eeacb26ef247d2a7c9a073e6de7099e7e9f16c9c89a844366ff587227b7675321e37fd794a5bd7950d080a71fc03e353b3d189121db70a9ead4e6d55
+DIST DateTime-Format-W3CDTF-0.07.tar.gz 29598 SHA256 69a02b661bbf1daa14a4813cb6786eaa66dbdf2743f0b3f458e30234c3a26268 SHA512 f5b8f3437c4e9a7e192900af16e83a567889dbdf1a934d604461c5096c271b497cda9bd4f9359658f536d262232e4521519f92c06bf07712922403baf6429c64 WHIRLPOOL 65c01fc6da006c26f44760bbe7e18bbe953657a6c2af23d1fb9752f91e1c057ae8476cd6fb6ab9e7544e4ac5a35743cb5bf44d3636663d6aabb3eedec27b60c3
--- a/dev-perl/Devel-CheckLib/Devel-CheckLib-1.100.0.ebuild
+++ b/dev-perl/Devel-CheckLib/Devel-CheckLib-1.100.0.ebuild
@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=MATTN
+DIST_VERSION=1.10
+inherit perl-module
+
+DESCRIPTION="check that a library is available"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	>=virtual/perl-File-Temp-0.160.0
+	virtual/perl-Exporter
+	virtual/perl-File-Spec
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		>=virtual/perl-Test-Simple-0.620.0
+		>=dev-perl/IO-CaptureOutput-1.80.100
+		>=dev-perl/Mock-Config-0.20.0
+	)
+"
--- a/dev-perl/Devel-CheckLib/Manifest
+++ b/dev-perl/Devel-CheckLib/Manifest
@ -1,3 +1,4 @@
 DIST Devel-CheckLib-1.06.tar.gz 14315 SHA256 b5a49989ad1ac414ad5dd52d9ec93c3b88c4d9141693a45d2b07bb24d8bc6dad SHA512 a87d7ecb6ab3936b1dfe69f7a6b61c21ab097cc89a45d98715e1615895f9412e64206f950535a77009249f35d028875fe679f90adb9b48030c2d5a28f6a8f68e WHIRLPOOL dace2adbcf33dad613790f8df460a9274a6f5abe0bac7bdf75fc0a8a97412bff5bd3f0ad7fa7967a78b7f6a96e1261e71843320e46dab35eae52de8ee3319172
 DIST Devel-CheckLib-1.07.tar.gz 15105 SHA256 c958fd46b306940000088098d66470cb51094ff39a9e950cf66251d67a92ff0a SHA512 05ced7b976b2c9854f0705db3b461614962568045e04b33a92c11d05ec8183cf56935dc5ef2f80e4746d52cb08c6c993627166d0f701abce5c91ceceed39d103 WHIRLPOOL 4e86cf21e710a69c73d7aeb1b966794ca37893cb016aa851f75266317c8ea06f7667d1159775dda245b6d079babe7c0626a4422323b792060a9ff1125724bf99
 DIST Devel-CheckLib-1.09.tar.gz 15015 SHA256 0301aa2cc827fb9bb16cc7ca1d59bd5193b9536ddbdbc3621835d8c61c57efd6 SHA512 e0d7c284bf04af253b2a88caca87751c438c030c807aa068de35d9bab476bbdf9f25a15297e924c62e89ab781a8809750b4ef46e4e8ee6427dc817efbdb1c297 WHIRLPOOL d25fd2ba73e6bfef6d4752bdd5c5c87732b33cf67679ab778b9b48d06530237e9cd612f7b32f26f51728078aca6932b8ad7d1a67a0743da5411deabe24fed9dd
+DIST Devel-CheckLib-1.10.tar.gz 15158 SHA256 1633f10bcbe86cf65721813d69264c4f3a426a9d741bc041647c0887bd41ad14 SHA512 aab565df0b31a08b2dff3fb777bc208ff9b8322d9012fb2deaa5d27411e4915cdd2e48cd65eb55323c69f23975e08cee8cfa4a8221a4b2e39770bdeecfe3f127 WHIRLPOOL 1c1d1e47c5036d1599ec2e9f4a7bec63b30a9c60ca5014af31f4923d1c768f9b318697b9f1f1fb4d1a1a783e2793a8f2655c0df8fca78bd872f00c29b77c79eb
--- a/dev-perl/File-ShareDir/File-ShareDir-1.102.0.ebuild
+++ b/dev-perl/File-ShareDir/File-ShareDir-1.102.0.ebuild
@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Locate per-dist and per-module shared files"

 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~x86-solaris"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~x86-solaris"
 IUSE="test"

 RDEPEND="
--- a/dev-perl/Filter/Filter-1.570.0.ebuild
+++ b/dev-perl/Filter/Filter-1.570.0.ebuild
@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Interface for creation of Perl Filters"

 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""

 DEPEND="
--- a/dev-perl/HTTP-Cache-Transparent/HTTP-Cache-Transparent-1.400.0.ebuild
+++ b/dev-perl/HTTP-Cache-Transparent/HTTP-Cache-Transparent-1.400.0.ebuild
@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=MATTIASH
+DIST_VERSION=1.4
+DIST_EXAMPLES=("examples/*")
+inherit perl-module
+
+DESCRIPTION="Cache the result of http get-requests persistently"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86"
+IUSE="test"
+
+RDEPEND="dev-perl/libwww-perl
+	virtual/perl-Digest-MD5
+	virtual/perl-Storable"
+DEPEND="${RDEPEND}
+	test? ( virtual/perl-Test-Simple )"
+
+src_test() {
+	perl_rm_files t/pod.t t/pod-coverage.t
+	perl-module_src_test
+}
--- a/dev-perl/HTTP-Cache-Transparent/Manifest
+++ b/dev-perl/HTTP-Cache-Transparent/Manifest
@ -1 +1,2 @@
 DIST HTTP-Cache-Transparent-1.1.tar.gz 9005 SHA256 0abf7b7d972abcd5d77aa4d138ad58406948e7f276f4071e13097b841f7c7eda SHA512 92993728c7803d6b9c2f7cfd8dce12e942df2002081908ebe3277034c1bcd35e3d4822fd246c028dd168229068a8e54b1caaca6f535b497319bd0dd3513c0ff0 WHIRLPOOL a81556aa41ee06ea39d5ff18026e70b52ad55c06c5ce229afb0b1873410af57f651bc1272aef732e667e30ab24ed46813ef109de3aa6a1e0638e714b4192462c
+DIST HTTP-Cache-Transparent-1.4.tar.gz 10289 SHA256 6622e1b5e5af952b1711aea247bdcb1b91c2aac0f11f32f819a2d07e11dd2845 SHA512 bd48290de4aeffe64cc4748d2f4b054abef539770dd8679f88fd24d9478819c31d7201918335404ea5ed0251d4c4f7d19926ccdeb6b4da2cecf251d2618589a4 WHIRLPOOL 223115bcf03c840085b41d73868b15ad75f6f21b3939789b24d6c4b0f7a8fa4b3428baff84fb52de9ee3616e605e51050bd78ac0df4e30c04aecf6cd85745921
--- a/dev-perl/List-MoreUtils/List-MoreUtils-0.419.0.ebuild
+++ b/dev-perl/List-MoreUtils/List-MoreUtils-0.419.0.ebuild
@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=REHSACK
+DIST_VERSION=0.419
+inherit perl-module
+
+DESCRIPTION="Provide the missing functionality from List::Util"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="test +xs"
+# See MoreUtils.pm/LICENSE
+LICENSE="Apache-2.0 || ( Artistic GPL-1+ )"
+
+PDEPEND="xs? ( dev-perl/List-MoreUtils-XS )"
+RDEPEND=">=dev-perl/Exporter-Tiny-0.38.0"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? ( >=virtual/perl-Test-Simple-0.960.0 )
+"
--- a/dev-perl/List-MoreUtils/Manifest
+++ b/dev-perl/List-MoreUtils/Manifest
@ -1,2 +1,3 @@
 DIST List-MoreUtils-0.413.tar.gz 131313 SHA256 4d6429d5672ce74a59d6490320252cb8b5b8285db8fe9c6551a4162e5375ef37 SHA512 178c08995d2eddd75054b29cd68adb77617e92b7e56ac56a890eb7b8e04a1f8eda09f2208288d61352db563bff7da0accf58f7482906a51e03b38465ea655d17 WHIRLPOOL 843a54dc44e6698ced55e2737dc42c14327af5e76d25899e617cbec6fccceb4ddcf8ca424e641fa32be60b6b1878191ad3446c1f8477c7c751559799b3d871bc
 DIST List-MoreUtils-0.418.tar.gz 55111 SHA256 365651edea4e0c806576e4dcfc3dfb98bb4cbb343bc5c3e04cdc7b5b71ed4988 SHA512 7ba4395262c4406e822baf40e5a32aa6d93779a56d2567c4920f085ab2580c376db41e2141e4b9b43860d65122ebe73a03dfb0ed76a32f087b05ca7eb90f6d6e WHIRLPOOL ed63b850aebc353fda7ba9a8b24b1e50527d56b0c672c16cbc534cd90c9fe452a055b05f256d3e05c2d66be3752b1ab20580815d473c0231bfbea55d34c55c40
+DIST List-MoreUtils-0.419.tar.gz 55193 SHA256 5f8e65608f5dc583faa6a703d19d277ad46dfc1816e51f8ff34fb8322ed48615 SHA512 d13beb5031d1559c2ec4cb93826e86f0f314c4f10c4fdcac6910de0cb039199599911838eadd499e81cb41025aae2a52d69a259653a9637679a1705c7adcd37a WHIRLPOOL 15c8d91b80aba279d458288edb7bc4c5557f2a84560ff284e0918dee09cf69cd2e320b958b201522e536493d49154d2af3654a0a43e74ad8cc353a71ac03a0ce
--- a/dev-perl/Math-FFT/Manifest
+++ b/dev-perl/Math-FFT/Manifest
@ -1 +1,2 @@
 DIST Math-FFT-1.28.tar.gz 29345 SHA256 63aca20ff0043544e8c1cb3fdcc9cc77d12241309bffaa45ad08f515085c3853 SHA512 d5d2dda22d3752f365a45b2dee7c1a71867fbe42aa9509196afd2c2eb950875bc599aa81ec06878c41d0dca4fa247add7503bda70bf688dbe64123d6b26f9927 WHIRLPOOL 50f6a471571f90f7b344b4065b826e6e238434858d6c5bc74d577b22cefe00fa96dee4168cf9633913ac65250d56c38145872ee21c6f40f8b1b55a0c18aa8118
+DIST Math-FFT-1.34.tar.gz 41732 SHA256 df7badbb4c1d21189ab7a3face3ecf817ee19d2df6f226451d3bc8fa2b7a7348 SHA512 605ce6805c106d00e851604115581d2e035843982e01b848d730e74890041c66e57139dcc037c36eeb3de80a45436e0a36f7482eac080e92638ac44be8af428d WHIRLPOOL ef00620a48da6129c2cafa0fa055448e7c7a3cbe574c69a0b63378d157b276b044478a370467bc76d732ec7fa9297fa7f3a57848a9ff83bebf895cd778c0960d
--- a/dev-perl/Math-FFT/Math-FFT-1.340.0.ebuild
+++ b/dev-perl/Math-FFT/Math-FFT-1.340.0.ebuild
@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=SHLOMIF
+DIST_VERSION=1.34
+inherit perl-module
+
+DESCRIPTION="Perl module to calculate Fast Fourier Transforms"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	virtual/perl-XSLoader
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		virtual/perl-Exporter
+		virtual/perl-File-Spec
+		virtual/perl-File-Temp
+		virtual/perl-IO
+		virtual/perl-Test-Simple
+		virtual/perl-parent
+	)
+"
--- a/dev-perl/Mock-Config/Manifest
+++ b/dev-perl/Mock-Config/Manifest
@ -0,0 +1 @@
+DIST Mock-Config-0.03.tar.gz 6139 SHA256 a5b8345757ca4f2b9335f5be14e93ebbb502865233a755bf53bc7156deec001b SHA512 6e61e8edc3226b133eb4b49358cccb45a8eb7da5b56eed0d75ce1503b5ef91c7ea84606ef3bd482e3ac8dc3d66226aa3065d835547b4e807729d909eae88c8c0 WHIRLPOOL 2ce32d433be777b39d0ff7207febdd257aa88e689cceb8bfc6ad2d54f5c1d6a4fde9acf65cc9ab19af2d252fca42e7b8eb5f693cc9bdbe09d142e6a144974400
--- a/dev-perl/Mock-Config/Mock-Config-0.30.0.ebuild
+++ b/dev-perl/Mock-Config/Mock-Config-0.30.0.ebuild
@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=RURBAN
+DIST_VERSION=0.03
+inherit perl-module
+
+DESCRIPTION="Temporarily set Config or XSConfig values"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+LICENSE="Artistic-2"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		virtual/perl-Test-Simple
+	)
+"
+src_test() {
+	perl_rm_files t/pod-coverage.t t/pod.t t/manifest.t
+	perl-module_src_test
+}
--- a/dev-perl/Mock-Config/metadata.xml
+++ b/dev-perl/Mock-Config/metadata.xml
@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="cpan">Mock-Config</remote-id>
+    <remote-id type="cpan-module">Mock::Config</remote-id>
+  </upstream>
+</pkgmetadata>
--- a/dev-perl/Mojolicious/Manifest
+++ b/dev-perl/Mojolicious/Manifest
@ -6,3 +6,4 @@ DIST Mojolicious-7.19.tar.gz 665594 SHA256 997305a328feed8cff5d10ec1d1029c55c4d8
 DIST Mojolicious-7.20.tar.gz 665674 SHA256 ddd034bdd2b99f64498f30b9859c2f2607318f43983dfe36e14bfdf1526fd693 SHA512 d51a2aa9e4f757e7cad50ec374ce054cf9bd03fa795fcd6755f6bbf22e81ed611c796cb7f42c5a6a992dc93206d449cd7604662c8eff7da91e5cf6d7b4b3ba02 WHIRLPOOL af718c32efbb910d1e4f35c6a35ed6da1b32ddb3ab689d5e8a118fdf7cd005055035c750a8948c40a6d9cc9864086031ac3e54054310da52076cd82f48704e76
 DIST Mojolicious-7.21.tar.gz 666264 SHA256 34e28d4716675cbfdaa193794affe7286015068eb313011bf3bd37f615690f86 SHA512 05f2688b7377b47c262e3a3f43610673e72ead7bf486da83066b581ececc94f57495efbcc3536a11ab3a401f098052d26962aca7df0f1b7de90fd6e7efbfcd36 WHIRLPOOL a6cf08ba98fa586d977a462718e3dc09bde979219f72e1eded84bd2a403112244731ceab9b490339266cd859c2cf46708cee8bb807ecaf07579901e423659eec
 DIST Mojolicious-7.29.tar.gz 673278 SHA256 106bc462b8744ef6f4fc571efb61d22765b06cafa6113af2f6742edc555abece SHA512 f3cdf282f37d2ff670fe8f9d6a8a9e5f18e74527ab42c51e8c5333555376bf177fbad052ad843ce7c849b1c2ddec2c42c2db4cfeac1fc0c33d571bec43aa32a3 WHIRLPOOL 4ce9a9c5cb071bce4a95e020f96c6f2d8befbddd8def3cc76d6275dda060a84494d9b8cbcfca1d3e3f1d5444b3437a922e8f19da19207541a77f54d1a143727e
+DIST Mojolicious-7.30.tar.gz 674616 SHA256 e10ccdad610d36c265c03a993138bc66d4508317dcdd082612eabf1ed7b47e2c SHA512 be1b6d3bae65c67f99bb75b2a8d8a15b8493560d4cece47adbf2660a3e1479803dbfdae7d5c226a37004db8c0aa1fed21202c192c4675c8a60dc2f4368a35016 WHIRLPOOL 7ed8f72c40970a3b6e70b5cc689134cebca62b455a5d0f9295eb899757652a0d6af840113e0ce03fa497c573dcf41f277687849a84001bd0325c02fce32d1ed4
--- a/dev-perl/Mojolicious/Mojolicious-7.300.0.ebuild
+++ b/dev-perl/Mojolicious/Mojolicious-7.300.0.ebuild
@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=SRI
+DIST_VERSION=7.30
+DIST_EXAMPLES=("examples/*")
+inherit perl-module
+
+DESCRIPTION="Real-time web framework"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test minimal"
+
+RDEPEND="
+	!minimal? (
+		>=dev-perl/EV-4.0.0
+	)
+	>=virtual/perl-IO-Socket-IP-0.370.0
+	>=virtual/perl-JSON-PP-2.271.30
+	>=virtual/perl-Pod-Simple-3.90.0
+	>=virtual/perl-Time-Local-1.200.0
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		virtual/perl-Test-Simple
+	)
+"
+src_test() {
+	perl_rm_files t/pod{,_coverage}.t
+	perl-module_src_test
+}
--- a/dev-perl/PerlIO-utf8_strict/Manifest
+++ b/dev-perl/PerlIO-utf8_strict/Manifest
@ -1 +1,2 @@
 DIST PerlIO-utf8_strict-0.006.tar.gz 66240 SHA256 980010e624c43be0a2aac8e1fe5db3fe43035940def75ca70401bb1ca98bd562 SHA512 9c8423d5e60eba54d1c1ad77840d703577e3bb35333e08ef34ada64bebc8c50630e19c6d536243bfbae4197bf8143de82251122af8581813c61428c8a78111de WHIRLPOOL a91f41d0aacfb1d32746d08ae639994ada8f02f65c4adb29b7bb4ffdf2244d4ed81712812b7b7773b5fa87e9dd8f91fc5e680b5850c622310af9b7d00d015469
+DIST PerlIO-utf8_strict-0.007.tar.gz 67922 SHA256 83a33f2fe046cb3ad6afc80790635a423e2c7c6854afacc6998cd46951cc81cb SHA512 0d39be9bcbab4cea087f59c67dc1af6773b6258c5e836590ff58cc18bf3392ba6e95c55a0c7ce94236e0be7053802b4b1d6010130355e1a973a3698aaf49af0f WHIRLPOOL 5dde44f00af014fa9046164de250bb22d85e92dcaab7c3e7abdc897f4457bc77d2365a366af7c2c1775e4689b9df7c8e6cb1cf59623f7ef9f61df3c403324d7b
--- a/dev-perl/PerlIO-utf8_strict/PerlIO-utf8_strict-0.6.0.ebuild
+++ b/dev-perl/PerlIO-utf8_strict/PerlIO-utf8_strict-0.6.0.ebuild
@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI=6
 DIST_AUTHOR=LEONT
 DIST_VERSION=0.006
--- a/dev-perl/PerlIO-utf8_strict/PerlIO-utf8_strict-0.7.0.ebuild
+++ b/dev-perl/PerlIO-utf8_strict/PerlIO-utf8_strict-0.7.0.ebuild
@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+DIST_AUTHOR=LEONT
+DIST_VERSION=0.007
+inherit perl-module
+
+DESCRIPTION="Fast and correct UTF-8 IO"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+# r: strict, warnings -> perl
+RDEPEND="
+	virtual/perl-XSLoader
+"
+# t: File::Spec::Functions -> File-Spec
+# t: IO::File -> IO
+# t: utf8 -> perl
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		virtual/perl-Carp
+		virtual/perl-Exporter
+		virtual/perl-File-Spec
+		virtual/perl-IO
+		dev-perl/Test-Exception
+		>=virtual/perl-Test-Simple-0.880.0
+	)
+"
+src_compile() {
+	emake OPTIMIZE="${CFLAGS}"
+}
--- a/dev-perl/SQL-Statement/Manifest
+++ b/dev-perl/SQL-Statement/Manifest
@ -1,3 +1,4 @@
 DIST SQL-Statement-1.405.tar.gz 138703 SHA256 239094b6f18c36d174a7a9aa73c13cbaf9fec83d68dce5a2226a6120bb673026 SHA512 e7aa4cd9c300d3638e07e078c09d0e551fe799311b871f1a669efd4bf3f4675068895f86d15b852aa0230decacc3f019ad55a2972d0d298813ca189e9b57281b WHIRLPOOL 65602df50ef0f81a79a76bad4ea2cb37fb45d9235740e0c46a2f7ce2c044f23217d21fd6d59cd50a6422e9eda1b3ca5779823d3d76997957a658b44d566bec46
 DIST SQL-Statement-1.409.tar.gz 148582 SHA256 76550db181cec75dfac55942c85be89b55be69568b9e9535ad6a9ffb603e5fb4 SHA512 f986eef8f911b3d903582a1d48d4d9446ebb63c45e6daee85fdcf144bef874125c7ff92fa1b4eeca680fb39aaff27541da3538ef04a7ea0d79f3297feeb2c8e0 WHIRLPOOL d106213a1f061eb8fe28c44525e01ef8bf781cbd3e91301b5f5fd7a2ad9c663deaf4b7e9407741fca1d3e3141f5fa11796b085cc2f54c58c4e1f5ae97425ed53
 DIST SQL-Statement-1.410.tar.gz 153271 SHA256 7367fcda896367c96d98416cad423c9f98adb7e04b793c5c7deb3052a1213182 SHA512 1e97a3abf97de5064fd136e42b05c9dbf934affdfca93753fde82d04ddb2ee667bbcdf68cf7a69c069eb9b07c2e49df66abe71d62e51d9e485558611565d0772 WHIRLPOOL 950d558c882a3e04ce1138eb9fb68ff78d64bbc906f37c13002c598d53a4483c9898b735aa688fba18f8a2689ba2265fca7dbff17bc8fa937e8422d2825da197
+DIST SQL-Statement-1.412.tar.gz 154608 SHA256 65c870883379c11b53f19ead10aaac241ccc86a90bbab77f6376fe750720e5c8 SHA512 73b65cd3d1b1be2ba1e80e2cbdd2aae0aa79a23252f28caf3c3a91c78f31c2f2d698e91ae474d44efc02f608a0ca042bf47cc4e76832864b49c590f54687e3fa WHIRLPOOL 4bab7ab4a52f3e1f37a47fea387b90b9555135be4a3c8ab257cd21e6d444df756f91d9192caf276f800e57c7edfb5f9b654bae7cc88f975d84718de56017cfa2
--- a/dev-perl/SQL-Statement/SQL-Statement-1.412.0.ebuild
+++ b/dev-perl/SQL-Statement/SQL-Statement-1.412.0.ebuild
@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=REHSACK
+DIST_VERSION=1.412
+inherit perl-module
+
+DESCRIPTION="Small SQL parser and engine"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="test minimal"
+
+RDEPEND="
+	!minimal? (
+		dev-perl/Math-Base-Convert
+		>=virtual/perl-Math-Complex-1.560.0
+		>=dev-perl/Text-Soundex-3.40.0
+	)
+	virtual/perl-Carp
+	>=dev-perl/Clone-0.300.0
+	virtual/perl-Data-Dumper
+	dev-perl/Module-Runtime
+	>=dev-perl/Params-Util-1.0.0
+	>=virtual/perl-Scalar-List-Utils-1.0.0
+	virtual/perl-Text-Balanced
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		dev-perl/Math-Base-Convert
+		>=virtual/perl-Math-Complex-1.560.0
+		dev-perl/Test-Deep
+		>=virtual/perl-Test-Simple-0.900.0
+		>=dev-perl/Text-Soundex-3.40.0
+	)
+"
--- a/dev-perl/YAML-LibYAML/Manifest
+++ b/dev-perl/YAML-LibYAML/Manifest
@ -1,2 +1,3 @@
 DIST YAML-LibYAML-0.62.tar.gz 142911 SHA256 1a334a7ea9fe444ddb384a378b9f6eb2b77f4564fe481a778b48fb48b82d31db SHA512 05d2fa1e656034da0c903a267037a08855040843dc6ec68d91e99df5c64f6896d29be0d170b5c08c0d601a1c87b595c90786a7ff1a12a33fa2bfff21f86aec81 WHIRLPOOL 899f316f1319f081512e7086a230e1a61d948cafa98517db7a6c6e6bbcbd56c5679450cc0c1e3703d6f5105dcf9c395267b3eab662aecd7864e0007ef83936fe
 DIST YAML-LibYAML-0.63.tar.gz 143075 SHA256 3cf0044a8838966f63c850a442e36039b8aec2db291089fffa11b786d1d164c8 SHA512 c1161ac72f678e4531f8fe5daf09553ba946513c3d1efa1d354ea17ef4dfefd4281a2d77e2fe49960388d338681a24d7547b36dc08ad8993651e807a303df954 WHIRLPOOL 1772e3416c045d7fd13fede6488ab4c6cb6f7ec7742e80f4fad6a062fed9f95d0008e59731316443010652216e8dd98754f7d51f2aa38ad7cb09626e2f24ac2e
+DIST YAML-LibYAML-0.64.tar.gz 143095 SHA256 c79c18550c44230a2fdeaea55a86be60fd65d927ab9dac02945e056cf637aefd SHA512 c8d996a9bc86e644c85fa8662b91afb75e0e9bcfeaba88b0a661ef83c9d1dfbcd4464fdba8fcc16269dc3c561c3c5257818f7f15df78bf4331ec2f91a6245faf WHIRLPOOL d39003a19fef1e588a6775f61031b36ab268a1289b2fb95a378becba08cf6ca876c2d586de0c72f563ae1cf2537be8f580d8821c455e2aef5d03f9b61efd3581
--- a/dev-perl/YAML-LibYAML/YAML-LibYAML-0.640.0.ebuild
+++ b/dev-perl/YAML-LibYAML/YAML-LibYAML-0.640.0.ebuild
@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=TINITA
+DIST_VERSION=0.64
+inherit perl-module
+
+DESCRIPTION="Perl YAML Serialization using XS and libyaml"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~sparc ~x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker"
+export OPTIMIZE="$CFLAGS"
+
+src_test() {
+	perl_rm_files t/author-pod-syntax.t
+	perl-module_src_test
+}
--- a/dev-perl/bareword-filehandles/Manifest
+++ b/dev-perl/bareword-filehandles/Manifest
@ -1 +1,2 @@
 DIST bareword-filehandles-0.003.tar.gz 54286 SHA256 be4334b476d6eead4d05b2e3587157c592470ef6dbff9298683ad7fee7a825fa SHA512 184c37f737a638a3cfad7657b39918a2aff862faa7c84ef965cc9f2a7c157b05eac732807a0ebb1de44a0ce76b72a96016a126cbba658cddd8230f3de6ab5d8b WHIRLPOOL 1b729ab4adffccb12618f4e2a27aa81f84103b2ce14087f2cde553dc8e6c8050bcb8b3aa1517863c99606eecbe8f4eda80503016cfcab7161f82e52a8baa0516
+DIST bareword-filehandles-0.004.tar.gz 54723 SHA256 e3a11671739a1b2ce35631e1ef2c5bd44f8026d18c4decfe920e511ca2f0a5e9 SHA512 3c9256e9822b6bacb8b4f0ee801f91dad8b946f9f3b7dd165c154c33c2780f7135b3bb70f806421dc9f62c2b0b7e51fdb04acab876fa27c960cf930a0e4ee6cd WHIRLPOOL 6b4ade0fe724288312482451e7ad62fffacc5f9b78df6a36861ab29075854293baf2b0261d20e95db9b56dae689cc929ad0bec7bdff3551f4742d6fab1e0619f
--- a/dev-perl/bareword-filehandles/bareword-filehandles-0.4.0.ebuild
+++ b/dev-perl/bareword-filehandles/bareword-filehandles-0.4.0.ebuild
@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=ILMARI
+DIST_VERSION=0.004
+inherit perl-module
+
+DESCRIPTION="Disables bareword filehandles"
+
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~x86"
+IUSE="test"
+
+RDEPEND="
+	dev-perl/B-Hooks-OP-Check
+	dev-perl/Lexical-SealRequireHints
+	virtual/perl-XSLoader
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	dev-perl/ExtUtils-Depends
+	test? ( >=virtual/perl-Test-Simple-0.880.0 )
+"
+
+src_test() {
+	perl_rm_files t/author-*.t t/release-*.t
+	perl-module_src_test
+}
--- a/dev-perl/bareword-filehandles/metadata.xml
+++ b/dev-perl/bareword-filehandles/metadata.xml
@ -5,4 +5,8 @@
    <email>perl@gentoo.org</email>
    <name>Gentoo Perl Project</name>
  </maintainer>
+  <upstream>
+    <remote-id type="cpan">bareword-filehandles</remote-id>
+    <remote-id type="cpan-module">bareword::filehandles</remote-id>
+  </upstream>
 </pkgmetadata>
--- a/dev-perl/glib-perl/glib-perl-1.324.0.ebuild
+++ b/dev-perl/glib-perl/glib-perl-1.324.0.ebuild
@ -13,7 +13,7 @@ HOMEPAGE="http://gtk2-perl.sf.net/ ${HOMEPAGE}"

 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE=""

 RDEPEND="
--- a/dev-python/backports-unittest-mock/backports-unittest-mock-1.2.1.ebuild
+++ b/dev-python/backports-unittest-mock/backports-unittest-mock-1.2.1.ebuild
@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"

 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ppc ppc64 ~x86"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ppc ppc64 x86"
 IUSE="doc test"

 RDEPEND="dev-python/mock[${PYTHON_USEDEP}]"
--- a/dev-python/pypy/pypy-5.6.0.ebuild
+++ b/dev-python/pypy/pypy-5.6.0.ebuild
@ -171,10 +171,10 @@ src_configure() {
 }

 src_compile() {
-	emake -C "${T}"/usession*-current/testing_1
+	emake -C "${T}"/usession*-0/testing_1

 	# copy back to make sys.prefix happy
-	cp -p "${T}"/usession*-current/testing_1/{pypy-c,libpypy-c.so} . || die
+	cp -p "${T}"/usession*-0/testing_1/{pypy-c,libpypy-c.so} . || die
 	pax-mark m pypy-c libpypy-c.so

 	use doc && emake -C pypy/doc html
--- a/dev-python/pypy/pypy-9999.ebuild
+++ b/dev-python/pypy/pypy-9999.ebuild
@ -177,10 +177,10 @@ src_configure() {
 }

 src_compile() {
-	emake -C "${T}"/usession*-current/testing_1
+	emake -C "${T}"/usession*-0/testing_1

 	# copy back to make sys.prefix happy
-	cp -p "${T}"/usession*-current/testing_1/{pypy-c,libpypy-c.so} . || die
+	cp -p "${T}"/usession*-0/testing_1/{pypy-c,libpypy-c.so} . || die
 	pax-mark m pypy-c libpypy-c.so

 	use doc && emake -C pypy/doc html
--- a/dev-python/pypy3/pypy3-5.5.0_alpha.ebuild
+++ b/dev-python/pypy3/pypy3-5.5.0_alpha.ebuild
@ -160,10 +160,10 @@ src_configure() {
 }

 src_compile() {
-	emake -C "${T}"/usession*-current/testing_1
+	emake -C "${T}"/usession*-0/testing_1

 	# copy back to make sys.prefix happy
-	cp -p "${T}"/usession*-current/testing_1/{pypy-c,libpypy-c.so} . || die
+	cp -p "${T}"/usession*-0/testing_1/{pypy-c,libpypy-c.so} . || die
 	pax-mark m pypy-c libpypy-c.so

 	#use doc && emake -C pypy/doc html
--- a/dev-python/pypy3/pypy3-9999.ebuild
+++ b/dev-python/pypy3/pypy3-9999.ebuild
@ -169,10 +169,10 @@ src_configure() {
 }

 src_compile() {
-	emake -C "${T}"/usession*-current/testing_1
+	emake -C "${T}"/usession*-0/testing_1

 	# copy back to make sys.prefix happy
-	cp -p "${T}"/usession*-current/testing_1/{pypy-c,libpypy-c.so} . || die
+	cp -p "${T}"/usession*-0/testing_1/{pypy-c,libpypy-c.so} . || die
 	pax-mark m pypy-c libpypy-c.so

 	#use doc && emake -C pypy/doc html
--- a/dev-python/rst-linker/rst-linker-1.7.ebuild
+++ b/dev-python/rst-linker/rst-linker-1.7.ebuild
@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"

 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ppc ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ppc ppc64 ~s390 ~sh ~sparc x86"
 IUSE="doc test"

 RDEPEND="
--- a/dev-python/ssl-fetch/ssl-fetch-0.4.ebuild
+++ b/dev-python/ssl-fetch/ssl-fetch-0.4.ebuild
@ -15,7 +15,7 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE=""

-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~x64-cygwin ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x64-cygwin ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"

 DEPEND=""

--- a/dev-ros/geodesy/Manifest
+++ b/dev-ros/geodesy/Manifest
@ -1 +1 @@
-DIST geographic_info-0.4.0.tar.gz 26981 SHA256 7e31afeeb319e67242304445b690f345d6b66993ab0be582e36a454f7ac8eca4 SHA512 1296ad824caacf0a1240468dbc979c647e8d412246ca8aae19f2091487ab2b9c9ec2c3fe3f3eb92f0b662f318b005a34072555bad6b3d979c1463464f303764d WHIRLPOOL d9865cea02597df7421739c56fc32fd3029c0ebf6a1558a4ee701cb0025269bdb6c735598c0aa411aa7736bfb10fdd554842b7c2e1c96e3b2ebb28a6686e50f6
+DIST geographic_info-0.5.0.tar.gz 27102 SHA256 83e046fe4fa92fc9a63727ab8699c0c833f8759ae09c4d07b2c1fd698c73eceb SHA512 c6c4937a7c9873c071be9e3fc4fcdb99f831028dce93793e537f8819e2fb8633b995e7d46d7192ddc3457a3b79d27c54c3e0b6656af30e2daabf1f0e7dff9f05 WHIRLPOOL a6c9f2e6341d1e1e313230bc3f45b8e3d4c0821d1c29ca38e47f8a276d1154d05b3731935efd44722d9f67fa2665ed2db822edc08a3a13a0801a4794443a1ae0
--- a/dev-ros/geodesy/geodesy-0.5.0.ebuild
+++ b/dev-ros/geodesy/geodesy-0.5.0.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=5
--- a/Show More
+++ b/Show More
				`@ -0,0 +1 @@`
				`DIST Mock-Config-0.03.tar.gz 6139 SHA256 a5b8345757ca4f2b9335f5be14e93ebbb502865233a755bf53bc7156deec001b SHA512 6e61e8edc3226b133eb4b49358cccb45a8eb7da5b56eed0d75ce1503b5ef91c7ea84606ef3bd482e3ac8dc3d66226aa3065d835547b4e807729d909eae88c8c0 WHIRLPOOL 2ce32d433be777b39d0ff7207febdd257aa88e689cceb8bfc6ad2d54f5c1d6a4fde9acf65cc9ab19af2d252fca42e7b8eb5f693cc9bdbe09d142e6a144974400`