Sync with portage [Sat Oct 29 14:05:03 MSK 2016].

2016-10-29 14:05:03 +03:00 · 2016-10-29 14:05:03 +03:00 · 34068621ef
commit 34068621ef
parent 28ad02c276
213 changed files with 4165 additions and 1689 deletions
--- a/app-admin/fleet/Manifest
+++ b/app-admin/fleet/Manifest
@ -1,4 +1,2 @@
-DIST fleet-0.11.0.tar.gz 452750 SHA256 475d92eccfa383d5ed7f48ecca69666c597eb67ed53c41ac443e5f7816110ad7 SHA512 050ef3fba52661caa87e04695dc0120b48d9916b2dc466750f3e735738b2de5e39cc343a8526cbdb8cf2966da89696efdc0a98709732e9c2cb6f7ea6875ef2fc WHIRLPOOL 294d46acba60ef8bae28c3e253ca410281918f4f15b5abb692d7a085e7d3846e28c5c890e677bc77487ed14cf4429dbf38beeb5ef7cc6a2746e583f7f825bd9c
-DIST fleet-0.11.1.tar.gz 453034 SHA256 65965730f70021988ed869e23d9599a2305f24287f3ac67c2b995b05ef28cbe8 SHA512 28e1fc15f634bb5445a5d011dfccae488a873714d868e8632d928a72728380ee7339619e7c057354a154daff71d7260f04c4911e1b371b05c96099ef1d0d9f8d WHIRLPOOL 476ebe9c72b343ecd7dc3f589eed010b5c98651683ee7aee034427702c2779cc16f7f012fa5e2df6d24af9c98731f8e176c3da7acec4ef6753d088ffbf1b14e5
 DIST fleet-0.11.5.tar.gz 456152 SHA256 a6a785099df71645b5fe8755a36baa6c11138749bc02ae4990fd3f52663c0394 SHA512 1d97e386430db948d8730ec26b7d55a1dad00343600400bf21f9a1cb855e068063244ffe55774e72920c210181ff80bd9706ec99fd9eeb2ac28be14bba1dfbf9 WHIRLPOOL 0a9274cc6077eec1790c3fa9ca1ada71723e392cf50f47d17019edc78fe202893053908ba4565beca7f5f6a0bae97d676304df4cd952ff8e06cb0797f41cea89
 DIST fleet-0.11.8.tar.gz 443257 SHA256 22f2f40c1c2938504b31e9dbb54eb6eb54569458a4dffe5e0020e917a5e1f66f SHA512 637332716928efba0f49af1234cfccd1d3979982ad974eb86980263230db5f2bce4eed5dcd80546e371653678e3d3ec448edb50d04b8f336d7402525dfb4ef2f WHIRLPOOL e516a7c0d21455b3a3be2a116473acc255af72c8f03b2eda9fe201b61e259689c536ef7d7f7f1385b42b7e99cce88183a151b33cf85d1f2c42a97e3ddd0e153d
--- a/app-admin/fleet/files/fleetd.service
+++ b/app-admin/fleet/files/fleetd.service
@ -1,9 +0,0 @@
-[Unit]
-Description=fleet
-Wants=etcd.service
-
-[Service]
-ExecStart=/usr/bin/fleetd
-
-[Install]
-WantedBy=multi-user.target
--- a/app-admin/fleet/fleet-0.11.0-r1.ebuild
+++ b/app-admin/fleet/fleet-0.11.0-r1.ebuild
@ -1,55 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit systemd vcs-snapshot
-
-DESCRIPTION="A Distributed init System"
-HOMEPAGE="https://github.com/coreos/fleet"
-SRC_URI="https://github.com/coreos/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc examples test"
-
-DEPEND="
-	>=dev-lang/go-1.3:=
-	test? ( dev-go/go-tools )
-"
-RDEPEND=""
-
-src_compile() {
-	./build || die 'Build failed'
-}
-
-src_test() {
-	./test || die 'Tests failed'
-}
-
-src_install() {
-	dobin "${S}"/bin/fleetd
-	dobin "${S}"/bin/fleetctl
-
-	systemd_dounit "${FILESDIR}"/fleet.service
-	systemd_dounit "${FILESDIR}"/fleet.socket
-
-	dodoc README.md
-	use doc && dodoc -r Documentation
-	use examples && dodoc -r examples
-
-	insinto /etc/${PN}
-	newins "${PN}".conf.sample "${PN}".conf
-}
-
-pkg_postinst() {
-	ewarn "Please read this if you are upgrading from a version <0.10.0-r1."
-	ewarn ""
-	ewarn "Starting with fleet 0.10 the fleetctl utility has"
-	ewarn "'--endpoint=unix:///var/run/fleet.sock' as default argument, which is"
-	ewarn "why we have introduced the fleet.socket unit and renamed the service"
-	ewarn "from fleetd.service to fleet.service. If you run fleet on system"
-	ewarn "startup, please re-enable it via 'systemctl enable fleet'."
-}
--- a/app-admin/fleet/fleet-0.11.1.ebuild
+++ b/app-admin/fleet/fleet-0.11.1.ebuild
@ -1,45 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit systemd vcs-snapshot
-
-DESCRIPTION="A Distributed init System"
-HOMEPAGE="https://github.com/coreos/fleet"
-SRC_URI="https://github.com/coreos/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc examples test"
-
-DEPEND="
-	>=dev-lang/go-1.3:=
-	test? ( dev-go/go-tools )
-"
-RDEPEND=""
-
-src_compile() {
-	./build || die 'Build failed'
-}
-
-src_test() {
-	./test || die 'Tests failed'
-}
-
-src_install() {
-	dobin "${S}"/bin/fleetd
-	dobin "${S}"/bin/fleetctl
-
-	systemd_dounit "${FILESDIR}"/fleet.service
-	systemd_dounit "${FILESDIR}"/fleet.socket
-
-	dodoc README.md
-	use doc && dodoc -r Documentation
-	use examples && dodoc -r examples
-
-	insinto /etc/${PN}
-	newins "${PN}".conf.sample "${PN}".conf
-}
--- a/app-admin/logstash-bin/Manifest
+++ b/app-admin/logstash-bin/Manifest
@ -1,4 +1,4 @@
 DIST logstash-2.3.4.tar.gz 79779303 SHA256 7f62a03ddc3972e33c343e982ada1796b18284f43ed9c0089a2efee78b239583 SHA512 cc5d6c04e414daf63c836141df87204e0cbc63f71ee02abb69496e29587d5b0803dd738949de559a597979c9f6c6bf9d11d55f4b084ce875f24fb362f2c9bd3b WHIRLPOOL 71b6d915153d80d9bc81d10454ffd14af4643c61557964d7fd8edf50bf1a5d1c53ce0b09c2aec9b079918df596bbb5b07420b8661572bf7ea659e9703694f07c
 DIST logstash-2.4.0.tar.gz 83882952 SHA256 622c435c5c0f40e205fd4d9411eb409cc52992cf62dde4c7cd46e480cd8247cc SHA512 27f7e22fcfbeabe58bef1220399a80b32b56b5e2af17c0279e3f583ed5170be649b961b92c3eef33120ce238f126a3cb32e614bd8109bd8c266b538888c5324d WHIRLPOOL 2d1db78ff21d86e22f709600b086dfc253120e6a659d46c1e6ebc6d62dfffd48f0a440c33fa9a1cd7014108f5ae88afa4ccd25211ce57b1a4856f756a855c71e
-DIST logstash-5.0.0-rc1.zip 110823656 SHA256 79d75d5c48b8094951066af4d92ad10e3f77e678d644b2af045bf4367ac8afc9 SHA512 2a8714de7642b89d2f5ec659b194f0949ca65123546389cd1ebdc8c211d24b985d255d61c5f9c84edd231adb61b15f183a9d409574bc9e7f7610444d674d339b WHIRLPOOL 2db57dccb27a0bb91381690da8b79b56868bd5d0deae39c7fbb9749b17f61283c36e49a1d487ed0301ecd347e49ea0b78d52c4e475ac035ed3f25c56372abc19
+DIST logstash-5.0.0.zip 110726123 SHA256 9a8ba13f9d4333fb17f373fc822a0ae5458ef8a37c026b823fc9a66044f8e331 SHA512 928541781d5f6bf16d91184f4863c2ecc3b8f07c190fd332b79f4f790091faf0531063459b96a53a250d986060a8968d9d326285e3195a39a116f0dc2ac1e43d WHIRLPOOL a6447c19d717819fa95b4e35e149215f8e6b270032311a80d56b235a1ee3de3561bd3ce5277ee3bd1fc11126819a0333d9ed068306f360e93788742ba45246d0
 DIST logstash-all-plugins-2.4.0.tar.gz 139743651 SHA256 b2ffe60745ece2140ebc4610f42543dcf3ff5ead2707f0b36f0b70e8ddf0baff SHA512 9627f6119d129b4dcdc41ff43e49a3880f4ba5fcb3ee11e1ec821929d542c93629b0f58ded6741c96da49cba16b05eca141acdeee0ed060389abc3f467bba593 WHIRLPOOL 49ddc27d6030ae65aaab0acabda478644232f92cbd2bbe3d1b118782c5ce1167edb2a485def982f3b6c8138f084e79a783273dd50519a82085b984259f7e19d4
--- a/app-admin/logstash-bin/files/logstash.initd2
+++ b/app-admin/logstash-bin/files/logstash.initd2
@ -0,0 +1,70 @@
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+LS_USER=${LS_USER:-logstash}
+LS_GROUP=${LS_GROUP:-$LS_USER}
+LS_LOG_FILE=${LS_LOG_FILE:-/var/log/logstash/logstash.log}
+LS_CONF_DIR=${LS_CONF_DIR:-/etc/logstash/conf.d}
+LS_HOME=${LS_HOME:-/var/lib/logstash}
+LS_HEAP_SIZE=${LS_HEAP_SIZE:-500m}
+LS_NICE=${LS_NICE:-19}
+LS_JAVA_OPTS=${LS_JAVA_OPTS:-"-Djava.io.tmpdir=${LS_HOME}"}
+LS_USE_GC_LOGGING=${LS_USE_GC_LOGGING:-false}
+LS_OPEN_FILES=${LS_OPEN_FILES:-16384}
+KILL_ON_STOP_TIMEOUT=${KILL_ON_STOP_TIMEOUT:-0}
+
+command="/opt/logstash/bin/logstash"
+command_args="--config ${LS_CONF_DIR} --log ${LS_LOG_FILE} ${LS_OPTS}"
+command_background="true"
+pidfile=${LS_PIDFILE:-"/run/logstash/logstash.pid"}
+
+start_stop_daemon_args="--user ${LS_USER}:${LS_GROUP} \
+	--chdir ${LS_HOME}
+	--nicelevel ${LS_NICE}
+	--env LS_HEAP_SIZE=${LS_HEAP_SIZE}
+	--env LS_JAVA_OPTS=${LS_JAVA_OPTS}
+	--env LS_USE_GC_LOGGING=${LS_USE_GC_LOGGING}"
+
+extra_commands="checkconfig"
+extra_started_commands="reload"
+
+checkconfig() {
+	if [ ! -f ${LS_CONF_DIR}/* ]; then
+		eerror "Please put your configuration in ${LS_CONF_DIR}"
+		exit 1
+	fi
+
+	ebegin "Checking your configuration"
+	${command} ${command_args} --configtest
+	eend $? "Configuration error. Please fix your configuration files."
+}
+
+reload() {
+	checkconfig || return 1
+	ebegin "Reloading configuration"
+	start-stop-daemon --signal HUP --pidfile "${pidfile}"
+	eend $?
+}
+
+start_pre() {
+	checkconfig || return 1
+
+	rc_ulimit="-n ${LS_OPEN_FILES}"
+
+	checkpath -d -o "${LS_USER}":"${LS_GROUP}" -m750 "$(dirname "${pidfile}")"
+	checkpath -d -o "${LS_USER}":"${LS_GROUP}" -m750 "$(dirname "${LS_LOG_FILE}")"
+	checkpath -f -o "${LS_USER}":"${LS_GROUP}" -m640 "${LS_LOG_FILE}"
+}
+
+stop() {
+	ebegin "Stopping logstash"
+	if [ "${KILL_ON_STOP_TIMEOUT}" == "1" ]; then
+		start-stop-daemon --stop \
+			--pidfile=${pidfile} \
+			--retry=TERM/5/KILL/5
+	else
+		start-stop-daemon --stop \
+			--pidfile=${pidfile}
+	fi
+}
--- a/app-admin/logstash-bin/logstash-bin-5.0.0_rc1.ebuild
+++ b/app-admin/logstash-bin/logstash-bin-5.0.0_rc1.ebuild
@ -7,8 +7,7 @@ EAPI=6
 inherit user

 MY_PN="${PN/-bin}"
-MY_PV="${PV/_/-}"
-MY_P="${MY_PN}-${MY_PV}"
+MY_P="${MY_PN}-${PV}"

 DESCRIPTION="Tool for managing events and logs"
 HOMEPAGE="https://www.elastic.co/products/logstash"
@ -16,7 +15,7 @@ SRC_URI="https://artifacts.elastic.co/downloads/${MY_PN}/${MY_P}.zip"

 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64"
 IUSE=""

 RESTRICT="strip"
@ -47,7 +46,7 @@ src_install() {
 	newins "${FILESDIR}/${MY_PN}.logrotate" "${MY_PN}"

 	newconfd "${FILESDIR}/${MY_PN}.confd" "${MY_PN}"
-	newinitd "${FILESDIR}/${MY_PN}.initd" "${MY_PN}"
+	newinitd "${FILESDIR}/${MY_PN}.initd2" "${MY_PN}"
 }

 pkg_postinst() {
--- a/app-arch/tar/files/tar-1.29-extract-pathname-bypass.patch
+++ b/app-arch/tar/files/tar-1.29-extract-pathname-bypass.patch
@ -0,0 +1,27 @@
+--- a/lib/paxnames.c	2016-04-06 00:04:47.314860045 +0300
+++ b/lib/paxnames.c	2016-04-06 02:08:44.962297881 +0300
+@@ -18,6 +18,7 @@
+ #include <system.h>
+ #include <hash.h>
+ #include <paxlib.h>
+#include <quotearg.h>
+ 
+ 
+ /* Hash tables of strings.  */
+@@ -114,7 +115,15 @@
+       for (p = file_name + prefix_len; *p; )
+ 	{
+           if (p[0] == '.' && p[1] == '.' && (ISSLASH (p[2]) || !p[2]))
+-	    prefix_len = p + 2 - file_name;
+            {
+	      static char const *const diagnostic[] =
+	      {
+		N_("%s: Member name contains '..'"),
+		N_("%s: Hard link target contains '..'")
+	      };
+	      ERROR ((0, 0, _(diagnostic[link_target]),
+	              quotearg_colon (file_name)));
+	    }
+ 
+ 	  do
+ 	    {
--- a/app-arch/tar/tar-1.29-r1.ebuild
+++ b/app-arch/tar/tar-1.29-r1.ebuild
@ -0,0 +1,81 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit flag-o-matic eutils
+
+DESCRIPTION="Use this to make tarballs :)"
+HOMEPAGE="https://www.gnu.org/software/tar/"
+SRC_URI="mirror://gnu/tar/${P}.tar.bz2
+	mirror://gnu-alpha/tar/${P}.tar.bz2"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="acl elibc_glibc minimal nls selinux static userland_GNU xattr"
+
+RDEPEND="acl? ( virtual/acl )
+	selinux? ( sys-libs/libselinux )"
+DEPEND="${RDEPEND}
+	nls? ( >=sys-devel/gettext-0.10.35 )
+	xattr? ( elibc_glibc? ( sys-apps/attr ) )"
+
+PATCHES=(
+	"${FILESDIR}/${P}-extract-pathname-bypass.patch"
+)
+
+src_prepare() {
+	epatch "${PATCHES[@]}"
+	epatch_user
+
+	if ! use userland_GNU ; then
+		sed -i \
+			-e 's:/backup\.sh:/gbackup.sh:' \
+			scripts/{backup,dump-remind,restore}.in \
+			|| die "sed non-GNU"
+	fi
+}
+
+src_configure() {
+	use static && append-ldflags -static
+	FORCE_UNSAFE_CONFIGURE=1 \
+	econf \
+		--enable-backup-scripts \
+		--bindir="${EPREFIX}"/bin \
+		--libexecdir="${EPREFIX}"/usr/sbin \
+		$(usex userland_GNU "" "--program-prefix=g") \
+		$(use_with acl posix-acls) \
+		$(use_enable nls) \
+		$(use_with selinux) \
+		$(use_with xattr xattrs)
+}
+
+src_install() {
+	default
+
+	local p=$(usex userland_GNU "" "g")
+	if [[ -z ${p} ]] ; then
+		# a nasty yet required piece of baggage
+		exeinto /etc
+		doexe "${FILESDIR}"/rmt
+	fi
+
+	# autoconf looks for gtar before tar (in configure scripts), hence
+	# in Prefix it is important that it is there, otherwise, a gtar from
+	# the host system (FreeBSD, Solaris, Darwin) will be found instead
+	# of the Prefix provided (GNU) tar
+	if use prefix ; then
+		dosym tar /bin/gtar
+	fi
+
+	mv "${ED}"/usr/sbin/${p}backup{,-tar} || die
+	mv "${ED}"/usr/sbin/${p}restore{,-tar} || die
+
+	if use minimal ; then
+		find "${ED}"/etc "${ED}"/*bin/ "${ED}"/usr/*bin/ \
+			-type f -a '!' '(' -name tar -o -name ${p}tar ')' \
+			-delete || die
+	fi
+}
--- a/app-emulation/flannel/Manifest
+++ b/app-emulation/flannel/Manifest
@ -1,2 +1 @@
-DIST flannel-0.5.4.tar.gz 578005 SHA256 14bbbabdbb85f3366ae6788a8b8ba110d56add15e06def4d8ead4c9698fc15fd SHA512 535d3de31186760cd72cac5753fabc269c8ebf9f3fe90a381b86dae0747a1dd4f4099cce19729a7d5990fefc99236bea8742062605a376f9bd9f653c07b4e92a WHIRLPOOL 10756f47fc35ce39ac1b9321d4bb347993d8d5dd37bc83bf769e35e32f3de02bbba89d39142c4b6eb8a6bd92be7a5ad91c45bf0f8aeb6e0efe050383766c3aef
 DIST flannel-0.5.5.tar.gz 592235 SHA256 dbbcb08c0e70713b0c920387a9967e5b30ef833c8118c847edbbca4f68ff0562 SHA512 5300583752fbfa0da3c1a066268a7441271c02a0304213cc854c252727b5035db4a51a4747ad54db3c741b6f623363c99920a5bf2292c59dc3dc4d653b366f83 WHIRLPOOL c97b7ece323309343fef40b36a826b420f3be5df61ac7bb9ae4faa48802c395be886b8a6740765779e2023a5bdbffde21dda1934179e4e284204aa821275e645
--- a/app-emulation/flannel/flannel-0.5.4.ebuild
+++ b/app-emulation/flannel/flannel-0.5.4.ebuild
@ -1,46 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit systemd user
-
-KEYWORDS="~amd64"
-DESCRIPTION="An etcd backed network fabric for containers"
-GO_PN="github.com/coreos/flannel"
-HOMEPAGE="https://${GO_PN}"
-SRC_URI="https://${GO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-DEPEND=">=dev-lang/go-1.4:="
-RDEPEND=""
-
-src_prepare() {
-	local line
-	sed -e 's:go build:[[ ${0##*/} == test ]] || \0 -v -x:' -i build || die
-	sed -e 's:go test:\0 -v:' -i test || die
-
-	# remote_test.go:98: GetNetworkConfig failed: Get http://127.0.0.1:9999/v1/_/config: dial tcp 127.0.0.1:9999: getsockopt: connection refused
-	sed -e 's:^func TestRemote:func _TestRemote:' -i remote/remote_test.go || die
-}
-
-src_compile() {
-	"${BASH}" -ex ./build || die 'Build failed'
-}
-
-src_test() {
-	"${BASH}" -ex ./test || die 'Tests failed'
-}
-
-src_install() {
-	dobin bin/*
-	exeinto /usr/libexec/flannel
-	doexe dist/mk-docker-opts.sh
-	insinto /etc/systemd/system/docker.service.d
-	newins "${FILESDIR}/flannel-docker.conf" flannel.conf
-	systemd_newtmpfilesd "${FILESDIR}/flannel.tmpfilesd" flannel.conf
-	systemd_dounit "${FILESDIR}/flanneld.service"
-}
--- a/app-emulation/lxd/Manifest
+++ b/app-emulation/lxd/Manifest
@ -1,3 +1,4 @@
 DIST lxd-2.2.tar.bz2 2234844 SHA256 c76b8698a9266afa5e4aec3ccaa283226cc52232e10ad376f02c4bcd000126b7 SHA512 272cd02f8533a18a51739fd2698f239cd57ae852fbf828d3dc53ed1253629808984720bde9173ae7df1f9e94389ab929b53893e7b57c2d0f6571744365c1c93a WHIRLPOOL d76c5ed9bedde8d51403a452bfc1f33bcb19d71fca79439c63f2b70bd58544ff0c05f4008f2603935dd1c63c4d0ea5c733775c723330de692fc5f6cd471d1529
 DIST lxd-2.3.tar.bz2 2248758 SHA256 cd746b3f9682e50b7973e6175a5b48b999748face9e4b515491773ade9d754c4 SHA512 746ea9c2e9266a8482a62fc9e9fdb83f0713b0094e1b52957c5bf2fbd00f4bf1d7a0978086ab123d60ac02bd0dd1f00d46801959ced3b01308170dd7911c7bdc WHIRLPOOL f899e78bd3082ddd46dab5d09d83fe23a23aabbee09488f48ef2ff4a9f3bc41878ecb50b4223235c12962b01468c7b0124c0ae54e60d452f224824cbc89d144e
 DIST lxd-2.4.1.tar.bz2 2257768 SHA256 4a02c74819870be5df71227f90be4bc1b7cb90784c115c9f96a6174c8d4dcf75 SHA512 84ce4911a55d495f809a4174061577eceba0b3cd0381170a23fea91651049e43ec809494bf885b315b2d5fde7cda19ee29eed71259b88d3a789fd87c26aac3db WHIRLPOOL 70a2eb3c6b239e9d8682005134ae5c8e991b2f331685b971e1e8d09173aec8c34848527c9f893af0f937384d0f33f7a9e626f8063a00e2fa450331acf00ad7fe
+DIST lxd-2.5.tar.bz2 2267313 SHA256 d87ac77ec6f47cd3e3417a78b0c315dac367bc89c532cf1784d80b31e57cfc8d SHA512 c023f2b9ccd958560eead23806cb60a04371a3721420f5c0d65e55cf2d7647d6690677619c4f8fa91573545817a1444d9d61f6a2b6ca8c3870136911cb1fbce9 WHIRLPOOL e4702e2597c5fe88ffa5139b829146ea474959799910bed79db617d9486da73d9de77c1ad398c1112d04109a858e5684f2c676bfe9fd4d68cf5081fbc0f6ae7a
--- a/app-emulation/lxd/files/lxd-2.5-dont-go-get.patch
+++ b/app-emulation/lxd/files/lxd-2.5-dont-go-get.patch
@ -0,0 +1,22 @@
+--- /Makefile.orig	2016-07-11 23:34:40.299664675 +0000
+++ /Makefile	2016-07-11 23:37:00.816018727 +0000
+@@ -12,19 +12,11 @@
+ 
+ .PHONY: default
+ default:
+-	# Must a few times due to go get race
+-	-go get -t -v -d ./...
+-	-go get -t -v -d ./...
+-	-go get -t -v -d ./...
+ 	go install -v $(DEBUG) ./...
+ 	@echo "LXD built successfully"
+ 
+ .PHONY: client
+ client:
+-	# Must a few times due to go get race
+-	-go get -t -v -d ./...
+-	-go get -t -v -d ./...
+-	-go get -t -v -d ./...
+ 	go install -v $(DEBUG) ./lxc
+ 	@echo "LXD client built successfully"
+ 
--- a/app-emulation/lxd/files/lxd-2.5.confd
+++ b/app-emulation/lxd/files/lxd-2.5.confd
@ -0,0 +1,27 @@
+# Group which owns the shared socket
+LXD_OPTIONS+=" --group lxd"
+
+
+
+# Enable cpu profiling into the specified file
+#LXD_OPTIONS+=" --cpuprofile /tmp/lxc_cpu_profile"
+
+# Enable memory profiling into the specified file
+#LXD_OPTIONS+=" --memprofile /tmp/lxc_mem_profile"
+
+
+
+# Enables debug mode
+#LXD_OPTIONS+=" --debug"
+
+# For debugging, print a complete stack trace every n seconds
+#LXD_OPTIONS+=" --print-goroutines-every 5"
+
+# Enables verbose mode
+#LXD_OPTIONS+=" -v"
+
+# Logfile to log to
+#LXD_OPTIONS+=" --logfile /var/log/lxd/lxd.log"
+
+# Enables syslog logging
+#LXD_OPTIONS+=" --syslog"
--- a/app-emulation/lxd/files/lxd-2.5.initd
+++ b/app-emulation/lxd/files/lxd-2.5.initd
@ -0,0 +1,50 @@
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+DAEMON=/usr/sbin/lxd
+PIDFILE=/run/lxd.pid
+
+extra_commands="stopall"
+
+depend() {
+    need net
+    use lxcfs
+
+    # remove with 2.0 release
+    need cgmanager
+}
+
+start() {
+    ebegin "Starting lxd server"
+
+    start-stop-daemon --start \
+		      --pidfile ${PIDFILE} \
+		      --exec ${DAEMON} \
+		      --background \
+		      --make-pidfile \
+		      -- \
+		      ${LXD_OPTIONS}
+
+    eend $?
+}
+
+stop() {
+    if [[ $RC_GOINGDOWN = YES ]] || [[ $RC_REBOOT = YES ]]; then
+	stopall
+    else
+	ebegin "Stopping lxd service (but not containers)"
+	start-stop-daemon --stop --quiet -R TERM/45 -p ${PIDFILE}
+	eend $?
+    fi
+}
+
+stopall() {
+    ebegin "Stopping lxd service and containers"
+    if "${DAEMON}" shutdown; then
+	/etc/init.d/lxd zap
+	rm -f ${PIDFILE}
+    fi
+    eend $?
+}
--- a/app-emulation/lxd/lxd-2.5.ebuild
+++ b/app-emulation/lxd/lxd-2.5.ebuild
@ -0,0 +1,195 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DESCRIPTION="Fast, dense and secure container management"
+HOMEPAGE="https://linuxcontainers.org/lxd/introduction/"
+EGO_PN_PARENT="github.com/lxc"
+EGO_PN="${EGO_PN_PARENT}/lxd"
+
+# The source is repackaged using a script at:
+#   https://dev.gentoo.org/~stasibear/lxd_repackage.py
+# This is necessary because go's native package management assumes
+# that a build starts with checking out many git repositories, often
+# from HEAD.  This provides no way to build the same code repeatably,
+# and anyway portage requires that fetching is only done from SRC_URI.
+# The only sane alternative I've seen is in the consul ebuild, which
+# is more transparent but raises other questions.
+SRC_URI="https://dev.gentoo.org/~stasibear/distfiles/${P}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+PLOCALES="de fr ja"
+IUSE="+daemon nls test"
+
+# IUSE and PLOCALES must be defined before l10n inherited
+inherit bash-completion-r1 golang-build l10n linux-info systemd user vcs-snapshot
+
+DEPEND="
+	>=dev-lang/go-1.7.1
+	dev-go/go-crypto
+	dev-libs/protobuf
+	nls? ( sys-devel/gettext )
+	test? (
+		app-misc/jq
+		dev-db/sqlite
+		net-misc/curl
+		sys-devel/gettext
+	)
+"
+
+RDEPEND="
+	daemon? (
+		app-admin/cgmanager
+		app-arch/xz-utils
+		app-emulation/lxc[cgmanager,seccomp]
+		net-dns/dnsmasq[dhcp,ipv6]
+		net-misc/rsync[xattr]
+		sys-apps/iproute2[ipv6]
+		sys-fs/squashfs-tools
+		virtual/acl
+	)
+"
+
+CONFIG_CHECK="
+	~BRIDGE
+	~DUMMY
+	~IP6_NF_NAT
+	~IP6_NF_TARGET_MASQUERADE
+	~IPV6
+	~IP_NF_NAT
+	~IP_NF_TARGET_MASQUERADE
+	~MACVLAN
+	~NETFILTER_XT_MATCH_COMMENT
+	~NET_IPGRE
+	~NET_IPGRE_DEMUX
+	~NET_IPIP
+	~NF_NAT_MASQUERADE_IPV4
+	~NF_NAT_MASQUERADE_IPV6
+	~VXLAN
+"
+
+ERROR_BRIDGE="BRIDGE: needed for network commands"
+ERROR_DUMMY="DUMMY: needed for network commands"
+ERROR_IP6_NF_NAT="IP6_NF_NAT: needed for network commands"
+ERROR_IP6_NF_TARGET_MASQUERADE="IP6_NF_TARGET_MASQUERADE: needed for network commands"
+ERROR_IPV6="IPV6: needed for network commands"
+ERROR_IP_NF_NAT="IP_NF_NAT: needed for network commands"
+ERROR_IP_NF_TARGET_MASQUERADE="IP_NF_TARGET_MASQUERADE: needed for network commands"
+ERROR_MACVLAN="MACVLAN: needed for network commands"
+ERROR_NETFILTER_XT_MATCH_COMMENT="NETFILTER_XT_MATCH_COMMENT: needed for network commands"
+ERROR_NET_IPGRE="NET_IPGRE: needed for network commands"
+ERROR_NET_IPGRE_DEMUX="NET_IPGRE_DEMUX: needed for network commands"
+ERROR_NET_IPIP="NET_IPIP: needed for network commands"
+ERROR_NF_NAT_MASQUERADE_IPV4="NF_NAT_MASQUERADE_IPV4: needed for network commands"
+ERROR_NF_NAT_MASQUERADE_IPV6="NF_NAT_MASQUERADE_IPV6: needed for network commands"
+ERROR_VXLAN="VXLAN: needed for network commands"
+
+PATCHES=("${FILESDIR}/${P}-dont-go-get.patch")
+
+# KNOWN ISSUES:
+# - Translations may not work.  I've been unsuccessful in forcing
+#   localized output.  Anyway, upstream (Canonical) doesn't install the
+#   message files.
+
+src_prepare() {
+	cd "${S}/src/${EGO_PN}" || die "Failed to change to deep src dir"
+
+	default_src_prepare
+
+	tmpgoroot="${T}/goroot"
+	mkdir -p "$tmpgoroot" || die "Failed to create temporary GOROOT"
+	cp -sR "$(get_golibdir_gopath)"/* "${tmpgoroot}" || die "Failed to copy files to temporary GOROOT"
+
+	# Warn on unhandled locale changes
+	l10n_find_plocales_changes po "" .po
+}
+
+src_compile() {
+	golang-build_src_compile
+
+	cd "${S}/src/${EGO_PN}" || die "Failed to change to deep src dir"
+
+	tmpgoroot="${T}/goroot"
+	if use daemon; then
+		# Build binaries
+		GOPATH="${S}:${tmpgoroot}" emake
+	else
+		# build client tool
+		GOPATH="${S}:${tmpgoroot}" emake client
+	fi
+
+	use nls && emake build-mo
+}
+
+src_test() {
+	if use daemon; then
+		# Go native tests should succeed
+		golang-build_src_test
+	fi
+}
+
+src_install() {
+	# Installs all src,pkg to /usr/lib/go-gentoo
+	golang-build_src_install
+
+	cd "${S}"
+	dobin bin/lxc
+	use daemon && dosbin bin/lxd
+
+	cd "src/${EGO_PN}"
+
+	if use nls; then
+		for lingua in ${PLOCALES}; do
+			if use linguas_${lingua}; then
+				domo po/${lingua}.mo
+			fi
+		done
+	fi
+
+	if use daemon; then
+		newinitd "${FILESDIR}"/${P}.initd lxd
+		newconfd "${FILESDIR}"/${P}.confd lxd
+
+		systemd_dounit "${FILESDIR}"/lxd.service
+	fi
+
+	newbashcomp config/bash/lxd-client lxc
+
+	dodoc AUTHORS CONTRIBUTING.md README.md doc/*
+}
+
+pkg_postinst() {
+	einfo
+	einfo "Consult https://wiki.gentoo.org/wiki/LXD for more information,"
+	einfo "including a Quick Start."
+
+	# The messaging below only applies to daemon installs
+	use daemon || return 0
+
+	# The control socket will be owned by (and writeable by) this group.
+	enewgroup lxd
+
+	# Ubuntu also defines an lxd user but it appears unused (the daemon
+	# must run as root)
+
+	einfo
+	einfo "Though not strictly required, some features are enabled at run-time"
+	einfo "when the relevant helper programs are detected:"
+	einfo "- sys-apps/apparmor"
+	einfo "- sys-fs/btrfs-progs"
+	einfo "- sys-fs/lvm2"
+	einfo "- sys-fs/lxcfs"
+	einfo "- sys-fs/zfs"
+	einfo "- sys-process/criu"
+	einfo
+	einfo "Since these features can't be disabled at build-time they are"
+	einfo "not USE-conditional."
+	einfo
+	einfo "Networks with bridge.mode=fan are unsupported due to requiring"
+	einfo "a patched kernel and iproute2."
+}
--- a/app-misc/elasticsearch/Manifest
+++ b/app-misc/elasticsearch/Manifest
@ -12,4 +12,4 @@ DIST elasticsearch-2.3.4.tar.gz 27547169 SHA256 371e0c5f4ded0a8548f1cce55faff3ef
 DIST elasticsearch-2.3.5.tar.gz 27547995 SHA256 1119a8c18620b98c4b85261318663a1f26dea92a26f34dfeb7f813fb7cbb468a SHA512 9c0cc8a9ae0fa2b52db583a5c006b05a84c1f84e1b8dbbafa88bec111190d056a23bd384d4241ce00dc8b56a6840857b296e4c0d2bf911f352ef67f128a87ca7 WHIRLPOOL de2aee3773d14c9b4abc0f20c3c8df1fe374a91ea54493f2c1df59fb8c02c97d684fd94b6bfaf140eebcfea4913197b10469b5aef34f62db89d825ae508a5095
 DIST elasticsearch-2.4.0.tar.gz 27364449 SHA256 3ae01140ae7bcbb91436feef381fbed774e36ef6d1e8e6a3153640db82acf4c9 SHA512 931f4d42cba43131718ec7480439b5fda0b9222a51cf9639d99ab4c00bdbedbe7e8da7a6016d88b848772cd416bc49fe7af09202160cecf839e39d803b45e869 WHIRLPOOL e03a2f7a6ea5913ce112b82e8578183c401f2d5901070a77c509ddbe7333fe62622fb2bb3e0f786a914bb15c56793e8b13220ae4588271baa3bbbcdf86223f47
 DIST elasticsearch-2.4.1.tar.gz 27364109 SHA256 23a369ef42955c19aaaf9e34891eea3a055ed217d7fbe76da0998a7a54bbe167 SHA512 69b22d5c2fc93e9bc83c5da415e110105d4d977aa98633041f51f8c55ba9e6045803584965367f6e1f962122ad81a8e07fefcc5a01c5381057ec921d65bc1751 WHIRLPOOL 893056d0cd23ae41e2cb9e3db4591108777b4360ad6be5c52782cc98379ab0f0c36b42758f9815fbaf8557c9e06723c03765fd9eb4cbfcf9fe0d3203d8e6039d
-DIST elasticsearch-5.0.0-rc1.tar.gz 32963528 SHA256 309ea46f81c5df97f60b6b13bb1d34b425c1598e101a91799ffbfb887944f8ac SHA512 ac69fe70d83cc868ed381a5773f86042e74aeafd55a7a426662837ae86b0376d9827559a89af1da4521be923bb27d67bb0f0a1d1f47f0e47ababd3eef9b66a73 WHIRLPOOL 684cbf0701774cfa260999861ac08594bd023166f26c851db94efddff0bbc830df04b58b30b7d6ba0faff82ea88e141a8ae1dcb95d9bfda98c04e4db399107eb
+DIST elasticsearch-5.0.0.tar.gz 32968292 SHA256 a866534f0fa7428e980c985d712024feef1dee04709add6e360fc7b73bb1e7ae SHA512 a4fa650d643c242a1f90059cfe6eb27e3d240b3deafc426abeae72c13aeae84b01ffb8b872b748619dfc58225ca29bde054fe10e1529522f9a06a1051991e4cd WHIRLPOOL a05a6dc785c00bb461ea286490cacc0222f9f95f0dea7ba61c6308cee0284edc53ee0a2047f723e990fa99f7ed09feda46313997b8f6dd487b042a6b26ecf8d6
--- a/app-misc/elasticsearch/elasticsearch-5.0.0_rc1.ebuild
+++ b/app-misc/elasticsearch/elasticsearch-5.0.0_rc1.ebuild
@ -7,19 +7,18 @@ EAPI=5
 inherit eutils systemd user

 MY_PN="${PN%-bin}"
-MY_PV="${PV/_/-}"
 DESCRIPTION="Open Source, Distributed, RESTful, Search Engine"
 HOMEPAGE="https://www.elastic.co/products/elasticsearch"
-SRC_URI="https://artifacts.elastic.co/downloads/${MY_PN}/${MY_PN}-${MY_PV}.tar.gz"
+SRC_URI="https://artifacts.elastic.co/downloads/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64"

 RESTRICT="strip"

 RDEPEND="|| ( virtual/jre:1.8 virtual/jre:1.7 )"

-S="${WORKDIR}/${MY_PN}-${MY_PV}"
+S="${WORKDIR}/${MY_PN}-${PV}"

 pkg_preinst() {
 	if has_version '<app-misc/elasticsearch-2.3.2'; then
--- a/app-portage/java-ebuilder/java-ebuilder-0.1.ebuild
+++ b/app-portage/java-ebuilder/java-ebuilder-0.1.ebuild
@ -20,7 +20,9 @@ LICENSE="GPL-2"
 SLOT="0"

 DEPEND=">=virtual/jdk-1.8"
-RDEPEND=">=virtual/jre-1.8"
+RDEPEND=">=virtual/jre-1.8
+	sys-process/parallel
+	>=dev-java/maven-bin-3"

 S="${WORKDIR}/${P}"

@ -39,7 +41,7 @@ Main-Class: ${MAIN_CLASS}" \
 }

 src_prepare() {
-	hprefixify scripts/{{tree,meta}.sh,movl}
+	hprefixify scripts/{{tree,meta}.sh,movl} java-ebuilder.conf
 	eapply_user
 }

@ -49,7 +51,7 @@ src_install() {

 	insinto /var/lib/${PN}
 	doins -r maven
-	dodir /var/lib/${PN}o/{poms,cache}
+	dodir /var/lib/${PN}/{poms,cache}

 	dodoc README maven.conf

@ -57,4 +59,7 @@ src_install() {
 	doexe scripts/{tree,meta}.sh

 	dobin scripts/movl
+
+	insinto /etc
+	doins java-ebuilder.conf
 }
--- a/app-portage/java-ebuilder/java-ebuilder-9999.ebuild
+++ b/app-portage/java-ebuilder/java-ebuilder-9999.ebuild
@ -20,7 +20,9 @@ LICENSE="GPL-2"
 SLOT="0"

 DEPEND=">=virtual/jdk-1.8"
-RDEPEND=">=virtual/jre-1.8"
+RDEPEND=">=virtual/jre-1.8
+	sys-process/parallel
+	>=dev-java/maven-bin-3"

 S="${WORKDIR}/${P}"

@ -39,7 +41,7 @@ Main-Class: ${MAIN_CLASS}" \
 }

 src_prepare() {
-	hprefixify scripts/{{tree,meta}.sh,movl}
+	hprefixify scripts/{{tree,meta}.sh,movl} java-ebuilder.conf
 	eapply_user
 }

@ -49,7 +51,7 @@ src_install() {

 	insinto /var/lib/${PN}
 	doins -r maven
-	dodir /var/lib/${PN}o/{poms,cache}
+	dodir /var/lib/${PN}/{poms,cache}

 	dodoc README maven.conf

@ -57,4 +59,7 @@ src_install() {
 	doexe scripts/{tree,meta}.sh

 	dobin scripts/movl
+
+	insinto /etc
+	doins java-ebuilder.conf
 }
--- a/app-text/libwps/Manifest
+++ b/app-text/libwps/Manifest
@ -2,3 +2,4 @@ DIST libwps-0.2.9.tar.xz 387340 SHA256 cf9a17a6c0452ab32cce342c1410f1620c66f9cb6
 DIST libwps-0.3.1.tar.xz 410376 SHA256 bb2c2a7db5121411ba705ccf3452cdce51d9798384fd9621e9702ba802878e93 SHA512 f628e6532b32331c7df0d97a9b71bf1f97347634657148b47d46ba7c2fd888d7fa9ffe52f31cfc24f86688c9c713bfaff360c7fe9f4a92d646cf8f21e7f5c2b1 WHIRLPOOL ebe35fabf22aedccfe3ca35e46971a26332040852357ea0f2241534261c77d597da38766192661ecd6fa24881e0bf9de4a80bdfea300129420d4635924434110
 DIST libwps-0.4.2.tar.xz 543052 SHA256 e4fa907dd2b49b309fb4a860332bc44158570e02cb4ec07d4c8577b374b9f935 SHA512 6e91a4dbb26335b6d4db47daec70d4f50313a8101de1dccce592cec49e00aaf50256580b3ea0c37f24b7ad1cc065a82e0a71deb0cfcd23dabf0a2627d915f48f WHIRLPOOL 137f54be1a0d342205275891008a8de32ae3ee6ba6c2cdafccd61112e4e99e82039a471ef2aa98f0a935a470f48cc59690e8e783e676cde50a78ff1e56558e6c
 DIST libwps-0.4.3.tar.xz 539624 SHA256 617d448a6c9bf935fc77a766e0b45d26f0886663d90b9bb00cfed9c28fbf13da SHA512 b05375a956871386fe4e4448407868cdc6f09a8ff5c6329450396529bf148222a17dd9e82f92f443d5d86030e4ef10d18fc89363b91d1dd36f14d4c24d8645d9 WHIRLPOOL 807d0800f17ec0fb9fc82828b1b9f434c06f61a3d2acfdb23c8b2bb5d1989c8a94091fd508ab0a2d5b17a5ece89c03258ecf85d875b348039caea488b75c4d35
+DIST libwps-0.4.4.tar.xz 574768 SHA256 b7c564bba7bc9058c524eaf94cb43448832aa03e3d763b98e11ee12d25082df4 SHA512 201b4a7d6788e4193aeff694e25bbda78678126b654907f4d20783afa343a069d7f6c12344b261496434df4fd1f3df933881a5ed5358f330cd15568c8710963d WHIRLPOOL de32feb8721771a5058b283b5dd6a59e005db1e53a8539c5e1268540cf3e9f5d0353babafcb42e82aade103dd1efc0834f0a80d7b3e995a8d5464ffbc0f538b7
--- a/app-text/libwps/libwps-0.4.4.ebuild
+++ b/app-text/libwps/libwps-0.4.4.ebuild
@ -0,0 +1,40 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit eutils
+
+DESCRIPTION="Microsoft Works file word processor format import filter library"
+HOMEPAGE="http://libwps.sourceforge.net/"
+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"
+
+RDEPEND="
+	app-text/libwpd:0.10
+	dev-libs/boost:=
+	dev-libs/librevenge
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+
+src_configure() {
+	econf \
+		--disable-werror \
+		$(use_enable static-libs static) \
+		--docdir=/usr/share/doc/${PF} \
+		$(use_with doc docs) \
+		$(use_enable debug)
+}
+
+src_install() {
+	default
+	prune_libtool_files --all
+}
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@ -1,4 +1,5 @@
 DIST mariadb-10.0.27.tar.gz 63258508 SHA256 bdf3a0c25aa2bc7a22a47e994eb7c8aa782624810eb3156038cc62bc9085c0cd SHA512 c3aa415b7fc766dce34c99795cfcfa424a8d7eb7ee19497f1a61cad7c708914b94d66eabb104dff364b2db77d07471ce810d708ec541efb1bed7291ca1ce7364 WHIRLPOOL 9a90edc10d482140da818bee7598dd1b468076091478fb63e19f475d8a3af6e059f04d85851b701b6e305b9912aefa7bbfa0b0045c075db8d9f16c30944da584
+DIST mariadb-10.0.28.tar.gz 63297461 SHA256 0a5033d56f1c5403df7fabd519ccbdc4da308b30a1ecd52e06a19be182a9bab2 SHA512 af4a0e830902d8916b4727e8d3d70ff5c5b7871b46fedb5d890881b5d22f196a423da0d4b1e9e0e6a25a40cfacd7fb1781d4a85dc1f9b31c89bbde8b50ffabc3 WHIRLPOOL 65c889d663f5ccacd9bebf87d5631d4ccb86df2245008db802697efb54f4db99fa461019b6aa58d3e95a76903de184e17590b2c606a1661a9686c6b448ade6aa
 DIST mariadb-10.1.17.tar.gz 61158134 SHA256 4ca45ac5e34418761868115ebc8c068d511fed08e283b2cac52559d63ba4aab5 SHA512 900f019ec7544e315c98aea3647988f6ec257822b116c8a986851db678dd0bf71018dde1d0c90adeaa713af12348344ffc54c292a64869d9565f3f906599396d WHIRLPOOL e2e4d1294bc64c37d6916dc291d33769fd05c591697efba27fff79cb4debc76cf7a5eaf6e63a9ce3a12c22653ffc9d25082eb5a03f4f402b7395b91cb9ea415d
 DIST mariadb-10.2.1.tar.gz 55721519 SHA256 90b7a17f3372c92c12dff084b37fcca8c4cf8106f4dcabd35fadc8efbaa348a2 SHA512 3dde348e4bba2b6837e0a0671e9ec944aa494e4a01ebb4704e067cc8fe71865aef685f4ce368e9a81c5adeb1e8cc4f3a1b4067193a4b1ffc1fc567bf79a0b4ff WHIRLPOOL cbf33b7f6fb131a834367214ff4ab49bbda8aebb6e6fe449c7be2648934bcdab79c50a043907c07603f51892041701be59ff45984db43e302b2174f6fd40bc31
 DIST mariadb-5.5.52.tar.gz 45745859 SHA256 e142f9459507b97c5848042863b313ce70750118446bb4e35e5c07fe66007293 SHA512 76d1c1209aa8b56d6562907cb224d0be4f6bccd46e30d16dfb57f19fee1c60dcba21d8388c70674cac0a09e11361e1c5296d1e79d2ba9edc16bc4f9c7a7733eb WHIRLPOOL 4030f24f9d79fded7eb51a9c84b590f81a58ae07797322a6b6f5c3f6c84ea86975eceeb03922c38acf0bcd18769c8a0759624822e570d7301fc950cffc283631
--- a/dev-db/mariadb/mariadb-10.0.28.ebuild
+++ b/dev-db/mariadb/mariadb-10.0.28.ebuild
@ -0,0 +1,208 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+MY_EXTRAS_VER="20160629-1442Z"
+SUBSLOT="18"
+MYSQL_PV_MAJOR="5.6"
+
+JAVA_PKG_OPT_USE="jdbc"
+
+inherit toolchain-funcs java-pkg-opt-2 mysql-multilib-r1
+
+HOMEPAGE="http://mariadb.org/"
+DESCRIPTION="An enhanced, drop-in replacement for MySQL"
+
+IUSE="bindist jdbc odbc oqgraph pam sphinx tokudb xml"
+RESTRICT="!bindist? ( bindist )"
+
+REQUIRED_USE="server? ( tokudb? ( jemalloc ) ) static? ( !pam )"
+
+# REMEMBER: also update eclass/mysql*.eclass before committing!
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+
+MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}"
+PATCHES=(
+	"${MY_PATCH_DIR}/01050_all_mariadb_mysql_config_cleanup-5.5.41.patch"
+	"${MY_PATCH_DIR}/20006_all_cmake_elib-mariadb-10.0.26.patch"
+	"${MY_PATCH_DIR}/20009_all_mariadb_myodbc_symbol_fix-5.5.38.patch"
+	"${MY_PATCH_DIR}/20018_all_mariadb-10.0.20-without-clientlibs-tools.patch"
+)
+COMMON_DEPEND="
+	!bindist? ( >=sys-libs/readline-4.1:0=	)
+	server? (
+		extraengine? (
+			odbc? ( dev-db/unixODBC:0= )
+			xml? ( dev-libs/libxml2:2= )
+		)
+		oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= )
+		pam? ( virtual/pam:0= )
+		tokudb? ( app-arch/snappy )
+	)
+	>=dev-libs/libpcre-8.35:3=
+"
+DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
+	server? ( extraengine? ( jdbc? ( >=virtual/jdk-1.6 ) ) )
+	${COMMON_DEPEND}"
+RDEPEND="${RDEPEND} ${COMMON_DEPEND}
+	perl? ( !dev-db/mytop
+		virtual/perl-Getopt-Long
+		dev-perl/TermReadKey
+		virtual/perl-Term-ANSIColor
+		virtual/perl-Time-HiRes )
+	server? ( extraengine? ( jdbc? ( >=virtual/jre-1.6 ) ) )
+"
+MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/mysql_version.h
+	/usr/include/mysql/private/probes_mysql_nodtrace.h
+	/usr/include/mysql/private/probes_mysql_dtrace.h )
+
+pkg_setup() {
+	java-pkg-opt-2_pkg_setup
+	mysql-multilib-r1_pkg_setup
+}
+
+pkg_preinst() {
+	java-pkg-opt-2_pkg_preinst
+	mysql-multilib-r1_pkg_preinst
+}
+
+src_prepare() {
+	java-pkg-opt-2_src_prepare
+	mysql-multilib-r1_src_prepare
+}
+
+src_configure(){
+	# bug 508724 mariadb cannot use ld.gold
+	tc-ld-disable-gold
+	local MYSQL_CMAKE_NATIVE_DEFINES=(
+			-DWITH_JEMALLOC=$(usex jemalloc system)
+			-DWITH_PCRE=system
+	)
+	if use server ; then
+		# Federated{,X} must be treated special otherwise they will not be built as plugins
+		if ! use extraengine ; then
+			MYSQL_CMAKE_NATIVE_DEFINES+=(
+				-DWITHOUT_FEDERATED=1
+				-DWITHOUT_FEDERATEDX=1 )
+		fi
+
+		MYSQL_CMAKE_NATIVE_DEFINES+=(
+			$(mysql-cmake_use_plugin oqgraph OQGRAPH)
+			$(mysql-cmake_use_plugin sphinx SPHINX)
+			$(mysql-cmake_use_plugin tokudb TOKUDB)
+			$(mysql-cmake_use_plugin pam AUTH_PAM)
+			-DWITHOUT_CASSANDRA=0
+			$(mysql-cmake_use_plugin extraengine SEQUENCE)
+			$(mysql-cmake_use_plugin extraengine SPIDER)
+			$(mysql-cmake_use_plugin extraengine CONNECT)
+			-DCONNECT_WITH_MYSQL=1
+			-DCONNECT_WITH_LIBXML2=$(usex xml)
+			-DCONNECT_WITH_ODBC=$(usex odbc)
+			-DCONNECT_WITH_JDBC=$(usex jdbc)
+			-DWITHOUT_MROONGA=1
+		)
+	fi
+	mysql-multilib-r1_src_configure
+}
+
+# Official test instructions:
+# USE='embedded extraengine perl server openssl static-libs' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mariadb-X.X.XX.ebuild \
+# digest clean package
+multilib_src_test() {
+
+	if ! multilib_is_native_abi ; then
+		einfo "Server tests not available on non-native abi".
+		return 0;
+	fi
+
+	local TESTDIR="${BUILD_DIR}/mysql-test"
+	local retstatus_unit
+	local retstatus_tests
+
+	if use server ; then
+
+		# Bug #213475 - MySQL _will_ object strenously if your machine is named
+		# localhost. Also causes weird failures.
+		[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
+
+		if [[ $UID -eq 0 ]]; then
+			die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
+		fi
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+		addpredict /this-dir-does-not-exist/t9.MYI
+
+		# Run CTest (test-units)
+		cmake-utils_src_test
+		retstatus_unit=$?
+		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
+
+		# Ensure that parallel runs don't die
+		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
+		# Enable parallel testing, auto will try to detect number of cores
+		# You may set this by hand.
+		# The default maximum is 8 unless MTR_MAX_PARALLEL is increased
+		export MTR_PARALLEL="${MTR_PARALLEL:-auto}"
+
+		# create directories because mysqladmin might run out of order
+		mkdir -p "${T}"/var-tests{,/log}
+
+		# These are failing in MariaDB 10.0 for now and are believed to be
+		# false positives:
+		#
+		# main.information_schema, binlog.binlog_statement_insert_delayed,
+		# main.mysqld--help, funcs_1.is_triggers, funcs_1.is_tables_mysql,
+		# funcs_1.is_columns_mysql main.bootstrap
+		# fails due to USE=-latin1 / utf8 default
+		#
+		# main.mysql_client_test, main.mysql_client_test_nonblock
+		# main.mysql_client_test_comp:
+		# segfaults at random under Portage only, suspect resource limits.
+		#
+		# archive.mysqlhotcopy_archive main.mysqlhotcopy_myisam
+		# fails due to bad cleanup of previous tests when run in parallel
+		# The tool is deprecated anyway
+		# Bug 532288
+
+#main.bootstrap \
+#		for t in main.mysql_client_test main.mysql_client_test_nonblock \
+#			main.mysql_client_test_comp \
+#			binlog.binlog_statement_insert_delayed main.information_schema \
+#			main.mysqld--help \
+#			archive.mysqlhotcopy_archive main.mysqlhotcopy_myisam \
+#			funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql ; do
+#				mysql-multilib-r1_disable_test  "$t" "False positives in Gentoo"
+#		done
+
+		# Run mysql tests
+		pushd "${TESTDIR}" || die
+
+		# run mysql-test tests
+		perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder
+
+		retstatus_tests=$?
+		[[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		popd || die
+
+		# Cleanup is important for these testcases.
+		pkill -9 -f "${S}/ndb" 2>/dev/null
+		pkill -9 -f "${S}/sql" 2>/dev/null
+
+		failures=""
+		[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
+		[[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		[[ -z "$failures" ]] || die "Test failures: $failures"
+		einfo "Tests successfully completed"
+
+	else
+		einfo "Skipping server tests due to minimal build."
+	fi
+}
--- a/dev-java/swt/Manifest
+++ b/dev-java/swt/Manifest
@ -1,9 +1,6 @@
 DIST swt-3.5.2-gtk-linux-ppc.zip 4947929 SHA256 f2619f6e107eee3c55c6694df4c89e77976d2d5517b6f3c17c358602536abf28 SHA512 2d3d194d2bb4c7f0e6d5bc801d41cb6de970de78c544a7edd2f18c4ed9291f7639dbedab4594c5221e76dd559c884c6fda7f32d11d0465a2d017fe0398a33dae WHIRLPOOL 282057de0d2e23c887db96d20ff8e39a1ea1e87adde415357903323095d4439e966218390932bebd2234dfed2117a0afa93372e9088e695770cb521ff7180501
 DIST swt-3.5.2-gtk-linux-x86.zip 4881316 SHA256 00477e6fc3c913916cd980a1ec29629c5250afc52dc0fcee74b035af0360eef7 SHA512 f53226458e5404cc03475c3bb903de81efa328625b713fe97b3b418a769b0476695e437e0693b5e10fa9a356de90302d6a2d267fe5e13f172803c684db9e9c82 WHIRLPOOL 4ca8f495c6d499ed8f1f6789333a6b357978029a6138a9986b6ef309a3e60303b6399b3c288e3732b13b75eb1db45e3679a559c806113a80572b0a05a226cadd
 DIST swt-3.5.2-gtk-linux-x86_64.zip 5068674 SHA256 91f9e2d4f6ca3926252d33895aafe82ba1b72bcdb77ec71dafa20d154f5d5bc7 SHA512 f226d531002dc472852f09ce9814c8dcf7b0c4209353a5639d8b814308807df6477c4a8aa0fd49743578282e6662ca8d5c316371720dca50953ad7ec44b7c6d3 WHIRLPOOL 335ab0845f3c27d3396286f26b45583cf4b71469c3567dd2a978fa3b82af7828d02925529ec686825d283207b3e3858237664f43ab4ecb56835a84ffb066033b
-DIST swt-3.7.1-gtk-linux-ppc64.zip 5687650 SHA256 11b0ea72554f0f75941b44ae76aaf70b326e1c0cda7328fbb5a83b682a5e653c SHA512 fe73fa10c41cde27393818eab7a3d4c1402fcfad5639d75c9642e2a020e872e7a5d65dd65c1a526b3e70f74ac6cb4bbb7df93ac48cd6923c483754dc74e52125 WHIRLPOOL d599d45cf43b4892faa0d435dc0e22d717234b918b74a29e7d542ebab486dacb3287fd105ba0380ea8b4b53806153ac62cb86d5bd5de4bf236522bb9471d6c49
-DIST swt-3.7.1-gtk-linux-x86.zip 5374283 SHA256 94279a6ab1aab248641daf728bca34f4eb2f4b812aaebc1973c775320cb96942 SHA512 3b9095b04e2cd8d4f3721c7ac51303f93164b47cb2afa992e553b46909e99232d70cceba9088053740fd46ef158f190101f2d84d3e6d1eddeabb40128bde1bf5 WHIRLPOOL f0c5d3190d5a1b2fbf8718591362b1115bb17e583ded59464e5c7108f3e652631bac21e8c8c4d216d4451096d726871b9f64fead3db4234125bae4983f84a00f
-DIST swt-3.7.1-gtk-linux-x86_64.zip 5671004 SHA256 dd11d29a95391afed42ac3883c45a2bda7e4597c72c4b7b1291316e006139b75 SHA512 0d7a3b2bb5facb120682c4a5d7ca9232483aea1dab67172368e723849ed79dee89ecfec2d286c4827e111191b5f7025232c26e0219b6f9fda3705b3b667ae0e2 WHIRLPOOL c2b6ae1d89de955a1df14fa6b6df8e234ccae84e0b01f5a5c414cd8764eee6f826ac7298e1bfe35d92aa527d4caa96cc4a2b54c91350f88b12a28c132e88ab63
 DIST swt-3.7.2-gtk-linux-ppc64.zip 5688113 SHA256 90106c1878470dfb78b665062a6a8f94c19cbb469221a37be4b7b985bed54c5e SHA512 750aaa43560bbf6f82f7f8cd9338abc88578f4f0b9aadaec9bc8a5c3d1ad593619cdf01d202cbf06766090ee977989ea7904643669c61971973951d8428b57d0 WHIRLPOOL 44b3b19b425132a615026209d1b557ab099dec441a8c2fb7aadfd90d19cd56228385e8e4f0ce09d66ebdcb9870cc5a932c1e6c6b4e3c507ca5b687b3ec6e18f4
 DIST swt-3.7.2-gtk-linux-x86.zip 5374609 SHA256 4e31f4cf5c6eac378ecaf5e261e925e82c377902c61cfdefaa38b1c3ea445183 SHA512 9f58864d05eba2648e4b5d5c958172f5c0c7c730209525b3d6f607586daaefea4d5ba1013e80c0c11948f01c553044b0a98c81688b33c14114ba79c7ce620426 WHIRLPOOL ff47a49df58f711c9ea9dcbc08ae6e5e78fcf11e9419a97a28a660af10172ba5b8eeff4e181794816c1b6aca9a6b3ea52b4f2cc855c0e399265a761c96b87296
 DIST swt-3.7.2-gtk-linux-x86_64.zip 5671443 SHA256 a92498e1fcd001b91a5128a414263908c876c5b74bd10c3276e08a8edd470443 SHA512 d60ae1d3f3b0577f7e3018139f93069c89d021064fec2f3f4074f95cfae56abdc0c7d531cb904ad3911482543cddcc3f6646ff47192073f4bde97c79e13612b7 WHIRLPOOL 2698abf1f6f50d6712d37e7b10ee6b0442f1db43b0d78814c3ee04a3922816c9f62247c55610f539c11dfd10c4f4fcf1ab2986eec81d2555144730c95ee381dd
--- a/dev-java/swt/swt-3.5.2.ebuild
+++ b/dev-java/swt/swt-3.5.2.ebuild
@ -7,26 +7,17 @@ EAPI=2
 inherit eutils java-pkg-2 java-ant-2 toolchain-funcs java-osgi

 MY_PV="${PV/_rc/RC}"
-MY_DMF="download.eclipse.org/eclipse/downloads/drops/R-${MY_PV}-201002111343"
+MY_DMF="http://archive.eclipse.org/eclipse/downloads/drops/R-${MY_PV}-201002111343"
 MY_P="${PN}-${MY_PV}"

 DESCRIPTION="GTK based SWT Library"
 HOMEPAGE="http://www.eclipse.org/"
-SRC_URI="x86? (
-			http://${MY_DMF}/${MY_P}-gtk-linux-x86.zip
-		)
-		x86-fbsd? (
-			http://${MY_DMF}/${MY_P}-gtk-linux-x86.zip
-		)
-		amd64? (
-			http://${MY_DMF}/${MY_P}-gtk-linux-x86_64.zip
-		)
-		ppc? (
-			http://${MY_DMF}/${MY_P}-gtk-linux-ppc.zip
-		)
-		ppc64? (
-			http://${MY_DMF}/${MY_P}-gtk-linux-x86_64.zip
-		)"
+SRC_URI="
+	amd64? ( ${MY_DMF}/${MY_P}-gtk-linux-x86_64.zip )
+	ppc? ( ${MY_DMF}/${MY_P}-gtk-linux-ppc.zip )
+	ppc64? ( ${MY_DMF}/${MY_P}-gtk-linux-x86_64.zip )
+	x86? ( ${MY_DMF}/${MY_P}-gtk-linux-x86.zip )
+	x86-fbsd? ( ${MY_DMF}/${MY_P}-gtk-linux-x86.zip )"

 SLOT="3.5"
 LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1"
--- a/dev-java/swt/swt-3.7.1.ebuild
+++ b/dev-java/swt/swt-3.7.1.ebuild
@ -1,181 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit eutils java-pkg-2 java-ant-2 toolchain-funcs java-osgi
-
-MY_PV="${PV/_rc/RC}"
-MY_DMF="download.eclipse.org/eclipse/downloads/drops/R-${MY_PV}-201109091335"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="GTK based SWT Library"
-HOMEPAGE="http://www.eclipse.org/"
-SRC_URI="x86? (
-			http://${MY_DMF}/${MY_P}-gtk-linux-x86.zip
-		)
-		x86-fbsd? (
-			http://${MY_DMF}/${MY_P}-gtk-linux-x86.zip
-		)
-		amd64? (
-			http://${MY_DMF}/${MY_P}-gtk-linux-x86_64.zip
-		)
-		ppc? (
-			http://${MY_DMF}/${MY_P}-gtk-linux-x86.zip
-		)
-		ppc64? (
-			http://${MY_DMF}/${MY_P}-gtk-linux-ppc64.zip
-		)"
-
-SLOT="3.7"
-LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-
-IUSE="cairo gnome opengl webkit"
-COMMON=">=dev-libs/glib-2.6
-		>=x11-libs/gtk+-2.6.8:2
-		>=dev-libs/atk-1.10.2
-		cairo? ( >=x11-libs/cairo-1.4.14 )
-		gnome?	(
-				=gnome-base/libgnome-2*
-				=gnome-base/gnome-vfs-2*
-				=gnome-base/libgnomeui-2*
-				)
-		opengl?	(
-			virtual/opengl
-			virtual/glu
-		)
-		webkit? ( >=net-libs/webkit-gtk-1.2:2 )
-		x11-libs/libXtst"
-
-DEPEND=">=virtual/jdk-1.4
-		app-arch/unzip
-		x11-libs/libX11
-		x11-libs/libXrender
-		x11-libs/libXt
-		>=x11-libs/libXtst-1.1.0
-		x11-proto/inputproto
-		virtual/pkgconfig
-		${COMMON}"
-
-RDEPEND=">=virtual/jre-1.4
-	${COMMON}"
-
-S="${WORKDIR}"
-
-# JNI libraries don't need SONAME, bug #253756
-QA_SONAME="usr/$(get_libdir)/libswt-.*.so"
-
-src_unpack() {
-	local DISTFILE=${A}
-	unzip -jq "${DISTDIR}"/${DISTFILE} "*src.zip" || die "Unable to extract distfile"
-	unpack "./src.zip"
-
-	# Cleanup the redirtied directory structure
-	rm -rf about_files/ || die
-}
-
-java_prepare() {
-	# Replace the build.xml to allow compilation without Eclipse tasks
-	cp "${FILESDIR}/build.xml" "${S}/build.xml" || die "Unable to update build.xml"
-	mkdir "${S}/src" && mv "${S}/org" "${S}/src" || die "Unable to restructure SWT sources"
-
-	# Fix Makefiles to respect flags and work with --as-needed
-	epatch "${FILESDIR}"/as-needed-and-flag-fixes-3.6.patch
-}
-
-src_compile() {
-	# Drop jikes support as it seems to be unfriendly with SWT
-	java-pkg_filter-compiler jikes
-
-	local AWT_ARCH
-	local JAWTSO="libjawt.so"
-	if [[ $(tc-arch) == 'x86' ]] ; then
-		AWT_ARCH="i386"
-	elif [[ $(tc-arch) == 'ppc' ]] ; then
-		AWT_ARCH="ppc"
-	elif [[ $(tc-arch) == 'ppc64' ]] ; then
-		AWT_ARCH="ppc64"
-	else
-		AWT_ARCH="amd64"
-	fi
-	if [[ -f "${JAVA_HOME}/jre/lib/${AWT_ARCH}/${JAWTSO}" ]]; then
-		export AWT_LIB_PATH="${JAVA_HOME}/jre/lib/${AWT_ARCH}"
-	elif [[ -f "${JAVA_HOME}/jre/bin/${JAWTSO}" ]]; then
-		export AWT_LIB_PATH="${JAVA_HOME}/jre/bin"
-	elif [[ -f "${JAVA_HOME}/$(get_libdir)/${JAWTSO}" ]] ; then
-		export AWT_LIB_PATH="${JAVA_HOME}/$(get_libdir)"
-	else
-		eerror "${JAWTSO} not found in the JDK being used for compilation!"
-		die "cannot build AWT library"
-	fi
-
-	# Fix the pointer size for AMD64
-	[[ ${ARCH} == "amd64" || ${ARCH} == "ppc64" ]] && export SWT_PTR_CFLAGS=-DJNI64
-
-	local platform="linux"
-
-	use elibc_FreeBSD && platform="freebsd"
-
-	local make="emake -f make_${platform}.mak NO_STRIP=y CC=$(tc-getCC) CXX=$(tc-getCXX)"
-
-	einfo "Building AWT library"
-	${make} make_awt
-
-	einfo "Building SWT library"
-	${make} make_swt
-
-	einfo "Building JAVA-AT-SPI bridge"
-	${make} make_atk
-
-	if use gnome ; then
-		einfo "Building GNOME VFS support"
-		${make} make_gnome
-	fi
-
-	if use cairo ; then
-		einfo "Building CAIRO support"
-		${make} make_cairo
-	fi
-
-	if use opengl ; then
-		einfo "Building OpenGL component"
-		${make} make_glx
-	fi
-
-	if use webkit ; then
-		einfo "Building the WebKitGTK+ component"
-
-		${make} make_webkit
-	fi
-
-	einfo "Building JNI libraries"
-	eant compile
-
-	einfo "Copying missing files"
-	cp -i "${S}/version.txt" "${S}/build/version.txt"
-	cp -i "${S}/src/org/eclipse/swt/internal/SWTMessages.properties" \
-		"${S}/build/org/eclipse/swt/internal/" || die
-
-	einfo "Packing JNI libraries"
-	eant jar
-}
-
-src_install() {
-	swtArch=${ARCH}
-	use amd64 && swtArch=x86_64
-	use x86-fbsd && swtArch=x86
-
-	sed "s/SWT_ARCH/${swtArch}/" "${FILESDIR}/${PN}-${SLOT}-manifest" > "MANIFEST_TMP.MF" || die
-	use cairo || sed -i -e "/ org.eclipse.swt.internal.cairo; x-internal:=true,/d" "MANIFEST_TMP.MF"
-	use gnome || sed -i -e "/ org.eclipse.swt.internal.gnome; x-internal:=true,/d" "MANIFEST_TMP.MF"
-	use opengl || sed -i -e "/ org.eclipse.swt.internal.opengl.glx; x-internal:=true,/d" "MANIFEST_TMP.MF"
-	use webkit || sed -i -e "/ org.eclipse.swt.internal.webkit; x-internal:=true,/d" "MANIFEST_TMP.MF"
-	java-osgi_newjar-fromfile "swt.jar" "MANIFEST_TMP.MF" "Standard Widget Toolkit for GTK 2.0"
-
-	java-pkg_sointo /usr/$(get_libdir)
-	java-pkg_doso *.so
-
-	dohtml about.html || die
-}
--- a/dev-java/swt/swt-3.7.2-r1.ebuild
+++ b/dev-java/swt/swt-3.7.2-r1.ebuild
@ -7,26 +7,17 @@ EAPI=4
 inherit eutils java-pkg-2 java-ant-2 toolchain-funcs java-osgi

 MY_PV="${PV/_rc/RC}"
-MY_DMF="download.eclipse.org/eclipse/downloads/drops/R-${MY_PV}-201202080800"
+MY_DMF="http://archive.eclipse.org/eclipse/downloads/drops/R-${MY_PV}-201202080800"
 MY_P="${PN}-${MY_PV}"

 DESCRIPTION="GTK based SWT Library"
 HOMEPAGE="http://www.eclipse.org/"
-SRC_URI="x86? (
-			http://${MY_DMF}/${MY_P}-gtk-linux-x86.zip
-		)
-		x86-fbsd? (
-			http://${MY_DMF}/${MY_P}-gtk-linux-x86.zip
-		)
-		amd64? (
-			http://${MY_DMF}/${MY_P}-gtk-linux-x86_64.zip
-		)
-		ppc? (
-			http://${MY_DMF}/${MY_P}-gtk-linux-x86.zip
-		)
-		ppc64? (
-			http://${MY_DMF}/${MY_P}-gtk-linux-ppc64.zip
-		)"
+SRC_URI="
+	amd64? ( ${MY_DMF}/${MY_P}-gtk-linux-x86_64.zip )
+	ppc? ( ${MY_DMF}/${MY_P}-gtk-linux-x86.zip )
+	ppc64? ( ${MY_DMF}/${MY_P}-gtk-linux-ppc64.zip )
+	x86? ( ${MY_DMF}/${MY_P}-gtk-linux-x86.zip )
+	x86-fbsd? ( ${MY_DMF}/${MY_P}-gtk-linux-x86.zip )"

 SLOT="3.7"
 LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1"
--- a/dev-java/swt/swt-3.7.2.ebuild
+++ b/dev-java/swt/swt-3.7.2.ebuild
@ -1,181 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit eutils java-pkg-2 java-ant-2 toolchain-funcs java-osgi
-
-MY_PV="${PV/_rc/RC}"
-MY_DMF="download.eclipse.org/eclipse/downloads/drops/R-${MY_PV}-201202080800"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="GTK based SWT Library"
-HOMEPAGE="http://www.eclipse.org/"
-SRC_URI="x86? (
-			http://${MY_DMF}/${MY_P}-gtk-linux-x86.zip
-		)
-		x86-fbsd? (
-			http://${MY_DMF}/${MY_P}-gtk-linux-x86.zip
-		)
-		amd64? (
-			http://${MY_DMF}/${MY_P}-gtk-linux-x86_64.zip
-		)
-		ppc? (
-			http://${MY_DMF}/${MY_P}-gtk-linux-x86.zip
-		)
-		ppc64? (
-			http://${MY_DMF}/${MY_P}-gtk-linux-ppc64.zip
-		)"
-
-SLOT="3.7"
-LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1"
-KEYWORDS="amd64 ~ppc64 x86"
-
-IUSE="cairo gnome opengl webkit"
-COMMON=">=dev-libs/glib-2.6
-		>=x11-libs/gtk+-2.6.8:2
-		>=dev-libs/atk-1.10.2
-		cairo? ( >=x11-libs/cairo-1.4.14 )
-		gnome?	(
-				=gnome-base/libgnome-2*
-				=gnome-base/gnome-vfs-2*
-				=gnome-base/libgnomeui-2*
-				)
-		opengl?	(
-			virtual/opengl
-			virtual/glu
-		)
-		webkit? ( >=net-libs/webkit-gtk-1.2:2 )
-		x11-libs/libXtst"
-
-DEPEND=">=virtual/jdk-1.4
-		app-arch/unzip
-		x11-libs/libX11
-		x11-libs/libXrender
-		x11-libs/libXt
-		>=x11-libs/libXtst-1.1.0
-		x11-proto/inputproto
-		virtual/pkgconfig
-		${COMMON}"
-
-RDEPEND=">=virtual/jre-1.4
-	${COMMON}"
-
-S="${WORKDIR}"
-
-# JNI libraries don't need SONAME, bug #253756
-QA_SONAME="usr/$(get_libdir)/libswt-.*.so"
-
-src_unpack() {
-	local DISTFILE=${A}
-	unzip -jq "${DISTDIR}"/${DISTFILE} "*src.zip" || die "Unable to extract distfile"
-	unpack "./src.zip"
-
-	# Cleanup the redirtied directory structure
-	rm -rf about_files/ || die
-}
-
-java_prepare() {
-	# Replace the build.xml to allow compilation without Eclipse tasks
-	cp "${FILESDIR}/build.xml" "${S}/build.xml" || die "Unable to update build.xml"
-	mkdir "${S}/src" && mv "${S}/org" "${S}/src" || die "Unable to restructure SWT sources"
-
-	# Fix Makefiles to respect flags and work with --as-needed
-	epatch "${FILESDIR}"/as-needed-and-flag-fixes-3.6.patch
-}
-
-src_compile() {
-	# Drop jikes support as it seems to be unfriendly with SWT
-	java-pkg_filter-compiler jikes
-
-	local AWT_ARCH
-	local JAWTSO="libjawt.so"
-	if [[ $(tc-arch) == 'x86' ]] ; then
-		AWT_ARCH="i386"
-	elif [[ $(tc-arch) == 'ppc' ]] ; then
-		AWT_ARCH="ppc"
-	elif [[ $(tc-arch) == 'ppc64' ]] ; then
-		AWT_ARCH="ppc64"
-	else
-		AWT_ARCH="amd64"
-	fi
-	if [[ -f "${JAVA_HOME}/jre/lib/${AWT_ARCH}/${JAWTSO}" ]]; then
-		export AWT_LIB_PATH="${JAVA_HOME}/jre/lib/${AWT_ARCH}"
-	elif [[ -f "${JAVA_HOME}/jre/bin/${JAWTSO}" ]]; then
-		export AWT_LIB_PATH="${JAVA_HOME}/jre/bin"
-	elif [[ -f "${JAVA_HOME}/$(get_libdir)/${JAWTSO}" ]] ; then
-		export AWT_LIB_PATH="${JAVA_HOME}/$(get_libdir)"
-	else
-		eerror "${JAWTSO} not found in the JDK being used for compilation!"
-		die "cannot build AWT library"
-	fi
-
-	# Fix the pointer size for AMD64
-	[[ ${ARCH} == "amd64" || ${ARCH} == "ppc64" ]] && export SWT_PTR_CFLAGS=-DJNI64
-
-	local platform="linux"
-
-	use elibc_FreeBSD && platform="freebsd"
-
-	local make="emake -f make_${platform}.mak NO_STRIP=y CC=$(tc-getCC) CXX=$(tc-getCXX)"
-
-	einfo "Building AWT library"
-	${make} make_awt
-
-	einfo "Building SWT library"
-	${make} make_swt
-
-	einfo "Building JAVA-AT-SPI bridge"
-	${make} make_atk
-
-	if use gnome ; then
-		einfo "Building GNOME VFS support"
-		${make} make_gnome
-	fi
-
-	if use cairo ; then
-		einfo "Building CAIRO support"
-		${make} make_cairo
-	fi
-
-	if use opengl ; then
-		einfo "Building OpenGL component"
-		${make} make_glx
-	fi
-
-	if use webkit ; then
-		einfo "Building the WebKitGTK+ component"
-
-		${make} make_webkit
-	fi
-
-	einfo "Building JNI libraries"
-	eant compile
-
-	einfo "Copying missing files"
-	cp -i "${S}/version.txt" "${S}/build/version.txt"
-	cp -i "${S}/src/org/eclipse/swt/internal/SWTMessages.properties" \
-		"${S}/build/org/eclipse/swt/internal/" || die
-
-	einfo "Packing JNI libraries"
-	eant jar
-}
-
-src_install() {
-	swtArch=${ARCH}
-	use amd64 && swtArch=x86_64
-	use x86-fbsd && swtArch=x86
-
-	sed "s/SWT_ARCH/${swtArch}/" "${FILESDIR}/${PN}-${SLOT}-manifest" > "MANIFEST_TMP.MF" || die
-	use cairo || sed -i -e "/ org.eclipse.swt.internal.cairo; x-internal:=true,/d" "MANIFEST_TMP.MF"
-	use gnome || sed -i -e "/ org.eclipse.swt.internal.gnome; x-internal:=true,/d" "MANIFEST_TMP.MF"
-	use opengl || sed -i -e "/ org.eclipse.swt.internal.opengl.glx; x-internal:=true,/d" "MANIFEST_TMP.MF"
-	use webkit || sed -i -e "/ org.eclipse.swt.internal.webkit; x-internal:=true,/d" "MANIFEST_TMP.MF"
-	java-osgi_newjar-fromfile "swt.jar" "MANIFEST_TMP.MF" "Standard Widget Toolkit for GTK 2.0"
-
-	java-pkg_sointo /usr/$(get_libdir)
-	java-pkg_doso *.so
-
-	dohtml about.html || die
-}
--- a/dev-java/swt/swt-3.8.2-r1.ebuild
+++ b/dev-java/swt/swt-3.8.2-r1.ebuild
@ -7,26 +7,17 @@ EAPI="5"
 inherit eutils java-pkg-2 java-ant-2 toolchain-funcs java-osgi

 MY_PV="${PV/_rc/RC}"
-MY_DMF="archive.eclipse.org/eclipse/downloads/drops/R-${MY_PV}-201301310800"
+MY_DMF="http://archive.eclipse.org/eclipse/downloads/drops/R-${MY_PV}-201301310800"
 MY_P="${PN}-${MY_PV}"

 DESCRIPTION="GTK based SWT Library"
 HOMEPAGE="http://www.eclipse.org/"
-SRC_URI="x86? (
-			http://${MY_DMF}/${MY_P}-gtk-linux-x86.zip
-		)
-		x86-fbsd? (
-			http://${MY_DMF}/${MY_P}-gtk-linux-x86.zip
-		)
-		amd64? (
-			http://${MY_DMF}/${MY_P}-gtk-linux-x86_64.zip
-		)
-		ppc? (
-			http://${MY_DMF}/${MY_P}-gtk-linux-x86.zip
-		)
-		ppc64? (
-			http://${MY_DMF}/${MY_P}-gtk-linux-ppc64.zip
-		)"
+SRC_URI="
+	amd64? ( ${MY_DMF}/${MY_P}-gtk-linux-x86_64.zip )
+	ppc? ( ${MY_DMF}/${MY_P}-gtk-linux-x86.zip )
+	ppc64? ( ${MY_DMF}/${MY_P}-gtk-linux-ppc64.zip )
+	x86? ( ${MY_DMF}/${MY_P}-gtk-linux-x86.zip )
+	x86-fbsd? ( ${MY_DMF}/${MY_P}-gtk-linux-x86.zip )"

 SLOT="3.8"
 LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1"
--- a/dev-java/swt/swt-3.8.2.ebuild
+++ b/dev-java/swt/swt-3.8.2.ebuild
@ -1,183 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils java-pkg-2 java-ant-2 toolchain-funcs java-osgi
-
-MY_PV="${PV/_rc/RC}"
-MY_DMF="archive.eclipse.org/eclipse/downloads/drops/R-${MY_PV}-201301310800"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="GTK based SWT Library"
-HOMEPAGE="http://www.eclipse.org/"
-SRC_URI="x86? (
-			http://${MY_DMF}/${MY_P}-gtk-linux-x86.zip
-		)
-		x86-fbsd? (
-			http://${MY_DMF}/${MY_P}-gtk-linux-x86.zip
-		)
-		amd64? (
-			http://${MY_DMF}/${MY_P}-gtk-linux-x86_64.zip
-		)
-		ppc? (
-			http://${MY_DMF}/${MY_P}-gtk-linux-x86.zip
-		)
-		ppc64? (
-			http://${MY_DMF}/${MY_P}-gtk-linux-ppc64.zip
-		)"
-
-SLOT="3.8"
-LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-
-IUSE="cairo gnome opengl webkit"
-COMMON=">=dev-libs/glib-2.6
-		>=x11-libs/gtk+-2.6.8:2
-		>=dev-libs/atk-1.10.2
-		cairo? ( >=x11-libs/cairo-1.4.14 )
-		gnome?	(
-				gnome-base/gnome-vfs:2
-				gnome-base/libgnome
-				gnome-base/libgnomeui
-				)
-		opengl?	(
-			virtual/opengl
-			virtual/glu
-		)
-		webkit? ( >=net-libs/webkit-gtk-1.2:2 )
-		x11-libs/libXtst"
-
-DEPEND=">=virtual/jdk-1.4
-		app-arch/unzip
-		x11-libs/libX11
-		x11-libs/libXrender
-		x11-libs/libXt
-		>=x11-libs/libXtst-1.1.0
-		x11-proto/inputproto
-		virtual/pkgconfig
-		${COMMON}"
-
-RDEPEND=">=virtual/jre-1.4
-	${COMMON}"
-
-S="${WORKDIR}"
-
-# JNI libraries don't need SONAME, bug #253756
-QA_SONAME="usr/$(get_libdir)/libswt-.*.so"
-
-src_unpack() {
-	local DISTFILE=${A}
-	unzip -jq "${DISTDIR}"/${DISTFILE} "*src.zip" || die "Unable to extract distfile"
-	unpack "./src.zip"
-
-	# Cleanup the redirtied directory structure
-	rm -rf about_files/ || die
-}
-
-java_prepare() {
-	# Replace the build.xml to allow compilation without Eclipse tasks
-	cp "${FILESDIR}/build.xml" "${S}/build.xml" || die "Unable to update build.xml"
-
-	mkdir -p "${S}/src"
-	mv "${S}/org" "${S}/src" || die "Unable to restructure SWT sources"
-
-	epatch "${FILESDIR}"/${PN}-3.8-as-needed-and-flag-fixes.patch
-	epatch "${FILESDIR}"/${P}-gthread.patch
-}
-
-src_compile() {
-	# Drop jikes support as it seems to be unfriendly with SWT
-	java-pkg_filter-compiler jikes
-
-	local AWT_ARCH
-	local JAWTSO="libjawt.so"
-	if [[ $(tc-arch) == 'x86' ]] ; then
-		AWT_ARCH="i386"
-	elif [[ $(tc-arch) == 'ppc' ]] ; then
-		AWT_ARCH="ppc"
-	elif [[ $(tc-arch) == 'ppc64' ]] ; then
-		AWT_ARCH="ppc64"
-	else
-		AWT_ARCH="amd64"
-	fi
-	if [[ -f "${JAVA_HOME}/jre/lib/${AWT_ARCH}/${JAWTSO}" ]]; then
-		export AWT_LIB_PATH="${JAVA_HOME}/jre/lib/${AWT_ARCH}"
-	elif [[ -f "${JAVA_HOME}/jre/bin/${JAWTSO}" ]]; then
-		export AWT_LIB_PATH="${JAVA_HOME}/jre/bin"
-	elif [[ -f "${JAVA_HOME}/$(get_libdir)/${JAWTSO}" ]] ; then
-		export AWT_LIB_PATH="${JAVA_HOME}/$(get_libdir)"
-	else
-		eerror "${JAWTSO} not found in the JDK being used for compilation!"
-		die "cannot build AWT library"
-	fi
-
-	# Fix the pointer size for AMD64
-	[[ ${ARCH} == "amd64" || ${ARCH} == "ppc64" ]] && export SWT_PTR_CFLAGS=-DJNI64
-
-	local platform="linux"
-
-	use elibc_FreeBSD && platform="freebsd"
-
-	local make="emake -f make_${platform}.mak NO_STRIP=y CC=$(tc-getCC) CXX=$(tc-getCXX)"
-
-	einfo "Building AWT library"
-	${make} make_awt
-
-	einfo "Building SWT library"
-	${make} make_swt
-
-	einfo "Building JAVA-AT-SPI bridge"
-	${make} make_atk
-
-	if use gnome ; then
-		einfo "Building GNOME VFS support"
-		${make} make_gnome
-	fi
-
-	if use cairo ; then
-		einfo "Building CAIRO support"
-		${make} make_cairo
-	fi
-
-	if use opengl ; then
-		einfo "Building OpenGL component"
-		${make} make_glx
-	fi
-
-	if use webkit ; then
-		einfo "Building the WebKitGTK+ component"
-
-		${make} make_webkit
-	fi
-
-	einfo "Building JNI libraries"
-	eant compile
-
-	einfo "Copying missing files"
-	cp -i "${S}/version.txt" "${S}/build/version.txt" || die
-	cp -i "${S}/src/org/eclipse/swt/internal/SWTMessages.properties" \
-		"${S}/build/org/eclipse/swt/internal/" || die
-
-	einfo "Packing JNI libraries"
-	eant jar
-}
-
-src_install() {
-	swtArch=${ARCH}
-	use amd64 && swtArch=x86_64
-	use x86-fbsd && swtArch=x86
-
-	sed "s/SWT_ARCH/${swtArch}/" "${FILESDIR}/${PN}-${SLOT}-manifest" > "MANIFEST_TMP.MF" || die
-	use cairo || sed -i -e "/ org.eclipse.swt.internal.cairo; x-internal:=true,/d" "MANIFEST_TMP.MF"
-	use gnome || sed -i -e "/ org.eclipse.swt.internal.gnome; x-internal:=true,/d" "MANIFEST_TMP.MF"
-	use opengl || sed -i -e "/ org.eclipse.swt.internal.opengl.glx; x-internal:=true,/d" "MANIFEST_TMP.MF"
-	use webkit || sed -i -e "/ org.eclipse.swt.internal.webkit; x-internal:=true,/d" "MANIFEST_TMP.MF"
-	java-osgi_newjar-fromfile "swt.jar" "MANIFEST_TMP.MF" "Standard Widget Toolkit for GTK 2.0"
-
-	java-pkg_sointo /usr/$(get_libdir)
-	java-pkg_doso *.so
-
-	dohtml about.html
-}
--- a/dev-java/swt/swt-4.2-r1.ebuild
+++ b/dev-java/swt/swt-4.2-r1.ebuild
@ -1,174 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils flag-o-matic java-pkg-2 java-ant-2 toolchain-funcs java-osgi
-
-MY_PV="${PV/_rc/RC}"
-MY_DMF="http://archive.eclipse.org/eclipse/downloads/drops4/R-${MY_PV}-201206081400"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="GTK based SWT Library"
-HOMEPAGE="http://www.eclipse.org/"
-SRC_URI="
-	amd64? ( ${MY_DMF}/${MY_P}-gtk-linux-x86_64.zip )
-	ppc? ( ${MY_DMF}/${MY_P}-gtk-linux-x86.zip )
-	ppc64? ( ${MY_DMF}/${MY_P}-gtk-linux-ppc64.zip )
-	x86? ( ${MY_DMF}/${MY_P}-gtk-linux-x86.zip )
-	x86-fbsd? ( ${MY_DMF}/${MY_P}-gtk-linux-x86.zip )"
-
-LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1"
-SLOT="4.2"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="cairo gnome opengl webkit"
-
-COMMON_DEP="
-	>=dev-libs/atk-1.10.2
-	>=dev-libs/glib-2.32
-	>=x11-libs/gtk+-2.6.8:2
-	x11-libs/libXtst
-	cairo? ( >=x11-libs/cairo-1.4.14 )
-	gnome?	(
-		=gnome-base/gnome-vfs-2*
-		=gnome-base/libgnome-2*
-		=gnome-base/libgnomeui-2*
-	)
-	opengl?	(
-		virtual/glu
-		virtual/opengl
-	)
-	webkit? ( >=net-libs/webkit-gtk-1.2:2 )"
-DEPEND="${COMMON_DEP}
-	>=virtual/jdk-1.4
-	app-arch/unzip
-	virtual/pkgconfig
-	x11-libs/libX11
-	x11-libs/libXrender
-	x11-libs/libXt
-	>=x11-libs/libXtst-1.1.0
-	x11-proto/inputproto"
-RDEPEND="${COMMON_DEP}
-	>=virtual/jre-1.4"
-
-S="${WORKDIR}"
-
-# JNI libraries don't need SONAME, bug #253756
-QA_SONAME="usr/$(get_libdir)/libswt-.*.so"
-
-src_unpack() {
-	local DISTFILE=${A}
-	unzip -jq "${DISTDIR}"/${DISTFILE} "*src.zip" || die "Unable to extract distfile"
-	unpack "./src.zip"
-
-	# Cleanup the redirtied directory structure
-	rm -rf about_files/ || die
-}
-
-java_prepare() {
-	# Replace the build.xml to allow compilation without Eclipse tasks
-	cp "${FILESDIR}/build.xml" "${S}/build.xml" || die "Unable to update build.xml"
-	mkdir "${S}/src" && mv "${S}/org" "${S}/src" || die "Unable to restructure SWT sources"
-
-	# Fix Makefiles to respect flags and work with --as-needed
-	epatch "${FILESDIR}"/${P}-as-needed-and-flag-fixes.patch
-}
-
-src_compile() {
-	# Drop jikes support as it seems to be unfriendly with SWT
-	java-pkg_filter-compiler jikes
-
-	local AWT_ARCH
-	local JAWTSO="libjawt.so"
-	if [[ $(tc-arch) == 'x86' ]] ; then
-		AWT_ARCH="i386"
-	elif [[ $(tc-arch) == 'ppc' ]] ; then
-		AWT_ARCH="ppc"
-	elif [[ $(tc-arch) == 'ppc64' ]] ; then
-		AWT_ARCH="ppc64"
-	else
-		AWT_ARCH="amd64"
-	fi
-	if [[ -f "${JAVA_HOME}/jre/lib/${AWT_ARCH}/${JAWTSO}" ]]; then
-		export AWT_LIB_PATH="${JAVA_HOME}/jre/lib/${AWT_ARCH}"
-	elif [[ -f "${JAVA_HOME}/jre/bin/${JAWTSO}" ]]; then
-		export AWT_LIB_PATH="${JAVA_HOME}/jre/bin"
-	elif [[ -f "${JAVA_HOME}/$(get_libdir)/${JAWTSO}" ]] ; then
-		export AWT_LIB_PATH="${JAVA_HOME}/$(get_libdir)"
-	else
-		eerror "${JAWTSO} not found in the JDK being used for compilation!"
-		die "cannot build AWT library"
-	fi
-
-	# Fix the pointer size for AMD64
-	[[ ${ARCH} == "amd64" || ${ARCH} == "ppc64" ]] && export SWT_PTR_CFLAGS=-DJNI64
-
-	local platform="linux"
-
-	use elibc_FreeBSD && platform="freebsd"
-
-	# Bug #461784, g_thread_init is deprecated since glib-2.32.
-	append-cflags -DNO__1g_1thread_1init
-
-	local make="emake -f make_${platform}.mak NO_STRIP=y CC=$(tc-getCC) CXX=$(tc-getCXX)"
-
-	einfo "Building AWT library"
-	${make} make_awt
-
-	einfo "Building SWT library"
-	${make} make_swt
-
-	einfo "Building JAVA-AT-SPI bridge"
-	${make} make_atk
-
-	if use gnome ; then
-		einfo "Building GNOME VFS support"
-		${make} make_gnome
-	fi
-
-	if use cairo ; then
-		einfo "Building CAIRO support"
-		${make} make_cairo
-	fi
-
-	if use opengl ; then
-		einfo "Building OpenGL component"
-		${make} make_glx
-	fi
-
-	if use webkit ; then
-		einfo "Building the WebKitGTK+ component"
-
-		${make} make_webkit
-	fi
-
-	einfo "Building JNI libraries"
-	eant compile
-
-	einfo "Copying missing files"
-	cp -i "${S}/version.txt" "${S}/build/version.txt"
-	cp -i "${S}/src/org/eclipse/swt/internal/SWTMessages.properties" \
-		"${S}/build/org/eclipse/swt/internal/" || die
-
-	einfo "Packing JNI libraries"
-	eant jar
-}
-
-src_install() {
-	swtArch=${ARCH}
-	use amd64 && swtArch=x86_64
-	use x86-fbsd && swtArch=x86
-
-	sed "s/SWT_ARCH/${swtArch}/" "${FILESDIR}/${PN}-${SLOT}-manifest" > "MANIFEST_TMP.MF" || die
-	use cairo || sed -i -e "/ org.eclipse.swt.internal.cairo; x-internal:=true,/d" "MANIFEST_TMP.MF"
-	use gnome || sed -i -e "/ org.eclipse.swt.internal.gnome; x-internal:=true,/d" "MANIFEST_TMP.MF"
-	use opengl || sed -i -e "/ org.eclipse.swt.internal.opengl.glx; x-internal:=true,/d" "MANIFEST_TMP.MF"
-	use webkit || sed -i -e "/ org.eclipse.swt.internal.webkit; x-internal:=true,/d" "MANIFEST_TMP.MF"
-	java-osgi_newjar-fromfile "swt.jar" "MANIFEST_TMP.MF" "Standard Widget Toolkit for GTK 2.0"
-
-	java-pkg_sointo /usr/$(get_libdir)
-	java-pkg_doso *.so
-
-	dohtml about.html
-}
--- a/dev-java/swt/swt-4.2.ebuild
+++ b/dev-java/swt/swt-4.2.ebuild
@ -1,171 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit eutils java-pkg-2 java-ant-2 toolchain-funcs java-osgi
-
-MY_PV="${PV/_rc/RC}"
-MY_DMF="http://archive.eclipse.org/eclipse/downloads/drops4/R-${MY_PV}-201206081400"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="GTK based SWT Library"
-HOMEPAGE="http://www.eclipse.org/"
-SRC_URI="
-	amd64? ( ${MY_DMF}/${MY_P}-gtk-linux-x86_64.zip )
-	ppc? ( ${MY_DMF}/${MY_P}-gtk-linux-x86.zip )
-	ppc64? ( ${MY_DMF}/${MY_P}-gtk-linux-ppc64.zip )
-	x86? ( ${MY_DMF}/${MY_P}-gtk-linux-x86.zip )
-	x86-fbsd? ( ${MY_DMF}/${MY_P}-gtk-linux-x86.zip )"
-
-LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1"
-SLOT="4.2"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="cairo gnome opengl webkit"
-
-COMMON_DEP="
-	>=dev-libs/atk-1.10.2
-	>=dev-libs/glib-2.6
-	>=x11-libs/gtk+-2.6.8:2
-	x11-libs/libXtst
-	cairo? ( >=x11-libs/cairo-1.4.14 )
-	gnome?	(
-		=gnome-base/gnome-vfs-2*
-		=gnome-base/libgnome-2*
-		=gnome-base/libgnomeui-2*
-	)
-	opengl?	(
-		virtual/glu
-		virtual/opengl
-	)
-	webkit? ( >=net-libs/webkit-gtk-1.2:2 )"
-DEPEND="${COMMON_DEP}
-	>=virtual/jdk-1.4
-	app-arch/unzip
-	virtual/pkgconfig
-	x11-libs/libX11
-	x11-libs/libXrender
-	x11-libs/libXt
-	>=x11-libs/libXtst-1.1.0
-	x11-proto/inputproto"
-RDEPEND="${COMMON_DEP}
-	>=virtual/jre-1.4"
-
-S="${WORKDIR}"
-
-# JNI libraries don't need SONAME, bug #253756
-QA_SONAME="usr/$(get_libdir)/libswt-.*.so"
-
-src_unpack() {
-	local DISTFILE=${A}
-	unzip -jq "${DISTDIR}"/${DISTFILE} "*src.zip" || die "Unable to extract distfile"
-	unpack "./src.zip"
-
-	# Cleanup the redirtied directory structure
-	rm -rf about_files/ || die
-}
-
-java_prepare() {
-	# Replace the build.xml to allow compilation without Eclipse tasks
-	cp "${FILESDIR}/build.xml" "${S}/build.xml" || die "Unable to update build.xml"
-	mkdir "${S}/src" && mv "${S}/org" "${S}/src" || die "Unable to restructure SWT sources"
-
-	# Fix Makefiles to respect flags and work with --as-needed
-	epatch "${FILESDIR}"/${P}-as-needed-and-flag-fixes.patch
-}
-
-src_compile() {
-	# Drop jikes support as it seems to be unfriendly with SWT
-	java-pkg_filter-compiler jikes
-
-	local AWT_ARCH
-	local JAWTSO="libjawt.so"
-	if [[ $(tc-arch) == 'x86' ]] ; then
-		AWT_ARCH="i386"
-	elif [[ $(tc-arch) == 'ppc' ]] ; then
-		AWT_ARCH="ppc"
-	elif [[ $(tc-arch) == 'ppc64' ]] ; then
-		AWT_ARCH="ppc64"
-	else
-		AWT_ARCH="amd64"
-	fi
-	if [[ -f "${JAVA_HOME}/jre/lib/${AWT_ARCH}/${JAWTSO}" ]]; then
-		export AWT_LIB_PATH="${JAVA_HOME}/jre/lib/${AWT_ARCH}"
-	elif [[ -f "${JAVA_HOME}/jre/bin/${JAWTSO}" ]]; then
-		export AWT_LIB_PATH="${JAVA_HOME}/jre/bin"
-	elif [[ -f "${JAVA_HOME}/$(get_libdir)/${JAWTSO}" ]] ; then
-		export AWT_LIB_PATH="${JAVA_HOME}/$(get_libdir)"
-	else
-		eerror "${JAWTSO} not found in the JDK being used for compilation!"
-		die "cannot build AWT library"
-	fi
-
-	# Fix the pointer size for AMD64
-	[[ ${ARCH} == "amd64" || ${ARCH} == "ppc64" ]] && export SWT_PTR_CFLAGS=-DJNI64
-
-	local platform="linux"
-
-	use elibc_FreeBSD && platform="freebsd"
-
-	local make="emake -f make_${platform}.mak NO_STRIP=y CC=$(tc-getCC) CXX=$(tc-getCXX)"
-
-	einfo "Building AWT library"
-	${make} make_awt
-
-	einfo "Building SWT library"
-	${make} make_swt
-
-	einfo "Building JAVA-AT-SPI bridge"
-	${make} make_atk
-
-	if use gnome ; then
-		einfo "Building GNOME VFS support"
-		${make} make_gnome
-	fi
-
-	if use cairo ; then
-		einfo "Building CAIRO support"
-		${make} make_cairo
-	fi
-
-	if use opengl ; then
-		einfo "Building OpenGL component"
-		${make} make_glx
-	fi
-
-	if use webkit ; then
-		einfo "Building the WebKitGTK+ component"
-
-		${make} make_webkit
-	fi
-
-	einfo "Building JNI libraries"
-	eant compile
-
-	einfo "Copying missing files"
-	cp -i "${S}/version.txt" "${S}/build/version.txt"
-	cp -i "${S}/src/org/eclipse/swt/internal/SWTMessages.properties" \
-		"${S}/build/org/eclipse/swt/internal/" || die
-
-	einfo "Packing JNI libraries"
-	eant jar
-}
-
-src_install() {
-	swtArch=${ARCH}
-	use amd64 && swtArch=x86_64
-	use x86-fbsd && swtArch=x86
-
-	sed "s/SWT_ARCH/${swtArch}/" "${FILESDIR}/${PN}-${SLOT}-manifest" > "MANIFEST_TMP.MF" || die
-	use cairo || sed -i -e "/ org.eclipse.swt.internal.cairo; x-internal:=true,/d" "MANIFEST_TMP.MF"
-	use gnome || sed -i -e "/ org.eclipse.swt.internal.gnome; x-internal:=true,/d" "MANIFEST_TMP.MF"
-	use opengl || sed -i -e "/ org.eclipse.swt.internal.opengl.glx; x-internal:=true,/d" "MANIFEST_TMP.MF"
-	use webkit || sed -i -e "/ org.eclipse.swt.internal.webkit; x-internal:=true,/d" "MANIFEST_TMP.MF"
-	java-osgi_newjar-fromfile "swt.jar" "MANIFEST_TMP.MF" "Standard Widget Toolkit for GTK 2.0"
-
-	java-pkg_sointo /usr/$(get_libdir)
-	java-pkg_doso *.so
-
-	dohtml about.html || die
-}
--- a/dev-lang/c-intercal/Manifest
+++ b/dev-lang/c-intercal/Manifest
@ -1 +1,2 @@
 DIST intercal-0.29.pax.gz 1003800 SHA256 fba1678bdd058350742fad2f3f0673bcea9f4c8add761855a67d8ada6650950b SHA512 0789278b334f65b6e2034493cf08b26a9885e7aec09072c9d9d3d2796b2c6b09f13a856afea1f77f6c6aac0f386b0a76e35ddd9c87584386f3b8a0ad30bddd31 WHIRLPOOL 9039db79d0ecfd17abdd2ba4788d5e812d4fc5db1fab3ba554567ec3d08cd7091408d054903e8a59dbf77fc78f5408dfc1608eaac0b10e1bf76c32b3a92e300d
+DIST intercal-0.30.tar.gz 930759 SHA256 b38b62a61a3cb5b0d3ce9f2d09c97bd74796979d532615073025a7fff6be1715 SHA512 e82f52082a73e0eb6116026f78fdcc38369f54af828b9ed0d3ca6ed6c40550bfa81db4ca7c4d09015b5db5104a1c06229cfed52e1d202c3a7443f933fbcc0498 WHIRLPOOL b76542b81d8322c5791a30573e0b7efdd7793a298970b29f074e49fa061e3a28f38fdbf7732f74a77d940e8167650182d3366f657ed525d079feb0c3d47d7dc2
--- a/dev-lang/c-intercal/c-intercal-29.0.ebuild
+++ b/dev-lang/c-intercal/c-intercal-29.0.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@ -25,10 +25,10 @@ get_intercal_version() {
 MY_PN="${PN#c-}"
 MY_PV="$(get_intercal_version)"
 DESCRIPTION="C-INTERCAL - INTERCAL to binary (via C) compiler"
-HOMEPAGE="http://c.intercal.org.uk"
+HOMEPAGE="http://c.intercal.org.uk/"
 SRC_URI="http://overload.intercal.org.uk/c/${MY_PN}-${MY_PV}.pax.gz"

-LICENSE="GPL-2 FDL-1.2"
+LICENSE="GPL-2+ FDL-1.2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="emacs examples"
--- a/dev-lang/c-intercal/c-intercal-30.0.ebuild
+++ b/dev-lang/c-intercal/c-intercal-30.0.ebuild
@ -0,0 +1,77 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit autotools elisp-common
+
+# C-INTERCAL uses minor-major ordering of version components and
+# negative version numbers. We map version components -1, -2, ...
+# to 65535, 65534, ..., and subtract one from the next component.
+# For example, upstream version 0.28 is mapped to Gentoo version 28.0
+# and 0.-2.0.29 is mapped to 28.65535.65534.0.
+get_intercal_version() {
+	local i=.${1:-${PV}} j k c=0
+	while [[ ${i} ]]; do
+		(( k = ${i##*.} + c ))
+		(( (c = (k >= 32768)) && (k -= 65536) ))
+		i=${i%.*}
+		j=${j}.${k}
+	done
+	echo ${j#.}
+}
+
+MY_PN="${PN#c-}"
+MY_PV="$(get_intercal_version)"
+DESCRIPTION="C-INTERCAL - INTERCAL to binary (via C) compiler"
+HOMEPAGE="http://www.catb.org/~esr/intercal/"
+SRC_URI="http://www.catb.org/~esr/intercal/${MY_PN}-${MY_PV}.tar.gz"
+
+LICENSE="GPL-2+ FDL-1.2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="emacs examples"
+
+DEPEND="emacs? ( virtual/emacs )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_PN}-${MY_PV}"
+SITEFILE="50${PN}-gentoo.el"
+
+src_prepare() {
+	eapply "${FILESDIR}"/${P}-version.patch
+	eapply_user
+	eautoreconf
+}
+
+src_compile() {
+	emake
+
+	if use emacs; then
+		elisp-compile etc/intercal.el
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc BUGS NEWS HISTORY README doc/THEORY.txt
+
+	if use emacs; then
+		elisp-install ${PN} etc/intercal.{el,elc}
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r pit
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
--- a/dev-lang/c-intercal/files/c-intercal-30.0-version.patch
+++ b/dev-lang/c-intercal/files/c-intercal-30.0-version.patch
@ -0,0 +1,11 @@
+--- intercal-0.30-orig/configure.ac
+++ intercal-0.30/configure.ac
+@@ -14,7 +14,7 @@
+ 		  subdir-objects no-texinfo.tex -Wall -Wno-override])
+ 
+ dnl Information about this version of INTERCAL.
+-PACKAGE_VERSION=0.29
+PACKAGE_VERSION=0.30
+ 
+ dnl Checks for programs.
+ AC_PROG_YACC
--- a/dev-libs/engine_pkcs11/Manifest
+++ b/dev-libs/engine_pkcs11/Manifest
@ -1 +1,2 @@
 DIST engine_pkcs11-0.1.8.tar.gz 320799 SHA256 de7d7e41e7c42deef40c53e10ccc3f88d2c036d6656ecee7e82e8be07b06a2e5 SHA512 00fa7cf1e44544267248b17669f69a3d91b8e3008da8a8d70004d8ed87543eb75b06c4a9f028f9aee157f54110acadf40d2c6ff3835eae4cf0c29ac819557dc2 WHIRLPOOL c2121466980c9fb425e1f6ca53dde2b055fa833c3f42494dc2fc6f7a0468aa84d14cacc1ff2bd8319f54eb336ae79b3b442f33406ff275074162e1b274beff7a
+DIST engine_pkcs11-0.2.2.tar.gz 347122 SHA256 eeec81e63741f5ad1ee28f9d1e405512446674618b5422ac7a75f16e6f438d50 SHA512 877eab21e9e31853e504e4a222e18f13a8020de724338a8af4adfc840ec55c610b35dbe455b4b59a170ff9b829610ec9bc404b10d873d17b0246c59b178ebe44 WHIRLPOOL d0f8d8572544893f4c7d93fea5016bfd3be66e7fcf030a9889b806efe6b156a2075dbbab3c462576908812bcd718562aac609049012c6eee74e11315d97670ca
--- a/dev-libs/engine_pkcs11/engine_pkcs11-0.2.2.ebuild
+++ b/dev-libs/engine_pkcs11/engine_pkcs11-0.2.2.ebuild
@ -0,0 +1,28 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit eutils
+
+DESCRIPTION="engine_pkcs11 is an implementation of an engine for OpenSSL"
+HOMEPAGE="http://www.opensc-project.org/engine_pkcs11"
+SRC_URI="https://github.com/OpenSC/${PN}/releases/download/${P}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="libressl"
+
+RDEPEND=">=dev-libs/libp11-0.3.1
+	!libressl? ( >=dev-libs/openssl-0.9.7d:0 )
+	libressl? ( dev-libs/libressl )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_install() {
+	default
+	prune_libtool_files --all
+}
--- a/dev-libs/libp11/Manifest
+++ b/dev-libs/libp11/Manifest
@ -1 +1,2 @@
 DIST libp11-0.2.8.tar.gz 377508 SHA256 a4121015503ade98074b5e2a2517fc8a139f8b28aed10021db2bb77283f40691 SHA512 917c6623942c83e7657c9b9c4ce0482ffc4539fc29edec9ace412dcece640be3785bf82e09e344c0866b55619ea011ab829ef3d4f8205f2019121d837b1d6c17 WHIRLPOOL fe4f8c6ce952e8a0985bf90af1413c0ba2c2ac84309b1cad55c12f65aa77655e4b9154e1af53d55ba968f9c88a960efd44a4033bcbaa309958f35327eeeac0d9
+DIST libp11-0.4.2.tar.gz 438887 SHA256 e2c3614a314b452a9b57e2914252df3ffee59e262dfb75b4fc73a2247f8ddebe SHA512 086845e8d1094ada8c301776e0231904e3cdaa28df6e8621490f8cbb0925ae8f8d9381ae1000f60686effa89bfbb34ccc013a77156d15718f269495260f125a2 WHIRLPOOL ddcc49a2ec00fcf8dbcb0bf3a915946c0d8f126be74d5bb2942cf9667b8fbe549031ed75839e57731fec96febeb02a03a129707ee01456b70a06bb008babe5bf
--- a/dev-libs/libp11/files/libp11-0.4.2-build.patch
+++ b/dev-libs/libp11/files/libp11-0.4.2-build.patch
@ -0,0 +1,29 @@
+From 74b7c656b0a5325c8198ee137bac05878c99d585 Mon Sep 17 00:00:00 2001
+From: Alon Bar-Lev <alon.barlev@gmail.com>
+Date: Sat, 29 Oct 2016 11:39:29 +0300
+Subject: [PATCH] build: fix symlink installation
+
+this fixes incorrect fix b313f00cc of symlink installation
+by adding dependency instead of overwriting automake behavior.
+
+Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
+---
+ src/Makefile.am | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 2aa5195..d0dd37e 100644
+--- a/src/Makefile.am
+++ b/src/Makefile.am
+@@ -48,7 +48,7 @@ pkcs11_la_LDFLAGS = $(AM_LDFLAGS) -module -shared -shrext $(SHARED_EXT) \
+ check-local: $(LTLIBRARIES)
+ 	cd .libs && $(LN_S) -f pkcs11$(SHARED_EXT) libpkcs11$(SHARED_EXT)
+-install-exec-hook:
+install-exec-hook: install-enginesLTLIBRARIES
+ 	cd '$(DESTDIR)$(enginesdir)' && $(LN_S) -f pkcs11$(SHARED_EXT) libpkcs11$(SHARED_EXT)
+ 
+ if WIN32
+ # def file required for MS users to build library
+-- 
+2.7.3
+
--- a/dev-libs/libp11/libp11-0.4.2.ebuild
+++ b/dev-libs/libp11/libp11-0.4.2.ebuild
@ -0,0 +1,44 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+
+inherit autotools eutils
+
+DESCRIPTION="Abstraction layer to simplify PKCS#11 API"
+HOMEPAGE="https://github.com/opensc/libp11/wiki"
+SRC_URI="https://github.com/OpenSC/${PN}/releases/download/${P}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="libressl bindist doc static-libs"
+
+RDEPEND="
+	!libressl? ( dev-libs/openssl:0=[bindist] )
+	libressl? ( dev-libs/libressl:0= )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )"
+
+PATCHES=(
+	"${FILESDIR}/${P}-build.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--enable-shared \
+		$(use_enable static-libs static) \
+		$(use_enable doc api-doc)
+}
+
+src_install() {
+	default
+	prune_libtool_files
+}
--- a/dev-python/elasticsearch-curator/Manifest
+++ b/dev-python/elasticsearch-curator/Manifest
@ -1,2 +1,3 @@
 DIST elasticsearch-2.4.0.tar.gz 27364449 SHA256 3ae01140ae7bcbb91436feef381fbed774e36ef6d1e8e6a3153640db82acf4c9 SHA512 931f4d42cba43131718ec7480439b5fda0b9222a51cf9639d99ab4c00bdbedbe7e8da7a6016d88b848772cd416bc49fe7af09202160cecf839e39d803b45e869 WHIRLPOOL e03a2f7a6ea5913ce112b82e8578183c401f2d5901070a77c509ddbe7333fe62622fb2bb3e0f786a914bb15c56793e8b13220ae4588271baa3bbbcdf86223f47
 DIST elasticsearch-curator-4.0.6.tar.gz 110804 SHA256 e60f671dfa003f45f68320599cb15cee38cc61cb25899d903c2b29f2e3892e09 SHA512 b52af17d7d58bb9599095a00d03e5fda6bc7d9b401d100379f2a6969e5f995367192f33c045251518345abd86f2b143b1b086aab2c165d7e66efccb02dab8698 WHIRLPOOL 7621d883d59202882f455393ca7a87b39292667890dd2c5e3841ffb8a62e823d775794173a0205b02da24b7016509759c302bfabee5fc77a8000c961f853466f
+DIST elasticsearch-curator-4.1.2.tar.gz 130194 SHA256 f4ccc0d49790e0f9390982cc2f0c69ad385361e7840050b6ecba4ef70fa64a0d SHA512 4a465c03baea6b708ce38bbaea8c94a288f91db39fba253a3123af68bce94b1253d22f0d9214fc449a97d55ad468f7f78bf14993c0f5cf18fcf91ebbe1ec57cb WHIRLPOOL 73f8b59f08a6746468336aaac9217a4e37ee15e0deeaf9711d7af79585dfe4e18402d6dceb3feafbafec3e2609dbcc7df983555529640e046336e0bb7421f0d3
--- a/dev-python/elasticsearch-curator/elasticsearch-curator-4.1.2.ebuild
+++ b/dev-python/elasticsearch-curator/elasticsearch-curator-4.1.2.ebuild
@ -0,0 +1,114 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+MY_PN="curator"
+ES_VERSION="2.4.0"
+
+inherit distutils-r1
+
+DESCRIPTION="Tending time-series indices in Elasticsearch"
+HOMEPAGE="https://github.com/elasticsearch/curator"
+SRC_URI="https://github.com/elasticsearch/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	test? ( https://download.elasticsearch.org/elasticsearch/elasticsearch/elasticsearch-${ES_VERSION}.tar.gz )"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND="
+	>=dev-python/elasticsearch-py-2.3.0[${PYTHON_USEDEP}]
+	<dev-python/elasticsearch-py-5.1.0[${PYTHON_USEDEP}]
+	>=dev-python/click-3.3[${PYTHON_USEDEP}]
+	dev-python/certifi[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.8.3[${PYTHON_USEDEP}]
+	dev-python/voluptuous[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/sphinx[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND}
+		|| ( virtual/jre:1.8 virtual/jre:1.7 )
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/nosexcover[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+python_test() {
+	ES="${WORKDIR}/elasticsearch-${ES_VERSION}"
+	ES_PORT="25123"
+	ES_LOG="${ES}/logs/elasticsearch.log"
+	PID="${ES}/elasticsearch.pid"
+
+	# run Elasticsearch instance on custom port
+	sed -i "s/# http.port: 9200/http.port: ${ES_PORT}/g; \
+		s/# cluster.name: my-application/cluster.name: gentoo-es-curator-test/g" \
+		${ES}/config/elasticsearch.yml || die
+
+	# Elasticsearch 1.6+ needs to set path.repo
+	grep -q "^path.repo" "${ES}/config/elasticsearch.yml"
+	if [ $? -ne 0 ]; then
+		echo "path.repo: /" >> "${ES}/config/elasticsearch.yml" || die
+	fi
+
+	# start local instance of elasticsearch
+	${ES}/bin/elasticsearch -d -p ${PID} || die
+
+	local i
+	for i in {1..10}; do
+		grep -q "started" ${ES_LOG} 2> /dev/null
+		if [ $? -eq 0 ]; then
+			einfo "Elasticsearch started"
+			eend 0
+			break
+		elif grep -q 'BindException\[Address already in use\]' "${ES_LOG}" 2>/dev/null; then
+			eend 1
+			eerror "Elasticsearch already running"
+			die "Cannot start Elasticsearch for tests"
+		else
+			einfo "Waiting for Elasticsearch"
+			eend 1
+			sleep 2
+			continue
+		fi
+	done
+
+	export TEST_ES_SERVER="localhost:${ES_PORT}"
+	esetup.py test
+
+	pkill -F ${PID}
+}
+
+python_prepare_all() {
+	# avoid downloading from net
+	sed -e '/^intersphinx_mapping/,+3d' -i docs/conf.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	cd docs || die
+	emake man $(usex doc html "")
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	doman docs/_build/man/*
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	ewarn ""
+	ewarn "For Python 3 support information please read: http://click.pocoo.org/3/python3/"
+	ewarn ""
+	ewarn "Example usage on Python 3:"
+	ewarn "export LC_ALL=en_US.UTF-8"
+	ewarn "export LANG=en_US.UTF-8"
+	ewarn "curator ..."
+}
--- a/dev-python/elasticsearch-py/Manifest
+++ b/dev-python/elasticsearch-py/Manifest
@ -1,5 +1,7 @@
 DIST elasticsearch-2.2.1.tar.gz 29424648 SHA256 7d43d18a8ee8d715d827ed26b4ff3d939628f5a5b654c6e8de9d99bf3a9b2e03 SHA512 9254175afff5c002625465fb5f398e4e53d121925a656af13e65d90eb3b3ef7507ef094cf44002f104a84e5147a8677a05f4071248140d6b48179b9057867cb5 WHIRLPOOL a470a663b8ec1b8cb7a8daf6bfc02ed7d5d0f23caab063ac2e6c7456bda449bad3e81237699fa434f077d4f86ee09dac7d007b554acc6428f2b436cf8448b210
 DIST elasticsearch-2.3.5.tar.gz 27547995 SHA256 1119a8c18620b98c4b85261318663a1f26dea92a26f34dfeb7f813fb7cbb468a SHA512 9c0cc8a9ae0fa2b52db583a5c006b05a84c1f84e1b8dbbafa88bec111190d056a23bd384d4241ce00dc8b56a6840857b296e4c0d2bf911f352ef67f128a87ca7 WHIRLPOOL de2aee3773d14c9b4abc0f20c3c8df1fe374a91ea54493f2c1df59fb8c02c97d684fd94b6bfaf140eebcfea4913197b10469b5aef34f62db89d825ae508a5095
+DIST elasticsearch-5.0.0.tar.gz 32968292 SHA256 a866534f0fa7428e980c985d712024feef1dee04709add6e360fc7b73bb1e7ae SHA512 a4fa650d643c242a1f90059cfe6eb27e3d240b3deafc426abeae72c13aeae84b01ffb8b872b748619dfc58225ca29bde054fe10e1529522f9a06a1051991e4cd WHIRLPOOL a05a6dc785c00bb461ea286490cacc0222f9f95f0dea7ba61c6308cee0284edc53ee0a2047f723e990fa99f7ed09feda46313997b8f6dd487b042a6b26ecf8d6
 DIST elasticsearch-py-1.4.0.tar.gz 74498 SHA256 7959787b47c3523e9c9aeffec441091fcd2b293d26c4fd5f576cf84cfb85ef63 SHA512 dbe51362f68d40e95a0cfefde4feb8d9d9c61b4f4795cbf69fd70bf981f290812ebac19a20ae8594cc39ac46a3c35ddfe450ff436fca0fada060736128478cf7 WHIRLPOOL a6730bcccc1201048f82aed6e63b7e73f38150002dd9889c575c9edf52834bc6f9a8256977ac27b092f3865074e4699729cc766564a4b731766d77d6a6de6324
 DIST elasticsearch-py-2.3.0.tar.gz 74954 SHA256 3610d3a2d2f4eb1906794276ac6fca1ad801067e0f36d71a8a11c2c9112ed120 SHA512 53ffc265dc2c42ef983bf12a6d6bfcb96a378da97c58b52ff872968e50f01936815f2d28d667d44a647174d90b55fbe6855ebeac6f86248adb4db4ba951facb1 WHIRLPOOL 836ea86fe64851eb1c8891f70ee8502bb2ff76c919536a3f57f06880dfed96626a658f3a722622ac49deb6d55ca9235755b56c771ed55d298b993c009c283b48
 DIST elasticsearch-py-2.4.0.tar.gz 77199 SHA256 0cab15c1a5c014f259703d982b074b3c6864fb152dd909fba60d23cde9133b76 SHA512 5a38419b4448850722c6af9181d5f00bed20796b645a336706040244c559893da7f57aa556251b8b2ee022c48f651b5f7646fc51f9f0f20ed3ab1449f244c096 WHIRLPOOL c28412a06b0a13329d8b4ad377cdfe3d88ac2afc130b872fcf51dadc148a6f17c4e3ea6b03982be8553d64c224841932aa8e1847fb225a001331219651c0d6dd
+DIST elasticsearch-py-5.0.0.tar.gz 79615 SHA256 544d526b022f398e555df2c83e25728159bcadbddf016aea6f4a8db706945ae9 SHA512 ed5ed433a81cadd71e596b14e7a0d1d69d549f25ea5e5ea3d4de0a755f3939eb3b86820937a4874e6acbfe0aa6d66027b5f696d7fac2fb9e692cbe140ed77417 WHIRLPOOL 741eb9e76aa51da47e18cfe25b474b622efcbe4e4cac5ce38d5112e91f56694561919d3b882274ae8caee4480bde7cdabddf54e8168369e684725463147eda7c
--- a/dev-python/elasticsearch-py/elasticsearch-py-5.0.0.ebuild
+++ b/dev-python/elasticsearch-py/elasticsearch-py-5.0.0.ebuild
@ -0,0 +1,91 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy )
+
+ES_VERSION="5.0.0"
+
+inherit distutils-r1
+
+RESTRICT="test" # fails to start in chroot envs, unreliable
+
+MY_PN=${PN/-py/}
+
+DESCRIPTION="official Python low-level client for Elasticsearch"
+HOMEPAGE="http://elasticsearch-py.rtfd.org/"
+SRC_URI="https://github.com/elasticsearch/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+		test? ( https://download.elasticsearch.org/elasticsearch/release/org/elasticsearch/distribution/tar/elasticsearch/${ES_VERSION}/elasticsearch-${ES_VERSION}.tar.gz )"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples doc test"
+
+RDEPEND=">=dev-python/urllib3-1.8[${PYTHON_USEDEP}]
+	<dev-python/urllib3-2.0[${PYTHON_USEDEP}]"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/sphinx-1.3.1-r1[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND}
+		>=dev-python/requests-1.0.0[${PYTHON_USEDEP}]
+		<dev-python/requests-3.0.0[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pretty-yaml[${PYTHON_USEDEP}]
+		dev-python/nosexcover[${PYTHON_USEDEP}]
+		|| ( virtual/jre:1.8 virtual/jre:1.7 ) )"
+
+python_test() {
+	ES="${WORKDIR}/elasticsearch-${ES_VERSION}"
+	ES_PORT="25124"
+	ES_LOG="${ES}/logs/elasticsearch.log"
+	PID="${ES}/elasticsearch.pid"
+
+	# run Elasticsearch instance on custom port
+	sed -i "s/# http.port: 9200/http.port: ${ES_PORT}/g; \
+		s/# cluster.name: my-application/cluster.name: gentoo-es-py-test/g" \
+		${ES}/config/elasticsearch.yml || die
+
+	# start local instance of elasticsearch
+	${ES}/bin/elasticsearch -d -p ${PID} || die
+
+	local i
+	for i in `seq 10`; do
+		grep -q "started" ${ES_LOG} 2> /dev/null
+		if [ $? -eq 0 ]; then
+			einfo "Elasticsearch started"
+			eend 0
+			break
+		elif grep -q 'BindException\[Address already in use\]' "${ES_LOG}" 2>/dev/null; then
+			eend 1
+			eerror "Elasticsearch already running"
+			die "Cannot start Elasticsearch for tests"
+		else
+			einfo "Waiting for Elasticsearch"
+			eend 1
+			sleep 2
+			continue
+		fi
+	done
+
+	export TEST_ES_SERVER="localhost:${ES_PORT}"
+	esetup.py test
+
+	pkill -F ${PID}
+}
+
+python_compile_all() {
+	cd docs || die
+	emake man $(usex doc html "")
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( docs/_build/html/. )
+	use examples && dodoc -r example
+	doman docs/_build/man/*
+	distutils-r1_python_install_all
+}
--- a/dev-python/fasteners/Manifest
+++ b/dev-python/fasteners/Manifest
@ -1 +1,2 @@
 DIST fasteners-0.13.0.tar.gz 17510 SHA256 76a804e7d5793ea5239aee7ccface4a51262fdd1d49cdb407838c2f8076ef059 SHA512 921affd29452548e97e0dbb2dc70d7f0df9c181b6f17da734dceef37f42f0873d4316da50905b56d9dae20801001d1fdde94569f6bb41f60fc211ef5bc7f161d WHIRLPOOL 3b94d7700a7e600328a42ddac0b3e2306a79dd2bd4fb1b3e540d0d635da3a81e75339abdf612833fbaf717e36430539dbf2a1b73390b0f8e57b665ac1e65f866
+DIST fasteners-0.14.1.tar.gz 17749 SHA256 427c76773fe036ddfa41e57d89086ea03111bbac57c55fc55f3006d027107e18 SHA512 a58c5f1658b1bc664c825f2237fa91b72b9f31590e7eb79c7ae7a86c507ebe84574ac7d8e837a7bec11ad32f04204ef6f5906219b00a6adb0732daee1eb6faa1 WHIRLPOOL 21c27f5c23e6c472210dae6b7aad8265c6cb952f63b0200a8489bb8462589d1b14a50d084453ec5487e39a857e8008ebad342c719a80affb3605255e7a43d406
--- a/dev-python/fasteners/fasteners-0.14.1.ebuild
+++ b/dev-python/fasteners/fasteners-0.14.1.ebuild
@ -0,0 +1,33 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python package that provides useful locks"
+HOMEPAGE="https://github.com/harlowja/fasteners"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/monotonic-0.1[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/testtools[${PYTHON_USEDEP}]
+		virtual/python-futures[${PYTHON_USEDEP}] )"
+
+python_test() {
+	nosetests -v || die
+}
--- a/dev-python/ipdb/Manifest
+++ b/dev-python/ipdb/Manifest
@ -1,3 +1,4 @@
+DIST ipdb-0.10.1.tar.gz 8595 SHA256 bb2948e726dbfb2687f4a582088b3f170b2556ba8e54ae1231c783c97e99ec87 SHA512 81dcc80651f7aab54287c2b6b7a4d7af1afa6962382dbf0dfa4d436fa0002522bb3c87c82133fd2d9cbb83a4e471b611afb6f7e7c6bd6db8b0685d94d651bce2 WHIRLPOOL 3c11655ad445c0c4f985b110ecbcfe75cda84ceb2fb3aa7a4133467bae7171181a451a45c24f061f89bd41340618a4bef41e583a98160503228cd877dba760b8
 DIST ipdb-0.8.1.zip 20522 SHA256 1763d1564113f5eb89df77879a8d3213273c4d7ff93dcb37a3070cdf0c34fd7c SHA512 515f282cb82ea989670a77956c02ac6433c125beba94c67b1eb90058c2427aac2345d02bb64b71a9593abbf7539d5ab0c20675bd24dde294b1e00544748da65c WHIRLPOOL 3e91eced09d5da6a0fc5442a6df97947fdd018bf73cd52ce0f4800e12f0a1c92f3168c3a171395e601669238b9cbebae0507cce60ca2db02a7f2610ffd73afc2
 DIST ipdb-0.8.2.tar.gz 13623 SHA256 9ac7193658c787321c79b366a3f415f968a215b4d7647508311415944762b727 SHA512 7b1f53787adffb3342f08fc55934e2e0188a990da1ec5661caae9879bb10d1678fd5f6e75268eb9125d5db648416328ae6937af8fbe097475a21751eb94f6624 WHIRLPOOL dee992900579ac68c14dcd171442541d8dcc24cccdc28b321e82d7b3b8ce3617fac7837a15db82f346717b3ac50aed166cd87985d1bac2be28c09629e31a6764
 DIST ipdb-0.8.zip 20204 SHA256 0d4a33f38e667a0c80ec1a5a0e468fe58e5cdc61cb8f4077b1024b85fe7b7117 SHA512 8d0c510a80efeb3ca9a87e4a573bbd0d75629789dec33ebd135f8c9285a276af2cfe5b6628d0bb121a3dbf9e6f248a19a341d9b475b7bfaa15bb9bdca0584dde WHIRLPOOL 376a2c872ae45e943fb99e8cc201f8d8e2a3ebcdc84dde5d1857269170ab6379d8eb2106567484d4eb2454a5c38e6c355d7a136cf74fab40b907fcabef2d6b8f
--- a/dev-python/ipdb/ipdb-0.10.1.ebuild
+++ b/dev-python/ipdb/ipdb-0.10.1.ebuild
@ -0,0 +1,31 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="IPython-enabled pdb"
+HOMEPAGE="https://pypi.python.org/pypi/ipdb"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-python/ipython[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/backports-shutil_get_terminal_size[${PYTHON_USEDEP}]' python2_7)
+	"
+
+DOCS=( HISTORY.txt )
+
+python_test() {
+	esetup.py test
+}
--- a/dev-python/m2crypto/m2crypto-0.25.1-r1.ebuild
+++ b/dev-python/m2crypto/m2crypto-0.25.1-r1.ebuild
@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

-EAPI=5
+EAPI=6

 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="threads(+)"
@ -17,12 +17,13 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"

 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~amd64"
 IUSE="libressl"

 RDEPEND="
 	!libressl? ( >=dev-libs/openssl-0.9.8:0= )
-	libressl? ( dev-libs/libressl:= )
+	libressl? ( dev-libs/libressl:0= )
+	dev-python/typing
 "
 DEPEND="${RDEPEND}
 	>=dev-lang/swig-1.3.28:0
--- a/dev-python/nose-parameterized/Manifest
+++ b/dev-python/nose-parameterized/Manifest
@ -0,0 +1 @@
+DIST nose-parameterized-0.5.0.tar.gz 10363 SHA256 a11c41b0cf8218e7cdc19ab7a1bdf5c141d161cd2350daee819473cc63cd0685 SHA512 812e3e0a44f1db323f9c134b7438ea5e2c63232b04dc4d8aa59d153253183471784fd4960ffb18f23e14c398e4633515ff933bdfbfdb6954c44af97235d3cf91 WHIRLPOOL d25ff1ef662fe6544176ed61a82cbf4725a377d7bb28dc9215623a250d63b4cc0eaff03e193d80b9f48dccc055ea3ba62ece871e10f12e5cc3f353e110d3db00
--- a/dev-python/nose-parameterized/metadata.xml
+++ b/dev-python/nose-parameterized/metadata.xml
@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <longdescription lang="en">
+    Parameterized testing for nose, parameterized testing for py.test, parameterized testing for unittest.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">nose-parameterized</remote-id>
+    <remote-id type="github">wolever/nose-parameterized</remote-id>
+  </upstream>
+</pkgmetadata>
--- a/dev-python/nose-parameterized/nose-parameterized-0.5.0.ebuild
+++ b/dev-python/nose-parameterized/nose-parameterized-0.5.0.ebuild
@ -0,0 +1,24 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Parameterized testing with any Python test framework"
+HOMEPAGE="https://github.com/kgrandis/nose-exclude"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="dev-python/nose[${PYTHON_USEDEP}]"
+
+python_test() {
+	nosetests -v || die
+}
--- a/dev-python/nose-testconfig/Manifest
+++ b/dev-python/nose-testconfig/Manifest
@ -1 +1,2 @@
+DIST nose-testconfig-0.10.tar.gz 9390 SHA256 54328a20ee8e8f877ba31af9ba76f29aa8254581b0ba57d8e306f37b8e1a94c8 SHA512 6bf05e0b82e0b47919da6e7f421c0c06737f9cc6d78eda49ca3d8b206d47313525a57af6c04760cdefc4e7d3288a2c10eaba9666d30a4f8135ed9856d219d7ca WHIRLPOOL 342d1c29a2e7f40f4e39157e58449c4e08b445109481d7711d04a6d174902768c857bcd1ea16a74a3b7f6b9de91794614ceb26401439af55d7601e3ed05686f7
 DIST nose-testconfig-0.9.tar.gz 7614 SHA256 bb6f1dd2dbd3e54a6c456110fb6dced449b5ad5262af712d595c123e4f8c34d3 SHA512 411630f9af56955e5bd87efaf2db0817442f78dc61ea64a29ac186f0a71d23d81220f68bab18ceb7d3bf201bc441b522bf9acff21b541905a5a4397280444a07 WHIRLPOOL e69abb0eb794ed72f54010268a4eeb7356b374efa52caf60cc637a904836ca703b04d36bbbdbb6bc5eefaee6e7d1990cc7d52228864611c91ef631e09624a25b
--- a/dev-python/nose-testconfig/nose-testconfig-0.10.ebuild
+++ b/dev-python/nose-testconfig/nose-testconfig-0.10.ebuild
@ -0,0 +1,26 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy  )
+
+inherit distutils-r1
+
+DESCRIPTION="Test Configuration plugin for nosetests"
+HOMEPAGE="https://bitbucket.org/jnoller/nose-testconfig"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+RDEPEND="dev-python/nose"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DOCS=( docs/index.txt )
+
+python_install_all() {
+	use examples && local EXAMPLES=( examples/. )
+	distutils-r1_python_install_all
+}
--- a/dev-python/nose/nose-1.3.7-r3.ebuild
+++ b/dev-python/nose/nose-1.3.7-r3.ebuild
@ -0,0 +1,95 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Unittest extension with automatic test suite discovery and easy test authoring"
+HOMEPAGE="
+	https://pypi.python.org/pypi/nose
+	http://readthedocs.org/docs/nose/
+	https://bitbucket.org/jpellerin/nose"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc examples test"
+
+REQUIRED_USE="
+	doc? ( || ( $(python_gen_useflags 'python2*') ) )"
+
+RDEPEND="
+	dev-python/coverage[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	doc? ( >=dev-python/sphinx-0.6[${PYTHON_USEDEP}] )
+	test? ( || ( $(python_gen_cond_dep 'dev-python/twisted-core[${PYTHON_USEDEP}]' python2_7)
+		 $(python_gen_cond_dep 'dev-python/twisted[${PYTHON_USEDEP}]' python2_7) ) )"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-python-3.5-backport.patch
+
+	# Patch against master found in an upstream PR, backported:
+	# https://github.com/nose-devs/nose/pull/1004
+	"${FILESDIR}"/${P}-coverage-4.1-support.patch
+)
+
+pkg_setup() {
+	use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( 'python2*' )
+}
+
+python_prepare_all() {
+	# Tests need to be converted, and they don't respect BUILD_DIR.
+	use test && DISTUTILS_IN_SOURCE_BUILD=1
+
+	# Disable tests requiring network connection.
+	sed \
+		-e "s/test_resolve/_&/g" \
+		-e "s/test_raises_bad_return/_&/g" \
+		-e "s/test_raises_twisted_error/_&/g" \
+		-i unit_tests/test_twisted.py || die "sed failed"
+	# Disable versioning of nosetests script to avoid collision with
+	# versioning performed by the eclass.
+	sed -e "/'nosetests%s = nose:run_exit' % py_vers_tag,/d" \
+		-i setup.py || die "sed2 failed"
+
+	# Prevent un-needed d'loading during doc build
+	sed -e "s/, 'sphinx.ext.intersphinx'//" -i doc/conf.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	local add_targets=()
+
+	if use test; then
+		add_targets+=( egg_info )
+		python_is_python3 && add_targets+=( build_tests )
+	fi
+
+	distutils-r1_python_compile ${add_targets[@]}
+}
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_test() {
+	"${PYTHON}" selftest.py -v || die "Tests fail with ${EPYTHON}"
+}
+
+python_install() {
+	distutils-r1_python_install --install-data "${EPREFIX}/usr/share"
+}
+
+python_install_all() {
+	use examples && dodoc -r examples
+	use doc && HTML_DOCS=( doc/.build/html/. )
+	distutils-r1_python_install_all
+}
--- a/dev-python/nose_warnings_filters/Manifest
+++ b/dev-python/nose_warnings_filters/Manifest
@ -1 +1,2 @@
 DIST nose_warnings_filters-0.1.0.tar.gz 3551 SHA256 198f1fb8d69583e555d565a544fb6817366d8493a783bbba6121a7c0adb8a7bb SHA512 6715d3a84fdaa712dfb10e4f48f874900e979dc58cbc8fdb4728a1589c9f0bec42b831e4896fb935b2ed4b2bde49e08210922ac3cda8fc0f18683b992f1b3dad WHIRLPOOL 1b1b65811e788eb27f67b2c7bbe8ee02a74dd53df8daa1af0d191cfdff8e9504d0885ede89657952d24b37a54bc193218ffa823071677e097040b0e7b32ac6cb
+DIST nose_warnings_filters-0.1.1.tar.gz 4118 SHA256 5d11dc351e6059cc398351140041377cffa1390097bc1564bdf325005163228c SHA512 fee5acff223077a8f5d753a7d01a77c0c3e2981bac8d4d8a847e1c81d363a945f0487a7237950dae9bd07fb3ee79c7404e512eba7e9987608baf70ec85bc684b WHIRLPOOL 2e826c01f70b9c7e4674fcd02fe1e7f129c5195d13cb55a76ca21d87dd032198599ca18a29d4b28cacef95b2f21c03282c31f7b58b9037b33680dd3e7a038477
--- a/dev-python/nose_warnings_filters/nose_warnings_filters-0.1.1.ebuild
+++ b/dev-python/nose_warnings_filters/nose_warnings_filters-0.1.1.ebuild
@ -0,0 +1,52 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
+
+inherit python-r1
+
+DESCRIPTION="A python module to inject warning filters during nosetest"
+HOMEPAGE="https://github.com/Carreau/nose_warnings_filters"
+SRC_URI="https://github.com/Carreau/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="${PYTHON_DEPS}
+	dev-python/nose[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+src_test() {
+	# nose_warnings_filters doesn't have a proper
+	# testing suite, hence we run the only testing
+	# script available
+	export PYTHONPATH="${S}:${S}/${PN}/tests"
+	touch "${S}/${PN}/tests/__init__.py" || die
+	run_test() {
+		"${PYTHON}" "${PN}"/tests/test_config.py \
+			|| die "Failed running test script"
+	}
+	python_foreach_impl run_test
+	unset PYTHONPATH
+}
+
+src_install() {
+	python_moduleinto "${PN}"
+	install_files() {
+		python_domodule "${PN}/__init__.py"
+
+		# Unfortunately, nose_warnings_filters is designed
+		# as a wheel package, for which a METADATA file is
+		# strictly required, otherwise a Runtime error is thrown
+		local egg_dir="${D%/}$(python_get_sitedir)/${PN}-${PV}.dist-info"
+		mkdir -p "${egg_dir}" || die
+		cp entry_points.txt "${egg_dir}" || die
+		touch "${egg_dir}"/METADATA || die
+	}
+	python_foreach_impl install_files
+}
--- a/dev-python/patch/Manifest
+++ b/dev-python/patch/Manifest
@ -0,0 +1 @@
+DIST patch-1.16.zip 12809 SHA256 c62073f356cff054c8ac24496f1a3d7cfa137835c31e9af39a9f5292fd75bd9f SHA512 563be07f0376e6ddcf7fa500006d57def4faa2d9fdbd5232afac625d17d9621787de60dc67f0895e1f54f1d5cf0920594ade0985f1dfb7796f131acc92cd7f0b WHIRLPOOL 9922686830093745168256c106fbc0a26ef17f40992a6b2bb3fd9c48bb0d6f6c978a90f886713eda4a2471f135740549ff7de76e4d14bdf58cae38bb46814ac0
--- a/dev-python/patch/metadata.xml
+++ b/dev-python/patch/metadata.xml
@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">techtonik/patch</remote-id>
+  </upstream>
+</pkgmetadata>
--- a/dev-python/patch/patch-1.16.ebuild
+++ b/dev-python/patch/patch-1.16.ebuild
@ -0,0 +1,23 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Library to parse and apply unified diffs"
+HOMEPAGE="https://github.com/techtonik/python-patch/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	app-arch/unzip"
+
+S="${WORKDIR}"
--- a/dev-python/python-iptables/Manifest
+++ b/dev-python/python-iptables/Manifest
@ -1,3 +1,4 @@
 DIST python-iptables-0.10.0.tar.gz 72897 SHA256 9118ce089b2732bae8647575c1c15d6e9af4f367c0f47ea27b404e2e02dcb5ca SHA512 3e6a77149b60bf0d408739827c9c73c759542b28d746c2d6636e7c60aa0d9f5ec6deba62a40b938629747788849eaf539c9950c84a022278e64fba24acc1171f WHIRLPOOL c481603b415ba5567567b886288c415d66d4a85c0622e4df08ab1534f273ae7ea2b1f564ec3320ca748baa54b0ed7a3e1e2f4d357fc4e046990d7cfd722582ec
+DIST python-iptables-0.11.0.tar.gz 73582 SHA256 55bdd0d8e3d0b4c27e4d61bf6f21ada1e19146c0adf65e5093e254a126abcce9 SHA512 5bbaeb09dc256738e3a168fa5941f39e50074eb1ac3ce18545a48c55eb06ef70fd974ad3153dc07ca67b1ef88a2a2c537a9f8d3ac85add990f6d15e9d37aa0a4 WHIRLPOOL 5ecc28a1f65389e63c962408f058ac0795a5ebd846320f4d9de4ad35e6bb7a8ee7dff4555af0c4c9c42d303b7b0f6de372c042d4219141446680ba45b8216ac4
 DIST python-iptables-0.8.0.tar.gz 38815 SHA256 7a80507fafdfe0448f604678e127b7dc6236dc7fe61771b3b56fd8199464ac46 SHA512 8cc3a88f1f101614597ad6e7712dd229e08b9d5fb1fc0383142746faad7f9e265ccdb6d036948bbdbf39c9021250ab98e7de36c7dc78e231f581d783431f5510 WHIRLPOOL 36ab036e4a30be4006c00bc605855c29382545ab19098af49abeb2eca0f91de5cd5608596e4d89b6efd013df58b740d886e2e362e6d0cc4aa7905afe7a7d0e50
 DIST python-iptables-0.9.0.tar.gz 72999 SHA256 80eee356beb3cfbe378a214719c5756bb665f9edfa04cd75e3a32e6e18a1f484 SHA512 5cffc83f496876346faa5b33a45be565fab2da41d25f9793db0788a80cb6835b33f474008febee8002d7af6fb052262881326adf6d69592aa96d750b2f921bd4 WHIRLPOOL 18872e6b7a3016cb2449bb1195fce874dee1d62df2aaa2bbea605f3055bf18e6c298d1dd14da9b1cb34196477470be1cdf60255df5521b734b052a3a88247ea0
--- a/dev-python/python-iptables/python-iptables-0.11.0.ebuild
+++ b/dev-python/python-iptables/python-iptables-0.11.0.ebuild
@ -0,0 +1,37 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for iptables"
+HOMEPAGE="https://github.com/ldx/python-iptables"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+DEPEND="net-firewall/iptables
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+RDEPEND="${DEPEND}"
+
+# tests manipulate live iptables rules, so disable them by default
+
+python_prepare_all() {
+	# Prevent un-needed d'loading during doc build
+	sed -e "s/, 'sphinx.ext.intersphinx'//" -i doc/conf.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/_build/html/. )
+	distutils-r1_python_install_all
+}
--- a/dev-python/s3transfer/Manifest
+++ b/dev-python/s3transfer/Manifest
@ -2,3 +2,4 @@ DIST s3transfer-0.1.4.tar.gz 87620 SHA256 c41d039ab9204e9eea72a6098ca5092ed001f2
 DIST s3transfer-0.1.5.tar.gz 92081 SHA256 c500b27b5a8693507e4768730c4c423d4717477c8676139fc764ac4e8e88708e SHA512 12639ac1576553c95443bcc51eb1c4ed036d5eeec134f0d5922661aa975b905fc433f712c3f4524363b46e3f79dd0dfe91aae75bbeb949c02abe996bae5f020a WHIRLPOOL 444d609770ea5fb84e09a76a3dd7b6047e16064e56417cd25bbed913d8619312405f2ff8dd38b5b300653f430a755afeaaad5f4837b86ae8cfac06ac8732c318
 DIST s3transfer-0.1.7.tar.gz 92659 SHA256 433d067bafb099a7d1653ae09ba39a7e479c90fcef06d396c8e6823f2a3cfd86 SHA512 081ed7e35c8c929a0b1f634dd47bb3de4776d40188d4ffc82c681dbe0a771c33351dedbeca3e6f57b94c6e501a0fe058065f18e3078280bd51a14ecbe1d1d35a WHIRLPOOL 1467e7f712a351f4944959a09a2f83e7b99c6283c61b8944fe6874ccaf5f7aa9e84f75253549620237b092b860562de876d2886ee9571699ed19abae9f553513
 DIST s3transfer-0.1.8.tar.gz 93076 SHA256 1e8eed63e0d1af4c966ef4b4ff3728b04ead251238ba92ff4b2ee23eee943bca SHA512 7b455c1b87efab861ec1a771af23107b0b5f9614dbda77a7c5a2fc1783406b4588ba1c4f86e7ad0b72cfe9a5e516f351f872aad71bad019ce326b9e5b09267a2 WHIRLPOOL ac57d0fd427a6f8bc93ecf64faa5f20952e08e55d0c90a348fffb625eebdfc0dc1ab7bfea37e11afa9f67c1f8caea1f0ff7c60a5ab1148488a756542802e012b
+DIST s3transfer-0.1.9.tar.gz 93414 SHA256 17ad7d672115f93a72ed7917209cb0bb02fc87f96f11886408ed8a6b1bb4c754 SHA512 866e39d543f608b3d6a4f80d677f663510a63e57d528e76e8fdaed027e9b6fc486aa0dc523c33328a6d54af09f0f23204bc799b42f614a6f7d9693158af44763 WHIRLPOOL 21d4eb9e71bb77024032bc9091bd4e5744fee737ccc4ea0a77cf16544206a00bddff1cfbbb0f68a3fd66f5827cb8a139bc73f1f262518d227205c2fee82e6367
--- a/dev-python/s3transfer/s3transfer-0.1.9.ebuild
+++ b/dev-python/s3transfer/s3transfer-0.1.9.ebuild
@ -0,0 +1,38 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+inherit distutils-r1
+
+DESCRIPTION="An Amazon S3 Transfer Manager"
+HOMEPAGE="https://github.com/boto/s3transfer"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+CDEPEND="
+	>=dev-python/botocore-1.3.0[${PYTHON_USEDEP}]
+	<dev-python/botocore-2.0.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '>=dev-python/futures-2.2.0[${PYTHON_USEDEP}]' 'python2_7')
+	$(python_gen_cond_dep '<dev-python/futures-4.0.0[${PYTHON_USEDEP}]' 'python2_7')
+"
+# Pin mock to 1.3.0 if testing failures due to mock occur.
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${CDEPEND}
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="${CDEPEND}"
+
+python_test() {
+	nosetests tests/unit/ tests/functional/ || die "tests failed under ${EPYTHON}"
+}
--- a/dev-python/vulture/Manifest
+++ b/dev-python/vulture/Manifest
@ -1 +1,2 @@
+DIST vulture-0.10.tar.gz 10205 SHA256 9c2dc36b84f3729361990b4488b7fde1cbe5afb9e3b59456aafc6928684fcd4b SHA512 05ec640a02de63e0d0dc8e4468e2be117ec2f0289918e58ef18b11ad58be1f753c32d892305c2a197d3048cdf253b4fda376cdf21b51078291d8297336134201 WHIRLPOOL b8012f346b904f38e97ae0e5833ce658c9e163694da87bc024351bb422e3a232ee011035f511b19d98c6aeefbe61eb6905af6e663d811196f277817d2e817d50
 DIST vulture-0.8.1.tar.gz 18708 SHA256 3d5567f7300707a7e340fffd0fd1ebfc8d717114944c03c842b8b6c26e2d365a SHA512 b9ca6fd67dfca4ac9d98f25425401ef6edb80426fb483c2fbe7797c3991a58fe67bd8abc4c77b1e4615cfb81ddd786eab669b6d4b48f505563c29597664f1950 WHIRLPOOL a1b094f2d47acf158edd3fe525fc885e3dcee11e246ddb5aa7625afb74db4093e26a40e37780513a8c2a9fe56dafad10ca2e33cd4ff0c654364448c87ebd2481
--- a/dev-python/vulture/vulture-0.10.ebuild
+++ b/dev-python/vulture/vulture-0.10.ebuild
@ -0,0 +1,20 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit distutils-r1
+
+DESCRIPTION="find unused classes, functions and variables in your code"
+HOMEPAGE="https://bitbucket.org/jendrikseipp/vulture https://pypi.python.org/pypi/vulture"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DOCS=( README.txt NEWS.txt )
--- a/dev-ruby/octokit/Manifest
+++ b/dev-ruby/octokit/Manifest
@ -1,2 +1,3 @@
 DIST octokit-4.2.0.tar.gz 2740295 SHA256 af4853f022677fd1c344e20d396912a3783f6bd43fffc9b608d9c4218eebcef8 SHA512 5b596da5c2b6bff4cbef3c3faa57a341e7e46dffa8b16d81072b567a5827138ce173a13c1054719853aaf821ad8f5ef8c7e1f666769f3a1e538ef886e64dc1c4 WHIRLPOOL 781bf01f770ee42568ce8278787542dc8840c7dc489042a1d52cb3c59e5ccf13cd3d8269ddc5f9443447060b10c0fd56c89218c1dfdd02c4989e3d20c0c6ebf8
 DIST octokit-4.3.0.tar.gz 2760618 SHA256 76ca1d4289f393c88556bc0c7518621db2d6371cb4c7ec68aa61d07327849fcc SHA512 2a0e680ef8b182722e4a7f489d69fc1d9e81864b29a7fddc4b1ab68a77deee7383ffac153662ceb9e55d7425a4f9e29f7303f0d8d0d821156ef1946734e197a6 WHIRLPOOL ab27fd63737604500a747496a3d040482de2532cfe5dd169d7144ba13476a6c14bf1d667385cd7f4b925030be8c9933e98ebfe72498e3be978574f1b206c7120
+DIST octokit-4.4.1.tar.gz 2823271 SHA256 9222747466c94f3976f3efb7f818e1a24134fb1fec33eaf395fd8097bfa68473 SHA512 cb6ceb4bbeeba9131176e425cafb40e5cbf0e38958a473ec44dcc702f0a087e5ff19ba34815f1a7a65d095b68c52824b161bf37e6b0fdc626770904bd830f5cb WHIRLPOOL 61e210e7fdc8679be50537ef5425c04710eebad54886fad865b46acd6f4e9758f66a0cb935e2238986c099765b313e6c0a3278e0f6dd2b377d5c049d4981715b
--- a/dev-ruby/octokit/octokit-4.4.1.ebuild
+++ b/dev-ruby/octokit/octokit-4.4.1.ebuild
@ -0,0 +1,34 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_RECIPE_DOC="yard"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRADOC="README.md CONTRIBUTING.md"
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit multilib ruby-fakegem
+
+DESCRIPTION="Ruby toolkit for the Github API"
+HOMEPAGE="https://github.com/octokit/octokit.rb"
+SRC_URI="https://github.com/octokit/octokit.rb/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm"
+IUSE=""
+
+RUBY_S=octokit.rb-${PV}
+
+ruby_add_rdepend ">=dev-ruby/sawyer-0.5.3"
+ruby_add_bdepend "test? ( dev-ruby/mime-types
+	>=dev-ruby/netrc-0.7.7
+	dev-ruby/vcr:2
+	>=dev-ruby/webmock-1.9:0 )"
+
+all_ruby_prepare() {
+	sed -i -e "1,10d" -e "/require 'vcr'/i\gem 'vcr', '~> 2.9.2'" spec/helper.rb || die
+}
--- a/dev-ruby/rex-arch/Manifest
+++ b/dev-ruby/rex-arch/Manifest
@ -1 +1,2 @@
 DIST rex-arch-0.1.1.gem 19968 SHA256 f502716c1d23e97e6082797a31edad61202ffdc2db3047641c2181e8500baf2a SHA512 ec6963d7256451dc35a768ba16ac6f44ccdb35d1be1427134f191b39a6b62f519db3de4529109bcddb5887afc6bdd65756c07ccc231425271aaee0838b7eec38 WHIRLPOOL d400643d3bc8b19c88394c9521295d9c4e702234153ba093c6216aa17f3f18d88cfb2100827b754802861273f832840cc9114f212a4e0acf8bde87fd828a7a36
+DIST rex-arch-0.1.2.gem 19968 SHA256 a3c5817ead9f84e19ecb6e4ae00e37c569aa99e27d61bbd5604988625806311e SHA512 330cd6eb6c5f913736e223d82da73e40104ecb537ee3e22a7aa16d1a31aa03ef6a10ae82306b10654718baf33f0f3d1c0a5da001099d6874eb3c1b16f8ae4b7c WHIRLPOOL 25939fd45c2cbd26f675db33dd8fb3bd8e5235d842ff4c6a3d28aab3da03c8017882cb0dd9d12c9605692adc8d765b76dab5bb2e6f96a5cedab5770ea16cdfdc
--- a/dev-ruby/rex-arch/rex-arch-0.1.2.ebuild
+++ b/dev-ruby/rex-arch/rex-arch-0.1.2.ebuild
@ -0,0 +1,26 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+USE_RUBY="ruby20 ruby21 ruby22 ruby23"
+#RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="architecture specific information for Rex"
+HOMEPAGE="https://rubygems.org/gems/rex-arch"
+
+LICENSE="BSD"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+# doesn't seem to actually run any tests
+RESTRICT=test
+
+ruby_add_bdepend "dev-ruby/rex-text"
--- a/dev-ruby/sanitize/Manifest
+++ b/dev-ruby/sanitize/Manifest
@ -1,3 +1,4 @@
 DIST sanitize-2.1.0.gem 20992 SHA256 c3be075f5b38a1b02404be5778b181e50fba9ab253bac851cb217d9a71375b77 SHA512 29a26e37342a75af2bc7795578edf2c5064263c58d38dfc36e18f1e111271616c026f7d808a05d63185c12f0e52384db84d62bdb796bf1b21d7e902ef0c1d096 WHIRLPOOL f07c3f7c3550b1e47e3189838a8c1c30c7cd856f237dde167516f25e86520fffe7357f87efd4f2fcf03230650fa55da0ff2d7870746c72c9897318f6dc935cc6
 DIST sanitize-4.2.0.tar.gz 1346791 SHA256 a2803fe2ec2cb817b235c1554218690d2450bbc653d0beafb9032a5df36bc592 SHA512 3a3d1041cb363a636b7aa2ad57a049565b64430b05bb8742d6aaaf81e3a79f14fb357caf8f14393e344b7315dfeefc7be217c53f8fbee04b3691f27f56e1108f WHIRLPOOL 4bd65c67533c1472520a65f96670f1c5766ceaf3f21bce829ae7e453d89eba0ca4c0c894fce6c825648178f90d641125d33bbe04b92062556d2a7d12e5cd6f26
 DIST sanitize-4.3.0.tar.gz 1346950 SHA256 f0d2bd4055474b90e9e263fe57f3a0b68000777650dab31dd78c7014d40afd9c SHA512 76ae6c9eb62ee6fff527f67d5e592406f1e6568c1dcbf528ac33cedae1b326ca4b9ba844a34f5ef271d8564c413e4467c5ea880c6cbbf3d41bc965853a40b299 WHIRLPOOL 30b369c3db4805438921c49b501c4bb49306048dad3aa68f6dfa0fdf219c8861326c054732326e27cdc09134ec54aa6888266f64d418a8638ad7ab3520c5115f
+DIST sanitize-4.4.0.tar.gz 1346967 SHA256 6dc4245523d66fdbe3e54d0918d713dbdcad29382946882d26d7114f91433d79 SHA512 6cd8ca61568fb792e282c0890a9dbc13c7568ad2874e22a48586c9457431905b5a83e468be4b5ce61de04984539cd60dd0705965652169412dff92a7e06656ff WHIRLPOOL 7533637ae4dfa9c7dabd8c14fb8c19a8856a8a1e1d8170054ac503ef21d6871ab63111f659e4b166acb12bccff07314ed20e317768ac58f00d294d974f7f31ab
--- a/dev-ruby/sanitize/sanitize-4.4.0.ebuild
+++ b/dev-ruby/sanitize/sanitize-4.4.0.ebuild
@ -0,0 +1,33 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+USE_RUBY="ruby20 ruby21 ruby22 ruby23"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="HISTORY.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Sanitize is a whitelist-based HTML sanitizer"
+HOMEPAGE="https://github.com/rgrove/sanitize"
+SRC_URI="https://github.com/rgrove/sanitize/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="4"
+KEYWORDS="~amd64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+
+ruby_add_rdepend "
+	>=dev-ruby/crass-1.0.2 =dev-ruby/crass-1.0*
+	>=dev-ruby/nokogiri-1.4.4
+	>=dev-ruby/nokogumbo-1.4.1 =dev-ruby/nokogumbo-1.4*"
+ruby_add_bdepend "test? ( dev-ruby/minitest )"
+
+each_ruby_test() {
+	${RUBY} -Ilib test/test_sanitize.rb || die
+}
--- a/dev-util/bazel/Manifest
+++ b/dev-util/bazel/Manifest
@ -0,0 +1 @@
+DIST bazel-0.3.2.tar.gz 145095554 SHA256 9692ac3318a40e8a0530f68bbfc473ae5f6a4a5c0fe08d2f88612ca4d40ba54a SHA512 975faf5830e952bea5d3fa8d127e0d5d9654af83f1fba0d7e26f9e1c2c71dd58542efea2382b0c52c9fd24ae43ec66a3ca7451309f02fd65c0896bbbdb3c79f5 WHIRLPOOL ab487f84e8126ab2badfd84d1fe757170900fbb2f88dff79d6867fb694bbb8adf226b7b89bfdb9cf207595bfd235583a54b8102a1a009f58be7bd3be039e1aaa
--- a/dev-util/bazel/bazel-0.3.2-r1.ebuild
+++ b/dev-util/bazel/bazel-0.3.2-r1.ebuild
@ -0,0 +1,65 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit bash-completion-r1 java-pkg-2
+
+DESCRIPTION="Fast and correct automated build system"
+HOMEPAGE="http://bazel.io/"
+SRC_URI="https://github.com/bazelbuild/bazel/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="examples tools zsh-completion"
+# strip corrupts the bazel binary
+RESTRICT="strip"
+DEPEND="virtual/jdk:1.8"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	echo ${PATH} | grep -q ccache && \
+		ewarn "${PN} usually fails to compile with ccache, you have been warned"
+	java-pkg-2_pkg_setup
+}
+
+src_compile() {
+	VERBOSE=yes ./compile.sh || die
+	# Use standalone strategy to deactivate the bazel sandbox, since it
+	# conflicts with FEATURES=sandbox.
+	echo "build --verbose_failures --spawn_strategy=standalone --genrule_strategy=standalone" \
+		> "${T}/bazelrc" || die
+	output/bazel --bazelrc="${T}/bazelrc" build //scripts:bazel-complete.bash || die
+}
+
+src_test() {
+	output/bazel test \
+		--verbose_failures \
+		--spawn_strategy=standalone \
+		--genrule_strategy=standalone \
+		--verbose_test_summary \
+		examples/cpp:hello-success_test || die
+}
+
+src_install() {
+	dobin output/bazel
+	newbashcomp bazel-bin/scripts/bazel-complete.bash ${PN}
+	if use zsh-completion ; then
+		insinto /usr/share/zsh/site-functions
+		doins scripts/zsh_completion/_bazel
+	fi
+	if use examples; then
+		docinto examples
+		doins -r examples/*
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+	# could really build tools but I don't know which ones
+	# are actually used
+	if use tools; then
+		docinto tools
+		doins -r tools/*
+		docompress -x /usr/share/doc/${PF}/tools
+	fi
+}
--- a/dev-util/bazel/bazel-0.3.2.ebuild
+++ b/dev-util/bazel/bazel-0.3.2.ebuild
@ -0,0 +1,34 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit bash-completion-r1 java-pkg-2
+
+DESCRIPTION="Bazel build system"
+HOMEPAGE="https://bazel.io/"
+SRC_URI="https://github.com/bazelbuild/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+# strip corrupts the bazel binary
+RESTRICT="strip"
+DEPEND="virtual/jdk:1.8"
+RDEPEND="${DEPEND}"
+
+src_compile() {
+	./compile.sh || die
+	# Use standalone strategy to deactivate the bazel sandbox, since it
+	# conflicts with FEATURES=sandbox.
+	echo "build --spawn_strategy=standalone --genrule_strategy=standalone" \
+		> "${T}/bazelrc" || die
+	output/bazel --bazelrc="${T}/bazelrc" build //scripts:bazel-complete.bash || die
+}
+
+src_install() {
+	dobin output/bazel
+	newbashcomp bazel-bin/scripts/bazel-complete.bash ${PN}
+}
--- a/dev-util/bazel/metadata.xml
+++ b/dev-util/bazel/metadata.xml
@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>zmedico@gentoo.org</email>
+	</maintainer>
+	<maintainer type="person">
+		<email>bicatali@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">bazelbuild/bazel</remote-id>
+	</upstream>
+	<longdescription>
+	  Bazel is Google's own build tool. Bazel has built-in support for
+	  building both client and server software, including client
+	  applications for both Android and iOS platforms. It also provides
+	  an extensible framework that you can use to develop your own build
+	  rules.
+	</longdescription>
+	<use>
+	  <flag name="tools">Install extra bazel tools to build from sources</flag>
+	</use>
+</pkgmetadata>
--- a/dev-util/conan/Manifest
+++ b/dev-util/conan/Manifest
@ -0,0 +1 @@
+DIST conan-0.14.1.tar.gz 386985 SHA256 3d20eba786a2243989bd4e53b805e265d1593b226ca271ffc3072994ad15c609 SHA512 1a1e4797b50856be38a1edd15c83edf74cdfbb6b64f7b72507ac649eaef7b69dd2d653021104c327f5077d89a1efbbc6dfd7bc1a7ffa6c32762ee2fb0709c56f WHIRLPOOL ae62aae19a3af3da8319e546c8593aec0ad3780109b4b4e97fc5a2892e59797f29c62c768fa59dc361af76426e28a1fcc43d9e4ff65065b581d8497d34e7cfaf
--- a/dev-util/conan/conan-0.14.1.ebuild
+++ b/dev-util/conan/conan-0.14.1.ebuild
@ -0,0 +1,46 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+PYTHON_REQ_USE="sqlite"
+
+inherit distutils-r1
+
+DESCRIPTION="Distributed C/C++ package manager"
+HOMEPAGE="http://conan.io/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/boto-2.38[${PYTHON_USEDEP}]
+	>=dev-python/bottle-0.12.8[${PYTHON_USEDEP}]
+	>=dev-python/colorama-0.3.3[${PYTHON_USEDEP}]
+	>=dev-python/fasteners-0.14.1[${PYTHON_USEDEP}]
+	>=dev-python/passlib-1.6.5[${PYTHON_USEDEP}]
+	>=dev-python/patch-1.16[${PYTHON_USEDEP}]
+	>=dev-python/pyjwt-1.4[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.11[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.7[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		  ${RDEPEND}
+		  >=dev-python/mock-1.3.0[${PYTHON_USEDEP}]
+		  >=dev-python/nose-1.3.7[${PYTHON_USEDEP}]
+		  >=dev-python/nose-parameterized-0.5.0[${PYTHON_USEDEP}]
+		  >=dev-python/webtest-2.0.18[${PYTHON_USEDEP}]
+	  )
+"
+
+python_test() {
+	nosetests -v || die
+}
--- a/dev-util/conan/metadata.xml
+++ b/dev-util/conan/metadata.xml
@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>bicatali@gentoo.org</email>
+    <name>Sébastien Fabbro</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">conan</remote-id>
+    <remote-id type="github">conan-io/conan</remote-id>
+  </upstream>
+  <longdescription>
+    Conan is a portable package manager, intended for C and C++
+    developers, but it is able to manage builds from source,
+    dependencies, and precompiled binaries for any language.
+  </longdescription>
+</pkgmetadata>
--- a/games-engines/solarus/solarus-1.3.1-r1.ebuild
+++ b/games-engines/solarus/solarus-1.3.1-r1.ebuild
@ -0,0 +1,55 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="An open-source Zelda-like 2D game engine"
+HOMEPAGE="http://www.solarus-games.org/"
+SRC_URI="http://www.zelda-solarus.com/downloads/${PN}/${P}-src.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc luajit"
+
+RDEPEND="
+	dev-games/physfs
+	media-libs/libmodplug
+	>=media-libs/libsdl2-2.0.1[X,joystick,video]
+	media-libs/libvorbis
+	media-libs/openal
+	media-libs/sdl2-image[png]
+	>=media-libs/sdl2-ttf-2.0.12
+	luajit? ( dev-lang/luajit:2 )
+	!luajit? ( dev-lang/lua:0 )"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )"
+
+src_prepare() {
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DSOLARUS_INSTALL_DESTINATION="/usr/bin"
+		-DSOLARUS_USE_LUAJIT="$(usex luajit)"
+	)
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+	if use doc ; then
+		cd doc || die
+		doxygen || die
+	fi
+}
+
+src_install() {
+	cmake-utils_src_install
+	doman solarus.6
+	use doc && dodoc -r doc/${PV%.*}/html/*
+}
--- a/games-rpg/zsxd/zsxd-1.9.0-r1.ebuild
+++ b/games-rpg/zsxd/zsxd-1.9.0-r1.ebuild
@ -0,0 +1,59 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit eutils gnome2-utils cmake-utils
+
+DESCRIPTION="A free 2D Zelda fangame parody"
+HOMEPAGE="http://www.solarus-games.org/"
+SRC_URI="http://www.zelda-solarus.com/downloads/${PN}/${P}.tar.gz"
+
+LICENSE="all-rights-reserved CC-BY-SA-3.0 GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RESTRICT="mirror bindist"
+
+RDEPEND=">=games-engines/solarus-1.3.1-r1
+	<games-engines/solarus-1.4.0"
+DEPEND="app-arch/zip"
+
+DOCS=( ChangeLog readme.txt )
+
+src_prepare() {
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DSOLARUS_INSTALL_DATAROOTDIR="/usr/share"
+		-DSOLARUS_INSTALL_BINDIR="/usr/bin"
+	)
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_install() {
+	cmake-utils_src_install
+	newicon -s 48 build/icons/${PN}_icon_48.png ${PN}.png
+	newicon -s 256 build/icons/${PN}_icon_256.png ${PN}.png
+
+	# install proper wrapper script
+	rm -f "${ED%/}/usr/bin/${PN}
+	make_wrapper ${PN} "solarus \"/usr/share/solarus/${PN}\"
+
+	make_desktop_entry "${PN}" "Zelda: Mystery of Solarus XD"
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
--- a/games-rpg/zsxd/zsxd-1.9.0.ebuild
+++ b/games-rpg/zsxd/zsxd-1.9.0.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@ -16,8 +16,7 @@ KEYWORDS="amd64 x86"
 IUSE=""
 RESTRICT="mirror bindist"

-RDEPEND=">=games-engines/solarus-1.3.0
-	<games-engines/solarus-1.4.0"
+RDEPEND="=games-engines/solarus-1.3.1"
 DEPEND="app-arch/zip"

 DOCS=( ChangeLog readme.txt )
--- a/gnome-extra/gnome-color-chooser/gnome-color-chooser-0.2.5.ebuild
+++ b/gnome-extra/gnome-color-chooser/gnome-color-chooser-0.2.5.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@ -30,6 +30,7 @@ RDEPEND="
 	x11-libs/pango
 "
 DEPEND="${RDEPEND}
+	dev-util/intltool
 	virtual/pkgconfig
 "

--- a/lxqt-base/lxqt-common/Manifest
+++ b/lxqt-base/lxqt-common/Manifest
@ -1 +1,2 @@
 DIST lxqt-common-0.10.0.tar.xz 3986324 SHA256 7b12f2fe7a42f5ea0c9f596eeb87ca3c97cc0b706121ceede64480e8480ec9d1 SHA512 bdfc93844724bc906c000b310063a815da15b0e34774da35f0536009fe63f45d1bf7f7b767b20fead013c10bead271a964a2826cf700f14a2a40717614f3b57e WHIRLPOOL 3c09d35845e41d74630ca05c5aff17dad909758044764a208c0a73c9e5cca901cbd7ed89ef3806c32e34f0c95c87df06a03457db1b47403f4a08521e0f6f43fb
+DIST lxqt-common-0.11.0.tar.xz 3216520 SHA256 3a34a2105a49545d2695cccaf6310d261a7e760455e583efa2d80b3ab54d6053 SHA512 5eeaa6ead263a93b58ab9ec536c287fe383b5abade722dd3c7232840bc12c56e2208904bfbbc5ee9092c340d14d939a2ac0dcd37cf2175a0f601bbe050f00a2c WHIRLPOOL 7c889291741a729ea642eeb14cdf0aa7fb4bb78aa2a0d6ede64ff8bae9ca6091649ab39642d3477fbc498e35ec021b4bf255db536e5c88a8da21681b039639e3
--- a/lxqt-base/lxqt-common/lxqt-common-0.11.0.ebuild
+++ b/lxqt-base/lxqt-common/lxqt-common-0.11.0.ebuild
@ -0,0 +1,35 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit cmake-utils
+
+DESCRIPTION="LXQt common resources"
+HOMEPAGE="http://lxqt.org/"
+
+if [[ ${PV} = *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="git://git.lxde.org/git/lxde/${PN}.git"
+else
+	SRC_URI="https://downloads.lxqt.org/lxqt/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+
+DEPEND=">=lxqt-base/liblxqt-0.11.0"
+RDEPEND="${DEPEND}"
+PDEPEND=">=lxqt-base/lxqt-session-0.11.0"
+
+src_configure() {
+	local mycmakeargs=( -DPULL_TRANSLATIONS=OFF )
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	dodir "/etc/X11/Sessions"
+	dosym  "/usr/bin/startlxqt" "/etc/X11/Sessions/lxqt"
+}
--- a/lxqt-base/lxqt-notificationd/Manifest
+++ b/lxqt-base/lxqt-notificationd/Manifest
@ -1 +1,2 @@
 DIST lxqt-notificationd-0.10.0.tar.xz 30896 SHA256 5c0859157ff6a20d613ea4aca24e786faf79ab6d69afec1e0b3671e3bbda53d5 SHA512 3a3ebcc104ac6de3c11ceac8a0c6b8f942e824b1301413fa20f93be68d53e02747e8c478fc744fa1bd3f04d2f54cd042c4b538cd537626d8b69088274a323519 WHIRLPOOL 56e93e04aa5ec5f81b6d6f43fdcb2ccebb429505372f51e18d28c19432133eb2a3f701ae7bda121c9474bfe7c9063c643fd470e69e2e88b9c1904ce542fc1a06
+DIST lxqt-notificationd-0.11.0.tar.xz 30592 SHA256 2e57b4f0c68694a8faf4999039b039f13291c720017b14c0bbdd8e0b49a0fa82 SHA512 f6dd3463ac993d7c7743addd6924dc8f15717f658c576c78ad01e4db361d1f1c98d02f6a2bec0069c191ad923b1ff63d49faf6ff7d564f67030233d6979adec5 WHIRLPOOL ee73ff0223d1009b0c78301857997deecee9b8a5f563a5d6bc7f0f29220d502e076abe9156a350ce59e568ea50188081a947b6e8baf3365e6257a7287c8b8e13
--- a/lxqt-base/lxqt-notificationd/lxqt-notificationd-0.11.0.ebuild
+++ b/lxqt-base/lxqt-notificationd/lxqt-notificationd-0.11.0.ebuild
@ -0,0 +1,39 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit cmake-utils
+
+DESCRIPTION="LXQt notification daemon and library"
+HOMEPAGE="http://lxqt.org/"
+
+if [[ ${PV} = *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="git://git.lxde.org/git/lxde/${PN}.git"
+else
+	SRC_URI="https://downloads.lxqt.org/lxqt/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+LICENSE="GPL-2 LGPL-2.1+"
+SLOT="0"
+
+RDEPEND="
+	>=dev-libs/libqtxdg-1.0.0
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	dev-qt/qtxml:5
+	kde-frameworks/kwindowsystem:5
+	~lxqt-base/liblxqt-${PV}
+	=lxqt-base/lxqt-common-0.11*"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5"
+
+src_configure() {
+	local mycmakeargs=( -DPULL_TRANSLATIONS=OFF )
+	cmake-utils_src_configure
+}
--- a/lxqt-base/lxqt-session/Manifest
+++ b/lxqt-base/lxqt-session/Manifest
@ -1 +1,2 @@
 DIST lxqt-session-0.10.0.tar.xz 65012 SHA256 2aedbeef904c11679199bfcdbf141880082c4bbcbcdad2b89b47d5b833fe26d4 SHA512 13f7e93c4773e61c785599b552473dfb4d3d7833111717a4875e4c0c8892ee10a1a99b099e76332aab8d266f1c27fc253812a2e9ccb8106731942ed3f7705077 WHIRLPOOL d77e63f11e270252802a1f65e68c4454cab74f6c538406991ccf65adb871727196b6c01c080a3028dc2c0ac028d25e98520ff962ace618639416a7a8b95c3ce7
+DIST lxqt-session-0.11.0.tar.xz 120680 SHA256 c03e8229ba53a80f4f8807299460ea052ae0916ea991dd1f48274280ef0d8b57 SHA512 3f45d3c8ca2856ab37e88554f5021a7003e2293552532b65b53a84fc886e8b5f4f0fa3e90b1b288d2f866f07a29e3170305dc611c4f31c6112a824886768dab9 WHIRLPOOL f7533c2b39e727f902bbbdc79d2204ef6e0c27cded7bba0c26665364d42598cf206b82a0a783073e87d36d780ddf82c43b8b73e2e9bc93c0f15ac1478e4efcef
--- a/lxqt-base/lxqt-session/lxqt-session-0.11.0.ebuild
+++ b/lxqt-base/lxqt-session/lxqt-session-0.11.0.ebuild
@ -0,0 +1,51 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-utils
+
+DESCRIPTION="LXQT session manager"
+HOMEPAGE="http://lxqt.org/"
+
+if [[ ${PV} = *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="git://git.lxde.org/git/lxde/${PN}.git"
+else
+	SRC_URI="https://downloads.lxqt.org/lxqt/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+LICENSE="GPL-2 LGPL-2.1+"
+SLOT="0"
+
+CDEPEND="
+	>=dev-libs/libqtxdg-1.0.0
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	dev-qt/qtxml:5
+	kde-frameworks/kwindowsystem:5[X]
+	~lxqt-base/liblxqt-${PV}
+	x11-libs/libX11
+	x11-misc/xdg-user-dirs"
+DEPEND="${CDEPEND}
+	dev-qt/linguist-tools:5
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+	=lxqt-base/lxqt-common-0.11*"
+
+src_configure() {
+	local mycmakeargs=( -DPULL_TRANSLATIONS=OFF )
+	cmake-utils_src_configure
+}
+
+src_install(){
+	cmake-utils_src_install
+	doman lxqt-config-session/man/*.1 lxqt-session/man/*.1
+}
--- a/media-gfx/gmic/Manifest
+++ b/media-gfx/gmic/Manifest
@ -1,2 +1,3 @@
 DIST gmic_1.6.5.0.tar.gz 3005945 SHA256 ebc98c4f5848b8343d581104e072299529ac3edbcea7b565ffd6e1fb4bfd66ed SHA512 3feb5589dcc341106ce1305ce2d3f90776f074607bec3b8413519aa5f2c9dc9554a9ee7a5ba1d52d1a9e7676e6bff135d444276c989511f973cd456136d0e4e1 WHIRLPOOL 02f3f711fa9c876fba39e56a42c30f62a6c2d0848ae836f9635d7df0ef57f48f2a8f09ca361232c2239e473046fe7d085260ac365d2e7b6d49e65c3c0aa2e9bc
 DIST gmic_1.6.5.1.tar.gz 3092777 SHA256 63737973848c292ef3877e1f6af3839e20fa209dd7a1bbacbdbac03bbb6fce85 SHA512 cfbb8db9a3f884ac27b4929a774c94372523a1e59a205180dde452d34310d32df4ef76c9cdfcc4ef5adf0ba72c5e1e44564cfeb2e9bc003ec8fae45df9c606c4 WHIRLPOOL e5e0e9d4dfff7a5b0da9d613bc998e32f71925cc44eb504519811327697fd13edf2abb1b94bd22619b17fa111d1e984944a01d7417ff0e328950b4258a7172fb
+DIST gmic_1.7.8.tar.gz 3013635 SHA256 3a2f32d79714239cfa56ecb10799b7d73362b4e2a852444bc24866272cd041a4 SHA512 2bfa7bb9ff3a99a76c71f7c4e0d619e9c205dafc02b5a2d1f097b6285c141e5413f7016b92d974327f787010a6832d272ab21a89842eee2484151072c2d4c559 WHIRLPOOL a81e135031ac095e700302d1b59428b6f86df4543643d17e759fcde3bcd7ceac950b7418d89854d2ee8c55af18efc67efc65f41984ca1dbbe5c12c3a12c36539
--- a/media-gfx/gmic/files/gmic-1.7.8-cmake.patch
+++ b/media-gfx/gmic/files/gmic-1.7.8-cmake.patch
@ -0,0 +1,76 @@
+--- gmic-1.7.8/CMakeLists.txt
+++ gmic-1.7.8/CMakeLists.txt
+@@ -3,9 +3,11 @@
+ project(gmic CXX C)
+ 
+ find_package(PkgConfig)
+include(GNUInstallDirs)
+ 
+ # options controlling the build process
+ option(BUILD_LIB "Build the GMIC shared library" ON)
+option(BUILD_LIB_STATIC "Build the GMIC static library" ON)
+ option(BUILD_CLI "Build the CLI interface" ON)
+ option(BUILD_PLUGIN "Build the GIMP plug-in" ON)
+ option(ENABLE_X "Add support for X11" ON)
+@@ -44,7 +46,7 @@
+ if(ENABLE_OPENMP)
+   if(NOT APPLE)
+     set(COMPILE_FLAGS " ${COMPILE_FLAGS} -fopenmp -Dcimg_use_openmp ")
+-    set(EXTRA_LIBRARIES "-lgomp ${EXTRA_LIBRARIES}")
+	set(EXTRA_LIBRARIES "${EXTRA_LIBRARIES} -lgomp")
+   endif(NOT APPLE)
+ endif(ENABLE_OPENMP)
+ 
+@@ -187,9 +189,9 @@
+     "Choose the type of build, options are: Debug Release RelWithDebInfo."
+     FORCE)
+ endif(NOT CMAKE_BUILD_TYPE)
+-SET(CMAKE_CXX_FLAGS_DEBUG " -O0 -g -ansi -pedantic -Dcimg_verbosity=3 ${COMPILE_FLAGS}") 
+-SET(CMAKE_CXX_FLAGS_RELEASE " -O3 -mtune=generic ${COMPILE_FLAGS}") 
+-SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO " -O3 -g -mtune=generic ${COMPILE_FLAGS}") 
+SET(CMAKE_CXX_FLAGS_DEBUG " -ansi -pedantic -Dcimg_verbosity=3 ${COMPILE_FLAGS}") 
+SET(CMAKE_CXX_FLAGS_RELEASE " ${COMPILE_FLAGS}") 
+SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO " ${COMPILE_FLAGS}") 
+ 
+ 
+ # source files
+@@ -220,7 +222,7 @@
+ if(BUILD_LIB)
+   add_library(libgmic SHARED ${CLI_Includes} ${CLI_Sources})
+   add_dependencies(libgmic gmic_extra_headers)
+-  set_target_properties(libgmic PROPERTIES OUTPUT_NAME "gmic")
+  set_target_properties(libgmic PROPERTIES SOVERSION "1" OUTPUT_NAME "gmic")
+   IF(NOT APPLE)
+     set_target_properties(libgmic PROPERTIES LINK_FLAGS "-Wl,-soname,libgmic.so.1")
+   ENDIF(NOT APPLE)
+@@ -236,7 +238,13 @@
+     ${FFTW3_LIBRARIES}
+     ${EXTRA_LIBRARIES}
+     )
+-  
+
+  INSTALL(TARGETS libgmic LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}")
+  INSTALL(FILES src/gmic.h DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
+endif(BUILD_LIB)
+
+
+if(BUILD_LIB_STATIC)
+   add_library(libgmicstatic STATIC ${CLI_Includes} ${CLI_Sources})
+   add_dependencies(libgmicstatic gmic_extra_headers)
+   set_target_properties(libgmicstatic PROPERTIES OUTPUT_NAME "gmic")
+@@ -252,11 +260,10 @@
+     ${FFTW3_LIBRARIES}
+     ${EXTRA_LIBRARIES}
+     )
+-  
+-  INSTALL(TARGETS libgmic LIBRARY DESTINATION lib)
+-  INSTALL(TARGETS libgmicstatic ARCHIVE DESTINATION lib)
+-  INSTALL(FILES src/gmic.h DESTINATION include)
+-endif(BUILD_LIB)
+
+  INSTALL(TARGETS libgmicstatic ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}")
+  INSTALL(FILES src/gmic.h DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
+endif(BUILD_LIB_STATIC)
+ 
+ 
+ if(BUILD_CLI)
--- a/media-gfx/gmic/gmic-1.7.8.ebuild
+++ b/media-gfx/gmic/gmic-1.7.8.ebuild
@ -0,0 +1,92 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit cmake-utils bash-completion-r1
+
+DESCRIPTION="GREYC's Magic Image Converter"
+HOMEPAGE="http://gmic.eu/ https://github.com/dtschump/gmic"
+SRC_URI="http://gmic.eu/files/source/${PN}_${PV}.tar.gz"
+
+LICENSE="CeCILL-2 FDL-1.3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+cli ffmpeg fftw gimp graphicsmagick jpeg opencv openexr openmp png static-libs tiff X zlib"
+REQUIRED_USE="|| ( cli gimp )"
+
+COMMON_DEPEND="
+	fftw? ( sci-libs/fftw:3.0[threads] )
+	gimp? ( >=media-gfx/gimp-2.4.0 )
+	graphicsmagick? ( media-gfx/graphicsmagick )
+	jpeg? ( virtual/jpeg:0 )
+	opencv? ( >=media-libs/opencv-2.3.1a-r1 )
+	openexr? (
+		media-libs/ilmbase
+		media-libs/openexr
+	)
+	png? ( media-libs/libpng:0= )
+	tiff? ( media-libs/tiff:0 )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXext
+	)
+	zlib? ( sys-libs/zlib )"
+RDEPEND="${COMMON_DEPEND}
+	ffmpeg? ( media-video/ffmpeg:0 )
+	gimp? ( !media-plugins/gimp-gmic )
+"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+"
+
+PATCHES=( "${FILESDIR}"/${P}-cmake.patch )
+
+pkg_pretend() {
+	if use openmp ; then
+		tc-has-openmp || die "Please switch to an openmp compatible compiler"
+	fi
+
+	if ! test-flag-CXX -std=c++11 ; then
+		die "You need at least GCC 4.7.x or Clang >= 3.3 for C++11-specific compiler flags"
+	fi
+}
+
+src_prepare() {
+	default
+	gunzip man/${PN}.1.gz || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_LIB=ON
+		-DBUILD_LIB_STATIC=$(usex static-libs)
+		-DBUILD_CLI=$(usex cli)
+		-DBUILD_PLUGIN=$(usex gimp)
+		-DENABLE_X=$(usex X)
+		-DENABLE_FFMPEG=$(usex ffmpeg)
+		-DENABLE_FFTW=$(usex fftw)
+		-DENABLE_GRAPHICSMAGICK=$(usex graphicsmagick)
+		-DENABLE_JPEG=$(usex jpeg)
+		-DENABLE_OPENCV=$(usex opencv)
+		-DENABLE_OPENEXR=$(usex openexr)
+		-DENABLE_OPENMP=$(usex openmp)
+		-DENABLE_PNG=$(usex png)
+		-DENABLE_TIFF=$(usex tiff)
+		-DENABLE_ZLIB=$(usex zlib)
+	)
+
+	local CMAKE_BUILD_TYPE="Release"
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	dodoc README
+
+	if use cli; then
+		doman man/${PN}.1
+		newbashcomp resources/${PN}_bashcompletion.sh ${PN}
+	fi
+}
--- a/media-gfx/gmic/metadata.xml
+++ b/media-gfx/gmic/metadata.xml
@ -6,6 +6,7 @@
 		<name>Gentoo Graphics Project</name>
 	</maintainer>
 	<use>
+		<flag name="cli">Build CLI interface</flag>
 		<flag name="graphicsmagick">Enable support for many common image file formats using the GraphicsMagick++ library</flag>
 		<flag name="opencv">Enable support for webcams using the OpenCV library</flag>
 	</use>
--- a/media-gfx/nomacs/nomacs-3.4-r1.ebuild
+++ b/media-gfx/nomacs/nomacs-3.4-r1.ebuild
@ -0,0 +1,76 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit cmake-utils fdo-mime
+
+DESCRIPTION="Qt-based image viewer"
+HOMEPAGE="http://www.nomacs.org/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/3.4.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~amd64-linux"
+IUSE="+jpeg opencv raw tiff zip"
+
+REQUIRED_USE="
+	raw? ( opencv )
+	tiff? ( opencv )
+"
+
+RDEPEND="
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5[jpeg?]
+	dev-qt/qtnetwork:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	>=media-gfx/exiv2-0.25:=
+	opencv? ( media-libs/opencv:=[-qt4] )
+	raw? ( >=media-libs/libraw-0.14:= )
+	tiff? ( media-libs/tiff:0 )
+	zip? ( >=dev-libs/quazip-0.7.2[qt5] )
+"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/${P}/ImageLounge"
+
+PATCHES=( "${FILESDIR}/${P}-no-opencv.patch" ) # bug 592134
+
+src_prepare() {
+	default
+
+	# fix build with quazip-0.7.2 - bug 598354
+	sed -i -e "s/find_package(QuaZIP/find_package(QuaZip5/" cmake/Unix.cmake || die
+	sed -e "s/include <quazip/&5/" \
+		-i src/DkLoader/DkImageLoader.cpp \
+		-i src/DkLoader/DkImageContainer.cpp \
+		-i src/DkLoader/DkBasicLoader.cpp \
+		-i src/DkGui/DkDialog.cpp || die
+
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_OPENCV=$(usex opencv)
+		-DENABLE_RAW=$(usex raw)
+		-DENABLE_TIFF=$(usex tiff)
+		-DENABLE_QUAZIP=$(usex zip)
+		-DUSE_SYSTEM_QUAZIP=ON
+	)
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}
--- a/media-gfx/sam2p/Manifest
+++ b/media-gfx/sam2p/Manifest
@ -1,2 +1,3 @@
 DIST sam2p-0.49.1.tar.gz 562304 SHA256 d97a270e3ad4ad138378b5fcb10e489e9af48a8150f308458771808dfceb069a SHA512 58565fdcb7c450ad23c2971b70f0362dbf4ecfd8c4dedf19c25b56fc98c8799696c6ecf75d47650bc3b21f88b8454d7c4e6b206f7c0ae0e5de35d608262c1220 WHIRLPOOL 809512e56f7e0b4ac0b8a00be1da1088a1249fbccf1b59470b4e25036ffdaf36884374c7735bad6a3440166e835c02ade7f87dc9eb00b92b84382602884517d5
 DIST sam2p-0.49.2.tar.gz 562733 SHA256 0e75d94bed380f8d8bd629f7797a0ca533b5d0b40eba2dab339146dedc1f79bf SHA512 8e4d629df192381bddf8468687c6a41d459b70788a5e9defc68d5497f855cbae838f2f6f924237b17e4a8e6fbf982fb2709615c8fb1d9c8cec5ec7ecf91ec6ce WHIRLPOOL 90ede2ba7b8f1dbc056cfdcfbaedd3cc995ccb58439050d6b4c51ab24a33f91b022110ea3a72ffe8b72e42f9104e936511fdbcdc1bf579fdac26c145ff2bb949
+DIST sam2p-0.49.3.tar.gz 2184864 SHA256 687210c3ccd12da646db2a6e53f2de5a3a7639a7bcb0c381a61789eca50a824d SHA512 9e9c91a2cd692e49bf73e7c197a0fcbe7df96c685636d1d00456eb8b4b847de3f4848d9bb3d9246340c479c62900ddd4e0a248257aa5e6ec6e16683c5dad54f8 WHIRLPOOL 5362348d1955f67ae6f64b72ec0d53e88e21c46d281e3e844329059f7d0f2c4a1ac2b2faeca48c1a923fbbbcff1c9732bb016192c001a2de1970197a17051f9b
--- a/media-gfx/sam2p/files/sam2p-0.49.3-build-fixes.patch
+++ b/media-gfx/sam2p/files/sam2p-0.49.3-build-fixes.patch
@ -0,0 +1,160 @@
+Fix literal suffix errors in C++14, caused by missing spaces between
+C-strings and macros.
+See also: https://bugs.gentoo.org/show_bug.cgi?id=585630
+
+--- a/configure.in
+++ b/configure.in
+@@ -81,8 +81,6 @@
+ dnl Checks for programs.
+ dnl AC_PROG_CC
+ AC_LANG_CPLUSPLUS
+-CXXFLAGS=" "
+-dnl ^^^ set it to non-empty, so AC_PROG_CXX won't include `-g'
+ CCC="$CCC g++"
+ dnl ^^^ check g++ before c++ (see acspecific.m4, grep AC_PROG_CXX)
+ AC_PROG_CXX
+@@ -216,7 +214,7 @@
+ 
+ dnl AC_PTS_RUN_OK([perl -x -S ./ccdep.pl $CXX], [], [AC_MSG_ERROR(cannot compute depends)])
+ rm -f Makedep
+-AC_PTS_RUN_OK([make Makedep], [], [AC_MSG_ERROR(cannot compute depends)])
+AC_PTS_RUN_OK([gmake Makedep], [], [AC_MSG_ERROR(cannot compute depends)])
+ AC_PTS_OK
+ echo "configure done. Now you should run: make; make install"
+ 
+--- a/gensio.cpp
+++ b/gensio.cpp
+@@ -494,7 +494,7 @@
+ 
+  #if HAVE_PTS_POPEN
+   if (!tmpsname) {
+-    if (NULLP==(p=popen(redir_cmd(), "w"CFG_PTS_POPEN_B))) Error::sev(Error::EERROR) << "Filter::PipeE" << ": popen() failed: " << (SimBuffer::B().appendDumpC(redir_cmd)) << (Error*)0;
+    if (NULLP==(p=popen(redir_cmd(), "w" CFG_PTS_POPEN_B))) Error::sev(Error::EERROR) << "Filter::PipeE" << ": popen() failed: " << (SimBuffer::B().appendDumpC(redir_cmd)) << (Error*)0;
+     signal(SIGPIPE, SIG_IGN); /* Don't abort process with SIGPIPE signals if child cannot read our data */
+   } else {
+  #else
+@@ -622,7 +622,7 @@
+   if (state==0) { /* Read the whole stream from `in', write it to `tmpsname' */
+    #if HAVE_PTS_POPEN
+     if (!tmpsname) {
+-      if (NULLP==(p=popen(redir_cmd(), "w"CFG_PTS_POPEN_B))) Error::sev(Error::EERROR) << "Filter::PipeD" << ": popen() failed: " << (SimBuffer::B().appendDumpC(redir_cmd)) << (Error*)0;
+      if (NULLP==(p=popen(redir_cmd(), "w" CFG_PTS_POPEN_B))) Error::sev(Error::EERROR) << "Filter::PipeD" << ": popen() failed: " << (SimBuffer::B().appendDumpC(redir_cmd)) << (Error*)0;
+       signal(SIGPIPE, SIG_IGN); /* Don't abort process with SIGPIPE signals if child cannot read our data */
+       vi_precopy();
+       in.vi_read(0,0);
+@@ -730,12 +730,7 @@
+ 
+ /* --- */
+ 
+-
+-#if HAVE_lstat_in_sys_stat
+-#  define PTS_lstat lstat
+-#else
+ #  define PTS_lstat stat
+-#endif
+ 
+ /** @param fname must start with '/' (dir separator)
+  * @return true if file successfully created
+--- a/in_ps.cpp
+++ b/in_ps.cpp
+@@ -137,7 +137,7 @@
+     // fprintf(stderr, "bbox=[%"PTS_CFG_PRINTFGLEN"g %"PTS_CFG_PRINTFGLEN"g %"PTS_CFG_PRINTFGLEN"g %"PTS_CFG_PRINTFGLEN"g]\n", llx, lly, urx, ury);
+     /* Dat: we must call translate _after_ setpagedevice (so it will take effect), at least with ESP Ghostscript 7.05.6 (2003-02-05); BUGFIX at Fri Aug 12 22:49:07 CEST 2005 */
+     sprintf(bboxline,
+-      "<</PageSize[%"PTS_CFG_PRINTFGLEN"g %"PTS_CFG_PRINTFGLEN"g]>>setpagedevice\n"
+      "<</PageSize[%" PTS_CFG_PRINTFGLEN "g %" PTS_CFG_PRINTFGLEN "g]>>setpagedevice\n"
+       /* removing /PageSize also cancels /a4, /a5 etc. */
+       /* we need `currentmatrix ... setpagedevice setmatrix' because
+        * setpagedevice cancels the current transformation matrix so our
+@@ -147,7 +147,7 @@
+       "/setpagedevice{matrix currentmatrix exch "
+       "dup length dict copy dup /PageSize undef setpagedevice "
+       "setmatrix}bind def\n"
+-      "%"PTS_CFG_PRINTFGLEN"g %"PTS_CFG_PRINTFGLEN"g translate\n"
+      "%" PTS_CFG_PRINTFGLEN "g %" PTS_CFG_PRINTFGLEN "g translate\n"
+       , urx-llx, ury-lly, -llx, -lly);
+   } else {
+     Error::sev(Error::WARNING) << "in_eps_reader: missing EPS bbox" << (Error*)0;
+--- a/Makefile
+++ b/Makefile
+@@ -17,7 +17,7 @@
+ export PERL_BADLANG
+ 
+ CXXX=$(CXD_assert)
+-LDALL=$(LDXX) -s $(LDFLAGS) $(LIBS)
+LDALL=$(LDXX) $(LDFLAGS) $(LIBS)
+ ifeq ($(ENABLE_DEBUG), no)
+ CXXX=$(CXD_no)
+ endif
+@@ -51,8 +51,8 @@
+ IDE_TARGETS_debug := $(patsubst %,%.yes, $(TARGETS))
+ IDE_TARGETS_release := $(TARGETS)
+ 
+-CXD_assert =$(CXX) -s -O2
+-CXD_no     =$(CXX) -s -DNDEBUG -O3
+CXD_assert =$(CXX)
+CXD_no     =$(CXX) -DNDEBUG
+ # CXD_yes    =$(CXX) $(GFLAG) -lefence
+ CXD_yes    =$(CXX) $(GFLAG)
+ CXD_checker=checkerg++ $(GFLAG)
+--- a/minips.cpp
+++ b/minips.cpp
+@@ -292,9 +292,9 @@
+ void MiniPS::Real::dump(GenBuffer::Writable &out_, bool dumpPS_force) {
+   char buf[64]; /* Imp: should be enough?? */
+   if (metric!=0 && (dumpPS_force || dumpPS)) {
+-    sprintf(buf, "%"PTS_CFG_PRINTFGLEN"g%s", d, me_psfactor[metric]);
+    sprintf(buf, "%" PTS_CFG_PRINTFGLEN "g%s", d, me_psfactor[metric]);
+   } else {
+-    sprintf(buf, "%"PTS_CFG_PRINTFGLEN"g", d*me_factor[metric]);
+    sprintf(buf, "%" PTS_CFG_PRINTFGLEN "g", d*me_factor[metric]);
+   }
+   out_ << buf;
+ }
+@@ -1044,7 +1044,7 @@
+   } else {
+     d = d < 0 ? 72.0 / -d : d / 72.0;
+     char buf[64]; /* Dat: enough */
+-    sprintf(buf, "%"PTS_CFG_PRINTFGLEN"g", d);
+    sprintf(buf, "%" PTS_CFG_PRINTFGLEN "g", d);
+     out << buf;
+   }
+ }
+@@ -1093,7 +1093,7 @@
+     out << (rounding>=2 && ll<0 ? 0 : ll);
+   } else {
+     char buf[64]; /* Dat: enough */
+-    sprintf(buf, "%"PTS_CFG_PRINTFGLEN"g", d);
+    sprintf(buf, "%" PTS_CFG_PRINTFGLEN "g", d);
+     out << buf;
+   }
+ }
+--- a/ps_tiny.c
+++ b/ps_tiny.c
+@@ -151,7 +151,7 @@
+ }
+ 
+ static void erri(char const*msg1, char const*msg2) {
+-  fprintf(stderr, "%s: error at %"SLEN_P"u.%"SLEN_P"u.%"SLEN_P"u: %s%s\n",
+  fprintf(stderr, "%s: error at %" SLEN_P "u.%" SLEN_P "u.%" SLEN_P "u: %s%s\n",
+     PROGNAME, curline, curofs-leftofs+1, curofs, msg1, msg2?msg2:"");
+   exit(3);
+ }
+@@ -230,7 +230,7 @@
+ /** @param b: assume null-terminated @return true on error */
+ static /*inline*/ sbool toInteger(char *s, psint_t *ret) {
+   int n=0; /* BUGFIX?? found by __CHECKER__ */
+-  return sscanf(s, "%"SLEN_P"i%n", ret, &n)<1 || s[n]!='\0';
+  return sscanf(s, "%" SLEN_P "i%n", ret, &n)<1 || s[n]!='\0';
+ }
+ 
+ /** @param b: assume null-terminated @return true on error */
+@@ -700,7 +700,7 @@
+   getotag("Abbr");
+   getkey("acount");  acount=getuintval();
+   getkey("xcount");  xcount=getuintval();
+-  sprintf(tmp,"%"SLEN_P"u dict%%</I>", acount+xcount);
+  sprintf(tmp,"%" SLEN_P "u dict%%</I>", acount+xcount);
+   setifmt(tmp,0); copy("I"); noifmt();
+   gettagbeg();
+ 
--- a/media-gfx/sam2p/sam2p-0.49.3.ebuild
+++ b/media-gfx/sam2p/sam2p-0.49.3.ebuild
@ -0,0 +1,48 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit autotools toolchain-funcs
+
+DESCRIPTION="Utility to convert raster images to EPS, PDF and many others"
+HOMEPAGE="https://github.com/pts/sam2p"
+SRC_URI="https://github.com/pts/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="examples gif"
+
+DEPEND="dev-lang/perl"
+
+RESTRICT="test"
+
+PATCHES=( "${FILESDIR}"/${P}-build-fixes.patch )
+
+src_prepare() {
+	default
+
+	# configure.in files are deprecated
+	mv configure.{in,ac} || die
+
+	# eautoreconf is still needed or you get bad warnings
+	eautoreconf
+}
+
+src_configure() {
+	tc-export CXX
+
+	econf --enable-lzw $(use_enable gif)
+}
+
+src_install() {
+	dobin sam2p
+	einstalldocs
+
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
--- a/media-libs/audiofile/audiofile-0.3.6-r2.ebuild
+++ b/media-libs/audiofile/audiofile-0.3.6-r2.ebuild
@ -0,0 +1,50 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit autotools gnome.org multilib-minimal
+
+DESCRIPTION="An elegant API for accessing audio files"
+HOMEPAGE="http://www.68k.org/~michael/audiofile/"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0/1" # subslot = soname major version
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc \
+	~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux \
+	~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="flac static-libs test"
+
+RDEPEND="flac? ( >=media-libs/flac-1.2.1[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	test? ( dev-cpp/gtest[${MULTILIB_USEDEP}] )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.3.6-gcc6-build-fixes.patch
+	"${FILESDIR}"/${PN}-0.3.6-system-gtest.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--enable-largefile
+		--disable-werror
+		--disable-examples
+		$(use_enable flac)
+		$(use_enable static-libs static)
+	)
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	# package provides .pc file
+	find "${D}" -name '*.la' -delete || die
+}
--- a/Show more
+++ b/Show more
				`@ -0,0 +1 @@`
				`DIST nose-parameterized-0.5.0.tar.gz 10363 SHA256 a11c41b0cf8218e7cdc19ab7a1bdf5c141d161cd2350daee819473cc63cd0685 SHA512 812e3e0a44f1db323f9c134b7438ea5e2c63232b04dc4d8aa59d153253183471784fd4960ffb18f23e14c398e4633515ff933bdfbfdb6954c44af97235d3cf91 WHIRLPOOL d25ff1ef662fe6544176ed61a82cbf4725a377d7bb28dc9215623a250d63b4cc0eaff03e193d80b9f48dccc055ea3ba62ece871e10f12e5cc3f353e110d3db00`
				`@ -0,0 +1 @@`
				`DIST patch-1.16.zip 12809 SHA256 c62073f356cff054c8ac24496f1a3d7cfa137835c31e9af39a9f5292fd75bd9f SHA512 563be07f0376e6ddcf7fa500006d57def4faa2d9fdbd5232afac625d17d9621787de60dc67f0895e1f54f1d5cf0920594ade0985f1dfb7796f131acc92cd7f0b WHIRLPOOL 9922686830093745168256c106fbc0a26ef17f40992a6b2bb3fd9c48bb0d6f6c978a90f886713eda4a2471f135740549ff7de76e4d14bdf58cae38bb46814ac0`
				`@ -0,0 +1 @@`
				`DIST bazel-0.3.2.tar.gz 145095554 SHA256 9692ac3318a40e8a0530f68bbfc473ae5f6a4a5c0fe08d2f88612ca4d40ba54a SHA512 975faf5830e952bea5d3fa8d127e0d5d9654af83f1fba0d7e26f9e1c2c71dd58542efea2382b0c52c9fd24ae43ec66a3ca7451309f02fd65c0896bbbdb3c79f5 WHIRLPOOL ab487f84e8126ab2badfd84d1fe757170900fbb2f88dff79d6867fb694bbb8adf226b7b89bfdb9cf207595bfd235583a54b8102a1a009f58be7bd3be039e1aaa`
				`@ -0,0 +1 @@`
				`DIST conan-0.14.1.tar.gz 386985 SHA256 3d20eba786a2243989bd4e53b805e265d1593b226ca271ffc3072994ad15c609 SHA512 1a1e4797b50856be38a1edd15c83edf74cdfbb6b64f7b72507ac649eaef7b69dd2d653021104c327f5077d89a1efbbc6dfd7bc1a7ffa6c32762ee2fb0709c56f WHIRLPOOL ae62aae19a3af3da8319e546c8593aec0ad3780109b4b4e97fc5a2892e59797f29c62c768fa59dc361af76426e28a1fcc43d9e4ff65065b581d8497d34e7cfaf`