Sync with portage [Fri Mar 17 09:51:00 MSK 2017].

7 years ago · 5cf7fc627a
parent 48c770a8fc
commit 5cf7fc627a
1134 changed files with 9604 additions and 13408 deletions
--- a/app-admin/filebeat/Manifest
+++ b/app-admin/filebeat/Manifest
@ -1 +1,2 @@
 DIST filebeat-5.1.2.tar.gz 16512836 SHA256 7cd554f8be6b02290ebbc17c9820acde3dc59108672ced7a0cf5486faa3e23ce SHA512 f5ade54c3a2471680067fc5f6861ddcc052177c473f40d2135ba281e63172a4ba386368f77e5e4ba77b60c88ee20e5cd0095705aa3ed6e2588fda034de6b116f WHIRLPOOL 438119b4e5664ee0cff2a70b811ea4c247def4b15efdc1bcc243f157fe88669636c6465b93316adc2d774e5b4109856c54cc658bde2636393431b0f30a712f80
+DIST filebeat-5.2.2.tar.gz 16489808 SHA256 45c89fab339de3d3e7f9a83c7a48312ede147d5989b67b8619d9128353c891c3 SHA512 7cf54eb0b27d830e51bf97964f078874eae62e1d9642fb598cdd2f0a405db4a74e1f299c5e57e29a67cfea209b9b3c7f38bdcbe6b2e2885285b77615236971c1 WHIRLPOOL 3a708a799b3360cee12a58d858bd51f474fb86c143c6648edd451d2862ce05ae0bc9544ceef62ddbf05bc50c439a7ee041faef70214ced3e53e16e8452a9f486
--- a/app-admin/filebeat/filebeat-5.2.2.ebuild
+++ b/app-admin/filebeat/filebeat-5.2.2.ebuild
@ -0,0 +1,69 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Lightweight log shipper for Logstash and Elasticsearch"
+HOMEPAGE="https://www.elastic.co/products/beats"
+SRC_URI="https://github.com/elastic/beats/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND=">=dev-lang/go-1.7.1"
+RDEPEND="!app-admin/filebeat-bin"
+
+ELASTIC="${WORKDIR}/src/github.com/elastic"
+BEATS="${ELASTIC}/beats"
+S="${BEATS}"
+
+src_unpack() {
+	mkdir -p "${ELASTIC}" || die
+	unpack ${P}.tar.gz
+	mv beats-${PV} "${BEATS}" || die
+}
+
+src_compile() {
+	cd ${BEATS}/filebeat || die
+	GOPATH="${WORKDIR}" emake
+}
+
+src_test() {
+	cd ${BEATS}/filebeat || die
+	GOPATH="${WORKDIR}" emake check
+}
+
+src_install() {
+	keepdir /var/{lib,log}/${PN}
+
+	fperms 0750 /var/{lib,log}/${PN}
+
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
+	newinitd "${FILESDIR}/${PN}.initd" ${PN}
+
+	insinto "/usr/share/doc/${PF}/examples"
+	doins ${PN}/{filebeat.yml,filebeat.full.yml}
+
+	insinto "/etc/${PN}"
+	doins ${PN}/{filebeat.template.json,filebeat.template-es2x.json}
+
+	exeinto "/usr/share/${PN}"
+	doexe libbeat/scripts/migrate_beat_config_1_x_to_5_0.py
+
+	dobin filebeat/filebeat
+}
+
+pkg_postinst() {
+	if [[ -n "${REPLACING_VERSIONS}" ]]; then
+		elog "Please read the migration guide at:"
+		elog "https://www.elastic.co/guide/en/beats/libbeat/5.0/upgrading.html"
+		elog ""
+		elog "The migration script:"
+		elog "${EROOT%/}/usr/share/filebeat/migrate_beat_config_1_x_to_5_0.py"
+		elog ""
+	fi
+
+	elog "Example configurations:"
+	elog "${EROOT%/}/usr/share/doc/${PF}/examples"
+}
--- a/app-admin/logstash-bin/Manifest
+++ b/app-admin/logstash-bin/Manifest
@ -1,2 +1,2 @@
 DIST logstash-5.1.2.zip 100044055 SHA256 99fd514b6241310c78aefca2cd895c1cec4cd426aa08fccf7e8bba26567573c3 SHA512 4186f942dd555dc1284bc657cbd3a61de8aa67a50bd2f7b725d3364e5fca61029cadb0ca4f9e1c4a36078805fd015128ddcd7773e19e643eaddd5ae2fa9c6673 WHIRLPOOL 1127a419a35e42de59a4bd61fe5b75e39daad69d0646019417abf83f44639a86fd2b1ffc687b6cc551562045ef3d2d901d7985437d158094d4d054e4a93bfd5d
-DIST logstash-5.2.0.zip 100036780 SHA256 875b5dab32a801ad489088fd4da5c2c18bf6292f58e7d17499b83fb9041a6d57 SHA512 30094d4f3f33394b4b6c1083058ab7fe2c33a4fb399f5866d01a472aa851984ec338eca67fbaf004abbd627a9286d8e4d129cdc1dcab627111b0a4d0a78295a7 WHIRLPOOL cee54f5b9c76209be142931755be69f620043beef75d8f6d8a289e2ae5d9c6b7fd5578967eade987fc43f7a219464551f556ca077e2f9d03b9e2960a4ec3d7fe
+DIST logstash-5.2.1.zip 100059438 SHA256 14093855a8a3a4f27a2b4e461ee70697fff527eece70d5d58f1015cf5103f77e SHA512 82b1a39edc5a2303692828cdf17e00b6909de5e2579850a2ebcc49bd64f16c833f7bdaa083ff266cc0f09f9fa0cf645cd7a32a7c0183aa2b095ecfbeaf9873ec WHIRLPOOL 418ffbc4244385ec52d1f9104e68a91a7f539f7ea3829bd683562b7ccdb275e1580da24945444f382038c61aadc616458c5c8caa3d18fef9b1ae6c155ae2d3e3
--- a/app-admin/logstash-bin/logstash-bin-5.2.1.ebuild
+++ b/app-admin/logstash-bin/logstash-bin-5.2.1.ebuild
--- a/app-backup/restic/Manifest
+++ b/app-backup/restic/Manifest
@ -1 +1,2 @@
 DIST restic-0.4.0.tar.gz 22926188 SHA256 746dbc7b73f5a542be57b71714b243266a011f1d750f56f5100c08a59df1aeac SHA512 ccd15f010f8da3bae3d33698e70ff1d9565f52fb56991b78d35f95493417a4ab050021153d81c424947233255d9553d050f7a66e1c709843fe3b2d323a81f85b WHIRLPOOL 94e6b9ed777a86cb6e46cf734b9280e68cc2ce1ea061c8a94409dca594add1ec24fb736a56e35571302ff5043a60bef7f60ff3b39b038ee128bc815f7d3d48cd
+DIST restic-0.5.0.tar.gz 22937327 SHA256 a8e99087478a076b8a9c7c74d37cd23a56224d8c9b242c171756784ade024fda SHA512 571e4b0aa92a6cd9320f48c46a4b2190576d9328169d54762747dfa024ab280fb41ee377b59f0114d89ebd50bc54488a8cb5e2b36c57959202e848394107bb3c WHIRLPOOL 19fef25a6e2dff3145a6700abb581e7cae3abe5522ee0197f56a572d499824e84ba25a3111c5e71856ffac18d75622766c74c585a44b6db489468050e1c8d59a
--- a/app-backup/restic/restic-0.5.0.ebuild
+++ b/app-backup/restic/restic-0.5.0.ebuild
@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="restic is a backup program that is fast, efficient and secure"
+HOMEPAGE="https://restic.github.io/"
+SRC_URI="https://github.com/restic/restic/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DOCS=( README.md CONTRIBUTING.md doc/Design.md doc/FAQ.md doc/index.md doc/Manual.md doc/REST_backend.md )
+
+DEPEND="dev-lang/go
+	test? ( sys-fs/fuse )"
+
+RDEPEND="sys-fs/fuse"
+
+src_compile() {
+	local mygoargs=(
+		-v
+		-work
+		-x
+		-tags release
+		-ldflags "-w -X main.version=${PV}"
+		-o "${S}"/restic cmds/restic
+	)
+
+	GOPATH="${S}:${S}/vendor" go build "${mygoargs[@]}" || die
+}
+
+src_test() {
+	GOPATH="${S}:${S}/vendor" go test -v -work -x restic/... cmds/... || die
+}
+
+src_install() {
+	dobin restic
+	einstalldocs
+}
--- a/app-benchmarks/i7z/files/gcc5.patch
+++ b/app-benchmarks/i7z/files/gcc5.patch
@ -0,0 +1,40 @@
+diff -Nuar i7z-5023138d7c35c4667c938b853e5ea89737334e92/GUI/i7z_GUI.cpp 
+i7z-5023138d7c35c4667c938b853e5ea89737334e92-fixed/GUI/i7z_GUI.cpp
+--- i7z-5023138d7c35c4667c938b853e5ea89737334e92/GUI/i7z_GUI.cpp	2013-10-12 20:59:19.000000000 +0000
+++ i7z-5023138d7c35c4667c938b853e5ea89737334e92-fixed/GUI/i7z_GUI.cpp	2017-03-06 18:27:54.825756111 +0000
+@@ -16,7 +16,7 @@
+ #include <sys/types.h>
+ #include <sys/time.h>
+ #include <time.h>
+-#include <math.h>
+#include <cmath>
+ 
+ #include <QApplication>
+ #include <QPushButton>
+@@ -382,7 +382,7 @@
+ 
+             //C1_time[i] -= C3_time[i] + C6_time[i];
+ 			C1_time[i] = c1_time - (C3_time[i] + C6_time[i]) ;
+-            if (!isnan(c1_time) && !isinf(c1_time)) {
+            if (!std::isnan(c1_time) && !std::isinf(c1_time)) {
+                 if (C1_time[i] <= 0) {
+                     C1_time[i]=0;
+                 }
+@@ -642,13 +642,13 @@
+ 
+     for (i = 0; i < (int)numCPUs; i++)
+     {
+-        if ( (mythread->FREQ[i] > Max_Freq_socket0) && (!isnan(mythread->FREQ[i])) &&
+-                (!isinf(mythread->FREQ[i]))  && (socket_list[i] == socket_0.socket_num) ) {
+        if ( (mythread->FREQ[i] > Max_Freq_socket0) && (!std::isnan(mythread->FREQ[i])) &&
+                (!std::isinf(mythread->FREQ[i]))  && (socket_list[i] == socket_0.socket_num) ) {
+             Max_Freq_socket0 = mythread->FREQ[i];
+             num_socket0_cpus++;
+         }
+-        if ( (mythread->FREQ[i] > Max_Freq_socket1) && (!isnan(mythread->FREQ[i])) &&
+-                (!isinf(mythread->FREQ[i]))  && (socket_list[i] == socket_1.socket_num) ) {
+        if ( (mythread->FREQ[i] > Max_Freq_socket1) && (!std::isnan(mythread->FREQ[i])) &&
+                (!std::isinf(mythread->FREQ[i]))  && (socket_list[i] == socket_1.socket_num) ) {
+             Max_Freq_socket1 = mythread->FREQ[i];
+             num_socket1_cpus++;
+         }
--- a/app-benchmarks/i7z/i7z-93_p20131012.ebuild
+++ b/app-benchmarks/i7z/i7z-93_p20131012.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6
@ -30,6 +30,7 @@ DEPEND="${RDEPEND}"
 PATCHES=(
 	"${FILESDIR}"/i7z-0.27.2-ncurses.patch
 	"${FILESDIR}"/qt5.patch
+	"${FILESDIR}"/gcc5.patch
 )

 S="${WORKDIR}/${PN}-${COMMIT}"
--- a/app-benchmarks/stress/stress-1.0.4-r1.ebuild
+++ b/app-benchmarks/stress/stress-1.0.4-r1.ebuild
@ -12,7 +12,7 @@ SRC_URI="http://people.seas.harvard.edu/~apw/stress/${MY_P}.tar.gz -> ${MY_P}-r1

 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 arm ~mips ppc ppc64 ~sparc ~x86"
 IUSE="static"

 S=${WORKDIR}/${MY_P}
--- a/app-benchmarks/sysbench/Manifest
+++ b/app-benchmarks/sysbench/Manifest
@ -1,2 +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-48124f838b00ff83a044fbf046a9d8d0b1602d90.tar.gz 281484 SHA256 d3619b4399e6a77a679932571402cfae85c9fd17541050a77006184b3cad155a SHA512 2dd9bb78343df27894094829708dc133009d8ee65399beafbf38ea88d42be311180a18bf7b76cd41b22482606b7de13840cbdf5fc5841a0d2ed59dd65e34cebe WHIRLPOOL 67874d43c2a1d6cda45f64edfe0961018c9b8f5b13cc68b35dfbcebc1f5c75d2bc0ecfc1cffdcc62fc783fcc8a4cabd0e1bbccea5546bcd907d649b6f3b17c71
--- a/app-benchmarks/sysbench/sysbench-1.0.4.ebuild
+++ b/app-benchmarks/sysbench/sysbench-1.0.4.ebuild
@ -0,0 +1,55 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+DESCRIPTION="System performance benchmark"
+HOMEPAGE="https://github.com/akopytov/sysbench"
+SRC_URI="https://github.com/akopytov/sysbench/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="aio mysql postgres test"
+
+RDEPEND="aio? ( dev-libs/libaio )
+	mysql? ( virtual/libmysqlclient )
+	postgres? ( dev-db/postgresql:= )"
+DEPEND="${RDEPEND}
+	app-editors/vim-core
+	dev-lang/luajit:=
+	dev-libs/concurrencykit
+	dev-libs/libxslt
+	sys-devel/libtool:=
+	virtual/pkgconfig
+	test? ( dev-util/cram )"
+
+src_prepare() {
+	default
+
+	sed -i -e "/^htmldir =/s:=.*:=/usr/share/doc/${PF}/html:" doc/Makefile.am || die
+
+	# remove bundled libs
+	rm -r third_party/luajit/luajit third_party/concurrency_kit/ck third_party/cram || die
+
+	./autogen.sh || die
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable aio aio)
+		$(use_with mysql mysql)
+		$(use_with postgres pgsql)
+		--without-attachsql
+		--without-drizzle
+		--without-oracle
+		--with-system-luajit
+		--with-system-ck
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	emake check test
+}
--- a/app-benchmarks/sysbench/sysbench-9999.ebuild
+++ b/app-benchmarks/sysbench/sysbench-9999.ebuild
@ -31,7 +31,7 @@ src_prepare() {
 	default

 	# remove bundled libs
-	rm -r third_party/luajit/luajit third_party/concurrency_kit/ck third_party/cram|| die
+	rm -r third_party/luajit/luajit third_party/concurrency_kit/ck third_party/cram || die

 	./autogen.sh || die
 }
--- a/app-crypt/gpgme/Manifest
+++ b/app-crypt/gpgme/Manifest
@ -1,3 +1,2 @@
-DIST gpgme-1.5.5.tar.bz2 976383 SHA256 0b3d3d5107680c594777aae65882a1ff6dd1ba629a83432e719c8b82a743c207 SHA512 a01b84c1ae2a7c647b2de793fc05d39c4bf4a2d1b7378934e437857823f11ca9e9c1f3b32302d69a3a84d0be1fee1e1c86874355031b8fa6b40f4ad56ecc72ad WHIRLPOOL f3ad4282a254cf1ab8d01184df787a773fa7963a42157da93bee11430263fa86166f12f051e2b11d13be99ce1f0939d565cb02a8fba93ab6afed73ca7b2c0041
 DIST gpgme-1.6.0.tar.bz2 983573 SHA256 b09de4197ac280b102080e09eaec6211d081efff1963bf7821cf8f4f9916099d SHA512 b7ccccc2bac246b0759c8752cadd3e77f03da39711badfc66d0f21cefab3f3b07fe1038611ad9ca1c16a8a48d7e831dcca68d83d052456a4cf794a73e287d41b WHIRLPOOL 4e753156474097dba9db2905954d1754ca408066996a01cbc7266a24654eb7c2323043f40495cc3c227d8eef540eeca47de4c23bb329a2d34604d5a4d3828970
 DIST gpgme-1.8.0.tar.bz2 1298407 SHA256 596097257c2ce22e747741f8ff3d7e24f6e26231fa198a41b2a072e62d1e5d33 SHA512 9f214a44ddc4d602c2a0befc66aa6be9f2c90a24e153b873475867e30eec30e074826b98c11d20b0a2e4cd04e2625ce2545220481225fceb6ca9c51d3208e3de WHIRLPOOL 79ed725e24302d4d738e90739cf3c5e6e9fa89c3e4fef87a4fca569abb7f7b7f0140e62e76161f747b555f49166fd0ccda277dbd6cc46c00ce2797c32d442f7b
--- a/app-crypt/gpgme/gpgme-1.5.5.ebuild
+++ b/app-crypt/gpgme/gpgme-1.5.5.ebuild
@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils libtool
-
-DESCRIPTION="GnuPG Made Easy is a library for making GnuPG easier to use"
-HOMEPAGE="http://www.gnupg.org/related_software/gpgme"
-SRC_URI="mirror://gnupg/gpgme/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="1/11" # subslot = soname major version
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="common-lisp static-libs"
-
-DEPEND="app-crypt/gnupg
-	>=dev-libs/libassuan-2.0.2
-	>=dev-libs/libgpg-error-1.11"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.1.8-et_EE.patch
-	elibtoolize
-}
-
-src_configure() {
-	econf \
-		--includedir="${EPREFIX}/usr/include/gpgme" \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	prune_libtool_files
-
-	if ! use common-lisp; then
-		rm -fr "${ED}usr/share/common-lisp"
-	fi
-}
--- a/app-crypt/gpgme/gpgme-1.8.0-r2.ebuild
+++ b/app-crypt/gpgme/gpgme-1.8.0-r2.ebuild
@ -14,7 +14,7 @@ SRC_URI="mirror://gnupg/gpgme/${P}.tar.bz2"

 LICENSE="GPL-2 LGPL-2.1"
 SLOT="1/11" # subslot = soname major version
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="common-lisp static-libs cxx python qt5"

 COMMON_DEPEND="app-crypt/gnupg
@ -73,6 +73,9 @@ src_configure() {
 		# resulting in an implicit declaration of strdup error.  Since
 		# it is in POSIX raise the feature set to that.
 		append-cxxflags -D_POSIX_C_SOURCE=200112L
+
+		# Work around bug 601834
+		use python && append-cflags -D_DARWIN_C_SOURCE
 	fi

 	econf \
--- a/app-crypt/quickcrypt/quickcrypt-0.9.2b-r1.ebuild
+++ b/app-crypt/quickcrypt/quickcrypt-0.9.2b-r1.ebuild
@ -11,7 +11,7 @@ SRC_URI="http://linux.netpimpz.com/quickcrypt/download/${MY_P}.tar.gz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ~mips ~ppc sparc x86"
+KEYWORDS="alpha amd64 hppa ia64 ~mips ppc sparc x86"
 IUSE=""

 DEPEND=">=dev-lang/perl-5.6
--- a/app-crypt/quickcrypt/quickcrypt-0.9.2b.ebuild
+++ b/app-crypt/quickcrypt/quickcrypt-0.9.2b.ebuild
@ -1,22 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-MY_P=${P/-/_}
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="gives you a quick MD5 Password from any string"
-HOMEPAGE="http://linux.netpimpz.com/quickcrypt/"
-SRC_URI="http://linux.netpimpz.com/quickcrypt/download/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 sparc ppc alpha amd64 ia64 hppa ~mips"
-IUSE=""
-
-DEPEND=">=dev-lang/perl-5.6
-	virtual/perl-Digest-MD5"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	dobin quickcrypt || die
-	dodoc README BUGS
-}
--- a/app-doc/tldp-howto/Manifest
+++ b/app-doc/tldp-howto/Manifest
@ -1,8 +1,4 @@
-DIST Linux-HOWTOs-20100701.tar.bz2 7220430 SHA256 193e897be336edf28411dc23b26742707795d3e4bb511990bccbbfabf6e9173e SHA512 2041a3361b522eb8377c98589d9fdbfdb2c1f20e5ba5bc74a67ec550529cd2b9b378d9e741cfddcfff8325c359b078b4e4a83337d6da10927e06254271f85a5d WHIRLPOOL 713e1881af3bdd7325880aebaf9924f5897219db878b1979706db1db4f913d5f5897cf7f25683502306208ae81eec8f48f95750c682226dcd1a5cf4f99ca1cbb
 DIST Linux-HOWTOs-20120707.tar.bz2 7221427 SHA256 8f818c0ac3bdbe01307b83fe81e3cfdc92112dbf8b32f5df9d28b41decd3def0 SHA512 329a299e2e66f17139a4ce4f6bed0106bc0bd2147773c659e101468adbc12a71c88f952fe7e96b78a483d62a3eafd5306cd8961c100c0ec93d55586ff1bddd41 WHIRLPOOL a981d645969c72e874aa30dda956ba4e09cf65919ea4ffd2f8469b5124af77a4ff3e8196fa515122a7cc878e8d1b036f263bfa910338a1984250f04c80fb422d
-DIST Linux-html-HOWTOs-20100701.tar.bz2 74332215 SHA256 bf3eaae198f465a5ec53c6878fa0bbb05b8faf2243bd2bdb88f0a0d23ff62584 SHA512 e1d9d238b69a972fec737bdfea95c34ff013e9a8caa8635ee2eb2a2e63aece143b5f65a953e64a0add75fe46fa8c9015638a1d2750e3559249fd91801409e560 WHIRLPOOL 951edb9052f1250295c34f83bd6f64c9a0d599b566b2e6ac35f125c5a291fb309818d88770390db248920045b806b0b1da3d1eb8130cd4f09277e66da6a171c0
 DIST Linux-html-HOWTOs-20120707.tar.bz2 75088235 SHA256 619ae9428f3c47fb9163a6b548f70877f0732e5457e9cd149c0e4d478ccd47ec SHA512 291764f596021cc098f13fc2a589a2bceb3a5865c7194db42c2b1e37bd59bceee089d34c9f55487a049a20d5f5296b5d0e67cc3303ed2aac1d2288a41caa2218 WHIRLPOOL 43cf549462ff6b6b133403eee408ba9defea0920304a4a9c7e06093d269c375082859ff7e49b8c5eb61287402c3a72738d3bb6a08dfc569b45c973a2b4e997f4
-DIST Linux-html-single-HOWTOs-20100701.tar.bz2 7567484 SHA256 251b8ddf1cba4796a6a50cf5e2a14d9cc33a40ffd22b7a19d802cfe89b871ebf SHA512 cb6756485a9f02b3bfb3765fa092298d2bd5cb7bc03d86d95b40bc81171d9167ceb47681f1643151a525f0251054f566c1783358c06bd728ce28c65fad3d1a2b WHIRLPOOL fb72ea8109ddcc4fa58fd13acee85a088c882cc60933b11059f905da9621c0344b49d678101107a7f158daecd9edefcecb4228abc62507278863996c714a9514
 DIST Linux-html-single-HOWTOs-20120707.tar.bz2 7563325 SHA256 5f80a27099ec484e8c063afaa767aba3868ea4af942dfccbb024a57eda6ba1c9 SHA512 edfc2c267c8efc66c220a5458eb514864f8b371031bc10afbfaab668558eaa8c02afd7b58c4cb65d874c5fe9b3e22f6df376e4114d3e8635be525c5d14e8bd20 WHIRLPOOL cee63efc95886acfaa25be04c7b124872a0a527d45c359cddc7d5ace5321984d5c8a829e116779c4118ce0572bd77a719df56c355b43de671c84a6521d5d58fd
-DIST Linux-pdf-HOWTOs-20100701.tar.bz2 56839500 SHA256 b8d9a245f8da038af0294335d1a98f0391792c2958e69962958f55778d2b0215 SHA512 54d2a168a186a44fe0d6f3532474e34d9542dc95f8633ee46b864d45ef91576929dd97902922d114fc4fc68c0112b14bd95b758836d25fb5b646655261eb3b7d WHIRLPOOL a600ccb734302d26d5b79bcebac44fd3d7ce7b70a55cfa34fb36b30bc7faf3fb9f3a08b130b7c6cb9290bc481345b65f166e77d764bd0180c774dd95627d4cb9
 DIST Linux-pdf-HOWTOs-20120707.tar.bz2 57436243 SHA256 7ba25461d394993229245ddef17b6f184e6d480ffea6d0fecd98f2092eed4ab2 SHA512 665387a1e2f9703042f1544ed015e39ba222744795ea676fcefc83fda94b6f9222a98aa4ed37ea5bd9164327837e924613ac41ca78a78ae9a4a4097fb64cff3e WHIRLPOOL 168fe7410c5a03c04898455b6c79725851641b88c282641ccd0d30bc1f5c674bc998f7113c04ae49b7a1b86274d3ef185b1bcaf850d9a5aa082fe42191915068
--- a/app-doc/tldp-howto/tldp-howto-20100701.ebuild
+++ b/app-doc/tldp-howto/tldp-howto-20100701.ebuild
@ -1,73 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit confutils
-
-DESCRIPTION="The Linux Documentation Project HOWTOs"
-HOMEPAGE="http://www.tldp.org"
-
-# Yay, unversioned distfiles
-# http://www.ibiblio.org/pub/Linux/docs/HOWTO/Linux-HOWTOs.tar.bz2
-# http://www.ibiblio.org/pub/Linux/docs/HOWTO/other-formats/html/Linux-html-HOWTOs.tar.bz2
-#  ^^^ this also contains the pdfs, not sure if it's intentional as older versions don't
-# http://www.ibiblio.org/pub/Linux/docs/HOWTO/other-formats/html_single/Linux-html-single-HOWTOs.tar.bz2
-# http://www.ibiblio.org/pub/Linux/docs/HOWTO/other-formats/pdf/Linux-pdf-HOWTOs.tar.bz2
-
-SRC_URI="
-	html? ( mirror://gentoo/Linux-html-HOWTOs-${PV}.tar.bz2 )
-	htmlsingle? ( mirror://gentoo/Linux-html-single-HOWTOs-${PV}.tar.bz2 )
-	pdf? ( mirror://gentoo/Linux-pdf-HOWTOs-${PV}.tar.bz2 )
-	text? ( mirror://gentoo/Linux-HOWTOs-${PV}.tar.bz2 )"
-
-LICENSE="FDL-1.2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
-IUSE="+html htmlsingle pdf text"
-RESTRICT="binchecks strip"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	confutils_require_any html htmlsingle pdf text
-}
-
-src_unpack() {
-	mkdir -p "${S}"
-	cd "${S}"
-	if use text; then
-		mkdir "${S}"/text
-		pushd "${S}"/text > /dev/null
-		unpack Linux-HOWTOs-${PV}.tar.bz2
-		popd > /dev/null
-	fi
-	if use html; then
-		unpack Linux-html-HOWTOs-${PV}.tar.bz2
-		[[ -d ${S}/HOWTO/pdf ]] && rm -r "${S}"/HOWTO/pdf
-		mv "${S}"/HOWTO "${S}"/html
-	fi
-	if use htmlsingle; then
-		mkdir "${S}"/htmlsingle
-		pushd "${S}"/htmlsingle > /dev/null
-		unpack Linux-html-single-HOWTOs-${PV}.tar.bz2
-		popd > /dev/null
-	fi
-	if use pdf; then
-		mkdir "${S}"/pdf
-		pushd "${S}"/pdf > /dev/null
-		unpack Linux-pdf-HOWTOs-${PV}.tar.bz2
-		popd > /dev/null
-	fi
-}
-
-src_install() {
-	if use text; then
-		docinto text
-		dodoc "${S}"/text/*
-		rm -r "${S}"/text
-	fi
-	insinto /usr/share/doc/${PF}
-	doins -r "${S}"/*
-}
--- a/app-doc/tldp-howto/tldp-howto-20120707.ebuild
+++ b/app-doc/tldp-howto/tldp-howto-20120707.ebuild
@ -15,7 +15,7 @@ SRC_URI="

 LICENSE="FDL-1.2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 IUSE="+html htmlsingle pdf text"
 REQUIRED_USE="|| ( html htmlsingle pdf text )"

--- a/app-editors/gedit-plugins/gedit-plugins-3.20.0.ebuild
+++ b/app-editors/gedit-plugins/gedit-plugins-3.20.0.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI="6"
@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{4,5} )
 PYTHON_REQ_USE="xml"
 VALA_MIN_API_VERSION="0.28"

-inherit eutils gnome2 multilib python-r1 vala
+inherit eutils gnome2 multilib python-single-r1 vala

 DESCRIPTION="Official plugins for gedit"
 HOMEPAGE="https://wiki.gnome.org/Apps/Gedit/ShippedPlugins"
@ -22,7 +22,7 @@ IUSE="+python ${IUSE_plugins}"
 REQUIRED_USE="
 	charmap? ( python )
 	git? ( python )
-	python? ( ^^ ( $(python_gen_useflags '*') ) )
+	python? ( ${PYTHON_REQUIRED_USE} )
 	terminal? ( python )
 	zeitgeist? ( python )
 "
@ -59,7 +59,7 @@ DEPEND="${RDEPEND}
 "

 pkg_setup() {
-	use python && [[ ${MERGE_TYPE} != binary ]] && python_setup
+	use python && [[ ${MERGE_TYPE} != binary ]] && python-single-r1_pkg_setup
 }

 src_prepare() {
--- a/app-editors/gedit-plugins/gedit-plugins-3.22.0.ebuild
+++ b/app-editors/gedit-plugins/gedit-plugins-3.22.0.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI="6"
@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{4,5} )
 PYTHON_REQ_USE="xml"
 VALA_MIN_API_VERSION="0.28"

-inherit eutils gnome2 multilib python-r1 vala
+inherit eutils gnome2 multilib python-single-r1 vala

 DESCRIPTION="Official plugins for gedit"
 HOMEPAGE="https://wiki.gnome.org/Apps/Gedit/ShippedPlugins"
@ -22,7 +22,7 @@ IUSE="+python ${IUSE_plugins}"
 REQUIRED_USE="
 	charmap? ( python )
 	git? ( python )
-	python? ( ^^ ( $(python_gen_useflags '*') ) )
+	python? ( ${PYTHON_REQUIRED_USE} )
 	terminal? ( python )
 	zeitgeist? ( python )
 "
@ -59,7 +59,7 @@ DEPEND="${RDEPEND}
 "

 pkg_setup() {
-	use python && [[ ${MERGE_TYPE} != binary ]] && python_setup
+	use python && [[ ${MERGE_TYPE} != binary ]] && python-single-r1_pkg_setup
 }

 src_prepare() {
--- a/app-editors/gedit/gedit-3.20.2.ebuild
+++ b/app-editors/gedit/gedit-3.20.2.ebuild
@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{4,5} )
 VALA_MIN_API_VERSION="0.26"
 VALA_USE_DEPEND="vapigen"

-inherit eutils gnome2 multilib python-r1 vala virtualx
+inherit eutils gnome2 multilib python-single-r1 vala virtualx

 DESCRIPTION="A text editor for the GNOME desktop"
 HOMEPAGE="https://wiki.gnome.org/Apps/Gedit"
@ -16,12 +16,7 @@ LICENSE="GPL-2+ CC-BY-SA-3.0"
 SLOT="0"

 IUSE="+introspection +python spell vala"
-# python-single-r1 would request disabling PYTHON_TARGETS on libpeas
-# we need to fix that
-REQUIRED_USE="
-	python? ( introspection )
-	python? ( ^^ ( $(python_gen_useflags '*') ) )
-"
+REQUIRED_USE="python? ( introspection ${PYTHON_REQUIRED_USE} )"

 KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"

@ -65,7 +60,7 @@ DEPEND="${COMMON_DEPEND}
 # yelp-tools, gnome-common needed to eautoreconf

 pkg_setup() {
-	use python && [[ ${MERGE_TYPE} != binary ]] && python_setup
+	use python && [[ ${MERGE_TYPE} != binary ]] && python-single-r1_pkg_setup
 }

 src_prepare() {
--- a/app-editors/gedit/gedit-3.22.0.ebuild
+++ b/app-editors/gedit/gedit-3.22.0.ebuild
@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{4,5} )
 VALA_MIN_API_VERSION="0.26"
 VALA_USE_DEPEND="vapigen"

-inherit eutils gnome2 multilib python-r1 vala virtualx
+inherit eutils gnome2 multilib python-single-r1 vala virtualx

 DESCRIPTION="A text editor for the GNOME desktop"
 HOMEPAGE="https://wiki.gnome.org/Apps/Gedit"
@ -16,12 +16,7 @@ LICENSE="GPL-2+ CC-BY-SA-3.0"
 SLOT="0"

 IUSE="+introspection +python spell vala"
-# python-single-r1 would request disabling PYTHON_TARGETS on libpeas
-# we need to fix that
-REQUIRED_USE="
-	python? ( introspection )
-	python? ( ^^ ( $(python_gen_useflags '*') ) )
-"
+REQUIRED_USE="python? ( introspection ${PYTHON_REQUIRED_USE} )"

 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"

@ -61,7 +56,7 @@ DEPEND="${COMMON_DEPEND}
 # yelp-tools, gnome-common needed to eautoreconf

 pkg_setup() {
-	use python && [[ ${MERGE_TYPE} != binary ]] && python_setup
+	use python && [[ ${MERGE_TYPE} != binary ]] && python-single-r1_pkg_setup
 }

 src_prepare() {
--- a/app-editors/neovim/neovim-0.1.4.ebuild
+++ b/app-editors/neovim/neovim-0.1.4.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=5
@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="git://github.com/neovim/neovim.git"
 else
 	SRC_URI="https://github.com/neovim/neovim/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
+	KEYWORDS="~amd64 ~x86"
 fi

 LICENSE="Apache-2.0 vim"
--- a/app-editors/vile/vile-9.8r.ebuild
+++ b/app-editors/vile/vile-9.8r.ebuild
@ -9,7 +9,7 @@ SRC_URI="ftp://invisible-island.net/vile/current/${P}.tgz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ia64 ~ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 ia64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="perl"

 RDEPEND=">=sys-libs/ncurses-5.2:0=
--- a/app-emulation/vagrant/Manifest
+++ b/app-emulation/vagrant/Manifest
@ -1,3 +1,2 @@
-DIST vagrant-1.8.6.tar.gz 1749696 SHA256 de1204c56feeeb327f542e58d39c9dd55fef78a9b753594a3b30e330d72d23e4 SHA512 dba8226b4039a8fa3587254f5d57fb7c967dde993aa87cffd745d7e176d2f78b45830e04711d90e48bca47197b11d1a46e34bf29e5bc0e1d6d78eecb2e636e36 WHIRLPOOL 3c32f00a4b4d773d6f795ad8a088c4a4316d612a8d4504348f2d2790bfc38bf5299a9e730c28b721858a36cff4210b322e8f6225b144e37282689c3beee1971b
-DIST vagrant-1.8.7.tar.gz 1756302 SHA256 5371d39679d40d4f6913728dd3d93c103e74c76ecc813710191a2c378b83a1e2 SHA512 b9cffded481b03d676d5815b1d6ba55b56cd5ae8ac7ddbaca19f36880df8cd3fdc9efc240782001619bd3790518e192ba82e8bbde2e4eba12894e78603e6a3b7 WHIRLPOOL 37e4dfe3b4f4681c01887ce75ec035cc8efdf2950b2d04bac0793dd527d65d3f7c991880e7fb402831eb746bb3cb1f84cf7b4529316435b007d6a0cf682f3393
 DIST vagrant-1.9.1.tar.gz 1762644 SHA256 ed30e5a277b5614ee83d9417793ed2af870977368c2b0344855694040c4d6449 SHA512 07ea6e2d881806ce61395a30abdaa7b4f7c2c39bb909d6c6e0aa14101945a9a26078ed18ebb8e238d97f05ee060564fb290615ac4868b80ee29b64b88a666452 WHIRLPOOL 16ece1985a78942c75774181c803e42ffe81cd0580314372932af6a3c5084b43f8d3db0d6137eaa3186a9cdbf33e8e9d59f27f95be6ebe2ed5d93a90577e7fb9
+DIST vagrant-1.9.2.tar.gz 1813028 SHA256 53723eec1180ed0e89c1968e06626c6d45e42f6dc25ae9934ca8dfc240a82046 SHA512 26e2a933571b076fae27ea13e0f86529e39ebc3eb7580781d9cfa81bff2383f4dee72b947b3d2cb4f4bd231769f27da27b95e10f43b5207b824cd22b1e2403b6 WHIRLPOOL 9401ba1d21d20cf4a0f1c74775e077d9fad27edfbcb21f96579ff6cf6d7e8ab734cd0832f20ff568f7346633b80dee2fbc897ca34f08bc6868add7d274330d76
--- a/app-emulation/vagrant/files/vagrant-1.8.4-install-plugins-in-isolation.patch
+++ b/app-emulation/vagrant/files/vagrant-1.8.4-install-plugins-in-isolation.patch
@ -1,114 +0,0 @@
--- bin/vagrant
-+++ bin/vagrant
-@@ -69,6 +69,11 @@
- require "bundler"
- begin
-   $vagrant_bundler_runtime = Bundler.setup(:default, :plugins)
-+# Invalidate the cached Gemfile.lock if necessary and try again
-+rescue Bundler::GemNotFound
-+  FileUtils.rm File.expand_path("~/.vagrant.d/Gemfile") if File.exists? File.expand_path("~/.vagrant.d/Gemfile")
-+  FileUtils.rm File.expand_path("~/.vagrant.d/Gemfile.lock") if File.exists? File.expand_path("~/.vagrant.d/Gemfile.lock")
-+  $vagrant_bundler_runtime = Bundler.setup(:default, :plugins)  
- rescue Bundler::GemNotFound
-   $stderr.puts "Bundler, the underlying system used to manage Vagrant plugins,"
-   $stderr.puts "is reporting that a plugin or its dependency can't be found."
--- lib/vagrant/bundler.rb        2016-06-13 10:21:40.000000000 +0200
-+++ lib/vagrant/bundler.rb     2016-06-23 08:19:22.466039136 +0200
-@@ -65,6 +65,13 @@
-       @configfile = tempfile("vagrant-configfile")
-       @configfile.close
- 
-+      # Ensure the path to user's Gemfile exists
-+      gemfile = Vagrant.user_data_path.join("Gemfile")
-+      unless File.exists? gemfile
-+        FileUtils.mkdir_p(File.dirname(gemfile))
-+        File.open(gemfile, 'w') {}
-+      end
-+
-       # Build up the Gemfile for our Bundler context. We make sure to
-       # lock Vagrant to our current Vagrant version. In addition to that,
-       # we add all our plugin dependencies.
-@@ -151,7 +158,7 @@
- 
-     # Clean removes any unused gems.
-     def clean(plugins)
-      gemfile    = build_gemfile(plugins)
-+      gemfile    = build_gemfile(plugins, false, true)
-       lockfile   = "#{gemfile.path}.lock"
-       definition = ::Bundler::Definition.build(gemfile, lockfile, nil)
-       root       = File.dirname(gemfile.path)
-@@ -182,11 +189,23 @@
-     # Builds a valid Gemfile for use with Bundler given the list of
-     # plugins.
-     #
-+    # @param [Hash|Bool] update Hash of gems to update or true for all
-+    # @param [Bool] invalidate Invalidate Gemfile.lock
-     # @return [Tempfile]
-    def build_gemfile(plugins)
-+    def build_gemfile(plugins, update = false, invalidate = false)
-       sources = plugins.values.map { |p| p["sources"] }.flatten.compact.uniq
- 
-      f = tempfile("vagrant-gemfile")
-+      # Determine what gems to update
-+      if update.is_a? Hash
-+        update_gems = update[:gems]
-+      elsif update === true
-+        update_gems = plugins.map{ |p| p[0] }
-+      else
-+        update_gems = []
-+      end
-+
-+      gemfile = Vagrant.user_data_path.join("Gemfile")
-+      f = File.open(gemfile, "w+")
-       f.tap do |gemfile|
-         sources.each do |source|
-           next if source == ""
-@@ -195,6 +214,19 @@
- 
-         gemfile.puts(%Q[gem "vagrant", "= #{VERSION}"])
- 
-+        locked_gems = []
-+
-+        # Use Gemfile.lock to lock the gem versions
-+        if ENV["VAGRANT_INTERNAL_BUNDLERIZED"] && File.exist?("#{gemfile.path}.lock") && !invalidate
-+          lockfile = ::Bundler::LockfileParser.new(::Bundler.read_file("#{gemfile.path}.lock"))
-+          lockfile.specs.each do |s|
-+            if s.name != 'vagrant' && !(update_gems.include? s.name)
-+              gemfile.puts(%Q[gem "#{s.name}", "#{s.version.to_s}"])
-+            end
-+          end
-+          locked_gems = lockfile.specs.map(&:name) - update_gems
-+        end
-+
-         gemfile.puts("group :plugins do")
-         plugins.each do |name, plugin|
-           version = plugin["gem_version"]
-@@ -205,10 +237,18 @@
-             opts[:require] = plugin["require"]
-           end
- 
-          gemfile.puts(%Q[gem "#{name}", #{version.inspect}, #{opts.inspect}])
-+          gemfile.puts(%Q[gem "#{name}", #{version.inspect}, #{opts.inspect}]) unless locked_gems.include? name
-         end
-         gemfile.puts("end")
-         gemfile.close
-+
-+        # Create Gemfile.lock if missing and re-generate Gemfile
-+        if !File.exist?("#{f.path}.lock") && File.exist?(f.path)
-+          lockfile = "#{f.path}.lock"
-+          ENV['BUNDLE_GEMFILE'] = f.path
-+          definition = ::Bundler::Definition.build(f.path, lockfile, false)
-+        end
-+        f
-       end
-     end
- 
-@@ -219,7 +259,7 @@
-     #   can be a hash of options. See Bundler.definition.
-     # @return [Array<Gem::Specification>]
-     def internal_install(plugins, update, **extra)
-      gemfile    = build_gemfile(plugins)
-+      gemfile    = build_gemfile(plugins, update)
-       lockfile   = "#{gemfile.path}.lock"
-       definition = ::Bundler::Definition.build(gemfile, lockfile, update)
-       root       = File.dirname(gemfile.path)
--- a/app-emulation/vagrant/files/vagrant-1.8.7
+++ b/app-emulation/vagrant/files/vagrant-1.8.7
@ -1,46 +0,0 @@
-#!/usr/bin/env bash
-#
-# This is a wrapper to properly execute Vagrant within the embedded
-# Vagrant installation directory. This sets up proper environmental variables
-# so that everything loads and compiles to proper directories.
-
-VAGRANT_DIR="$( ruby -e 'print Gem::default_path[-1] + "/gems/vagrant-1.8.7"' )"
-
-# Export GEM_HOME based on VAGRANT_HOME
-#
-# This needs to be set because Bundler includes gem paths
-# from RubyGems' Gem.paths.
-if [ -z $VAGRANT_HOME ]; then
-  VAGRANT_HOME=$(eval echo "~/.vagrant.d")
-fi
-export GEM_HOME="$VAGRANT_HOME/gems"
-
-# SSL certs
-export SSL_CERT_FILE="/etc/ssl/certs/ca-certificates.crt"
-
-# Export an environmental variable to say we're in a Vagrant
-# installer created environment.
-export VAGRANT_INSTALLER_ENV=1
-
-# This is currently used only in Vagrant::Plugin::Manager.system_plugins_file
-# to locate plugins configuration file.
-export VAGRANT_INSTALLER_EMBEDDED_DIR="/var/lib/vagrant"
-export VAGRANT_INSTALLER_VERSION="2"
-
-# Determine the OS that we're on, which is used in some later checks.
-# It is very important we do this _before_ setting the PATH below
-# because uname dependencies can conflict on some platforms.
-OS=$(uname -s 2>/dev/null)
-
-# Export the OS as an environmental variable that Vagrant can access
-# so that it can behave better.
-export VAGRANT_DETECTED_OS="${OS}"
-
-VAGRANT_EXECUTABLE="${VAGRANT_DIR}/bin/vagrant"
-VAGRANT_LAUNCHER="${VAGRANT_DIR}/lib/vagrant/pre-rubygems.rb"
-
-# Export the VAGRANT_EXECUTABLE so that pre-rubygems can optimize a bit
-export VAGRANT_EXECUTABLE
-
-# Call the actual Vagrant bin with our arguments
-exec ruby "${VAGRANT_LAUNCHER}" "$@"
--- a/app-emulation/vagrant/files/vagrant-1.9.2
+++ b/app-emulation/vagrant/files/vagrant-1.9.2
@ -4,7 +4,7 @@
 # Vagrant installation directory. This sets up proper environmental variables
 # so that everything loads and compiles to proper directories.

-VAGRANT_DIR="$( ruby -e 'print Gem::default_path[-1] + "/gems/vagrant-1.8.6"' )"
+VAGRANT_DIR="$( ruby -e 'print Gem::default_path[-1] + "/gems/vagrant-1.9.2"' )"

 # Export GEM_HOME based on VAGRANT_HOME
 #
@ -37,10 +37,9 @@ OS=$(uname -s 2>/dev/null)
 export VAGRANT_DETECTED_OS="${OS}"

 VAGRANT_EXECUTABLE="${VAGRANT_DIR}/bin/vagrant"
-VAGRANT_LAUNCHER="${VAGRANT_DIR}/lib/vagrant/pre-rubygems.rb"

 # Export the VAGRANT_EXECUTABLE so that pre-rubygems can optimize a bit
 export VAGRANT_EXECUTABLE

 # Call the actual Vagrant bin with our arguments
-exec ruby "${VAGRANT_LAUNCHER}" "$@"
+exec ruby "${VAGRANT_EXECUTABLE}" "$@"
--- a/app-emulation/vagrant/vagrant-1.8.7.ebuild
+++ b/app-emulation/vagrant/vagrant-1.8.7.ebuild
@ -1,87 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-RUBY_FAKEGEM_GEMSPEC="vagrant.gemspec"
-RUBY_FAKEGEM_EXTRAINSTALL="keys plugins templates version.txt"
-RUBY_FAKEGEM_TASK_DOC=""
-
-inherit bash-completion-r1 ruby-fakegem eutils
-
-DESCRIPTION="A tool for building and distributing development environments"
-HOMEPAGE="http://vagrantup.com/"
-SRC_URI="https://github.com/mitchellh/vagrant/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+virtualbox"
-
-RDEPEND="${RDEPEND}
-	app-arch/libarchive
-	net-misc/curl
-	virtualbox? ( || ( app-emulation/virtualbox app-emulation/virtualbox-bin ) )"
-
-ruby_add_rdepend "
-	>=dev-ruby/bundler-1.12.5
-	>=dev-ruby/childprocess-0.5.0
-	>=dev-ruby/erubis-2.7.0
-	>=dev-ruby/i18n-0.6.0:* <dev-ruby/i18n-0.8.0:*
-	>=dev-ruby/listen-3.1.5
-	>=dev-ruby/hashicorp-checkpoint-0.1.1
-	>=dev-ruby/log4r-1.1.9 <dev-ruby/log4r-1.1.11
-	>=dev-ruby/net-ssh-3.0.1
-	>=dev-ruby/net-sftp-2.1
-	>=dev-ruby/net-scp-1.1.0
-	|| ( >=dev-ruby/rest-client-1.6.0:0 dev-ruby/rest-client:2 )
-	>=dev-ruby/nokogiri-1.6.7.1
-	>=dev-ruby/mime-types-2.6.2:* <dev-ruby/mime-types-3:*
-"
-
-ruby_add_bdepend "
-	dev-ruby/rake
-"
-
-all_ruby_prepare() {
-	# remove bundler support
-	sed -i '/[Bb]undler/d' Rakefile || die
-	rm Gemfile || die
-
-	# loosen dependencies
-	sed -e '/hashicorp-checkpoint\|listen\|net-ssh\|net-scp/s/~>/>=/' \
-		-e '/ruby_dep/s/<=/>=/' \
-		-e '/nokogiri\|bundler/s/=/>=/' \
-		-i ${PN}.gemspec || die
-
-	# remove windows-specific gems
-	sed -e '/wdm\|winrm/d' \
-		-i ${PN}.gemspec || die
-
-	# remove bsd-specific gems
-	sed -e '/rb-kqueue/d' \
-		-i ${PN}.gemspec || die
-
-	# see https://github.com/mitchellh/vagrant/pull/5877
-	epatch "${FILESDIR}"/${PN}-1.8.4-install-plugins-in-isolation.patch
-
-	# disable embedded CA certs and use system ones
-	epatch "${FILESDIR}"/${PN}-1.8.1-disable-embedded-cacert.patch
-
-	# fix rvm issue (bug #474476)
-	epatch "${FILESDIR}"/${PN}-1.8.1-rvm.patch
-}
-
-all_ruby_install() {
-	newbashcomp contrib/bash/completion.sh ${PN}
-	all_fakegem_install
-
-	# provide executable similar to upstream:
-	# https://github.com/mitchellh/vagrant-installers/blob/master/substrate/modules/vagrant_installer/templates/vagrant.erb
-	newbin "${FILESDIR}/${P}" "${PN}"
-
-	# directory for plugins.json
-	dodir /var/lib/vagrant
-}
--- a/app-emulation/vagrant/vagrant-1.9.1-r1.ebuild
+++ b/app-emulation/vagrant/vagrant-1.9.1-r1.ebuild
@ -32,7 +32,7 @@ ruby_add_rdepend "
 	>=dev-ruby/listen-3.1.5
 	>=dev-ruby/hashicorp-checkpoint-0.1.1
 	>=dev-ruby/log4r-1.1.9 <dev-ruby/log4r-1.1.11
-	>=dev-ruby/net-ssh-3.0.1
+	>=dev-ruby/net-ssh-3.0.1:*
 	>=dev-ruby/net-sftp-2.1
 	>=dev-ruby/net-scp-1.1.0
 	|| ( >=dev-ruby/rest-client-1.6.0:0 dev-ruby/rest-client:2 )
--- a/app-emulation/vagrant/vagrant-1.9.2.ebuild
+++ b/app-emulation/vagrant/vagrant-1.9.2.ebuild
@ -1,8 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI="5"
-USE_RUBY="ruby20 ruby21 ruby22"
+USE_RUBY="ruby21 ruby22 ruby23"

 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
 RUBY_FAKEGEM_GEMSPEC="vagrant.gemspec"
@ -26,14 +26,13 @@ RDEPEND="${RDEPEND}
 	virtualbox? ( || ( app-emulation/virtualbox app-emulation/virtualbox-bin ) )"

 ruby_add_rdepend "
-	>=dev-ruby/bundler-1.12.5
 	>=dev-ruby/childprocess-0.5.0
 	>=dev-ruby/erubis-2.7.0
 	>=dev-ruby/i18n-0.6.0:* <dev-ruby/i18n-0.8.0:*
 	>=dev-ruby/listen-3.1.5
 	>=dev-ruby/hashicorp-checkpoint-0.1.1
 	>=dev-ruby/log4r-1.1.9 <dev-ruby/log4r-1.1.11
-	>=dev-ruby/net-ssh-3.0.1
+	>=dev-ruby/net-ssh-3.0.1:*
 	>=dev-ruby/net-sftp-2.1
 	>=dev-ruby/net-scp-1.1.0
 	|| ( >=dev-ruby/rest-client-1.6.0:0 dev-ruby/rest-client:2 )
@ -42,7 +41,7 @@ ruby_add_rdepend "
 "

 ruby_add_bdepend "
-	dev-ruby/rake
+	>=dev-ruby/rake-11.3.0
 "

 all_ruby_prepare() {
@ -51,9 +50,9 @@ all_ruby_prepare() {
 	rm Gemfile || die

 	# loosen dependencies
-	sed -e '/hashicorp-checkpoint\|listen\|net-ssh\|net-scp/s/~>/>=/' \
+	sed -e '/hashicorp-checkpoint\|listen\|net-ssh\|net-scp\|rake\|childprocess/s/~>/>=/' \
 		-e '/ruby_dep/s/<=/>=/' \
-		-e '/nokogiri\|bundler/s/=/>=/' \
+		-e '/nokogiri/s/=/>=/' \
 		-i ${PN}.gemspec || die

 	# remove windows-specific gems
@ -64,9 +63,6 @@ all_ruby_prepare() {
 	sed -e '/rb-kqueue/d' \
 		-i ${PN}.gemspec || die

-	# see https://github.com/mitchellh/vagrant/pull/5877
-	epatch "${FILESDIR}"/${PN}-1.8.4-install-plugins-in-isolation.patch
-
 	# disable embedded CA certs and use system ones
 	epatch "${FILESDIR}"/${PN}-1.8.1-disable-embedded-cacert.patch

--- a/app-emulation/virtualbox-additions/Manifest
+++ b/app-emulation/virtualbox-additions/Manifest
@ -1,4 +1,5 @@
 DIST VBoxGuestAdditions_5.0.16.iso 60063744 SHA256 8190f1e4031f8195971c2a97d2d3b1cf2d86fc83219f750d05cee9255c7dad85 SHA512 8a9d3fcb96a450163f357b92f8149f58700ec65c127fb872b103554417979fbe624a9e1bced3bb6cbf4b0bb6a5c3bbcae9581836cc5d3fde7a034d4032e519f9 WHIRLPOOL 89ed9064014a715a892388b5dbe3c4b577a5a813580be4fd2bd604672354f258b00a619980ba1369aeaceff6a77c6d370cc2b6bf3c17d2cd73a5c8fc9dcad1e8
 DIST VBoxGuestAdditions_5.0.32.iso 58433536 SHA256 4d60a243373ce2b61fe26bcaeb9e300482b16c3407c4c94f02a16f8fd0539319 SHA512 ffae693070a7b401792f67318e3389ec78079634a84834b874bf076400ffeb2f35f3e0b219186a8e51bd969db71285544d12b30c34a076659df45fabde2577b6 WHIRLPOOL e95b286dbb601877814ead39dbf3d0b694005d88d9c45f793ed207f1a27a75aab832a35fc03d0d94a625c7792f194dfefb0d412103a5d7ae5336cdf8381bf902
-DIST VBoxGuestAdditions_5.1.14.iso 59369472 SHA256 1b206b76050dccd3ed979307230f9ddea79551e1c0aba93faee77416733cdc8a SHA512 e5779202579662e1b9c7b33f9f801bccb83e4c547074a5803ab5f78a3f377297fa5f935aa8612159a2c2db5c190efb6d4ec3f14fca598e8e40be1a5cc789a71e WHIRLPOOL a5f5219c1f961d6ce1705e2e14d4d8bae3dd1e443b666101901e4737adeead2fb2fc05dd67d6a2b16fd9fe73fc20b8b49ebbf7a644ca02237bb56959335cc62d
+DIST VBoxGuestAdditions_5.0.36.iso 58433536 SHA256 285409ba6990fa105e451bfc3afe8af12185fdce03e8c3c9f864ae5ee3730a21 SHA512 86d69b1a2d9b88a5f273798258cc61882bd10db847fbbc31e79e6b1d57caf9ab8d40b9292c30dae5c8c3d4336b51787534e0c4627511b282677f99aac31bc7c0 WHIRLPOOL 82df32088b914d3f6db551c59a9f3d56f8c6a172543eb0dc7b110368b967743f7a948fa4a144a7483e2e545942af607d6bbc8e47fdaac60c335c64baa83a3e1e
 DIST VBoxGuestAdditions_5.1.16.iso 59375616 SHA256 2a327e31d5f6283d6dbdc9b32cb586848740fbefa49d96664fe463f88828cfab SHA512 a19a43030d1f624d849f418029e5b8baf931a31e404cc88406d69a0a2a309762222774c5b1c44752e4cc231047a6bb2b386447d8b78d3848f85eff7c02b0e774 WHIRLPOOL 8ca7ce9899e588301bc7f39cdf3bb3233c994b387736cfdee0513fc5a53a69814999b94d1b53ac59488373888567402e738a5509d5b287cc554d0bc51491c0a6
+DIST VBoxGuestAdditions_5.1.18.iso 59381760 SHA256 f2951b49f48a560fbc1afe9d135d1f3f82a3e158b9002278d05d978428adca8a SHA512 4b96a69e104cbc666b2f58a9da524b9002f56d79d37bac299948619c8f41a3796e9e41c1c395c51bd3ea1f0aa406852cc1cf48d40cffaf55e0d7508df44b9c46 WHIRLPOOL 7fa55a76c356ba468280d19cf4bbd00eabcd27ad990bcb86385b445b2e2fd551e1544ad09190d0daa4a6fdfc282c9eb6624f2a7a4f87af42c969a258f3fa71f2
--- a/app-emulation/virtualbox-additions/virtualbox-additions-5.0.36.ebuild
+++ b/app-emulation/virtualbox-additions/virtualbox-additions-5.0.36.ebuild
--- a/app-emulation/virtualbox-additions/virtualbox-additions-5.1.18.ebuild
+++ b/app-emulation/virtualbox-additions/virtualbox-additions-5.1.18.ebuild
@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils
+
+MY_PN=VBoxGuestAdditions
+MY_PV="${PV/beta/BETA}"
+MY_PV="${MY_PV/rc/RC}"
+MY_P=${MY_PN}_${MY_PV}
+
+DESCRIPTION="CD image containing guest additions for VirtualBox"
+HOMEPAGE="http://www.virtualbox.org/"
+SRC_URI="http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.iso"
+
+LICENSE="GPL-2+ LGPL-2.1+ MIT SGI-B-2.0 CDDL"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RESTRICT="mirror"
+
+RDEPEND="!app-emulation/virtualbox-bin
+	!=app-emulation/virtualbox-9999"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	return 0
+}
+
+src_install() {
+	insinto /usr/share/${PN/-additions}
+	newins "${DISTDIR}"/${MY_P}.iso ${MY_PN}.iso
+}
--- a/app-emulation/virtualbox-bin/Manifest
+++ b/app-emulation/virtualbox-bin/Manifest
@ -1,16 +1,20 @@
 DIST Oracle_VM_VirtualBox_Extension_Pack-5.0.16-105871.tar.gz 16896587 SHA256 c234e158c49f4f92c38e41918c117d756a81236ff1030a896e44faf88284ecc7 SHA512 39a7c6726e57c89a970e771f80369617c95e154498174deed025ca953e85197981215dd1250317285213a8e9bf6b7140e06311bd6df464613bfe90a37ef1c3c8 WHIRLPOOL 8bdf4a499e8d2d463249fb98ea35ee3a91d81004418e171396c0a26d91f3de9eda6fe632a1d85df58e1de1c32c5c939a365277ad836c685f83600277bd7282bf
 DIST Oracle_VM_VirtualBox_Extension_Pack-5.0.32-112930.tar.gz 18966317 SHA256 3a0c45eb2471566787def7d73f8c01b03a806e5b2042c21911c2142dafdf9a44 SHA512 138b1ee971f396cdde58874c220e9e1d791561dad4e5a5cf14e8bc7aca40d851e3017ef179645cc235c0cf2848dc5e4f500a0ef8865c997371043bf02836acbc WHIRLPOOL 27733c658f1a6cbe31950b89e51b5a18dc5deeaac3a907e302e041e1aa2bea5b013fde83e4c6b7d5c120a022ce4d89355fc54cac9fe7a79ee716c011c638fd3d
-DIST Oracle_VM_VirtualBox_Extension_Pack-5.1.14-112924.tar.gz 19476532 SHA256 baddb7cc49224ecc1147f82d77fce2685ac39941ac9b0aac83c270dd6570ea85 SHA512 f54e915976a4b4f3ab55ce7d5ea2ab6bf00f4355cdf5fb05ec9c7ef629464f7d8ef798c443380326ce12d74cb316e41f34ef6017377542c8a91a3a547ef8a040 WHIRLPOOL f27c47f83fe3875eb0b11fac3454c40f2220e37c7fad3d11709d1059712ac66f7b70cf515d88a010301227c9679f07db5fc8dcb9bd2ae82aa5cabce30276c53e
+DIST Oracle_VM_VirtualBox_Extension_Pack-5.0.36-114008.tar.gz 19050365 SHA256 160765cc0375a1901ff18f887ee8469d5175257b036e81da59ba0b8278da8d4d SHA512 f65b08a69b83b64eef7e72f3b9cecab054cf0232d0578b36388f33c50e7f96c4c05b1b673f146c4894824099030740eb821eecc2982d64fd3d8b6d370b7dea12 WHIRLPOOL 0e1361ae7edc7d6e0f9e4d215ed8286235ec7fac6b9c5dda6c0f6a452def67b9f82ee30ae87d8b71376cba984986c69fc9d41c1f8a026e7c19c1172e43e62cd5
 DIST Oracle_VM_VirtualBox_Extension_Pack-5.1.16-113841.tar.gz 19559112 SHA256 a838711616bf015be192c99b2282731321d062ea061a51bd78676ed47b1fc709 SHA512 5482194ee33d405b34426b83bfe31d3ff8de5c90d8aca4a49805d796b5dc782e3d769d6eea85318f60b8943afea094cb01fae8ebaee886a3132789f334a7b759 WHIRLPOOL 1badb7d1dc6a147106befc9e50e3a76525693643d8ed8b616dc9f9435c99e4679a170fa2e22b12b45260aba8ca64e8ca8465800b730b990abe0868928d312043
+DIST Oracle_VM_VirtualBox_Extension_Pack-5.1.18-114002.tar.gz 19558758 SHA256 996f783996a597d3936fc5f1ccf56edd31ae1f8fb4d527009647d9a2c8c853cd SHA512 2e034440d3e29592383c4b15e594ddee8cf319cb67a7c6a4f2df277ccfbd82ee7d7e010ca0a123db9d1876053dfd4729184749dae079f8211a58a21d4fb74b4e WHIRLPOOL 0a0464ac902c98dcf6e4ee432eda3a0b174aea5489952a26338b18ee431e2859e709f2b2a9c72bd3dd842f495f1d02c7627430462a5e2374773062159c243301
 DIST VirtualBox-5.0.16-105871-Linux_amd64.run 85913042 SHA256 2fc30af485c67162a8f1fafb5a0d9c6cbab4dc17ec362e6d8d2487071b4daa47 SHA512 706159c25ad144a489d7519dcc5a9fa6ee47415bac8fc48bb56fbbe72953f5e65fcdf9d045fbe686520ea676dbf511a19208adfd81f199c804e1b632de581f6b WHIRLPOOL 298235fe47a08136232916b990675b4b26dbab7155fd00c82d2405170fd7d255cfa5f93c07a13a89cdc0a129662f3a14d3386be17e11c02bbd3a564de554bcf3
 DIST VirtualBox-5.0.16-105871-Linux_x86.run 84909518 SHA256 46421f6ebed4de2466d32193597fbcfe71c2a89c5fd5ac1493856b509d6259e1 SHA512 a16e5a9ee4c643985d48c6ac8e7224074dd2a775bf05b9ef712fff898962493a2126bb1ced20b5ec525ddd86d0ce6c42c06e286f03758aad5d39d58b87db51a8 WHIRLPOOL dbc4af908d3e2879388426defd733539f3bbff10a4f957858f42ae7c328a5cbd0480667b50777a69e860be475d8c66a392badb79503d9f22c267688edc6a1e4e
 DIST VirtualBox-5.0.32-112930-Linux_amd64.run 84387282 SHA256 c5bf59227730855c3f56d4e4f755528ad27d2f5f01bd12791f5b4490364540bf SHA512 22f50362d4b611a55d331d5104b81cbea5e80515c8e992b6ad3f834f80d106fb0d055ce0e534878ad2eeb899b4fef8ec5149bea8c48dce3109685c16ede55f44 WHIRLPOOL 9eb268d9eb69bed9ed4dba0ff0c20c119a9d70d2ae4151d6d2f4c29c300e884c1cbe0f9d356d4053ec069169d5851272f9de620eff8c680d7e1a75a49f5e3896
 DIST VirtualBox-5.0.32-112930-Linux_x86.run 83690958 SHA256 f735bcdb7a93c7b794d610970e537dd4961e1a34453d124a472de10e816aa356 SHA512 cf57024ccc9f306f0108ad3b2ce4d29fa960bafdbdbdcc7bde34094a07e8a62b6f361e7cb77b8d3bb58bb31763b19397c2a0f8fe958600261e8adddab8e9b0b8 WHIRLPOOL 973c2c6b2c71c60ecacfae47b922ed32bdfaa249a08e0c49b3d540031ed3aaa63d5a67da7dccbb9ae24e4b49420b1f6aa85cc7662c9c42333c318e7f1e47cb03
-DIST VirtualBox-5.1.14-112924-Linux_amd64.run 87428562 SHA256 f61ea80feaeec931ff7cd7da4a465f28ce6f4b99816a2d618eb1423178978a16 SHA512 c63a1318ff4f0c3ada7ff76691491b3cbaf262c77e143560f1ac0d6dcb06bf839cc642aa5bdf388bcb6df77704b82af48c42c89d88b195476c37e3aec5025615 WHIRLPOOL bfe742520704588371c8410a4107f68780fa97f5d7215ccb3ea6b0a141af68c0a9d7e93da6ef9bcac289915ac45f4eeefef7b864aae1b2a23d970fd5bc732c2e
-DIST VirtualBox-5.1.14-112924-Linux_x86.run 86773198 SHA256 899b601238d5ff8fd3b9c95291f454de93211d68a9204a6a8d28dbed5bba17a4 SHA512 51b41b5f9d13fd54919d30000f78499aed36bcd52a6d7353cdbb902131f5dcef8a13c44ddfc26e5f9eee060e5bdbff138a1bc0c3ccb7fee175070f0a1c4e81d8 WHIRLPOOL c502715a1ac28f599e10a31431f16c7a16a01c98af804c7e47d44a6a46e26856fbe0010c9332a09d413aefff04912ab12bdc2f71c1dd1ba260ec7b2ce3b1194c
+DIST VirtualBox-5.0.36-114008-Linux_amd64.run 84438481 SHA256 75699013f4204bdc0fa6d0198e53fa98ca3fe1256cd1ce2b799296a610473da8 SHA512 57d5c6942ffcc35cececce54e38e0192950d9a26532dffc40fe8fb31662e6bb2b9c7503599444adf538e9f99aa943caa1357e67994c2407e63a6e1967f36cf97 WHIRLPOOL 45929bf9013c6d7adb7239d4030b6dcc5844e4ebed72115184dd230dee792447ae1ac74a6bb73bd92708cc714c5ef39924af0ede485bb92cd614a00567115817
+DIST VirtualBox-5.0.36-114008-Linux_x86.run 83742157 SHA256 cef216f8bf09379cdcd5f88d9da5edac94c992a64ac97ede7e99d29902fd5c4c SHA512 4cb0aadfe9ff3e87f84f149b1d24dd68b312a4be9b12deb83a4db78a0f977a4357fe6cab3044d8651b06ed5e5078346208392c75beea44552a112800704856ec WHIRLPOOL 87a8daa26e675bfae5da1bd4d4a6a920416075fb11b38922b3a02108a97b0e5eed25cd1c7a2c01773f6372e8ddd807d42f4df6342f9de9c550709ee10f0943cd
 DIST VirtualBox-5.1.16-113841-Linux_amd64.run 87684561 SHA256 41aab2f9d84fb03c339644fa28ab3503f8e478e30a16f1711b225f33a38c4a5a SHA512 e952f0e029af4e799d439976a3c1f677e72a9fbe2db9292663fed9779e3b238117b3d5a8ae725c65cfc559c340381ceea213fd352150552bba538e1707497b15 WHIRLPOOL dde25b37b16330013fa1a469ffec98cd2fc9d990783c6ce77a46eaba08057dcee914e0df8e963af010152d704484e6dd291f7c55ec9d2a310f3f6e98df9e80bf
 DIST VirtualBox-5.1.16-113841-Linux_x86.run 86896078 SHA256 895da15cc94096f29b3faf2129090a4b0cf1e1f49583901380848c2dd3ca6416 SHA512 fccf68d2075b5a77a240aafbd86b9adc7d6203fcbbbc78b0b4943c96f9e3d2897f2a009560142907b39e4659a1440a56401671986cef53faf5058e41ac6cb0c7 WHIRLPOOL 2d80994f973d474f64864b9b22d32ad23011c919232353dcd96eccfa668264debda06f59a90d57d649b7b19ad7721a58dbc33dffcc73797e8f5f633d8eb8fd97
+DIST VirtualBox-5.1.18-114002-Linux_amd64.run 87684562 SHA256 22801c4b828fd8dec41bdf9d9a9679a18f95e5af051d2b096e3bbf753bc66757 SHA512 0821a6cf650304c56597aa9f13cb5e9daee0026bd97421a439ef2c0ca62144887533bb5cc85ced9872bcaee74a6c48f593bbbfc812dd89c98c918e2dcf7d01ef WHIRLPOOL 19824a02589c0c417af31b80376cf7db764fd923f967aa7ef20d9bfc2dcaf335dcce24e8973b5abd2ad72a8bf6a9ff66f26397a65b7967b1ed6b66299fcc7e5b
+DIST VirtualBox-5.1.18-114002-Linux_x86.run 86875596 SHA256 193526802093d512ba3673552b9377b3cd17b0ad5484d5ee1ba52eea24e61ccb SHA512 6b501f3e0c668a4608c7e5dc3e5074fcc398b054ec78b140015f8f33a0f17cc8c918cada98286d9f64f38fb46dc7fb7e358d87690c5f780d184faaac4e55e3c1 WHIRLPOOL e65b913bc426daf752f205bfdd7408e31e433754cdc35801f3bdbef13b050c099202005a93f0fca0e9360f75a46b320c523f0faba3c8ddc4a7109444f3efabc2
 DIST VirtualBoxSDK-5.0.16-105871.zip 9639569 SHA256 df1bd5ed7f7fe9c401555498a1abed6f1f98e001c0069f16d401ccf3afe3061b SHA512 f4e1af1d97a26818722124fbbaffa6d61369b1a5f3b350b749284afdde038802f4a0e93e9bbb4c9ab0f49aad1f4fa19bbc4b0bdb04aa172a433a77a538816e25 WHIRLPOOL 0598061b47e5d0ef775665300ab61ad7b94638d32fb358a9c189536b00b2456ce4c90dfbcc00bac86da736289253e84a3b586b8b7d1da4087db76e8845a8ca33
 DIST VirtualBoxSDK-5.0.32-112930.zip 9674720 SHA256 37165cd54271e3e84117228a2c1836a368a313176397c7455ed303683e9950d1 SHA512 aad7beb301b0376cad102d935b09217428331027b57863464aaa6b3db6418202f9f68b8c1361ee409f8c5fda2cc8169166a5b067ef020ca3a509fe17f64f34fc WHIRLPOOL ee737ac9f24bd854daddbb766df4fbbb071dd3fbf6fd9fbb71b985fc52f84374f4899096ad463510e5caf32d5c965b60ba4c0f408bed59984aedee9d99c31a45
-DIST VirtualBoxSDK-5.1.14-112924.zip 9861171 SHA256 a89a1f6762893825b7b83d5964b21c26d043dc8e62ab3cee86f4cb419f5081af SHA512 1bdbfcadbf322a552de50035b704c0df24c165c9165b99d169ec76f417dc301d5bf6780079d65822a7f3e8fe204ef593f4d42eda70ff126617e0c7e088bd4ef2 WHIRLPOOL d6515baa4f7ff63b86914389d1d1a58fb69e8a094bfc5be6c3ba675b669a6281cee027f35aa42a29c15fac989b95fd527c328608a299365f8e0e795caf4f08d2
+DIST VirtualBoxSDK-5.0.36-114008.zip 9677707 SHA256 1109651d05bfc734f663b12d420a7c44ab396ee0fbbe2d51cb55df73ddbd8e9b SHA512 854d461ea8a5ee67673cfea3c0b340882b244137f3e8b8c824be5fc2d30fa9d5abf1322b5c083158cd73134f030097bd06424e7afa05570a6e43f0057119e25d WHIRLPOOL a2e0b71639a517ce636fcfd35b16e8bb3d19bc0351fe5a2f2f7e40880e3e335595cf83c19f81f09b8d8f4b64ae118d716bfe7c3de5f9bd13da5eee4f7e0fdbea
 DIST VirtualBoxSDK-5.1.16-113841.zip 9861063 SHA256 667cb9b3d5a0564ae07c8307e4be152dc5832682cc58da8434517fe35b25eb63 SHA512 d2f2004914f86753fa645e823c50a5ba7aaebf5490648b91184385367f72caef9afe4ae3ab103a1a8103a1ed0a46e30a22a11dfa23a66dc442d4043c07523669 WHIRLPOOL c3cdf380fa80b062cb291ef6868fbaaf57900199ab01de24ee0963db71bf2557d3dedca37ea3aa03240c3e5fe0efedbea3f3241ded74f3d9eeee52f9f0687643
+DIST VirtualBoxSDK-5.1.18-114002.zip 9858620 SHA256 3aadf617f5c36b6a36f92d9a0d3347f08ad4dee69c12fff3a4764c437d71e838 SHA512 922dd4f22953591c793f3d7f02c708e93e3962350020529d47af19323ac7782ad027d033ee9e4e2433adc577e44d6b823ff67ea2acdd82d02f7346c289085b54 WHIRLPOOL 0b6f11f20ed9f12b5ad48bf84c87db229e9deb534d6e308191e280abb13709d7fed4d57c2a429030980b2f68687c5a1b50b15d0e7826fccb96d0293d32420aaa
--- a/app-emulation/virtualbox-bin/virtualbox-bin-5.0.36.114008.ebuild
+++ b/app-emulation/virtualbox-bin/virtualbox-bin-5.0.36.114008.ebuild
@ -0,0 +1,287 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils fdo-mime gnome2 pax-utils python-r1 udev unpacker versionator
+
+MAIN_PV="$(get_version_component_range 1-3)"
+if [[ ${PV} = *_beta* ]] || [[ ${PV} = *_rc* ]] ; then
+	MY_PV="${MAIN_PV}_$(get_version_component_range 5)"
+	MY_PV="${MY_PV/beta/BETA}"
+	MY_PV="${MY_PV/rc/RC}"
+else
+	MY_PV="${MAIN_PV}"
+fi
+VBOX_BUILD_ID="$(get_version_component_range 4)"
+VBOX_PV="${MY_PV}-${VBOX_BUILD_ID}"
+MY_P="VirtualBox-${VBOX_PV}-Linux"
+# needed as sometimes the extpack gets another build ID
+EXTP_PV="${VBOX_PV}"
+EXTP_PN="Oracle_VM_VirtualBox_Extension_Pack"
+EXTP_P="${EXTP_PN}-${EXTP_PV}"
+# needed as sometimes the SDK gets another build ID
+SDK_PV="${VBOX_PV}"
+SDK_P="VirtualBoxSDK-${SDK_PV}"
+
+DESCRIPTION="Family of powerful x86 virtualization products for enterprise and home use"
+HOMEPAGE="http://www.virtualbox.org/"
+SRC_URI="amd64? ( http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}_amd64.run )
+	x86? ( http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}_x86.run )
+	http://download.virtualbox.org/virtualbox/${MY_PV}/${EXTP_P}.vbox-extpack -> ${EXTP_P}.tar.gz"
+
+LICENSE="GPL-2 PUEL"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+additions +chm headless python vboxwebsrv rdesktop-vrdp"
+RESTRICT="mirror"
+
+if [[ "${PV}" != *beta* ]] ; then
+	SRC_URI+="
+		sdk? ( http://download.virtualbox.org/virtualbox/${MY_PV}/${SDK_P}.zip )"
+	IUSE+=" sdk"
+fi
+
+DEPEND="app-arch/unzip
+	${PYTHON_DEPS}"
+
+RDEPEND="!!app-emulation/virtualbox
+	!app-emulation/virtualbox-additions
+	~app-emulation/virtualbox-modules-${MAIN_PV}
+	!headless? (
+		x11-libs/libXcursor
+		media-libs/libsdl[X]
+		x11-libs/libXrender
+		x11-libs/libXfixes
+		media-libs/libpng
+		x11-libs/libXi
+		x11-libs/libXrandr
+		x11-libs/libXinerama
+		x11-libs/libXft
+		media-libs/freetype
+		media-libs/fontconfig
+		x11-libs/libXext
+		dev-libs/glib
+		chm? ( dev-libs/expat )
+	)
+	dev-libs/libxml2
+	sys-fs/lvm2
+	x11-libs/libXau
+	x11-libs/libX11
+	x11-libs/libXt
+	x11-libs/libXmu
+	x11-libs/libSM
+	x11-libs/libICE
+	x11-libs/libXdmcp
+	${PYTHON_DEPS}"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+S=${WORKDIR}
+
+QA_PREBUILT="opt/VirtualBox/*"
+
+PYTHON_UPDATER_IGNORE="1"
+
+src_unpack() {
+	unpack_makeself ${MY_P}_${ARCH}.run
+	unpack ./VirtualBox.tar.bz2
+
+	mkdir "${S}"/${EXTP_PN} || die
+	pushd "${S}"/${EXTP_PN} &>/dev/null || die
+	unpack ${EXTP_P}.tar.gz
+	popd &>/dev/null || die
+
+	if [[ "${PV}" != *beta* ]] && use sdk ; then
+		unpack VirtualBoxSDK-${SDK_PV}.zip
+	fi
+}
+
+src_configure() {
+	:;
+}
+
+src_compile() {
+	:;
+}
+
+src_install() {
+	# create virtualbox configurations files
+	insinto /etc/vbox
+	newins "${FILESDIR}/${PN}-config" vbox.cfg
+
+	if ! use headless ; then
+		newmenu "${FILESDIR}"/${PN}.desktop-2 ${PN}.desktop
+
+		# set up symlinks (bug #572012)
+		dosym /opt/VirtualBox/virtualbox.xml /usr/share/mime/packages/virtualbox.xml
+
+		local size ico icofile
+		for size in 16 24 32 48 64 72 96 128 256 ; do
+			pushd "${S}"/icons/${size}x${size} &>/dev/null || die
+			if [[ -f "virtualbox.png" ]] ; then
+				doicon -s ${size} virtualbox.png
+			fi
+			for ico in hdd ova ovf vbox{,-extpack} vdi vdh vmdk ; do
+				icofile="virtualbox-${ico}.png"
+				if [[ -f "${icofile}" ]] ; then
+					doicon -s ${size} ${icofile}
+				fi
+			done
+			popd &>/dev/null || die
+		done
+		doicon -s scalable "${S}"/icons/scalable/virtualbox.svg
+		insinto /usr/share/pixmaps
+		newins "${S}"/icons/48x48/virtualbox.png ${PN}.png
+	fi
+
+	pushd "${S}"/${EXTP_PN} &>/dev/null || die
+	insinto /opt/VirtualBox/ExtensionPacks/${EXTP_PN}
+	doins -r linux.${ARCH}
+	doins ExtPack* PXE-Intel.rom
+	popd &>/dev/null || die
+	rm -rf "${S}"/${EXTP_PN}
+
+	insinto /opt/VirtualBox
+	dodir /opt/bin
+
+	doins UserManual.pdf
+
+	if [[ "${PV}" != *beta* ]] && use sdk ; then
+		doins -r sdk
+	fi
+
+	if use additions; then
+		doins -r additions
+	fi
+
+	if use vboxwebsrv; then
+		doins vboxwebsrv
+		fowners root:vboxusers /opt/VirtualBox/vboxwebsrv
+		fperms 0750 /opt/VirtualBox/vboxwebsrv
+		dosym /opt/VirtualBox/VBox.sh /opt/bin/vboxwebsrv
+		newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv
+		newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
+	fi
+
+	if use rdesktop-vrdp; then
+		doins rdesktop-vrdp
+		doins -r rdesktop-vrdp-keymaps
+		fperms 0750 /opt/VirtualBox/rdesktop-vrdp
+		dosym /opt/VirtualBox/rdesktop-vrdp /opt/bin/rdesktop-vrdp
+	fi
+
+	if ! use headless && use chm; then
+		doins kchmviewer VirtualBox.chm
+		fowners root:vboxusers /opt/VirtualBox/kchmviewer
+		fperms 0750 /opt/VirtualBox/kchmviewer
+	fi
+
+	# This ebuild / package supports only py2.7.  When py3 comes is unknown.
+	# The compile phase makes VBoxPython2_7.so.
+	# py3 support would presumably require a binary pre-compiled by py3.
+	use python && doins VBoxPython.so VBoxPython2_7.so
+
+	rm -rf src rdesktop* deffiles install* routines.sh runlevel.sh \
+		vboxdrv.sh VBox.sh VBox.png vboxnet.sh additions VirtualBox.desktop \
+		VirtualBox.tar.bz2 LICENSE VBoxSysInfo.sh rdesktop* vboxwebsrv \
+		webtest kchmviewer VirtualBox.chm vbox-create-usb-node.sh \
+		90-vbox-usb.fdi uninstall.sh vboxshell.py vboxdrv-pardus.py \
+		VBoxPython?_*.so
+
+	if use headless ; then
+		rm -rf VBoxSDL VirtualBox VBoxKeyboard.so
+	fi
+
+	doins -r * || die
+
+	# create symlinks for working around unsupported $ORIGIN/.. in VBoxC.so (setuid)
+	dosym /opt/VirtualBox/VBoxVMM.so /opt/VirtualBox/components/VBoxVMM.so
+	dosym /opt/VirtualBox/VBoxREM.so /opt/VirtualBox/components/VBoxREM.so
+	dosym /opt/VirtualBox/VBoxRT.so /opt/VirtualBox/components/VBoxRT.so
+	dosym /opt/VirtualBox/VBoxDDU.so /opt/VirtualBox/components/VBoxDDU.so
+	dosym /opt/VirtualBox/VBoxXPCOM.so /opt/VirtualBox/components/VBoxXPCOM.so
+
+	local each
+	for each in VBox{Manage,SVC,XPCOMIPCD,Tunctl,NetAdpCtl,NetDHCP,NetNAT,TestOGL,ExtPackHelperApp}; do
+		fowners root:vboxusers /opt/VirtualBox/${each}
+		fperms 0750 /opt/VirtualBox/${each}
+		pax-mark -m "${D}"/opt/VirtualBox/${each}
+	done
+	# VBoxNetAdpCtl and VBoxNetDHCP binaries need to be suid root in any case..
+	fperms 4750 /opt/VirtualBox/VBoxNetAdpCtl
+	fperms 4750 /opt/VirtualBox/VBoxNetDHCP
+	fperms 4750 /opt/VirtualBox/VBoxNetNAT
+
+	if ! use headless ; then
+		# Hardened build: Mark selected binaries set-user-ID-on-execution
+		for each in VBox{SDL,Headless} VirtualBox; do
+			fowners root:vboxusers /opt/VirtualBox/${each}
+			fperms 4510 /opt/VirtualBox/${each}
+			pax-mark -m "${D}"/opt/VirtualBox/${each}
+		done
+
+		dosym /opt/VirtualBox/VBox.sh /opt/bin/VirtualBox
+		dosym /opt/VirtualBox/VBox.sh /opt/bin/VBoxSDL
+	else
+		# Hardened build: Mark selected binaries set-user-ID-on-execution
+		fowners root:vboxusers /opt/VirtualBox/VBoxHeadless
+		fperms 4510 /opt/VirtualBox/VBoxHeadless
+		pax-mark -m "${D}"/opt/VirtualBox/VBoxHeadless
+	fi
+
+	exeinto /opt/VirtualBox
+	newexe "${FILESDIR}/${PN}-3-wrapper" "VBox.sh"
+	fowners root:vboxusers /opt/VirtualBox/VBox.sh
+	fperms 0750 /opt/VirtualBox/VBox.sh
+
+	dosym /opt/VirtualBox/VBox.sh /opt/bin/VBoxManage
+	dosym /opt/VirtualBox/VBox.sh /opt/bin/VBoxVRDP
+	dosym /opt/VirtualBox/VBox.sh /opt/bin/VBoxHeadless
+	dosym /opt/VirtualBox/VBoxTunctl /opt/bin/VBoxTunctl
+
+	# set an env-variable for 3rd party tools
+	echo -n "VBOX_APP_HOME=/opt/VirtualBox" > "${T}/90virtualbox"
+	doenvd "${T}/90virtualbox"
+
+	local udevdir="$(get_udevdir)"
+	insinto ${udevdir}/rules.d
+	doins "${FILESDIR}"/10-virtualbox.rules
+	sed "s@%UDEVDIR%@${udevdir}@" \
+		-i "${D}"${udevdir}/rules.d/10-virtualbox.rules || die
+	# move udev scripts into ${udevdir} (bug #372491)
+	mv "${D}"/opt/VirtualBox/VBoxCreateUSBNode.sh "${D}"${udevdir} || die
+	fperms 0750 ${udevdir}/VBoxCreateUSBNode.sh
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+
+	gnome2_icon_cache_update
+
+	udevadm control --reload-rules && udevadm trigger --subsystem-match=usb
+
+	elog ""
+	if ! use headless ; then
+		elog "To launch VirtualBox just type: \"VirtualBox\""
+		elog ""
+	fi
+	elog "You must be in the vboxusers group to use VirtualBox."
+	elog ""
+	elog "For advanced networking setups you should emerge:"
+	elog "net-misc/bridge-utils and sys-apps/usermode-utilities"
+	elog ""
+	elog "Please visit http://www.virtualbox.org/wiki/Editions for"
+	elog "an overview about the different features of ${PN}"
+	elog "and virtualbox-ose"
+	if [ -e "${ROOT}/etc/udev/rules.d/10-virtualbox.rules" ] ; then
+		elog ""
+		elog "Please remove \"${ROOT}/etc/udev/rules.d/10-virtualbox.rules\""
+		elog "or else USB in ${PN} won't work."
+	fi
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}
--- a/app-emulation/virtualbox-bin/virtualbox-bin-5.1.18.114002.ebuild
+++ b/app-emulation/virtualbox-bin/virtualbox-bin-5.1.18.114002.ebuild
--- a/app-emulation/virtualbox-extpack-oracle/Manifest
+++ b/app-emulation/virtualbox-extpack-oracle/Manifest
@ -1,4 +1,5 @@
 DIST Oracle_VM_VirtualBox_Extension_Pack-5.0.16-105871.tar.gz 16896587 SHA256 c234e158c49f4f92c38e41918c117d756a81236ff1030a896e44faf88284ecc7 SHA512 39a7c6726e57c89a970e771f80369617c95e154498174deed025ca953e85197981215dd1250317285213a8e9bf6b7140e06311bd6df464613bfe90a37ef1c3c8 WHIRLPOOL 8bdf4a499e8d2d463249fb98ea35ee3a91d81004418e171396c0a26d91f3de9eda6fe632a1d85df58e1de1c32c5c939a365277ad836c685f83600277bd7282bf
 DIST Oracle_VM_VirtualBox_Extension_Pack-5.0.32-112930.tar.gz 18966317 SHA256 3a0c45eb2471566787def7d73f8c01b03a806e5b2042c21911c2142dafdf9a44 SHA512 138b1ee971f396cdde58874c220e9e1d791561dad4e5a5cf14e8bc7aca40d851e3017ef179645cc235c0cf2848dc5e4f500a0ef8865c997371043bf02836acbc WHIRLPOOL 27733c658f1a6cbe31950b89e51b5a18dc5deeaac3a907e302e041e1aa2bea5b013fde83e4c6b7d5c120a022ce4d89355fc54cac9fe7a79ee716c011c638fd3d
-DIST Oracle_VM_VirtualBox_Extension_Pack-5.1.14-112924.tar.gz 19476532 SHA256 baddb7cc49224ecc1147f82d77fce2685ac39941ac9b0aac83c270dd6570ea85 SHA512 f54e915976a4b4f3ab55ce7d5ea2ab6bf00f4355cdf5fb05ec9c7ef629464f7d8ef798c443380326ce12d74cb316e41f34ef6017377542c8a91a3a547ef8a040 WHIRLPOOL f27c47f83fe3875eb0b11fac3454c40f2220e37c7fad3d11709d1059712ac66f7b70cf515d88a010301227c9679f07db5fc8dcb9bd2ae82aa5cabce30276c53e
+DIST Oracle_VM_VirtualBox_Extension_Pack-5.0.36-114008.tar.gz 19050365 SHA256 160765cc0375a1901ff18f887ee8469d5175257b036e81da59ba0b8278da8d4d SHA512 f65b08a69b83b64eef7e72f3b9cecab054cf0232d0578b36388f33c50e7f96c4c05b1b673f146c4894824099030740eb821eecc2982d64fd3d8b6d370b7dea12 WHIRLPOOL 0e1361ae7edc7d6e0f9e4d215ed8286235ec7fac6b9c5dda6c0f6a452def67b9f82ee30ae87d8b71376cba984986c69fc9d41c1f8a026e7c19c1172e43e62cd5
 DIST Oracle_VM_VirtualBox_Extension_Pack-5.1.16-113841.tar.gz 19559112 SHA256 a838711616bf015be192c99b2282731321d062ea061a51bd78676ed47b1fc709 SHA512 5482194ee33d405b34426b83bfe31d3ff8de5c90d8aca4a49805d796b5dc782e3d769d6eea85318f60b8943afea094cb01fae8ebaee886a3132789f334a7b759 WHIRLPOOL 1badb7d1dc6a147106befc9e50e3a76525693643d8ed8b616dc9f9435c99e4679a170fa2e22b12b45260aba8ca64e8ca8465800b730b990abe0868928d312043
+DIST Oracle_VM_VirtualBox_Extension_Pack-5.1.18-114002.tar.gz 19558758 SHA256 996f783996a597d3936fc5f1ccf56edd31ae1f8fb4d527009647d9a2c8c853cd SHA512 2e034440d3e29592383c4b15e594ddee8cf319cb67a7c6a4f2df277ccfbd82ee7d7e010ca0a123db9d1876053dfd4729184749dae079f8211a58a21d4fb74b4e WHIRLPOOL 0a0464ac902c98dcf6e4ee432eda3a0b174aea5489952a26338b18ee431e2859e709f2b2a9c72bd3dd842f495f1d02c7627430462a5e2374773062159c243301
--- a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.0.36.114008.ebuild
+++ b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.0.36.114008.ebuild
--- a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.1.18.114002.ebuild
+++ b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.1.18.114002.ebuild
@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils multilib versionator
+
+MAIN_PV="$(get_version_component_range 1-3)"
+if [[ ${PV} = *_beta* ]] || [[ ${PV} = *_rc* ]] ; then
+	MY_PV="${MAIN_PV}_$(get_version_component_range 5)"
+	DEP_PV="${MY_PV}"
+	MY_PV="${MY_PV/beta/BETA}"
+	MY_PV="${MY_PV/rc/RC}"
+else
+	MY_PV="${MAIN_PV}"
+	DEP_PV="${MAIN_PV}"
+fi
+VBOX_BUILD_ID="$(get_version_component_range 4)"
+MY_PN="Oracle_VM_VirtualBox_Extension_Pack"
+MY_P="${MY_PN}-${MY_PV}-${VBOX_BUILD_ID}"
+
+DESCRIPTION="PUEL extensions for VirtualBox"
+HOMEPAGE="http://www.virtualbox.org/"
+SRC_URI="http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.vbox-extpack -> ${MY_P}.tar.gz"
+
+LICENSE="PUEL"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RESTRICT="mirror strip"
+
+RDEPEND="~app-emulation/virtualbox-${DEP_PV}"
+
+S="${WORKDIR}"
+
+QA_PREBUILT="/usr/lib*/virtualbox/ExtensionPacks/${MY_PN}/.*"
+
+src_install() {
+	insinto /usr/$(get_libdir)/virtualbox/ExtensionPacks/${MY_PN}
+	doins -r linux.${ARCH}
+	doins ExtPack* PXE-Intel.rom
+}
--- a/app-emulation/virtualbox-guest-additions/Manifest
+++ b/app-emulation/virtualbox-guest-additions/Manifest
@ -1,4 +1,5 @@
 DIST VirtualBox-5.0.16.tar.bz2 111062984 SHA256 f5a44d33a1db911f445b2eb2d22d9293a96a535cba488b5a235577ef868fa63c SHA512 3da3a227360fb50d299e99770378f65e8cb99525377343fa8faff2360be66643d46f68323d6a8b8d4d26182082f171bb35ab2497167bf6df18827a5ea7742074 WHIRLPOOL ea709057c588f28820790c2b193decba9ee0c57e0f82aa4361ca87aef661315182e18b5ee29558e47ed92f6037eb91befa5390680661a7b9f2248c7819b4a85c
 DIST VirtualBox-5.0.32.tar.bz2 111684963 SHA256 4a48d4a8b6ca68353bd39f2c9d2896e1659818959f858e8326ef649481d15550 SHA512 77e479e43a08bd9656792cc8e58bbb4e57e1290803bc100a00b9595f2dfdf580607c9a1d38f72aebf638cf6ba3f63bef79913301c8b2a135b5cfcf35a44707e4 WHIRLPOOL 1b03a9368259e1704981dcd64f773f8097d03c582e8c18a012c55463d5bbb15b2521e83f51fe3cf4fe30822db26726c9ff145d711cb97ae2287368068338a9a4
-DIST VirtualBox-5.1.14.tar.bz2 115042132 SHA256 8267bb026717c6e55237eb798210767d9c703cfcdf01224d9bc26f7dac9f228a SHA512 ab0646c587fa1b573a9332ca0f1959660adc02f2ecf63ac808f4a7e3ceb9b2c58adab8e309aec4630ff7fa447f47d7487e7e8d0a1f718a42d39ce71e96067fae WHIRLPOOL 915b3ac0d50def86e92b662c7fe32e1390c9dab73efb9fc9595465c45818b86b4380be93a7075d17e33f9b70d92dbbbf6063ce0dad6448c9a592648a10f2409b
+DIST VirtualBox-5.0.36.tar.bz2 112998831 SHA256 3b5a9b12bbeb01af10c03d505261aaff15bf88681afd5b7cadb5d58682746812 SHA512 db6d23b4196a4ae3c5860bcc331094ca35c849fe98b132a5a6b0721e58548cd72ba3dfb7bb9ccc2a3beee9997cb333aa4c66c1c850556c5ecc6eec38f43ee409 WHIRLPOOL 3853a658731a85f8b2b206b617b7bd37d86ace15447f07fd0598a96aa266783b121b91f8f84dd3d6463edc0cd45504d2de901149802ff658b86ba0abb850ce26
 DIST VirtualBox-5.1.16.tar.bz2 115670028 SHA256 78071c3172f3bd3c7981c352c3ae6c6a9c01f6ab24bc0aa7ec79f3528b2291a7 SHA512 322903af8ec6f5f56fa4d4181caf435b4aba5c25b824e664e06c4cabfadad595a0417fd882f7138aa36388846171228e3bf02931fb63388640b5ef5c6c4bcafc WHIRLPOOL faa06cf139225a7b44df752342b674f43296c411499132034bca1868abeac6ed89b31a506f7398f813b12e9c1cfa1f5cc1825c64d0f70ce7886c1a2efce3e0f7
+DIST VirtualBox-5.1.18.tar.bz2 115680674 SHA256 7ed0959bbbd02826b86b3d5dc8348931ddfab267c31f8ed36ee53c12f5522cd9 SHA512 0ff7cc5471203304435aaf25995719d1c782a5503da94f238cbf57b1b2b7dcd7bd81f17fd24bd77449eb75ad0e104aa8b5b389c1feddb1af9f45b1b72f35b546 WHIRLPOOL b254d4fef5b760fa0708db805ae070bfb0ba17d8ebac2fbbcade36d9e79ba8a02031199d7b8bb6b546f3a40013e5b3e756a130745e913bb921d6bbb658123669
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.0.36.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.0.36.ebuild
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.1.18.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.1.18.ebuild
@ -0,0 +1,219 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils linux-mod systemd user toolchain-funcs
+
+MY_PV="${PV/beta/BETA}"
+MY_PV="${MY_PV/rc/RC}"
+MY_P=VirtualBox-${MY_PV}
+DESCRIPTION="VirtualBox kernel modules and user-space tools for Gentoo guests"
+HOMEPAGE="http://www.virtualbox.org/"
+SRC_URI="http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="X"
+
+RDEPEND="X? ( x11-apps/xrandr
+		x11-apps/xrefresh
+		x11-libs/libXmu
+		x11-libs/libX11
+		x11-libs/libXt
+		x11-libs/libXext
+		x11-libs/libXau
+		x11-libs/libXdmcp
+		x11-libs/libSM
+		x11-libs/libICE
+		x11-proto/glproto )
+	sys-apps/dbus
+	!!x11-drivers/xf86-input-virtualbox"
+DEPEND="${RDEPEND}
+	>=dev-util/kbuild-0.1.9998_pre20131130
+	>=dev-lang/yasm-0.6.2
+	sys-devel/bin86
+	sys-libs/pam
+	sys-power/iasl
+	X? ( x11-proto/renderproto )
+	!X? ( x11-proto/xproto )"
+PDEPEND="X? ( ~x11-drivers/xf86-video-virtualbox-${PV} )"
+
+BUILD_TARGETS="all"
+BUILD_TARGET_ARCH="${ARCH}"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	MODULE_NAMES="vboxguest(misc:${WORKDIR}/vboxguest:${WORKDIR}/vboxguest)
+		vboxsf(misc:${WORKDIR}/vboxsf:${WORKDIR}/vboxsf)"
+	use X && MODULE_NAMES+=" vboxvideo(misc:${WORKDIR}/vboxvideo::${WORKDIR}/vboxvideo)"
+
+	linux-mod_pkg_setup
+	BUILD_PARAMS="KERN_DIR=${KV_OUT_DIR} KERNOUT=${KV_OUT_DIR}"
+	enewgroup vboxguest
+	enewuser vboxguest -1 /bin/sh /dev/null vboxguest
+	# automount Error: VBoxServiceAutoMountWorker: Group "vboxsf" does not exist
+	enewgroup vboxsf
+}
+
+src_unpack() {
+	unpack ${A}
+
+	# Create and unpack a tarball with the sources of the Linux guest
+	# kernel modules, to include all the needed files
+	"${S}"/src/VBox/Additions/linux/export_modules "${WORKDIR}/vbox-kmod.tar.gz"
+	unpack ./vbox-kmod.tar.gz
+
+	# Remove shipped binaries (kBuild,yasm), see bug #232775
+	cd "${S}"
+	rm -rf kBuild/bin tools
+}
+
+src_prepare() {
+	# PaX fixes (see bug #298988)
+	pushd "${WORKDIR}" &>/dev/null || die
+	eapply "${FILESDIR}"/vboxguest-4.1.0-log-use-c99.patch
+	popd &>/dev/null || die
+
+	# Disable things unused or splitted into separate ebuilds
+	cp "${FILESDIR}/${PN}-5-localconfig" LocalConfig.kmk || die
+	use X || echo "VBOX_WITH_X11_ADDITIONS :=" >> LocalConfig.kmk
+
+	# stupid new header references...
+	for vboxheader in {product,revision,version}-generated.h ; do
+		for mdir in vbox{guest,sf} ; do
+			ln -sf "${S}"/out/linux.${ARCH}/release/${vboxheader} \
+				"${WORKDIR}/${mdir}/${vboxheader}"
+		done
+	done
+
+	# Remove pointless GCC version limitations in check_gcc()
+	sed -e "/\s*-o\s*\\\(\s*\$cc_maj\s*-eq\s*[5-9]\s*-a\s*\$cc_min\s*-gt\s*[0-5]\s*\\\)\s*\\\/d" \
+		-i configure || die
+
+	eapply_user
+}
+
+src_configure() {
+	# build the user-space tools, warnings are harmless
+	local cmd=(
+		./configure
+		--nofatal
+		--disable-xpcom
+		--disable-sdl-ttf
+		--disable-pulse
+		--disable-alsa
+		--with-gcc="$(tc-getCC)"
+		--with-g++="$(tc-getCXX)"
+		--target-arch=${ARCH}
+		--with-linux="${KV_OUT_DIR}"
+		--build-headless
+	)
+	echo "${cmd[@]}"
+	"${cmd[@]}" || die "configure failed"
+	source ./env.sh
+	export VBOX_GCC_OPT="${CFLAGS} ${CPPFLAGS}"
+}
+
+src_compile() {
+	MAKE="kmk" \
+	emake TOOL_YASM_AS=yasm \
+	VBOX_ONLY_ADDITIONS=1 \
+	KBUILD_VERBOSE=2
+
+	# Now creating the kernel modules. We must do this _after_
+	# we compiled the user-space tools as we need two of the
+	# automatically generated header files. (>=3.2.0)
+	linux-mod_src_compile
+}
+
+src_install() {
+	linux-mod_src_install
+
+	cd "${S}"/out/linux.${ARCH}/release/bin/additions || die
+
+	insinto /sbin
+	newins mount.vboxsf mount.vboxsf
+	fperms 4755 /sbin/mount.vboxsf
+
+	newinitd "${FILESDIR}"/${PN}-8.initd ${PN}
+
+	insinto /usr/sbin/
+	newins VBoxService vboxguest-service
+	fperms 0755 /usr/sbin/vboxguest-service
+
+	insinto /usr/bin
+	doins VBoxControl
+	fperms 0755 /usr/bin/VBoxControl
+
+	# VBoxClient user service and xrandr wrapper
+	if use X ; then
+		doins VBoxClient
+		fperms 0755 /usr/bin/VBoxClient
+
+		pushd "${S}"/src/VBox/Additions/x11/Installer &>/dev/null \
+			|| die
+		newins 98vboxadd-xclient VBoxClient-all
+		fperms 0755 /usr/bin/VBoxClient-all
+		popd &>/dev/null || die
+	fi
+
+	# udev rule for vboxdrv
+	local udev_rules_dir="/lib/udev/rules.d"
+	dodir ${udev_rules_dir}
+	echo 'KERNEL=="vboxguest", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
+		>> "${D}/${udev_rules_dir}/60-virtualbox-guest-additions.rules" \
+		|| die
+	echo 'KERNEL=="vboxuser", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
+		>> "${D}/${udev_rules_dir}/60-virtualbox-guest-additions.rules" \
+		|| die
+
+	# VBoxClient autostart file
+	insinto /etc/xdg/autostart
+	doins "${FILESDIR}"/vboxclient.desktop
+
+	# sample xorg.conf
+	insinto /usr/share/doc/${PF}
+	doins "${FILESDIR}"/xorg.conf.vbox
+
+	systemd_dounit "${FILESDIR}/${PN}.service"
+}
+
+pkg_postinst() {
+	linux-mod_pkg_postinst
+	if ! use X ; then
+		elog "use flag X is off, enable it to install the"
+		elog "X Window System video driver."
+	fi
+	elog ""
+	elog "Please add users to the \"vboxguest\" group so they can"
+	elog "benefit from seamless mode, auto-resize and clipboard."
+	elog ""
+	elog "The vboxsf group has been added to make automount services work."
+	elog "These services are part of the shared folders support."
+	elog ""
+	elog "Please add:"
+	elog "/etc/init.d/${PN}"
+	elog "to the default runlevel in order to start"
+	elog "needed services."
+	elog "To use the VirtualBox X driver, use the following"
+	elog "file as your /etc/X11/xorg.conf:"
+	elog "    /usr/share/doc/${PF}/xorg.conf.vbox"
+	elog ""
+	elog "Also make sure you use the Mesa library for OpenGL:"
+	elog "    eselect opengl set xorg-x11"
+	elog ""
+	elog "An autostart .desktop file has been installed to start"
+	elog "VBoxClient in desktop sessions."
+	elog ""
+	elog "You can mount shared folders with:"
+	elog "    mount -t vboxsf <shared_folder_name> <mount_point>"
+	elog ""
+	elog "Warning:"
+	elog "this ebuild is only needed if you are running gentoo"
+	elog "inside a VirtualBox Virtual Machine, you don't need"
+	elog "it to run VirtualBox itself."
+	elog ""
+}
--- a/app-emulation/virtualbox-modules/Manifest
+++ b/app-emulation/virtualbox-modules/Manifest
@ -1,4 +1,5 @@
 DIST vbox-kernel-module-src-5.0.16.tar.xz 593944 SHA256 8905e174069a6caf0200808fda6726704a947ab56fc48c3b6ebbf8831dde4123 SHA512 5311f6cfd917c04bcb51182ad414c0930fb85a73a90d81156f08640cdb4e4d442ed46a10b62b5d07ed81aa1ad65430d5186e95cc64293502c9b84937a6470bb4 WHIRLPOOL daf741cd8465ce65ae0e3f304b7c49d55be828da5fc285ac3a2b8e6fc7e68865b184b738a79fa7fbf1e106d647200a40224902ef7041e4dd5ab2c9ef054e4199
 DIST vbox-kernel-module-src-5.0.32.tar.xz 600916 SHA256 30fdc07a999b7ef7e401d425e6663c7da31df477ef810b69405b0752c36bfbd9 SHA512 22c7ade7c8d4b3883bd09893fdb2016d54394d54a1ce0b442caae0b63fecead2b817e22290cb14ea1089b259f31d0f39ceb991e97c9a6b93067819b7eb5e7436 WHIRLPOOL 1a512ecb033f5803a41009e5decc6b420ac50d01f3619d011d8a3fc21975dfbb05d680221ade03b810435f54228b87a82f2f770dfb9ac93f519bb54f2cce1f1c
-DIST vbox-kernel-module-src-5.1.14.tar.xz 613508 SHA256 7409f0cdb4de7358aa5c1265bb6cc71802d37a28ac0156daa3c4c8c9c6d49551 SHA512 fad7c4d12a2afc1c112ee620fe748ecb0bacdcbf6db9d3c1375ac35f610dc017c8b0a62221b8401935ea7b266b2126191bf1c3fe96613b0a0bf779341df5d147 WHIRLPOOL c0ea8f4ab1b73cd04c20a095875beec4cd3b43630c0c3b17e884f59ed0ee7d12e3d6c102419d954b9f0dd27bc6e5fd1f0bcbf14aa605d0ebfc70eb5b703c03d8
+DIST vbox-kernel-module-src-5.0.36.tar.xz 601068 SHA256 3f74d7eb1bb6316c643e994fef141ad46e4ce5c3653863a19080d02b1a699732 SHA512 72f41a63693d56ff26e47557700b3ccf038a58aa2251fa1fa5d1c46448e526635a9546e6d052e0449975c738c945cd120e6832b9ac74426a959f6ff81b2addc0 WHIRLPOOL 420d847af604f26f39be978a4e11af7aa307c0b0a1b88b0e08f603f4539c5f3794c314fefde5655a2ef5f249a56745bb00ac6db9d1fcaf40c6c8f961ebbd20f7
 DIST vbox-kernel-module-src-5.1.16.tar.xz 613860 SHA256 c8074df935a880ae8c1d34e7123692ccaac8b8391cb7fa873141c6869ce57698 SHA512 59f04d3edec6d25e1d7a1e8607a5ff18cea0d667416d0022b85befce4a426a5e581c86ef89343285bbe5124ff92615648b141cf379d98cb8d4fdc842a9cf54a3 WHIRLPOOL 60d3501f09b34d28e3e5073b366a395e1888b7342a4c96ae537e15f435d081e0ce9419ad7c0d6b24cc183bd81d4c3ac9f21f311bdcfa6d3b28f7bd95c8849869
+DIST vbox-kernel-module-src-5.1.18.tar.xz 613824 SHA256 363bae7950e3360c470696a59b1eb1e4d7cc06ec5cc8253eb6ef45a7e3deacf9 SHA512 7ca722830925ba6aa56a1b6f60bee6a9bb594a18ca006e49e206dd66fd6b81a5efa4e5503b8b8d0bc24e6072ee0724f09ba776c9aa6b56da922877440f5c13bc WHIRLPOOL c69787e5d5df705e830e7126dd1ff27e240de05316941c9787f029657d279757a0ff3842a8b834d9cbccd960a11e07d920543cb0ed976530414b0d8b42bc3e1b
--- a/app-emulation/virtualbox-modules/virtualbox-modules-5.0.36.ebuild
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-5.0.36.ebuild
--- a/app-emulation/virtualbox-modules/virtualbox-modules-5.1.18.ebuild
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-5.1.18.ebuild
@ -0,0 +1,64 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# XXX: the tarball here is just the kernel modules split out of the binary
+#      package that comes from virtualbox-bin
+
+EAPI=6
+
+inherit eutils linux-mod user
+
+MY_P=vbox-kernel-module-src-${PV}
+DESCRIPTION="Kernel Modules for Virtualbox"
+HOMEPAGE="http://www.virtualbox.org/"
+SRC_URI="https://dev.gentoo.org/~polynomial-c/virtualbox/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="pax_kernel"
+
+RDEPEND="!=app-emulation/virtualbox-9999"
+
+S=${WORKDIR}
+
+BUILD_TARGETS="all"
+BUILD_TARGET_ARCH="${ARCH}"
+MODULE_NAMES="vboxdrv(misc:${S}) vboxnetflt(misc:${S}) vboxnetadp(misc:${S}) vboxpci(misc:${S})"
+
+pkg_setup() {
+	enewgroup vboxusers
+
+	CONFIG_CHECK="!TRIM_UNUSED_KSYMS"
+	ERROR_TRIM_UNUSED_KSYMS="The kernel option CONFIG_TRIM_UNUSED_KSYMS removed kernel symbols that are needed by ${PN} to load correctly."
+
+	linux-mod_pkg_setup
+
+	BUILD_PARAMS="KERN_DIR=${KV_DIR} O=${KV_OUT_DIR} V=1 KBUILD_VERBOSE=1"
+}
+
+src_prepare() {
+	if kernel_is -ge 2 6 33 ; then
+		# evil patch for new kernels - header moved
+		grep -lR linux/autoconf.h *  | xargs sed -i -e 's:<linux/autoconf.h>:<generated/autoconf.h>:'
+	fi
+
+	if use pax_kernel && kernel_is -ge 3 0 0 ; then
+		epatch "${FILESDIR}"/${PN}-4.1.4-pax-const.patch
+	fi
+
+	default
+}
+
+src_install() {
+	linux-mod_src_install
+	insinto /usr/lib/modules-load.d/
+	doins "${FILESDIR}"/virtualbox.conf
+}
+
+pkg_postinst() {
+	linux-mod_pkg_postinst
+	elog "If you are using sys-apps/openrc, please add \"vboxdrv\", \"vboxnetflt\","
+	elog "\"vboxnetadp\" and \"vboxpci\" to:"
+	elog "  /etc/conf.d/modules"
+}
--- a/app-emulation/virtualbox/Manifest
+++ b/app-emulation/virtualbox/Manifest
@ -1,7 +1,9 @@
 DIST VirtualBox-5.0.16.tar.bz2 111062984 SHA256 f5a44d33a1db911f445b2eb2d22d9293a96a535cba488b5a235577ef868fa63c SHA512 3da3a227360fb50d299e99770378f65e8cb99525377343fa8faff2360be66643d46f68323d6a8b8d4d26182082f171bb35ab2497167bf6df18827a5ea7742074 WHIRLPOOL ea709057c588f28820790c2b193decba9ee0c57e0f82aa4361ca87aef661315182e18b5ee29558e47ed92f6037eb91befa5390680661a7b9f2248c7819b4a85c
 DIST VirtualBox-5.0.32.tar.bz2 111684963 SHA256 4a48d4a8b6ca68353bd39f2c9d2896e1659818959f858e8326ef649481d15550 SHA512 77e479e43a08bd9656792cc8e58bbb4e57e1290803bc100a00b9595f2dfdf580607c9a1d38f72aebf638cf6ba3f63bef79913301c8b2a135b5cfcf35a44707e4 WHIRLPOOL 1b03a9368259e1704981dcd64f773f8097d03c582e8c18a012c55463d5bbb15b2521e83f51fe3cf4fe30822db26726c9ff145d711cb97ae2287368068338a9a4
-DIST VirtualBox-5.1.14.tar.bz2 115042132 SHA256 8267bb026717c6e55237eb798210767d9c703cfcdf01224d9bc26f7dac9f228a SHA512 ab0646c587fa1b573a9332ca0f1959660adc02f2ecf63ac808f4a7e3ceb9b2c58adab8e309aec4630ff7fa447f47d7487e7e8d0a1f718a42d39ce71e96067fae WHIRLPOOL 915b3ac0d50def86e92b662c7fe32e1390c9dab73efb9fc9595465c45818b86b4380be93a7075d17e33f9b70d92dbbbf6063ce0dad6448c9a592648a10f2409b
+DIST VirtualBox-5.0.36.tar.bz2 112998831 SHA256 3b5a9b12bbeb01af10c03d505261aaff15bf88681afd5b7cadb5d58682746812 SHA512 db6d23b4196a4ae3c5860bcc331094ca35c849fe98b132a5a6b0721e58548cd72ba3dfb7bb9ccc2a3beee9997cb333aa4c66c1c850556c5ecc6eec38f43ee409 WHIRLPOOL 3853a658731a85f8b2b206b617b7bd37d86ace15447f07fd0598a96aa266783b121b91f8f84dd3d6463edc0cd45504d2de901149802ff658b86ba0abb850ce26
 DIST VirtualBox-5.1.16.tar.bz2 115670028 SHA256 78071c3172f3bd3c7981c352c3ae6c6a9c01f6ab24bc0aa7ec79f3528b2291a7 SHA512 322903af8ec6f5f56fa4d4181caf435b4aba5c25b824e664e06c4cabfadad595a0417fd882f7138aa36388846171228e3bf02931fb63388640b5ef5c6c4bcafc WHIRLPOOL faa06cf139225a7b44df752342b674f43296c411499132034bca1868abeac6ed89b31a506f7398f813b12e9c1cfa1f5cc1825c64d0f70ce7886c1a2efce3e0f7
+DIST VirtualBox-5.1.18.tar.bz2 115680674 SHA256 7ed0959bbbd02826b86b3d5dc8348931ddfab267c31f8ed36ee53c12f5522cd9 SHA512 0ff7cc5471203304435aaf25995719d1c782a5503da94f238cbf57b1b2b7dcd7bd81f17fd24bd77449eb75ad0e104aa8b5b389c1feddb1af9f45b1b72f35b546 WHIRLPOOL b254d4fef5b760fa0708db805ae070bfb0ba17d8ebac2fbbcade36d9e79ba8a02031199d7b8bb6b546f3a40013e5b3e756a130745e913bb921d6bbb658123669
 DIST virtualbox-5.0.16-patches-01.tar.xz 4024 SHA256 200eb980a12323a61d0fa6dbf61ed64ee1e2bb5e18e16eabdf8668d8fd8be3e4 SHA512 4eed117253754abee9088d4c320b4a6f0b3e1c8313b98f354cb727001156fe68d553a677073d40b921437f4cc073420866d1533aad4e61a79607d8360abbfd4a WHIRLPOOL ab40851873d55ae873ca8ff88670a17476c0d502116f4abda7b766064a2daa71929eb69b4b68c64c3d2d0762134fe85d07044bdedde4bf15924520a604972aaa
 DIST virtualbox-5.0.32-patches-01.tar.xz 4400 SHA256 e5bf5b5b391b3402172b5a30952da50affacaeaf40a75df0430ad623fcd8ed6f SHA512 5df0ecb4f9190375edc62d231aacd381c36a1697cc33df48b2f2d68a05ca1c855d127e466eda62030736dbcee76f5c67a519a2f42b72eacaf7ed65a8cf991e8a WHIRLPOOL 4c11787951848aadacc0772df5a46ce8d54445e0120901be280f493d4cc6333e986d0376f33ac0217dbb23758240c025028ea1d21c360fc2840c8e3003a0ff62
+DIST virtualbox-5.0.36-patches-01.tar.xz 4572 SHA256 734d90bb35c92d46aa979046c066fab5ca2a54aebc99c1a038b9acbab5820c81 SHA512 61e8a3bbabfee1fd7286a46ebc93b4acca761dc860159d2d0c4b6c104d3365dedb32496bdc8b63a1fc1ff54f4954c75447e4be6c9608a975e2f75bf884e22a59 WHIRLPOOL fdd81469b6565c30ca44c5ea5ea10b8f62aeef301af622999f355bc46fb931d952f1145e87f290d7b744371189c3738424fc85de632faeb8ab57d54e7a30a901
 DIST virtualbox-5.1.6-patches-01.tar.xz 4268 SHA256 5bfae08bc53fee06aea501e77b7998348adba43792149248d217ab03dea8c04f SHA512 2401df42ac8c2fd1f4bbc795713b185d5e65c2a36c763fa1d7274686599808aecdc28aaa6443c9efc9842f7b3eeb928818c95d1e7ad3b86239c2ace441a5e116 WHIRLPOOL 25505eaff2eeb820a09a2c8807c2d5cec48cbfe98fcd30b04daf86c4cd7c506f09c67b80d5ecc221ded08af6e48297e0161bae16862e5a1d3204b27945c511b0
--- a/app-emulation/virtualbox/virtualbox-5.0.36.ebuild
+++ b/app-emulation/virtualbox/virtualbox-5.0.36.ebuild
@ -0,0 +1,436 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+inherit eutils fdo-mime flag-o-matic java-pkg-opt-2 linux-info multilib pax-utils python-single-r1 toolchain-funcs udev
+
+MY_PV="${PV/beta/BETA}"
+MY_PV="${MY_PV/rc/RC}"
+MY_P=VirtualBox-${MY_PV}
+SRC_URI="http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2
+	https://dev.gentoo.org/~polynomial-c/${PN}/patchsets/${PN}-5.0.36-patches-01.tar.xz"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="Family of powerful x86 virtualization products for enterprise and home use"
+HOMEPAGE="http://www.virtualbox.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa debug doc headless java libressl lvm pam pulseaudio +opengl python +qt4 +sdk +udev vboxwebsrv vnc"
+
+RDEPEND="!app-emulation/virtualbox-bin
+	~app-emulation/virtualbox-modules-${PV}
+	dev-libs/libIDL
+	>=dev-libs/libxslt-1.1.19
+	net-misc/curl
+	dev-libs/libxml2
+	media-libs/libpng:0=
+	media-libs/libvpx:0=
+	sys-libs/zlib
+	!headless? (
+		media-libs/libsdl:0[X,video]
+		x11-libs/libX11
+		x11-libs/libXcursor
+		x11-libs/libXext
+		x11-libs/libXmu
+		x11-libs/libXt
+		opengl? ( virtual/opengl media-libs/freeglut )
+		qt4? (
+			dev-qt/qtgui:4
+			dev-qt/qtcore:4
+			opengl? ( dev-qt/qtopengl:4 )
+			x11-libs/libXinerama
+		)
+	)
+	java? ( >=virtual/jre-1.6:= )
+	libressl? ( dev-libs/libressl:= )
+	!libressl? ( dev-libs/openssl:0= )
+	lvm? ( sys-fs/lvm2 )
+	udev? ( >=virtual/udev-171 )
+	vnc? ( >=net-libs/libvncserver-0.9.9 )"
+DEPEND="${RDEPEND}
+	>=dev-util/kbuild-0.1.9998_pre20131130
+	>=dev-lang/yasm-0.6.2
+	sys-devel/bin86
+	sys-libs/libcap
+	sys-power/iasl
+	virtual/pkgconfig
+	alsa? ( >=media-libs/alsa-lib-1.0.13 )
+	doc? (
+		app-text/docbook-sgml-dtd:4.4
+		dev-texlive/texlive-basic
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexrecommended
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-fontsrecommended
+		dev-texlive/texlive-fontsextra
+	)
+	!headless? ( x11-libs/libXinerama )
+	java? ( >=virtual/jre-1.6:= )
+	pam? ( sys-libs/pam )
+	pulseaudio? ( media-sound/pulseaudio )
+	vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] )
+	${PYTHON_DEPS}"
+
+QA_TEXTRELS_x86="usr/lib/virtualbox-ose/VBoxGuestPropSvc.so
+	usr/lib/virtualbox/VBoxSDL.so
+	usr/lib/virtualbox/VBoxSharedFolders.so
+	usr/lib/virtualbox/VBoxDD2.so
+	usr/lib/virtualbox/VBoxOGLrenderspu.so
+	usr/lib/virtualbox/VBoxPython.so
+	usr/lib/virtualbox/VBoxDD.so
+	usr/lib/virtualbox/VBoxDDU.so
+	usr/lib/virtualbox/VBoxREM64.so
+	usr/lib/virtualbox/VBoxSharedClipboard.so
+	usr/lib/virtualbox/VBoxHeadless.so
+	usr/lib/virtualbox/VBoxRT.so
+	usr/lib/virtualbox/VBoxREM.so
+	usr/lib/virtualbox/VBoxSettings.so
+	usr/lib/virtualbox/VBoxKeyboard.so
+	usr/lib/virtualbox/VBoxSharedCrOpenGL.so
+	usr/lib/virtualbox/VBoxVMM.so
+	usr/lib/virtualbox/VirtualBox.so
+	usr/lib/virtualbox/VBoxOGLhosterrorspu.so
+	usr/lib/virtualbox/components/VBoxC.so
+	usr/lib/virtualbox/components/VBoxSVCM.so
+	usr/lib/virtualbox/components/VBoxDDU.so
+	usr/lib/virtualbox/components/VBoxRT.so
+	usr/lib/virtualbox/components/VBoxREM.so
+	usr/lib/virtualbox/components/VBoxVMM.so
+	usr/lib/virtualbox/VBoxREM32.so
+	usr/lib/virtualbox/VBoxPython2_7.so
+	usr/lib/virtualbox/VBoxXPCOMC.so
+	usr/lib/virtualbox/VBoxOGLhostcrutil.so
+	usr/lib/virtualbox/VBoxNetDHCP.so
+	usr/lib/virtualbox/VBoxNetNAT.so"
+
+REQUIRED_USE="
+	java? ( sdk )
+	python? ( sdk )
+	vboxwebsrv? ( java )
+	${PYTHON_REQUIRED_USE}
+"
+
+pkg_setup() {
+	if ! use headless && ! use qt4 ; then
+		einfo "No USE=\"qt4\" selected, this build will not include"
+		einfo "any Qt frontend."
+	elif use headless && use qt4 ; then
+		einfo "You selected USE=\"headless qt4\", defaulting to"
+		einfo "USE=\"headless\", this build will not include any X11/Qt frontend."
+	fi
+
+	if ! use opengl ; then
+		einfo "No USE=\"opengl\" selected, this build will lack"
+		einfo "the OpenGL feature."
+	fi
+	if ! use python ; then
+		einfo "You have disabled the \"python\" USE flag. This will only"
+		einfo "disable the python bindings being installed."
+	fi
+	java-pkg-opt-2_pkg_setup
+	python-single-r1_pkg_setup
+
+	tc-ld-disable-gold #bug 488176
+	tc-export CC CXX LD AR RANLIB
+	export HOST_CC="$(tc-getBUILD_CC)"
+}
+
+src_prepare() {
+	# Remove shipped binaries (kBuild,yasm), see bug #232775
+	rm -r kBuild/bin tools || die
+
+	# Remove pointless GCC version limitations in check_gcc()
+	sed -e "/\s*-o\s*\\\(\s*\$cc_maj\s*-eq\s*[5-9]\s*-a\s*\$cc_min\s*-gt\s*[0-5]\s*\\\)\s*\\\/d" \
+		-i configure || die
+
+	# Disable things unused or split into separate ebuilds
+	sed -e "s@MY_LIBDIR@$(get_libdir)@" \
+		"${FILESDIR}"/${PN}-5-localconfig > LocalConfig.kmk || die
+
+	# Respect LDFLAGS
+	sed -e "s@_LDFLAGS\.${ARCH}*.*=@& ${LDFLAGS}@g" \
+		-i Config.kmk src/libs/xpcom18a4/Config.kmk || die
+
+	# Do not use hard-coded ld (related to bug #488176)
+	sed -e '/QUIET)ld /s@ld @$(LD) @' \
+		-i src/VBox/Devices/PC/ipxe/Makefile.kmk || die
+
+	# Use PAM only when pam USE flag is enbaled (bug #376531)
+	if ! use pam ; then
+		elog "Disabling PAM removes the possibility to use the VRDP features."
+		sed -i 's@^.*VBOX_WITH_PAM@#VBOX_WITH_PAM@' Config.kmk || die
+		sed -i 's@\(.*/auth/Makefile.kmk.*\)@#\1@' \
+			src/VBox/HostServices/Makefile.kmk || die
+	fi
+
+	# add correct java path
+	if use java ; then
+		sed "s@/usr/lib/jvm/java-6-sun@$(java-config -O)@" \
+			-i "${S}"/Config.kmk || die
+		java-pkg-opt-2_src_prepare
+	fi
+
+	if ! gcc-specs-pie ; then
+		rm "${WORKDIR}/patches/050_${PN}-5.0.2-nopie.patch" || die
+	fi
+
+	eapply "${WORKDIR}/patches"
+
+	eapply_user
+}
+
+src_configure() {
+	local myconf
+	use alsa       || myconf+=( --disable-alsa )
+	use debug      && myconf+=( --build-debug )
+	use doc        || myconf+=( --disable-docs )
+	use java       || myconf+=( --disable-java )
+	use lvm        || myconf+=( --disable-devmapper )
+	use opengl     || myconf+=( --disable-opengl )
+	use pulseaudio || myconf+=( --disable-pulse )
+	use python     || myconf+=( --disable-python )
+	use vboxwebsrv && myconf+=( --enable-webservice )
+	use vnc        && myconf+=( --enable-vnc )
+	if ! use headless ; then
+		use qt4 || myconf+=( --disable-qt4 )
+	else
+		myconf+=( --build-headless --disable-opengl )
+	fi
+	if use amd64 && ! has_multilib_profile ; then
+		myconf+=( --disable-vmmraw )
+	fi
+	# not an autoconf script
+	./configure \
+		--with-gcc="$(tc-getCC)" \
+		--with-g++="$(tc-getCXX)" \
+		--disable-dbus \
+		--disable-kmods \
+		${myconf[@]} \
+		|| die "configure failed"
+}
+
+src_compile() {
+	source ./env.sh || die
+
+	MAKEJOBS=$(echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+')
+	MAKELOAD=$(echo ${MAKEOPTS} | egrep -o '(\-l|\-\-load-average)(=?|[[:space:]]*)[[:digit:]]+') #'
+	MAKEOPTS="${MAKEJOBS} ${MAKELOAD}"
+	MAKE="kmk" emake \
+		VBOX_BUILD_PUBLISHER=_Gentoo \
+		TOOL_GCC3_CC="$(tc-getCC)" TOOL_GCC3_CXX="$(tc-getCXX)" \
+		TOOL_GCC3_AS="$(tc-getCC)" TOOL_GCC3_AR="$(tc-getAR)" \
+		TOOL_GCC3_LD="$(tc-getCXX)" TOOL_GCC3_LD_SYSMOD="$(tc-getLD)" \
+		TOOL_GCC3_CFLAGS="${CFLAGS}" TOOL_GCC3_CXXFLAGS="${CXXFLAGS}" \
+		VBOX_GCC_OPT="${CXXFLAGS}" \
+		TOOL_YASM_AS=yasm KBUILD_VERBOSE=2 \
+		all
+}
+
+src_install() {
+	local binpath="release"
+	use debug && binpath="debug"
+	cd "${S}"/out/linux.${ARCH}/${binpath}/bin || die
+
+	local vbox_inst_path="/usr/$(get_libdir)/${PN}" each fwfile
+
+	vbox_inst() {
+		local binary="${1}"
+		local perms="${2:-0750}"
+		local path="${3:-${vbox_inst_path}}"
+
+		[[ -n "${binary}" ]] || die "vbox_inst: No binray given!"
+		[[ ${perms} =~ ^[[:digit:]]+{4}$ ]] || die "vbox_inst: perms must consist of four digits."
+
+		insinto ${path}
+		doins ${binary}
+		fowners root:vboxusers ${path}/${binary}
+		fperms ${perms} ${path}/${binary}
+	}
+
+	# Create configuration files
+	insinto /etc/vbox
+	newins "${FILESDIR}/${PN}-4-config" vbox.cfg
+
+	# Set the right libdir
+	sed -i \
+		-e "s@MY_LIBDIR@$(get_libdir)@" \
+		"${D}"/etc/vbox/vbox.cfg || die "vbox.cfg sed failed"
+
+	# Install the wrapper script
+	exeinto ${vbox_inst_path}
+	newexe "${FILESDIR}/${PN}-ose-5-wrapper" "VBox"
+	fowners root:vboxusers ${vbox_inst_path}/VBox
+	fperms 0750 ${vbox_inst_path}/VBox
+
+	# Install binaries and libraries
+	insinto ${vbox_inst_path}
+	doins -r components
+
+	# *.rc files for x86_64 are only available on multilib systems
+	local rcfiles="*.rc"
+	if use amd64 && ! has_multilib_profile ; then
+		rcfiles=""
+	fi
+	for each in VBox{ExtPackHelperApp,Manage,SVC,Tunctl,XPCOMIPCD} *so *r0 ${rcfiles} ; do
+		vbox_inst ${each}
+	done
+
+	# These binaries need to be suid root in any case.
+	for each in VBox{Headless,Net{AdpCtl,DHCP,NAT}} ; do
+		vbox_inst ${each} 4750
+	done
+
+	# Install EFI Firmware files (bug #320757)
+	pushd "${S}"/src/VBox/Devices/EFI/FirmwareBin &>/dev/null || die
+	for fwfile in VBoxEFI{32,64}.fd ; do
+		vbox_inst ${fwfile} 0644
+	done
+	popd &>/dev/null || die
+
+	# VBoxSVC and VBoxManage need to be pax-marked (bug #403453)
+	# VBoxXPCOMIPCD (bug #524202)
+	for each in VBox{Headless,Manage,SVC,XPCOMIPCD} ; do
+		pax-mark -m "${D}"${vbox_inst_path}/${each}
+	done
+
+	# Symlink binaries to the shipped wrapper
+	for each in vbox{headless,manage} VBox{Headless,Manage,VRDP} ; do
+		dosym ${vbox_inst_path}/VBox /usr/bin/${each}
+	done
+	dosym ${vbox_inst_path}/VBoxTunctl /usr/bin/VBoxTunctl
+
+	# VRDPAuth only works with this (bug #351949)
+	dosym VBoxAuth.so ${vbox_inst_path}/VRDPAuth.so
+
+	# set an env-variable for 3rd party tools
+	echo -n "VBOX_APP_HOME=${vbox_inst_path}" > "${T}/90virtualbox"
+	doenvd "${T}/90virtualbox"
+
+	if ! use headless ; then
+		vbox_inst VBoxSDL 4750
+		pax-mark -m "${D}"${vbox_inst_path}/VBoxSDL
+
+		for each in vboxsdl VBoxSDL ; do
+			dosym ${vbox_inst_path}/VBox /usr/bin/${each}
+		done
+
+		if use opengl && use qt4 ; then
+			vbox_inst VBoxTestOGL
+			pax-mark -m "${D}"${vbox_inst_path}/VBoxTestOGL
+		fi
+
+		if use qt4 ; then
+			vbox_inst VirtualBox 4750
+			pax-mark -m "${D}"${vbox_inst_path}/VirtualBox
+
+			for each in virtualbox VirtualBox ; do
+				dosym ${vbox_inst_path}/VBox /usr/bin/${each}
+			done
+
+			insinto /usr/share/${PN}
+			doins -r nls
+
+			newmenu "${FILESDIR}"/${PN}-ose.desktop-2 ${PN}.desktop
+		fi
+
+		pushd "${S}"/src/VBox/Artwork/OSE &>/dev/null || die
+		for size in 16 32 48 64 128 ; do
+			newicon -s ${size} ${PN}-${size}px.png ${PN}.png
+		done
+		newicon ${PN}-48px.png ${PN}.png
+		doicon -s scalable ${PN}.svg
+		popd &>/dev/null || die
+	fi
+
+	if use lvm ; then
+		vbox_inst VBoxVolInfo 4750
+		dosym ${vbox_inst_path}/VBoxVolInfo /usr/bin/VBoxVolInfo
+	fi
+
+	if use sdk ; then
+		insinto ${vbox_inst_path}
+		doins -r sdk
+
+		if use java ; then
+			java-pkg_regjar "${D}${vbox_inst_path}/sdk/bindings/xpcom/java/vboxjxpcom.jar"
+			java-pkg_regso "${D}${vbox_inst_path}/libvboxjxpcom.so"
+		fi
+	fi
+
+	if use udev ; then
+		# New way of handling USB device nodes for VBox (bug #356215)
+		local udevdir="$(get_udevdir)"
+		insinto ${udevdir}
+		doins VBoxCreateUSBNode.sh
+		fowners root:vboxusers ${udevdir}/VBoxCreateUSBNode.sh
+		fperms 0750 ${udevdir}/VBoxCreateUSBNode.sh
+		insinto ${udevdir}/rules.d
+		sed "s@%UDEVDIR%@${udevdir}@" "${FILESDIR}"/10-virtualbox.rules \
+			> "${T}"/10-virtualbox.rules || die
+		doins "${T}"/10-virtualbox.rules
+	fi
+
+	if use vboxwebsrv ; then
+		vbox_inst vboxwebsrv
+		dosym ${vbox_inst_path}/VBox /usr/bin/vboxwebsrv
+		newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv
+		newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
+	fi
+
+	if use doc ; then
+		dodoc UserManual.pdf
+	fi
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+
+	if use udev ; then
+		udevadm control --reload-rules \
+			&& udevadm trigger --subsystem-match=usb
+	fi
+
+	if ! use headless && use qt4 ; then
+		elog "To launch VirtualBox just type: \"virtualbox\"."
+	fi
+	elog "You must be in the vboxusers group to use VirtualBox."
+	elog ""
+	elog "The latest user manual is available for download at:"
+	elog "http://download.virtualbox.org/virtualbox/${PV}/UserManual.pdf"
+	elog ""
+	elog "For advanced networking setups you should emerge:"
+	elog "net-misc/bridge-utils and sys-apps/usermode-utilities"
+	elog ""
+	elog "IMPORTANT!"
+	elog "If you upgrade from app-emulation/virtualbox-ose make sure to run"
+	elog "\"env-update\" as root and logout and relogin as the user you wish"
+	elog "to run ${PN} as."
+	elog ""
+	elog "Starting with version 4.0.0, ${PN} has USB-1 support."
+	elog "For USB-2 support, PXE-boot ability and VRDP support please emerge"
+	elog "  app-emulation/virtualbox-extpack-oracle"
+	elog "package."
+	elog "Starting with version 5.0.0, ${PN} no longer has the \"additions\" and"
+	elog "the \"extension\" USE flag. For installation of the guest additions ISO"
+	elog "image, please emerge"
+	elog "  app-emulation/virtualbox-additions"
+	elog "and for the USB2, USB3, VRDP and PXE boot ROM modules, please emerge"
+	elog "  app-emulation/virtualbox-extpack-oracle"
+	if ! use udev ; then
+		elog ""
+		elog "WARNING!"
+		elog "Without USE=udev, USB devices will likely not work in ${PN}."
+	elif [ -e "${ROOT}/etc/udev/rules.d/10-virtualbox.rules" ] ; then
+		elog ""
+		elog "Please remove \"${ROOT}/etc/udev/rules.d/10-virtualbox.rules\""
+		elog "or else USB in ${PN} won't work."
+	fi
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}
--- a/app-emulation/virtualbox/virtualbox-5.1.18.ebuild
+++ b/app-emulation/virtualbox/virtualbox-5.1.18.ebuild
--- a/app-laptop/laptop-mode-tools/Manifest
+++ b/app-laptop/laptop-mode-tools/Manifest
@ -1,3 +1 @@
-DIST laptop-mode-tools_1.66.tar.gz 111175 SHA256 0e8488d6112fa7edfa7e4b1084b16f8c7c6726d935029e4afd7d7034caed5f62 SHA512 8649f70ab63ca0a1e5edf5c4c69062b01dce97b34ef6686a2c044f177aaac59008d4275b237e2c97a2541b6b824c0513d32323c156a43684264ba6d2c5fc8b6c WHIRLPOOL 4fc981f00c4afd74da74e192beb292c5d39e2a3bcc23d77e5daf37c71b75acb4df81c70a68586c0704b47fbe08dce69b1921d0d151777b5451b8d6302bac5b0f
-DIST laptop-mode-tools_1.69.2.tar.gz 115082 SHA256 2db1225cc8b6fb214f221362b9fabfffb1cbd25556d00bef3d3a6db9f3b19a59 SHA512 cc1e2ef7c2dd963f542b2e745fc8f3f046199d848a3c2bc44509fb2f08dc5dfa05ce1f9d70b5c678e6c088ed55ce7875eadf4ac806f006806c5bb1b229f980e5 WHIRLPOOL a563fee8497c390060c8820b5b5efa9c58c2222175fb9075f55344888627b2f054ed8aee3e1ecf415f84f19ab4c9f6c21bf20ea4880b8827949f9c05baccf945
 DIST laptop-mode-tools_1.70.tar.gz 116624 SHA256 12cde7dbec8c35201efab96187be75ec84e0a2424494852413f21be1b7bc6a11 SHA512 755e2d94b63bb2a6e5362365f11181374c5fe159b508076f5def91c4df93983fa3e2553bbd94ae0b5bb4690aa7fb0881eafe3f4dcc7c8e77a8b72de23f6a21c5 WHIRLPOOL a70b0e3353877ffedd87ed3f72f1239addd34e8fecfd0e54b98c328a1f4a48a87a2f278fa4afa227452eb5f874bd58912a1ddf8ae2f385636c6bb3a552ce7b3a
--- a/app-laptop/laptop-mode-tools/laptop-mode-tools-1.66.ebuild
+++ b/app-laptop/laptop-mode-tools/laptop-mode-tools-1.66.ebuild
@ -1,92 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils multilib systemd udev
-
-MY_P=${PN}_${PV}
-
-DESCRIPTION="Linux kernel laptop_mode user-space utilities"
-HOMEPAGE="http://www.samwel.tk/laptop_mode/"
-SRC_URI="http://www.samwel.tk/laptop_mode/tools/downloads/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="+acpi apm bluetooth scsi"
-
-RDEPEND="net-wireless/wireless-tools
-	sys-apps/iproute2
-	sys-apps/ethtool
-	sys-apps/hdparm
-	sys-apps/which
-	acpi? ( sys-power/acpid )
-	apm? ( sys-apps/apmd )
-	bluetooth? ( net-wireless/bluez:= )
-	scsi? ( sys-apps/sdparm )"
-DEPEND=""
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	# This should avoid conflict with pm-powersave wrt #327443 and #396703
-	cat <<-EOF > "${T}"/${PN}
-	HOOK_BLACKLIST="00powersave"
-	EOF
-}
-
-src_compile() { :; }
-
-src_install() {
-	DESTDIR="${D}" \
-		INIT_D="none" \
-		MAN_D="/usr/share/man" \
-		LIB_D="/usr/$(get_libdir)" \
-		UDEV_D="$(get_udevdir)" \
-		SYSTEMD_UNIT_D="$(systemd_get_unitdir)" \
-		TMPFILES_D="/usr/lib/tmpfiles.d" \
-		ACPI="$(use acpi && echo force || echo disabled)" \
-		PMU="$(false && echo force || echo disabled)" \
-		APM="$(use apm && echo force || echo disabled)" \
-		SYSTEMD=yes \
-		sh ./install.sh || die
-
-	dodoc Documentation/*.txt README.md
-	newinitd "${FILESDIR}"/laptop_mode.init-1.4 laptop_mode
-
-	# See src_prepare()
-	insinto /etc/pm/config.d
-	doins "${T}"/${PN}
-}
-
-pkg_postinst() {
-	if use acpi || use apm; then
-		if use acpi; then
-			daemon_name="acpid"
-		elif use apm; then
-			deamon_name="apmd"
-		fi
-		if [ "$(rc-config list default | grep laptop_mode)" = "" ] || [ "$(rc-config list default | grep ${daemon_name} )" = "" ]; then
-			ewarn "To enable automatic power state event handling,"
-			ewarn "e.g. enabling laptop_mode after unplugging the battery,"
-			ewarn "both laptop_mode and the ${daemon_name} daemon must be"
-			ewarn "added to default runlevel:"
-			if [ "$(rc-config list default | grep laptop_mode)" = "" ]; then
-				ewarn "# rc-update add laptop_mode default"
-			fi
-			if [ "$(rc-config list default | grep ${daemon_name} )" = "" ]; then
-				ewarn "# rc-update add ${daemon_name} default"
-			fi
-		fi
-	else
-		ewarn "Without USE=\"acpi\" or USE=\"apm\" ${PN} can not"
-		ewarn "automatically disable laptop_mode on low battery."
-		ewarn
-		ewarn "This means you can lose up to 10 minutes of work if running"
-		ewarn "out of battery while laptop_mode is enabled."
-		ewarn
-		ewarn "Please see laptop-mode.txt in /usr/share/doc/${PF} for further"
-		ewarn "information."
-		ewarn
-	fi
-}
--- a/app-laptop/laptop-mode-tools/laptop-mode-tools-1.69.2.ebuild
+++ b/app-laptop/laptop-mode-tools/laptop-mode-tools-1.69.2.ebuild
@ -1,92 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils multilib systemd udev
-
-MY_P=${PN}_${PV}
-
-DESCRIPTION="Linux kernel laptop_mode user-space utilities"
-HOMEPAGE="https://github.com/rickysarraf/laptop-mode-tools/wiki"
-SRC_URI="https://github.com/rickysarraf/${PN}/releases/download/${PV}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="+acpi apm bluetooth scsi"
-
-RDEPEND="net-wireless/wireless-tools
-	sys-apps/iproute2
-	sys-apps/ethtool
-	sys-apps/hdparm
-	sys-apps/which
-	acpi? ( sys-power/acpid )
-	apm? ( sys-apps/apmd )
-	bluetooth? ( net-wireless/bluez:= )
-	scsi? ( sys-apps/sdparm )"
-DEPEND=""
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	# This should avoid conflict with pm-powersave wrt #327443 and #396703
-	cat <<-EOF > "${T}"/${PN}
-	HOOK_BLACKLIST="00powersave"
-	EOF
-}
-
-src_compile() { :; }
-
-src_install() {
-	DESTDIR="${D}" \
-		INIT_D="none" \
-		MAN_D="/usr/share/man" \
-		LIB_D="/usr/$(get_libdir)" \
-		UDEV_D="$(get_udevdir)" \
-		SYSTEMD_UNIT_D="$(systemd_get_unitdir)" \
-		TMPFILES_D="/usr/lib/tmpfiles.d" \
-		ACPI="$(use acpi && echo force || echo disabled)" \
-		PMU="$(false && echo force || echo disabled)" \
-		APM="$(use apm && echo force || echo disabled)" \
-		SYSTEMD=yes \
-		sh ./install.sh || die
-
-	dodoc Documentation/*.txt README.md
-	newinitd "${FILESDIR}"/laptop_mode.init-1.4 laptop_mode
-
-	# See src_prepare()
-	insinto /etc/pm/config.d
-	doins "${T}"/${PN}
-}
-
-pkg_postinst() {
-	if use acpi || use apm; then
-		if use acpi; then
-			daemon_name="acpid"
-		elif use apm; then
-			deamon_name="apmd"
-		fi
-		if [ "$(rc-config list default | grep laptop_mode)" = "" ] || [ "$(rc-config list default | grep ${daemon_name} )" = "" ]; then
-			ewarn "To enable automatic power state event handling,"
-			ewarn "e.g. enabling laptop_mode after unplugging the battery,"
-			ewarn "both laptop_mode and the ${daemon_name} daemon must be"
-			ewarn "added to default runlevel:"
-			if [ "$(rc-config list default | grep laptop_mode)" = "" ]; then
-				ewarn "# rc-update add laptop_mode default"
-			fi
-			if [ "$(rc-config list default | grep ${daemon_name} )" = "" ]; then
-				ewarn "# rc-update add ${daemon_name} default"
-			fi
-		fi
-	else
-		ewarn "Without USE=\"acpi\" or USE=\"apm\" ${PN} can not"
-		ewarn "automatically disable laptop_mode on low battery."
-		ewarn
-		ewarn "This means you can lose up to 10 minutes of work if running"
-		ewarn "out of battery while laptop_mode is enabled."
-		ewarn
-		ewarn "Please see laptop-mode.txt in /usr/share/doc/${PF} for further"
-		ewarn "information."
-		ewarn
-	fi
-}
--- a/app-laptop/laptop-mode-tools/laptop-mode-tools-1.70.ebuild
+++ b/app-laptop/laptop-mode-tools/laptop-mode-tools-1.70.ebuild
@ -13,7 +13,7 @@ SRC_URI="https://github.com/rickysarraf/${PN}/releases/download/${PV}/${MY_P}.ta

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="+acpi apm bluetooth scsi"

 RDEPEND="net-wireless/wireless-tools
--- a/app-leechcraft/lcpackgen/Manifest
+++ b/app-leechcraft/lcpackgen/Manifest
@ -1 +1,2 @@
+DIST lcpackgen-1.3.1.tar.gz 8209 SHA256 7bdebf4d138d484156e7accec88f64b2eb08223d8eb4948c625c54b4a9c0705c SHA512 1c1b04583d103d2e0e07ecf030df0653d26a7f6f31616e1308649882cd175c2854d989fb3d681bb9d6d4d60277fc14c687d4ad809893f31d4437f60fad4d26aa WHIRLPOOL c58342f74e48ab1da40766f61206f46fac27f7652071d9a6081afdad08cb8b75d64d02c6118530ffe51b95d093dd0238000e6f0ed61139689b130ca7b01bd09a
 DIST lcpackgen-1.3.tar.gz 8273 SHA256 0d569a892f4f533bcccf7c2b89849fd539c9847da5543f00ea5560b92be45893 SHA512 fd7b0eab958082ca421d87a8a15626d07ff2a65e54f7804fa227267e71310d958c3cf7954db897b7f737076249018a5e861bde371742fd3764252ee0bb876df5 WHIRLPOOL c0255fd0b0e51ebf1e6082cb7a2425c8990c5524a6bcbfa971715e768fe0d3c74811d00b03d58c0daccc24448d7900806534ac39a9d7c3bc8abab8fb4b5cbd9f
--- a/app-leechcraft/lcpackgen/lcpackgen-1.3.1.ebuild
+++ b/app-leechcraft/lcpackgen/lcpackgen-1.3.1.ebuild
@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="Package creator for app-leechcraft/lc-lackman package manager"
+HOMEPAGE="https://leechcraft.org/"
+SRC_URI="https://github.com/0xd34df00d/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Boost-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	dev-libs/boost
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtxml:5
+	dev-qt/qtxmlpatterns:5"
+RDEPEND="${DEPEND}
+	dev-qt/qtsvg:5"
+
+CMAKE_USE_DIR="${S}"/src
--- a/app-misc/chkcrontab/Manifest
+++ b/app-misc/chkcrontab/Manifest
@ -1 +1,2 @@
 DIST chkcrontab-1.6.tar.gz 24701 SHA256 be7436d5ece4ad6390365f6edf0f1dc59dfd655a9de3b4699884343ceb150f2e SHA512 249061ecf7c8dc2d2275dcda3048fd00fc2ca85d39dabb2de61a3ab415243bbd1a61222be8c0ddfa66eb36577bb2efb27ba4a0c2a013559dee126c95cc73bd1b WHIRLPOOL 13995293e761930d0d900c3e7fa5b7695fad3416ade96fc34be415a448ca5e5969f5b82889d46041ed801ca2f13e5154a01698d753898ee9027bd9a2c8e6e29f
+DIST chkcrontab-1.7.tar.gz 25088 SHA256 1725172dbdea26f1aef915b9acd7100605e49f8675761900bc0992a227d767b9 SHA512 5236b1996a8d4f5d3861bf3d8a1bafafa271237965721ea4ff61e6712ee4546b9d0484483a0dac25f9d920904f899f2930b46df16d656083b422d95a1d6de0c0 WHIRLPOOL bf89b4a126e3244e2b02ec594e57cc50df802be75427148c326d132e1fcbd3df5346301093860d664ca221cc85e78c65768c2a43108f09de11a7c1fdad8a46fc
--- a/app-misc/chkcrontab/chkcrontab-1.7.ebuild
+++ b/app-misc/chkcrontab/chkcrontab-1.7.ebuild
@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="A tool to detect crontab errors"
+HOMEPAGE="https://github.com/lyda/chkcrontab"
+SRC_URI="https://github.com/lyda/chkcrontab/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+python_test() {
+	esetup.py test || die
+}
+
+python_install_all() {
+	doman doc/${PN}.1
+	distutils-r1_python_install_all
+}
--- a/app-misc/chkcrontab/metadata.xml
+++ b/app-misc/chkcrontab/metadata.xml
@ -1,16 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>hydrapolic@gmail.com</email>
-		<name>Tomas Mozes</name>
-		<description>Proxy maintainer</description>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">lyda/chkcrontab</remote-id>
-	</upstream>
+  <maintainer type="person">
+    <email>hydrapolic@gmail.com</email>
+    <name>Tomáš Mózes</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">lyda/chkcrontab</remote-id>
+  </upstream>
 </pkgmetadata>
--- a/app-misc/elasticsearch/Manifest
+++ b/app-misc/elasticsearch/Manifest
@ -1,2 +1,3 @@
 DIST elasticsearch-2.4.4.tar.gz 27343272 SHA256 981092e6ca65ba5560b8b97a74e5ed0eb2236e9128efdb85bb652cec340158e2 SHA512 899a4d2fc64548bcd488ece223f5f189dfb191eceb36390c4b9d8d0d90ef9d2cb67ada475223b9b2e0bd0fb521a4ab978bc7f60781195927e36d027925338c14 WHIRLPOOL 1a90bb8c923a9eab6cc4390b3daaa44cd85d5c1a3a1a5ef7d274050eb25b061a11a91b0f57ebe9f3cb27aafee3267af8f63ca87837f79d622ff362fbc5b6ae1a
 DIST elasticsearch-5.1.2.tar.gz 33299777 SHA256 74d752f9a8b46898d306ad169b72f328e17215c0909149e156a576089ef11c42 SHA512 1867626e8a87f11ed109e1325fd1d16c9e0af06ebe6a30c78ea679ab533ab377f5da8ea55af6871be33af226f02187a2aadd77e5e23c097dd24055be21e9d691 WHIRLPOOL 2e9df71c915343e2cc8ad82c59b877f41f5e093cbeba21f471c32cb51a195eccc6223bc48da48bb4af2e6bea9f2539f2e93b866963148f4ca2940ba4466e614e
+DIST elasticsearch-5.2.2.tar.gz 33799732 SHA256 cf88930695794a8949342d386f028548bd10b26ecc8c4b422a94ea674faf8ac9 SHA512 670f8aa81a34191a13cc8c608a9dc7bec60c63bbed8fdb9bc0619585d644867576a7677eb0f14b4e4d064e59def186d4b431930bf79b54bcbf59a29b0b327e85 WHIRLPOOL 4ec1f3b5ed15b9f22d27512ea784ffe9e32e00808fec89418860955d2f4759d045775e18c0a61693da47f39de9f235de954eada231fbd6de5fbfd17f552e8452
--- a/app-misc/elasticsearch/elasticsearch-5.2.2.ebuild
+++ b/app-misc/elasticsearch/elasticsearch-5.2.2.ebuild
@ -0,0 +1,70 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils systemd user
+
+DESCRIPTION="Open Source, Distributed, RESTful, Search Engine"
+HOMEPAGE="https://www.elastic.co/products/elasticsearch"
+SRC_URI="https://artifacts.elastic.co/downloads/${PN}/${P}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RESTRICT="strip"
+
+RDEPEND="virtual/jre:1.8"
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 /bin/bash /usr/share/${PN} ${PN}
+}
+
+src_prepare() {
+	rm -rf bin/*.{bat,exe} || die
+	rm LICENSE.txt || die
+
+	default
+}
+
+src_install() {
+	keepdir /etc/${PN}
+	keepdir /etc/${PN}/scripts
+
+	insinto /etc/${PN}
+	doins config/*
+	rm -rf config || die
+
+	insinto /usr/share/${PN}
+	doins -r ./*
+
+	exeinto /usr/share/${PN}/bin
+	doexe "${FILESDIR}/elasticsearch-systemd-pre-exec"
+
+	chmod +x "${D}"/usr/share/${PN}/bin/* || die
+
+	keepdir /var/{lib,log}/${PN}
+	keepdir /usr/share/${PN}/plugins
+
+	systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles.d" "${PN}.conf"
+
+	insinto /etc/sysctl.d
+	newins "${FILESDIR}/${PN}.sysctl.d" "${PN}.conf"
+
+	newinitd "${FILESDIR}/${PN}.init8" "${PN}"
+	newconfd "${FILESDIR}/${PN}.conf3" "${PN}"
+	systemd_newunit "${FILESDIR}"/${PN}.service6 "${PN}.service"
+}
+
+pkg_postinst() {
+	elog
+	elog "You may create multiple instances of ${PN} by"
+	elog "symlinking the init script:"
+	elog "ln -sf /etc/init.d/${PN} /etc/init.d/${PN}.instance"
+	elog
+	elog "Please make sure you put elasticsearch.yml, log4j2.properties and scripts"
+	elog "from /etc/elasticsearch into the configuration directory of the instance:"
+	elog "/etc/${PN}/instance"
+	elog
+}
--- a/app-misc/elasticsearch/files/elasticsearch.init8
+++ b/app-misc/elasticsearch/files/elasticsearch.init8
@ -0,0 +1,95 @@
+#!/sbin/openrc-run
+
+name="Elasticsearch"
+description="Elasticsearch Server"
+
+ES_INSTANCE=${SVCNAME#*.}
+PID_DIR=${PID_DIR:="/run/elasticsearch"}
+
+if [ -n "${ES_INSTANCE}" ] && [ ${SVCNAME} != "elasticsearch" ]; then
+	PIDFILE="${PID_DIR}/elasticsearch.${ES_INSTANCE}.pid"
+	ES_BASE_PATH="/var/lib/elasticsearch/${ES_INSTANCE}"
+	CONF_DIR="/etc/elasticsearch/${ES_INSTANCE}"
+	LOG_DIR="/var/log/elasticsearch/${ES_INSTANCE}"
+else
+	PIDFILE="${PID_DIR}/elasticsearch.pid"
+	ES_BASE_PATH="/var/lib/elasticsearch/_default"
+	CONF_DIR="/etc/elasticsearch"
+	LOG_DIR="/var/log/elasticsearch/_default"
+fi
+
+ES_HOME=${ES_HOME:="/usr/share/elasticsearch"}
+ES_USER=${ES_USER:="elasticsearch"}
+ES_GROUP=${ES_GROUP:="elasticsearch"}
+ES_STARTUP_SLEEP_TIME=${ES_STARTUP_TIME:=5}
+MAX_OPEN_FILES=${MAX_OPEN_FILES:=65536}
+MAX_MAP_COUNT=${MAX_MAP_COUNT:=262144}
+
+DATA_DIR=${DATA_DIR:="${ES_BASE_PATH}/data"}
+
+if [ -f "${CONF_DIR}/elasticsearch.in.sh" ]; then
+    ES_INCLUDE="${CONF_DIR}/elasticsearch.in.sh"
+fi
+
+export ES_INCLUDE
+export JAVA_HOME
+export JAVA_OPTS
+export ES_JVM_OPTIONS
+export ES_JAVA_OPTS
+export ES_STARTUP_SLEEP_TIME
+
+server_command="/usr/share/elasticsearch/bin/elasticsearch"
+server_args="-d -p ${PIDFILE} -Edefault.path.logs=${LOG_DIR} -Edefault.path.data=${DATA_DIR} -Edefault.path.conf=${CONF_DIR}"
+
+depend() {
+	use net
+}
+
+start() {
+	local conf
+	local conf_file
+	for conf in elasticsearch.yml; do
+		conf_file="${CONF_DIR}/${conf}"
+		if [ ! -f "${conf_file}" ]; then
+			eerror "${conf_file} must be copied into place"
+			return 1
+		fi
+	done
+
+	if [ -n "${MAX_MAP_COUNT}" -a -f /proc/sys/vm/max_map_count ]; then
+		sysctl -q -w vm.max_map_count=${MAX_MAP_COUNT}
+	fi
+
+	ebegin "Starting ${SVCNAME}"
+
+	if [ -n "${MAX_LOCKED_MEMORY}" ]; then
+		ulimit -l "${MAX_LOCKED_MEMORY}"
+	fi
+
+	if [ -n "${MAX_OPEN_FILES}" ]; then
+		ulimit -n "${MAX_OPEN_FILES}"
+	fi
+
+	checkpath -d -o "${ES_USER}:${ES_GROUP}" -m750 "/var/lib/elasticsearch"
+	checkpath -d -o "${ES_USER}:${ES_GROUP}" -m750 "/var/log/elasticsearch"
+	checkpath -d -o "${ES_USER}:${ES_GROUP}" -m750 "${PID_DIR}"
+	checkpath -d -o "${ES_USER}:${ES_GROUP}" -m750 "${ES_BASE_PATH}"
+	checkpath -d -o "${ES_USER}:${ES_GROUP}" -m750 "${LOG_DIR}"
+
+	start-stop-daemon --start \
+		--background \
+		--chdir "${ES_HOME}" \
+		--user="${ES_USER}" \
+		--pidfile="${PIDFILE}" \
+		--exec ${server_command} -- ${server_args}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping ${SVCNAME}"
+	start-stop-daemon --stop \
+		--pidfile=${PIDFILE} \
+		--user="${ES_USER}" \
+		--retry=TERM/20
+	eend $?
+}
--- a/app-misc/mc/mc-4.8.18-r1.ebuild
+++ b/app-misc/mc/mc-4.8.18-r1.ebuild
@ -13,7 +13,7 @@ SRC_URI="http://ftp.midnight-commander.org/${MY_P}.tar.xz"

 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
 IUSE="+edit gpm mclib nls samba sftp +slang spell test X +xdg"

 REQUIRED_USE="spell? ( edit )"
--- a/app-misc/neofetch/neofetch-3.0.1.ebuild
+++ b/app-misc/neofetch/neofetch-3.0.1.ebuild
@ -1,6 +1,5 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$

 EAPI=6

--- a/app-portage/gentoolkit/gentoolkit-0.3.3.ebuild
+++ b/app-portage/gentoolkit/gentoolkit-0.3.3.ebuild
@ -16,7 +16,7 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE=""

-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~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 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~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"

 DEPEND="sys-apps/portage[${PYTHON_USEDEP}]"
 RDEPEND="${DEPEND}
--- a/app-text/iso-codes/Manifest
+++ b/app-text/iso-codes/Manifest
@ -1,2 +1 @@
-DIST iso-codes-3.70.tar.xz 3452288 SHA256 41e2fbaec2ed57e767b94f175d0dcd31b627aeb23b75cd604605a6fb6109d61f SHA512 59238008b320a739afd1cdf689f2c163d233e3fadfe9ab038bdad2502e866185867edab9f46fd078a6d46f4431267e614d0dd3b597ba17fdda95004bbaf5dd4a WHIRLPOOL e9a5dab29699386be3c3a2b16e925aa4741c260a782b2fbb88ef180682feb9f05dc6f0b88920a00c299f671677de0f5d19e61a88c9b0299c7e566a732125ab79
 DIST iso-codes-3.74.tar.xz 3455148 SHA256 21f4f3cea8fe09f5b53784522303a0e1e7d083964ecaf1c75b1441d4d9ec6aee SHA512 b4d583a6aee331c2cdf7cdd68a0ef5e7c3b291c4afa9a9a636e9fe2aef54e784cec070f5b8fafb31e8c84b278e1a9b08d7f925187882f7382378b66778e0d9cb WHIRLPOOL 0e83c3c7fcc3f21b1b5aacd003c65550dc896cb3bb4eff0fc8a5719870a7ce4ce3fe2da8ea6e3a5ab47512d3137a1b331c2880999534d82c34b5bbf1a91d3663
--- a/app-text/iso-codes/iso-codes-3.70.ebuild
+++ b/app-text/iso-codes/iso-codes-3.70.ebuild
@ -1,78 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{4,5} )
-PLOCALES="af am ar as ast az be bg bn bn_IN br bs byn ca crh cs cy da de dz el en eo es et eu fa fi fo fr ga gez gl gu haw he hi hr hu hy ia id is it ja ka kk km kn ko kok ku lt lv mi mk ml mn mr ms mt nb ne nl nn nso oc or pa pl ps pt pt_BR ro ru rw si sk sl so sq sr sr@latin sv sw ta te th ti tig tk tl tr tt tt@iqtelif ug uk ve vi wa wal wo xh zh_CN zh_HK zh_TW zu"
-
-inherit eutils l10n python-any-r1
-
-DESCRIPTION="ISO language, territory, currency, script codes and their translations"
-HOMEPAGE="http://pkg-isocodes.alioth.debian.org/"
-SRC_URI="http://pkg-isocodes.alioth.debian.org/downloads/${P}.tar.xz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${PYTHON_DEPS}
-	app-arch/xz-utils
-	sys-devel/gettext
-"
-
-# This ebuild does not install any binaries.
-RESTRICT="binchecks strip"
-
-# l10n_find_plocales_changes doesn't support multiple directories,
-# so need to do the update scan ourselves.
-check_existing_locales() {
-	local std loc all_locales=()
-
-	ebegin "Looking for new locales"
-	for std in "${all_stds[@]}"; do
-		pushd "${std}" >/dev/null || die
-		for loc in *.po; do
-			all_locales+=( "${loc%.po}" )
-		done
-		popd >/dev/null
-	done
-
-	all_locales=$(echo $(printf '%s\n' "${all_locales[@]}" | LC_COLLATE=C sort -u))
-	if [[ ${PLOCALES} != "${all_locales}" ]]; then
-		eend 1
-		eerror "There are changes in locales! This ebuild should be updated to:"
-		eerror "PLOCALES=\"${all_locales}\""
-		die "Update PLOCALES in the ebuild"
-	else
-		eend 0
-	fi
-}
-
-src_prepare() {
-	default
-
-	local std loc mylinguas
-	local all_stds=( iso_15924 iso_3166-{1,2,3} iso_4217 iso_639-{2,3,5} )
-
-	check_existing_locales
-
-	# Modify the Makefiles so they only install requested locales.
-	for std in "${all_stds[@]}"; do
-		einfo "Preparing ${std} ..."
-		pushd "${std}" >/dev/null || die
-		mylinguas=()
-		for loc in *.po; do
-			if use "linguas_${loc%.po}"; then
-				mylinguas+=( "${loc}" )
-			fi
-		done
-
-		sed \
-			-e "/^pofiles =/s:=.*:= ${mylinguas[*]}:" \
-			-e "/^mofiles =/s:=.*:= ${mylinguas[*]/%.po/.mo}:" \
-			-i Makefile.am Makefile.in || die "sed in ${std} folder failed"
-		popd >/dev/null
-	done
-}
--- a/app-text/iso-codes/iso-codes-3.74.ebuild
+++ b/app-text/iso-codes/iso-codes-3.74.ebuild
@ -13,7 +13,7 @@ SRC_URI="http://pkg-isocodes.alioth.debian.org/downloads/${P}.tar.xz"

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

 RDEPEND=""
--- a/app-text/libwps/Manifest
+++ b/app-text/libwps/Manifest
@ -1,2 +1,3 @@
 DIST libwps-0.4.4.tar.xz 574768 SHA256 b7c564bba7bc9058c524eaf94cb43448832aa03e3d763b98e11ee12d25082df4 SHA512 201b4a7d6788e4193aeff694e25bbda78678126b654907f4d20783afa343a069d7f6c12344b261496434df4fd1f3df933881a5ed5358f330cd15568c8710963d WHIRLPOOL de32feb8721771a5058b283b5dd6a59e005db1e53a8539c5e1268540cf3e9f5d0353babafcb42e82aade103dd1efc0834f0a80d7b3e995a8d5464ffbc0f538b7
 DIST libwps-0.4.5.tar.xz 588948 SHA256 8e175ab9339d447a285a1533bfdc405432b9a275e4f3a98690ffaf12fe7f4d4a SHA512 bed70efbd51bc18891e901810eba72e3b21050cde6ac170589cc0e55fb8cbef44de4be7b7ec657895715efaa30fb0ad1b6032cf507ca969d31cc03cc96973a94 WHIRLPOOL 91948ede9976c9d62865c76a93bc8779b14d9438dd5d64fd8f8d6fd98abe9bb748d19e0509c88b7f6d47770d5ce62c1e8ccb9a2281963166b4e93f465079a78c
+DIST libwps-0.4.6.tar.xz 592276 SHA256 e48a7c2fd20048a0a8eaf69bad972575f8b9f06e7497c787463f127d332fccd0 SHA512 00d1d9108f405cb5eeb67985057f0c6a5d9dd8ef9c3daeebb6739e10a38a5db7cbf22a9e4d09684452376896009993ba08cb015ec0616b56c222244d87a3241e WHIRLPOOL 31198a1889148c87357c0411cd7c28c75de69048ed9c589e98c8a9f866a18295a6d572308966bc1173f207499616bcd1e87eb48bbbec5193fef36228a23ca5c5
--- a/app-text/libwps/libwps-0.4.6.ebuild
+++ b/app-text/libwps/libwps-0.4.6.ebuild
@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Microsoft Works file word processor format import filter library"
+HOMEPAGE="https://sourceforge.net/p/libwps/wiki/Home/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
+
+LICENSE="|| ( LGPL-2.1 MPL-2.0 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~x86"
+IUSE="doc debug static-libs tools"
+
+RDEPEND="
+	dev-libs/librevenge
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+
+src_configure() {
+	econf \
+		--disable-werror \
+		--with-sharedptr=c++11 \
+		$(use_enable debug) \
+		$(use_with doc docs) \
+		$(use_enable static-libs static) \
+		$(use_enable tools)
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
--- a/app-text/rarian/rarian-0.8.1-r2.ebuild
+++ b/app-text/rarian/rarian-0.8.1-r2.ebuild
@ -1,50 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils libtool
-
-DESCRIPTION="A documentation metadata library"
-HOMEPAGE="https://rarian.freedesktop.org/"
-SRC_URI="https://${PN}.freedesktop.org/Releases/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="static-libs"
-
-RDEPEND="dev-libs/libxslt
-	|| ( sys-apps/util-linux app-misc/getopt )"
-DEPEND="${RDEPEND}
-	!<app-text/scrollkeeper-9999"
-
-DOCS=( ChangeLog NEWS README )
-
-src_prepare() {
-	# Fix uri of omf files produced by rarian-sk-preinstall, see bug #302900
-	epatch "${FILESDIR}/${P}-fix-old-doc.patch"
-
-	# remove unneeded line, bug #240564
-	sed "s/ (foreign dist-bzip2 dist-gzip)//" -i configure || die "sed failed"
-
-	# bug #409811, https://bugs.freedesktop.org/show_bug.cgi?id=53264
-	# sed to avoid autoreconf
-	if ! has_version sys-apps/util-linux; then
-		sed -e 's/getopt -/getopt-long -/' \
-			-i util/rarian-sk-update.in || die "sed 2 failed"
-	fi
-
-	elibtoolize ${ELTCONF}
-}
-
-src_configure() {
-	econf \
-		--localstatedir="${EPREFIX}"/var \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -exec rm -f {} +
-}
--- a/app-text/rarian/rarian-0.8.1-r3.ebuild
+++ b/app-text/rarian/rarian-0.8.1-r3.ebuild
@ -12,7 +12,7 @@ SRC_URI="https://${PN}.freedesktop.org/Releases/${P}.tar.gz

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

 RDEPEND="
--- a/dev-cpp/commoncpp2/commoncpp2-1.8.1-r3.ebuild
+++ b/dev-cpp/commoncpp2/commoncpp2-1.8.1-r3.ebuild
@ -10,7 +10,7 @@ SRC_URI="mirror://gnu/commoncpp/${P}.tar.gz"
 HOMEPAGE="https://www.gnu.org/software/commoncpp/"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 ~x86"
 IUSE="debug doc examples ipv6 gnutls ssl static-libs"

 RDEPEND="
--- a/dev-cpp/libxmlpp/Manifest
+++ b/dev-cpp/libxmlpp/Manifest
@ -1,3 +1,2 @@
 DIST libxml++-2.40.1.tar.xz 955220 SHA256 4ad4abdd3258874f61c2e2a41d08e9930677976d303653cd1670d3e9f35463e9 SHA512 a4ec2e8182d981c57bdcb8f0a203a3161f8c735ceb59fd212408b7a539d1dc826adf6717bed8f4d544ab08afd9c2fc861efe518e24bbd3a1c4b158e2ca48183a WHIRLPOOL f1888bc6f90dd10dea04f617f317a2eed79f2c4981e03b1fbdb3cefcc4bfeadc256c5dd6163d82b7b33cb29d8d15de98de822d2d40f3fa8e8851efe827cdff72
-DIST libxml++-3.0.0.tar.xz 934588 SHA256 2ff3640417729d357bada2e3049061642e0b078c323a8e0d37ae68df96547952 SHA512 5474006bd0e473b999f0d27e31e06d6509ce009f479d74c0114cde96858706318ba7367e0652a91b3a567c00b73e53dee4f951beb81dfb3ba42412fb21eec1de WHIRLPOOL bd6a1c905b7bae4ad15be7b3f23d0aed28262c9c5b1fff744b27fc1c01a9ff3a2f8ca66dca54ad2e607aeab688d24de57ae90c39990a3a9e29839ae79182d1c2
 DIST libxml++-3.0.1.tar.xz 948796 SHA256 19dc8d21751806c015179bc0b83f978e65c878724501bfc0b6c1bcead29971a6 SHA512 9b8ccea9df11d70bb23d7d9983b18d28c648aa0107f9654a79d1cfe97db4633b69dd4b97b76d155aca8553d014a314247851f18d0371717e44a056ee804ccd95 WHIRLPOOL 289641871fecd74f46f76d731b839796130b52d16c3ad16930be850987c84e9d152e3d5d99674d2053cbab19e17a0006b93c42213e32119b29bd7a95df0349eb
--- a/dev-cpp/libxmlpp/libxmlpp-3.0.0.ebuild
+++ b/dev-cpp/libxmlpp/libxmlpp-3.0.0.ebuild
@ -1,36 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME_ORG_MODULE="${PN/pp/++}"
-
-inherit gnome2 multilib-minimal
-
-DESCRIPTION="C++ wrapper for the libxml2 XML parser library"
-HOMEPAGE="http://libxmlplusplus.sourceforge.net/"
-
-LICENSE="LGPL-2.1"
-SLOT="3.0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="doc"
-
-RDEPEND="
-	>=dev-libs/libxml2-2.7.7[${MULTILIB_USEDEP}]
-	>=dev-cpp/glibmm-2.32[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
-"
-
-multilib_src_prepare() {
-	gnome2_src_prepare
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" gnome2_src_configure \
-		$(use_enable doc documentation)
-}
-
-multilib_src_install() {
-	gnome2_src_install
-}
--- a/dev-cpp/libxmlpp/libxmlpp-3.0.1.ebuild
+++ b/dev-cpp/libxmlpp/libxmlpp-3.0.1.ebuild
@ -11,7 +11,7 @@ HOMEPAGE="http://libxmlplusplus.sourceforge.net/"

 LICENSE="LGPL-2.1"
 SLOT="3.0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="doc"

 RDEPEND="
--- a/dev-db/mariadb/mariadb-10.0.30.ebuild
+++ b/dev-db/mariadb/mariadb-10.0.30.ebuild
@ -19,7 +19,7 @@ RESTRICT="!bindist? ( bindist )"
 REQUIRED_USE="server? ( tokudb? ( jemalloc ) ) static? ( !pam ) jdbc? ( extraengine server !static )"

 # REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"

 MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}"
 PATCHES=(
--- a/dev-db/mysqltuner/Manifest
+++ b/dev-db/mysqltuner/Manifest
@ -1,2 +1,3 @@
 DIST mysqltuner-1.2.0.tar.gz 24562 SHA256 54b743808f7f1d882cc912ffbb62dae57303e3e17f45aefd55a16825c016bc9d SHA512 b38277c31c1a870525f20bc1c023fe9675403834313a65c99c445a5fa1048c7aa3dc8ed5a9a9255c4844bdb001b28ee45be807306d0f1739c170d8ee9e0ab53f WHIRLPOOL 5290f77df91bcb23cc2bbb5097a08df54bc4e32560732ff078005bdd9acdf74a8f76647b893ab600dee4d848a70d6a6923e9806b30fb9504c6d3f5d31067be75
 DIST mysqltuner-1.6.0.tar.gz 53424 SHA256 dc3045b9ffae7837d187d2b1ef4c42648bf7ffc6bb9f69864a4bfeecd5205e37 SHA512 904022ef64eaf75f3294a9a5123dc5e00482d95378722df63140bc6859ec245c32d9b06d19955790a5e29b9335e6da3df2cebdeb4659cb9058561866f6ec69c2 WHIRLPOOL fa1cde57da2eb67ca6524aea6cae58864128ab7beebb9dab779ba6f44b7a38fb1a2b5a6a729f0b0c73e78e8bd61d3519ea0990885e992e00091b178d110cec3a
+DIST mysqltuner-1.6.18.tar.gz 169074 SHA256 ae2b2668198fb78a7685fc4a372bafcef0a91b1dca15d065dae73eeb74bcd6cb SHA512 8067b7ac4a4fe7398ee2cdc463a30042f46972f97680b49912dca46fd1d835989aa4115568dbe5473ff28c4d956bf0ad70537318db788dd56bc93ad220e6bcb6 WHIRLPOOL 0ffe6459f157cc4e7e015dde806f0e5086c546f14c53855b04f61edba3e2e8b4b98a57212d10d48722bb2277041561729b14ec870383df56bd32587fb6275c4b
--- a/dev-db/mysqltuner/metadata.xml
+++ b/dev-db/mysqltuner/metadata.xml
@ -3,6 +3,7 @@
 <pkgmetadata>
  <!-- maintainer-needed -->
  <upstream>
-    <remote-id type="github">rackerhacker/MySQLTuner-perl</remote-id>
+    <remote-id type="github">major/MySQLTuner-perl</remote-id>
+    <bugs-to>https://github.com/major/MySQLTuner-perl/issues</bugs-to>
  </upstream>
 </pkgmetadata>
--- a/dev-db/mysqltuner/mysqltuner-1.6.18.ebuild
+++ b/dev-db/mysqltuner/mysqltuner-1.6.18.ebuild
@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN=MySQLTuner-perl
+
+DESCRIPTION="MySQLTuner is a high-performance MySQL tuning script"
+HOMEPAGE="http://www.mysqltuner.com/"
+SRC_URI="https://github.com/major/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="dev-lang/perl
+	virtual/perl-Getopt-Long
+	virtual/mysql"
+
+DOCS=( USAGE.md CONTRIBUTING.md INTERNALS.md basic_passwords.txt vulnerabilities.csv )
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_install() {
+	newbin "${PN}.pl" "${PN}"
+
+	# The passwords and vulnerabilities are meant to be fed to the script uncompressed
+	docompress -x "/usr/share/doc/${PF}/basic_passwords.txt" "/usr/share/doc/${PF}/vulnerabilities.csv"
+	einstalldocs
+}
--- a/dev-java/cssparser/Manifest
+++ b/dev-java/cssparser/Manifest
@ -1,2 +1,3 @@
 DIST cssparser-0.9.20.jar 241231 SHA256 1a486e005d1e13a76e8ec03b887fe624419016ff67f2b627caf15bf4178a69ae SHA512 e65ade843b5ebb899850b86602756a8abb8b4a86922193483701dbd4b4a3a6d9eb937f8e5565ff3d46886727d4ccbfccd744dd9262584175cbf22d32cbd6e97d WHIRLPOOL 50d412ca506c86b131cce19556d0bb7ab23996a09b2471ec98a7fb7f372d3997f0387270460e1ac4904634b4f5e34ff5e0ebd1c553b50468781658bad0e284d8
 DIST cssparser-0.9.21.jar 245708 SHA256 63b18f55fb96d87319c83a8ecfaf952515543a6dcec8d5780824c3b481be932f SHA512 ae3f098cadfb802c5f809919e0802a0ac90d5e1c1466d04db1c505724cea0d0513c440de173a47e5251e73e1551d754c3550bec02421b4318332d471a23d29d2 WHIRLPOOL d01a2668f3e66f56f8bcba1a326dd374bbfb5161e276b73ea397620b0d0c6dc1af1d9b8c226eae3b27be5bd53019da7c588bf30ade2bfc3b305aa8c147fbbc12
+DIST cssparser-0.9.22.jar 245363 SHA256 8c926b9c336fc338ae4bf944bc9187251b8a2fd261d65a617669bc0482551590 SHA512 33dd8906d967bdafeefb6cea9d03fc746cf350102e8e53360284638cdc3d55f254c616d2d3ab5d1849fd92e6924c9751ebff72942f0855b6fdd4ab309a509485 WHIRLPOOL 003255e004c5fc52ee071c63d27ca1f3a4f7235c440c5da712e42cb8ba18ec97b529fcdc21069b46a9447d07996b380151585523eb3011a02c45a7e49106419b
--- a/dev-java/cssparser/cssparser-0.9.22.ebuild
+++ b/dev-java/cssparser/cssparser-0.9.22.ebuild
@ -0,0 +1,26 @@
+# 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="API for parsing CSS 2 in Java"
+HOMEPAGE="http://cssparser.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}-sources.jar -> ${P}.jar"
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+CDEPEND="dev-java/sac:0"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.6"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+JAVA_GENTOO_CLASSPATH="sac"
--- a/dev-lang/gnat-gpl/gnat-gpl-2016.ebuild
+++ b/dev-lang/gnat-gpl/gnat-gpl-2016.ebuild
@ -57,10 +57,14 @@ GCC_A_FAKEIT="${P}-src.tar.gz

 pkg_setup() {
 	GCC=${ADA:-$(tc-getCC)}
-	local path=$(dirname ${GCC})
 	local base=$(basename ${GCC})
-	GNATMAKE="${path}/${base/gcc/gnatmake}"
-	GNATBIND="${path}/${base/gcc/gnatbind}"
+	GNATMAKE="${base/gcc/gnatmake}"
+	GNATBIND="${base/gcc/gnatbind}"
+	if [[ ${base} != ${GCC} ]] ; then
+		local path=$(dirname ${GCC})
+		GNATMAKE="${path}/${GNATMAKE}"
+		GNATBIND="${path}/${GNATBIND}"
+	fi
 	if [[ -z "$(type ${GNATMAKE} 2>/dev/null)" ]] ; then
 		eerror "You need a gcc compiler that provides the Ada Compiler:"
 		eerror "1) use gcc-config to select the right compiler or"
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@ -1,4 +1,5 @@
 DIST php-5.6.30.tar.xz 12449696 SHA256 a363185c786432f75e3c7ff956b49c3369c3f6906a6b10459f8d1ddc22f70805 SHA512 fdf503925c236a79cc09bc9e5c06ce5afa7497ccf20ab486389b818a7d84db1b84ac119523b35586f64fff7d198b6c20164910fbf33254b35ec2f41015d9feef WHIRLPOOL d3217dfd3de0a2b2f178f1b869d2e0fa39128c4518deaf20f6f79d81a938f3730bf4cfb1cc19ddd55797a9e43a2ebad76555ae08004cefbf2430fc6916c49bd3
 DIST php-7.0.15.tar.xz 12575116 SHA256 300364d57fc4a6176ff7d52d390ee870ab6e30df121026649f8e7e0b9657fe93 SHA512 1d233edb908f44fb895184dbfdfd5684d52e4c831dc3e8184b3e645137e6f44bdc7abd16ceaf2249b9288cf1f1893b7dcca955c6e1c3a6b4afbe03cec2a85033 WHIRLPOOL 4ac7bf2521eb242204fcd9e231a53d06879b16e47928c6cdf9e04c2f16b25b880b16378c0d9425b3c1a183127dce062f3905eb3dd0a6cd196f3decb9304e2b7a
 DIST php-7.0.16.tar.xz 12587920 SHA256 244ac39bc657448962860aa7a590e4417f68513ad5e86ee2727b1328b0537309 SHA512 7925971a4a01f00110bd9fd80d805adc9cdb0021e639e4d84a9f5d76d7d7aa02d79ed54292fa0947f47cc99854181e203f7ecf6f25d60b804e0bc447b169134f WHIRLPOOL 0e5ab58097cd0e42b54af358b77c9694c22fcffd2b243230e94e3fafbf1d264567871e207c2a87249302ab11a2ae0efe3435a4d1d3fa8877c0a3e067c7dcb101
+DIST php-7.0.17.tar.xz 12588452 SHA256 471c16fcdd6a5e1a37199e97bcaeea6117626229785185be7532aaa7c6ee04be SHA512 9d8072a958046a554f242be1fa6f857b4d9605e383fc21078181249a37c24a1ea0ec70de808ac3e174b51e7ecd1e12bdc49da37a357610813388e5328c8c8816 WHIRLPOOL 323d934456a66af9f10f19d19299e66ff742e044e6b8a8ae1d0c2247559a42650dcc16d0462e3d2e0507823dcef75db45cb7942db281bfebbe509bca504de59d
 DIST php-7.1.2.tar.xz 12780720 SHA256 d815a0c39fd57bab1434a77ff0610fb507c22f790c66cd6f26e27030c4b3e971 SHA512 d1cc387e8817ecbdf5ec80dc01ab0363d1f71347b1ea71f335210df2760dc419e0dc4087c7f45d2f2e9874b555bd7813c36a0d75f5c8e6f2a322693b134087a3 WHIRLPOOL 6e5e43c5050242737c4446d4b93aac3b3142a19c2dcb3e846c18db8bd6f74c98b9bc077c8aa7a7f82fb47ee98ed43be39a8219c1b2714d36a4367ee54d517e42
--- a/dev-lang/php/php-7.0.17.ebuild
+++ b/dev-lang/php/php-7.0.17.ebuild
@ -0,0 +1,746 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic versionator systemd
+
+DESCRIPTION="The PHP language runtime engine"
+HOMEPAGE="http://php.net/"
+SRC_URI="http://php.net/distributions/${P}.tar.xz"
+
+LICENSE="PHP-3.01
+	BSD
+	Zend-2.0
+	bcmath? ( LGPL-2.1+ )
+	fpm? ( BSD-2 )
+	gd? ( gd )
+	unicode? ( BSD-2 LGPL-2.1 )"
+
+SLOT="$(get_version_component_range 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+
+# We can build the following SAPIs in the given order
+SAPIS="embed cli cgi fpm apache2 phpdbg"
+
+# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
+IUSE="${IUSE}
+	${SAPIS/cli/+cli}
+	threads"
+
+IUSE="${IUSE} acl bcmath berkdb bzip2 calendar cdb cjk
+	coverage crypt +ctype curl debug
+	enchant exif +fileinfo +filter firebird
+	flatfile ftp gd gdbm gmp +hash +iconv imap inifile
+	intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl
+	mhash mssql mysql mysqli nls
+	oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
+	readline recode selinux +session sharedmem
+	+simplexml snmp soap sockets spell sqlite ssl
+	sysvipc systemd tidy +tokenizer truetype unicode wddx webp
+	+xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib"
+
+# The supported (that is, autodetected) versions of BDB are listed in
+# the ./configure script. Other versions *work*, but we need to stick to
+# the ones that can be detected to avoid a repeat of bug #564824.
+COMMON_DEPEND="
+	>=app-eselect/eselect-php-0.9.1[apache2?,fpm?]
+	>=dev-libs/libpcre-8.32[unicode]
+	acl? ( sys-apps/acl )
+	apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=]
+		<www-servers/apache-2.4[threads=] ) )
+	berkdb? ( || ( 	sys-libs/db:5.3
+					sys-libs/db:5.1
+					sys-libs/db:4.8
+					sys-libs/db:4.7
+					sys-libs/db:4.6
+					sys-libs/db:4.5 ) )
+	bzip2? ( app-arch/bzip2 )
+	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
+	cjk? ( !gd? (
+		virtual/jpeg:0
+		media-libs/libpng:0=
+		sys-libs/zlib
+	) )
+	coverage? ( dev-util/lcov )
+	crypt? ( >=dev-libs/libmcrypt-2.4 )
+	curl? ( >=net-misc/curl-7.10.5 )
+	enchant? ( app-text/enchant )
+	exif? ( !gd? (
+		virtual/jpeg:0
+		media-libs/libpng:0=
+		sys-libs/zlib
+	) )
+	firebird? ( dev-db/firebird )
+	gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
+	gdbm? ( >=sys-libs/gdbm-1.8.0 )
+	gmp? ( dev-libs/gmp:0 )
+	iconv? ( virtual/libiconv )
+	imap? ( virtual/imap-c-client[kerberos=,ssl=] )
+	intl? ( dev-libs/icu:= )
+	iodbc? ( dev-db/libiodbc )
+	kerberos? ( virtual/krb5 )
+	ldap? ( >=net-nds/openldap-1.2.11 )
+	ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 )
+	libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) )
+	mssql? ( dev-db/freetds[mssql] )
+	nls? ( sys-devel/gettext )
+	oci8-instant-client? ( dev-db/oracle-instantclient-basic )
+	odbc? ( >=dev-db/unixODBC-1.8.13 )
+	postgres? ( dev-db/postgresql:* )
+	qdbm? ( dev-db/qdbm )
+	readline? ( sys-libs/readline:0= )
+	recode? ( app-text/recode )
+	sharedmem? ( dev-libs/mm )
+	simplexml? ( >=dev-libs/libxml2-2.6.8 )
+	snmp? ( >=net-analyzer/net-snmp-5.2 )
+	soap? ( >=dev-libs/libxml2-2.6.8 )
+	spell? ( >=app-text/aspell-0.50 )
+	sqlite? ( >=dev-db/sqlite-3.7.6.3 )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0 )
+		libressl? ( dev-libs/libressl )
+	)
+	tidy? ( app-text/htmltidy )
+	truetype? (
+		=media-libs/freetype-2*
+		!gd? (
+			virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
+	)
+	unicode? ( dev-libs/oniguruma )
+	wddx? ( >=dev-libs/libxml2-2.6.8 )
+	webp? ( media-libs/libwebp )
+	xml? ( >=dev-libs/libxml2-2.6.8 )
+	xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv )
+	xmlreader? ( >=dev-libs/libxml2-2.6.8 )
+	xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
+	xpm? (
+		x11-libs/libXpm
+		virtual/jpeg:0
+		media-libs/libpng:0= sys-libs/zlib
+	)
+	xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
+	zip? ( sys-libs/zlib )
+	zlib? ( sys-libs/zlib )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	virtual/mta
+	fpm? (
+		selinux? ( sec-policy/selinux-phpfpm )
+		systemd? ( sys-apps/systemd ) )"
+
+DEPEND="${COMMON_DEPEND}
+	app-arch/xz-utils
+	>=sys-devel/bison-3.0.1
+	sys-devel/flex
+	>=sys-devel/m4-1.4.3
+	>=sys-devel/libtool-1.5.18"
+
+# Without USE=readline or libedit, the interactive "php -a" CLI will hang.
+REQUIRED_USE="
+	cli? ( ^^ ( readline libedit ) )
+	truetype? ( gd )
+	webp? ( gd )
+	cjk? ( gd )
+	exif? ( gd )
+	xpm? ( gd )
+	gd? ( zlib )
+	simplexml? ( xml )
+	soap? ( xml )
+	wddx? ( xml )
+	xmlrpc? ( || ( xml iconv ) )
+	xmlreader? ( xml )
+	xslt? ( xml )
+	ldap-sasl? ( ldap )
+	mhash? ( hash )
+	phar? ( hash )
+	qdbm? ( !gdbm )
+	readline? ( !libedit )
+	recode? ( !imap !mysqli )
+	sharedmem? ( !threads )
+	mysql? ( || ( mysqli pdo ) )
+	|| ( cli cgi fpm apache2 embed phpdbg )"
+
+PHP_MV="$(get_major_version)"
+
+# Allow users to install production version if they want to
+if [[ "${PHP_INI_VERSION}" == "production" ]]; then
+	PHP_INI_UPSTREAM="php.ini-production"
+else
+	PHP_INI_UPSTREAM="php.ini-development"
+fi
+
+php_install_ini() {
+	local phpsapi="${1}"
+
+	# work out where we are installing the ini file
+	php_set_ini_dir "${phpsapi}"
+
+	local phpinisrc="${PHP_INI_UPSTREAM}-${phpsapi}"
+	cp "${PHP_INI_UPSTREAM}" "${phpinisrc}" || die
+
+	# default to /tmp for save_path, bug #282768
+	sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" || die
+
+	# Set the extension dir
+	sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" -i "${phpinisrc}" || die
+
+	# Set the include path to point to where we want to find PEAR packages
+	sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die
+
+	dodir "${PHP_INI_DIR#${EPREFIX}}"
+	insinto "${PHP_INI_DIR#${EPREFIX}}"
+	newins "${phpinisrc}" php.ini
+
+	elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
+	elog
+
+	dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
+	dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
+
+	if use opcache; then
+		elog "Adding opcache to $PHP_EXT_INI_DIR"
+		echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> \
+			 "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
+		dosym "${PHP_EXT_INI_DIR#${EPREFIX}}/opcache.ini" \
+			  "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
+	fi
+
+	# SAPI-specific handling
+	if [[ "${sapi}" == "fpm" ]] ; then
+		einfo "Installing FPM config files php-fpm.conf and www.conf"
+		insinto "${PHP_INI_DIR#${EPREFIX}}"
+		doins sapi/fpm/php-fpm.conf
+		insinto "${PHP_INI_DIR#${EPREFIX}}/fpm.d"
+		doins sapi/fpm/www.conf
+	fi
+
+	dodoc php.ini-development
+	dodoc php.ini-production
+}
+
+php_set_ini_dir() {
+	PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
+	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
+	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
+}
+
+src_prepare() {
+	default
+
+	# In php-7.x, the FPM pool configuration files have been split off
+	# of the main config. By default the pool config files go in
+	# e.g. /etc/php-fpm.d, which isn't slotted. So here we move the
+	# include directory to a subdirectory "fpm.d" of $PHP_INI_DIR. Later
+	# we'll install the pool configuration file "www.conf" there.
+	php_set_ini_dir fpm
+	sed -i "s~^include=.*$~include=${PHP_INI_DIR}/fpm.d/*.conf~" \
+		sapi/fpm/php-fpm.conf.in \
+		|| die 'failed to move the include directory in php-fpm.conf'
+}
+
+src_configure() {
+	addpredict /usr/share/snmp/mibs/.index
+	addpredict /var/lib/net-snmp/mib_indexes
+
+	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
+
+	# The php-fpm config file wants localstatedir to be ${EPREFIX}/var
+	# and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002.
+	local our_conf=(
+		--prefix="${PHP_DESTDIR}"
+		--mandir="${PHP_DESTDIR}/man"
+		--infodir="${PHP_DESTDIR}/info"
+		--libdir="${PHP_DESTDIR}/lib"
+		--with-libdir="$(get_libdir)"
+		--localstatedir="${EPREFIX}/var"
+		--without-pear
+		$(use_enable threads maintainer-zts)
+	)
+
+	our_conf+=(
+		$(use_with acl fpm-acl)
+		$(use_enable bcmath bcmath)
+		$(use_with bzip2 bz2 "${EPREFIX}/usr")
+		$(use_enable calendar calendar)
+		$(use_enable coverage gcov)
+		$(use_enable ctype ctype)
+		$(use_with curl curl "${EPREFIX}/usr")
+		$(use_enable xml dom)
+		$(use_with enchant enchant "${EPREFIX}/usr")
+		$(use_enable exif exif)
+		$(use_enable fileinfo fileinfo)
+		$(use_enable filter filter)
+		$(use_enable ftp ftp)
+		$(use_with nls gettext "${EPREFIX}/usr")
+		$(use_with gmp gmp "${EPREFIX}/usr")
+		$(use_enable hash hash)
+		$(use_with mhash mhash "${EPREFIX}/usr")
+		$(use_with iconv iconv \
+			$(use elibc_glibc || use elibc_musl || echo "${EPREFIX}/usr"))
+		$(use_enable intl intl)
+		$(use_enable ipv6 ipv6)
+		$(use_enable json json)
+		$(use_with kerberos kerberos "${EPREFIX}/usr")
+		$(use_enable xml libxml)
+		$(use_with xml libxml-dir "${EPREFIX}/usr")
+		$(use_enable unicode mbstring)
+		$(use_with crypt mcrypt "${EPREFIX}/usr")
+		$(use_with unicode onig "${EPREFIX}/usr")
+		$(use_with ssl openssl "${EPREFIX}/usr")
+		$(use_with ssl openssl-dir "${EPREFIX}/usr")
+		$(use_enable pcntl pcntl)
+		$(use_enable phar phar)
+		$(use_enable pdo pdo)
+		$(use_enable opcache opcache)
+		$(use_with postgres pgsql "${EPREFIX}/usr")
+		$(use_enable posix posix)
+		$(use_with spell pspell "${EPREFIX}/usr")
+		$(use_with recode recode "${EPREFIX}/usr")
+		$(use_enable simplexml simplexml)
+		$(use_enable sharedmem shmop)
+		$(use_with snmp snmp "${EPREFIX}/usr")
+		$(use_enable soap soap)
+		$(use_enable sockets sockets)
+		$(use_with sqlite sqlite3 "${EPREFIX}/usr")
+		$(use_enable sysvipc sysvmsg)
+		$(use_enable sysvipc sysvsem)
+		$(use_enable sysvipc sysvshm)
+		$(use_with systemd fpm-systemd)
+		$(use_with tidy tidy "${EPREFIX}/usr")
+		$(use_enable tokenizer tokenizer)
+		$(use_enable wddx wddx)
+		$(use_enable xml xml)
+		$(use_enable xmlreader xmlreader)
+		$(use_enable xmlwriter xmlwriter)
+		$(use_with xmlrpc xmlrpc)
+		$(use_with xslt xsl "${EPREFIX}/usr")
+		$(use_enable zip zip)
+		$(use_with zlib zlib "${EPREFIX}/usr")
+		$(use_enable debug debug)
+	)
+
+	# DBA support
+	if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
+		|| use qdbm ; then
+		our_conf+=( "--enable-dba${shared}" )
+	fi
+
+	# DBA drivers support
+	our_conf+=(
+		$(use_with cdb cdb)
+		$(use_with berkdb db4 "${EPREFIX}/usr")
+		$(use_enable flatfile flatfile)
+		$(use_with gdbm gdbm "${EPREFIX}/usr")
+		$(use_enable inifile inifile)
+		$(use_with qdbm qdbm "${EPREFIX}/usr")
+	)
+
+	# Support for the GD graphics library
+	our_conf+=(
+		$(use_with truetype freetype-dir "${EPREFIX}/usr")
+		$(use_enable cjk gd-jis-conv)
+		$(use_with gd jpeg-dir "${EPREFIX}/usr")
+		$(use_with gd png-dir "${EPREFIX}/usr")
+		$(use_with xpm xpm-dir "${EPREFIX}/usr")
+	)
+	if use webp; then
+		our_conf+=( --with-webp-dir="${EPREFIX}/usr" )
+	fi
+	# enable gd last, so configure can pick up the previous settings
+	our_conf+=( $(use_with gd gd) )
+
+	# IMAP support
+	if use imap ; then
+		our_conf+=(
+			$(use_with imap imap "${EPREFIX}/usr")
+			$(use_with ssl imap-ssl "${EPREFIX}/usr")
+		)
+	fi
+
+	# Interbase/firebird support
+	our_conf+=( $(use_with firebird interbase "${EPREFIX}/usr") )
+
+	# LDAP support
+	if use ldap ; then
+		our_conf+=(
+			$(use_with ldap ldap "${EPREFIX}/usr")
+			$(use_with ldap-sasl ldap-sasl "${EPREFIX}/usr")
+		)
+	fi
+
+	# MySQL support
+	local mysqllib="mysqlnd"
+	local mysqlilib="mysqlnd"
+
+	our_conf+=( $(use_with mysqli mysqli "${mysqlilib}") )
+
+	local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock"
+	if use mysql || use mysqli ; then
+		our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") )
+	fi
+
+	# ODBC support
+	our_conf+=(
+		$(use_with odbc unixODBC "${EPREFIX}/usr")
+		$(use_with iodbc iodbc "${EPREFIX}/usr")
+	)
+
+	# Oracle support
+	our_conf+=( $(use_with oci8-instant-client oci8) )
+
+	# PDO support
+	if use pdo ; then
+		our_conf+=(
+			$(use_with mssql pdo-dblib "${EPREFIX}/usr")
+			$(use_with mysql pdo-mysql "${mysqllib}")
+			$(use_with postgres pdo-pgsql)
+			$(use_with sqlite pdo-sqlite "${EPREFIX}/usr")
+			$(use_with firebird pdo-firebird "${EPREFIX}/usr")
+			$(use_with odbc pdo-odbc "unixODBC,${EPREFIX}/usr")
+			$(use_with oci8-instant-client pdo-oci)
+		)
+	fi
+
+	# readline/libedit support
+	our_conf+=(
+		$(use_with readline readline "${EPREFIX}/usr")
+		$(use_with libedit libedit "${EPREFIX}/usr")
+	)
+
+	# Session support
+	if use session ; then
+		our_conf+=( $(use_with sharedmem mm "${EPREFIX}/usr") )
+	else
+		our_conf+=( $(use_enable session session) )
+	fi
+
+	# Use pic for shared modules such as apache2's mod_php
+	our_conf+=( --with-pic )
+
+	# we use the system copy of pcre
+	# --with-pcre-regex affects ext/pcre
+	# --with-pcre-dir affects ext/filter and ext/zip
+	our_conf+=(
+		--with-pcre-regex="${EPREFIX}/usr"
+		--with-pcre-dir="${EPREFIX}/usr"
+	)
+
+	# Catch CFLAGS problems
+	# Fixes bug #14067.
+	# Changed order to run it in reverse for bug #32022 and #12021.
+	replace-cpu-flags "k6*" "i586"
+
+	# Support user-passed configuration parameters
+	our_conf+=( ${EXTRA_ECONF:-} )
+
+	# Support the Apache2 extras, they must be set globally for all
+	# SAPIs to work correctly, especially for external PHP extensions
+
+	mkdir -p "${WORKDIR}/sapis-build" || die
+	for one_sapi in $SAPIS ; do
+		use "${one_sapi}" || continue
+		php_set_ini_dir "${one_sapi}"
+
+		# The BUILD_DIR variable is used to determine where to output
+		# the files that autotools creates. This was all originally
+		# based on the autotools-utils eclass.
+		BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}"
+		cp -a "${S}" "${BUILD_DIR}" || die
+		cd "${BUILD_DIR}" || die
+
+		local sapi_conf=(
+			--with-config-file-path="${PHP_INI_DIR}"
+			--with-config-file-scan-dir="${PHP_EXT_INI_DIR_ACTIVE}"
+		)
+
+		for sapi in $SAPIS ; do
+			case "$sapi" in
+				cli|cgi|embed|fpm|phpdbg)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf+=( "--enable-${sapi}" )
+					else
+						sapi_conf+=( "--disable-${sapi}" )
+					fi
+					;;
+
+				apache2)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf+=( --with-apxs2="${EPREFIX}/usr/bin/apxs" )
+					else
+						sapi_conf+=( --without-apxs2 )
+					fi
+					;;
+			esac
+		done
+
+		# Construct the $myeconfargs array by concatenating $our_conf
+		# (the common args) and $sapi_conf (the SAPI-specific args).
+		local myeconfargs=( "${our_conf[@]}" )
+		myeconfargs+=( "${sapi_conf[@]}" )
+
+		pushd "${BUILD_DIR}" > /dev/null || die
+		econf "${myeconfargs[@]}"
+		popd > /dev/null || die
+	done
+}
+
+src_compile() {
+	# snmp seems to run during src_compile, too (bug #324739)
+	addpredict /usr/share/snmp/mibs/.index
+	addpredict /var/lib/net-snmp/mib_indexes
+
+	for sapi in ${SAPIS} ; do
+		if use "${sapi}"; then
+			cd "${WORKDIR}/sapis-build/$sapi" || \
+				die "Failed to change dir to ${WORKDIR}/sapis-build/$1"
+			emake
+		fi
+	done
+}
+
+src_install() {
+	# see bug #324739 for what happens when we don't have that
+	addpredict /usr/share/snmp/mibs/.index
+
+	# grab the first SAPI that got built and install common files from there
+	local first_sapi=""
+	for sapi in $SAPIS ; do
+		if use $sapi ; then
+			first_sapi=$sapi
+			break
+		fi
+	done
+
+	# Makefile forgets to create this before trying to write to it...
+	dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
+
+	# Install php environment (without any sapis)
+	cd "${WORKDIR}/sapis-build/$first_sapi" || die
+	emake INSTALL_ROOT="${D}" \
+		install-build install-headers install-programs
+
+	local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
+
+	# Create the directory where we'll put version-specific php scripts
+	keepdir "/usr/share/php${PHP_MV}"
+
+	local sapi="", file=""
+	local sapi_list=""
+
+	for sapi in ${SAPIS}; do
+		if use "${sapi}" ; then
+			einfo "Installing SAPI: ${sapi}"
+			cd "${WORKDIR}/sapis-build/${sapi}" || die
+
+			if [[ "${sapi}" == "apache2" ]] ; then
+				# We're specifically not using emake install-sapi as libtool
+				# may cause unnecessary relink failures (see bug #351266)
+				insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
+				newins ".libs/libphp${PHP_MV}$(get_libname)" \
+					   "libphp${PHP_MV}$(get_libname)"
+				keepdir "/usr/$(get_libdir)/apache2/modules"
+			else
+				# needed each time, php_install_ini would reset it
+				local dest="${PHP_DESTDIR#${EPREFIX}}"
+				into "${dest}"
+				case "$sapi" in
+					cli)
+						source="sapi/cli/php"
+						;;
+					cgi)
+						source="sapi/cgi/php-cgi"
+						;;
+					fpm)
+						source="sapi/fpm/php-fpm"
+						;;
+					embed)
+						source="libs/libphp${PHP_MV}$(get_libname)"
+						;;
+					phpdbg)
+						source="sapi/phpdbg/phpdbg"
+						;;
+					*)
+						die "unhandled sapi in src_install"
+						;;
+				esac
+
+				if [[ "${source}" == *"$(get_libname)" ]]; then
+					dolib.so "${source}"
+				else
+					dobin "${source}"
+					local name="$(basename ${source})"
+					dosym "${dest}/bin/${name}" "/usr/bin/${name}${SLOT}"
+				fi
+			fi
+
+			php_install_ini "${sapi}"
+
+			# construct correct SAPI string for php-config
+			# thanks to ferringb for the bash voodoo
+			if [[ "${sapi}" == "apache2" ]]; then
+				sapi_list="${sapi_list:+${sapi_list} }apache2handler"
+			else
+				sapi_list="${sapi_list:+${sapi_list} }${sapi}"
+			fi
+		fi
+	done
+
+	# Installing opcache module
+	if use opcache ; then
+		into "${PHP_DESTDIR#${EPREFIX}}"
+		dolib.so "modules/opcache$(get_libname)"
+	fi
+
+	# Install env.d files
+	newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}"
+	sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
+	sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
+
+	# set php-config variable correctly (bug #278439)
+	sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
+		"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" || die
+
+	if use fpm ; then
+		if use systemd; then
+			systemd_newunit "${FILESDIR}/php-fpm_at.service" \
+							"php-fpm@${SLOT}.service"
+		else
+			systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" \
+							"php-fpm@${SLOT}.service"
+		fi
+	fi
+}
+
+src_test() {
+	echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+	PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
+	if [[ ! -x "${PHP_BIN}" ]] ; then
+		ewarn "Test phase requires USE=cli, skipping"
+		return
+	else
+		export TEST_PHP_EXECUTABLE="${PHP_BIN}"
+	fi
+
+	if [[ -x "${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" ]] ; then
+		export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi"
+	fi
+
+	if [[ -x "${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" ]] ; then
+		export TEST_PHPDBG_EXECUTABLE="${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg"
+	fi
+
+	REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n  -d \
+					  "session.save_path=${T}" \
+					  "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d \
+					  "session.save_path=${T}"
+
+	for name in ${EXPECTED_TEST_FAILURES}; do
+		mv "${name}.out" "${name}.out.orig" 2>/dev/null || die
+	done
+
+	local failed="$(find -name '*.out')"
+	if [[ ${failed} != "" ]] ; then
+		ewarn "The following test cases failed unexpectedly:"
+		for name in ${failed}; do
+			ewarn "  ${name/.out/}"
+		done
+	else
+		einfo "No unexpected test failures, all fine"
+	fi
+
+	if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
+		local passed=""
+		for name in ${EXPECTED_TEST_FAILURES}; do
+			[[ -f "${name}.diff" ]] && continue
+			passed="${passed} ${name}"
+		done
+		if [[ ${passed} != "" ]] ; then
+			einfo "The following test cases passed unexpectedly:"
+			for name in ${passed}; do
+				ewarn "  ${passed}"
+			done
+		else
+			einfo "None of the known-to-fail tests passed, all fine"
+		fi
+	fi
+}
+
+pkg_postinst() {
+	# Output some general info to the user
+	if use apache2 ; then
+		elog
+		elog "To enable PHP in apache, you will need to add \"-D PHP\" to"
+		elog "your apache2 command. OpenRC users can append that string to"
+		elog "APACHE2_OPTS in /etc/conf.d/apache2."
+		elog
+		elog "The apache module configuration file 70_mod_php.conf is"
+		elog "provided (and maintained) by eselect-php."
+		elog
+	fi
+
+	# Create the symlinks for php
+	for m in ${SAPIS}; do
+		[[ ${m} == 'embed' ]] && continue;
+		if use $m ; then
+			local ci=$(eselect php show $m)
+			if [[ -z $ci ]]; then
+				eselect php set $m php${SLOT} || die
+				einfo "Switched ${m} to use php:${SLOT}"
+				einfo
+			elif [[ $ci != "php${SLOT}" ]] ; then
+				elog "To switch $m to use php:${SLOT}, run"
+				elog "    eselect php set $m php${SLOT}"
+				elog
+			fi
+		fi
+	done
+
+	# Remove dead symlinks for SAPIs that were just disabled. For
+	# example, if the user has the cgi SAPI enabled, then he has an
+	# eselect-php symlink for it. If he later reinstalls PHP with
+	# USE="-cgi", that symlink will break. This call to eselect is
+	# supposed to remove that dead link per bug 572436.
+	eselect php cleanup || die
+
+	if ! has "php${SLOT/./-}" ${PHP_TARGETS}; then
+	   elog "To build extensions for this version of PHP, you will need to"
+	   elog "add php${SLOT/./-} to your PHP_TARGETS USE_EXPAND variable."
+	   elog
+	fi
+
+	# Only mention PHP_INI_VERSION if the user doesn't have it set.
+	case "${PHP_INI_VERSION}" in
+		production|development)
+		;;
+	*)
+		elog "This ebuild installed a version of php.ini based on"
+		elog "${PHP_INI_UPSTREAM}. You can choose which version of"
+		elog "php.ini to install by default by setting PHP_INI_VERSION"
+		elog "to either 'production' or 'development' in your make.conf."
+		elog "Both versions of php.ini can be found with the PHP docs in"
+		elog "${EPREFIX}/usr/share/doc/${PF}"
+		elog
+		;;
+	esac
+
+	elog "For details on how version slotting works, please see"
+	elog "the wiki:"
+	elog
+	elog "  https://wiki.gentoo.org/wiki/PHP"
+	elog
+}
+
+pkg_postrm() {
+	# This serves two purposes. First, if we have just removed the last
+	# installed version of PHP, then this will remove any dead symlinks
+	# belonging to eselect-php. Second, if a user upgrades slots from
+	# (say) 5.6 to 7.0 and depcleans the old slot, then this will update
+	# his existing symlinks to point to the new 7.0 installation. The
+	# latter is bug 432962.
+	#
+	# Note: the eselect-php package may not be installed at this point,
+	# so we can't die() if this command fails.
+	eselect php cleanup
+}
--- a/dev-libs/appstream-glib/Manifest
+++ b/dev-libs/appstream-glib/Manifest
@ -1,3 +1,2 @@
-DIST appstream-glib-0.6.3.tar.xz 1944512 SHA256 3ec355c950b86cd792b6e396a5a4a72487999e300fcacf7466a663974ec4ad24 SHA512 aae4885e32bc6f0247f6e8f415471531a8c28976e1ba4bd977200d72e24a04dfc2370395e3e0ea6e052386a963540cb91f025cd4f1ab837404762f1be2a76ff0 WHIRLPOOL 5bc9874e9f0708064f93fca8938d3708171dbf4cd356c8475e6d804ba109e51fc0b00d5dc4ac547f55c8a37c358c0d8fad6900ea214e8760b6da999be3f8c252
 DIST appstream-glib-0.6.7.tar.xz 1961284 SHA256 9767756e2c970709f0070d4c9e617bb3af2d62cd4fbce8486bd742092671b922 SHA512 cc8b58fa1eb8a4cb0c73f256ff3455d7ffc62282cf70676ae669a0b471c08278b3870d5d50dc70c386ec536031056136ba6742b674d94ca0c20d397f49615df2 WHIRLPOOL 93b8698d018eee7997b6fd232f8ee0447f34980628905147ae73b9274b2781fd422eca41ed266f89faee3ee63616cff86a12ca60e78d297ead56d462692534b7
 DIST appstream-glib-0.6.8.tar.xz 1962132 SHA256 23f009233a96d1246c4c46c9746be126ae9d422753399621445d07bff49cae41 SHA512 dac9e0cc6dd8dfb81cbcdb6796d6890b61d5ede634cbe31768d1cf5746ada3beaf8b46918bab24e72604d52cbf6c6602efa6aedbdf9379f4c10528929f926fe5 WHIRLPOOL d2f2dd1607f4cb03ab501e4e189862cbb5c58b0bc3e63af153d72c7a714e791509dc2981921b1414f11282f7681277b690cb3142ce71c2bacd2799a935bdfdc2
--- a/dev-libs/appstream-glib/appstream-glib-0.6.3.ebuild
+++ b/dev-libs/appstream-glib/appstream-glib-0.6.3.ebuild
@ -1,59 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit bash-completion-r1 gnome2
-
-DESCRIPTION="Provides GObjects and helper methods to read and write AppStream metadata"
-HOMEPAGE="https://people.freedesktop.org/~hughsient/appstream-glib/"
-SRC_URI="https://people.freedesktop.org/~hughsient/${PN}/releases/${P}.tar.xz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/8" # soname version
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 sparc x86"
-IUSE="+introspection nls stemmer"
-
-RDEPEND="
-	app-arch/gcab
-	app-arch/libarchive
-	dev-db/sqlite:3
-	>=dev-libs/glib-2.45.8:2
-	>=dev-libs/json-glib-1.1.1
-	dev-libs/libyaml
-	>=media-libs/fontconfig-2.11:1.0
-	>=media-libs/freetype-2.4:2
-	>=net-libs/libsoup-2.51.92:2.4
-	sys-apps/util-linux
-	>=x11-libs/gdk-pixbuf-2.31.5:2
-	x11-libs/gtk+:3
-	x11-libs/pango
-	introspection? ( >=dev-libs/gobject-introspection-0.9.8:= )
-	stemmer? ( dev-libs/snowball-stemmer )
-"
-DEPEND="${RDEPEND}
-	app-text/docbook-xml-dtd:4.3
-	dev-libs/libxslt
-	>=dev-util/gtk-doc-am-1.9
-	>=sys-devel/gettext-0.19.7
-"
-# ${PN} superseeds appdata-tools, require dummy package until all ebuilds
-# are migrated to appstream-glib
-RDEPEND="${RDEPEND}
-	!<dev-util/appdata-tools-0.1.8-r1
-"
-
-src_configure() {
-	gnome2_src_configure \
-		--enable-builder \
-		--enable-firmware \
-		--disable-rpm \
-		--disable-static \
-		--enable-dep11 \
-		--enable-man \
-		$(use_enable nls) \
-		$(use_enable introspection) \
-		$(use_enable stemmer) \
-		--with-bashcompletiondir="$(get_bashcompdir)"
-}
--- a/dev-libs/appstream-glib/appstream-glib-0.6.7.ebuild
+++ b/dev-libs/appstream-glib/appstream-glib-0.6.7.ebuild
@ -12,7 +12,7 @@ SRC_URI="https://people.freedesktop.org/~hughsient/${PN}/releases/${P}.tar.xz"

 LICENSE="LGPL-2.1"
 SLOT="0/8" # soname version
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="+introspection nls stemmer"

 RDEPEND="
--- a/dev-libs/boost/boost-1.62.0-r1.ebuild
+++ b/dev-libs/boost/boost-1.62.0-r1.ebuild
@ -15,7 +15,7 @@ SRC_URI="https://downloads.sourceforge.net/project/boost/${PN}/${PV}/${MY_P}.tar

 LICENSE="Boost-1.0"
 SLOT="0/${PV}" # ${PV} instead ${MAJOR_V} due to bug 486122
-KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris ~x86-winnt"

 IUSE="context debug doc icu +nls mpi python static-libs +threads tools"

--- 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/gmime/gmime-2.6.23.ebuild
+++ b/dev-libs/gmime/gmime-2.6.23.ebuild
@ -11,7 +11,7 @@ HOMEPAGE="http://spruce.sourceforge.net/gmime/ https://developer.gnome.org/gmime

 SLOT="2.6"
 LICENSE="LGPL-2.1"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="doc mono smime static-libs vala"

 RDEPEND="
--- a/dev-libs/injeqt/Manifest
+++ b/dev-libs/injeqt/Manifest
@ -1 +1,2 @@
 DIST injeqt-1.0.1.tar.gz 63748 SHA256 81aafaf990134486331bbb5c362be2b8520a3bec86e82869125c17ec652d686d SHA512 b090c8d5c9fc6091ca55d8b2abe408f10c0c93209755d7fc548723cb5c7fc49e913d4e1360c822b74886df885e08b4d634c53082ce2d8da649e1cc79f6207dc8 WHIRLPOOL 346a81c3866adcf2b466408c8f293d8fa15bd0874b8a07e4fa13d2e03e40bc6c24fb1cd6a077cb854692de9f4f6645c9210bbbf958c8fced3fda429b3592a2a3
+DIST injeqt-1.1.0.tar.gz 74112 SHA256 a5e125ab3e8c9f7139fccbce22d772b01c4e1af074dea3bbb1ddb4379a42cb16 SHA512 f14661c75fb875a9cba3de37252ef4048971a9f12e3482a2e3fe9df01aef842746d51a1cc19343f9b959b29f465c3ab15790608a04375d707073741448ee8443 WHIRLPOOL d0ad335f5122ef093477274c1e8d831b2720b9afeba86ebbb38d2c1914fc8042371c54a0c9234b20d6a84008ac51166a65261c7663cec8de4a87e10a32212786
--- a/dev-libs/injeqt/injeqt-1.1.0.ebuild
+++ b/dev-libs/injeqt/injeqt-1.1.0.ebuild
@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="Dependency injection framework for Qt5"
+HOMEPAGE="https://github.com/vogel/injeqt"
+SRC_URI="https://github.com/vogel/injeqt/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	>=dev-qt/qtcore-5.4.2:5
+"
+DEPEND="${RDEPEND}
+	test? ( >=dev-qt/qttest-5.4.2:5 )
+"
+
+# https://github.com/vogel/injeqt/issues/18
+RESTRICT=test
+
+src_configure() {
+	local mycmakeargs=(
+		-DDISABLE_EXAMPLES=ON
+		-DDISABLE_TESTS=$(usex !test)
+	)
+	cmake-utils_src_configure
+}
--- a/dev-libs/libbsd/libbsd-0.8.3.ebuild
+++ b/dev-libs/libbsd/libbsd-0.8.3.ebuild
@ -10,7 +10,7 @@ SRC_URI="https://${PN}.freedesktop.org/releases/${P}.tar.xz"

 LICENSE="BSD BSD-2 BSD-4 ISC"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"

 DEPEND=">=sys-kernel/linux-headers-3.17"
--- a/dev-libs/libevdev/Manifest
+++ b/dev-libs/libevdev/Manifest
@ -1,5 +1 @@
-DIST libevdev-1.4.4.tar.xz 409856 SHA256 ed9979369b6a6e28f5897d099538549ecffb2b7c00c1b717eb77c31d85bc45a9 SHA512 5170ce3e99588b3ce2f9d3580b2d2087b527eaf258ab69a9e8620e2c336d9fa54c36f75ba4b68a61b5ecd7c8123bb9adf538ba882ed353df08a54cd68906e210 WHIRLPOOL 6812c199e03e0eab750c83603d8f9dcc8d5b917d7b0cc2942317fff75083d91b0601401c5e5fddc4d64066c44a4d7de210f994fc01f79f7ce884fdf039b9e1c5
-DIST libevdev-1.5.2.tar.xz 397848 SHA256 5ee2163656a61f5703cb5c08a05c9471ffb7b640bfbe2c55194ea50d908f629b SHA512 7f07d2eb9feb3e4bd5ae512fa7000dd8d1ad8d5334fff9440262ab45aaec95ff311e3f9c9b1711259700b3f35613b192f5a2c8ac90fcb6842390bfd861e3e30c WHIRLPOOL 92a5679722caf6222036909a8a0dadc02503592e4b06e68e74f7deeaabc8e5335bc5a94c0d765913029350dfdb6f4ee7236459c1e637fc87cbc3635eec1c6a6f
-DIST libevdev-1.5.4.tar.xz 397876 SHA256 11fe76d62cc76fbc9dbf8e94696a80eee63780139161e5cf54c55ec21a8173a4 SHA512 9062b8c599ccc361d39bd0d06ee7dd7ddcca21541849a5f53ff1ec6d9760a8b575d90201a9a6b5ac5a01e7a77af9d191901bb1196976de52080e351717119f4e WHIRLPOOL 2d7fbc0942fe6a2a1c1d3ee0fffe43ec11fb4e88d8bdb251171b28d58de3426aa8dfbfe43600b49ffcf0ef2e21a4c9de87c239d76c1302b190af813c7fad791b
-DIST libevdev-1.5.5.tar.xz 406500 SHA256 320120782018b992956b3fa29495c323832860807ac8ea74537e636a0e0280b1 SHA512 cab1679c51566c673839f001c499cd854d502fd365a962547560859658be677552c30ebecba30faebfac1b4da795d480cf494c9317906a81c27d1f2aef58b133 WHIRLPOOL 59b0e07fd6b3c160eff143b2ec7cdc77ac80f5ccde979a978231694eec362d2bda24a92d0f1b76b9ef21d851801a58a76f6d22d4ed2bd4d8ca2c7f5f9ddbabe6
 DIST libevdev-1.5.6.tar.xz 407024 SHA256 ecec7e9d66b1d3692f10b3b20aa97fb25e874a784c5552a7b1698091fef5a688 SHA512 4e9f44e0957d9d83e46de095f1eb8a64d7db808ac5a397d266ec1149948b82aa3f123fcf3d47cd72aff2741cce13b2162324c195f892861de97d7beb19ef6b19 WHIRLPOOL bbc0be49280c07249d802a14b8f054a5a116a3b18bd42e3a6a700011f293f1b1b0c8dd40f611a1a68a9b1b3e7f07cc316acdba2e12ab24d66be662c9f36396ac
--- a/dev-libs/libevdev/libevdev-1.4.4.ebuild
+++ b/dev-libs/libevdev/libevdev-1.4.4.ebuild
@ -1,24 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-XORG_MULTILIB=yes
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-inherit python-any-r1 xorg-2
-
-EGIT_REPO_URI="git://anongit.freedesktop.org/${PN}.git"
-
-DESCRIPTION="Handler library for evdev events"
-
-if [[ ${PV} == 9999* ]] ; then
-	SRC_URI=""
-else
-	SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"
-fi
-
-RESTRICT="test" # Tests need to run as root.
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
-IUSE=""
-
-DEPEND="${PYTHON_DEPS}"
--- a/dev-libs/libevdev/libevdev-1.5.2.ebuild
+++ b/dev-libs/libevdev/libevdev-1.5.2.ebuild
@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-XORG_MULTILIB=yes
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-inherit python-any-r1 xorg-2
-
-EGIT_REPO_URI="git://anongit.freedesktop.org/${PN}.git"
-
-DESCRIPTION="Handler library for evdev events"
-
-if [[ ${PV} == 9999* ]] ; then
-	SRC_URI=""
-else
-	SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"
-fi
-
-RESTRICT="test" # Tests need to run as root.
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
-IUSE=""
-
-DEPEND="${PYTHON_DEPS}"
--- a/dev-libs/libevdev/libevdev-1.5.4.ebuild
+++ b/dev-libs/libevdev/libevdev-1.5.4.ebuild
@ -1,24 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-XORG_MULTILIB=yes
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-inherit python-any-r1 xorg-2
-
-EGIT_REPO_URI="git://anongit.freedesktop.org/${PN}.git"
-
-DESCRIPTION="Handler library for evdev events"
-
-if [[ ${PV} == 9999* ]] ; then
-	SRC_URI=""
-else
-	SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"
-fi
-
-RESTRICT="test" # Tests need to run as root.
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
-IUSE=""
-
-DEPEND="${PYTHON_DEPS}"
--- a/dev-libs/libevdev/libevdev-1.5.5.ebuild
+++ b/dev-libs/libevdev/libevdev-1.5.5.ebuild
@ -1,24 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-XORG_MULTILIB=yes
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-inherit python-any-r1 xorg-2
-
-EGIT_REPO_URI="git://anongit.freedesktop.org/${PN}.git"
-
-DESCRIPTION="Handler library for evdev events"
-
-if [[ ${PV} == 9999* ]] ; then
-	SRC_URI=""
-else
-	SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"
-fi
-
-RESTRICT="test" # Tests need to run as root.
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
-IUSE=""
-
-DEPEND="${PYTHON_DEPS}"
--- a/Show More
+++ b/Show More