Merge remote-tracking branch 'remotes/Coacher/fwknop-cleanup'

Pull request: https://github.com/gentoo/gentoo/pull/501
author: Ian Delaney <idella4@gentoo.org> 2015-12-21 10:33:54 +0800
committer: Ian Delaney <idella4@gentoo.org> 2015-12-21 10:33:54 +0800
commit: 577c60980f1c38f5a985598776319df700d98a1e (patch)
tree: 919d2a4a96c55d096700f3d85c4be99592d87c97
parent: app-misc/elasticsearch: remove old vns. 1.6.2, 1.7.1 (diff)
parent: net-firewall/fwknop: drop obsolete initscript revision suffix (diff)
download: gentoo-577c60980f1c38f5a985598776319df700d98a1e.tar.gz
gentoo-577c60980f1c38f5a985598776319df700d98a1e.tar.bz2
gentoo-577c60980f1c38f5a985598776319df700d98a1e.zip
205 files changed, 3236 insertions, 2850 deletions
diff --git a/app-admin/rex/Manifest b/app-admin/rex/Manifest
index 8b2d0b171131..bec6500407c1 100644
--- a/app-admin/rex/Manifest
+++ b/app-admin/rex/Manifest
@@ -1,3 +1,4 @@
 DIST Rex-1.0.0.tar.gz 261873 SHA256 894ba5128842b33cbc5dfeabdbeded18f303d2efbb082d08c9fceb38a7a0217b SHA512 53eb51e88e466f9dc429da828e3745c074eac1e1f1ba02f5c4f058358f071cd6eb71a95d56f65bd9b0e142aa824b2c660b7e7fe83c9ecd742dec12c3a4b642d4 WHIRLPOOL dc6b0dcd6ef3b1de4a7839a47054481b036bbd5395702c110e7760173797428b24d198bd50d8975045bd740a6180278bc34eef57c827e4d6a17a316577f16608
 DIST Rex-1.2.0.tar.gz 267664 SHA256 26a222bf418950b94b53c22c5fe87828a1503d6794a5516759914c5925f5f6fb SHA512 68467d00b6acdedd6b92dd51a8a6b42e3acf92fd28713a7ee7137744cd071b681e2e8f2fc5cf45df8979bdb78e9b49d2dbd52db7505f8aa9169b18e94e38719d WHIRLPOOL 453330d69b4a8e7e5f689fd10797233948a32fc239025fe68196ee2bfcd71f762f80e008e959cec209da58c8e1bb9be9ac66abaea9efe3bd70b4fcd38f903a8e
 DIST Rex-1.3.2.tar.gz 271446 SHA256 49be858e2ae51dda2fa2769b5e824ca2b5b7605f3b7e6c2f613b889e132e34b0 SHA512 589383b5a2c993e775be12ecd7b6ed5b525bd1f503311592bb302dd8558f5e0221fae6b459d4b52be418cb423fd294a759a63fce918b260e7c90fa153df0525a WHIRLPOOL ace24f03fc5ee5cb5b58bc14d4eb60f18598df645ad4c39260797012e2ecd2c40f72b3875f63dd5b4213990a6de817abcd511ade5d2928110072719e8b9c8ee2
+DIST Rex-1.3.3.tar.gz 274725 SHA256 111e80515fc3c1846668aa4ff0731443a58f3e74d78063dfc61fea96ca49cde6 SHA512 b2331e400027568f59496ff52f0a19bd009f66fea2a5b80ed9055859f59f0057afa50f61934cccd5af434c6f60dfa99700bc3904127b822a5ae684cb8bb6c70c WHIRLPOOL c8285e50f0259060ead8e86b120b3a16d6a1f506dec8eead33ac5e8a0af8371083a73315cf859c99433a7b8c902cbd48f383326c6ce2b0c4d900681baf623a51
diff --git a/app-admin/rex/rex-1.3.3.ebuild b/app-admin/rex/rex-1.3.3.ebuild
new file mode 100644
index 000000000000..561ea9dd61ee
--- /dev/null
+++ b/app-admin/rex/rex-1.3.3.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MODULE_AUTHOR=FERKI
+MODULE_A=Rex-${PV}.tar.gz
+
+inherit perl-module
+
+DESCRIPTION="(R)?ex is a small script to ease the execution of remote commands"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	dev-perl/DBI
+	dev-perl/Digest-HMAC
+	dev-perl/Digest-SHA1
+	dev-perl/Expect
+	dev-perl/Hash-Merge
+	dev-perl/IO-String
+	dev-perl/IO-Tty
+	dev-perl/IPC-Shareable
+	dev-perl/JSON-XS
+	dev-perl/List-MoreUtils
+	dev-perl/Net-OpenSSH
+	dev-perl/Net-SFTP-Foreign
+	dev-perl/Parallel-ForkManager
+	dev-perl/Sort-Naturally
+	dev-perl/String-Escape
+	dev-perl/TermReadKey
+	dev-perl/Text-Glob
+	dev-perl/URI
+	dev-perl/XML-LibXML
+	dev-perl/XML-Simple
+	dev-perl/libwww-perl
+	dev-perl/yaml
+	virtual/perl-Carp
+	virtual/perl-Data-Dumper
+	virtual/perl-Digest-MD5
+	virtual/perl-Exporter
+	virtual/perl-File-Spec
+	virtual/perl-MIME-Base64
+	virtual/perl-Scalar-List-Utils
+	virtual/perl-Storable
+	virtual/perl-Time-HiRes
+"
+
+DEPEND="
+	${RDEPEND}
+	test? (
+		dev-perl/Test-UseAllModules
+		virtual/perl-File-Temp
+	)
+"
+
+SRC_TEST="do"
+
+S="${WORKDIR}/Rex-${PV}"
diff --git a/app-backup/duply/Manifest b/app-backup/duply/Manifest
index 23ff5affe3f1..bd48cce7625d 100644
--- a/app-backup/duply/Manifest
+++ b/app-backup/duply/Manifest
@@ -1,4 +1,5 @@
 DIST duply_1.10.1.tgz 36079 SHA256 78f3714b0dc39657e2b3030e206370d38205305ca484e212704dcf77f9e70d35 SHA512 be991742e343b16c08024e0f0185e0d23d2630f06bb53a73c2056ba90e7d5610d64885be3edcdb38e464d6ddcc9e4c854958f234471b718189e988af2599ba5f WHIRLPOOL 6fe0f5201d1ac9d9c738d16cda7bce500dc860a2c446be5a2382deeeb0faf26b43a7bfd423e2fe72d14c8319e3e5defa92d1ce51b28083462daf579821131f6b
 DIST duply_1.10.tgz 36075 SHA256 62286bddd6efee67fb20c790e63bf25847ad65c06a4969b275e9abdb6253f6cc SHA512 10af8208d14bbb23bccc03cba5db7fbdccd8cacc0ada18cc07ad268966200884c280486ce5019385bfa8d1e61b1aecee5e38704332b45d97b47419eca995641c WHIRLPOOL dc96ba35644a88f9929ce93216b0b44901b9c7d1b5c2f58439888066ae64f7fd254e3496f12f08159ad905e4d7a06f07e09a7c9dab1318ce1e29fe101fc1c4b2
+DIST duply_1.11.1.tgz 43677 SHA256 128792962bbd1509e875bd91e613be3aa1263e6edb57815957e07d54346bc02d SHA512 a5f3303d89f62633369e350b8232a571801dad395e66978fdf806cb9e072c22adfd5c0323308de2338580451096eb7f5cb304b6cb1964d0aecd205add213f424 WHIRLPOOL b62310c14f53400352de0936002bc915468db5325b3f91d82354b8bed6f108de750e2a4c557c5f3635b57dc9c27b8d382410de56cf1f969d9d479b1484988e3e
 DIST duply_1.11.tgz 43476 SHA256 234fc6e2cb7ad53966e40aabb5ca6447217b7b6179d5f6f18240ac5b5071f75c SHA512 d42902839693af67b2bedf534430c2bb8f59d04fcfb609174743423e37dcff52ae04c8621a0c55d1f544e74e1834b5672cbb6bdb9e3cb124727a1d4f7e5dabda WHIRLPOOL c12b791240e7c24f3b3390d50b4878f9d44e1adb34d600c3f4596431bbda88c03ae835f413bb504d348584d9b07368a845d0866833e29a1aa15ac1b8b431a3c6
 DIST duply_1.9.2.tgz 36222 SHA256 2bfc0964ebc0bae5752e0b4a12eb8fb6f78a27739f32c9acb4ac81947506c5ab SHA512 9ef5e22f43a6854e413ed1c2b88b10d0ae75cff7b2bcd927d20a588234555e9b7eff25d094f688f9d4f8510eba6bc20f7635c0de9ab9b402966075595922333e WHIRLPOOL 6a3e79c87e0b28386f0ed6fd8eb7973659477ad278e80e292a3e6cea944fd512baffc9a455e148faeadb687a46a8e274ce86668c29f30244b5b63f1f850a9c00
diff --git a/app-backup/duply/duply-1.11.1.ebuild b/app-backup/duply/duply-1.11.1.ebuild
new file mode 100644
index 000000000000..49df6e9b5a38
--- /dev/null
+++ b/app-backup/duply/duply-1.11.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit readme.gentoo
+
+DESCRIPTION="A shell frontend for duplicity"
+HOMEPAGE="http://duply.net"
+SRC_URI="mirror://sourceforge/project/ftplicity/duply%20%28simple%20duplicity%29/1.11.x/${PN}_${PV}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="app-text/txt2man"
+RDEPEND="app-backup/duplicity"
+
+S=${WORKDIR}/${PN}_${PV}
+
+src_install() {
+	dobin ${PN}
+	./${PN} txt2man > ${PN}.1 || die
+	doman ${PN}.1
+	dodoc CHANGELOG.txt
+	readme.gentoo_create_doc
+}
diff --git a/app-crypt/acme/Manifest b/app-crypt/acme/Manifest
index 327e5a25d101..b990924ab528 100644
--- a/app-crypt/acme/Manifest
+++ b/app-crypt/acme/Manifest
@@ -1 +1 @@
-DIST letsencrypt-0.1.0.tar.gz 524821 SHA256 1c1ac7b41e5e0fc0e41a7ef159ac9147a4aafff54453d57b519eb05bf52ade14 SHA512 6a786290362741ac97dcb4b59bc4cba56f3e8b5193bbc10be19086d462f76e6124259c42bac36afe9eb818f4bb9edec34f8e2a02bd8c855e3b35404f4ee81f96 WHIRLPOOL cdc41a3466de54ab8ddfeedea9935205d78383028769dcfbc876be0c2ef80c2d14f5d0e4a9c56a751163718f5ababb07848822989a060de7031ea8ebdf6424a0
+DIST letsencrypt-0.1.1.tar.gz 533715 SHA256 3f5210fc2e28577b1b24c4fbfb5c20ac259925a5fad81cf69a1b4f62d76511db SHA512 bd045622f77272447b9d497c410a128c30371c6df5beab418089c2c8b26fef9e87ecc6055bdf4017d7d2fb5f840b4900ff9efba848d07a2bf3a1be9d7fc0df99 WHIRLPOOL b89bcbf1dea41bd0a391cc3db86c4a7413cdf9c5e64c2398b60b7c57c5950c221bd64a51f773a7fb2fc725d93f3d672170c97147d5b5b644a008309e95dd8576
diff --git a/app-crypt/acme/acme-0.1.0-r1.ebuild b/app-crypt/acme/acme-0.1.1.ebuild
index 1df4590ea219..afd5efce9be0 100644
--- a/app-crypt/acme/acme-0.1.0-r1.ebuild
+++ b/app-crypt/acme/acme-0.1.1.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999* ]]; then
 	KEYWORDS=""
 	S=${WORKDIR}/${P}/${PN}
 else
-	SRC_URI="https://github.com/letsencrypt/archive/v${PV}.tar.gz -> letsencrypt-${PV}.tar.gz"
+	SRC_URI="https://github.com/letsencrypt/letsencrypt/archive/v${PV}.tar.gz -> letsencrypt-${PV}.tar.gz"
 	KEYWORDS="~amd64"
 	S=${WORKDIR}/letsencrypt-${PV}/acme
 fi
diff --git a/app-crypt/acme/acme-9999.ebuild b/app-crypt/acme/acme-9999.ebuild
index 1df4590ea219..afd5efce9be0 100644
--- a/app-crypt/acme/acme-9999.ebuild
+++ b/app-crypt/acme/acme-9999.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999* ]]; then
 	KEYWORDS=""
 	S=${WORKDIR}/${P}/${PN}
 else
-	SRC_URI="https://github.com/letsencrypt/archive/v${PV}.tar.gz -> letsencrypt-${PV}.tar.gz"
+	SRC_URI="https://github.com/letsencrypt/letsencrypt/archive/v${PV}.tar.gz -> letsencrypt-${PV}.tar.gz"
 	KEYWORDS="~amd64"
 	S=${WORKDIR}/letsencrypt-${PV}/acme
 fi
diff --git a/app-crypt/letsencrypt/Manifest b/app-crypt/letsencrypt/Manifest
index 327e5a25d101..b990924ab528 100644
--- a/app-crypt/letsencrypt/Manifest
+++ b/app-crypt/letsencrypt/Manifest
@@ -1 +1 @@
-DIST letsencrypt-0.1.0.tar.gz 524821 SHA256 1c1ac7b41e5e0fc0e41a7ef159ac9147a4aafff54453d57b519eb05bf52ade14 SHA512 6a786290362741ac97dcb4b59bc4cba56f3e8b5193bbc10be19086d462f76e6124259c42bac36afe9eb818f4bb9edec34f8e2a02bd8c855e3b35404f4ee81f96 WHIRLPOOL cdc41a3466de54ab8ddfeedea9935205d78383028769dcfbc876be0c2ef80c2d14f5d0e4a9c56a751163718f5ababb07848822989a060de7031ea8ebdf6424a0
+DIST letsencrypt-0.1.1.tar.gz 533715 SHA256 3f5210fc2e28577b1b24c4fbfb5c20ac259925a5fad81cf69a1b4f62d76511db SHA512 bd045622f77272447b9d497c410a128c30371c6df5beab418089c2c8b26fef9e87ecc6055bdf4017d7d2fb5f840b4900ff9efba848d07a2bf3a1be9d7fc0df99 WHIRLPOOL b89bcbf1dea41bd0a391cc3db86c4a7413cdf9c5e64c2398b60b7c57c5950c221bd64a51f773a7fb2fc725d93f3d672170c97147d5b5b644a008309e95dd8576
diff --git a/app-crypt/letsencrypt/letsencrypt-0.1.0-r1.ebuild b/app-crypt/letsencrypt/letsencrypt-0.1.1.ebuild
index 72156f507227..f92eb1c5d7d5 100644
--- a/app-crypt/letsencrypt/letsencrypt-0.1.0-r1.ebuild
+++ b/app-crypt/letsencrypt/letsencrypt-0.1.1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
 	KEYWORDS=""
 else
-	SRC_URI="https://github.com/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64"
 fi
 
diff --git a/app-crypt/letsencrypt/letsencrypt-9999.ebuild b/app-crypt/letsencrypt/letsencrypt-9999.ebuild
index 72156f507227..f92eb1c5d7d5 100644
--- a/app-crypt/letsencrypt/letsencrypt-9999.ebuild
+++ b/app-crypt/letsencrypt/letsencrypt-9999.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
 	KEYWORDS=""
 else
-	SRC_URI="https://github.com/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64"
 fi
 
diff --git a/app-crypt/signing-party/Manifest b/app-crypt/signing-party/Manifest
index b59627a240f2..cca428f95baf 100644
--- a/app-crypt/signing-party/Manifest
+++ b/app-crypt/signing-party/Manifest
@@ -2,3 +2,4 @@ DIST signing-party_1.1.11.orig.tar.gz 233965 SHA256 90073c2c05a36c0fdbf4ffc8b062
 DIST signing-party_1.1.4.orig.tar.gz 230259 SHA256 3d135437540ad1e5b3bb209ee90896a6b9153170eb0e4c93d018c1952fb80fa1 SHA512 935a192d8ce0057731b3422d217a90890dd97d9c84a3a46e3e4a2536f41e6752a44a86ba13db9b9a3e24a629dd6e78cb599a7999eeffea0a2b3b83b775dea36c WHIRLPOOL b5efdbd37d3277fd4fedc0938abcedada2c9a603bfdb1e93882e60abd698e4d4ef9535fde8d6c0c57818603e12507d911a150022fea5690b72eac66eecda803f
 DIST signing-party_2.0.orig.tar.gz 236249 SHA256 cc23e48b2f06dee7cbf7b80ee4dfbed69908cb4584d3d5fa29ed7b2f962ec16e SHA512 3ba3063deb9b994112e614d4b329d796def38ec498b3cb6f573c849b796f802aea162786f129f5b5a9bbc347f45c0c8a47e36e7b448f6e511bd912497edd1efe WHIRLPOOL ad6db7717de2194fbb1f91bd8a1d76111a09711cbf57f354d37ebfe2da7c7a5ac7b32ea24c22f43b87fb0e25b03be331673f8a3637af314813df8cc75165a591
 DIST signing-party_2.1.orig.tar.gz 237478 SHA256 ca87849a74ea4c271e92422bfe6b1be2bfe2c2de9a723bf11aa088e4ea88965d SHA512 939415b5fd5538a2a8831c7ea37f4395fd56fc216700116ab39a3d3acd6ad7239b730d43f624593c2d89292251d0fc0c443164e26be1f9643b5b410efc75d33b WHIRLPOOL 8b5100dc5cb8b3a3754789d0b1d2fc316949504d5e31fe59c6050567753d0cfc1de101713312d5811ba3a68ed6ef2c83840b0d8647bd9f92abae9664ac780246
+DIST signing-party_2.2.orig.tar.gz 237612 SHA256 ad5d06c6c58de17aee104b9cf2f3a954cd9b854e5a77c1a8b62cf0a67c63168f SHA512 bf4b741364cf100f17047900e61c16a8df2f31a3143ce40de64afdb19b8ed251c716389661787988d03526ade4453e096b1d76fa51777e74d6fa84ecd2c5f09d WHIRLPOOL 7fda0fe23951d7375d92bb22fdc5fd55d6415beea6f899e5b01b24d7d58ca6e8f0ca22805095cdb66ce82c80109802c5b452152cf2d994ee0a039f96405720e8
diff --git a/app-crypt/signing-party/signing-party-2.2.ebuild b/app-crypt/signing-party/signing-party-2.2.ebuild
new file mode 100644
index 000000000000..25a78723ce59
--- /dev/null
+++ b/app-crypt/signing-party/signing-party-2.2.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils toolchain-funcs autotools
+
+DESCRIPTION="A collection of several tools related to OpenPGP"
+HOMEPAGE="http://pgp-tools.alioth.debian.org/"
+SRC_URI="mirror://debian/pool/main/s/signing-party/${PN}_${PV}.orig.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-lang/perl"
+RDEPEND="${DEPEND}
+	>=app-crypt/gnupg-1.3.92
+	dev-perl/GnuPG-Interface
+	dev-perl/text-template
+	dev-perl/MIME-tools
+	net-mail/qprint
+	>=dev-perl/MailTools-1.62
+	dev-perl/Net-IDN-Encode
+	virtual/mailx
+	virtual/mta
+	|| (
+		dev-perl/libintl-perl
+		dev-perl/Text-Iconv
+		app-text/recode
+	)"
+S=$WORKDIR
+
+src_prepare() {
+	# app-crypt/keylookup
+	rm -r keylookup || die
+	# media-gfx/springgraph
+	rm -r springgraph || die
+
+	cd keyanalyze/pgpring
+	mv configure.in configure.ac
+	sed -i 's/AM_C_PROTOTYPES//' configure.ac || die
+	eautoreconf
+	cd "${WORKDIR}"
+
+	find . -name Makefile | xargs sed -i -e 's/CFLAGS:=/CFLAGS=/' -e 's/CPPFLAGS:=/CPPFLAGS=/' -e 's/LDFLAGS:=/LDFLAGS=/'
+
+	sed -i "s:/usr/share/doc/signing-party/caff/caffrc.sample:${EPREFIX}/usr/share/doc/${P}/caff/caffrc.sample.gz:g" \
+		caff/caff || die
+	sed -i -e 's/automake[^ ]*/true/g' -e 's/autoconf[^ ]*/true/g' keyanalyze/Makefile || die
+	sed -i 's/make /\$(MAKE) /' keyanalyze/Makefile || die
+}
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		CPPFLAGS="${CPPFLAGS}" \
+		CFLAGS="${CFLAGS}" \
+		LDFLAGS="${LDFLAGS}" \
+		STRIP=true
+}
+
+src_install() {
+	# Check Makefile when a new tool is introduced to this package.
+	# caff
+	dobin caff/caff caff/pgp-clean caff/pgp-fixkey
+	docinto caff
+	dodoc caff/{README*,THANKS,TODO,caffrc.sample}
+	# gpgdir
+	dobin gpgdir/gpgdir
+	docinto gpgdir
+	dodoc gpgdir/{VERSION,LICENSE,README,INSTALL,CREDITS,ChangeLog*}
+	# gpg-key2ps
+	dobin gpg-key2ps/gpg-key2ps
+	docinto gpg-key2ps
+	dodoc gpg-key2ps/README
+	# gpglist
+	dobin gpglist/gpglist
+	# gpg-mailkeys
+	dobin gpg-mailkeys/gpg-mailkeys
+	docinto gpg-mailkeys
+	dodoc gpg-mailkeys/{example.gpg-mailkeysrc,README}
+	# gpgparticipants
+	dobin gpgparticipants/gpgparticipants
+	# gpgwrap
+	dobin gpgwrap/bin/gpgwrap
+	docinto gpgwrap
+	dodoc gpgwrap/{LICENSE,NEWS,README}
+	doman gpgwrap/doc/gpgwrap.1
+	# gpgsigs
+	dobin gpgsigs/gpgsigs
+	insinto /usr/share/signing-party
+	# keyanalyze
+	# TODO: some of the scripts are intended for webpages, and not really
+	# packaging, so they are NOT installed yet.
+	newbin keyanalyze/pgpring/pgpring pgpring-keyanalyze
+	dobin keyanalyze/{keyanalyze,process_keys}
+	docinto keyanalyze
+	dodoc keyanalyze/{README,Changelog}
+	# See app-crypt/keylookup instead
+	#dobin keylookup/keylookup
+	#docinto keylookup
+	#dodoc keylookup/NEWS
+	# sig2dot
+	dobin sig2dot/sig2dot
+	dodoc sig2dot/README.sig2dot
+	# See media-gfx/springgraph instead
+	#dobin springgraph/springgraph
+	#dodoc springgraph/README.springgraph
+	# all other manpages, and the root doc
+	doman */*.1
+	dodoc README
+}
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index fecd59c21521..3f611c43b374 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -1,7 +1,9 @@
 DIST emacs-18.59-linux22x-elf-glibc21.diff.gz 15671 SHA256 fb810d893938883d50a3a8d7c43fbeb1604d5454f760b8f1f700326c8ee659dd SHA512 c6c6ea33850dadf08d68fff56fc6aacc80ad1aa36661260715d50b95438942d56e6244094427d50356cfe716f26559feb885254c436399bff7be639637d605b6 WHIRLPOOL cafaa0fb0d06058cac8e445a7a1b5cba145d23186477a9c681efdab8ca0f18a9675dec3a93851fd7138890701f83fab83300c28a548c8fc22478a0cfff95d5da
 DIST emacs-18.59-patches-8.tar.bz2 19667 SHA256 637542bf5ee07d4abac11b76e742598a60787f3869dbf377eed99ae005fbc59d SHA512 a6564bc16724bfdb22f77b0e21b6064ca5e0e1bc91f3223c1037c26f8a048f28ac7a5da6817dc940a5f00f1f39bbfcda2277645409cd7e143a55fabdc3d3fe5d WHIRLPOOL 6b81f978aef2b429262e79ab1d995cca9237dc9c9d98144d2dc3de07bc2cdcec8547adbaf5ad41d9cce3239554918c04c7b9ff783b7931582a3a7398eb2b66f1
+DIST emacs-18.59-patches-9.tar.xz 21380 SHA256 69411c57b20850e8aab1e20614437f9a836c2ddf47c46a833d0262c138fa3270 SHA512 595a4a7a4052c3b3325e4d4952eed24c98d3dd62b7ce89bd149f046552e2dd67ec3e720b7559fbc086b06a667c992bccc60201ef53b263dbd0fc96cbcdceee38 WHIRLPOOL 23f803d940c35fe9519fe7169e6bca7012c2d2db2246dec121fba37e8dbf39f411a9e579a9cbd4193562da72b9ac226286ad687877ccadd7cb78ea7eb615ab3f
 DIST emacs-18.59.tar.gz 2962652 SHA256 1e27e33f91984a91e9b4c1f21433f931aba03670960ecc147bb6d7b0de0f051e SHA512 03ce565e346e89b7aacb1852f4783e8907f394de7da0c543b475cb038eb89b87f980d0f7ca1841b1d2108b20f211e95113c7214e4a33e5767a1827ff43173f33 WHIRLPOOL 5e98e71518f665e2a8278afe54e0ace6d7fdd9df23ff0a3354ffc1d5cc25cd21b0dd4d82766fcb436d4f24e9291c933295e956e1ffea43cfeedf915175763be6
 DIST emacs-23.4-patches-17.tar.xz 16164 SHA256 bc9d4a36239f2749e218d903b67102e211a3a62ef162f5ab2801865dab77b752 SHA512 ceccd559b4f53328d75016b64d246ecf6fca7edebd080ce3bbba5f4d000bec38be5da91f3195c972ede0710da14b3be0545891321259b0a0b2963981c8fd62de WHIRLPOOL 4b70ce4d876e92a006e3dc0a31301f604aa8fa53a198515d1cbb3517a94933b1d7a11636494c1bd28ad1049a5a233d4ec13213e74e1eaff1cf96bb1fd095c345
+DIST emacs-23.4-patches-18.tar.xz 16512 SHA256 8c783691d61b888ca79d5d7a8319806a3125b656b3406a8834166cd53ba94813 SHA512 ec1092ca9a767035517fdb280fa31684466cf03ce19b3bcaf80ea816ad417fe8bf918787c49f2719bbf535a59594132ef2044c38a810717e8b5119a76d3dc0d2 WHIRLPOOL aac96413b3a76acbf3e9a771d909be42f913a72688e5c11c31534439a242e364d220ef66d23b73cf8ed4693f4a9ed2f5642c155e66b4b49e6ea1c2a16944aaa4
 DIST emacs-23.4.tar.bz2 38646508 SHA256 26576f9e664397c729f78f5ffcd092969251988461896fe8793062346ee988b9 SHA512 def7a95ecaefae24d8102b96b1d575a23def1b11a8f0bb17b68f7913bd118e2ea4449a8feee76c1bd649f099b70419f0d494ddd9bb32b26f92720cda842b0296 WHIRLPOOL 2384c3f63ff153c3975e373334d6021d46b23ad3cab448ed2e1180501236453a61d13bf1dfbb2e6075bb141dd8511d85f77e37c763b39769f98de48eacc56f3b
 DIST emacs-24.4-patches-5.tar.xz 6000 SHA256 967dac364282a51933f90c56f368bc3f2741efe0b7ff42d3151bb4824b70fa04 SHA512 0a337ad5b7601f5e453645d1fba99717328c6bc7a5505bcb4bd8e853179cf61be43eb6f3b9370edf0f44aa6485d4847c14554c1592ccc7da87b10dabaaa9d421 WHIRLPOOL 149f3a431d055963c544d9fa6c6447a16aa093840f6bf4086f50506979356a12407af16291c46ee62a92b3ee41767452046f45a7163214be33ab7bdbcd6059dc
 DIST emacs-24.4.tar.xz 39733124 SHA256 47e391170db4ca0a3c724530c7050655f6d573a711956b4cd84693c194a9d4fd SHA512 f51f88a4736a3f153ef01f3ad710571e967cd3d0c0112b066169a4040725d370ec29b14a4ca8fa3e3f4c657c726ba8e64c3ac4e390b8e911ea47a3afb5ac755c WHIRLPOOL eae38c2382731fecf0ccf8f717f8c96cc130d01a893ff560caecde903294eb843660492761ea8cce9920b79bfc55e821921924e27c040f25355110f56cd2255b
diff --git a/app-editors/emacs/emacs-18.59-r11.ebuild b/app-editors/emacs/emacs-18.59-r11.ebuild
new file mode 100644
index 000000000000..e78983d9dcc9
--- /dev/null
+++ b/app-editors/emacs/emacs-18.59-r11.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit toolchain-funcs flag-o-matic multilib
+
+DESCRIPTION="The extensible self-documenting text editor"
+HOMEPAGE="https://www.gnu.org/software/emacs/"
+SRC_URI="ftp://ftp.gnu.org/old-gnu/emacs/${P}.tar.gz
+	ftp://ftp.splode.com/pub/users/friedman/emacs/${P}-linux22x-elf-glibc21.diff.gz
+	https://dev.gentoo.org/~ulm/emacs/${P}-patches-9.tar.xz"
+
+LICENSE="GPL-1+ GPL-2+ BSD" #HPND
+SLOT="18"
+KEYWORDS="~amd64 ~x86"
+IUSE="abi_x86_x32"
+
+RDEPEND=">=app-eselect/eselect-emacs-1.16
+	sys-libs/ncurses:0
+	amd64? (
+		abi_x86_x32? ( >=sys-libs/ncurses-5.9-r3:0[abi_x86_x32(-)?] )
+		!abi_x86_x32? ( >=sys-libs/ncurses-5.9-r3:0[abi_x86_32(-)] )
+	)"
+#	X? ( x11-libs/libX11[-xcb] )
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+PATCHES="../${P}-linux22x-elf-glibc21.diff ../patch"
+
+src_configure() {
+	# autoconf? What's autoconf? We are living in 1992. ;-)
+	local arch
+	case ${ARCH} in
+		amd64)
+			if use abi_x86_x32; then
+				arch=x86-x32
+				multilib_toolchain_setup x32
+			else
+				arch=intel386
+				multilib_toolchain_setup x86
+			fi
+			;;
+		x86) arch=intel386 ;;
+		*) die "Architecture ${ARCH} not yet supported" ;;
+	esac
+	local cmd="s/\"s-.*\.h\"/\"s-linux.h\"/;s/\"m-.*\.h\"/\"m-${arch}.h\"/"
+	#use X && cmd="${cmd};s/.*\(#define HAVE_X_WINDOWS\).*/\1/"
+	sed -e "${cmd}" src/config.h-dist >src/config.h || die
+
+	cat <<-END >src/paths.h
+		#define PATH_LOADSEARCH "/usr/share/emacs/${PV}/lisp"
+		#define PATH_EXEC "/usr/share/emacs/${PV}/etc"
+		#define PATH_LOCK "/var/lib/emacs/lock/"
+		#define PATH_SUPERLOCK "/var/lib/emacs/lock/!!!SuperLock!!!"
+	END
+
+	sed -i -e "s:/usr/lib/\([^ ]*\).o:/usr/$(get_libdir)/\1.o:g" \
+		-e "s:-lncurses:$("$(tc-getPKG_CONFIG)" --libs ncurses):" \
+		src/s-linux.h || die
+
+	# -O3 and -finline-functions cause segmentation faults at run time.
+	filter-flags -finline-functions
+	replace-flags -O[3-9] -O2
+	strip-flags
+	# Quieten GCC 5. Feel free to submit a patch adding all those prototypes.
+	append-flags -Wno-implicit
+}
+
+src_compile() {
+	# Do not use the sandbox, or the dumped Emacs will be twice as large
+	export SANDBOX_ON=0
+	emake --jobs=1 \
+		CC="$(tc-getCC)" CFLAGS="${CFLAGS} -Demacs" \
+		LD="$(tc-getCC) -nostdlib" LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	local basedir="/usr/share/emacs/${PV}" i
+
+	dodir ${basedir}
+	dodir /usr/share/man/man1
+	emake --jobs=1 \
+		LIBDIR="${D}"${basedir} \
+		BINDIR="${D}"/usr/bin \
+		MANDIR="${D}"/usr/share/man/man1 \
+		install
+
+	rmdir "${D}"${basedir}/lock || die
+	find "${D}"${basedir} -type f \( -name "*.c" -o -name ChangeLog \
+		-o -name COPYING ! -path "*/etc/COPYING" \) -exec rm "{}" + || die
+	fperms -R go-w ${basedir}
+
+	# remove duplicate DOC file
+	rm "${D}"${basedir}/etc/DOC || die
+
+	# move executables to the correct place
+	mv "${D}"/usr/bin/emacs{,-${SLOT}} || die
+	for i in etags ctags emacsclient; do
+		mv "${D}"/usr/bin/${i}{,-emacs-${SLOT}} || die
+		rm "${D}"${basedir}/etc/${i} || die
+	done
+
+	dodir /usr/libexec/emacs/${PV}
+	for i in wakeup digest-doc sorted-doc movemail cvtmail fakemail \
+		yow env server
+	do
+		mv "${D}"${basedir}/etc/${i} "${D}"/usr/libexec/emacs/${PV}/${i} || die
+		dosym ../../../../libexec/emacs/${PV}/${i} ${basedir}/etc/${i}
+	done
+	for i in test-distrib make-docfile; do
+		rm "${D}"${basedir}/etc/${i} || die
+	done
+
+	# move man page
+	mv "${D}"/usr/share/man/man1/emacs{,-${SLOT}}.1 || die
+
+	# move Info files
+	dodir /usr/share/info
+	mv "${D}"${basedir}/info "${D}"/usr/share/info/emacs-${SLOT} || die
+	dosym ../../info/emacs-${SLOT} "${basedir}"/info
+	docompress -x /usr/share/info
+
+	# move Info dir to avoid collisions with the dir file generated by portage
+	mv "${D}"/usr/share/info/emacs-${SLOT}/dir{,.orig} || die
+	touch "${D}"/usr/share/info/emacs-${SLOT}/.keepinfodir
+
+	dodir /var/lib/emacs
+	diropts -m0777
+	keepdir /var/lib/emacs/lock
+
+	dodoc README PROBLEMS
+}
+
+pkg_preinst() {
+	# move Info dir file to correct name
+	if [[ -d "${D}"/usr/share/info ]]; then
+		mv "${D}"/usr/share/info/emacs-${SLOT}/dir{.orig,} || die
+	fi
+}
+
+pkg_postinst() {
+	eselect emacs update ifunset
+}
+
+pkg_postrm() {
+	eselect emacs update ifunset
+}
diff --git a/app-editors/emacs/emacs-23.4-r14.ebuild b/app-editors/emacs/emacs-23.4-r14.ebuild
new file mode 100644
index 000000000000..edb1f0d7de33
--- /dev/null
+++ b/app-editors/emacs/emacs-23.4-r14.ebuild
@@ -0,0 +1,349 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+WANT_AUTOMAKE="none"
+
+inherit autotools elisp-common flag-o-matic multilib readme.gentoo-r1
+
+DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
+HOMEPAGE="https://www.gnu.org/software/emacs/"
+SRC_URI="mirror://gnu/emacs/${P}.tar.bz2
+	https://dev.gentoo.org/~ulm/emacs/${P}-patches-18.tar.xz"
+
+LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
+SLOT="23"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="alsa aqua athena dbus games gconf gif gpm gtk gzip-el hesiod jpeg kerberos livecd m17n-lib motif pax_kernel png sound source svg tiff toolkit-scroll-bars X Xaw3d xft +xpm"
+REQUIRED_USE="?? ( aqua X )"
+
+RDEPEND="sys-libs/ncurses:0
+	>=app-eselect/eselect-emacs-1.16
+	>=app-emacs/emacs-common-gentoo-1.5[games?,X?]
+	net-libs/liblockfile
+	hesiod? ( net-dns/hesiod )
+	kerberos? ( virtual/krb5 )
+	alsa? ( media-libs/alsa-lib )
+	gpm? ( sys-libs/gpm )
+	dbus? ( sys-apps/dbus )
+	X? (
+		x11-libs/libXmu
+		x11-libs/libXt
+		x11-misc/xbitmaps
+		gconf? ( >=gnome-base/gconf-2.26.2 )
+		gif? ( media-libs/giflib )
+		jpeg? ( virtual/jpeg:0= )
+		png? ( >=media-libs/libpng-1.4:0= )
+		svg? ( >=gnome-base/librsvg-2.0 )
+		tiff? ( media-libs/tiff:0 )
+		xpm? ( x11-libs/libXpm )
+		xft? (
+			media-libs/fontconfig
+			media-libs/freetype
+			x11-libs/libXft
+			m17n-lib? (
+				>=dev-libs/libotf-0.9.4
+				>=dev-libs/m17n-lib-1.5.1
+			)
+		)
+		gtk? ( x11-libs/gtk+:2 )
+		!gtk? (
+			motif? ( >=x11-libs/motif-2.3:0 )
+			!motif? (
+				Xaw3d? ( x11-libs/libXaw3d )
+				!Xaw3d? ( athena? ( x11-libs/libXaw ) )
+			)
+		)
+	)"
+
+DEPEND="${RDEPEND}
+	alsa? ( virtual/pkgconfig )
+	dbus? ( virtual/pkgconfig )
+	X? ( virtual/pkgconfig )
+	gzip-el? ( app-arch/gzip )
+	pax_kernel? (
+		sys-apps/attr
+		sys-apps/paxctl
+	)"
+
+RDEPEND="${RDEPEND}
+	!<app-editors/emacs-vcs-${PV}"
+
+EMACS_SUFFIX="${PN/emacs/emacs-${SLOT}}"
+SITEFILE="20${PN}-${SLOT}-gentoo.el"
+# FULL_VERSION keeps the full version number, which is needed in
+# order to determine some path information correctly for copy/move
+# operations later on
+FULL_VERSION="${PV%%_*}"
+S="${WORKDIR}/emacs-${FULL_VERSION}"
+
+src_prepare() {
+	eapply ../patch
+	eapply_user
+
+	sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 \
+		|| die "unable to sed ctags.1"
+
+	if ! use alsa; then
+		# ALSA is detected even if not requested by its USE flag.
+		# Suppress it by supplying pkg-config with a wrong library name.
+		sed -i -e "/ALSA_MODULES=/s/alsa/DiSaBlEaLsA/" configure.in \
+			|| die "unable to sed configure.in"
+	fi
+	if ! use gzip-el; then
+		# Emacs' build system automatically detects the gzip binary and
+		# compresses el files. We don't want that so confuse it with a
+		# wrong binary name
+		sed -i -e "s/ gzip/ PrEvEnTcOmPrEsSiOn/" configure.in \
+			|| die "unable to sed configure.in"
+	fi
+
+	mv configure.in configure.ac || die
+	eautoreconf
+}
+
+src_configure() {
+	strip-flags
+	filter-flags -fstrict-aliasing -pie
+	append-flags $(test-flags -fno-strict-aliasing)
+
+	if use sh; then
+		replace-flags "-O[1-9]" -O0		#262359
+	elif use ia64; then
+		replace-flags "-O[2-9]" -O1		#325373
+	else
+		replace-flags "-O[3-9]" -O2
+	fi
+
+	local myconf
+
+	if use alsa && ! use sound; then
+		einfo "Although sound USE flag is disabled you chose to have alsa,"
+		einfo "so sound is switched on anyway."
+		myconf+=" --with-sound"
+	else
+		myconf+=" $(use_with sound)"
+	fi
+
+	if use X; then
+		myconf+=" --with-x --without-ns"
+		myconf+=" $(use_with gconf)"
+		myconf+=" $(use_with toolkit-scroll-bars)"
+		myconf+=" $(use_with gif)"
+		myconf+=" $(use_with jpeg)"
+		myconf+=" $(use_with png)"
+		myconf+=" $(use_with svg rsvg)"
+		myconf+=" $(use_with tiff)"
+		myconf+=" $(use_with xpm)"
+
+		if use xft; then
+			myconf+=" --with-xft"
+			myconf+=" $(use_with m17n-lib libotf)"
+			myconf+=" $(use_with m17n-lib m17n-flt)"
+		else
+			myconf+=" --without-xft"
+			myconf+=" --without-libotf --without-m17n-flt"
+			use m17n-lib && ewarn \
+				"USE flag \"m17n-lib\" has no effect if \"xft\" is not set."
+		fi
+
+		# GTK+ is the default toolkit if USE=gtk is chosen with other
+		# possibilities. Emacs upstream thinks this should be standard
+		# policy on all distributions
+		local f
+		if use gtk; then
+			einfo "Configuring to build with GIMP Toolkit (GTK+)"
+			myconf+=" --with-x-toolkit=gtk"
+			for f in motif Xaw3d athena; do
+				use ${f} && ewarn \
+					"USE flag \"${f}\" has no effect if \"gtk\" is set."
+			done
+		elif use motif; then
+			einfo "Configuring to build with Motif toolkit"
+			myconf+=" --with-x-toolkit=motif"
+			for f in Xaw3d athena; do
+				use ${f} && ewarn \
+					"USE flag \"${f}\" has no effect if \"motif\" is set."
+			done
+		elif use athena || use Xaw3d; then
+			einfo "Configuring to build with Athena/Lucid toolkit"
+			myconf+=" --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)"
+		else
+			einfo "Configuring to build with no toolkit"
+			myconf+=" --with-x-toolkit=no"
+		fi
+	elif use aqua; then
+		einfo "Configuring to build with Nextstep (Cocoa) support"
+		myconf+=" --with-ns --disable-ns-self-contained"
+		myconf+=" --without-x"
+	else
+		myconf+=" --without-x --without-ns"
+	fi
+
+	# Save version information in the Emacs binary. It will be available
+	# in variable "system-configuration-options".
+	myconf+=" GENTOO_PACKAGE=${CATEGORY}/${PF}"
+
+	# According to configure, this option is only used for GNU/Linux
+	# (x86_64 and s390). For Gentoo Prefix we have to explicitly spell
+	# out the location because $(get_libdir) does not necessarily return
+	# something that matches the host OS's libdir naming (e.g. RHEL).
+	local crtdir=$($(tc-getCC) -print-file-name=crt1.o)
+	crtdir=${crtdir%/*}
+
+	econf \
+		--program-suffix="-${EMACS_SUFFIX}" \
+		--infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
+		--localstatedir="${EPREFIX}"/var \
+		--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
+		--with-crt-dir="${crtdir}" \
+		--with-gameuser=":gamestat" \
+		$(use_with hesiod) \
+		$(use_with kerberos) $(use_with kerberos kerberos5) \
+		$(use_with gpm) \
+		$(use_with dbus) \
+		${myconf}
+}
+
+src_compile() {
+	export SANDBOX_ON=0			# for the unbelievers, see Bug #131505
+	emake CC="$(tc-getCC)" \
+		AR="$(tc-getAR) cq" \
+		RANLIB="$(tc-getRANLIB)"
+}
+
+src_install () {
+	emake DESTDIR="${D}" install
+
+	rm "${ED}"/usr/bin/emacs-${FULL_VERSION}-${EMACS_SUFFIX} \
+		|| die "removing duplicate emacs executable failed"
+	mv "${ED}"/usr/bin/emacs-${EMACS_SUFFIX} "${ED}"/usr/bin/${EMACS_SUFFIX} \
+		|| die "moving emacs executable failed"
+
+	# move man pages to the correct place
+	local m
+	mv "${ED}"/usr/share/man/man1/{emacs,${EMACS_SUFFIX}}.1 \
+		|| die "moving emacs man page failed"
+	for m in b2m ctags ebrowse emacsclient etags grep-changelog rcs-checkin; do
+		mv "${ED}"/usr/share/man/man1/${m}{,-${EMACS_SUFFIX}}.1 \
+			|| die "moving ${m} man page failed"
+	done
+
+	# move info dir to avoid collisions with the dir file generated by portage
+	mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} \
+		|| die "moving info dir failed"
+	touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
+	docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
+
+	# avoid collision between slots, see bug #169033 e.g.
+	rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el
+	rm -rf "${ED}"/usr/share/{applications,icons}
+	rm -rf "${ED}"/var
+
+	# remove unused <version>/site-lisp dir
+	rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp
+
+	# remove COPYING file (except for etc/COPYING used by describe-copying)
+	rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING
+
+	local cdir
+	if use source; then
+		cdir="/usr/share/emacs/${FULL_VERSION}/src"
+		insinto "${cdir}"
+		# This is not meant to install all the source -- just the
+		# C source you might find via find-function
+		doins src/*.{c,h,m}
+		doins -r src/{m,s}
+		rm "${ED}"/usr/share/emacs/${FULL_VERSION}/src/Makefile.c
+		rm "${ED}"/usr/share/emacs/${FULL_VERSION}/src/{m,s}/README
+	elif has installsources ${FEATURES}; then
+		cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src"
+	fi
+
+	sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF
+	X
+	;;; ${PN}-${SLOT} site-lisp configuration
+	X
+	(when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
+	Y  (setq find-function-C-source-directory
+	Y	"${EPREFIX}${cdir}")
+	X  (let ((path (getenv "INFOPATH"))
+	X	(dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}")
+	X	(re "\\\\\`${EPREFIX}/usr/share/info\\\\>"))
+	X    (and path
+	X	 ;; move Emacs Info dir before anything else in /usr/share/info
+	X	 (let* ((p (cons nil (split-string path ":" t))) (q p))
+	X	   (while (and (cdr q) (not (string-match re (cadr q))))
+	X	     (setq q (cdr q)))
+	X	   (setcdr q (cons dir (delete dir (cdr q))))
+	X	   (setq Info-directory-list (prune-directory-list (cdr p)))))))
+	EOF
+	elisp-site-file-install "${T}/${SITEFILE}" || die
+
+	dodoc README BUGS
+
+	if use aqua; then
+		dodir /Applications/Gentoo
+		rm -rf "${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app
+		mv nextstep/Emacs.app \
+			"${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app || die
+	fi
+
+	DOC_CONTENTS="You can set the version to be started by /usr/bin/emacs
+		through the Emacs eselect module, which also redirects man and info
+		pages. Therefore, several Emacs versions can be installed at the
+		same time. \"man emacs.eselect\" for details.
+		\\n\\nIf you upgrade from a previous major version of Emacs, then
+		it is strongly recommended that you use app-admin/emacs-updater
+		to rebuild all byte-compiled elisp files of the installed Emacs
+		packages."
+	use X && DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
+		Installing media-fonts/font-adobe-{75,100}dpi on the X server's
+		machine would satisfy basic Emacs requirements under X11.
+		See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs
+		for how to enable anti-aliased fonts."
+	use aqua && DOC_CONTENTS+="\\n\\nEmacs${EMACS_SUFFIX#emacs}.app is in
+		\"${EPREFIX}/Applications/Gentoo\". You may want to copy or symlink
+		it into /Applications by yourself."
+	readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+	# move Info dir file to correct name
+	local infodir=/usr/share/info/${EMACS_SUFFIX} f
+	if [[ -f ${ED}${infodir}/dir.orig ]]; then
+		mv "${ED}"${infodir}/dir{.orig,} || die "moving info dir failed"
+	elif [[ -d "${ED}"${infodir} ]]; then
+		# this should not happen in EAPI 4
+		ewarn "Regenerating Info directory index in ${infodir} ..."
+		rm -f "${ED}"${infodir}/dir{,.*}
+		for f in "${ED}"${infodir}/*; do
+			if [[ ${f##*/} != *-[0-9]* && -e ${f} ]]; then
+				install-info --info-dir="${ED}"${infodir} "${f}" \
+					|| die "install-info failed"
+			fi
+		done
+	fi
+}
+
+pkg_postinst() {
+	elisp-site-regen
+	readme.gentoo_print_elog
+
+	if use livecd; then
+		# force an update of the emacs symlink for the livecd/dvd,
+		# because some microemacs packages set it with USE=livecd
+		eselect emacs update
+	elif [[ $(readlink "${EROOT}"/usr/bin/emacs) = ${EMACS_SUFFIX} ]]; then
+		# refresh symlinks in case any installed files have changed
+		eselect emacs set ${EMACS_SUFFIX}
+	else
+		eselect emacs update ifunset
+	fi
+}
+
+pkg_postrm() {
+	elisp-site-regen
+	eselect emacs update ifunset
+}
diff --git a/app-editors/nano/nano-2.4.3.ebuild b/app-editors/nano/nano-2.4.3.ebuild
index 58fa18e0fffb..f7a601b1c5eb 100644
--- a/app-editors/nano/nano-2.4.3.ebuild
+++ b/app-editors/nano/nano-2.4.3.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	MY_P=${PN}-${PV/_}
 	SRC_URI="http://www.nano-editor.org/dist/v${PV:0:3}/${MY_P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-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"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-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"
 fi
 
 DESCRIPTION="GNU GPL'd Pico clone with more functionality"
diff --git a/app-editors/retext/Manifest b/app-editors/retext/Manifest
index 9091eb561cd8..c106eb7b2511 100644
--- a/app-editors/retext/Manifest
+++ b/app-editors/retext/Manifest
@@ -3,3 +3,4 @@ DIST ReText-5.0.2.tar.gz 140853 SHA256 7ef898abc8aed70502fd4d69ed7e8ab43cc978fcb
 DIST ReText-5.1.0.tar.gz 151833 SHA256 09b12892a0520bb8b0692f5aec7aa88911d07a5048a3402a9e9d4ac57322b5ca SHA512 3dbfe4992195119513c571291c344338dccf55c52d000cc69da63d0e51e5f2d9c5a0a2fba6570e525c96f1f9243a7465391a59b840a1fb7dd4513a0b4909ca5c WHIRLPOOL 76826184a3e8ac3ea3f5c10c31a3630ad8bc37a1bce0d771fc250f1f53acb9dd2f888aa67adf946368a5baebcdab0306100ea0e632dcd36edd81cdcd1a247838
 DIST ReText-5.2.0.tar.gz 156953 SHA256 463b524435d7b068d90304ae719f96a9c8b957323206549ae5a02ffe5fa82b17 SHA512 9a40fb0e39145ee9bc29945af488e74ea8aa5a78b220f28d1c3de5060daf6f3a6864b4e852165847bb4b5905ca4f0684d56b24864baa05f96468f5d4d0172c6b WHIRLPOOL be4b10f7158de253ac1a104e5053d80afcf5ecc6928ba8a009c8bbdac9166a735cb60d56c268c6f1651f3d7c6c4d9daac46caa4696795e68c1dbf870dc759afd
 DIST ReText-5.2.1.tar.gz 157119 SHA256 02164ae2bba6f47a2ec5e11aa06aefbcd96bea1b84a96c5673dbe18d8ccb2a69 SHA512 1d11f6824b64a082425ac2e8b67da15d4df5352539b66a8297dba0cd4f4236b7328966e97104c3fd7a641067a84023f65ba856f932d8489ff4e80722471835d8 WHIRLPOOL 24e7c756f61c210320b0ab9a67c99f43ccf5739310a01d9ee98d779e8b45b27dbc828b0c573973b2e4d2b8e07f2edd56660de685930a7a2ed8ceb50ab6fb6f91
+DIST ReText-5.3.0.tar.gz 160163 SHA256 9ec0cee93e6731fbf00b86574cb47c3132f62291e762f5e47258a3171bfdd21d SHA512 d6ff8e61b1e13de72c5d1741795fddb3a1ba443b2aa6aba6ca933ae38e09c8dac38085bfd73e0c1773dec9a72df1f08d64ef22d2396694530bade6ff8a485223 WHIRLPOOL 98537b5244a583c04604a6b1626a3813b6506dfefda6d40c85aaae076b30c7e14a0b8a363e431d9bd5ceea41a31f07785663a018bbdae1dc897a29eec22c99c1
diff --git a/app-editors/retext/metadata.xml b/app-editors/retext/metadata.xml
index 75d09adebd5b..1234822a986d 100644
--- a/app-editors/retext/metadata.xml
+++ b/app-editors/retext/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer>
diff --git a/app-editors/retext/retext-5.3.0.ebuild b/app-editors/retext/retext-5.3.0.ebuild
new file mode 100644
index 000000000000..f033298566f5
--- /dev/null
+++ b/app-editors/retext/retext-5.3.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python3_{3,4} )
+
+PLOCALES="ca cs cy da de es et eu fr hu it ja pl pt pt_BR ru sk sr sr@latin uk zh_TW"
+
+inherit distutils-r1 l10n
+
+MY_PN="ReText"
+MY_P="${MY_PN}-${PV/_/~}"
+
+DESCRIPTION="Simple editor for Markdown and reStructuredText"
+HOMEPAGE="https://github.com/retext-project/retext https://github.com/retext-project/retext/wiki"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+spell"
+
+RDEPEND="
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/markdown[${PYTHON_USEDEP}]
+	dev-python/markups[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/PyQt5[gui,network,printsupport,webkit,widgets,${PYTHON_USEDEP}]
+	spell? ( dev-python/pyenchant[${PYTHON_USEDEP}] )
+"
+
+S="${WORKDIR}"/${MY_P}
+
+remove_locale() {
+	find "${ED}" -name "retext_${1}.qm" -delete || die "Failed to remove locale ${1}."
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	l10n_for_each_disabled_locale_do remove_locale
+
+	make_desktop_entry ${PN} "${MY_PN} Editor" ${PN} "Development;Utility;TextEditor"
+}
diff --git a/app-editors/znotes/znotes-0.4.5.ebuild b/app-editors/znotes/znotes-0.4.5.ebuild
index 40ec5b607b75..b0f484b3e419 100644
--- a/app-editors/znotes/znotes-0.4.5.ebuild
+++ b/app-editors/znotes/znotes-0.4.5.ebuild
@@ -3,7 +3,7 @@
 # $Id$
 
 EAPI=4
-inherit qt4-r2
+inherit qmake-utils qt4-r2
 
 DESCRIPTION="Simple Notes"
 HOMEPAGE="http://znotes.sourceforge.net/"
@@ -23,6 +23,6 @@ DOCS="CHANGELOG THANKS"
 PATCHES=( "${FILESDIR}/${P}-gcc-4.7.patch" )
 
 src_configure() {
-	lrelease znotes.pro || die "lrelease failed"
+	"$(qt4_get_bindir)"/lrelease znotes.pro || die "lrelease failed"
 	qt4-r2_src_configure
 }
diff --git a/app-emacs/ebuild-mode/Manifest b/app-emacs/ebuild-mode/Manifest
index 0e0fb2a0ffe6..4c89a0b1f027 100644
--- a/app-emacs/ebuild-mode/Manifest
+++ b/app-emacs/ebuild-mode/Manifest
@@ -1,2 +1,2 @@
-DIST ebuild-mode-1.27.tar.xz 29040 SHA256 06b682c5132f513d1a22ad96beca8bbb7d632aa73b094cc79cd1109c7a5bcfe2 SHA512 7f8608f66bb5fd665059019cccbae4729e1fd3389628428c8c83d0a8694b3de78217da255b5858c91df40925c7c859d1cb1806adf98f97c2441c6e71444713ec WHIRLPOOL 364f35d89c8137f6c6c9c257a99780e69dce93cd077b9e12ef4944c924f042fb3bc1da9fddae08ede385f3faf13e5c22533c5a566ce891ff93d39bae758a7b62
 DIST ebuild-mode-1.28.tar.xz 29028 SHA256 1b255ed1048c4ca3331e0c445759030d27d746d0ef98c0fbd043b4916b9a49a0 SHA512 b44805b81639dfe6e092dc6ab0c469374cb66cb7b63e9decf499859b02f45a9080f7f39cd2d0883f66d219368ce0ad25ce61bac7b5053583847589f1ca590db9 WHIRLPOOL 141e3697dac006a5908194ce5a2d35e07d656fbfe847256cc6c2178a6ebbc08c462ba709980c926cd29e48e274f3abf1a6d8cd81c3a7263051d6fcde3efa9192
+DIST ebuild-mode-1.29.tar.xz 29296 SHA256 d4f095b1e58f7182218caa2d5839c0dec3eeb4f10386d846a36a895bcb979190 SHA512 bf81a5af269db49c2e9907daf7fc5d457ac07a5b9d921aa8084a55fc9065d71d114ea4210fba393b791e2473d5ab8bf37c2af2724f889061537e37e383574344 WHIRLPOOL 7e6167c79c5a22c9eab1ba91244f8ac18343092b459e8f8aa38308cd4003ec510e8be88d79e44c6432737816679b1c48491d1f3095c4f891eae499ee025c5018
diff --git a/app-emacs/ebuild-mode/ebuild-mode-1.27.ebuild b/app-emacs/ebuild-mode/ebuild-mode-1.29.ebuild
index 9f610e7ac89b..ad3832be86ba 100644
--- a/app-emacs/ebuild-mode/ebuild-mode-1.27.ebuild
+++ b/app-emacs/ebuild-mode/ebuild-mode-1.29.ebuild
@@ -2,9 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
-inherit readme.gentoo elisp
+inherit readme.gentoo-r1 elisp
 
 DESCRIPTION="Emacs modes for editing ebuilds and other Gentoo specific files"
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Emacs"
@@ -12,7 +12,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 
 DOCS="ChangeLog keyword-generation.sh"
 ELISP_TEXINFO="${PN}.texi"
diff --git a/app-emulation/qemu/qemu-2.5.0.ebuild b/app-emulation/qemu/qemu-2.5.0.ebuild
index 249a20a6dda7..70f595ea5b5c 100644
--- a/app-emulation/qemu/qemu-2.5.0.ebuild
+++ b/app-emulation/qemu/qemu-2.5.0.ebuild
@@ -343,6 +343,11 @@ qemu_src_configure() {
 		--disable-guest-agent
 		--disable-strip
 		--disable-werror
+		# We support gnutls/nettle for crypto operations.  It is possible
+		# to use gcrypt when gnutls/nettle are disabled (but not when they
+		# are enabled), but it's not really worth the hassle.  Disable it
+		# all the time to avoid automatically detecting it. #568856
+		--disable-gcrypt
 		--python="${PYTHON}"
 		--cc="$(tc-getCC)"
 		--cxx="$(tc-getCXX)"
@@ -372,6 +377,7 @@ qemu_src_configure() {
 		$(conf_softmmu fdt)
 		$(conf_softmmu glusterfs)
 		$(conf_softmmu gnutls)
+		$(conf_softmmu gnutls nettle)
 		$(conf_softmmu gtk)
 		$(conf_softmmu infiniband rdma)
 		$(conf_softmmu iscsi libiscsi)
diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild
index 249a20a6dda7..70f595ea5b5c 100644
--- a/app-emulation/qemu/qemu-9999.ebuild
+++ b/app-emulation/qemu/qemu-9999.ebuild
@@ -343,6 +343,11 @@ qemu_src_configure() {
 		--disable-guest-agent
 		--disable-strip
 		--disable-werror
+		# We support gnutls/nettle for crypto operations.  It is possible
+		# to use gcrypt when gnutls/nettle are disabled (but not when they
+		# are enabled), but it's not really worth the hassle.  Disable it
+		# all the time to avoid automatically detecting it. #568856
+		--disable-gcrypt
 		--python="${PYTHON}"
 		--cc="$(tc-getCC)"
 		--cxx="$(tc-getCXX)"
@@ -372,6 +377,7 @@ qemu_src_configure() {
 		$(conf_softmmu fdt)
 		$(conf_softmmu glusterfs)
 		$(conf_softmmu gnutls)
+		$(conf_softmmu gnutls nettle)
 		$(conf_softmmu gtk)
 		$(conf_softmmu infiniband rdma)
 		$(conf_softmmu iscsi libiscsi)
diff --git a/app-laptop/tp_smapi/tp_smapi-0.41-r1.ebuild b/app-laptop/tp_smapi/tp_smapi-0.41-r1.ebuild
new file mode 100644
index 000000000000..fe6add2bf3e0
--- /dev/null
+++ b/app-laptop/tp_smapi/tp_smapi-0.41-r1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit flag-o-matic linux-mod
+
+DESCRIPTION="IBM ThinkPad SMAPI BIOS driver"
+HOMEPAGE="https://github.com/evgeni/tp_smapi/ http://tpctl.sourceforge.net/"
+SRC_URI="mirror://github/evgeni/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="hdaps"
+
+RESTRICT="userpriv"
+
+# We need dmideode if the kernel does not support DMI_DEV_TYPE_OEM_STRING
+# in dmi.h
+DEPEND="sys-apps/dmidecode"
+RDEPEND="${DEPEND}"
+
+pkg_pretend() {
+	linux-mod_pkg_setup
+
+	if kernel_is lt 2 6 19; then
+		eerror
+		eerror "${P} requires Linux kernel 2.6.19 or above."
+		eerror
+		die "Unsupported kernel version"
+	fi
+
+	MODULE_NAMES="thinkpad_ec(extra:) tp_smapi(extra:)"
+	BUILD_PARAMS="KSRC=${KV_DIR} KBUILD=${KV_OUT_DIR}"
+	BUILD_TARGETS="default"
+
+	if use hdaps; then
+		CONFIG_CHECK="~INPUT_UINPUT"
+		WARNING_INPUT_UINPUT="Your kernel needs uinput for the hdaps module to perform better"
+		linux-info_pkg_setup
+
+		MODULE_NAMES="${MODULE_NAMES} hdaps(extra:)"
+		BUILD_PARAMS="${BUILD_PARAMS} HDAPS=1"
+
+		CONFIG_CHECK="~!SENSORS_HDAPS"
+		ERROR_SENSORS_HDAPS="${P} with USE=hdaps conflicts with in-kernel HDAPS (CONFIG_SENSORS_HDAPS)"
+		linux-info_pkg_setup
+	fi
+}
+
+pkg_setup() {
+	# run again as pkg_pretend is not var safe
+	pkg_pretend
+}
+
+src_compile() {
+	# Kernel Makefiles may pull in -mpreferred-stack-boundary=3
+	# which requires that SSE disabled or compilation will fail.
+	# So we need to ensure that appended user CLAGS do not re-enable SSE
+	# https://bugs.gentoo.org/show_bug.cgi?id=492964
+	replace-flags '-msse*' ''
+
+	linux-mod_src_compile
+}
+
+src_install() {
+	linux-mod_src_install
+	dodoc CHANGES README
+	newinitd "${FILESDIR}"/${PN}-0.40-initd smapi
+	newconfd "${FILESDIR}"/${PN}-0.40-confd smapi
+}
diff --git a/app-misc/pdfpc/Manifest b/app-misc/pdfpc/Manifest
index 6b1955cc153b..39ea66aa68ab 100644
--- a/app-misc/pdfpc/Manifest
+++ b/app-misc/pdfpc/Manifest
@@ -1,3 +1,2 @@
 DIST pdfpc-3.1.1.tgz 199004 SHA256 ec5ffb9c2b55d1bac76172a6a13ed527ceed8cf0d659aca5e302f6a7185f00f2 SHA512 554203094b18fe11fd085414961de6644df3c258ad52d46ad171cfd6c2199028bcbaa9560bdaba63d83f858b467407cc276972b34f341cc25260db1d1358e88d WHIRLPOOL bddcba6a4285ea2b58dd01f76b7b050db630eaa97de5bba32a66f7f85563e6a99763a52e82286297f605dfa59d9ff918007baab297e587968ac1c83e3d69e8a8
 DIST pdfpc-4.0.1.tar.gz 74405 SHA256 7c40cb87f9f1ce5e1683e96cc815572ea4c0a30e9db691501401ad271d27a3fb SHA512 701cf57b13b3abb2bacf086a29464a24d9eb67b095a89e770fade12f512d78773899bc9c71bc888e85b0a0acf2a122dd819b0259a1ab850a4f7af5fbc7369cdb WHIRLPOOL 0e1054b2aedce013c7f4397b05c66f658e6de88fe4fe6e857e8bd6bf33b5b68f3acda8fd327cffb9b2db7d1726543cdb5afdd342be1b8286a55799f5c5be9688
-DIST pdfpc-v4.0.0.tar.gz 71039 SHA256 c091c554f4e3ed8735df40055253459c47b09590775a6f9b5b6abf1b42647a62 SHA512 2c822dee9c47be4858a9a20c729864120335b506d1271d032635653e394db3934bf0a1c261d6bcfeb416918e5c20553de688106fa2ad40834f91f75bf11a231d WHIRLPOOL f52f05bb9073505fc798c6182fb73e1b94fc007304105b1d038a5d6fcb791616e6afc2a42e02ef76bd0fc1a1cdd446cd8866ea4d08bba7a655428ffbe7266a3a
diff --git a/app-misc/pdfpc/pdfpc-4.0.0-r1.ebuild b/app-misc/pdfpc/pdfpc-4.0.0-r1.ebuild
deleted file mode 100644
index d88d3c24423d..000000000000
--- a/app-misc/pdfpc/pdfpc-4.0.0-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-VALA_MIN_API_VERSION="0.26"
-VALA_MAX_API_VERSION="0.28" # fix sed line if you increase this
-
-inherit vala cmake-utils
-
-DESCRIPTION="Presenter console with multi-monitor support for PDF files"
-HOMEPAGE="http://pdfpc.github.io"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${PN}-v${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="app-text/poppler:=[cairo]
-	dev-libs/glib:2
-	dev-libs/libgee:0.8
-	gnome-base/librsvg
-	media-libs/gstreamer:1.0
-	media-libs/gst-plugins-base:1.0
-	x11-libs/gtk+:3"
-DEPEND="${RDEPEND}
-	$(vala_depend)"
-
-S=${WORKDIR}/${PN}-v${PV}
-
-src_prepare() {
-	sed -i -e "s/valac-0.20/valac-0.28 valac-0.26/" cmake/Vala_CMake/vala/FindVala.cmake || die
-	vala_src_prepare
-}
-
-src_configure(){
-	local mycmakeargs=(
-		-DSYSCONFDIR="${EPREFIX}/etc"
-	)
-	cmake-utils_src_configure
-}
diff --git a/app-misc/zygrib/zygrib-7.0.0.ebuild b/app-misc/zygrib/zygrib-7.0.0.ebuild
index 2b94c343a0a7..ff457a5c77d2 100644
--- a/app-misc/zygrib/zygrib-7.0.0.ebuild
+++ b/app-misc/zygrib/zygrib-7.0.0.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-inherit eutils qt4-r2
+inherit eutils qmake-utils qt4-r2
 
 MY_PN="zyGrib"
 
@@ -37,7 +37,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 src_prepare() {
 	sed -i 's,INSTALLDIR=$(HOME)/zyGrib,INSTALLDIR=$(DESTDIR)/opt/zyGrib,' Makefile
-	sed -i 's,QMAKE=/usr/bin/qmake-qt4,QMAKE=/usr/bin/qmake,' Makefile
+	sed -i "s,QMAKE=/usr/bin/qmake-qt4,QMAKE=$(qt4_get_bindir)/qmake," Makefile
 }
 
 src_install() {
diff --git a/app-pda/libopensync-plugin-file/Manifest b/app-pda/libopensync-plugin-file/Manifest
deleted file mode 100644
index c71e7d470e46..000000000000
--- a/app-pda/libopensync-plugin-file/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST libopensync-plugin-file-0.22.tar.bz2 216890 SHA256 52231306a388f7ad49b273e0a90e3320811cfcad6c222669d05fe92e4c157825 SHA512 c8df060db87eb7eeb8e6dff6dc486eb4edd348bc22ec73e7d38930d9a1aef4f40e3d29f4d010ee7671fb1e59615512d92b9a3f3e49b714187c932d196460442e WHIRLPOOL 4af0243f88ef0cf2e84e46385375ee2b951470e783e4f0de2d8c36e1fc6f7b05f7f2b0a4e8032c1cf26e1cf4794b9751564b32295e0f778d5573477d2d1877b3
-DIST libopensync-plugin-file-0.36.tar.bz2 32942 SHA256 932726d69b398686b9d6a1e2afd53c537c03ae8a476df1b8b00ba1f8b4abbf44 SHA512 baa28eb811e916f77fd3c14748c0728e779815ad52755440220836b81fd20602c81c433071554f6e06bc9f3e114c32b354cbd8f68688d05025f39cde84c41e1c WHIRLPOOL 3acf4d367268b7bbbad6d028f23b3bf6f8668b21dc7ae14bda6b2b07349eea01b610a27ac3cc5c8a40d20d5ca6d331f1374381a931d74c21c2d15ba135c28046
-DIST libopensync-plugin-file-0.39.tar.bz2 53152 SHA256 26930abb2460b1b111f0acf3b16578613250f4ddd12e942a58163b252b96d1ab SHA512 b85061067c7157124f48be24965464e2aacabb12d1e9253077c01f466c74d3c0ec252f4ca905196f395f90ba5ca5474c6b60eb653e7905b6b5ec3aa45071c064 WHIRLPOOL 3c0107d8f6259aa750e08137a3d08c3e7198f5dc76a91f6c9909c1be55289fadd3adb3bea6be11a1857283cf04dd45925e2fb9e05286021cc09e268b8ba22f0e
diff --git a/app-pda/libopensync-plugin-file/libopensync-plugin-file-0.22.ebuild b/app-pda/libopensync-plugin-file/libopensync-plugin-file-0.22.ebuild
deleted file mode 100644
index 7bbe39860eaa..000000000000
--- a/app-pda/libopensync-plugin-file/libopensync-plugin-file-0.22.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="3"
-
-DESCRIPTION="OpenSync File Plugin"
-HOMEPAGE="http://www.opensync.org/"
-SRC_URI="http://www.opensync.org/download/releases/${PV}/${P}.tar.bz2"
-
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-LICENSE="LGPL-2.1"
-IUSE=""
-
-RDEPEND="~app-pda/libopensync-${PV}
-	dev-libs/glib:2
-	dev-libs/libxml2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	find "${D}" -name '*.la' -exec rm -f {} + || die
-}
diff --git a/app-pda/libopensync-plugin-file/libopensync-plugin-file-0.36.ebuild b/app-pda/libopensync-plugin-file/libopensync-plugin-file-0.36.ebuild
deleted file mode 100644
index 40a72b874f6d..000000000000
--- a/app-pda/libopensync-plugin-file/libopensync-plugin-file-0.36.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="3"
-
-inherit cmake-utils
-
-DESCRIPTION="OpenSync File Plugin"
-HOMEPAGE="http://www.opensync.org/"
-SRC_URI="http://www.opensync.org/download/releases/${PV}/${P}.tar.bz2"
-
-KEYWORDS="~amd64 ~ppc ~x86"
-SLOT="0"
-LICENSE="LGPL-2.1"
-IUSE=""
-
-RDEPEND="~app-pda/libopensync-${PV}
-	dev-libs/glib:2
-	dev-libs/libxml2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_install() {
-	cmake-utils_src_install
-	find "${D}" -name '*.la' -exec rm -f {} + || die
-}
diff --git a/app-pda/libopensync-plugin-file/libopensync-plugin-file-0.39.ebuild b/app-pda/libopensync-plugin-file/libopensync-plugin-file-0.39.ebuild
deleted file mode 100644
index 40a72b874f6d..000000000000
--- a/app-pda/libopensync-plugin-file/libopensync-plugin-file-0.39.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="3"
-
-inherit cmake-utils
-
-DESCRIPTION="OpenSync File Plugin"
-HOMEPAGE="http://www.opensync.org/"
-SRC_URI="http://www.opensync.org/download/releases/${PV}/${P}.tar.bz2"
-
-KEYWORDS="~amd64 ~ppc ~x86"
-SLOT="0"
-LICENSE="LGPL-2.1"
-IUSE=""
-
-RDEPEND="~app-pda/libopensync-${PV}
-	dev-libs/glib:2
-	dev-libs/libxml2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_install() {
-	cmake-utils_src_install
-	find "${D}" -name '*.la' -exec rm -f {} + || die
-}
diff --git a/app-pda/libopensync-plugin-file/libopensync-plugin-file-9999.ebuild b/app-pda/libopensync-plugin-file/libopensync-plugin-file-9999.ebuild
deleted file mode 100644
index 0630122a291a..000000000000
--- a/app-pda/libopensync-plugin-file/libopensync-plugin-file-9999.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="3"
-
-inherit cmake-utils subversion
-
-DESCRIPTION="OpenSync File Plugin"
-HOMEPAGE="http://www.opensync.org/"
-SRC_URI=""
-
-ESVN_REPO_URI="http://svn.opensync.org/plugins/file-sync"
-
-KEYWORDS="~amd64 ~ppc ~x86"
-SLOT="0"
-LICENSE="LGPL-2.1"
-IUSE=""
-
-RDEPEND="~app-pda/libopensync-${PV}
-	dev-libs/glib:2
-	dev-libs/libxml2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_install() {
-	cmake-utils_src_install
-	find "${D}" -name '*.la' -exec rm -f {} + || die
-}
diff --git a/app-pda/libopensync-plugin-file/metadata.xml b/app-pda/libopensync-plugin-file/metadata.xml
deleted file mode 100644
index 0c317e5ffa3d..000000000000
--- a/app-pda/libopensync-plugin-file/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<herd>pda</herd>
-	<maintainer>
-		<email>rhill@gentoo.org</email>
-		<name>Ryan Hill</name>
-	</maintainer>
-</pkgmetadata>
-
diff --git a/app-pda/libopensync-plugin-gnokii/Manifest b/app-pda/libopensync-plugin-gnokii/Manifest
deleted file mode 100644
index f9edabcb0f86..000000000000
--- a/app-pda/libopensync-plugin-gnokii/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST libopensync-plugin-gnokii-0.22.tar.bz2 226990 SHA256 eb4902b4b7f9923f7644d350dd6cd84b562ebde8ca201e6284a29cff90c838a1 SHA512 a6ef418087d3803ebd4a6e68c8d2b6840667985d9cf8d8020efb98f675a519c3e1923329843de4d6fa72c7b35e23e7fef496e9067f941e24f12c30cd8d022059 WHIRLPOOL f26b8991b23d058f8e8589a93e111fdd81514fd755a0d43ff8c3201616c3f0d86b246a2f1bcc150fccbd5f1bcc2e925390b2ecdbe188b26293e89f8703f62b2a
-DIST libopensync-plugin-gnokii-0.36.tar.bz2 43782 SHA256 8674cc4a5df4a57d5d66756afc8492ac13ff335108ac225ee8164215a6feeb0b SHA512 527c5743cca879d3a9a34bfa16e10bf0d05e45dc0cc53b19a5e343ccf5f1985c38ee88f126da5c864dfc4f1c3ccee1d36c0d5d135907add7ad3d493373f28547 WHIRLPOOL a88e72fb7724af11f2bd32e57905da9438e0825d1f1c281667a012320f01919f6a5d9396fd188fa6db08e8963c3da69799f0b1b38a0b47ae88cdebfca1dfb566
diff --git a/app-pda/libopensync-plugin-gnokii/libopensync-plugin-gnokii-0.22.ebuild b/app-pda/libopensync-plugin-gnokii/libopensync-plugin-gnokii-0.22.ebuild
deleted file mode 100644
index dac0db2bad41..000000000000
--- a/app-pda/libopensync-plugin-gnokii/libopensync-plugin-gnokii-0.22.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit flag-o-matic
-
-DESCRIPTION="OpenSync Gnokii Plugin"
-HOMEPAGE="http://www.opensync.org/"
-SRC_URI="http://dev.gentooexperimental.org/~peper/distfiles/${P}.tar.bz2"
-
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE=""
-
-DEPEND="=app-pda/libopensync-${PV}*
-	>=app-mobilephone/gnokii-0.6.14"
-RDEPEND="${DEPEND}"
-
-src_compile() {
-	append-flags -Wno-error
-	econf || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog README
-}
diff --git a/app-pda/libopensync-plugin-gnokii/libopensync-plugin-gnokii-0.36.ebuild b/app-pda/libopensync-plugin-gnokii/libopensync-plugin-gnokii-0.36.ebuild
deleted file mode 100644
index 7b4421097eb0..000000000000
--- a/app-pda/libopensync-plugin-gnokii/libopensync-plugin-gnokii-0.36.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="2"
-
-inherit cmake-utils
-
-DESCRIPTION="OpenSync Gnokii Plugin"
-HOMEPAGE="http://www.opensync.org/"
-SRC_URI="http://www.opensync.org/download/releases/${PV}/${P}.tar.bz2"
-
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE=""
-
-DEPEND="=app-pda/libopensync-${PV}*
-	>=app-mobilephone/gnokii-0.6.14"
-RDEPEND="${DEPEND}"
diff --git a/app-pda/libopensync-plugin-gnokii/libopensync-plugin-gnokii-9999.ebuild b/app-pda/libopensync-plugin-gnokii/libopensync-plugin-gnokii-9999.ebuild
deleted file mode 100644
index 271f281d0e90..000000000000
--- a/app-pda/libopensync-plugin-gnokii/libopensync-plugin-gnokii-9999.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="2"
-
-inherit cmake-utils subversion
-
-DESCRIPTION="OpenSync Gnokii Plugin"
-HOMEPAGE="http://www.opensync.org/"
-SRC_URI=""
-
-ESVN_REPO_URI="http://svn.opensync.org/plugins/gnokii-sync"
-
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE=""
-
-DEPEND="=app-pda/libopensync-${PV}*
-	>=app-mobilephone/gnokii-0.6.14"
-RDEPEND="${DEPEND}"
diff --git a/app-pda/libopensync-plugin-gnokii/metadata.xml b/app-pda/libopensync-plugin-gnokii/metadata.xml
deleted file mode 100644
index 228404d3a4b2..000000000000
--- a/app-pda/libopensync-plugin-gnokii/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>pda</herd>
-</pkgmetadata>
diff --git a/app-pda/libopensync-plugin-gpe/Manifest b/app-pda/libopensync-plugin-gpe/Manifest
deleted file mode 100644
index 2331400d311d..000000000000
--- a/app-pda/libopensync-plugin-gpe/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST libopensync-plugin-gpe-0.22.tar.bz2 221836 SHA256 2f291a694bee5a502845b1b5ab465acdd524f4c288fcb4b4851982532a4ff56b SHA512 c1f8c94314898014fac174a11b965e9118ee86e2b168463ec52f10b39c4fa8baee365827505d7bd9d843c3049b34e41319329ab1d90ea7180ef5e75ebf312687 WHIRLPOOL 5ca25b1b3fe6882ef47cdfeed1dd7686f397814445f07eaac864cbd77982b278927d0f2d77f15ac5f5c13da0a0a3c6292e352f9b5b54eca8a28a47efa9bbc6b8
-DIST libopensync-plugin-gpe-0.36.tar.bz2 40935 SHA256 b919b1536ca0229881122ac63d98d02a8c8f038f8dbcad4fe173c466cca2cb05 SHA512 65bad63f66a35f8b9005e593ada82f82f59ed6d835e8eed9d249e812ad70efaac78f3c0f897293395f0612e82c54870d8df42cd8f0e267c860d063a3b1e0179b WHIRLPOOL 57a59bc3d94b123b3f4645de1c282f8b8b8771dc06bc6397e079c9209dd59cac0a2639accbfeee5a15d2e80fde676e7976f23457f8b4def330dc12e4a5df3e30
diff --git a/app-pda/libopensync-plugin-gpe/libopensync-plugin-gpe-0.22.ebuild b/app-pda/libopensync-plugin-gpe/libopensync-plugin-gpe-0.22.ebuild
deleted file mode 100644
index 7696e7edd1c3..000000000000
--- a/app-pda/libopensync-plugin-gpe/libopensync-plugin-gpe-0.22.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-DESCRIPTION="OpenSync Gpe Plugin"
-HOMEPAGE="http://www.opensync.org/"
-SRC_URI="http://dev.gentooexperimental.org/~peper/distfiles/${P}.tar.bz2"
-
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE=""
-
-DEPEND="=app-pda/libopensync-${PV}*"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog README
-}
diff --git a/app-pda/libopensync-plugin-gpe/libopensync-plugin-gpe-0.36.ebuild b/app-pda/libopensync-plugin-gpe/libopensync-plugin-gpe-0.36.ebuild
deleted file mode 100644
index 9d6812c61e35..000000000000
--- a/app-pda/libopensync-plugin-gpe/libopensync-plugin-gpe-0.36.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="2"
-
-inherit cmake-utils
-
-DESCRIPTION="OpenSync Gpe Plugin"
-HOMEPAGE="http://www.opensync.org/"
-SRC_URI="http://www.opensync.org/download/releases/${PV}/${P}.tar.bz2"
-
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE=""
-
-DEPEND="=app-pda/libopensync-${PV}*"
-RDEPEND="${DEPEND}"
diff --git a/app-pda/libopensync-plugin-gpe/libopensync-plugin-gpe-9999.ebuild b/app-pda/libopensync-plugin-gpe/libopensync-plugin-gpe-9999.ebuild
deleted file mode 100644
index ab00aeec2c62..000000000000
--- a/app-pda/libopensync-plugin-gpe/libopensync-plugin-gpe-9999.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="2"
-
-inherit cmake-utils subversion
-
-DESCRIPTION="OpenSync Gpe Plugin"
-HOMEPAGE="http://www.opensync.org/"
-SRC_URI=""
-
-ESVN_REPO_URI="http://svn.opensync.org/plugins/gpe"
-
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE=""
-
-DEPEND="=app-pda/libopensync-${PV}*"
-RDEPEND="${DEPEND}"
diff --git a/app-pda/libopensync-plugin-gpe/metadata.xml b/app-pda/libopensync-plugin-gpe/metadata.xml
deleted file mode 100644
index 228404d3a4b2..000000000000
--- a/app-pda/libopensync-plugin-gpe/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>pda</herd>
-</pkgmetadata>
diff --git a/app-pda/libopensync-plugin-irmc/Manifest b/app-pda/libopensync-plugin-irmc/Manifest
deleted file mode 100644
index 39076716f368..000000000000
--- a/app-pda/libopensync-plugin-irmc/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST libopensync-plugin-irmc-0.22.tar.bz2 244648 SHA256 4bed935f596bd5ae11f6263a97e3cd25029a911f7e476e9b8f11b8036d89a0f6 SHA512 6ca23c98e1867682dc1d5e80c510ed6664bd362b72b36ff8706338f1d198c55541a034f01794c1138152a1b84886518e52e5648541863e62d879a0488ea9b722 WHIRLPOOL 0e654d60888f2c8d7fe304283fc8a4af6e08c3fa42287d64c12fec6344fdfff2f74ef541bca2d1bc548337cd9063330bb57120b8ac027453cb7a1fa096058e28
diff --git a/app-pda/libopensync-plugin-irmc/libopensync-plugin-irmc-0.22.ebuild b/app-pda/libopensync-plugin-irmc/libopensync-plugin-irmc-0.22.ebuild
deleted file mode 100644
index 1efd36293791..000000000000
--- a/app-pda/libopensync-plugin-irmc/libopensync-plugin-irmc-0.22.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-DESCRIPTION="OpenSync IrMC plugin"
-HOMEPAGE="http://www.opensync.org/"
-SRC_URI="http://www.opensync.org/download/releases/${PV}/${P}.tar.bz2"
-
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE="+bluetooth irda"
-
-REQUIRED_USE="|| ( bluetooth irda )"
-
-RDEPEND="~app-pda/libopensync-${PV}
-	dev-libs/glib:2
-	dev-libs/libxml2
-	>=dev-libs/openobex-1.0[bluetooth?,irda?]
-	bluetooth? ( net-wireless/bluez )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_configure() {
-	econf \
-		$(use_enable bluetooth) \
-		$(use_enable irda)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	find "${D}" -name '*.la' -exec rm -f {} + || die
-	dodoc AUTHORS README
-}
diff --git a/app-pda/libopensync-plugin-irmc/libopensync-plugin-irmc-9999.ebuild b/app-pda/libopensync-plugin-irmc/libopensync-plugin-irmc-9999.ebuild
deleted file mode 100644
index 6522e5844e3b..000000000000
--- a/app-pda/libopensync-plugin-irmc/libopensync-plugin-irmc-9999.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit eutils cmake-utils subversion
-
-DESCRIPTION="OpenSync IrMC plugin"
-HOMEPAGE="http://www.opensync.org/"
-SRC_URI=""
-
-ESVN_REPO_URI="http://svn.opensync.org/plugins/irmc-sync"
-
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE="bluetooth irda"
-
-REQUIRED_USE="|| ( bluetooth irda )"
-
-RDEPEND="~app-pda/libopensync-${PV}
-	dev-libs/glib:2
-	dev-libs/libxml2
-	>=dev-libs/openobex-1.0[bluetooth?,irda?]
-	bluetooth? ( net-wireless/bluez )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_compile() {
-	local mycmakeargs="
-		$(cmake-utils_use_enable bluetooth BLUETOOTH)
-		$(cmake-utils_use_enable irda IRDA)"
-
-	cmake-utils_src_compile
-}
diff --git a/app-pda/libopensync-plugin-irmc/metadata.xml b/app-pda/libopensync-plugin-irmc/metadata.xml
deleted file mode 100644
index 8b8c775aede9..000000000000
--- a/app-pda/libopensync-plugin-irmc/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>pda</herd>
-<maintainer>
-  <email>rhill@gentoo.org</email>
-  <name>Ryan Hill</name>
-</maintainer>
-<use>
-  <flag name='irda'>Enable infrared support</flag>
-</use>
-</pkgmetadata>
diff --git a/app-pda/libopensync-plugin-moto/Manifest b/app-pda/libopensync-plugin-moto/Manifest
deleted file mode 100644
index 4431c7cad680..000000000000
--- a/app-pda/libopensync-plugin-moto/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST libopensync-plugin-moto-0.22.tar.bz2 25846 SHA256 5081f7626fcc562a4478b83e30ec20bb2413e1c10866629dc85d7e6d9f25a0a5 SHA512 764cc6bb286e9d038949c5aa9064f0c3d7d85afbffe2767ee2f98fbb1ccbbb06375c065cd0df3a7dce8f6b333a4511ca3060773d6eae7eb470ea8c6018335eb1 WHIRLPOOL f6350a9639a825c68ad58a608cdb51982efb6673301d43f72a4dfb17a14360cece26edc3aa3b8476cc6c659aa0260594cddb3f6fb73b2adda993bf50f4b63c40
diff --git a/app-pda/libopensync-plugin-moto/libopensync-plugin-moto-0.22.ebuild b/app-pda/libopensync-plugin-moto/libopensync-plugin-moto-0.22.ebuild
deleted file mode 100644
index 23076d703143..000000000000
--- a/app-pda/libopensync-plugin-moto/libopensync-plugin-moto-0.22.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=3
-
-PYTHON_DEPEND="2:2.6"
-
-inherit multilib python
-
-DESCRIPTION="Motorola plug-in for OpenSync"
-HOMEPAGE="http://www.opensync.org/"
-SRC_URI="http://www.opensync.org/download/releases/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="bluetooth"
-
-RDEPEND="~app-pda/libopensync-${PV}
-	~app-pda/libopensync-plugin-python-${PV}
-	dev-python/python-dateutil
-	bluetooth? ( dev-python/pybluez )"
-DEPEND=""
-
-src_install() {
-	# This is correct per README and OPENSYNC_PYTHONPLG_DIR variable in
-	# configure.in at libopensync-plugin-python-0.22 package.
-	insinto /usr/$(get_libdir)/opensync/python-plugins
-	doins motosync.py || die
-	exeinto /usr/share/opensync/defaults
-	doexe moto-sync || die
-	dodoc AUTHORS README
-}
diff --git a/app-pda/libopensync-plugin-moto/metadata.xml b/app-pda/libopensync-plugin-moto/metadata.xml
deleted file mode 100644
index 228404d3a4b2..000000000000
--- a/app-pda/libopensync-plugin-moto/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>pda</herd>
-</pkgmetadata>
diff --git a/app-pda/libopensync-plugin-palm/Manifest b/app-pda/libopensync-plugin-palm/Manifest
deleted file mode 100644
index 0384fcb238fd..000000000000
--- a/app-pda/libopensync-plugin-palm/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST libopensync-plugin-palm-0.22.tar.bz2 232123 SHA256 a96c25ce7a68a1e6455a6f05fec20e8db77dab319de7e330145b3cfef8e0ce0d SHA512 fbcfc7fbc68bb1798dd02e38f4d1abe3d2c0f6d2b3a141d83d829454d43c45cdaf4d400b1226d7a8ed39d1304c68332eb9d0c77be635974c3d7f11207b952dd0 WHIRLPOOL 1850e4724a2b95916dc3afa983b865dc01d6a90b5a21e14772ead9f8bc22ae95bc5ca53f4eb83a1737b10b23f3fa7076c2b4737f709ecb435110f6c026d51342
diff --git a/app-pda/libopensync-plugin-palm/files/libopensync-plugin-palm-include_pisock.patch b/app-pda/libopensync-plugin-palm/files/libopensync-plugin-palm-include_pisock.patch
deleted file mode 100644
index 8182e6735bec..000000000000
--- a/app-pda/libopensync-plugin-palm/files/libopensync-plugin-palm-include_pisock.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- acinclude.m4.org	2006-10-25 17:52:48.000000000 +0200
-+++ acinclude.m4	2006-10-25 17:53:15.000000000 +0200
-@@ -16,7 +16,7 @@
-       PILOT_CFLAGS="-I$with_pilot_link/include"
-       PILOT_LIBS="-L$with_pilot_link/lib -Wl,-R$with_pilot_link/lib -lpisock"
-     else
--      PILOT_CFLAGS=""
-+      PILOT_CFLAGS="-I/usr/include/libpisock"
-       PILOT_LIBS="-lpisock"
-     fi
- 
diff --git a/app-pda/libopensync-plugin-palm/libopensync-plugin-palm-0.22.ebuild b/app-pda/libopensync-plugin-palm/libopensync-plugin-palm-0.22.ebuild
deleted file mode 100644
index 8d06aa848070..000000000000
--- a/app-pda/libopensync-plugin-palm/libopensync-plugin-palm-0.22.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="3"
-
-inherit autotools eutils
-
-DESCRIPTION="OpenSync Palm Plugin"
-HOMEPAGE="http://www.opensync.org/"
-SRC_URI="http://www.opensync.org/download/releases/${PV}/${P}.tar.bz2"
-
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-LICENSE="LGPL-2.1"
-IUSE=""
-
-RDEPEND="~app-pda/libopensync-${PV}
-	>=app-pda/pilot-link-0.11.8
-	dev-libs/glib:2
-	dev-libs/libxml2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	# Patch fixing includedir for pisock
-	epatch "${FILESDIR}/${PN}-include_pisock.patch"
-	sed -i -e 's: -Werror::g' src/Makefile.am
-	eautoreconf
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	find "${D}" -name '*.la' -exec rm -f {} + || die
-	dodoc AUTHORS README
-}
diff --git a/app-pda/libopensync-plugin-palm/libopensync-plugin-palm-9999.ebuild b/app-pda/libopensync-plugin-palm/libopensync-plugin-palm-9999.ebuild
deleted file mode 100644
index 4beb4ee98d5a..000000000000
--- a/app-pda/libopensync-plugin-palm/libopensync-plugin-palm-9999.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="3"
-
-inherit cmake-utils subversion
-
-DESCRIPTION="OpenSync Palm Plugin"
-HOMEPAGE="http://www.opensync.org/"
-SRC_URI=""
-
-ESVN_REPO_URI="http://svn.opensync.org/plugins/palm"
-
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-LICENSE="LGPL-2.1"
-IUSE=""
-
-RDEPEND="~app-pda/libopensync-${PV}
-	>=app-pda/pilot-link-0.11.8
-	dev-libs/glib:2
-	dev-libs/libxml2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS="README"
diff --git a/app-pda/libopensync-plugin-palm/metadata.xml b/app-pda/libopensync-plugin-palm/metadata.xml
deleted file mode 100644
index 0c317e5ffa3d..000000000000
--- a/app-pda/libopensync-plugin-palm/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<herd>pda</herd>
-	<maintainer>
-		<email>rhill@gentoo.org</email>
-		<name>Ryan Hill</name>
-	</maintainer>
-</pkgmetadata>
-
diff --git a/app-pda/libopensync-plugin-python/Manifest b/app-pda/libopensync-plugin-python/Manifest
deleted file mode 100644
index 3648f1d13c01..000000000000
--- a/app-pda/libopensync-plugin-python/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST libopensync-plugin-python-0.22.tar.bz2 215702 SHA256 49815fb498679cb0cb3713874da9ee60012753b25ff1dafc60cfca7cc38f3766 SHA512 ae52dace9ea82084d170f242ab7f1d1cc565a09eda45c71abc7a9e7fc726b963adbd121c731c22a105485162e9a9a924189f4669c6d13bf0156b42be0db211e7 WHIRLPOOL 400bd859bc58a8558a06197cd8dc63d56c6a038b81bccc2cffe7ae9a983447920986b8d0eae237a56d96e54fea5f0e88453fe90b44366d82d77230a43fe98b92
diff --git a/app-pda/libopensync-plugin-python/libopensync-plugin-python-0.22.ebuild b/app-pda/libopensync-plugin-python/libopensync-plugin-python-0.22.ebuild
deleted file mode 100644
index ca2191e5ed29..000000000000
--- a/app-pda/libopensync-plugin-python/libopensync-plugin-python-0.22.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="3"
-PYTHON_DEPEND="2:2.5"
-
-inherit python
-
-DESCRIPTION="OpenSync Python Module"
-HOMEPAGE="http://www.opensync.org/"
-SRC_URI="http://www.opensync.org/download/releases/${PV}/${P}.tar.bz2"
-
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-LICENSE="LGPL-2.1"
-IUSE=""
-
-RDEPEND="~app-pda/libopensync-${PV}
-	dev-libs/glib:2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-pkg_setup() {
-	python_set_active_version 2
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	find "${D}" -name '*.la' -exec rm -f {} + || die
-}
diff --git a/app-pda/libopensync-plugin-python/libopensync-plugin-python-9999.ebuild b/app-pda/libopensync-plugin-python/libopensync-plugin-python-9999.ebuild
deleted file mode 100644
index 7103e2e85209..000000000000
--- a/app-pda/libopensync-plugin-python/libopensync-plugin-python-9999.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="3"
-PYTHON_DEPEND="2:2.5"
-
-inherit cmake-utils python subversion
-
-DESCRIPTION="OpenSync Python Module"
-HOMEPAGE="http://www.opensync.org/"
-SRC_URI=""
-
-ESVN_REPO_URI="http://svn.opensync.org/plugins/python-module"
-
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-LICENSE="LGPL-2.1"
-IUSE=""
-
-RDEPEND="~app-pda/libopensync-${PV}
-	dev-libs/glib:2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-pkg_setup() {
-	python_set_active_version 2
-}
-
-src_prepare() {
-	# hardcoded python versions, use the module shipped with cmake (bug #276220)
-	rm "${S}"/cmake/modules/FindPythonLibs.cmake || die
-}
diff --git a/app-pda/libopensync-plugin-python/metadata.xml b/app-pda/libopensync-plugin-python/metadata.xml
deleted file mode 100644
index 228404d3a4b2..000000000000
--- a/app-pda/libopensync-plugin-python/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>pda</herd>
-</pkgmetadata>
diff --git a/app-pda/libopensync-plugin-sunbird/Manifest b/app-pda/libopensync-plugin-sunbird/Manifest
deleted file mode 100644
index b98bc7db75bc..000000000000
--- a/app-pda/libopensync-plugin-sunbird/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST libopensync-plugin-sunbird-0.22.tar.bz2 252354 SHA256 84beabde5440d4cd397f86f4092d9dd57d5a0a278623468a4a86004a1a920414 SHA512 95b4ed2fb438205ac3ecf7b5ffc2072b5dba42ea3a6ef63e08a43f18fe6a72e0fcd20c4be9d328b2999c9ee6cf0271cba8f52ad1ee4037a1563dda7d5d0cadec WHIRLPOOL 6feb80ec634bfb850fa653b6e178a7ac3320c6875a1d6a620af3abed77a201022f2f54bcabbcfad2b4fa50d8368301f8c0b82033fb4c4e7ac67869d93fab5505
diff --git a/app-pda/libopensync-plugin-sunbird/libopensync-plugin-sunbird-0.22.ebuild b/app-pda/libopensync-plugin-sunbird/libopensync-plugin-sunbird-0.22.ebuild
deleted file mode 100644
index f6d646867f74..000000000000
--- a/app-pda/libopensync-plugin-sunbird/libopensync-plugin-sunbird-0.22.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="3"
-
-DESCRIPTION="OpenSync Sunbird Plugin"
-HOMEPAGE="http://www.opensync.org/"
-SRC_URI="http://www.opensync.org/download/releases/${PV}/${P}.tar.bz2"
-
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-LICENSE="LGPL-2.1"
-IUSE=""
-
-RDEPEND="~app-pda/libopensync-${PV}
-	dev-libs/glib:2
-	dev-libs/libxml2
-	net-libs/neon"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	sed -i -e 's: -Werror::g' src/Makefile.in
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	find "${D}" -name '*.la' -exec rm -f {} + || die
-	dodoc AUTHORS README
-}
diff --git a/app-pda/libopensync-plugin-sunbird/metadata.xml b/app-pda/libopensync-plugin-sunbird/metadata.xml
deleted file mode 100644
index 0c317e5ffa3d..000000000000
--- a/app-pda/libopensync-plugin-sunbird/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<herd>pda</herd>
-	<maintainer>
-		<email>rhill@gentoo.org</email>
-		<name>Ryan Hill</name>
-	</maintainer>
-</pkgmetadata>
-
diff --git a/app-pda/libopensync-plugin-synce-rra/Manifest b/app-pda/libopensync-plugin-synce-rra/Manifest
deleted file mode 100644
index c897df8af552..000000000000
--- a/app-pda/libopensync-plugin-synce-rra/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST libopensync-plugin-synce-rra-0.22.2.tar.gz 325388 SHA256 88bd7950960774bb1c626fc46b87bd11754f641475f3318328de3edf3f18b192 SHA512 5f5618e1742a48ab0de48585609997a2014ba586ebbac62f48df1e3724028c1359776953dbd3e29703d241a5c1dc44044d567f79481a041a014a00fbbc2ac51e WHIRLPOOL 07321e3785a8593078d52f3d0da2824cfa8cceaa60c708adc5cd9b936a416a9e8b29c50988877dc8f94ad12048a291a54a14e37ebe45e80ae6ae9ec9d9813028
diff --git a/app-pda/libopensync-plugin-synce-rra/libopensync-plugin-synce-rra-0.22.2.ebuild b/app-pda/libopensync-plugin-synce-rra/libopensync-plugin-synce-rra-0.22.2.ebuild
deleted file mode 100644
index 571fb05551c1..000000000000
--- a/app-pda/libopensync-plugin-synce-rra/libopensync-plugin-synce-rra-0.22.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-DESCRIPTION="OpenSync SynCE RRA Plugin"
-HOMEPAGE="http://sourceforge.net/projects/synce/ http://www.opensync.org/"
-SRC_URI="mirror://sourceforge/synce/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="=app-pda/libopensync-0.22*
-	app-pda/synce-core
-	>=dev-libs/glib-2
-	>=dev-libs/librra-0.16
-	dev-libs/libxml2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS ChangeLog README
-	find "${ED}" -name '*.la' -exec rm -f {} +
-}
diff --git a/app-pda/libopensync-plugin-synce-rra/metadata.xml b/app-pda/libopensync-plugin-synce-rra/metadata.xml
deleted file mode 100644
index ba58102c22c2..000000000000
--- a/app-pda/libopensync-plugin-synce-rra/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<herd>pda</herd>
-	<upstream>
-		<remote-id type="sourceforge">synce</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-pda/libopensync-plugin-syncml/Manifest b/app-pda/libopensync-plugin-syncml/Manifest
deleted file mode 100644
index b13c4d3df6f4..000000000000
--- a/app-pda/libopensync-plugin-syncml/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST libopensync-plugin-syncml-0.39.tar.bz2 65557 SHA256 fd1bf079d804e7f8d16cec3eb743c0f7df3379f46ae037387b8b06be8392bbdd SHA512 9f7c48e6ec97f989228c6bf79bb4e5a81e5d078b613ce84d3254781fe6b17cde328aa0179463c8306a17aa8596d5ed0b06aee5bb5b43171b086729661beee91b WHIRLPOOL da77a036269371a2b1c56c16fc26455d919f73ecc1f800387d3d5c6c315863233947e785b7f6bc7c2170bff8ebea95ed1d580b92fb81f42b1dc41b30fdf17e41
diff --git a/app-pda/libopensync-plugin-syncml/libopensync-plugin-syncml-0.39.ebuild b/app-pda/libopensync-plugin-syncml/libopensync-plugin-syncml-0.39.ebuild
deleted file mode 100644
index dfdf43650771..000000000000
--- a/app-pda/libopensync-plugin-syncml/libopensync-plugin-syncml-0.39.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit cmake-utils
-
-DESCRIPTION="OpenSync SyncML Plugin"
-HOMEPAGE="http://www.opensync.org/"
-SRC_URI="http://www.opensync.org/download/releases/${PV}/${P}.tar.bz2"
-
-KEYWORDS="~amd64 ~ppc ~x86"
-SLOT="0"
-LICENSE="LGPL-2.1"
-IUSE="http +obex"
-
-REQUIRED_USE="|| ( http obex )"
-
-RDEPEND="~app-pda/libopensync-${PV}
-	dev-libs/glib:2
-	dev-libs/libxml2
-	>=app-pda/libsyncml-0.5.0[obex?,http?]"
-DEPEND="${RDEPEND}"
-
-# FIXME: % tests passed, 2 tests failed out of 2
-RESTRICT="test"
-
-src_configure() {
-	DOCS="AUTHORS"
-
-	local mycmakeargs="
-		$(cmake-utils_use_enable http HTTP)
-		$(cmake-utils_use_enable obex OBEX)"
-
-	cmake-utils_src_configure
-}
diff --git a/app-pda/libopensync-plugin-syncml/libopensync-plugin-syncml-9999.ebuild b/app-pda/libopensync-plugin-syncml/libopensync-plugin-syncml-9999.ebuild
deleted file mode 100644
index 0fb4dfa72418..000000000000
--- a/app-pda/libopensync-plugin-syncml/libopensync-plugin-syncml-9999.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit cmake-utils subversion
-
-DESCRIPTION="OpenSync SyncML Plugin"
-HOMEPAGE="http://www.opensync.org/"
-SRC_URI=""
-
-ESVN_REPO_URI="http://svn.opensync.org/plugins/syncml/trunk"
-
-KEYWORDS="~amd64 ~ppc ~x86"
-SLOT="0"
-LICENSE="LGPL-2.1"
-IUSE="http +obex"
-
-REQUIRED_USE="|| ( http obex )"
-
-RDEPEND="~app-pda/libopensync-${PV}
-	~app-pda/libsyncml-${PV}[obex?,http?]
-	dev-libs/glib:2
-	dev-libs/libxml2"
-DEPEND="${RDEPEND}"
-
-RESTRICT="test"
-
-src_configure() {
-	DOCS="AUTHORS"
-
-	local mycmakeargs="
-		$(cmake-utils_use_enable http HTTP)
-		$(cmake-utils_use_enable obex OBEX)"
-
-	cmake-utils_src_configure
-}
diff --git a/app-pda/libopensync-plugin-syncml/metadata.xml b/app-pda/libopensync-plugin-syncml/metadata.xml
deleted file mode 100644
index 498754bb0060..000000000000
--- a/app-pda/libopensync-plugin-syncml/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>pda</herd>
-<maintainer>
-  <email>rhill@gentoo.org</email>
-  <name>Ryan Hill</name>
-</maintainer>
-<use>
-  <flag name='http'>Enable http transports</flag>
-  <flag name='obex'>Enable obex transports</flag>
-</use>
-</pkgmetadata>
diff --git a/app-pda/libopensync-plugin-vformat/Manifest b/app-pda/libopensync-plugin-vformat/Manifest
deleted file mode 100644
index 6424b5dbb955..000000000000
--- a/app-pda/libopensync-plugin-vformat/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST libopensync-plugin-vformat-0.39.tar.bz2 106247 SHA256 33ee22ee28af622216efa99924e3af0956e4bca48381e634d94b5141d12b40b9 SHA512 d4ecc5cd7ec82471e1e299ceff6fe7f9f5c14aa33dc589c5f9c0f8147ae68b2f937a9ec4c8d66d79f6ea90864c174dd02655bbea9969ac695538dbbeb4204a4a WHIRLPOOL e785a3e734d34d361c29317f005e318b74d76834a85b050f6a5b2c0122c3c1a225d74c4363d6934dd154b03efe8000a63a8ee44793783ea6d0ced4b52e2f4bd5
diff --git a/app-pda/libopensync-plugin-vformat/libopensync-plugin-vformat-0.39.ebuild b/app-pda/libopensync-plugin-vformat/libopensync-plugin-vformat-0.39.ebuild
deleted file mode 100644
index 49d70e132789..000000000000
--- a/app-pda/libopensync-plugin-vformat/libopensync-plugin-vformat-0.39.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="3"
-
-inherit cmake-utils
-
-DESCRIPTION="OpenSync VFormat Plugin"
-HOMEPAGE="http://www.opensync.org"
-SRC_URI="http://www.opensync.org/download/releases/${PV}/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND="~app-pda/libopensync-${PV}
-	dev-libs/glib:2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-# Don't pass
-RESTRICT="test"
-
-DOCS="AUTHORS ChangeLog"
diff --git a/app-pda/libopensync-plugin-vformat/libopensync-plugin-vformat-9999.ebuild b/app-pda/libopensync-plugin-vformat/libopensync-plugin-vformat-9999.ebuild
deleted file mode 100644
index 4226f1c81b61..000000000000
--- a/app-pda/libopensync-plugin-vformat/libopensync-plugin-vformat-9999.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="3"
-
-inherit cmake-utils subversion
-
-DESCRIPTION="OpenSync VFormat Plugin"
-HOMEPAGE="http://www.opensync.org"
-SRC_URI=""
-
-ESVN_REPO_URI="http://svn.opensync.org/format-plugins/vformat/"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND="~app-pda/libopensync-${PV}
-	dev-libs/glib:2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-# Don't pass
-RESTRICT="test"
-
-DOCS="AUTHORS"
diff --git a/app-pda/libopensync-plugin-vformat/metadata.xml b/app-pda/libopensync-plugin-vformat/metadata.xml
deleted file mode 100644
index eedf953f4475..000000000000
--- a/app-pda/libopensync-plugin-vformat/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<herd>pda</herd>
-	<maintainer>
-		<email>rhill@gentoo.org</email>
-		<name>Ryan Hill</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/app-pda/libopensync/Manifest b/app-pda/libopensync/Manifest
deleted file mode 100644
index 7ae420a06194..000000000000
--- a/app-pda/libopensync/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST libopensync-0.22.tar.bz2 489978 SHA256 3394bae1e3bcfe463d139a367ba5ebe73d968df128c871842dcb4965a725d0dc SHA512 90b6c7af9890d51bddfa5ce9ff5403f642d1deb7dc839e517366f9fd0afa5cd582b9a0e6e37d4a110f2aba7421da6705da0a761ad3ea40e9def3d3580f1b6aa2 WHIRLPOOL 8bd6110fd589c02ce97305a56b02ad5b9583d005ad2b9d3ebf994b47064d558247936f446df891fa508fdc23de43d1921e9e85e272e470ade88bbe94c05a0ad5
-DIST libopensync-0.36.tar.bz2 879868 SHA256 c686d27f0818e2d8cc6277ba123c74d7210e70fa2b320c5a828eaaedd598e908 SHA512 8f677b25df609320bc3e6ad021f686d4bc3a3ce9d2586ce8ae9148fd631b3835a3fd6fca6478750c968b7ea43744425d54918434b28b35120619de197be3ed1c WHIRLPOOL a1c02885d6a373fd824b3d4b3556c002e82f72ee120808250e975d96300db44641b736483e10f2a244dd521650441a75b2bd2b59a94cd9a0fc0c67d6e7e7aff5
-DIST libopensync-0.39.tar.bz2 1146955 SHA256 078f5d1d29774a190679e7e65e587f34cd8b001f07ea8745f31eba3f07edc430 SHA512 038c92e2599ca31d6633dd60eaf44e157887d285c8946740afb153c4afb98b718f3f73251212e1055452a793142d0d27e2edf510a9830308d20d9c7d4023c7e4 WHIRLPOOL a84f4eb14d81da23c8e725262b2e5b3bb233767bfb3154d609e614b17d8c8a3f2c97136551f56102568ff5b02ef1cf030260d1c16c77ca8b5dc703b9671c6cff
diff --git a/app-pda/libopensync/files/libopensync-0.22-Makefile.patch b/app-pda/libopensync/files/libopensync-0.22-Makefile.patch
deleted file mode 100644
index 579b792a49d4..000000000000
--- a/app-pda/libopensync/files/libopensync-0.22-Makefile.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-https://bugs.gentoo.org/355291
-
---- a/opensync/Makefile.am
-+++ b/opensync/Makefile.am
-@@ -77,5 +77,5 @@ CLEANFILES = \
- 	*.bbg \
- 	*.da
- 
--libopensync_la_LDFLAGS = @PACKAGE_LIBS@ @GCOV_LDFLAGS@
--libopensync_la_LIBADD = @XML_LIBS@
-+libopensync_la_LDFLAGS = @GCOV_LDFLAGS@
-+libopensync_la_LIBADD = @PACKAGE_LIBS@ @XML_LIBS@
---- a/osengine/Makefile.am
-+++ b/osengine/Makefile.am
-@@ -43,5 +43,5 @@ CLEANFILES = \
- 	*.bbg \
- 	*.da
- 
--libosengine_la_LDFLAGS = $(PACKAGE_LIBS) -R $(libdir) @GCOV_LDFLAGS@
--libosengine_la_LIBADD = $(top_builddir)/opensync/libopensync.la
-+libosengine_la_LDFLAGS = @GCOV_LDFLAGS@
-+libosengine_la_LIBADD = $(top_builddir)/opensync/libopensync.la $(PACKAGE_LIBS)
---- a/osplugin/Makefile.am
-+++ b/osplugin/Makefile.am
-@@ -9,8 +9,8 @@ libexec_PROGRAMS = osplugin
- ospluginincludedir = @OPENSYNC_HEADERDIR@
- 
- osplugin_SOURCES = osplugin.c
--osplugin_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ -R $(libdir) @GCOV_LDFLAGS@
--osplugin_LDADD = $(top_builddir)/opensync/libopensync.la
-+osplugin_LDFLAGS = @GCOV_LDFLAGS@
-+osplugin_LDADD = $(top_builddir)/opensync/libopensync.la @PACKAGE_LIBS@ @XML_LIBS@
- 
- CLEANFILES = \
- 	*.bb \
---- a/tools/Makefile.am
-+++ b/tools/Makefile.am
-@@ -9,24 +9,24 @@ bin_PROGRAMS = osyncdump osyncstress osyncplugin osynctest osyncbinary
- endif
- 
- osyncdump_SOURCES = osyncdump.c
--osyncdump_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ -R $(libdir) @GCOV_LDFLAGS@
--osyncdump_LDADD = $(top_builddir)/opensync/libopensync.la
-+osyncdump_LDFLAGS = @GCOV_LDFLAGS@
-+osyncdump_LDADD = $(top_builddir)/opensync/libopensync.la @PACKAGE_LIBS@ @XML_LIBS@
- 
- osyncstress_SOURCES = osyncstress.c
--osyncstress_LDFLAGS = @PACKAGE_LIBS@ -R $(libdir) @GCOV_LDFLAGS@
--osyncstress_LDADD = $(top_builddir)/osengine/libosengine.la $(top_builddir)/opensync/libopensync.la
-+osyncstress_LDFLAGS = @GCOV_LDFLAGS@
-+osyncstress_LDADD = $(top_builddir)/osengine/libosengine.la $(top_builddir)/opensync/libopensync.la @PACKAGE_LIBS@
- 
- osyncplugin_SOURCES = osyncplugin.c
--osyncplugin_LDFLAGS = @PACKAGE_LIBS@ -R $(libdir) @GCOV_LDFLAGS@
--osyncplugin_LDADD = $(top_builddir)/opensync/libopensync.la
-+osyncplugin_LDFLAGS = @GCOV_LDFLAGS@
-+osyncplugin_LDADD = $(top_builddir)/opensync/libopensync.la @PACKAGE_LIBS@
- 
- osynctest_SOURCES = osynctest.c
--osynctest_LDFLAGS = @PACKAGE_LIBS@ -R $(libdir) @GCOV_LDFLAGS@
--osynctest_LDADD = $(top_builddir)/osengine/libosengine.la $(top_builddir)/opensync/libopensync.la
-+osynctest_LDFLAGS = @GCOV_LDFLAGS@
-+osynctest_LDADD = $(top_builddir)/osengine/libosengine.la $(top_builddir)/opensync/libopensync.la @PACKAGE_LIBS@
- 
- osyncbinary_SOURCES = osyncbinary.c
--osyncbinary_LDFLAGS = @PACKAGE_LIBS@ -R $(libdir)
--osyncbinary_LDADD = $(top_builddir)/opensync/libopensync.la
-+osyncbinary_LDFLAGS =
-+osyncbinary_LDADD = $(top_builddir)/opensync/libopensync.la @PACKAGE_LIBS@
- 
- CLEANFILES = \
- 	*.bb \
---- a/wrapper/Makefile.am
-+++ b/wrapper/Makefile.am
-@@ -22,5 +22,5 @@ osbindings_LTLIBRARIES = _opensync.la
- endif
- 
- nodist__opensync_la_SOURCES = opensync_wrap.c
--_opensync_la_LDFLAGS = @PACKAGE_LIBS@ @XML_LIBS@ $(PYTHON_LDFLAGS) -R $(libdir) -module -avoid-version
--_opensync_la_LIBADD = $(top_builddir)/opensync/libopensync.la
-+_opensync_la_LDFLAGS = -module -avoid-version
-+_opensync_la_LIBADD = $(top_builddir)/opensync/libopensync.la $(PYTHON_LDFLAGS) @PACKAGE_LIBS@ @XML_LIBS@
diff --git a/app-pda/libopensync/files/libopensync-0.22-fbsd.patch b/app-pda/libopensync/files/libopensync-0.22-fbsd.patch
deleted file mode 100644
index c9e7cdc9a8e2..000000000000
--- a/app-pda/libopensync/files/libopensync-0.22-fbsd.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- libopensync-0.22/formats/vformats-xml/vformat.c	2007-06-17 10:54:54 +0000
-+++ libopensync-0.22/formats/vformats-xml/vformat.c	2007-06-17 10:55:30 +0000
-@@ -236,7 +236,7 @@
- 	if (charset) {
- 
- 		cd = iconv_open("UTF-8", charset->str);
--#ifdef SOLARIS
-+#if defined(SOLARIS) || defined(__FreeBSD__) || defined(__NetBSD__)
-                 if (iconv(cd, (const char**)&inbuf, &inbytesleft, &p, &outbytesleft) != (size_t)(-1)) {
- #else
-                 if (iconv(cd, &inbuf, &inbytesleft, &p, &outbytesleft) != (size_t)(-1)) {
-@@ -264,7 +264,7 @@
- 
- 			/* because inbuf is not UTF-8, we think it is ISO-8859-1 */
-                         cd = iconv_open("UTF-8", "ISO-8859-1");
--#ifdef SOLARIS
-+#if defined(SOLARIS) || defined(__FreeBSD__) || defined(__NetBSD__)
-                         if (iconv(cd, (const char**)&inbuf, &inbytesleft, &p, &outbytesleft) != (size_t)(-1)) {
- #else
-                         if (iconv(cd, &inbuf, &inbytesleft, &p, &outbytesleft) != (size_t)(-1)) {
diff --git a/app-pda/libopensync/files/libopensync-0.22-pythonpath.patch b/app-pda/libopensync/files/libopensync-0.22-pythonpath.patch
deleted file mode 100644
index abfb68cbdb33..000000000000
--- a/app-pda/libopensync/files/libopensync-0.22-pythonpath.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-diff --git a/acinclude.m4 b/acinclude.m4
-index 2bf9951..a3b617c 100644
---- a/acinclude.m4
-+++ b/acinclude.m4
-@@ -1008,9 +1008,9 @@ AC_DEFUN([AC_PROG_SWIG],[
-                         if test -z "$available_patch" ; then
-                                 [available_patch=0]
-                         fi
--                        if test $available_major -ne $required_major \
--                                -o $available_minor -ne $required_minor \
--                                -o $available_patch -lt $required_patch ; then
-+                        if test $available_major -lt $required_major \
-+                                -a $available_minor -lt $required_minor \
-+                                -a $available_patch -lt $required_patch ; then
-                                 AC_MSG_WARN([SWIG version >= $1 is required.  You have $swig_version.  You should look at http://www.swig.org])
-                                 SWIG='echo "Error: SWIG version >= $1 is required.  You have '"$swig_version"'.  You should look at http://www.swig.org" ; false'
-                         else
-@@ -1114,7 +1114,7 @@ AC_DEFUN([AC_PYTHON_DEVEL],[
- 	AC_MSG_CHECKING([for Python include path])
- 	python_path=`echo $PYTHON | sed "s,/bin.*$,,"`
- 	for i in "$python_path/include/python$PYTHON_VERSION/" "$python_path/include/python/" "$python_path/" ; do
--		python_path=`find $i -type f -name Python.h -print | sed "1q"`
-+		python_path=`find $i -type f -name Python.h -print 2>/dev/null | sed "1q"`
- 		if test -n "$python_path" ; then
- 			break
- 		fi
-@@ -1129,8 +1129,8 @@ AC_DEFUN([AC_PYTHON_DEVEL],[
- 	# Check for Python library path
- 	AC_MSG_CHECKING([for Python library path])
- 	python_path=`echo $PYTHON | sed "s,/bin.*$,,"`
--	for i in "$python_path/lib/python$PYTHON_VERSION/config/" "$python_path/lib/python$PYTHON_VERSION/" "$python_path/lib/python/config/" "$python_path/lib/python/" "$python_path/" ; do
--		python_path=`find $i -type f -name libpython$PYTHON_VERSION.* -print | sed "1q"`
-+	for i in "$python_path/lib/python$PYTHON_VERSION/config/" "$python_path/lib/python$PYTHON_VERSION/" "$python_path/lib/python/config/" "$python_path/lib/python/" "$python_path/lib/" ; do
-+		python_path=`find $i -type f -name libpython$PYTHON_VERSION.* -print 2>/dev/null | sed "1q"`
- 		if test -n "$python_path" ; then
- 			break
- 		fi
-@@ -1142,16 +1142,21 @@ AC_DEFUN([AC_PYTHON_DEVEL],[
- 	fi
- 	AC_SUBST([PYTHON_LDFLAGS],["-L$python_path -lpython$PYTHON_VERSION"])
- 	#
--	python_site=`echo $python_path | sed "s/config/site-packages/"`
--	AC_SUBST([PYTHON_SITE_PKG],[$python_site])
-+	# site-packages directory
-+	#
-+	AC_MSG_CHECKING(python site-packages)
-+	PYTHON_SITE_PKG=`$PYTHON -c "from distutils.sysconfig import get_python_lib; \
-+	            print get_python_lib()"`
-+	AC_MSG_RESULT($PYTHON_SITE_PKG)
-+	AC_SUBST(PYTHON_SITE_PKG)
- 	#
- 	# libraries which must be linked in when embedding
- 	#
- 	AC_MSG_CHECKING(python extra libraries)
- 	PYTHON_EXTRA_LIBS=`$PYTHON -c "import distutils.sysconfig; \
-                 conf = distutils.sysconfig.get_config_var; \
--                print conf('LOCALMODLIBS')+' '+conf('LIBS')"
--	AC_MSG_RESULT($PYTHON_EXTRA_LIBS)`
-+                print conf('LOCALMODLIBS')+' '+conf('LIBS')"`
-+	AC_MSG_RESULT($PYTHON_EXTRA_LIBS)
- 	AC_SUBST(PYTHON_EXTRA_LIBS)
- ])
- dnl as-ac-expand.m4 0.2.0
diff --git a/app-pda/libopensync/files/libopensync-0.22-swig-typeerror.patch b/app-pda/libopensync/files/libopensync-0.22-swig-typeerror.patch
deleted file mode 100644
index b1e42f394493..000000000000
--- a/app-pda/libopensync/files/libopensync-0.22-swig-typeerror.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/wrapper/opensync.i b/wrapper/opensync.i
-index 623c0f4..8131158 100644
---- a/wrapper/opensync.i
-+++ b/wrapper/opensync.i
-@@ -82,7 +82,7 @@ typedef struct {} OSyncHashTable;
- %extend OSyncChange {
- 	OSyncChange(PyObject *obj=NULL) {
- 		OSyncChange *change = NULL;
--		if (obj)
-+		if ((obj) && (obj != Py_None))
- 			change = (OSyncChange *)PyCObject_AsVoidPtr(obj);
- 		else
- 			change = osync_change_new();
diff --git a/app-pda/libopensync/libopensync-0.22-r1.ebuild b/app-pda/libopensync/libopensync-0.22-r1.ebuild
deleted file mode 100644
index eb46001b8213..000000000000
--- a/app-pda/libopensync/libopensync-0.22-r1.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="3"
-
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython 2.7-pypy-*"
-
-inherit autotools eutils python
-
-DESCRIPTION="OpenSync synchronisation framework library"
-HOMEPAGE="http://www.opensync.org/"
-SRC_URI="http://www.opensync.org/download/releases/${PV}/${P}.tar.bz2"
-
-KEYWORDS="amd64 hppa ppc ppc64 x86"
-SLOT="0"
-LICENSE="LGPL-2.1"
-IUSE="debug doc python"
-
-RDEPEND="dev-db/sqlite:3
-	dev-libs/glib:2
-	dev-libs/libxml2"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc?	( app-doc/doxygen )
-	python?	( >=dev-lang/swig-1.3.17 )"
-#   test?   ( >=dev-libs/check-0.9.2 )"
-
-# Tests don't pass
-RESTRICT="test"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-fbsd.patch
-	epatch "${FILESDIR}"/${P}-pythonpath.patch
-	epatch "${FILESDIR}"/${P}-swig-typeerror.patch
-	epatch "${FILESDIR}"/${P}-Makefile.patch
-	eautoreconf
-
-	find "${S}" -name Makefile.in -print0 | xargs -0 sed -i -e 's: -Werror::' \
-		-e 's: -R $(libdir)::g'
-
-	use python && python_copy_sources
-}
-
-src_configure() {
-	do_configure() {
-		econf \
-			--enable-engine \
-			--enable-tools \
-			$(use_enable python) \
-			$(use_enable debug) \
-			$(use_enable debug tracing)
-			#$(use_enable test unit-tests)
-
-			sed -i -e 's:^\(hardcode_libdir_flag_spec=\).*:\1"":g' \
-				-e 's:^\(runpath_var=\).*:\1DIE_RPATH_DIE:g' \
-				-e 's:func_apped:func_append:g' \
-				libtool
-	}
-
-	use python && python_execute_function -s do_configure
-	do_configure # do this even when USE=python - we need to generate Doxyfile
-}
-
-src_compile() {
-	use python \
-		&& python_execute_function -d -s \
-		|| default
-
-	if use doc; then
-		doxygen Doxyfile || die
-	fi
-}
-
-src_install() {
-	do_install() {
-		emake DESTDIR="${D}" install || die
-	}
-
-	use python \
-		&& python_execute_function -s do_install \
-		|| do_install
-
-	find "${D}" -name '*.la' -exec rm -f {} + || die
-	dodoc AUTHORS NEWS README TODO
-
-	if use doc; then
-		dohtml docs/html/* || die
-	fi
-}
-
-pkg_postinst() {
-	elog "Enabling the 'debug' useflag is required for bug reports."
-	elog "Also see: http://www.opensync.org/wiki/tracing"
-}
diff --git a/app-pda/libopensync/libopensync-0.22.ebuild b/app-pda/libopensync/libopensync-0.22.ebuild
deleted file mode 100644
index 52f360d7524e..000000000000
--- a/app-pda/libopensync/libopensync-0.22.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit eutils
-
-DESCRIPTION="OpenSync synchronisation framework library"
-HOMEPAGE="http://www.opensync.org/"
-SRC_URI="http://dev.gentooexperimental.org/~peper/distfiles/${P}.tar.bz2"
-
-KEYWORDS="amd64 hppa ppc ppc64 x86"
-SLOT="0"
-LICENSE="LGPL-2.1"
-IUSE="debug doc python"
-#profiling" - needs tau - http://www.cs.uoregon.edu/research/tau/
-
-# Tests are not doing anything in 0.22
-#		$(use_enable test unit-tests) \
-RESTRICT="test"
-
-RDEPEND=">=dev-db/sqlite-3
-	>=dev-libs/glib-2
-	dev-libs/libxml2
-	python? ( >=dev-lang/python-2.2 )
-	debug? ( >=dev-libs/check-0.9.2 )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	python? ( >=dev-lang/swig-1.3.17 )"
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-fbsd.patch"
-}
-
-src_compile() {
-	econf \
-		--enable-engine \
-		--enable-tools \
-		$(use_enable python) \
-		$(use_enable debug) \
-		$(use_enable debug tracing) \
-		|| die "econf failed"
-
-	emake || die "emake failed"
-
-	use doc && doxygen Doxyfile
-}
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	dodoc AUTHORS ChangeLog NEWS README TODO
-	use doc && dohtml docs/html/*
-}
-
-pkg_preinst() {
-	has_version "<${CATEGORY}/${PN}-0.21"
-	previous_less_than_0_21=$?
-}
-
-pkg_postinst() {
-	elog "Building with 'debug' useflag is highly encouraged"
-	elog "and requiered for bug reports."
-	elog "Also see http://www.opensync.org/wiki/tracing"
-
-	if [[ $previous_less_than_0_21 = 0 ]] ; then
-		echo ""
-		elog "You are updating from version prior to 0.21 and hence you need to rebuild your db."
-		elog "How: http://www.opensync.org/wiki/FAQ#HowdoIcleanupasyncgroupfortesting"
-		elog "Why: http://www.nabble.com/Not-Unique-UID-fix-in-subversion-tf3167800.html"
-	fi
-}
diff --git a/app-pda/libopensync/libopensync-0.36-r2.ebuild b/app-pda/libopensync/libopensync-0.36-r2.ebuild
deleted file mode 100644
index 4cf96e4dcdc2..000000000000
--- a/app-pda/libopensync/libopensync-0.36-r2.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="3"
-
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython 2.7-pypy-*"
-
-inherit cmake-utils python
-
-DESCRIPTION="OpenSync synchronisation framework library"
-HOMEPAGE="http://www.opensync.org/"
-SRC_URI="http://www.opensync.org/download/releases/${PV}/${P}.tar.bz2"
-
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd"
-SLOT="0"
-LICENSE="LGPL-2.1"
-IUSE="debug doc python" # test
-
-RDEPEND="dev-db/sqlite:3
-	dev-libs/glib:2
-	dev-libs/libxml2
-	dev-libs/libxslt"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc?	( app-doc/doxygen
-			  media-gfx/graphviz )
-	python?	( >=dev-lang/swig-1.3.17 )"
-#	test?	( >=dev-libs/check-0.9.2 )"
-
-DOCS="AUTHORS CODING README"
-
-# Tests don't pass
-RESTRICT="test"
-
-src_prepare() {
-	# Has hardcoded python versions, use the module shipped with cmake instead
-	# bug #276220
-	rm "${S}"/cmake/modules/FindPythonLibs.cmake
-
-	use python && python_copy_sources
-}
-
-src_configure() {
-	local mycmakeargs="
-		-DCMAKE_SKIP_RPATH=ON
-		$(cmake-utils_use_build doc DOCUMENTATION)
-		$(cmake-utils_use_enable python WRAPPER)
-		$(cmake-utils_use python OPENSYNC_PYTHONBINDINGS)
-		$(cmake-utils_use debug OPENSYNC_DEBUG_MODULES)
-		$(cmake-utils_use debug OPENSYNC_TRACE)"
-#		$(cmake-utils_use test OPENSYNC_UNITTESTS)"
-
-	do_configure() {
-		if use python; then
-			CMAKE_BUILD_DIR="${WORKDIR}/${P}-${PYTHON_ABI}"
-			CMAKE_USE_DIR="${CMAKE_BUILD_DIR}"
-			# since we're using cmake's FindPythonLibs PYTHON_VERSION is
-			# not defined
-			sed -i -e "s:\${PYTHON_VERSION}:${PYTHON_ABI}:g" \
-				"${CMAKE_BUILD_DIR}"/wrapper/CMakeLists.txt
-		fi
-		cmake-utils_src_configure || die
-	}
-
-	use python \
-		&& python_execute_function -s do_configure \
-		|| do_configure
-}
-
-src_compile() {
-	do_compile() {
-		if use python; then
-			CMAKE_BUILD_DIR="${WORKDIR}/${P}-${PYTHON_ABI}"
-			CMAKE_USE_DIR="${CMAKE_BUILD_DIR}"
-		fi
-		cmake-utils_src_compile || die
-	}
-
-	use python \
-		&& python_execute_function -s do_compile \
-		|| do_compile
-
-	if use doc ; then
-		cmake-utils_src_make DoxygenDoc || die
-	fi
-}
-
-# TODO - fix
-src_test() {
-	pushd "${CMAKE_BUILD_DIR}" > /dev/null
-
-	if ! LD_LIBRARY_PATH="${CMAKE_BUILD_DIR}/opensync/" emake -j1 test ; then
-		die "Make test failed. See above for details."
-	fi
-
-	popd > /dev/null
-}
-
-src_install() {
-	do_install() {
-		if use python; then
-			CMAKE_BUILD_DIR="${WORKDIR}/${P}-${PYTHON_ABI}"
-			CMAKE_USE_DIR="${CMAKE_BUILD_DIR}"
-		fi
-		cmake-utils_src_install || die
-	}
-
-	use python \
-		&& python_execute_function -s do_install \
-		|| do_install
-
-	find "${D}" -name '*.la' -exec rm -f {} + || die
-
-	if use doc; then
-		cd "${CMAKE_BUILD_DIR}"
-		dohtml docs/html/* || die
-	fi
-}
-
-pkg_postinst() {
-	elog "Enabling the 'debug' useflag is required for bug reports."
-	elog "Also see: http://www.opensync.org/wiki/tracing"
-}
diff --git a/app-pda/libopensync/libopensync-0.39-r1.ebuild b/app-pda/libopensync/libopensync-0.39-r1.ebuild
deleted file mode 100644
index a7097518e2ff..000000000000
--- a/app-pda/libopensync/libopensync-0.39-r1.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="3"
-
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython 2.7-pypy-*"
-
-inherit cmake-utils python
-
-DESCRIPTION="OpenSync synchronisation framework library"
-HOMEPAGE="http://www.opensync.org/"
-SRC_URI="http://www.opensync.org/download/releases/${PV}/${P}.tar.bz2"
-
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd"
-SLOT="0"
-LICENSE="LGPL-2.1"
-IUSE="debug doc python" # test
-
-RDEPEND="dev-db/sqlite:3
-	>=dev-libs/glib-2.12:2
-	dev-libs/libxml2
-	dev-libs/libxslt"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc?	( app-doc/doxygen
-			  media-gfx/graphviz )
-	python?	( >=dev-lang/swig-1.3.17 )"
-#	test?	( >=dev-libs/check-0.9.2 )"
-
-DOCS="AUTHORS CODING ChangeLog README"
-
-# Tests don't pass
-RESTRICT="test"
-
-src_prepare() {
-	# Has hardcoded python versions, use the module shipped with cmake instead
-	# bug #276220
-	rm "${S}"/cmake/modules/FindPythonLibs.cmake
-
-	use python && python_copy_sources
-}
-
-src_configure() {
-	local mycmakeargs="
-		-DCMAKE_SKIP_RPATH=ON
-		$(cmake-utils_use_build doc DOCUMENTATION)
-		$(cmake-utils_use_enable python WRAPPER)
-		$(cmake-utils_use python OPENSYNC_PYTHONBINDINGS)
-		$(cmake-utils_use debug OPENSYNC_DEBUG_MODULES)
-		$(cmake-utils_use debug OPENSYNC_TRACE)"
-#		$(cmake-utils_use test OPENSYNC_UNITTESTS)"
-
-	do_configure() {
-		if use python; then
-			CMAKE_BUILD_DIR="${WORKDIR}/${P}-${PYTHON_ABI}"
-			CMAKE_USE_DIR="${CMAKE_BUILD_DIR}"
-			# since we're using cmake's FindPythonLibs PYTHON_VERSION is
-			# not defined
-			sed -i -e "s:\${PYTHON_VERSION}:${PYTHON_ABI}:g" \
-				"${CMAKE_BUILD_DIR}"/wrapper/CMakeLists.txt
-		fi
-		cmake-utils_src_configure || die
-	}
-
-	use python \
-		&& python_execute_function -s do_configure \
-		|| do_configure
-}
-
-src_compile() {
-	do_compile() {
-		if use python; then
-			CMAKE_BUILD_DIR="${WORKDIR}/${P}-${PYTHON_ABI}"
-			CMAKE_USE_DIR="${CMAKE_BUILD_DIR}"
-		fi
-		cmake-utils_src_compile || die
-	}
-
-	use python \
-		&& python_execute_function -s do_compile \
-		|| do_compile
-
-	if use doc ; then
-		cmake-utils_src_make DoxygenDoc || die
-	fi
-}
-
-# TODO - fix
-src_test() {
-	pushd "${CMAKE_BUILD_DIR}" > /dev/null
-
-	if ! LD_LIBRARY_PATH="${CMAKE_BUILD_DIR}/opensync/" emake -j1 test ; then
-		die "Make test failed. See above for details."
-	fi
-
-	popd > /dev/null
-}
-
-src_install() {
-	do_install() {
-		if use python; then
-			CMAKE_BUILD_DIR="${WORKDIR}/${P}-${PYTHON_ABI}"
-			CMAKE_USE_DIR="${CMAKE_BUILD_DIR}"
-		fi
-		cmake-utils_src_install || die
-	}
-
-	use python \
-		&& python_execute_function -s do_install \
-		|| do_install
-
-	find "${D}" -name '*.la' -exec rm -f {} + || die
-
-	if use doc; then
-		cd "${CMAKE_BUILD_DIR}"
-		dohtml docs/html/* || die
-	fi
-}
-
-pkg_postinst() {
-	elog "For >=app-pda/libopensync-0.39 use app-pda/osynctool instead of"
-	elog "the older app-pda/msynctool."
-}
diff --git a/app-pda/libopensync/libopensync-9999.ebuild b/app-pda/libopensync/libopensync-9999.ebuild
deleted file mode 100644
index f742631d491f..000000000000
--- a/app-pda/libopensync/libopensync-9999.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="3"
-
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython 2.7-pypy-*"
-
-inherit cmake-utils subversion python
-
-DESCRIPTION="OpenSync synchronisation framework library"
-HOMEPAGE="http://www.opensync.org/"
-SRC_URI=""
-
-ESVN_REPO_URI="http://svn.opensync.org/trunk"
-
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd"
-SLOT="0"
-LICENSE="LGPL-2.1"
-IUSE="debug doc python" # test
-
-RDEPEND="dev-db/sqlite:3
-	>=dev-libs/glib-2.12:2
-	dev-libs/libxml2
-	dev-libs/libxslt"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc?	( app-doc/doxygen
-			  media-gfx/graphviz )
-	python? ( >=dev-lang/swig-1.3.17 )"
-#	test? ( >=dev-libs/check-0.9.2 )
-
-DOCS="AUTHORS CODING ChangeLog README"
-
-# tests don't pass
-RESTRICT="test"
-
-src_prepare() {
-	# Use cmake's instead - bug #276220
-	rm "${S}"/cmake/modules/FindPythonLibs.cmake
-
-	use python && python_copy_sources
-}
-
-src_configure() {
-	local mycmakeargs="-DCMAKE_SKIP_RPATH=ON
-		$(cmake-utils_use_build doc DOCUMENTATION)
-		$(cmake-utils_use_enable python WRAPPER)
-		$(cmake-utils_use python OPENSYNC_PYTHONBINDINGS)
-		$(cmake-utils_use debug OPENSYNC_DEBUG_MODULES)
-		$(cmake-utils_use debug OPENSYNC_TRACE)"
-#		$(cmake-utils_use test OPENSYNC_UNITTESTS)
-
-	do_configure() {
-		if use python; then
-			CMAKE_BUILD_DIR="${WORKDIR}/${P}-${PYTHON_ABI}"
-			CMAKE_USE_DIR="${CMAKE_BUILD_DIR}"
-			# since we're using cmake's FindPythonLibs PYTHON_VERSION is not defined
-			sed -i -e "s:\${PYTHON_VERSION}:${PYTHON_ABI}:g" \
-				"${CMAKE_BUILD_DIR}"/wrapper/CMakeLists.txt
-		fi
-		cmake-utils_src_configure || die
-	}
-
-	use python \
-		&& python_execute_function -s do_configure \
-		|| do_configure
-}
-
-src_compile() {
-	do_compile() {
-		if use python; then
-			CMAKE_BUILD_DIR="${WORKDIR}/${P}-${PYTHON_ABI}"
-			CMAKE_USE_DIR="${CMAKE_BUILD_DIR}"
-		fi
-		cmake-utils_src_compile || die
-	}
-
-	use python \
-		&& python_execute_function -s do_compile \
-		|| do_compile
-
-	if use doc ; then
-		cmake-utils_src_make DoxygenDoc || die
-	fi
-}
-
-src_test() {
-	pushd "${CMAKE_BUILD_DIR}" > /dev/null
-
-	if ! LD_LIBRARY_PATH="${CMAKE_BUILD_DIR}/opensync/" emake -j1 test ; then
-		die "Make test failed. See above for details."
-	fi
-
-	popd > /dev/null
-}
-
-src_install() {
-	do_install() {
-		if use python; then
-			CMAKE_BUILD_DIR="${WORKDIR}/${P}-${PYTHON_ABI}"
-			CMAKE_USE_DIR="${CMAKE_BUILD_DIR}"
-		fi
-		cmake-utils_src_install || die
-	}
-
-	use python \
-		&& python_execute_function -s do_install \
-		|| do_install
-
-	find "${D}" -name '*.la' -exec rm -f {} + || die
-
-	if use doc; then
-		cd "${CMAKE_BUILD_DIR}"
-		dohtml docs/html/* || die
-	fi
-}
-
-pkg_postinst() {
-	elog "Building with 'debug' useflag is highly encouraged"
-	elog "and requiered for bug reports."
-	elog "Also see http://www.opensync.org/wiki/tracing"
-}
diff --git a/app-pda/libopensync/metadata.xml b/app-pda/libopensync/metadata.xml
deleted file mode 100644
index 0c317e5ffa3d..000000000000
--- a/app-pda/libopensync/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<herd>pda</herd>
-	<maintainer>
-		<email>rhill@gentoo.org</email>
-		<name>Ryan Hill</name>
-	</maintainer>
-</pkgmetadata>
-
diff --git a/app-pda/libsyncml/Manifest b/app-pda/libsyncml/Manifest
deleted file mode 100644
index cfe1de84db65..000000000000
--- a/app-pda/libsyncml/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST libsyncml-0.5.4.tar.bz2 289488 SHA256 5ee4c48923ae78489fd13a4329d6a86bcb020bb777f9bc1b35d152f197b748ff SHA512 aed0821d01eaaa3fef69d559820875591d3837b3968be24293fc41924b3599a2810d2b4cc29f82e6f4058a212eae5f71021bd96a046b568e7cb1a036ba8f37aa WHIRLPOOL f036a5bf991ed76fe66c709bcb5ac3cc9f974d91b2b2fcdba3fc21fbab6c7a9b69ce5675c6a65ccc73261e0ec3c732a8c4124a8764e656a288385f9847112fe6
diff --git a/app-pda/libsyncml/libsyncml-0.5.4.ebuild b/app-pda/libsyncml/libsyncml-0.5.4.ebuild
deleted file mode 100644
index b83a3e4690df..000000000000
--- a/app-pda/libsyncml/libsyncml-0.5.4.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit cmake-utils
-
-DESCRIPTION="Implementation of the SyncML protocol"
-HOMEPAGE="http://libsyncml.opensync.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-KEYWORDS="~amd64 ~ppc ~x86"
-SLOT="0"
-LICENSE="LGPL-2.1"
-IUSE="debug doc http +obex test"
-
-# bluetooth and obex merged because bluetooth support in obex backend is
-# automagic, bug #285040
-# libsoup:2.2 is forced off to avoid automagic
-RDEPEND=">=dev-libs/glib-2.12
-	>=dev-libs/libwbxml-0.11.0
-	dev-libs/libxml2
-	http? ( net-libs/libsoup:2.4 )
-	obex? (
-		net-wireless/bluez
-		>=dev-libs/openobex-1.1[bluetooth] )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	test? ( >=dev-libs/check-0.9.7 )"
-
-REQUIRED_USE="|| ( http obex )"
-
-DOCS="AUTHORS CODING ChangeLog RELEASE"
-
-src_prepare() {
-	# https://bugs.gentoo.org/425738
-	sed -i \
-		-e '/include/s:wbxml.h:wbxml/&:' \
-		libsyncml/parser/sml_wbxml_internals.h tests/mobiles/obex_mobile_ds_client.c || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DHAVE_LIBSOUP22=OFF
-		-DDOC_INSTALL_DIR=/usr/share/doc/${PF}
-		$(cmake-utils_use_enable debug TRACE)
-		$(cmake-utils_use_enable http HTTP)
-		$(cmake-utils_use_enable obex OBEX)
-		$(cmake-utils_use_enable obex BLUETOOTH)
-		$(cmake-utils_use_enable test UNIT_TEST)
-	)
-
-	if use http && use obex; then
-		# Doc builds with those previous USE flags only
-		mycmakeargs+=( $(cmake-utils_use_build doc DOCUMENTATION) )
-	fi
-
-	cmake-utils_src_configure
-}
diff --git a/app-pda/libsyncml/libsyncml-9999.ebuild b/app-pda/libsyncml/libsyncml-9999.ebuild
deleted file mode 100644
index 1ad4e7a92cbc..000000000000
--- a/app-pda/libsyncml/libsyncml-9999.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit cmake-utils subversion
-
-DESCRIPTION="Implementation of the SyncML protocol"
-HOMEPAGE="http://libsyncml.opensync.org/"
-SRC_URI=""
-
-ESVN_REPO_URI="http://svn.opensync.org/libsyncml/trunk"
-
-KEYWORDS="~amd64 ~ppc ~x86"
-SLOT="0"
-LICENSE="LGPL-2.1"
-IUSE="+debug doc http +obex test"
-
-# bluetooth and obex merged because bluetooth support in obex backend is
-# automagic, bug #285040
-# libsoup:2.2 is forced off to avoid automagic
-RDEPEND=">=dev-libs/glib-2.12
-	>=dev-libs/libwbxml-0.11.0
-	dev-libs/libxml2
-	http? ( net-libs/libsoup:2.4 )
-	obex? (
-		net-wireless/bluez
-		>=dev-libs/openobex-1.1[bluetooth] )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	test? ( >=dev-libs/check-0.9.7 )"
-
-REQUIRED_USE="|| ( http obex )"
-
-DOCS="AUTHORS CODING ChangeLog RELEASE"
-
-src_prepare() {
-	# https://bugs.gentoo.org/425738
-	sed -i \
-		-e '/include/s:wbxml.h:wbxml/&:' \
-		libsyncml/parser/sml_wbxml_internals.h tests/mobiles/obex_mobile_ds_client.c || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DHAVE_LIBSOUP22=OFF
-		$(cmake-utils_use_build doc DOCUMENTATION)
-		$(cmake-utils_use_enable debug TRACE)
-		$(cmake-utils_use_enable http HTTP)
-		$(cmake-utils_use_enable obex OBEX)
-		$(cmake-utils_use_enable obex BLUETOOTH)
-		$(cmake-utils_use_enable test UNIT_TEST)
-	)
-
-	cmake-utils_src_configure
-}
diff --git a/app-pda/libsyncml/metadata.xml b/app-pda/libsyncml/metadata.xml
deleted file mode 100644
index 814a7c1c4fcc..000000000000
--- a/app-pda/libsyncml/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <herd>pda</herd>
-  <use>
-    <flag name="http">Enable http transports</flag>
-    <flag name="obex">Enable obex transports</flag>
-  </use>
-  <upstream>
-    <remote-id type="sourceforge">libsyncml</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/app-pda/msynctool/Manifest b/app-pda/msynctool/Manifest
deleted file mode 100644
index f507c2909cc1..000000000000
--- a/app-pda/msynctool/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST msynctool-0.22.tar.bz2 219787 SHA256 5a3008eaaf61dc9f7cc0cd0c762d700dfa8cc1aa65c07ec5bf12abe252f2d280 SHA512 69bc7e38f8d35e3eaebfb307832eab5e6a47a14197433482c8e1c9ccf6fc05070b0931e4063ad0511909b8a310237fc4bdf838acbd93877c55579499f754027f WHIRLPOOL 9e3b39514815e969b2e909f5f1f31e183ba8c49356f83c454566512487e1cd5db04c868c378f1e5aa2e3e559f7e51c637b92e0fd6adc2658f440c6f3cc91b843
diff --git a/app-pda/msynctool/metadata.xml b/app-pda/msynctool/metadata.xml
deleted file mode 100644
index a514ffc3d378..000000000000
--- a/app-pda/msynctool/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<herd>pda</herd>
-	<maintainer>
-		<email>rhill@gentoo.org</email>
-		<name>Ryan Hill</name>
-	</maintainer>
-	<longdescription lang="en">
-	</longdescription>
-</pkgmetadata>
-
diff --git a/app-pda/msynctool/msynctool-0.22.ebuild b/app-pda/msynctool/msynctool-0.22.ebuild
deleted file mode 100644
index 4866994832fe..000000000000
--- a/app-pda/msynctool/msynctool-0.22.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="3"
-
-DESCRIPTION="OpenSync msync tool"
-HOMEPAGE="http://www.opensync.org/"
-SRC_URI="http://www.opensync.org/downloads/releases/${PV}/${P}.tar.bz2"
-
-KEYWORDS="~amd64 ~ppc ~x86"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE=""
-
-RDEPEND="~app-pda/libopensync-${PV}
-	dev-libs/glib:2
-	dev-libs/libxml2
-	!app-pda/osynctool"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	sed -i -e 's: -Werror::g' \
-		-e 's: -R $(libdir)::g' \
-		tools/Makefile.in
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS README
-}
diff --git a/app-pda/multisync-gui/Manifest b/app-pda/multisync-gui/Manifest
deleted file mode 100644
index 01f3aecb19fb..000000000000
--- a/app-pda/multisync-gui/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST multisync-gui-0.91.0.tar.gz 112933 SHA256 958b9f2ecf4726095be7a8a5de5d24d325e487891dce56d02b566a93027f769d SHA512 66697d8d48d494d6a2aef7cf26cbe3b2602e9661b5c557acc15b2b0942062edcb7cba95c9c2192d097ff7a1a16f051ac613eb8dbcd2429287153fc8354f2fe2b WHIRLPOOL 137019f6d750b8045d0a35bd76dfe2330b896f4a6b413eeb66eeea64c87d5f39fb8306c8dfdb7c16add85b0c8bbdbde8599ff4edde0e37201bc0b9fb3d93d4b3
-DIST multisync-gui-0.92.0_pre20080531.tar.bz2 47265 SHA256 a7dcbcf2a1d367772e7bb83260cac8c66a524135bc96cef674d891cbec08de9d SHA512 f800f63f63283feb1fa7a2ff4f4beba4807c6ba24665a28b249ee5399a8a41062707c3cd04ff5e359c6f9c7f0f5ba4b5941d6a584befe4d8cc63b31f109fa858 WHIRLPOOL acee792dfa19d4ff039122681e2e5ff41dfc3857d3427ce1d77d5e7c2768fe527577f832f04faed47264eb4d8908e5e92367464f6812010d757adea9643642eb
diff --git a/app-pda/multisync-gui/files/multisync-gui-0.92.0-cmake.patch b/app-pda/multisync-gui/files/multisync-gui-0.92.0-cmake.patch
deleted file mode 100644
index 2edffd93e86e..000000000000
--- a/app-pda/multisync-gui/files/multisync-gui-0.92.0-cmake.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Path-fixings.
-
-http://bugs.gentoo.org/237366
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1,7 +1,7 @@
- PROJECT( multisyncgui C )
- 
--SET( MULTISYNCGUI_GLADE_DIR "${CMAKE_INSTALL_PREFIX}/usr/share/multisync-gui/" )
--SET( MULTISYNCGUI_ICON_DIR "${CMAKE_INSTALL_PREFIX}/usr/share/pixmaps/multisync-gui/" )
-+SET( MULTISYNCGUI_GLADE_DIR "${CMAKE_INSTALL_PREFIX}/share/multisync-gui/" )
-+SET( MULTISYNCGUI_ICON_DIR "${CMAKE_INSTALL_PREFIX}/share/pixmaps/" )
- 
- SET( MULTISYNCGUI_VERSION "0.36" )
- SET( MULTISYNCGUI_GLADE "${MULTISYNCGUI_GLADE_DIR}/multisyncgui.glade" )
---- a/misc/CMakeLists.txt
-+++ b/misc/CMakeLists.txt
-@@ -3,6 +3,6 @@ CONFIGURE_FILE( "${CMAKE_CURRENT_SOURCE_DIR}/multisyncgui.glade" "${CMAKE_CURREN
- 
- ###### INSTALL ################### 
- 
--INSTALL( FILES ${CMAKE_CURRENT_BINARY_DIR}/multisyncgui.desktop DESTINATION "${CMAKE_INSTALL_PREFIX}/usr/share/applications/" )
-+INSTALL( FILES ${CMAKE_CURRENT_BINARY_DIR}/multisyncgui.desktop DESTINATION "${CMAKE_INSTALL_PREFIX}/share/applications/" )
- INSTALL( FILES "${CMAKE_CURRENT_BINARY_DIR}/multisyncgui.glade" DESTINATION "${MULTISYNCGUI_GLADE_DIR}" )
- INSTALL( FILES multisync.png DESTINATION ${MULTISYNCGUI_ICON_DIR} ) 
---- a/misc/multisyncgui.desktop
-+++ b/misc/multisyncgui.desktop
-@@ -3,10 +3,10 @@ Encoding=UTF-8
- Name=multisyncgui
- Comment=Synchronization program for personal information such as calendars, addressbooks etc.
- Comment[de]=Synchronisation von Organizern, PIMs und Mobiltelefonen
--Exec=@PREFIX@/bin/multisync-gui
-+Exec=@CMAKE_INSTALL_PREFIX@/bin/multisyncgui
- Terminal=false
- Type=Application
--Icon=@MULTISYNC_ICON_DIR@/multisync.png
-+Icon=@MULTISYNCGUI_ICON_DIR@/multisync.png
- StartupWMClass=multisync
- X-Desktop-File-Install-Version=0.3
- Categories=Application;Utility;X-Red-Hat-Base;
diff --git a/app-pda/multisync-gui/files/multisync-gui-0.92.0-pixbuf-include.patch b/app-pda/multisync-gui/files/multisync-gui-0.92.0-pixbuf-include.patch
deleted file mode 100644
index af88164a8e07..000000000000
--- a/app-pda/multisync-gui/files/multisync-gui-0.92.0-pixbuf-include.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-Add gdk-pixbuf include dir (split out in gtk+-2.21).
-
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -1,4 +1,4 @@
--INCLUDE_DIRECTORIES( ${OPENSYNC_INCLUDE_DIRS} ${GTK2_INCLUDE_DIRS} ${LIBGLADE_INCLUDE_DIRS} ${LIBXML2_INCLUDE_DIRS} )
-+INCLUDE_DIRECTORIES( ${OPENSYNC_INCLUDE_DIRS} ${GTK2_INCLUDE_DIRS} ${LIBGLADE_INCLUDE_DIRS} ${LIBXML2_INCLUDE_DIRS} /usr/include/gdk-pixbuf-2.0 )
- LINK_DIRECTORIES( ${OPENSYNC_LIBRARY_DIRS} ${GTK2_LIBRARY_DIRS} ${LIBGLADE_LIBRARY_DIRS} ${LIBXML2_LIBRARY_DIRS} )
- 
- SET( multisyncgui_SRCS
diff --git a/app-pda/multisync-gui/metadata.xml b/app-pda/multisync-gui/metadata.xml
deleted file mode 100644
index 228404d3a4b2..000000000000
--- a/app-pda/multisync-gui/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>pda</herd>
-</pkgmetadata>
diff --git a/app-pda/multisync-gui/multisync-gui-0.91.0.ebuild b/app-pda/multisync-gui/multisync-gui-0.91.0.ebuild
deleted file mode 100644
index 0b9ea658fa7f..000000000000
--- a/app-pda/multisync-gui/multisync-gui-0.91.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit toolchain-funcs
-
-DESCRIPTION="OpenSync multisync-gui"
-HOMEPAGE="http://www.opensync.org/"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND="<=app-pda/libopensync-0.35
-	>=gnome-base/libgnomeui-2
-	x11-libs/gtk+:2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS=""
-
-src_configure() {
-	CPPFLAGS="${CXXFLAGS}" CFLAGS="${CXXFLAGS}" ./configure --prefix=/usr
-}
diff --git a/app-pda/multisync-gui/multisync-gui-0.92.0_pre20080531.ebuild b/app-pda/multisync-gui/multisync-gui-0.92.0_pre20080531.ebuild
deleted file mode 100644
index e1fe569265a8..000000000000
--- a/app-pda/multisync-gui/multisync-gui-0.92.0_pre20080531.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit cmake-utils
-
-DESCRIPTION="OpenSync multisync-gui"
-HOMEPAGE="http://www.opensync.org/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-KEYWORDS="~amd64 ~ppc ~x86"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE=""
-
-RDEPEND="~app-pda/libopensync-0.36
-	>=dev-libs/libxml2-2.6.30
-	>=gnome-base/libglade-2.6.2:2.0
-	>=x11-libs/gtk+-2.21:2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-0.92.0-cmake.patch \
-		"${FILESDIR}"/${PN}-0.92.0-pixbuf-include.patch
-}
diff --git a/app-pda/osynctool/Manifest b/app-pda/osynctool/Manifest
deleted file mode 100644
index d87cd8227ca3..000000000000
--- a/app-pda/osynctool/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST osynctool-0.39.tar.bz2 55850 SHA256 9690bc7720fadd1517c56f04b480d99c87304a43dc6e04b89bf1f59bb7e6764d SHA512 3e814b5b0261c8c69da451d1ce8d8380ebb1058f134a6d47e9e863036d3321866f4a8c1f71d23b9552d0abe7317bc9df3afcc64e97b35f7091d28b3ba8c2f4b6 WHIRLPOOL 168524b6469020d73b7a14ed40c987854c8b849f1e7eb26e10910dfa5a37b7d80424ebe460c1bfc9aaa0703cc8672d9b2d873702b7b759e246b1496b67531426
diff --git a/app-pda/osynctool/metadata.xml b/app-pda/osynctool/metadata.xml
deleted file mode 100644
index 65fffc6ff831..000000000000
--- a/app-pda/osynctool/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>pda</herd>
-<longdescription lang="en">
-Command line interface for OpenSync.
-You can use this tool to synchronize your devices and applications using the OpenSync framework from the command line.
-</longdescription>
-</pkgmetadata>
-
diff --git a/app-pda/osynctool/osynctool-0.39.ebuild b/app-pda/osynctool/osynctool-0.39.ebuild
deleted file mode 100644
index 1e9e0e50cf76..000000000000
--- a/app-pda/osynctool/osynctool-0.39.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="3"
-
-inherit cmake-utils
-
-DESCRIPTION="Command line interface for OpenSync"
-HOMEPAGE="http://www.opensync.org/"
-SRC_URI="http://www.opensync.org/download/releases/${PV}/${P}.tar.bz2"
-
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE=""
-
-RDEPEND="~app-pda/libopensync-${PV}
-	dev-libs/glib:2
-	!app-pda/msynctool"
-DEPEND="${DEPEND}"
-
-DOCS="AUTHORS CODING"
-
-src_prepare() {
-	sed -i -e 's:/etc/bash_completion.d:/share/bash-completion:g' \
-		tools/CMakeLists.txt
-}
diff --git a/app-pda/osynctool/osynctool-9999.ebuild b/app-pda/osynctool/osynctool-9999.ebuild
deleted file mode 100644
index b4957991f6f9..000000000000
--- a/app-pda/osynctool/osynctool-9999.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="3"
-
-inherit cmake-utils subversion
-
-DESCRIPTION="Command line interface for OpenSync"
-HOMEPAGE="http://www.opensync.org/"
-SRC_URI=""
-
-ESVN_REPO_URI="http://svn.opensync.org/osynctool/trunk"
-
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE=""
-
-RDEPEND="~app-pda/libopensync-${PV}
-	dev-libs/glib:2
-	!app-pda/msynctool"
-DEPEND="${DEPEND}"
-
-DOCS="AUTHORS CODING"
-
-src_prepare() {
-	sed -i -e 's:/etc/bash_completion.d:/share/bash-completion:g' \
-		tools/CMakeLists.txt
-}
diff --git a/app-portage/gentoolkit/files/0.3.1-setup.py-print.patch b/app-portage/gentoolkit/files/0.3.1-setup.py-print.patch
new file mode 100644
index 000000000000..29f7a186d1ef
--- /dev/null
+++ b/app-portage/gentoolkit/files/0.3.1-setup.py-print.patch
@@ -0,0 +1,29 @@
+From 4e06e9f032ed187ce682434955778c3241854e26 Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Sun, 20 Dec 2015 15:19:06 -0500
+Subject: [PATCH] Remove useless print() in set_version
+
+This was causing a TypeError in python3.
+
+Bug: https://bugs.gentoo.org/568906
+---
+ setup.py | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index b32b7d6..01e4b3e 100755
+--- a/setup.py
++++ b/setup.py
+@@ -80,9 +80,6 @@ class set_version(core.Command):
+ 				with io.open(f[0], 'r', 1, 'utf_8') as s:
+ 					for line in s:
+ 						newline = re.sub(pattern %f[1], '"%s"' % ver, line, 1)
+-						if newline != line:
+-							#log.info("%s: %s" % (f, newline))
+-							print("%s: %s" % (f[0], newline.encode('utf_8').strip('\n')))
+ 						updated_file.append(newline)
+ 				with io.open(f[0], 'w', 1, 'utf_8') as s:
+ 					s.writelines(updated_file)
+-- 
+2.6.4
+
diff --git a/app-portage/gentoolkit/gentoolkit-0.3.0.9-r2.ebuild b/app-portage/gentoolkit/gentoolkit-0.3.0.9-r2.ebuild
index 182dc47c0907..f1d049783c9e 100644
--- a/app-portage/gentoolkit/gentoolkit-0.3.0.9-r2.ebuild
+++ b/app-portage/gentoolkit/gentoolkit-0.3.0.9-r2.ebuild
@@ -7,7 +7,7 @@ EAPI="5"
 PYTHON_COMPAT=(python{2_7,3_3,3_4} pypy)
 PYTHON_REQ_USE="xml(+),threads(+)"
 
-inherit distutils-r1
+inherit distutils-r1 eutils
 
 DESCRIPTION="Collection of administration scripts for Gentoo"
 HOMEPAGE="https://www.gentoo.org/proj/en/portage/tools/index.xml"
@@ -36,6 +36,7 @@ PATCHES=(
 )
 
 python_prepare_all() {
+	epatch "${FILESDIR}/0.3.1-setup.py-print.patch"
 	python_setup
 	echo VERSION="${PVR}" "${PYTHON}" setup.py set_version
 	VERSION="${PVR}" "${PYTHON}" setup.py set_version
diff --git a/app-portage/gentoolkit/gentoolkit-0.3.1.ebuild b/app-portage/gentoolkit/gentoolkit-0.3.1.ebuild
index 4311b00395b3..7621d423fa82 100644
--- a/app-portage/gentoolkit/gentoolkit-0.3.1.ebuild
+++ b/app-portage/gentoolkit/gentoolkit-0.3.1.ebuild
@@ -7,7 +7,7 @@ EAPI="5"
 PYTHON_COMPAT=(python{2_7,3_3,3_4,3_5} pypy)
 PYTHON_REQ_USE="xml(+),threads(+)"
 
-inherit distutils-r1
+inherit distutils-r1 eutils
 
 DESCRIPTION="Collection of administration scripts for Gentoo"
 HOMEPAGE="https://www.gentoo.org/proj/en/portage/tools/index.xml"
@@ -28,6 +28,7 @@ RDEPEND="${DEPEND}
 	sys-apps/grep"
 
 python_prepare_all() {
+	epatch "${FILESDIR}/0.3.1-setup.py-print.patch"
 	python_setup
 	echo VERSION="${PVR}" "${PYTHON}" setup.py set_version
 	VERSION="${PVR}" "${PYTHON}" setup.py set_version
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index 004a4ff113b5..ed59351cfae9 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -1,5 +1,3 @@
 DIST poppler-0.32.0.tar.xz 1609624 SHA256 4963e31ba5e17530a87b16588e22928bc044e8d28d02303dded981bff6725b98 SHA512 f68355a0242ce467b9d7d7f47cc0c3b08f015c38b147eaeddc392e693239bce2b1b3832bd5e5411f25edddab6d3cea8ca0be151372a86963610a4eae3ea50eee WHIRLPOOL bb56d497f435ccb78dfeb0125ca5d003d08769fe74e11da940f6f5399194698e1908c22d815129e6d1f1a7a9855a68ad7043a3bdd4779045fcf64dd97ade3d22
-DIST poppler-0.36.0.tar.xz 1629984 SHA256 93cc067b23c4ef7421380d3e8bd7c940b2027668446750787d7c1cb42720248e SHA512 36f7ea892d05c73d2862b6d5a29753cfe6823f54f8449e010b9960b59d9c698ba4f239625e8dbf41a235ae61203d8b445f775f5622b38c6d24328870e77371c5 WHIRLPOOL 4111ab5146a65ef4485ff010b9056dfd6573c9d72af3d07c5a16bde49c25ded5c05e26285d672e33a06b05845fdfef240170359ebe4547191a7ca695a91e3e90
-DIST poppler-0.37.0.tar.xz 1636496 SHA256 b89f9c5eae3bbb1046b0f767714afd75eca102a0406a3a30856778d42a685bee SHA512 9cdff2da9d13b8db25a24e8703ab411da1caa6545cd25b6153ce019c185cd90eda8dbb59a5c320ea6e8ec1896b0197987acc72ba233d6ece4e212a2132a6b087 WHIRLPOOL 8dda998aac39d86caf215a4c9f3019918282e800d37a29e8f686527e6f2eba6177dbd70968254085008b7a86e34327cbb80b01473a52bf941ad9ad3511fe2341
 DIST poppler-0.38.0.tar.xz 1637772 SHA256 6f0c0d49c8346d7c0cfe6348124e7f19cc901b5d35c9cd89944aac6e454e8a8b SHA512 1b8643c0f58eb1e1c3d98266c38d311c66458168188146af72c99c9f374882bdc616aa3febd8833538b286652c21a567e6240aa590111bcebcba5ee845e6bad9 WHIRLPOOL 05a75ca4ed3741273eefe003026caa1f9bb1e3d9f08d1e3885d2fddd7704349434b6deb1f9e755312d7a5b040e85435b0baa92f4934c4d220b1ea8625ebff4f5
 DIST poppler-0.39.0.tar.xz 1641156 SHA256 afd75befa9c3a41e1d7755c4e43dea70cfd8f1a4dac118e83032cbb41ce17bb9 SHA512 046a80d5cbbdf1dda57ebcd09a77eb80239a85b0d8250d89174e5a69ce171000c4ab624f6c00b599b30d4ed2559976c8e527b3ed65f04c6d3f582c3e2b75e522 WHIRLPOOL 5722c48d0d2278134f7fa353d327a6fed0ae63b96f0f1e8edd2107c9d7012a8e95d2996887e415e4cfe525cf64b7d5630c75620376fc075297397fd57f7f2be7
diff --git a/app-text/poppler/poppler-0.36.0.ebuild b/app-text/poppler/poppler-0.36.0.ebuild
deleted file mode 100644
index 971bdb07c1c9..000000000000
--- a/app-text/poppler/poppler-0.36.0.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit cmake-utils toolchain-funcs
-
-if [[ "${PV}" == "9999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="git://git.freedesktop.org/git/${PN}/${PN}"
-	SLOT="0/9999"
-else
-	SRC_URI="http://poppler.freedesktop.org/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-	SLOT="0/55"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
-fi
-
-DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
-HOMEPAGE="http://poppler.freedesktop.org/"
-
-LICENSE="GPL-2"
-IUSE="cairo cjk curl cxx debug doc +introspection +jpeg +jpeg2k +lcms png qt4 qt5 tiff +utils"
-
-# No test data provided
-RESTRICT="test"
-
-COMMON_DEPEND="
-	>=media-libs/fontconfig-2.6.0
-	>=media-libs/freetype-2.3.9
-	sys-libs/zlib
-	cairo? (
-		dev-libs/glib:2
-		>=x11-libs/cairo-1.10.0
-		introspection? ( >=dev-libs/gobject-introspection-1.32.1 )
-	)
-	curl? ( net-misc/curl )
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( media-libs/openjpeg:2= )
-	lcms? ( media-libs/lcms:2 )
-	png? ( media-libs/libpng:0= )
-	qt4? (
-		dev-qt/qtcore:4
-		dev-qt/qtgui:4
-	)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtxml:5
-	)
-	tiff? ( media-libs/tiff:0 )
-"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-"
-RDEPEND="${COMMON_DEPEND}
-	cjk? ( >=app-text/poppler-data-0.4.4 )
-"
-
-DOCS=(AUTHORS NEWS README README-XPDF TODO)
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.26.0-qt5-dependencies.patch"
-	"${FILESDIR}/${PN}-0.28.1-fix-multilib-configuration.patch"
-	"${FILESDIR}/${PN}-0.28.1-respect-cflags.patch"
-	"${FILESDIR}/${PN}-0.33.0-openjpeg2.patch"
-)
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# Clang doesn't grok this flag, the configure nicely tests that, but
-	# cmake just uses it, so remove it if we use clang
-	if [[ ${CC} == clang ]] ; then
-		sed -i -e 's/-fno-check-new//' cmake/modules/PopplerMacros.cmake || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_GTK_TESTS=OFF
-		-DBUILD_QT4_TESTS=OFF
-		-DBUILD_QT5_TESTS=OFF
-		-DBUILD_CPP_TESTS=OFF
-		-DENABLE_SPLASH=ON
-		-DENABLE_ZLIB=ON
-		-DENABLE_XPDF_HEADERS=ON
-		$(cmake-utils_use_enable curl LIBCURL)
-		$(cmake-utils_use_enable cxx CPP)
-		$(cmake-utils_use_enable utils)
-		$(cmake-utils_use_with cairo)
-		$(cmake-utils_use_with introspection GObjectIntrospection)
-		$(cmake-utils_use_with jpeg)
-		$(cmake-utils_use_with png)
-		$(cmake-utils_use_with qt4)
-		$(cmake-utils_use_find_package qt5 Qt5Core)
-		$(cmake-utils_use_with tiff)
-	)
-	if use jpeg2k; then
-		mycmakeargs+=(-DENABLE_LIBOPENJPEG=openjpeg2)
-	else
-		mycmakeargs+=(-DENABLE_LIBOPENJPEG=)
-	fi
-	if use lcms; then
-		mycmakeargs+=(-DENABLE_CMS=lcms2)
-	else
-		mycmakeargs+=(-DENABLE_CMS=)
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# live version doesn't provide html documentation
-	if use cairo && use doc && [[ ${PV} != 9999 ]]; then
-		# For now install gtk-doc there
-		insinto /usr/share/gtk-doc/html/poppler
-		doins -r "${S}"/glib/reference/html/*
-	fi
-}
diff --git a/app-text/poppler/poppler-0.37.0.ebuild b/app-text/poppler/poppler-0.37.0.ebuild
deleted file mode 100644
index a09d7d5f15f2..000000000000
--- a/app-text/poppler/poppler-0.37.0.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit cmake-utils toolchain-funcs
-
-if [[ "${PV}" == "9999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="git://git.freedesktop.org/git/${PN}/${PN}"
-	SLOT="0/9999"
-else
-	SRC_URI="http://poppler.freedesktop.org/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-	SLOT="0/56"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
-fi
-
-DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
-HOMEPAGE="http://poppler.freedesktop.org/"
-
-LICENSE="GPL-2"
-IUSE="cairo cjk curl cxx debug doc +introspection +jpeg +jpeg2k +lcms png qt4 qt5 tiff +utils"
-
-# No test data provided
-RESTRICT="test"
-
-COMMON_DEPEND="
-	>=media-libs/fontconfig-2.6.0
-	>=media-libs/freetype-2.3.9
-	sys-libs/zlib
-	cairo? (
-		dev-libs/glib:2
-		>=x11-libs/cairo-1.10.0
-		introspection? ( >=dev-libs/gobject-introspection-1.32.1 )
-	)
-	curl? ( net-misc/curl )
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( media-libs/openjpeg:2= )
-	lcms? ( media-libs/lcms:2 )
-	png? ( media-libs/libpng:0= )
-	qt4? (
-		dev-qt/qtcore:4
-		dev-qt/qtgui:4
-	)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtxml:5
-	)
-	tiff? ( media-libs/tiff:0 )
-"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-"
-RDEPEND="${COMMON_DEPEND}
-	cjk? ( >=app-text/poppler-data-0.4.4 )
-"
-
-DOCS=(AUTHORS NEWS README README-XPDF TODO)
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.26.0-qt5-dependencies.patch"
-	"${FILESDIR}/${PN}-0.28.1-fix-multilib-configuration.patch"
-	"${FILESDIR}/${PN}-0.28.1-respect-cflags.patch"
-	"${FILESDIR}/${PN}-0.33.0-openjpeg2.patch"
-)
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# Clang doesn't grok this flag, the configure nicely tests that, but
-	# cmake just uses it, so remove it if we use clang
-	if [[ ${CC} == clang ]] ; then
-		sed -i -e 's/-fno-check-new//' cmake/modules/PopplerMacros.cmake || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_GTK_TESTS=OFF
-		-DBUILD_QT4_TESTS=OFF
-		-DBUILD_QT5_TESTS=OFF
-		-DBUILD_CPP_TESTS=OFF
-		-DENABLE_SPLASH=ON
-		-DENABLE_ZLIB=ON
-		-DENABLE_XPDF_HEADERS=ON
-		$(cmake-utils_use_enable curl LIBCURL)
-		$(cmake-utils_use_enable cxx CPP)
-		$(cmake-utils_use_enable utils)
-		$(cmake-utils_use_with cairo)
-		$(cmake-utils_use_with introspection GObjectIntrospection)
-		$(cmake-utils_use_with jpeg)
-		$(cmake-utils_use_with png)
-		$(cmake-utils_use_with qt4)
-		$(cmake-utils_use_find_package qt5 Qt5Core)
-		$(cmake-utils_use_with tiff)
-	)
-	if use jpeg2k; then
-		mycmakeargs+=(-DENABLE_LIBOPENJPEG=openjpeg2)
-	else
-		mycmakeargs+=(-DENABLE_LIBOPENJPEG=)
-	fi
-	if use lcms; then
-		mycmakeargs+=(-DENABLE_CMS=lcms2)
-	else
-		mycmakeargs+=(-DENABLE_CMS=)
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# live version doesn't provide html documentation
-	if use cairo && use doc && [[ ${PV} != 9999 ]]; then
-		# For now install gtk-doc there
-		insinto /usr/share/gtk-doc/html/poppler
-		doins -r "${S}"/glib/reference/html/*
-	fi
-}
diff --git a/dev-haskell/scientific/scientific-0.3.3.8.ebuild b/dev-haskell/scientific/scientific-0.3.3.8.ebuild
index 625b739ee7fd..ba988a4c1c96 100644
--- a/dev-haskell/scientific/scientific-0.3.3.8.ebuild
+++ b/dev-haskell/scientific/scientific-0.3.3.8.ebuild
@@ -5,7 +5,6 @@
 EAPI=5
 
 # ebuild generated by hackport 0.4.4.9999
-#hackport: flags: -integer-simple
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
@@ -36,6 +35,5 @@ DEPEND="${RDEPEND}
 
 src_configure() {
 	haskell-cabal_src_configure \
-		$(cabal_flag bytestring-builder bytestring-builder) \
-		--flag=-integer-simple
+		$(cabal_flag bytestring-builder bytestring-builder)
 }
diff --git a/dev-java/cortado/cortado-0.6.0-r1.ebuild b/dev-java/cortado/cortado-0.6.0-r1.ebuild
index e7e72b0d9031..b70bc3d674a0 100644
--- a/dev-java/cortado/cortado-0.6.0-r1.ebuild
+++ b/dev-java/cortado/cortado-0.6.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://downloads.xiph.org/releases/cortado/${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 
 RDEPEND=">=virtual/jre-1.6"
 DEPEND=">=virtual/jdk-1.6
@@ -21,8 +21,8 @@ DEPEND=">=virtual/jdk-1.6
 EANT_BUILD_TARGET="stripped"
 
 src_prepare() {
-	echo "#!/bin/sh" > scripts/get-revision
-	echo "echo ${PV}"    >> scripts/get-revision
+	echo "#!/bin/sh" > scripts/get-revision || die
+	echo "echo ${PV}" >> scripts/get-revision || die
 }
 
 src_install() {
diff --git a/dev-java/cortado/cortado-0.6.0.ebuild b/dev-java/cortado/cortado-0.6.0.ebuild
deleted file mode 100644
index 3c61568b356f..000000000000
--- a/dev-java/cortado/cortado-0.6.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=2
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Multimedia framework for Java written by Fluendo"
-HOMEPAGE="http://www.theora.org/cortado/"
-SRC_URI="http://downloads.xiph.org/releases/cortado/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE=""
-
-COMMON_DEP=""
-
-RDEPEND=">=virtual/jre-1.4
-	${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.4
-	app-arch/unzip
-	${COMMON_DEP}"
-
-EANT_BUILD_TARGET=stripped
-
-src_prepare() {
-	echo "#!/bin/sh" > scripts/get-revision
-	echo "echo ${PV}"    >> scripts/get-revision
-}
-
-src_install() {
-	java-pkg_newjar output/dist/applet/${PN}-ovt-stripped-${PV}.jar
-	dodoc ChangeLog HACKING NEWS README RELEASE TODO \
-		|| die "dodoc failed"
-}
diff --git a/dev-java/jebl/jebl-2013.02.18.ebuild b/dev-java/jebl/jebl-2013.02.18.ebuild
index 1cbad0389c43..862383ee30c2 100644
--- a/dev-java/jebl/jebl-2013.02.18.ebuild
+++ b/dev-java/jebl/jebl-2013.02.18.ebuild
@@ -1,34 +1,26 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
-
-#ESVN_REPO_URI="https://jebl.svn.sourceforge.net/svnroot/jebl/trunk/jebl"
-#ESVN_REPO_URI="https://jebl.svn.sourceforge.net/svnroot/jebl/tags/${P//./_}"
-
 JAVA_PKG_IUSE="doc"
-EANT_BUILD_TARGET="dist"
-EANT_DOC_TARGET="document"
 
-#inherit subversion java-pkg-2 java-ant-2
 inherit java-pkg-2 java-ant-2
 
 DESCRIPTION="Java Evolutionary Biology Library"
 HOMEPAGE="http://jebl.sourceforge.net/"
-#SRC_URI=""
 SRC_URI="https://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 SLOT="0"
 LICENSE="LGPL-2.1"
 IUSE=""
 
-CDEPEND=""
-DEPEND="${CDEPEND}
-	>=virtual/jdk-1.5"
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.5"
+DEPEND=">=virtual/jdk-1.5"
+RDEPEND=">=virtual/jre-1.5"
+
+EANT_BUILD_TARGET="dist"
+EANT_DOC_TARGET="document"
 
 java_prepare() {
 	rm -rf "${S}/src/org/virion/jam/maconly" || die
diff --git a/dev-java/jebl/jebl-9999.ebuild b/dev-java/jebl/jebl-9999.ebuild
deleted file mode 100644
index 32115c9f4878..000000000000
--- a/dev-java/jebl/jebl-9999.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="2"
-
-ESVN_REPO_URI="https://jebl.svn.sourceforge.net/svnroot/jebl/trunk/jebl"
-#ESVN_REPO_URI="https://jebl.svn.sourceforge.net/svnroot/jebl/tags/${P//./_}"
-
-JAVA_PKG_IUSE="doc"
-EANT_BUILD_TARGET="dist"
-EANT_DOC_TARGET="document"
-
-inherit subversion java-pkg-2 java-ant-2
-#inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Java Evolutionary Biology Library"
-HOMEPAGE="http://jebl.sourceforge.net/"
-SRC_URI=""
-#SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-KEYWORDS=""
-SLOT="0"
-LICENSE="LGPL-2.1"
-IUSE=""
-
-CDEPEND=""
-DEPEND="${CDEPEND}
-	>=virtual/jdk-1.5"
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.5"
-
-S="${WORKDIR}/${P//./_}"
-
-java_prepare() {
-	rm -rf "${S}/src/org/virion/jam/maconly" || die
-}
-
-src_install() {
-	java-pkg_dojar dist/jebl.jar || die
-	java-pkg_dojar dist/jam.jar || die
-	use doc && java-pkg_dojavadoc doc/api
-}
diff --git a/dev-java/jung/jung-1.7.6-r1.ebuild b/dev-java/jung/jung-1.7.6-r1.ebuild
new file mode 100644
index 000000000000..ae0b0e213b14
--- /dev/null
+++ b/dev-java/jung/jung-1.7.6-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="The Java Universal Network/Graph Framework"
+HOMEPAGE="http://jung.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.zip"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+CDEPEND="
+	dev-java/colt:0
+	dev-java/commons-collections:0"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="
+	${CDEPEND}
+	app-arch/unzip
+	>=virtual/jdk-1.6"
+
+JAVA_SRC_DIR="src/edu"
+
+JAVA_GENTOO_CLASSPATH="
+	colt
+	commons-collections
+"
+
+java_prepare() {
+	java-pkg_clean
+}
diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index 0559144df3cc..ce071e264eb8 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -1,4 +1,3 @@
-DIST ruby-1.9.3-p551.tar.bz2 10049332 SHA256 b0c5e37e3431d58613a160504b39542ec687d473de1d4da983dabcf3c5de771e SHA512 5ea40f8c40cf116030ffdedbe436c1fdbf9a50b7bb44bc890845c9c2a885c34da711bc1a9e9694788c2f4710f7e6e0adc4410aec1ab18a25a27168f25ac3d68c WHIRLPOOL a4de6b7300e1f1cb22b01b1fbe0a73928baf6e5b1d083e8eb239e7696703e13774fdcb52bbb7f4253ea75b597663c43a8fbea2df7b77ed95f3fd8b2512ff1f1e
 DIST ruby-2.0.0-p645.tar.xz 8295192 SHA256 875be4f57bdbb2d2be0d64bfd8fc5022f004d55261ead8fd0cdc2e9e415e9f7b SHA512 440f8ea50f51c53f90e42a8dfd7cd41f806b290d5c12c09f84d9159ab9c95e19b036cd8a5dc788844da501b9fcd1fa8ad8352ef7417998debc1b43a61a4ea4dc WHIRLPOOL 6201a39976f793dd3702ba580aafb881ba6e9f5cbc9d544bdddf508ca86dc14fc2970451a386ba495d16f2f68724197ef089ba02e7d1a9423870a0fa5c39cbc8
 DIST ruby-2.0.0-p647.tar.xz 8301008 SHA256 9f793880df1209ea4e5c10ee9d8ef79caa0e73ee769f745f1c191505255e2847 SHA512 38fd2ad631588a0e8adf9a7ae01cb5274eca4fd794c5ed7030e5fae9e53cd8920eaac9d388c73b844a154c7eb56fa6fed8e2ee5df5617efd624b6a568ea4953b WHIRLPOOL c8ec19ed900e6578f1f6e08d1e2a5c015cfa6e81379fb0437a1167ffb8bc56561d02b4b5b35a674039f7adcd2c43b222b89e139cb0ea702e8bfec886872c8e6a
 DIST ruby-2.0.0-p648.tar.xz 8303584 SHA256 22fe97739110ba9171b13fc4dcd1a92e767f16769de3593ee41ef1283d218402 SHA512 95df515d37f04193eaceaded4a4f568f83041683349cd44767803f77361a66533226d83eac6586ac894ae61d79bd36ce047f951aed43f9a8356dbb3244280774 WHIRLPOOL ef78b838d061b1707219453a70c8b4a503d46e9f95797007555943a837de21f22c0c93039c75172d7df4fe9b5eca38472ee7177f98785cb5993c7e80140a1d27
@@ -8,7 +7,6 @@ DIST ruby-2.1.8.tar.xz 9382672 SHA256 94eeae3b3e3ac93cfd205e1aaef4c5325227b7656c
 DIST ruby-2.2.2.tar.xz 10463044 SHA256 f033b5d08ab57083e48c1d81bcd7399967578c370b664da90e12a32891424462 SHA512 bd72d0a4c017e2527659f64ef2781bbe8bd540a2302eaa60234a12282fd53c359e04205c56385402c67e81bb9dab3b88de53de82e12bb13e3386c26301043b64 WHIRLPOOL ee9c3a664ac1d67bd9ff4ed8fcc7d4c8e9b6e2f5774c938f876223b22022b498932afc41990890a03b560c65ffe29a039761d18bbeeab46fe13cbfff515bc115
 DIST ruby-2.2.3.tar.xz 10453204 SHA256 c6ec90e9ed018e6d9a578fc93755d8565839908d5796809e1aecd1798c7ea8a7 SHA512 e3ce3333e8d59f4f3bfc84cf9bbbc6f74272470e12913d299fd1d41fc166dee21921eed1789591f50c3f3b6e5fd38fd1b99855c16aff28bdc4ae8fcc680c71bd WHIRLPOOL 3fae4fc3112f24004f0f043d29b2e624e559fa3d53e6b0479af03df910d210aaeb8274c294dfe1ef0602f63790b4cdc31147d5fd92707e38ea29f01fd07e8839
 DIST ruby-2.2.4.tar.xz 10464500 SHA256 d28bff4641e382681c58072ddc244d025ac47ff71dd9426a92fcfc3830d1773c SHA512 755257eea0cb79f28f1d2dc6e2a5ee4b1954280f51153e5fe90605a875b1d52077660b87e4e04d11552591a1f60a1241e4c70056f073a217b3bad896f64780da WHIRLPOOL 9d3d549dce991d2d594df624bf2f55f4ff9269c35193b190e3fd774b8883facb568f010a3b79927e083cc5bad277281e4c8a9fc3979f609fca50f86775563484
-DIST ruby-patches-1.9.3_p551-r1.tar.bz2 3685 SHA256 362d94b77c3408d200c42855868ebb5ddbee287d66bbed8e269255f9cb63418a SHA512 646a1979c1b879ef46cb195204bdcea83215f6407331f92d8caed910e03d1f426bfb203629f4bea307740742757877edae22bf9978b55cbda03921a0c25b8409 WHIRLPOOL 3001b1c6189a882a45125d04b6264e22e0bf2b773c249bf00c2cfc98dec3392ae422913d278aae289767db0aaf8782e1a7dd44e94965aa02893833d5737ad494
 DIST ruby-patches-2.0.0_p645.tar.bz2 2947 SHA256 dc173fe94af215fd2c1823f46140e4f11892dec59ce55b10ffad26b622bb6e4e SHA512 423a4fddfc8d7fd4f5b041989da343bc96ce0c3f22a448cab8cec47d4c458f4deeb83b167a0a3ae71d3be57df9b41151d1cafadd191bd3d3e9b08b32732e36cd WHIRLPOOL 9c728e95cf01abdb48afc2ff008dc73d341096b253c664297b6780b32821c1ec406c388ce5860b5dd2ce2de862fb80b2ae45d03750045aaf13c371743f97c92e
 DIST ruby-patches-2.0.0_p647-r1.tar.bz2 3341 SHA256 7d82403fed6216baed59ac1fbba888e2b9a4a9cb742ffd01531753bae07ab6b8 SHA512 40d07275a391df3e0a7a0c2705913c8120a548e223032dc39993f8f873c8d0639646cf728dc95f1400352a13766623ac6d69a1b1ff03183df6fabf32946dd7a6 WHIRLPOOL ed7ea6b1c1fd3570ea85b885f7455d8273cff2a9db2540c9e89faca867bd5eed2b4de52c7d21a96bb33ae0beedce113c68bb6c8cee4688650ff5169bd9c265fd
 DIST ruby-patches-2.0.0_p647.tar.bz2 2947 SHA256 dc173fe94af215fd2c1823f46140e4f11892dec59ce55b10ffad26b622bb6e4e SHA512 423a4fddfc8d7fd4f5b041989da343bc96ce0c3f22a448cab8cec47d4c458f4deeb83b167a0a3ae71d3be57df9b41151d1cafadd191bd3d3e9b08b32732e36cd WHIRLPOOL 9c728e95cf01abdb48afc2ff008dc73d341096b253c664297b6780b32821c1ec406c388ce5860b5dd2ce2de862fb80b2ae45d03750045aaf13c371743f97c92e
diff --git a/dev-lang/ruby/metadata.xml b/dev-lang/ruby/metadata.xml
index bf0744a3d1d3..312287f02d28 100644
--- a/dev-lang/ruby/metadata.xml
+++ b/dev-lang/ruby/metadata.xml
@@ -15,11 +15,6 @@
       readline extension will not be built (and irb will lose line
       editing functionality).
     </flag>
-    <flag name="yaml">
-      Use the <pkg>dev-libs/libyaml</pkg> library to build the psych
-      extension, available since Ruby 1.9.2_rc2, in alternative to the
-      bundled syck-based parser.
-    </flag>
     <flag name="rdoc">
       Install <pkg>dev-ruby/rdoc</pkg> after installing Ruby.
     </flag>
diff --git a/dev-lang/ruby/ruby-1.9.3_p551-r1.ebuild b/dev-lang/ruby/ruby-1.9.3_p551-r1.ebuild
deleted file mode 100644
index c8dc37680fea..000000000000
--- a/dev-lang/ruby/ruby-1.9.3_p551-r1.ebuild
+++ /dev/null
@@ -1,217 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-#PATCHSET=1
-
-inherit autotools eutils flag-o-matic multilib versionator
-
-RUBYPL=$(get_version_component_range 4)
-
-MY_P="${PN}-$(get_version_component_range 1-3)-${RUBYPL:-0}"
-S=${WORKDIR}/${MY_P}
-
-SLOT=$(get_version_component_range 1-2)
-MY_SUFFIX=$(delete_version_separator 1 ${SLOT})
-# 1.9.3 still uses 1.9.1
-RUBYVERSION=1.9.1
-
-if [[ -n ${PATCHSET} ]]; then
-	if [[ ${PVR} == ${PV} ]]; then
-		PATCHSET="${PV}-r0.${PATCHSET}"
-	else
-		PATCHSET="${PVR}.${PATCHSET}"
-	fi
-else
-	PATCHSET="${PVR}"
-fi
-
-DESCRIPTION="An object-oriented scripting language"
-HOMEPAGE="http://www.ruby-lang.org/"
-SRC_URI="mirror://ruby/1.9/${MY_P}.tar.bz2
-		 https://dev.gentoo.org/~flameeyes/ruby-team/${PN}-patches-${PATCHSET}.tar.bz2"
-
-LICENSE="|| ( Ruby-BSD BSD-2 )"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="berkdb debug doc examples gdbm ipv6 +rdoc rubytests socks5 ssl xemacs ncurses +readline +yaml" #libedit
-
-# libedit support is removed everywhere because of this upstream bug:
-# http://redmine.ruby-lang.org/issues/show/3698
-
-RDEPEND="
-	berkdb? ( sys-libs/db )
-	gdbm? ( sys-libs/gdbm )
-	ssl? ( dev-libs/openssl:0 )
-	socks5? ( >=net-proxy/dante-1.1.13 )
-	ncurses? ( sys-libs/ncurses )
-	readline?  ( sys-libs/readline )
-	yaml? ( dev-libs/libyaml )
-	virtual/libffi
-	sys-libs/zlib
-	>=app-eselect/eselect-ruby-20100402
-	!<dev-ruby/rdoc-3.9.4
-	!<dev-ruby/rubygems-1.8.10-r1"
-#	libedit? ( dev-libs/libedit )
-#	!libedit? ( readline? ( sys-libs/readline ) )
-
-DEPEND="${RDEPEND}"
-PDEPEND="
-	virtual/rubygems[ruby_targets_ruby19]
-	rdoc? ( >=dev-ruby/rdoc-3.9.4[ruby_targets_ruby19] )
-	xemacs? ( app-xemacs/ruby-modes )"
-
-src_prepare() {
-	EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" \
-		epatch "${WORKDIR}/patches"
-
-	einfo "Unbundling gems..."
-	cd "$S"
-	rm -r \
-		{bin,lib}/rake lib/rake.rb man/rake.1 \
-		ext/json \
-		bin/gem || die "removal failed"
-
-	# Fix a hardcoded lib path in configure script
-	sed -i -e "s:\(RUBY_LIB_PREFIX=\"\${prefix}/\)lib:\1$(get_libdir):" \
-		configure.in || die "sed failed"
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=
-
-	# -fomit-frame-pointer makes ruby segfault, see bug #150413.
-	filter-flags -fomit-frame-pointer
-	# In many places aliasing rules are broken; play it safe
-	# as it's risky with newer compilers to leave it as it is.
-	append-flags -fno-strict-aliasing
-	# SuperH needs this
-	use sh && append-flags -mieee
-
-	# Socks support via dante
-	if use socks5 ; then
-		# Socks support can't be disabled as long as SOCKS_SERVER is
-		# set and socks library is present, so need to unset
-		# SOCKS_SERVER in that case.
-		unset SOCKS_SERVER
-	fi
-
-	# Increase GC_MALLOC_LIMIT if set (default is 8000000)
-	if [ -n "${RUBY_GC_MALLOC_LIMIT}" ] ; then
-		append-flags "-DGC_MALLOC_LIMIT=${RUBY_GC_MALLOC_LIMIT}"
-	fi
-
-	# ipv6 hack, bug 168939. Needs --enable-ipv6.
-	use ipv6 || myconf="${myconf} --with-lookup-order-hack=INET"
-
-#	if use libedit; then
-#		einfo "Using libedit to provide readline extension"
-#		myconf="${myconf} --enable-libedit --with-readline"
-#	elif use readline; then
-#		einfo "Using readline to provide readline extension"
-#		myconf="${myconf} --with-readline"
-#	else
-#		myconf="${myconf} --without-readline"
-#	fi
-	myconf="${myconf} $(use_with readline)"
-
-	# Always disable tk because the module is no longer compatible with
-	# stable tcl/tk: https://bugs.gentoo.org/show_bug.cgi?id=500894
-	INSTALL="${EPREFIX}/usr/bin/install -c" econf \
-		--program-suffix=${MY_SUFFIX} \
-		--with-soname=ruby${MY_SUFFIX} \
-		--enable-shared \
-		--enable-pthread \
-		--without-tk \
-		$(use_enable socks5 socks) \
-		$(use_enable doc install-doc) \
-		--enable-ipv6 \
-		$(use_enable debug) \
-		$(use_with berkdb dbm) \
-		$(use_with gdbm) \
-		$(use_with ssl openssl) \
-		$(use_with ncurses curses) \
-		$(use_with yaml psych) \
-		${myconf} \
-		--enable-option-checking=no \
-		|| die "econf failed"
-}
-
-src_compile() {
-	emake V=1 EXTLDFLAGS="${LDFLAGS}" || die "emake failed"
-}
-
-src_test() {
-	emake -j1 V=1 test || die "make test failed"
-
-	elog "Ruby's make test has been run. Ruby also ships with a make check"
-	elog "that cannot be run until after ruby has been installed."
-	elog
-	if use rubytests; then
-		elog "You have enabled rubytests, so they will be installed to"
-		elog "/usr/share/${PN}-${SLOT}/test. To run them you must be a user other"
-		elog "than root, and you must place them into a writeable directory."
-		elog "Then call: "
-		elog
-		elog "ruby${MY_SUFFIX} -C /location/of/tests runner.rb"
-	else
-		elog "Enable the rubytests USE flag to install the make check tests"
-	fi
-}
-
-src_install() {
-	# Ruby is involved in the install process, we don't want interference here.
-	unset RUBYOPT
-
-	local MINIRUBY=$(echo -e 'include Makefile\ngetminiruby:\n\t@echo $(MINIRUBY)'|make -f - getminiruby)
-
-	LD_LIBRARY_PATH="${D}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
-	RUBYLIB="${S}:${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}"
-	for d in $(find "${S}/ext" -type d) ; do
-		RUBYLIB="${RUBYLIB}:$d"
-	done
-	export LD_LIBRARY_PATH RUBYLIB
-
-	emake V=1 DESTDIR="${D}" install || die "make install failed"
-
-	# Remove installed rubygems copy
-	rm -r "${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}/rubygems" || die "rm rubygems failed"
-	rm -r "${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}"/rdoc* || die "rm rdoc failed"
-	rm -r "${D}/usr/bin/"{ri,rdoc}"${MY_SUFFIX}" || die "rm rdoc bins failed"
-
-	if use doc; then
-		make DESTDIR="${D}" install-doc || die "make install-doc failed"
-	fi
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r sample
-	fi
-
-	dodoc ChangeLog NEWS doc/NEWS* README* ToDo || die
-
-	if use rubytests; then
-		pushd test
-		insinto /usr/share/${PN}-${SLOT}/test
-		doins -r .
-		popd
-	fi
-}
-
-pkg_postinst() {
-	if [[ ! -n $(readlink "${ROOT}"usr/bin/ruby) ]] ; then
-		eselect ruby set ruby${MY_SUFFIX}
-	fi
-
-	elog
-	elog "To switch between available Ruby profiles, execute as root:"
-	elog "\teselect ruby set ruby(19|20|...)"
-	elog
-}
-
-pkg_postrm() {
-	eselect ruby cleanup
-}
diff --git a/dev-perl/HTML-Format/HTML-Format-2.140.0.ebuild b/dev-perl/HTML-Format/HTML-Format-2.140.0.ebuild
new file mode 100644
index 000000000000..0ce1a53f7df4
--- /dev/null
+++ b/dev-perl/HTML-Format/HTML-Format-2.140.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DIST_NAME=HTML-Formatter
+DIST_AUTHOR=NIGELM
+DIST_VERSION=2.14
+inherit perl-module
+
+DESCRIPTION="HTML Formatter"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="test"
+
+RDEPEND="
+	virtual/perl-Carp
+	virtual/perl-Data-Dumper
+	virtual/perl-Encode
+	dev-perl/Font-AFM
+	dev-perl/HTML-Tree
+	virtual/perl-IO
+	virtual/perl-parent
+"
+DEPEND="${RDEPEND}
+	>=dev-perl/Module-Build-0.280.0
+	test? (
+		dev-perl/File-Slurper
+		virtual/perl-File-Spec
+		virtual/perl-Scalar-List-Utils
+		>=virtual/perl-Test-Simple-0.960.0
+	)
+"
diff --git a/dev-perl/HTML-Format/Manifest b/dev-perl/HTML-Format/Manifest
index 4d7246b435e0..c78bc7d5c500 100644
--- a/dev-perl/HTML-Format/Manifest
+++ b/dev-perl/HTML-Format/Manifest
@@ -1,2 +1,3 @@
 DIST HTML-Format-2.10.tar.gz 45383 SHA256 149f4ac19733042e3f81b965047e9a053d8e5eb0832437625f4b9de860d5819a SHA512 a15a471fab17285704dbfb91b226d75d2bda0fbacbb5ce9259bc72fd4e7d5ba2129b5b4f133d68ebe3f03ddad0620e2e757f29bf4c7af819bf00333c2fad200c WHIRLPOOL 75bea74964f996e1b73cf665f4705f9157922c1d5ec50700857672c84087577a2836e97f2e4098fedf4fe0d22be8b92caf9cf9a0bae02098e2b3955e9a40bbcf
 DIST HTML-Format-2.11.tar.gz 48697 SHA256 44a3af6b9d0184bb4cc300624352760e4435c3d802521742f42dd228e44d4a95 SHA512 e664b442fdde64009c48998c1168558a8256f81d4a9d2f3b610ad89ddfcfa846dfaaef837becda4a0ee4df1b36c05ca066d45ac374a23159ffdaba82730089fe WHIRLPOOL b832f691beead56e26ed78055293f344000c9a243886e6131b959cfc91729e4bcb4ef907481804afde3fe2253c893d28156443996eada2de0d3bac6a4427780e
+DIST HTML-Formatter-2.14.tar.gz 51298 SHA256 d28eeeab48ab5f7bfcc73cc106b0f756073d98d48dfdb91ca2951f832f8e035e SHA512 616ee70f3a6038589d9348a1463bd9c1cac4d7fe00aff5dbb52968d0ef44129658ff6cdc114f2c389a1eed068a64f48ab34bb90b60d3f20a0a024750ddadda42 WHIRLPOOL fdf953e6115a1c0f82366707cab0bd7d80e1a1173e76e7231e9d702dfdad2b23b3d298859986e79304c4fd1b23d0481003f615cad8c802b8880999ee3f08700d
diff --git a/dev-perl/HTTP-Server-Simple/HTTP-Server-Simple-0.510.0.ebuild b/dev-perl/HTTP-Server-Simple/HTTP-Server-Simple-0.510.0.ebuild
new file mode 100644
index 000000000000..094d083b1360
--- /dev/null
+++ b/dev-perl/HTTP-Server-Simple/HTTP-Server-Simple-0.510.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DIST_AUTHOR=BPS
+DIST_VERSION=0.51
+inherit perl-module
+
+DESCRIPTION="Lightweight HTTP Server"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="test"
+
+RDEPEND="
+	dev-perl/CGI
+	>=virtual/perl-Socket-1.940.0
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		dev-perl/Test-Pod
+		dev-perl/Test-Pod-Coverage
+	)
+"
diff --git a/dev-perl/HTTP-Server-Simple/Manifest b/dev-perl/HTTP-Server-Simple/Manifest
index a21cfb50dc37..7609fd0b5c3d 100644
--- a/dev-perl/HTTP-Server-Simple/Manifest
+++ b/dev-perl/HTTP-Server-Simple/Manifest
@@ -1,2 +1,3 @@
 DIST HTTP-Server-Simple-0.44.tar.gz 33804 SHA256 cff4f882da63a9a71271e25d1dc9160e64e5dd1195ed0a63894609ada7bb7416 SHA512 d8a3abd636de5cbd1b169911d02bb207d071f3f4ec9056f7ae4892062ff57b61737e4dfd03db8629ae553368c97b40baa88d021f6e4f973900d94abcc780591e WHIRLPOOL c8d112eefddf60d69eb17b1779a8744507da9bb6e759247da6309ba12188dcdc76a99ab439b8079fd865d87f3c0b003550d62172b8e7fbde970c3ac5a9bda388
 DIST HTTP-Server-Simple-0.50.tar.gz 36290 SHA256 5bd8117f469f566f55ee12406a1f9e03942d6f64e42f6e7461051e738bc27602 SHA512 601486cfa0744db9a131d6720873ef1cf995000671cd373854c29fc9a0b482d4f7ace69b97a48019897675714320e718b87e87fdcfe084e88c762ea2249120a2 WHIRLPOOL 1590c52ff7daa1489fb0666184d5eaef770bb1ce3ebe089dc8417b80c75db3a6b3adcaf4d13d39db05ac6737cca129b3e075263b6b3967a7a60d6a57b18ca61b
+DIST HTTP-Server-Simple-0.51.tar.gz 35056 SHA256 b9dc5c9f12c16ca39a96f0ede1e27a18a5594274ff8f583000788a7fca136dfb SHA512 92cb45fc8b57237c064b780ccdfd3ca959daff73cb054590574053cc3dedc81e14627c2aee6d26da48f717f31925d099dd9d11b0e9cd0a98cb3b06221820fabd WHIRLPOOL 449677370d084430afa03e3abdcb42615a7be0a24d94c4b605b196f4b8789ac4642637550c2462e5df364cceaac7fc4f985cde9681e681385cec29f2cd6490cf
diff --git a/dev-perl/Log-Agent/Log-Agent-1.1.0.ebuild b/dev-perl/Log-Agent/Log-Agent-1.1.0.ebuild
new file mode 100644
index 000000000000..5dfc68de0f6b
--- /dev/null
+++ b/dev-perl/Log-Agent/Log-Agent-1.1.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DIST_AUTHOR=MROGASKI
+DIST_VERSION=1.001
+inherit perl-module
+
+DESCRIPTION="A general logging framework"
+
+LICENSE="Artistic-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? ( virtual/perl-Test-Simple )
+"
+
+DIST_TEST=do
diff --git a/dev-perl/Log-Agent/Manifest b/dev-perl/Log-Agent/Manifest
index 45545df088ae..546fbc97c37b 100644
--- a/dev-perl/Log-Agent/Manifest
+++ b/dev-perl/Log-Agent/Manifest
@@ -1,2 +1,3 @@
 DIST Log-Agent-0.307.tar.gz 55238 SHA256 668b3b798a093b4ac78765d7ede6cf1133a50d7be11a6c717bca6e351d40e7fe SHA512 ecf706a739c6c56052e53296bddce06c5b3983631827737d6a08611105c43f4adcd8df0342b9aaaddbc4318a142848efdcfd644e42fd9871838bfb884a2f916b WHIRLPOOL 16112cd7a5d4117f084c6615b8de1ff93ab2f84026bed7113ae232816af82536b08e3c2e683ab883fb0f681b7e8764fcc4a6433d0d0f4a8250636fc886f8c317
 DIST Log-Agent-1.000.tar.gz 55407 SHA256 c25be2fcc9be011ad0b0a5a84d767cac8489c0a791c7961c4ee809ee9509f373 SHA512 5bdb068ebce637d88a5bfe51162de773dec4938aa2d9285130d7f51e9d875e02842387fda52c4189fa329f747ce34290bdd3e46b0a1eadfd7384008de998c302 WHIRLPOOL 040329bb8de096423805de46eb25709355345a168cc85f7f14f2e072fcdcda507231c1b08130f19667e690b738d8a0e15d198b63366187f82710535300c8281d
+DIST Log-Agent-1.001.tar.gz 56215 SHA256 9a7827fa862e3bb3af121518fcfbac4f505fdadbe863496dc18ee7daabdeae85 SHA512 b8d3a15e40129add73bb4967ecc5daf37c0fd8a17eb75ed86fe338a9eb228b37ddd56b9bbf9bdef91f8453eb1b53d7fe303a96f68cbb0834820f2354fa37b5e7 WHIRLPOOL 8b421a6e1eb08f2f7744d56c8fd066c907bb2a4b8964005123ed817c1a0604fa3a51a098fa285c2af0e7ad11e70900d6d574bdef94e02218a944da684f8a0c0e
diff --git a/dev-perl/Math-BigInt-GMP/Manifest b/dev-perl/Math-BigInt-GMP/Manifest
index 999135a4d1d2..00a25acbce4e 100644
--- a/dev-perl/Math-BigInt-GMP/Manifest
+++ b/dev-perl/Math-BigInt-GMP/Manifest
@@ -1,2 +1,3 @@
 DIST Math-BigInt-GMP-1.38.tar.gz 55585 SHA256 1ad0cac911a08f150c5e5a8286aec20de21c863bd27b8f002456cff11e086f15 SHA512 e33abe8c3b939e559be4e3ec61ce77a6fb3da6451ea88cb22fd4785cfebc816024e957ad02e81b43ee982346e0e444630ee5d93a87a02182a765374d1a694222 WHIRLPOOL 15c9d6fedd1f14401171b66a6094ef092ebf7ba991bbf82827da1d8973beed37adae4d0ba85e2aed0db9f5ec6f4bc4e12c1ed143645492ccf2b13b551e3f9922
 DIST Math-BigInt-GMP-1.46.tar.gz 58150 SHA256 414a0c22d195ebc426fed535cf8dc6a3ca2de9da270c828c313c018ab5335772 SHA512 4b8426d82e28fbd4d827f58f49540f0cc1d6c95b0ce5cdf9cd7c5c797b9f7777d534df57950d2f29dd5640b947005071a8f6c7d1235657710113e9e323444876 WHIRLPOOL 5b62bcffbd788ea8e97672c48e6e241e7f2a4ae52c60d9f58ceec973b6b39bccbb33367f841106be8f80f5336998568433534984a7e11ef3df1f99f7f8981e58
+DIST Math-BigInt-GMP-1.47.tar.gz 58266 SHA256 9ed3101d39fc118e025604e48894b88bf674f44c745a591c580987b2f24127e8 SHA512 fea2ce1324feecbbe44ae7d84944362354f35aeb96dbd79a0ca04f806617819051c19442b7d1672ed47e6ab1322ace06ff209cac2810f9f2b14711dacf444d26 WHIRLPOOL a19d9d32a5087b2dce3e6a7232a59137ff7778777a958cd5e4359d0f981a61c2c77a03e6154fdc71cbc2e589132017ba6e650cffb066dec6dd40fe5360c1031b
diff --git a/dev-perl/Math-BigInt-GMP/Math-BigInt-GMP-1.380.0.ebuild b/dev-perl/Math-BigInt-GMP/Math-BigInt-GMP-1.380.0.ebuild
index 32a26d1bcb50..93460d15c79a 100644
--- a/dev-perl/Math-BigInt-GMP/Math-BigInt-GMP-1.380.0.ebuild
+++ b/dev-perl/Math-BigInt-GMP/Math-BigInt-GMP-1.380.0.ebuild
@@ -15,7 +15,7 @@ KEYWORDS="alpha amd64 hppa ppc sparc x86"
 IUSE=""
 
 RDEPEND=">=virtual/perl-Math-BigInt-1.999.300
-	 >=dev-libs/gmp-4.0.0"
+	 >=dev-libs/gmp-4.0.0:0"
 DEPEND="${RDEPEND}"
 
 SRC_TEST="do"
diff --git a/dev-perl/Math-BigInt-GMP/Math-BigInt-GMP-1.460.0.ebuild b/dev-perl/Math-BigInt-GMP/Math-BigInt-GMP-1.460.0.ebuild
index 86ecbad8d319..0e62f383ff31 100644
--- a/dev-perl/Math-BigInt-GMP/Math-BigInt-GMP-1.460.0.ebuild
+++ b/dev-perl/Math-BigInt-GMP/Math-BigInt-GMP-1.460.0.ebuild
@@ -14,8 +14,8 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86"
 IUSE=""
 
-RDEPEND=">=virtual/perl-Math-BigInt-1.999.300
-	 >=dev-libs/gmp-4.0.0"
+RDEPEND=">=virtual/perl-Math-BigInt-1.999.709
+	 >=dev-libs/gmp-4.0.0:0"
 DEPEND="${RDEPEND}"
 
 PERL_RM_FILES=(
diff --git a/dev-perl/Math-BigInt-GMP/Math-BigInt-GMP-1.470.0.ebuild b/dev-perl/Math-BigInt-GMP/Math-BigInt-GMP-1.470.0.ebuild
new file mode 100644
index 000000000000..934dad59caa1
--- /dev/null
+++ b/dev-perl/Math-BigInt-GMP/Math-BigInt-GMP-1.470.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DIST_AUTHOR=PJACKLAM
+DIST_VERSION=1.47
+inherit perl-module
+
+DESCRIPTION="Use the GMP library for Math::BigInt routines"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86"
+IUSE="test"
+
+RDEPEND="
+	>=virtual/perl-Math-BigInt-1.999.709
+	>=virtual/perl-XSLoader-0.20.0
+	>=dev-libs/gmp-4.0.0:0
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? ( >=virtual/perl-Test-Simple-0.470.0 )
+"
diff --git a/dev-perl/glib-perl/Manifest b/dev-perl/glib-perl/Manifest
index b2c428c39805..fd40319dbe70 100644
--- a/dev-perl/glib-perl/Manifest
+++ b/dev-perl/glib-perl/Manifest
@@ -1,4 +1,4 @@
 DIST Glib-1.301.tar.gz 284547 SHA256 1df55a02c4d173ff4e417503b67e6d7896409966a1560d3bb2b4e50f658a9376 SHA512 f69de4bd9d3ecca0018d1f8a2fddb81a88529580ddbede3beaf2d3f9c2867eb127e8c1f7433f5bc2933a6adbe6265390c7e4d46592357a8414efbef6f4d9c2e7 WHIRLPOOL 27fccd60371629ec0d65822e8ada2af3c8d2da24bc4c8482413888303fc9fab41ea167375a783d3dafede75db95c4bcbf03cfbcde0f4e85f094d4d5491da4fb5
 DIST Glib-1.305.tar.gz 286063 SHA256 2955483a00db4a18953ee7b557e8638415e2aa7e96e75851ba10fbdc68a9108e SHA512 e475ee3ef66d4a9dc3199dbf1ccb4d9d0b12f06ecbb0773f16091f72bfb957dfc24db07ff3b474f93949b0d6028d4078014f1707a63ed32abf39824c99baae49 WHIRLPOOL c3d75a0be528beb1a923ebc75f9dde11575ffcbbe442ae015e6482f950c37c321c6ec5ee2f946f458016e85ccc599ebc058112af561864008a080d669dd378d0
-DIST Glib-1.310.tar.gz 295350 SHA256 f645aac388c7103e217d8b3a75d55be8e2327b5fc77a01fd1af50404dac168c7 SHA512 b04a1ba7488d8b8b01ee54d220acb88dc40ceda6e1ec94d2a08c55a2b31ad4d6736190525334a7e51c0f67de08a352f797bbea7600f68717ab071136b97bf086 WHIRLPOOL ff1bc6cc87d5738aa48f01cdba9f845445657a589cc7415f7b8c5c81dd9e73a42969bfe4bde6eff6851fdf47344f8de5adb39e14d286e5aaf324a6e27ae662f7
 DIST Glib-1.313.tar.gz 295561 SHA256 b29f5cd93f151cd52ef288220df4d5cccb844190c34cde8962c27fb804194f98 SHA512 9a0fff69bab175c6a3d23d0f0aafe05a3a2ab97fe999176a2f07a87cbddea904906d5ff804906588d6eb50650b8722c1c2f7a6c140b593a874d06cf8900aecde WHIRLPOOL 18ebfb8d35bddf460bb799fc9c802b9a9865a7ceaca3073fead9e9568269eff4b287a9fba926ea0b0b6840f559d8c365f8cf0d306f2bb97f7d550b1ee23a92a5
+DIST Glib-1.314.tar.gz 296480 SHA256 b47e9e0117325085457b263b3a70847ed908419e06e8975f36f2b953f5f4908e SHA512 2a61a81f9b3d0404fa2e731d3851d67dc2bfc499a34bd77e0a9b6875a889f0faf5ac5fe2f24f8df7e2059283716e91aba5596556aad43f454e8cfd56fe866607 WHIRLPOOL a1dee6daf8a6cda5ea8da85a5a57551075c8a030f67c8f42c900547ed2754acc98633d12bf8f8d5641f14f9426e2d40309da7e22150a2bb4b7179e58900797fe
diff --git a/dev-perl/glib-perl/glib-perl-1.310.0.ebuild b/dev-perl/glib-perl/glib-perl-1.314.0.ebuild
index 1775f34a96ff..4d67186e12b2 100644
--- a/dev-perl/glib-perl/glib-perl-1.310.0.ebuild
+++ b/dev-perl/glib-perl/glib-perl-1.314.0.ebuild
@@ -2,11 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
-MY_PN=Glib
-MODULE_AUTHOR=XAOC
-MODULE_VERSION=1.310
+DIST_NAME=Glib
+DIST_AUTHOR=XAOC
+DIST_VERSION=1.314
 inherit perl-module
 
 DESCRIPTION="Glib - Perl wrappers for the GLib utility and Object libraries"
@@ -27,5 +27,3 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	dev-perl/Log-Agent
 "
-
-SRC_TEST="do"
diff --git a/dev-python/astropy-helpers/Manifest b/dev-python/astropy-helpers/Manifest
index e8823815c9b3..22741646926f 100644
--- a/dev-python/astropy-helpers/Manifest
+++ b/dev-python/astropy-helpers/Manifest
@@ -1,3 +1,4 @@
 DIST astropy-helpers-0.4.1.tar.gz 98477 SHA256 0b4e47e535e7226d8795efb9e9453cac9343759058970a20734e66f443074577 SHA512 85975268372624bec4024dfbe560ef820bda308db898919c4d29643f10df11636f4996a8ff3f2fb7deece44f88963ddb0c8ca231e030713cf17db7503ceae42e WHIRLPOOL b37fa02ebe3e750052a9681e1e8a3a0aa9eede1909e69c70e2004ba738139707e1a0c21797681454ee782a6543bc8808b8de574d60aba601d228966c8659bb9f
 DIST astropy-helpers-1.0.3.tar.gz 127177 SHA256 0733f3081db46ec02faa08595dad9a72d79d0ed73e54fe3404620703d737594d SHA512 74d4f191290914cf51f91b9cc1a9ed168799a47f586c33505a4ebdef554b7e4cdc90625fbd9b8c9e29b44fc2a988fdf0f50446ce9461017a9755c7ec2a2b1ed4 WHIRLPOOL 43a00a990b3caabeeecefac90bbb91e2b42a7f184c66887855ea188b123f0b74125fb9b694e7d503e78dbed720769329b95aaddd17c16d65807113ec7253b448
 DIST astropy-helpers-1.0.5.tar.gz 127951 SHA256 b872547580861564023f31a201dcb63d5e9f134f47f4224eb3904a6341b42507 SHA512 31e0c858f126d1e02167faaed2395529ade4e484d0c9c53f809d15de2fda68a4ce9dcd36951546c071d3556feb6f64ca4b0ed5678405af57cb80f3e0cf8de13d WHIRLPOOL 1481eff853e04c94dd95f689c148a68f83cc18d7026f766d2af7d6c4ffc5c0f9eca107c3403b9295f245aed3dea562377ba59cf2bbb303d4653fb4712f6a037c
+DIST astropy-helpers-1.0.6.tar.gz 126274 SHA256 3651a854fafd0184252639775aab9776331f8ae1bbadd920169d6dc1914095e3 SHA512 c3fa2e329094c5e319b493d2c8889b1158dfdcb8845dc978274a4333167b5069228d9c9ac585e0759b1002776d4597b2a23cf5d276d9c971122919afddb8f277 WHIRLPOOL 83467c958a762fb3b045b6e8e168572012ef308b6aaac7f92c5992e5207cd26efb6cbb5ce617e5701ab2c8d23f169af939052dc2bd50195b9163f3a8db5d6b3f
diff --git a/dev-python/astropy-helpers/astropy-helpers-1.0.6.ebuild b/dev-python/astropy-helpers/astropy-helpers-1.0.6.ebuild
new file mode 100644
index 000000000000..ef256068ccaa
--- /dev/null
+++ b/dev-python/astropy-helpers/astropy-helpers-1.0.6.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2015 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="Helpers for Astropy and Affiliated packages"
+HOMEPAGE="https://github.com/astropy/astropy-helpers"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+KEYWORDS="~amd64 ~x86 ~x86-linux"
+
+python_prepare_all() {
+	sed -e '/import ah_bootstrap/d' -i setup.py || die "Removing ah_bootstrap failed"
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/pypy/pypy-9999.ebuild b/dev-python/pypy/pypy-9999.ebuild
new file mode 100644
index 000000000000..302e84393a75
--- /dev/null
+++ b/dev-python/pypy/pypy-9999.ebuild
@@ -0,0 +1,258 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 pypy )
+EHG_REPO_URI="https://bitbucket.org/pypy/pypy"
+inherit check-reqs eutils mercurial multilib multiprocessing pax-utils python-any-r1 toolchain-funcs versionator
+
+CPY_PATCHSET_VERSION="2.7.10-0"
+
+DESCRIPTION="A fast, compliant alternative implementation of the Python language"
+HOMEPAGE="http://pypy.org/"
+SRC_URI="
+	https://dev.gentoo.org/~floppym/python/python-gentoo-patches-${CPY_PATCHSET_VERSION}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0/$(get_version_component_range 1-2 ${PV})"
+KEYWORDS=""
+IUSE="bzip2 doc gdbm +jit low-memory ncurses sandbox shadowstack sqlite cpu_flags_x86_sse2 test tk"
+
+RDEPEND=">=sys-libs/zlib-1.1.3:0=
+	virtual/libffi:0=
+	virtual/libintl:0=
+	dev-libs/expat:0=
+	dev-libs/openssl:0=[-bindist]
+	bzip2? ( app-arch/bzip2:0= )
+	gdbm? ( sys-libs/gdbm:0= )
+	ncurses? ( sys-libs/ncurses:0= )
+	sqlite? ( dev-db/sqlite:3= )
+	tk? (
+		dev-lang/tk:0=
+		dev-tcltk/tix:0=
+	)
+	!dev-python/pypy-bin:0"
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx )
+	${PYTHON_DEPS}
+	test? ( dev-python/pytest )"
+PDEPEND="app-admin/python-updater"
+
+S="${WORKDIR}/${P}-src"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		if use low-memory; then
+			if ! python_is_installed pypy; then
+				eerror "USE=low-memory requires a (possibly old) version of dev-python/pypy"
+				eerror "or dev-python/pypy-bin being installed. Please install it using e.g.:"
+				eerror
+				eerror "  $ emerge -1v dev-python/pypy-bin"
+				eerror
+				eerror "before attempting to build dev-python/pypy[low-memory]."
+				die "dev-python/pypy-bin (or dev-python/pypy) needs to be installed for USE=low-memory"
+			fi
+
+			CHECKREQS_MEMORY="1750M"
+			use amd64 && CHECKREQS_MEMORY="3500M"
+		else
+			CHECKREQS_MEMORY="3G"
+			use amd64 && CHECKREQS_MEMORY="6G"
+		fi
+
+		check-reqs_pkg_pretend
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		pkg_pretend
+
+		if python_is_installed pypy; then
+			if [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]] || use low-memory; then
+				einfo "Using already-installed PyPy to perform the translation."
+				local EPYTHON=pypy
+			else
+				einfo "Using ${EPYTHON} to perform the translation. Please note that upstream"
+				einfo "recommends using PyPy for that. If you wish to do so, please unset"
+				einfo "the EPYTHON variable."
+			fi
+		fi
+
+		python-any-r1_pkg_setup
+	fi
+}
+
+src_unpack() {
+	default
+	mercurial_src_unpack
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/4.0.0-gentoo-path.patch" \
+		"${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch" \
+		"${FILESDIR}"/2.5.0-shared-lib.patch	# 517002
+
+	sed -e "s^@EPREFIX@^${EPREFIX}^" \
+		-e "s^@libdir@^$(get_libdir)^" \
+		-i lib-python/2.7/distutils/command/install.py || die
+
+	# apply CPython stdlib patches
+	pushd lib-python/2.7 > /dev/null || die
+	epatch "${FILESDIR}"/2.5.0_all_distutils_cxx.patch \
+		"${WORKDIR}"/patches/22_all_turkish_locale.patch \
+		"${WORKDIR}"/patches/62_all_xml.use_pyxml.patch
+	popd > /dev/null || die
+
+	epatch_user
+}
+
+src_compile() {
+	tc-export CC
+
+	local jit_backend
+	if use jit; then
+		jit_backend='--jit-backend='
+
+		# We only need the explicit sse2 switch for x86.
+		# On other arches we can rely on autodetection which uses
+		# compiler macros. Plus, --jit-backend= doesn't accept all
+		# the modern values...
+
+		if use x86; then
+			if use cpu_flags_x86_sse2; then
+				jit_backend+=x86
+			else
+				jit_backend+=x86-without-sse2
+			fi
+		else
+			jit_backend+=auto
+		fi
+	fi
+
+	local args=(
+		--shared
+		$(usex jit -Ojit -O2)
+		$(usex shadowstack --gcrootfinder=shadowstack '')
+		$(usex sandbox --sandbox '')
+
+		${jit_backend}
+		--make-jobs=$(makeopts_jobs)
+
+		pypy/goal/targetpypystandalone
+	)
+
+	# Avoid linking against libraries disabled by use flags
+	local opts=(
+		bzip2:bz2
+		ncurses:_minimal_curses
+	)
+
+	local opt
+	for opt in "${opts[@]}"; do
+		local flag=${opt%:*}
+		local mod=${opt#*:}
+
+		args+=(
+			$(usex ${flag} --withmod --withoutmod)-${mod}
+		)
+	done
+
+	local interp=( "${PYTHON}" )
+	if use low-memory; then
+		interp=( env PYPY_GC_MAX_DELTA=200MB
+			"${PYTHON}" --jit loop_longevity=300 )
+	fi
+
+	set -- "${interp[@]}" rpython/bin/rpython --batch "${args[@]}"
+	echo -e "\033[1m${@}\033[0m"
+	"${@}" || die "compile error"
+
+	use doc && emake -C pypy/doc/ html
+	pax-mark m "${ED%/}${INSDESTTREE}/pypy-c"
+}
+
+src_test() {
+	# (unset)
+	local -x PYTHONDONTWRITEBYTECODE
+
+	./pypy-c ./pypy/test_all.py --pypy=./pypy-c lib-python || die
+}
+
+src_install() {
+	einfo "Installing PyPy ..."
+	insinto "/usr/$(get_libdir)/pypy"
+	doins -r include lib_pypy lib-python pypy-c libpypy-c.so
+	fperms a+x ${INSDESTTREE}/pypy-c ${INSDESTTREE}/libpypy-c.so
+	pax-mark m "${ED%/}${INSDESTTREE}/pypy-c" "${ED%/}${INSDESTTREE}/libpypy-c.so"
+	dosym ../$(get_libdir)/pypy/pypy-c /usr/bin/pypy
+	dodoc README.rst
+
+	if ! use gdbm; then
+		rm -r "${ED%/}${INSDESTTREE}"/lib_pypy/gdbm.py \
+			"${ED%/}${INSDESTTREE}"/lib-python/*2.7/test/test_gdbm.py || die
+	fi
+	if ! use sqlite; then
+		rm -r "${ED%/}${INSDESTTREE}"/lib-python/*2.7/sqlite3 \
+			"${ED%/}${INSDESTTREE}"/lib_pypy/_sqlite3.py \
+			"${ED%/}${INSDESTTREE}"/lib-python/*2.7/test/test_sqlite.py || die
+	fi
+	if ! use tk; then
+		rm -r "${ED%/}${INSDESTTREE}"/lib-python/*2.7/{idlelib,lib-tk} \
+			"${ED%/}${INSDESTTREE}"/lib_pypy/_tkinter \
+			"${ED%/}${INSDESTTREE}"/lib-python/*2.7/test/test_{tcl,tk,ttk*}.py || die
+	fi
+
+	# Install docs
+	use doc && dohtml -r pypy/doc/_build/html/
+
+	einfo "Generating caches and byte-compiling ..."
+
+	local -x PYTHON=${ED%/}${INSDESTTREE}/pypy-c
+	local -x LD_LIBRARY_PATH="${ED%/}${INSDESTTREE}"
+	# we can't use eclass function since PyPy is dumb and always gives
+	# paths relative to the interpreter
+	local PYTHON_SITEDIR=${EPREFIX}/usr/$(get_libdir)/pypy/site-packages
+	python_export pypy EPYTHON
+
+	echo "EPYTHON='${EPYTHON}'" > epython.py || die
+	python_domodule epython.py
+
+	# Generate Grammar and PatternGrammar pickles.
+	"${PYTHON}" -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
+		|| die "Generation of Grammar and PatternGrammar pickles failed"
+
+	# Generate cffi modules
+	# Please keep in sync with pypy/tool/build_cffi_imports.py!
+#cffi_build_scripts = {
+#    "sqlite3": "_sqlite3_build.py",
+#    "audioop": "_audioop_build.py",
+#    "tk": "_tkinter/tklib_build.py",
+#    "curses": "_curses_build.py" if sys.platform != "win32" else None,
+#    "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
+#    "gdbm": "_gdbm_build.py"  if sys.platform != "win32" else None,
+#    "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
+	cffi_targets=( audioop syslog pwdgrp )
+	use gdbm && cffi_targets+=( gdbm )
+	use ncurses && cffi_targets+=( curses )
+	use sqlite && cffi_targets+=( sqlite3 )
+	use tk && cffi_targets+=( tkinter/tklib )
+
+	local t
+	# all modules except tkinter output to .
+	# tkinter outputs to the correct dir ...
+	cd "${ED%/}${INSDESTTREE}"/lib_pypy || die
+	for t in "${cffi_targets[@]}"; do
+		# tkinter doesn't work via -m
+		"${PYTHON}" "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
+	done
+
+	# Cleanup temporary objects
+	find "${ED%/}${INSDESTTREE}" -name "_cffi_*.[co]" -delete || die
+	find "${ED%/}${INSDESTTREE}" -type d -empty -delete || die
+
+	# compile the installed modules
+	python_optimize "${ED%/}${INSDESTTREE}"
+}
diff --git a/dev-python/pypy3/files/2.5.0-shared-lib.patch b/dev-python/pypy3/files/2.5.0-shared-lib.patch
new file mode 100644
index 000000000000..ddd74730f3dd
--- /dev/null
+++ b/dev-python/pypy3/files/2.5.0-shared-lib.patch
@@ -0,0 +1,12 @@
+diff -ur pypy-2.5.0-src.orig/rpython/translator/platform/posix.py pypy-2.5.0-src/rpython/translator/platform/posix.py
+--- rpython/translator/platform/posix.py	2015-02-03 05:12:49.000000000 +0800
++++ rpython/translator/platform/posix.py	2015-03-22 07:36:01.420116684 +0800
+@@ -183,7 +183,7 @@
+                    'int main(int argc, char* argv[]) '
+                    '{ return $(PYPY_MAIN_FUNCTION)(argc, argv); }" > $@')
+             m.rule('$(DEFAULT_TARGET)', ['$(TARGET)', 'main.o'],
+-                   '$(CC_LINK) $(LDFLAGS_LINK) main.o -L. -l$(SHARED_IMPORT_LIB) -o $@ $(RPATH_FLAGS)')
++                   '$(CC_LINK) $(LDFLAGS_LINK) main.o -L. -l$(SHARED_IMPORT_LIB) \'-Wl,-rpath,$$ORIGIN\' -o $@')
+ 
+         return m
+ 
diff --git a/dev-python/pypy3/files/21_all_distutils_c++.patch b/dev-python/pypy3/files/21_all_distutils_c++.patch
new file mode 100644
index 000000000000..f12df8ac4070
--- /dev/null
+++ b/dev-python/pypy3/files/21_all_distutils_c++.patch
@@ -0,0 +1,251 @@
+http://bugs.python.org/issue1222585
+
+--- Lib/distutils/cygwinccompiler.py
++++ Lib/distutils/cygwinccompiler.py
+@@ -136,9 +136,13 @@
+         self.set_executables(compiler='gcc -mcygwin -O -Wall',
+                              compiler_so='gcc -mcygwin -mdll -O -Wall',
+                              compiler_cxx='g++ -mcygwin -O -Wall',
++                             compiler_so_cxx='g++ -mcygwin -mdll -O -Wall',
+                              linker_exe='gcc -mcygwin',
+                              linker_so=('%s -mcygwin %s' %
+-                                        (self.linker_dll, shared_option)))
++                                        (self.linker_dll, shared_option)),
++                             linker_exe_cxx='g++ -mcygwin',
++                             linker_so_cxx=('%s -mcygwin %s' %
++                                            (self.linker_dll, shared_option)))
+ 
+         # cygwin and mingw32 need different sets of libraries
+         if self.gcc_version == "2.91.57":
+@@ -162,8 +166,12 @@
+                 raise CompileError(msg)
+         else: # for other files use the C-compiler
+             try:
+-                self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
+-                           extra_postargs)
++                if self.detect_language(src) == 'c++':
++                    self.spawn(self.compiler_so_cxx + cc_args + [src, '-o', obj] +
++                               extra_postargs)
++                else:
++                    self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
++                               extra_postargs)
+             except DistutilsExecError as msg:
+                 raise CompileError(msg)
+ 
+@@ -294,10 +302,15 @@
+         self.set_executables(compiler='gcc -mno-cygwin -O -Wall',
+                              compiler_so='gcc -mno-cygwin -mdll -O -Wall',
+                              compiler_cxx='g++ -mno-cygwin -O -Wall',
++                             compiler_so_cxx='g++ -mno-cygwin -mdll -O -Wall',
+                              linker_exe='gcc -mno-cygwin',
+                              linker_so='%s -mno-cygwin %s %s'
+                                         % (self.linker_dll, shared_option,
+-                                           entry_point))
++                                           entry_point),
++                             linker_exe_cxx='g++ -mno-cygwin',
++                             linker_so_cxx='%s -mno-cygwin %s %s'
++                                            % (self.linker_dll, shared_option,
++                                               entry_point))
+         # Maybe we should also append -mthreads, but then the finished
+         # dlls need another dll (mingwm10.dll see Mingw32 docs)
+         # (-mthreads: Support thread-safe exception handling on `Mingw32')
+--- Lib/distutils/emxccompiler.py
++++ Lib/distutils/emxccompiler.py
+@@ -63,8 +63,12 @@
+         # XXX optimization, warnings etc. should be customizable.
+         self.set_executables(compiler='gcc -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall',
+                              compiler_so='gcc -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall',
++                             compiler_cxx='g++ -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall',
++                             compiler_so_cxx='g++ -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall',
+                              linker_exe='gcc -Zomf -Zmt -Zcrtdll',
+-                             linker_so='gcc -Zomf -Zmt -Zcrtdll -Zdll')
++                             linker_so='gcc -Zomf -Zmt -Zcrtdll -Zdll',
++                             linker_exe_cxx='g++ -Zomf -Zmt -Zcrtdll',
++                             linker_so_cxx='g++ -Zomf -Zmt -Zcrtdll -Zdll')
+ 
+         # want the gcc library statically linked (so that we don't have
+         # to distribute a version dependent on the compiler we have)
+@@ -81,8 +85,12 @@
+                 raise CompileError(msg)
+         else: # for other files use the C-compiler
+             try:
+-                self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
+-                           extra_postargs)
++                if self.detect_language(src) == 'c++':
++                    self.spawn(self.compiler_so_cxx + cc_args + [src, '-o', obj] +
++                               extra_postargs)
++                else:
++                    self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
++                               extra_postargs)
+             except DistutilsExecError as msg:
+                 raise CompileError(msg)
+ 
+--- Lib/distutils/sysconfig_cpython.py
++++ Lib/distutils/sysconfig_cpython.py
+@@ -170,9 +170,12 @@
+                 _osx_support.customize_compiler(_config_vars)
+                 _config_vars['CUSTOMIZED_OSX_COMPILER'] = 'True'
+ 
+-        (cc, cxx, opt, cflags, ccshared, ldshared, shlib_suffix, ar, ar_flags) = \
+-            get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS',
+-                            'CCSHARED', 'LDSHARED', 'SHLIB_SUFFIX', 'AR', 'ARFLAGS')
++        (cc, cxx, ccshared, ldshared, ldcxxshared, shlib_suffix, ar, ar_flags) = \
++            get_config_vars('CC', 'CXX', 'CCSHARED', 'LDSHARED', 'LDCXXSHARED',
++                            'SHLIB_SUFFIX', 'AR', 'ARFLAGS')
++
++        cflags = ''
++        cxxflags = ''
+ 
+         newcc = None
+         if 'CC' in os.environ:
+@@ -181,19 +184,27 @@
+             cxx = os.environ['CXX']
+         if 'LDSHARED' in os.environ:
+             ldshared = os.environ['LDSHARED']
++        if 'LDCXXSHARED' in os.environ:
++            ldcxxshared = os.environ['LDCXXSHARED']
+         if 'CPP' in os.environ:
+             cpp = os.environ['CPP']
+         else:
+             cpp = cc + " -E"           # not always
+         if 'LDFLAGS' in os.environ:
+             ldshared = ldshared + ' ' + os.environ['LDFLAGS']
++            ldcxxshared = ldcxxshared + ' ' + os.environ['LDFLAGS']
+         if 'CFLAGS' in os.environ:
+-            cflags = opt + ' ' + os.environ['CFLAGS']
++            cflags = os.environ['CFLAGS']
+             ldshared = ldshared + ' ' + os.environ['CFLAGS']
++        if 'CXXFLAGS' in os.environ:
++            cxxflags = os.environ['CXXFLAGS']
++            ldcxxshared = ldcxxshared + ' ' + os.environ['CXXFLAGS']
+         if 'CPPFLAGS' in os.environ:
+             cpp = cpp + ' ' + os.environ['CPPFLAGS']
+             cflags = cflags + ' ' + os.environ['CPPFLAGS']
++            cxxflags = cxxflags + ' ' + os.environ['CPPFLAGS']
+             ldshared = ldshared + ' ' + os.environ['CPPFLAGS']
++            ldcxxshared = ldcxxshared + ' ' + os.environ['CPPFLAGS']
+         if 'AR' in os.environ:
+             ar = os.environ['AR']
+         if 'ARFLAGS' in os.environ:
+@@ -202,13 +213,17 @@
+             archiver = ar + ' ' + ar_flags
+ 
+         cc_cmd = cc + ' ' + cflags
++        cxx_cmd = cxx + ' ' + cxxflags
+         compiler.set_executables(
+             preprocessor=cpp,
+             compiler=cc_cmd,
+             compiler_so=cc_cmd + ' ' + ccshared,
+-            compiler_cxx=cxx,
++            compiler_cxx=cxx_cmd,
++            compiler_so_cxx=cxx_cmd + ' ' + ccshared,
+             linker_so=ldshared,
+             linker_exe=cc,
++            linker_so_cxx=ldcxxshared,
++            linker_exe_cxx=cxx,
+             archiver=archiver)
+ 
+         compiler.shared_lib_extension = shlib_suffix
+--- Lib/distutils/unixccompiler.py
++++ Lib/distutils/unixccompiler.py
+@@ -52,14 +52,17 @@
+     # are pretty generic; they will probably have to be set by an outsider
+     # (eg. using information discovered by the sysconfig about building
+     # Python extensions).
+-    executables = {'preprocessor' : None,
+-                   'compiler'     : ["cc"],
+-                   'compiler_so'  : ["cc"],
+-                   'compiler_cxx' : ["c++"],  # pypy: changed, 'cc' is bogus
+-                   'linker_so'    : ["cc", "-shared"],
+-                   'linker_exe'   : ["cc"],
+-                   'archiver'     : ["ar", "-cr"],
+-                   'ranlib'       : None,
++    executables = {'preprocessor'    : None,
++                   'compiler'        : ["cc"],
++                   'compiler_so'     : ["cc"],
++                   'compiler_cxx'    : ["c++"],
++                   'compiler_so_cxx' : ["c++"],
++                   'linker_so'       : ["cc", "-shared"],
++                   'linker_exe'      : ["cc"],
++                   'linker_so_cxx'   : ["c++", "-shared"],
++                   'linker_exe_cxx'  : ["c++"],
++                   'archiver'        : ["ar", "-cr"],
++                   'ranlib'          : None,
+                   }
+ 
+     if sys.platform[:6] == "darwin":
+@@ -108,12 +111,19 @@
+ 
+     def _compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts):
+         compiler_so = self.compiler_so
++        compiler_so_cxx = self.compiler_so_cxx
+         if sys.platform == 'darwin':
+             compiler_so = _osx_support.compiler_fixup(compiler_so,
+                                                     cc_args + extra_postargs)
++            compiler_so_cxx = _osx_support.compiler_fixup(compiler_so_cxx,
++                                                    cc_args + extra_postargs)
+         try:
+-            self.spawn(compiler_so + cc_args + [src, '-o', obj] +
+-                       extra_postargs)
++            if self.detect_language(src) == 'c++':
++                self.spawn(compiler_so_cxx + cc_args + [src, '-o', obj] +
++                           extra_postargs)
++            else:
++                self.spawn(compiler_so + cc_args + [src, '-o', obj] +
++                           extra_postargs)
+         except DistutilsExecError as msg:
+             raise CompileError(msg)
+ 
+@@ -171,22 +181,16 @@
+                 ld_args.extend(extra_postargs)
+             self.mkpath(os.path.dirname(output_filename))
+             try:
+-                if target_desc == CCompiler.EXECUTABLE:
+-                    linker = self.linker_exe[:]
++                if target_lang == "c++":
++                    if target_desc == CCompiler.EXECUTABLE:
++                        linker = self.linker_exe_cxx[:]
++                    else:
++                        linker = self.linker_so_cxx[:]
+                 else:
+-                    linker = self.linker_so[:]
+-                if target_lang == "c++" and self.compiler_cxx:
+-                    # skip over environment variable settings if /usr/bin/env
+-                    # is used to set up the linker's environment.
+-                    # This is needed on OSX. Note: this assumes that the
+-                    # normal and C++ compiler have the same environment
+-                    # settings.
+-                    i = 0
+-                    if os.path.basename(linker[0]) == "env":
+-                        i = 1
+-                        while '=' in linker[i]:
+-                            i += 1
+-                    linker[i] = self.compiler_cxx[i]
++                    if target_desc == CCompiler.EXECUTABLE:
++                        linker = self.linker_exe[:]
++                    else:
++                        linker = self.linker_so[:]
+ 
+                 if sys.platform == 'darwin':
+                     linker = _osx_support.compiler_fixup(linker, ld_args)
+--- Lib/_osx_support.py
++++ Lib/_osx_support.py
+@@ -14,13 +14,13 @@
+ # configuration variables that may contain universal build flags,
+ # like "-arch" or "-isdkroot", that may need customization for
+ # the user environment
+-_UNIVERSAL_CONFIG_VARS = ('CFLAGS', 'LDFLAGS', 'CPPFLAGS', 'BASECFLAGS',
+-                            'BLDSHARED', 'LDSHARED', 'CC', 'CXX',
+-                            'PY_CFLAGS', 'PY_LDFLAGS', 'PY_CPPFLAGS',
+-                            'PY_CORE_CFLAGS')
++_UNIVERSAL_CONFIG_VARS = ('CFLAGS', 'CXXFLAGS', 'LDFLAGS', 'CPPFLAGS',
++                          'BASECFLAGS', 'BLDSHARED', 'LDSHARED', 'LDCXXSHARED',
++                          'CC', 'CXX', 'PY_CFLAGS', 'PY_LDFLAGS',
++                          'PY_CPPFLAGS', 'PY_CORE_CFLAGS')
+ 
+ # configuration variables that may contain compiler calls
+-_COMPILER_CONFIG_VARS = ('BLDSHARED', 'LDSHARED', 'CC', 'CXX')
++_COMPILER_CONFIG_VARS = ('BLDSHARED', 'LDSHARED', 'LDCXXSHARED', 'CC', 'CXX')
+ 
+ # prefix added to original configuration variable names
+ _INITPRE = '_OSX_SUPPORT_INITIAL_'
diff --git a/dev-python/pypy3/files/4.0.0-gentoo-path.patch b/dev-python/pypy3/files/4.0.0-gentoo-path.patch
new file mode 100644
index 000000000000..1c0270d93bae
--- /dev/null
+++ b/dev-python/pypy3/files/4.0.0-gentoo-path.patch
@@ -0,0 +1,50 @@
+From 165e05bbdc93e54411217c0198d0a5cbb9de4e33 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Fri, 27 Nov 2015 17:02:42 +0100
+Subject: [PATCH] Gentoo: override paths for system-wide install based on
+ sys.prefix
+
+Override all default distutils install paths to ones suitable for
+system-wide install when sys.prefix indicates we're running the Gentoo
+system-wide install of PyPy with no prefix overrides (e.g. virtualenv).
+
+Fixes: https://bugs.gentoo.org/462306
+Fixes: https://bugs.gentoo.org/465546
+---
+ lib-python/3/distutils/command/install.py | 13 ++++++++++++-
+ 1 file changed, 12 insertions(+), 1 deletion(-)
+
+diff --git a/lib-python/3/distutils/command/install.py b/lib-python/3/distutils/command/install.py
+index fc43951..fed5218 100644
+--- a/lib-python/3/distutils/command/install.py
++++ b/lib-python/3/distutils/command/install.py
+@@ -90,6 +90,13 @@ INSTALL_SCHEMES = {
+         'scripts': '$base/bin',
+         'data'   : '$base',
+         },
++    'gentoo': {
++        'purelib': '$base/site-packages',
++        'platlib': '$base/site-packages',
++        'headers': '$base/include',
++        'scripts': '@EPREFIX@/usr/bin',
++        'data'   : '@EPREFIX@/usr',
++        },
+     }
+ 
+ # The keys to an installation scheme; if any new types of files are to be
+@@ -476,7 +483,11 @@ class install (Command):
+         # it's the caller's problem if they supply a bad name!
+         if (hasattr(sys, 'pypy_version_info') and
+             not name.endswith(('_user', '_home'))):
+-            name = 'pypy'
++            if self.install_base == os.path.normpath('@EPREFIX@/usr/@libdir@/pypy'):
++                # override paths for system-wide install
++                name = 'gentoo'
++            else:
++                name = 'pypy'
+         scheme = INSTALL_SCHEMES[name]
+         for key in SCHEME_KEYS:
+             attrname = 'install_' + key
+-- 
+2.6.3
+
diff --git a/dev-python/pypy3/pypy3-9999.ebuild b/dev-python/pypy3/pypy3-9999.ebuild
new file mode 100644
index 000000000000..73bd1594c24e
--- /dev/null
+++ b/dev-python/pypy3/pypy3-9999.ebuild
@@ -0,0 +1,238 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# pypy3 needs to be built using python 2
+PYTHON_COMPAT=( python2_7 pypy )
+EHG_PROJECT="pypy"
+EHG_REPO_URI="https://bitbucket.org/pypy/pypy"
+EHG_REVISION="py3k"
+inherit check-reqs eutils mercurial multilib multiprocessing pax-utils python-any-r1 toolchain-funcs versionator
+
+DESCRIPTION="A fast, compliant alternative implementation of the Python language"
+HOMEPAGE="http://pypy.org/"
+SRC_URI=""
+
+LICENSE="MIT"
+SLOT="0/$(get_version_component_range 1-2 ${PV})"
+KEYWORDS=""
+IUSE="bzip2 gdbm +jit low-memory ncurses sandbox shadowstack sqlite cpu_flags_x86_sse2 test tk"
+
+RDEPEND=">=sys-libs/zlib-1.1.3:0=
+	virtual/libffi:0=
+	virtual/libintl:0=
+	dev-libs/expat:0=
+	dev-libs/openssl:0=[-bindist]
+	bzip2? ( app-arch/bzip2:0= )
+	gdbm? ( sys-libs/gdbm:0= )
+	ncurses? ( sys-libs/ncurses:0= )
+	sqlite? ( dev-db/sqlite:3= )
+	tk? (
+		dev-lang/tk:0=
+		dev-tcltk/tix:0=
+	)
+	!dev-python/pypy3-bin:0"
+DEPEND="${RDEPEND}
+	low-memory? ( virtual/pypy:0 )
+	!low-memory? ( ${PYTHON_DEPS} )"
+PDEPEND="app-admin/python-updater"
+
+S="${WORKDIR}/${P}-src"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		if use low-memory; then
+			CHECKREQS_MEMORY="1750M"
+			use amd64 && CHECKREQS_MEMORY="3500M"
+		else
+			CHECKREQS_MEMORY="3G"
+			use amd64 && CHECKREQS_MEMORY="6G"
+		fi
+
+		check-reqs_pkg_pretend
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		pkg_pretend
+
+		# unset to allow forcing pypy below :)
+		use low-memory && local EPYTHON=
+		if python_is_installed pypy && [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]]; then
+			einfo "Using PyPy to perform the translation."
+			local EPYTHON=pypy
+		else
+			einfo "Using ${EPYTHON:-python2} to perform the translation. Please note that upstream"
+			einfo "recommends using PyPy for that. If you wish to do so, please install"
+			einfo "virtual/pypy and ensure that EPYTHON variable is unset."
+		fi
+
+		python-any-r1_pkg_setup
+	fi
+}
+
+src_unpack() {
+	default
+	mercurial_src_unpack
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/4.0.0-gentoo-path.patch" \
+		"${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch" \
+		"${FILESDIR}"/2.5.0-shared-lib.patch	# 517002
+
+	sed -e "s^@EPREFIX@^${EPREFIX}^" \
+		-e "s^@libdir@^$(get_libdir)^" \
+		-i lib-python/3/distutils/command/install.py || die
+
+	# apply CPython stdlib patches
+	pushd lib-python/3 > /dev/null || die
+	epatch "${FILESDIR}"/21_all_distutils_c++.patch
+	popd > /dev/null || die
+
+	epatch_user
+}
+
+src_compile() {
+	tc-export CC
+
+	local jit_backend
+	if use jit; then
+		jit_backend='--jit-backend='
+
+		# We only need the explicit sse2 switch for x86.
+		# On other arches we can rely on autodetection which uses
+		# compiler macros. Plus, --jit-backend= doesn't accept all
+		# the modern values...
+
+		if use x86; then
+			if use cpu_flags_x86_sse2; then
+				jit_backend+=x86
+			else
+				jit_backend+=x86-without-sse2
+			fi
+		else
+			jit_backend+=auto
+		fi
+	fi
+
+	local args=(
+		--shared
+		$(usex jit -Ojit -O2)
+		$(usex shadowstack --gcrootfinder=shadowstack '')
+		$(usex sandbox --sandbox '')
+
+		${jit_backend}
+		--make-jobs=$(makeopts_jobs)
+
+		pypy/goal/targetpypystandalone
+	)
+
+	# Avoid linking against libraries disabled by use flags
+	local opts=(
+		bzip2:bz2
+		ncurses:_minimal_curses
+	)
+
+	local opt
+	for opt in "${opts[@]}"; do
+		local flag=${opt%:*}
+		local mod=${opt#*:}
+
+		args+=(
+			$(usex ${flag} --withmod --withoutmod)-${mod}
+		)
+	done
+
+	local interp=( "${PYTHON}" )
+	if use low-memory; then
+		interp=( env PYPY_GC_MAX_DELTA=200MB
+			"${PYTHON}" --jit loop_longevity=300 )
+	fi
+
+	set -- "${interp[@]}" rpython/bin/rpython --batch "${args[@]}"
+	echo -e "\033[1m${@}\033[0m"
+	"${@}" || die "compile error"
+
+	#use doc && emake -C pypy/doc/ html
+	pax-mark m "${ED%/}${INSDESTTREE}/pypy-c"
+}
+
+src_install() {
+	einfo "Installing PyPy ..."
+	insinto "/usr/$(get_libdir)/pypy3"
+	doins -r include lib_pypy lib-python pypy-c libpypy-c.so
+	fperms a+x ${INSDESTTREE}/pypy-c ${INSDESTTREE}/libpypy-c.so
+	pax-mark m "${ED%/}${INSDESTTREE}/pypy-c" "${ED%/}${INSDESTTREE}/libpypy-c.so"
+	dosym ../$(get_libdir)/pypy3/pypy-c /usr/bin/pypy3
+	dodoc README.rst
+
+	if ! use gdbm; then
+		rm -r "${ED%/}${INSDESTTREE}"/lib_pypy/gdbm.py \
+			"${ED%/}${INSDESTTREE}"/lib-python/*3/test/test_gdbm.py || die
+	fi
+	if ! use sqlite; then
+		rm -r "${ED%/}${INSDESTTREE}"/lib-python/*3/sqlite3 \
+			"${ED%/}${INSDESTTREE}"/lib_pypy/_sqlite3.py \
+			"${ED%/}${INSDESTTREE}"/lib-python/*3/test/test_sqlite.py || die
+	fi
+	if ! use tk; then
+		rm -r "${ED%/}${INSDESTTREE}"/lib-python/*3/{idlelib,tkinter} \
+			"${ED%/}${INSDESTTREE}"/lib_pypy/_tkinter \
+			"${ED%/}${INSDESTTREE}"/lib-python/*3/test/test_{tcl,tk,ttk*}.py || die
+	fi
+
+	# Install docs
+	#use doc && dohtml -r pypy/doc/_build/html/
+
+	einfo "Generating caches and byte-compiling ..."
+
+	local -x PYTHON=${ED%/}${INSDESTTREE}/pypy-c
+	local -x LD_LIBRARY_PATH="${ED%/}${INSDESTTREE}"
+	# we can't use eclass function since PyPy is dumb and always gives
+	# paths relative to the interpreter
+	local PYTHON_SITEDIR=${EPREFIX}/usr/$(get_libdir)/pypy3/site-packages
+	python_export pypy3 EPYTHON
+
+	echo "EPYTHON='${EPYTHON}'" > epython.py || die
+	python_domodule epython.py
+
+	# Generate Grammar and PatternGrammar pickles.
+	"${PYTHON}" -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
+		|| die "Generation of Grammar and PatternGrammar pickles failed"
+
+	# Generate cffi modules
+	# Please keep in sync with pypy/tool/build_cffi_imports.py!
+#cffi_build_scripts = {
+#    "sqlite3": "_sqlite3_build.py",
+#    "audioop": "_audioop_build.py",
+#    "tk": "_tkinter/tklib_build.py",
+#    "curses": "_curses_build.py" if sys.platform != "win32" else None,
+#    "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
+#    "gdbm": "_gdbm_build.py"  if sys.platform != "win32" else None,
+#    "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
+	cffi_targets=( audioop syslog pwdgrp )
+	use gdbm && cffi_targets+=( gdbm )
+	use ncurses && cffi_targets+=( curses )
+	use sqlite && cffi_targets+=( sqlite3 )
+	use tk && cffi_targets+=( tkinter/tklib )
+
+	local t
+	# all modules except tkinter output to .
+	# tkinter outputs to the correct dir ...
+	cd "${ED%/}${INSDESTTREE}"/lib_pypy || die
+	for t in "${cffi_targets[@]}"; do
+		# tkinter doesn't work via -m
+		"${PYTHON}" "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
+	done
+
+	# Cleanup temporary objects
+	find "${ED%/}${INSDESTTREE}" -name "_cffi_*.[co]" -delete || die
+	find "${ED%/}${INSDESTTREE}" -type d -empty -delete || die
+
+	# compile the installed modules
+	python_optimize "${ED%/}${INSDESTTREE}"
+}
diff --git a/dev-python/pyte/Manifest b/dev-python/pyte/Manifest
index f30b34e3f33e..9bec2a5f81a8 100644
--- a/dev-python/pyte/Manifest
+++ b/dev-python/pyte/Manifest
@@ -1 +1,2 @@
+DIST pyte-0.4.10.tar.gz 44410 SHA256 9c492bacc628c2e88fe3a5cb70dcd361b544baa46cd51435861e48068a896ecf SHA512 64ee60285c621cf13e24bb7e22e541bb66ed4eb2fa5cb371e0051d65e96766ae630c15206b0f0ee3f98dff87a82517b65dd9b322445439d97a92dd226a54969f WHIRLPOOL bd7f1526cf58e4ba31236d8d7f4f7e352110a70c155dfdf21b84b497262f9e8106f5efbdc30e42733cd27f9e430322ab4fceaec8f18267e09b7ccc0ea52636fb
 DIST pyte-0.4.9.tar.gz 43730 SHA256 3b1d3b9df29e24f6ae3e9c277d830a01bbb610bf88e6bb4c8255a25c00472ba3 SHA512 551f464282db7bd4eadf53358619651a6bac59868939f30ee3f33255a275ec321d773c075e786f28861824ed005282ec7aac11a63ced173fe8a1aacbfa9e2e0c WHIRLPOOL 20eac26136cdc906d40ea0b409be99959443fd2b24143a29223f78f42986f52f4e4b99c0817a22ed0edcf2b59e1d5961fac0cf4cc32d1430f71f64b532b9e951
diff --git a/dev-python/pyte/pyte-0.4.10.ebuild b/dev-python/pyte/pyte-0.4.10.ebuild
new file mode 100644
index 000000000000..d4b48d4f7c30
--- /dev/null
+++ b/dev-python/pyte/pyte-0.4.10.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} )
+
+inherit distutils-r1
+
+DESCRIPTION="Simple VTXXX-compatible terminal emulator"
+HOMEPAGE="https://pypi.python.org/pypi/pyte/ https://github.com/selectel/pyte"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="LGPL-3"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/sure/Manifest b/dev-python/sure/Manifest
index 051f282e6778..fb56c85cb3c5 100644
--- a/dev-python/sure/Manifest
+++ b/dev-python/sure/Manifest
@@ -1,3 +1,4 @@
+DIST sure-1.2.24.tar.gz 28089 SHA256 5c0456a0bfec40ffe57bf9f1f1d4f6cfd4b92848b8c97b5b4165afb933c0d2d3 SHA512 875d2cb220d8915737909df372bedc2266c5c948c6f5ea23f3de5ee57b0f1179d2a0ae3455228d71a4f0f4279c098bb4c142a862b55462d67fd425c0def49a8b WHIRLPOOL 6cc102e2aabb143af0ae8104a4ce7d2fe44c00facf2d27d43b5d9e44f9f9b81ba888d6e2df91f2c14b3d50c5502450dc4c353e802a17c176353f284cd84db9a2
 DIST sure-1.2.3.tar.gz 16921 SHA256 f6200277de5b63094f2d1d384967e19a95be53ba664bb7a748b3b183e5cfadf7 SHA512 79f9e7639e468e61858d70cb3184c44e9de30d1ecefb4701e3a305b9fc231b9a4df27e795f8b31da6ddc221ba002bc83dd59621e7f364598c80b831a4bcc9fa9 WHIRLPOOL 1c2d5d58b2765e1ea89bb27d079083479f4460a01ae735268fbc82148643348a8796ec6142b39e4a188fb6bad16a130578b66ae52bd2ebe112bd2972cd6cc54a
 DIST sure-1.2.5-r1.tar.gz 52128 SHA256 8a77c1372f3bf9784310b3cf0ab66e86190b531a2b68e47616bce0e4e4983fbe SHA512 733df3a9482cc23e5f078b554a80a726ed87f4ac307b00166d5ad7d8d40de47fe7d77a7373b213d75fc78849a2ba0dbea89f71c6f29449f52eab448fdf847c45 WHIRLPOOL d466c9a6016f636f2b388ed001c12f7e050184b2b54507e1ef5ead4899b2ab8433022254645bd7a989f15105d768902e18289c8f23cff82277d422811f1b7cfb
 DIST sure-1.2.5.tar.gz 19048 SHA256 63f9861f607c5a27d090edaf91e6c93421a11ae1c011171f7394f44ccc391cdc SHA512 41f097318093b7e1683c38cae7aad3551bcc4e82918d3005388ce660c81a014b0939d3ad9dc12905c50892c82282c3e90aadb01ca7600b593d09afa2549c7135 WHIRLPOOL ea3bb51d9f0b375656b248c80c0a381fc026347efb0a94c856fb319c1e6f1e7d9e6e5a665f57e835a4fdb50060f3b2fa4c9168e8f61ae01af5a05bfc337a9481
diff --git a/dev-python/sure/sure-1.2.24.ebuild b/dev-python/sure/sure-1.2.24.ebuild
new file mode 100644
index 000000000000..eb3ec23b12d0
--- /dev/null
+++ b/dev-python/sure/sure-1.2.24.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Utility belt for automated testing in python for python"
+HOMEPAGE="https://github.com/gabrielfalcao/sure"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+CDEPEND="
+	dev-python/mock[${PYTHON_USEDEP}]
+	>=dev-python/nose-1.3.0[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	~dev-python/rednose-0.4.1[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( ${CDEPEND} )
+"
+RDEPEND="${CDEPEND}"
+
+python_prepare_all() {
+	sed \
+		-e "82s/read_version()/'${PV}'/" \
+		-i setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests -v -s tests --rednose || die "Tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/urllib3/Manifest b/dev-python/urllib3/Manifest
index 16d9cb0d5ee9..8e8bdc3c03b6 100644
--- a/dev-python/urllib3/Manifest
+++ b/dev-python/urllib3/Manifest
@@ -2,4 +2,5 @@ DIST urllib3-1.10.3.tar.gz 136894 SHA256 ce1bb9a3f103610a062ace3ae6e56ebf2fa0fbe
 DIST urllib3-1.10.4.tar.gz 138538 SHA256 52131e6a561466f1206e1a648d9a73dda2a804d0f70e83782bd88494542ded09 SHA512 83118aa5bf23add5bb5dafd98d32459315d971246ac2a49f7f0d0fcad6414099885f6d4fc7847de17e983b949c8a21fa4ed71c0216e578bdfc8eb351672f7c09 WHIRLPOOL 03431b6c575f3399bf8876d7dfad126986864e3a3f09d05e7e682b5b374ed420854c776a3d7bac91538086e43a9b832975aaf0b1b2e3fcde1ba8cfe93417bdc3
 DIST urllib3-1.10.tar.gz 128200 SHA256 25b4a7fbbd9112e0190f31f8877aa0523caeab8630872ad1bbddaba01cdd6599 SHA512 32f9162f82a676146fae6bba462d21eb81635d8660ca4676b5e8dd3d18b68525a265695c646f06c099a78c24d9b108f0610d3e17f20578d473771bebd42cc52d WHIRLPOOL a8a84b79fd0edeecdd19eaef0ee809d1c5d842ff6bcf089df9a1111744a2f42bec1a366b76b6e7334a51cad83d42b166f133a4156bbbfb7be24518353ee71081
 DIST urllib3-1.12.tar.gz 151072 SHA256 0ea512776971fe4e76192600fe41e4e7ee96b4b9a5b15aefc1ac31d2a63872c6 SHA512 44f1cf9c5d5538e35d026551a2d1dc7119786c1148b9a769fa9f652f0368e996512962c6245c92d1f4bb1d8e816e2fb0ffebeb0060b01f92b2a5d6e01d15426f WHIRLPOOL d386e4fb47b2ea4d78d2ad690c9252d6be1b3f5a624e20670e22c9b3a28dc910e3d5ecd24ca54d8f8337f8e9a9875208efce06952cd392d9c8254257eadeee70
+DIST urllib3-1.13.1.tar.gz 156259 SHA256 6eba1d713f8552e37ac4081c6bdf7be9f5a79f58447aed762bf24cc34c5e3983 SHA512 663c0a10b0e6b8a2c337cf799e45b8d949cbf0f542e22204fe31af193c7275c499ddf0ac3470152cc51bed56a0f5b77f1897140801b732773f606e77e8cea420 WHIRLPOOL d0c3ea06f7a8180eca9b22197ddad6f04ea9b9c5fe254ade00e12fb9a5ffeaa9264a5a160cc49ebd87a1822ba13af22bef357a241b7b76b2281f400f776e309e
 DIST urllib3-1.9.1.tar.gz 171086 SHA256 d858379ef5988d4534bb8909432d697422100aaff272299d661339836b6dae9b SHA512 c972e4dc9dabf6378da75e0abce5e53bec29624f2dc0faff3c8ce762474d490da6aec7d2e374c57d0d18e640311845750eb257fc7829ac9d25a3d9c957c59c6f WHIRLPOOL 666b82e712939b3ff5dfe109ba0498c16dbea7f2c0f0c2e1c317cf7e6f03711ce4a9468bb72327abe7821aa75c0257d30dbce5c196ba59215df3dba4084c7360
diff --git a/dev-python/urllib3/urllib3-1.13.1.ebuild b/dev-python/urllib3/urllib3-1.13.1.ebuild
new file mode 100644
index 000000000000..ba3e4231fd27
--- /dev/null
+++ b/dev-python/urllib3/urllib3-1.13.1.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="HTTP library with thread-safe connection pooling, file post, and more"
+HOMEPAGE="https://github.com/shazow/urllib3"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="doc test"
+
+RDEPEND="
+	dev-python/certifi[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/backports-ssl-match-hostname[${PYTHON_USEDEP}]' python2_7 pypy)
+	$(python_gen_cond_dep 'dev-python/ndg-httpsclient[${PYTHON_USEDEP}]' python2_7 pypy)
+	$(python_gen_cond_dep 'dev-python/pyasn1[${PYTHON_USEDEP}]' python2_7 pypy)
+	"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		>=www-servers/tornado-4.2.1[$(python_gen_usedep 'python*')]
+		>=dev-python/mock-1.3.0[${PYTHON_USEDEP}]
+		>=dev-python/nose-1.3.7[${PYTHON_USEDEP}]
+		>=dev-python/nose-exclude-0.4.1[${PYTHON_USEDEP}]
+	)
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	"
+
+# Testsuite written requiring mock to be installed under all Cpythons
+
+python_prepare_all() {
+	# Replace bundled copy of dev-python/six
+	cat > urllib3/packages/six.py <<-EOF
+		from __future__ import absolute_import
+		from six import *
+	EOF
+
+	sed \
+		-e 's:\.packages\.six:six:g' \
+		-e 's:\.six:six:g' \
+		-i urllib3/util/response.py urllib3/response.py || die
+
+	sed -i '/cover-min-percentage/d' setup.cfg || die
+	# Fix tests
+	sed -i 's/urllib3.packages.six/six/' test/test_retry.py || die
+
+	# Reset source of objects.inv
+	if use doc; then
+		local PYTHON_DOC_ATOM=$(best_version --host-root dev-python/python-docs:2.7)
+		local PYTHON_DOC_VERSION="${PYTHON_DOC_ATOM#dev-python/python-docs-}"
+		local PYTHON_DOC="/usr/share/doc/python-docs-${PYTHON_DOC_VERSION}/html"
+		local PYTHON_DOC_INVENTORY="${PYTHON_DOC}/objects.inv"
+		sed \
+			-e "s|'python': ('http://docs.python.org/2.7', None|'${PYTHON_DOC}': ('${PYTHON_DOC_INVENTORY}'|" \
+			-i docs/conf.py || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	# Failures still occur under py2.7.
+	# https://github.com/shazow/urllib3/issues/621
+
+	[[ "${EPYTHON}" == pypy ]] && return
+
+	nosetests -v test || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/werkzeug/Manifest b/dev-python/werkzeug/Manifest
index 8b07fb97f05a..39136c71aff2 100644
--- a/dev-python/werkzeug/Manifest
+++ b/dev-python/werkzeug/Manifest
@@ -3,4 +3,5 @@ DIST Werkzeug-0.10.4.tar.gz 1137282 SHA256 9d2771e4c89be127bc4bac056ab7ceaf0e006
 DIST Werkzeug-0.10.tar.gz 1133931 SHA256 9a97a6fcf87390172748da9e5250710b352dff18e979db925d276112cdcfa7ac SHA512 fc9872892ce02b3501a0edc0ea25a1edd793af61e0c268de80e465fb6ecee6f95c323a624fb2f71903c28a4b743012e3a48d23652172e7c4bc7305c797d4fee5 WHIRLPOOL 77a6a71a9c8d8ea55970f8a30569bf2964ebdb762c97fd8d92516a08aac1a53efcb115ad0ee10ee952be93b4732067680844a463d33ff69207454f2046594b3f
 DIST Werkzeug-0.11.1.tar.gz 1151713 SHA256 280b37866a1fa8604549cbc278f06d310143e20f1a6520ae5cf66e0df615e0a7 SHA512 d6cc65b8c3afe66f45acf3c9897679684c3525fcb27bbad54e7920fef15d88081d264f41f35f7a4d498e7f0664259f664a06ddfe794f8837585642a68d650c45 WHIRLPOOL 075923ea3f44356dc72b6272bc94d8a023c372123f19b59c9e3f2bf9852cdcf57d6ab54fc00b4d1eb87700852225e9f24877d550ab4c3813204cd07a9eef4590
 DIST Werkzeug-0.11.2.tar.gz 1152067 SHA256 eb4f98994b40a8e2edce289e811c9a38880ae53eb9ff6f031d0e243a69b0fcbf SHA512 aa83da47763a4c5b9b68c10e84ad195d8ae50b419faf25928d135cd0eebf7a57c4a7e178002a2f7a849005e0df8491398e12cd00098ccfb227ae2b75129e4966 WHIRLPOOL 612df2c211627712ed1853b89f17e943daf6156658fd7fd224133c8bc3d23808f77497a1bb5b711f9d7d446de8d2f6b8f0be1df0f9eb2e8f777d23a3bbed83dd
+DIST Werkzeug-0.11.3.tar.gz 1152396 SHA256 eb5f700a9bfc96420b055635af9002d3662e43d80c3ffd31f224c25bc0d5f462 SHA512 43fddfbf16e8771b21510749b95a55a03867009393e9b56802f894a74a1a8a51e0731e19c9b3c2c358cbb5e51e0c88ff6457bf672f934a62f8f114d3c7b6c357 WHIRLPOOL cc5a7b3985df5dc0f611ededce7b19667ab3ff4a20b08b6232cabe859633096c886ea654b9528d5660fa8c34001ac4148f96c53213a1e7a6a6d677a5361a0b57
 DIST Werkzeug-0.9.6.tar.gz 1128428 SHA256 7f11e7e2e73eb22677cac1b11113eb6106f66cedef13d140e83cf6563c90b79c SHA512 0b36df25d5f69a0353f7a9321b9197ace2926b6d8e983a91ef372c270ff51462f7d86184447a5f74b4ad05ffdc6411098f77b45a4f1c906dd525d7edf220399c WHIRLPOOL db153036e9dc36c70239001a6b451adeaafa3819f4903bb8c297bb4313c9a064926a2aad6e4457810b53796b3e492228a9ee1ec165fe5dce0522ab0d2c7407f9
diff --git a/dev-python/werkzeug/werkzeug-0.11.3.ebuild b/dev-python/werkzeug/werkzeug-0.11.3.ebuild
new file mode 100644
index 000000000000..91d72c859bd4
--- /dev/null
+++ b/dev-python/werkzeug/werkzeug-0.11.3.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+MY_PN="Werkzeug"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Collection of various utilities for WSGI applications"
+HOMEPAGE="http://werkzeug.pocoo.org/ https://pypi.python.org/pypi/Werkzeug"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="test"
+
+RDEPEND="dev-python/simplejson[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-xprocess[${PYTHON_USEDEP}]
+	)"
+
+S="${WORKDIR}/${MY_P}"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-ruby/amq-protocol/Manifest b/dev-ruby/amq-protocol/Manifest
index 5443b3621ed3..ff831e39eea7 100644
--- a/dev-ruby/amq-protocol/Manifest
+++ b/dev-ruby/amq-protocol/Manifest
@@ -1,2 +1,3 @@
 DIST amq-protocol-1.9.2.gem 43520 SHA256 79e018cb1a3522967525973ae04d40884620e8d4adca02afeb710f00643a84be SHA512 ea4553b337589589cc89b70e351722ec8af402bd560d73fd35ad41665424a6212e03e26ac86aace5d90f599c7fc2236686fbd83bd75c7023647d95163a2d8573 WHIRLPOOL 5fcfd806b8d84aa64b10bc160fe439dcdff2977b739e04ec23b8f86d94f7a5bee4b95d3688317096b0dcf9214a12921f4b0a4c93c9bd0f6ad3376a6199659189
 DIST amq-protocol-2.0.0.gem 43008 SHA256 13ffd60f8f41d986b522f4dabce1c9d97e248395998e358298d1dfe54943ef9b SHA512 d0bc3de546b4d618fb66ecee57691c948058f8c82fab6f5747a6122d56be39d36a5670df76e4ad23124cccc81c5d1ba2babe6dda02f070a6d306eb30a8ad7cc8 WHIRLPOOL c4c98f6892f35959f92c42b35aea51b90bc074942e30999c7f8bf4f13156148d917f2a6d35580654483f8495b2e8423cbe123c130865ea2e2ac173860e8347a9
+DIST amq-protocol-2.0.1.gem 43008 SHA256 fd5c0ef0f01c040529a6ddbc12cbdde3e40f63d5045c08b13a03f803df4ef6e6 SHA512 d723899902338562c9b4ad7fdd625e7efa27380b35e9986dfd31f8d334b7cdba4bea47a0f0306a4d24bd14376011287a98d5f31e2d92f89e9fdce7e267d37818 WHIRLPOOL 17657719885871532e1eb99ef4cf69dba84141c895f038c71f22fc054642a3b45cbbaf57bf0429aa4c239309b0c2c78d0ac1d9c6f3cb5a307672af4facce8f46
diff --git a/dev-ruby/amq-protocol/amq-protocol-2.0.1.ebuild b/dev-ruby/amq-protocol/amq-protocol-2.0.1.ebuild
new file mode 100644
index 000000000000..d2844cc3003f
--- /dev/null
+++ b/dev-ruby/amq-protocol/amq-protocol-2.0.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="ChangeLog.md README.md"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="An AMQP 0.9.1 serialization library for Ruby"
+HOMEPAGE="https://github.com/ruby-amqp/amq-protocol"
+
+LICENSE="MIT"
+SLOT="2"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+ruby_add_bdepend "test? ( dev-ruby/rspec-its )"
+
+all_ruby_prepare() {
+	rm Gemfile || die
+	sed -i -e '/bundler/ s:^:#:' -e '/effin_utf8/ s:^:#:' spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/arel/Manifest b/dev-ruby/arel/Manifest
index 51b74286c290..f2fd06bc2e2b 100644
--- a/dev-ruby/arel/Manifest
+++ b/dev-ruby/arel/Manifest
@@ -3,3 +3,4 @@ DIST arel-4.0.2.gem 52736 SHA256 eddf4c7794df8ba2673e0d0f35e3f7b064f346c6f5be098
 DIST arel-5.0.1.20140414130214.gem 52224 SHA256 c941f07bad89af26e8837c73d8a399b7777c721609f759eda015ed0081601636 SHA512 9f4c768712492ef8f7a938d89ce9c54c4e7c7ec2ff53ee52d5d12f0cefd7960895049f112b772864d034a4419acab91511173ddaab70a9f3d4027899af150011 WHIRLPOOL ebfae83108a1049dff2cdeb697c1c0514baa2ebdfbc0d885e586240397b33af8be8181268017a759fab9b7655992abceed844d80b91f8d85f8e9dfca98c3bc32
 DIST arel-6.0.2.tar.gz 51951 SHA256 5bb34a5dd4257a6f05b31f565db9c370df302f053ac42a63ea3f997fe8c593a3 SHA512 b7ad77a32b88296a2fe7b52ffbcfb2d5e7deb32c2dd02286a3c25563a565d323efa82a38047515f6e5bd9f99b5476f5aaeb2198f8213f5bb818dcf041817de90 WHIRLPOOL c27b868404e8dcee11ac24b5bed05052e8ab16b66eba0379a319e2a13f40b5f008994fbad599099e112a72fe2c54d157e8445ed0f27b9a089971e5bf769b0b8c
 DIST arel-6.0.3.tar.gz 52003 SHA256 476a51333ec8588213bbd91174af239d4910a68cd14a99de29d44ca5c24ec37a SHA512 8e04daacae0b07fd02c5623e86b87940e0d712e0ab7d85354d2ba8a9e0cc30d1549f128a39732d8dac5b83f3f77c1bfadb650b5726d1faf2bfeb64e0d51a8f04 WHIRLPOOL cae263da4bf2f3f869b3d658b0ced3f57349172f95ec05952ae6b2896704bc06c552814485ffcdc85d36f19ed68c386097e4b16c5317b05144b8176193896938
+DIST arel-7.0.0.tar.gz 55676 SHA256 19a927b76aa153cc8adab9b6c69d3b67f8701757663f834ca5f0c5b6d0105b9d SHA512 1972b43946e5760ea78052db0382818f059afa943117c9e5fd9f1f595529c769b1b3886eaff1bf0e23c051ef7440d49907b6a3a3bf4d97bda30cd88688875b87 WHIRLPOOL 09c04bf4603d68ac7206292b806ba52273fca116a94d27f5c345aaad09d7ea17b5064c822a7eb341a8cb9643b9028e2f1454ec6dd535171f9c799e9a7d5b0256
diff --git a/dev-ruby/arel/arel-7.0.0.ebuild b/dev-ruby/arel/arel-7.0.0.ebuild
new file mode 100644
index 000000000000..7252926e6f8c
--- /dev/null
+++ b/dev-ruby/arel/arel-7.0.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 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="rdoc"
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="History.txt README.markdown"
+
+RUBY_FAKEGEM_GEMSPEC="arel.gemspec"
+
+inherit ruby-fakegem versionator
+
+DESCRIPTION="Arel is a Relational Algebra for Ruby"
+HOMEPAGE="https://github.com/rails/arel"
+SRC_URI="https://github.com/rails/arel/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MIT"
+SLOT="$(get_version_component_range 1-2)"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/test-unit:2
+		>=dev-ruby/minitest-5.4:5
+	)"
+
+all_ruby_prepare() {
+	sed -i -e "/[Bb]undler/d" \
+		-e '/specname/,$ s:^:#:' Rakefile || die
+}
diff --git a/dev-ruby/ast/Manifest b/dev-ruby/ast/Manifest
index f81892308eac..ae8b9a92c5c3 100644
--- a/dev-ruby/ast/Manifest
+++ b/dev-ruby/ast/Manifest
@@ -1,2 +1,3 @@
 DIST ast-2.0.0.gem 14336 SHA256 e8912628cabb49357e69f741b707b5b92c1be8be596e236589c4c44e6d453cd2 SHA512 dee0296c4d1bcad6454930778cadf0395b25a87b4c24d15a74d190739344c66bce3f08451868278fc9cea1a420e8548698342264edeccda76b793afabc5ebf6b WHIRLPOOL 3a8ea7c502324261628711ebeb2391045938aa7e95e1d18e235365f58ab89f407162787a7299df3e0a2c112c6943d40e407b38509f993bd627a8d7216e041b6b
 DIST ast-2.1.0.gem 14848 SHA256 f3066fd52ad2aa5731d5321ea609190deade4f2be251a3891d1cecdc1df74b80 SHA512 b60fb87ba204456dbb09ed6d747322555e415f5849d67dfb75624c4de2158b65038db7e4762ac6faf6c2b6854b0af8069b13e0b9c33b50eeaf69d5963588403a WHIRLPOOL eea8653a94d54bd1eef6f081b3197f728593f6f05e8e6632d0f4a672b35e123dd7276d250142ec5a6e222800ca8926ac60bf112f35e44c97464fa0fb3250bfb0
+DIST ast-2.2.0.gem 14848 SHA256 8be669575d41b7b961a3e6ed370e550bed6083b3f8337ab6c8b506871c02ad92 SHA512 556b9d68787a05f33f6f7e518971dfc965d326fd1a2e0dd1d16d1360526c598fccb0117a09348da88f6243bb3295dbb6d91fa6bd2a27c19cd7b519105b826aea WHIRLPOOL da7ca57261786f8bdb6e87733649535bbacd6f0f82614a865019f518177f0e3877df72a9fdc7ffac07af35254b73553340e708d1a8d913039cfd0cbca847cddb
diff --git a/dev-ruby/ast/ast-2.2.0.ebuild b/dev-ruby/ast/ast-2.2.0.ebuild
new file mode 100644
index 000000000000..3a9bdbc70df4
--- /dev/null
+++ b/dev-ruby/ast/ast-2.2.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_RECIPE_DOC="yard"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A library for working with abstract syntax trees"
+HOMEPAGE="https://github.com/whitequark/ast"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_bdepend "test? (
+	dev-ruby/bacon )"
+
+all_ruby_prepare() {
+	sed -i -e "/[Bb]undler/d" Rakefile || die
+	sed -i -e "/git ls/d" ${PN}.gemspec || die
+	sed -i -e "/simplecov/,+11d" -e "/colored_output/d" test/helper.rb || die
+}
+
+each_ruby_test() {
+	${RUBY} -S bacon -Itest -a || die
+}
diff --git a/dev-ruby/bundler/Manifest b/dev-ruby/bundler/Manifest
index 496fc9cff32e..0c3bae56e52a 100644
--- a/dev-ruby/bundler/Manifest
+++ b/dev-ruby/bundler/Manifest
@@ -1,3 +1,4 @@
 DIST bundler-1.10.6.tar.gz 313526 SHA256 6c700c2183577be4991b82a975b981bf85a6eb32c9a9a86027aa8e88f1768c19 SHA512 63791bca60c0981aebd69a8fab8bd3741976a0c2a94a5d99f54560917e3a9661b87812385d88a9b858e8d08ffe3b68b42e1c06eb8370dd216713fd6daa1a2166 WHIRLPOOL f74fdfa82a96a8bb3f695bd4126283bc1076a42944227476bda98084e8e50f56e87508f8e63f102fc6297f38ae6325130a9750ee1ccb340c2163d35ab1ed1e36
+DIST bundler-1.11.2.tar.gz 329289 SHA256 8f84487d197f7fcd1753dbe92403febb1ad1ac4ef847fadb473ca9ec62647c8d SHA512 04f324b1a6c23b4e92f2b8c1c974a9420af21f95569b8617d600c9d307af142d109c606cce5f64601e79620f31194d1b4b9f72982b7009c37c5a7a5dd1d973a6 WHIRLPOOL 45fb426c454da025c938bab216f6cd41832779b827736aa66b8536877ae5eb161813f34ffcd1280f410a55140673ad10916f4407bf894eec6c23fcad0045ba80
 DIST bundler-1.8.9.tar.gz 290462 SHA256 9ecbe18147b990e8c5c7f299e9bc7b63eb274f54b05134ad334e0abeb943f733 SHA512 2e3378e2c329c53eb6e578b496e1fb332c4f96eca58299e59dd8cb7f5d3b78f43bc6bf96c452cbeb99a0459c016a824248f907b58dcc2081490e4f59ea7a32ba WHIRLPOOL 887a72075093405dd5c94902865589e4946d70f1cc390725e8ae35f6a36cdc2bdd05b9c27958a5c2497d6f42011791c2432f15ab45e1ccbc8c7f0d7da37799c9
 DIST bundler-1.9.10.tar.gz 301546 SHA256 ea56d906a96f14ffb8ebd3bd5f35ebb4389901be10c8470f6741d6567f16f844 SHA512 0cd05ae67543c5993d2e33cc9287dc375703cda3250de3556442ae513825b200d534640a9232806b1c4bdec192937de2b40d54563030d9aff8f7727f349a7b17 WHIRLPOOL ac2a118bd85d5b6c9ef2819dec95c6580c769a4985429fd959cffc0e0a6be1f6e37106b2d713e42c360dd19761b71f93dbf519f68fd5bcda0ffb09f97e5eff89
diff --git a/dev-ruby/bundler/bundler-1.11.2.ebuild b/dev-ruby/bundler/bundler-1.11.2.ebuild
new file mode 100644
index 000000000000..1730e4726257
--- /dev/null
+++ b/dev-ruby/bundler/bundler-1.11.2.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+USE_RUBY="ruby20 ruby21 ruby22"
+
+#RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+# No documentation task
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md ISSUES.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="An easy way to vendor gem dependencies"
+HOMEPAGE="https://github.com/carlhuda/bundler"
+SRC_URI="https://github.com/carlhuda/bundler/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc test"
+
+ruby_add_rdepend virtual/rubygems
+
+ruby_add_bdepend "doc? ( app-text/ronn )"
+
+# ruby_add_bdepend "test? ( app-text/ronn )"
+
+# The specs require a number of gems to be installed in a temporary
+# directory, but this requires network access. All tests should still
+# pass with network access.
+RESTRICT="test"
+
+RDEPEND+=" dev-vcs/git"
+
+all_ruby_prepare() {
+	# Bundler only supports running the specs from git:
+	# https://github.com/carlhuda/bundler/issues/issue/738
+	sed -i -e '/when Bundler is bundled/,/^  end/ s:^:#:' spec/runtime/setup_spec.rb || die
+
+	# Fails randomly and no clear cause can be found. Might be related
+	# to bug 346357. This was broken in previous releases without a
+	# failing spec, so patch out this spec for now since it is not a
+	# regression.
+	sed -i -e '/works when you bundle exec bundle/,/^  end/ s:^:#:' spec/install/deploy_spec.rb || die
+
+	# Remove unneeded git dependency from gemspec, which we need to use
+	# for bug 491826
+	sed -i -e '/files/ s:^:#:' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Avoid specs that are not compatible with all rspec versions.
+	sed -e '/has no malformed whitespace/,/^  end/ s:^:#:' \
+		-e '/uses double-quotes consistently/,/^  end/ s:^:#:' \
+		-i spec/quality_spec.rb || die
+
+	# Avoid spec failing with git 2.0.
+	sed -i -e '/on releasing/,/^        end/ s:^:#:' spec/bundler/gem_helper_spec.rb || die
+}
+
+each_ruby_compile() {
+	if use doc ; then
+		${RUBY} -S rake man:build || die
+	fi
+}
diff --git a/dev-ruby/bunny/Manifest b/dev-ruby/bunny/Manifest
index 2b61a4eefef4..17758bfcd63f 100644
--- a/dev-ruby/bunny/Manifest
+++ b/dev-ruby/bunny/Manifest
@@ -1,5 +1,3 @@
-DIST bunny-1.6.3.gem 180224 SHA256 3eb1339993db6ea5b8655be374c0427924c13bdc9cafee8141e513d334e0a52d SHA512 ceeca544cd05c78adb3bd3164ca84851b65270ecd069e923979b432abc92160642f334df088364ae9960b2c3523260a0ffcd06dd20b51bd798178231efa74a95 WHIRLPOOL 7a9a20240e15c3b480aa870c6270f08ba0d95d12d4ea68e71c444e5abe4933a9dfadbe3babf71c1e35c78a04be09a0d8c01159781b749db3be79189ddede9e13
-DIST bunny-1.7.0.gem 181248 SHA256 889b3bb5b173d8ce16ec7d96cd72ccd742a3e31eaaf0f0336b762cec1f0bf806 SHA512 158ea3906c1318458da7551519ff00e30191f91f0cf3ea777b1069f55cd5fce865591495f56177f8d23a4498bdf95b145caa2027136fab2d3108af6a685eca59 WHIRLPOOL 05fa177b554a5d0c4a76f953242b3d715c4dc969b939375ac22e5d054fee4a1a6634c8a851f25f11120037a1992af7202ff5727452415cea5a3e60cea6c24a03
 DIST bunny-2.0.1.gem 183296 SHA256 ceff06015fa1ddc3aeea397f23242a9de13f3bc7f3481ace1a0b194d66a84236 SHA512 53ef3ec503f4ed5cbcec72343a492f102c358f7f2bd6f4833a3306384faf03195e59f9ca5ef9a7e0d7dc21ae1428c9b107bbbc5a4691853920d3410765e576be WHIRLPOOL 465ea17a2c1ed51127ed37f4ad8fc916d9227111debec127bfcd4e539a7c697c8f5395c3f26cc47c4665948f7e67027d1d0b20c1235b93482aa17302bcbf7771
-DIST bunny-2.2.0.gem 183808 SHA256 901b9e4ccac2edc7b1e08ca63083e519410b46a0c8d23438a6be6570be8282f1 SHA512 f7043ddb7d0f7e9cf365d27456b0545110aa9b61cbbf89fdb73cb73cc60b14d7d9d13c4e6292347a43698053ac06468fe7e10f6bcf4a22306040e85e83fd6d36 WHIRLPOOL 35cbee6eaca8b19248e8f3c344838651ecde93b65eee632c468fa45327adf8685f2deba394a6435fe9635aa5f4a1a0df3284f6c48551be2cd62b88b4880ae658
 DIST bunny-2.2.1.gem 184320 SHA256 ff05d3a86257e0cc8c1480a7918da9d476bed90ece06fbfbb19319b9c224a81b SHA512 649aa1e1110a5feda751e471251b24ab3e43fabe9c95d9502bc18e5b0ff39543de329f7135fbc6adbe8dd4d12324dfe9a01a254fdf6e79e4daa12c782138fe03 WHIRLPOOL c0972565ee3e0213eb2b98d30af1f90a94bf3db19fa36b24da33388e4345a323ee536f7bbd2dd5b685abd14bcdec67ca278e63fbc20c5fc108e3b273b3bcd26e
+DIST bunny-2.2.2.gem 184320 SHA256 36a2b307dcc7f271e9027cb8dde5827b7e02c6a8e4694c0e693b746e4d171a9b SHA512 f87994ab4e491c7e4527189a5a76ce2e4d0a6c7555f913ddefed77d95c62a080b7b629020c66afc0a6cb8ea1d7a310aba0e4dedfc6c3e5b97daf4d4c9378f517 WHIRLPOOL 42fa1e2ed8737dfcaf91a900d282a33adc151d5f996ca6bdc840b4919d1bba16c6c1e7f9240a6e1bef02a37e73d722e3e9ed5bafeb4045687b2ece33cb0054a6
diff --git a/dev-ruby/bunny/bunny-1.6.3.ebuild b/dev-ruby/bunny/bunny-1.6.3.ebuild
deleted file mode 100644
index f53f3f7659ec..000000000000
--- a/dev-ruby/bunny/bunny-1.6.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-# Tests require a live AMQP server.
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_EXTRADOC="ChangeLog.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Another synchronous Ruby AMQP client"
-HOMEPAGE="https://github.com/celldee/bunny"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/amq-protocol-1.9.2"
-
-all_ruby_install() {
-	all_fakegem_install
-
-	insinto /usr/share/doc/${PF}
-	doins -r examples || die
-}
diff --git a/dev-ruby/bunny/bunny-1.7.0.ebuild b/dev-ruby/bunny/bunny-1.7.0.ebuild
deleted file mode 100644
index f53f3f7659ec..000000000000
--- a/dev-ruby/bunny/bunny-1.7.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-# Tests require a live AMQP server.
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_EXTRADOC="ChangeLog.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Another synchronous Ruby AMQP client"
-HOMEPAGE="https://github.com/celldee/bunny"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/amq-protocol-1.9.2"
-
-all_ruby_install() {
-	all_fakegem_install
-
-	insinto /usr/share/doc/${PF}
-	doins -r examples || die
-}
diff --git a/dev-ruby/bunny/bunny-2.2.0.ebuild b/dev-ruby/bunny/bunny-2.2.2.ebuild
index d4bedab2f7d6..19d3a89aab5b 100644
--- a/dev-ruby/bunny/bunny-2.2.0.ebuild
+++ b/dev-ruby/bunny/bunny-2.2.2.ebuild
@@ -3,7 +3,7 @@
 # $Id$
 
 EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22"
 
 RUBY_FAKEGEM_TASK_DOC=""
 
@@ -22,7 +22,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-ruby_add_rdepend "dev-ruby/amq-protocol:2"
+ruby_add_rdepend ">=dev-ruby/amq-protocol-2.0.1:2"
 
 all_ruby_install() {
 	all_fakegem_install
diff --git a/dev-ruby/dbf/Manifest b/dev-ruby/dbf/Manifest
index 9dc0889f67c0..b6f479a03f41 100644
--- a/dev-ruby/dbf/Manifest
+++ b/dev-ruby/dbf/Manifest
@@ -3,3 +3,4 @@ DIST dbf-2.0.13.gem 125952 SHA256 d970c42f6f677df3b31788814845ac3135979987641447
 DIST dbf-2.0.8.gem 115712 SHA256 d953117337e3d12720815304b5e584ccdd7d081b65d0a01dd2d825087e1b4f79 SHA512 b2098359f88b5df50113af979d0d95591b1b15db22e8554bced14f4a5190ac3f490971e7f857bb832d4957f82e6f82d5cbcea0332401a54cf41b897bfb1f3b74 WHIRLPOOL 7afdf410cfc43009e407a14ffe5944d1639ec4318d9517314b9d41734341777ce5833033462accf3ea699d26b4fd4a3fb410875ee4b9eda197199cefd3db7836
 DIST dbf-3.0.0.gem 125952 SHA256 d3c2dfd562d254bd5a566bf231fa61b25b18c952190de2d67c6d628bc785d81f SHA512 b84bd1dc62a27f5c8c30a03bce5eb90c4a461d2821cfe7da4a6505fb602592f74541e00ee4f2e40d4e16c9321b3f1ec07c11c992dfef62be5b98c58a65e5c264 WHIRLPOOL 87ed38184455eac2ce2c74385b1ffe37b4d5775432f4f9065804e96d4eb465eec1e982ee5d1d571a2163be4f42d9c6f80006e847b3dc712ef870594702776f8b
 DIST dbf-3.0.1.gem 125952 SHA256 baa8342d8a7bb27239a713ed48ed1d1252878e293fcac0c24d97ad884e12e49e SHA512 64f94f29c36084ba31a993767555e52687467ed7c5c6d21a2efc1cdfe4d7f414531fd1b5dc2b7e9b73f5d9a5456e0e81b91123eb3084ebb4ca9ed62a91e466ac WHIRLPOOL 430e63d7982e7f5f95487818a1bdb6bca2fa6667c4d35aa0e4d72c0b205db34a8750ab9e2bf0f11270d63a71fde71e25b1e949d4d78137d95cb8c6edafd0aafe
+DIST dbf-3.0.3.gem 125952 SHA256 5db79720ae7079c9539be3abc4a2801ee9ea4d0a4fc5ca3ded44f9ef67015b24 SHA512 6f04ec0903ac3daa24bf388a103248cbd7fd9353616cd738c5e0b72f8c27a0cd19d9113655b1e5dd9d6193b6549496526febf7ba49ed729a1a2f1f77cc202a97 WHIRLPOOL 786ed9d7954536b795c1225a067064c673ba7a630df213e3d13526b1388739c3a9a4eb3f90eec3e8fcbb9e630930d694f595475176aa880e66f9a028578c20a0
diff --git a/dev-ruby/dbf/dbf-3.0.3.ebuild b/dev-ruby/dbf/dbf-3.0.3.ebuild
new file mode 100644
index 000000000000..05c2593c51f5
--- /dev/null
+++ b/dev-ruby/dbf/dbf-3.0.3.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+USE_RUBY="ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md docs/*"
+
+inherit ruby-fakegem
+
+DESCRIPTION="a small fast library for reading dBase, xBase, Clipper and FoxPro
+database files"
+HOMEPAGE="https://github.com/infused/dbf"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
diff --git a/dev-ruby/hashie/Manifest b/dev-ruby/hashie/Manifest
index f960fd5fa2e8..ba30922e0b5e 100644
--- a/dev-ruby/hashie/Manifest
+++ b/dev-ruby/hashie/Manifest
@@ -1,2 +1,3 @@
 DIST hashie-2.1.2.gem 34816 SHA256 a9e1e4928bf4f5a5683ea9c7ef29e50fb93f72542f9a9550e205fe33a6568923 SHA512 6f72998710da58a2584939b4e74a114ae54168902020dc16ec5ea0422a91316b84aa6835fffb36a2985634f24ff5b0d01bcdb50134a414a269a4881ebcd728ac WHIRLPOOL 6b67c04ef9dc33a9ffdf25d14440bdd3ce621f1bde9b4eb806de63fa39edc76627f80d10435efc708fc48d24f1450046f33aceb20d76238a0cf8b67ddcf72e78
 DIST hashie-3.4.2.gem 56320 SHA256 b68373c5f6589c5222638433918bc3e256acbaead7f883e5ec18420f507b17ca SHA512 9081d91ad014914f59ec4e18b92c27b6f316f03f476c94d3b469bda54f201d339d553ef142018f0e605d3571418af784d57e25211a6c141cd8eb5a56497c28d6 WHIRLPOOL cc76a268a7b8abc618b236a1958db783a5dc9e14c92b719782db71dd1a518e436b4e801f6854e5c8958298d4212814bae23893c1fe2a42561de28ba993847b2f
+DIST hashie-3.4.3.gem 58880 SHA256 29213491e9f74158b9a7ec0806b3698039357209a6b24553cfd767f6418365c7 SHA512 1a9f3169308e99559c67e021f0d4174618fd6e4cb6a53b4c7889b609ea32e2d7cde7216de2e3d485f496fa73491702e3af81b6875071b35ecfe5609d925225f7 WHIRLPOOL 09ab898ad08a975c69beb12bf2154c20d9ca00b698610101497705370f17c66f7d389b55b92378c83b02d53f3218351c3ccca119c8df5f80ce199dd7acb08722
diff --git a/dev-ruby/hashie/hashie-3.4.3.ebuild b/dev-ruby/hashie/hashie-3.4.3.ebuild
new file mode 100644
index 000000000000..5c9bfcbf867b
--- /dev/null
+++ b/dev-ruby/hashie/hashie-3.4.3.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+USE_RUBY="ruby20 ruby21"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Hashie is a small collection of tools that make hashes more powerful"
+HOMEPAGE="http://intridea.com/posts/hashie-the-hash-toolkit"
+
+LICENSE="MIT"
+SLOT="3"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/activesupport )"
+
+all_ruby_prepare() {
+	# Remove bundler and fix one spec that depends on its requires
+	#rm Gemfile || die
+	sed -i -e '/[Bb]undler/d' Rakefile || die
+	sed -e '/pry/ s:^:#:' -i spec/spec_helper.rb || die
+
+	# Avoid dependency on rspec-pending_for and its dependencies
+	sed -i -e '/pending_for/ s:^:#:' \
+		spec/spec_helper.rb \
+		spec/hashie/mash_spec.rb \
+		spec/hashie/extensions/strict_key_access_spec.rb || die
+}
diff --git a/dev-ruby/ruby-oci8/Manifest b/dev-ruby/ruby-oci8/Manifest
index 666cd81fb346..9e0403f85651 100644
--- a/dev-ruby/ruby-oci8/Manifest
+++ b/dev-ruby/ruby-oci8/Manifest
@@ -1,2 +1,3 @@
 DIST ruby-oci8-2.1.7.gem 231424 SHA256 6970edbed87a3f62db99a73f1584e615c572eb5818a9506161fbaff4e623c8c8 SHA512 7d08cba20c6fd1537e140c92cc5a6c7b169d1feb1a6c07a66c5569a6adf456943135935d47ded6cbf0c4a783d14d7877bb827e375c17a3b92dd5db0df8433d37 WHIRLPOOL 16228efb3057aebd82825c848dddef027f91f408f51d68d6d24f904eaedb49275b4969b78f190a0755ee531f0821ae8ece0ce845ad159a6d2b842a32b0d8c11b
 DIST ruby-oci8-2.1.8.gem 249856 SHA256 f5ab06e0312849b181e0b5e471f73b3070b9317ba289875f7ed44ee963b48f50 SHA512 897e5b86106b45e12bf359b8ed379a36a1c457daa1de9e7a8431f409ec25b12b20e30ed254a2bc77ab1abc0731f1c45e93860a36e0e6903c6fc7573a9ceeef9e WHIRLPOOL 7628ff11626619a82c02792d97ff66a2349af289d92fb52f928ff11c328a17dc8d1e02b16473028d0473f62d05617f07c30814030b32eb9908e52d49f4c259db
+DIST ruby-oci8-2.2.1.gem 308736 SHA256 415bf668212a18e7edce6b424f71c6ae18c78357124d372d645c03c12ca10d87 SHA512 e44aa8819b47dfeefe8cfb78094484ef78973ccfa4f026fae6e3363dda8152e9348c108797c8a19dcdc3bdab288651e63e74333c733b96b7ad9f2003d21709af WHIRLPOOL 7c993ca70d55976268f8cb2795331eadfe54c17d85ddc39bcb4dd1d69dead168c6ba7705a7f62c300a5cdd2de27645561b8c874891bea3082862fd4e6d754713
diff --git a/dev-ruby/ruby-oci8/ruby-oci8-2.1.8.ebuild b/dev-ruby/ruby-oci8/ruby-oci8-2.1.8.ebuild
index e33ea5ff53b5..bf9bfefa0db9 100644
--- a/dev-ruby/ruby-oci8/ruby-oci8-2.1.8.ebuild
+++ b/dev-ruby/ruby-oci8/ruby-oci8-2.1.8.ebuild
@@ -8,6 +8,7 @@ USE_RUBY="ruby19 ruby20 ruby21 ruby22"
 inherit multilib ruby-fakegem
 
 RUBY_FAKEGEM_EXTRADOC="NEWS README.md ChangeLog"
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 
 DESCRIPTION="A Ruby library for Oracle OCI8"
 HOMEPAGE="https://rubygems.org/gems/ruby-oci8/"
diff --git a/dev-ruby/ruby-oci8/ruby-oci8-2.2.1.ebuild b/dev-ruby/ruby-oci8/ruby-oci8-2.2.1.ebuild
new file mode 100644
index 000000000000..bf9bfefa0db9
--- /dev/null
+++ b/dev-ruby/ruby-oci8/ruby-oci8-2.2.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+
+inherit multilib ruby-fakegem
+
+RUBY_FAKEGEM_EXTRADOC="NEWS README.md ChangeLog"
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+
+DESCRIPTION="A Ruby library for Oracle OCI8"
+HOMEPAGE="https://rubygems.org/gems/ruby-oci8/"
+
+LICENSE="Ruby"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND+=" dev-db/oracle-instantclient-basic"
+DEPEND+=" dev-db/oracle-instantclient-basic"
+
+EXT_DIR="ext/oci8"
+
+each_ruby_configure() {
+	# configure the native libraries
+	${RUBY} -C${EXT_DIR} extconf.rb --prefix="${D}/usr" || die "configure failed"
+}
+
+each_ruby_compile() {
+	# compile the native libraries
+	emake -C ${EXT_DIR} V=1 || die "could not compile native library"
+}
+
+each_ruby_install() {
+	# install the native libraries
+	emake -C ${EXT_DIR} install DESTDIR="${D}" || die "could not install native library"
+	# install the gem files
+	each_fakegem_install
+}
diff --git a/dev-util/universalindentgui/universalindentgui-1.2.0-r1.ebuild b/dev-util/universalindentgui/universalindentgui-1.2.0-r1.ebuild
index 8b9cd9691638..b622706549ca 100644
--- a/dev-util/universalindentgui/universalindentgui-1.2.0-r1.ebuild
+++ b/dev-util/universalindentgui/universalindentgui-1.2.0-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=4
 PYTHON_DEPEND="python? 2"
 LANGS="de fr ja ru uk zh_TW"
 
-inherit eutils python qt4-r2
+inherit eutils python qmake-utils qt4-r2
 
 DESCRIPTION="Cross platform GUI for several code formatters, beautifiers and indenters"
 HOMEPAGE="http://universalindent.sourceforge.net/"
@@ -47,8 +47,8 @@ pkg_setup() {
 
 src_prepare() {
 	# correct translation binaries
-	sed -e "s/lupdate-qt4/lupdate/" \
-		-e "s/lrelease-qt4/lrelease/" \
+	sed -e "s|lupdate-qt4|$(qt4_get_bindir)/lupdate|" \
+		-e "s|lrelease-qt4|$(qt4_get_bindir)/lrelease|" \
 		-i UniversalIndentGUI.pro || die "sed pro translation binary"
 
 	if use debug; then
diff --git a/eclass/elisp.eclass b/eclass/elisp.eclass
index 11788802b039..93a7d4bb2a37 100644
--- a/eclass/elisp.eclass
+++ b/eclass/elisp.eclass
@@ -65,13 +65,21 @@
 # DOCS="blah.txt ChangeLog" is automatically used to install the given
 # files by dodoc in src_install().
 
-inherit elisp-common eutils
+inherit elisp-common
 
 case ${EAPI:-0} in
-	0|1) EXPORT_FUNCTIONS src_{unpack,compile,install} \
-		pkg_{setup,postinst,postrm} ;;
-	*) EXPORT_FUNCTIONS src_{unpack,prepare,configure,compile,install} \
-		pkg_{setup,postinst,postrm} ;;
+	0|1)
+		inherit eutils
+		EXPORT_FUNCTIONS src_{unpack,compile,install} \
+			pkg_{setup,postinst,postrm} ;;
+	2|3|4|5)
+		inherit eutils
+		EXPORT_FUNCTIONS src_{unpack,prepare,configure,compile,install} \
+			pkg_{setup,postinst,postrm} ;;
+	6)
+		EXPORT_FUNCTIONS src_{unpack,prepare,configure,compile,install} \
+			pkg_{setup,postinst,postrm} ;;
+	*) die "${ECLASS}: EAPI ${EAPI} not supported" ;;
 esac
 
 DEPEND=">=virtual/emacs-${NEED_EMACS:-23}"
@@ -117,21 +125,28 @@ elisp_src_unpack() {
 # for in the current working dir, WORKDIR, and FILESDIR.
 
 elisp_src_prepare() {
-	local patch
+	local patch file
 	for patch in ${ELISP_PATCHES}; do
 		if [[ -f ${patch} ]]; then
-			epatch "${patch}"
+			file="${patch}"
 		elif [[ -f ${WORKDIR}/${patch} ]]; then
-			epatch "${WORKDIR}/${patch}"
+			file="${WORKDIR}/${patch}"
 		elif [[ -f ${FILESDIR}/${patch} ]]; then
-			epatch "${FILESDIR}/${patch}"
+			file="${FILESDIR}/${patch}"
 		else
 			die "Cannot find ${patch}"
 		fi
+		case ${EAPI:-0} in
+			0|1|2|3|4|5) epatch "${file}" ;;
+			6) eapply "${file}" ;;
+		esac
 	done
 
 	# apply any user patches
-	epatch_user
+	case ${EAPI:-0} in
+		0|1|2|3|4|5) epatch_user ;;
+		6) eapply_user ;;
+	esac
 
 	if [[ -n ${ELISP_REMOVE} ]]; then
 		rm ${ELISP_REMOVE} || die
diff --git a/eclass/kernel-2.eclass b/eclass/kernel-2.eclass
index 1a508f119aaf..02da62aa914c 100644
--- a/eclass/kernel-2.eclass
+++ b/eclass/kernel-2.eclass
@@ -132,9 +132,20 @@ debug-print-kernel2-variables() {
 #Eclass functions only from here onwards ...
 #==============================================================
 handle_genpatches() {
-	local tarball
+	local tarball want_unipatch_list
 	[[ -z ${K_WANT_GENPATCHES} || -z ${K_GENPATCHES_VER} ]] && return 1
 
+	if [[ -n ${1} ]]; then
+		# set UNIPATCH_LIST_GENPATCHES only on explicit request
+		# since that requires 'use' call which can be used only in phase
+		# functions, while the function is also called in global scope
+		if [[ ${1} == --set-unipatch-list ]]; then
+			want_unipatch_list=1
+		else
+			die "Usage: ${FUNCNAME} [--set-unipatch-list]"
+		fi
+	fi
+
 	debug-print "Inside handle_genpatches"
 	local OKV_ARRAY
 	IFS="." read -r -a OKV_ARRAY <<<"${OKV}"
@@ -161,11 +172,11 @@ handle_genpatches() {
 			use_cond_start="experimental? ( "
 			use_cond_end=" )"
 
-			if use experimental ; then
+			if [[ -n ${want_unipatch_list} ]] && use experimental ; then
 				UNIPATCH_LIST_GENPATCHES+=" ${DISTDIR}/${tarball}"
 				debug-print "genpatches tarball: $tarball"
 			fi
-		else
+		elif [[ -n ${want_unipatch_list} ]]; then
 			UNIPATCH_LIST_GENPATCHES+=" ${DISTDIR}/${tarball}"
 			debug-print "genpatches tarball: $tarball"
 		fi
@@ -1232,6 +1243,8 @@ kernel-2_src_unpack() {
 	universal_unpack
 	debug-print "Doing unipatch"
 
+	# request UNIPATCH_LIST_GENPATCHES in phase since it calls 'use'
+	handle_genpatches --set-unipatch-list
 	[[ -n ${UNIPATCH_LIST} || -n ${UNIPATCH_LIST_DEFAULT} || -n ${UNIPATCH_LIST_GENPATCHES} ]] && \
 		unipatch "${UNIPATCH_LIST_DEFAULT} ${UNIPATCH_LIST_GENPATCHES} ${UNIPATCH_LIST}"
 
diff --git a/eclass/mercurial.eclass b/eclass/mercurial.eclass
index f58335a4ce75..bf85aaab6395 100644
--- a/eclass/mercurial.eclass
+++ b/eclass/mercurial.eclass
@@ -112,7 +112,7 @@ mercurial_fetch() {
 		die "failed to create ${EHG_STORE_DIR}/${EHG_PROJECT}"
 	chmod -f g+rw "${EHG_STORE_DIR}/${EHG_PROJECT}" || \
 		echo "Warning: failed to chmod g+rw ${EHG_PROJECT}"
-	cd "${EHG_STORE_DIR}/${EHG_PROJECT}" || \
+	pushd "${EHG_STORE_DIR}/${EHG_PROJECT}" > /dev/null || \
 		die "failed to cd to ${EHG_STORE_DIR}/${EHG_PROJECT}"
 
 	# Clone/update repository:
@@ -122,12 +122,13 @@ mercurial_fetch() {
 			rm -rf "${module}"
 			die "failed to clone ${EHG_REPO_URI}"
 		}
-		cd "${module}"
 	elif [[ -z "${EHG_OFFLINE}" ]]; then
 		einfo "Updating ${EHG_STORE_DIR}/${EHG_PROJECT}/${module} from ${EHG_REPO_URI}"
-		cd "${module}" || die "failed to cd to ${module}"
+		pushd "${module}" > /dev/null || die "failed to cd to ${module}"
 		${EHG_PULL_CMD} "${EHG_REPO_URI}" || die "update failed"
+		popd > /dev/null || die
 	fi
+	popd > /dev/null || die
 
 	# Checkout working copy:
 	einfo "Creating working directory in ${sourcedir} (target revision: ${EHG_REVISION})"
diff --git a/games-fps/alienarena/alienarena-20130827.ebuild b/games-fps/alienarena/alienarena-20130827.ebuild
index 0ff39102a75c..3193fa85769c 100644
--- a/games-fps/alienarena/alienarena-20130827.ebuild
+++ b/games-fps/alienarena/alienarena-20130827.ebuild
@@ -8,7 +8,8 @@ inherit eutils gnome2-utils games
 MY_PN=alienarena-7.66
 DESCRIPTION="Fast-paced multiplayer deathmatch game"
 HOMEPAGE="http://red.planetarena.org/"
-SRC_URI="http://icculus.org/alienarena/Files/${MY_PN}-linux${PV}.tar.gz"
+SRC_URI="http://icculus.org/alienarena/Files/${MY_PN}-linux${PV}.tar.gz
+	http://red.planetarena.org/files/${MY_PN}-linux${PV}.tar.gz"
 
 LICENSE="GPL-2 free-noncomm"
 SLOT="0"
diff --git a/games-fps/warsow/warsow-1.5.1-r1.ebuild b/games-fps/warsow/warsow-1.5.1-r1.ebuild
index b36b9e39ab3f..b9324efa4b36 100644
--- a/games-fps/warsow/warsow-1.5.1-r1.ebuild
+++ b/games-fps/warsow/warsow-1.5.1-r1.ebuild
@@ -41,7 +41,7 @@ RDEPEND=">=dev-libs/libRocket-1.2.1_p20130110
 		x11-libs/libXrandr
 		x11-libs/libXxf86dga
 		x11-libs/libXxf86vm
-		virtual/jpeg
+		virtual/jpeg:0
 		virtual/opengl
 		openal? ( media-libs/openal )
 	)"
diff --git a/kde-apps/kcalc/kcalc-15.08.3-r1.ebuild b/kde-apps/kcalc/kcalc-15.08.3-r1.ebuild
index 576eb68f1ffe..3978e44f88fb 100644
--- a/kde-apps/kcalc/kcalc-15.08.3-r1.ebuild
+++ b/kde-apps/kcalc/kcalc-15.08.3-r1.ebuild
@@ -30,6 +30,7 @@ COMMON_DEPEND="
 	dev-qt/qtxml:5
 "
 DEPEND="${COMMON_DEPEND}
+	$(add_frameworks_dep kinit)
 	dev-libs/mpfr:0
 "
 RDEPEND="${COMMON_DEPEND}"
diff --git a/kde-apps/kdeartwork-kscreensaver/kdeartwork-kscreensaver-4.14.3.ebuild b/kde-apps/kdeartwork-kscreensaver/kdeartwork-kscreensaver-4.14.3.ebuild
index 3948b3532e4d..9f3d466fe276 100644
--- a/kde-apps/kdeartwork-kscreensaver/kdeartwork-kscreensaver-4.14.3.ebuild
+++ b/kde-apps/kdeartwork-kscreensaver/kdeartwork-kscreensaver-4.14.3.ebuild
@@ -21,17 +21,20 @@ RDEPEND="
 	media-libs/libart_lgpl
 	x11-libs/libX11
 	x11-libs/libXt
-	kexiv2? ( $(add_kdeapps_dep libkexiv2) )
 	virtual/glu
 	virtual/opengl
+	kexiv2? ( $(add_kdeapps_dep libkexiv2) )
 	xscreensaver? ( x11-misc/xscreensaver )
 "
 DEPEND="${RDEPEND}
 	eigen? ( dev-cpp/eigen:2 )
 "
 
-PATCHES=( "${FILESDIR}/${PN}-xscreensaver.patch"
-	"${FILESDIR}/${PN}-4.5.95-webcollage.patch" )
+PATCHES=(
+	"${FILESDIR}/${PN}-xscreensaver.patch"
+	"${FILESDIR}/${PN}-4.5.95-webcollage.patch"
+	"${FILESDIR}/${PN}-15.08.3-missing-include.patch"
+)
 
 src_configure() {
 	local mycmakeargs=(
diff --git a/kde-apps/kdeartwork-wallpapers/files/kdeartwork-wallpapers-15.08.3-kf5-port.patch b/kde-apps/kdeartwork-wallpapers/files/kdeartwork-wallpapers-15.08.3-kf5-port.patch
new file mode 100644
index 000000000000..925560d27414
--- /dev/null
+++ b/kde-apps/kdeartwork-wallpapers/files/kdeartwork-wallpapers-15.08.3-kf5-port.patch
@@ -0,0 +1,49 @@
+--- a/CMakeLists.txt	2013-10-18 18:04:24.000000000 +0200
++++ b/CMakeLists.txt	2015-12-19 14:20:50.523356947 +0100
+@@ -3,9 +3,14 @@
+ set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules )
+ 
+ # search packages used by KDE
+-find_package(KDE4 REQUIRED)
+-include (KDE4Defaults)
+-include (MacroLibrary)
++cmake_minimum_required(VERSION 2.8.12)
++
++find_package(ECM 0.0.9 REQUIRED NO_MODULE)
++set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
++
++include(KDEInstallDirs)
++include(KDECMakeSettings)
++include(ECMOptionalAddSubdirectory)
+ 
+ add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
+ add_definitions( -DQT_NO_CAST_FROM_ASCII )
+@@ -14,18 +19,17 @@
+ include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES})
+ 
+ 
+-macro_optional_add_subdirectory(ColorSchemes)
+-macro_optional_add_subdirectory(IconThemes)
+-macro_optional_add_subdirectory(emoticons)
+-macro_optional_add_subdirectory(kscreensaver)
++ecm_optional_add_subdirectory(ColorSchemes)
++ecm_optional_add_subdirectory(IconThemes)
++ecm_optional_add_subdirectory(emoticons)
++ecm_optional_add_subdirectory(kscreensaver)
+ if (Q_WS_X11)
+-   macro_optional_add_subdirectory(kwin-styles)
++   ecm_optional_add_subdirectory(kwin-styles)
+ endif (Q_WS_X11)
+-macro_optional_add_subdirectory(styles)
+-macro_optional_add_subdirectory(wallpapers)
+-macro_optional_add_subdirectory(HighResolutionWallpapers)
+-macro_optional_add_subdirectory(WeatherWallpapers)
+-macro_optional_add_subdirectory(desktopthemes)
++ecm_optional_add_subdirectory(styles)
++ecm_optional_add_subdirectory(wallpapers)
++ecm_optional_add_subdirectory(HighResolutionWallpapers)
++ecm_optional_add_subdirectory(WeatherWallpapers)
++ecm_optional_add_subdirectory(desktopthemes)
+ 
+-macro_display_feature_log()
+ 
diff --git a/kde-apps/kdeartwork-wallpapers/kdeartwork-wallpapers-15.08.3-r1.ebuild b/kde-apps/kdeartwork-wallpapers/kdeartwork-wallpapers-15.08.3-r1.ebuild
new file mode 100644
index 000000000000..20dc3242e1d9
--- /dev/null
+++ b/kde-apps/kdeartwork-wallpapers/kdeartwork-wallpapers-15.08.3-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+RESTRICT="binchecks strip"
+
+KMNAME="kdeartwork"
+KDE_AUTODEPS="false"
+KDE_SCM="svn"
+inherit kde5
+
+DESCRIPTION="Wallpapers from kde"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="$(add_frameworks_dep extra-cmake-modules)"
+RDEPEND="!kde-apps/kdeartwork-wallpapers:4"
+
+PATCHES=( "${FILESDIR}/${P}-kf5-port.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		-DDISABLE_ALL_OPTIONAL_SUBDIRECTORIES=TRUE
+		-DBUILD_wallpapers=TRUE
+		-DBUILD_HighResolutionWallpapers=TRUE
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-apps/kdeartwork-weatherwallpapers/files/kdeartwork-weatherwallpapers-15.08.3-kf5-port.patch b/kde-apps/kdeartwork-weatherwallpapers/files/kdeartwork-weatherwallpapers-15.08.3-kf5-port.patch
new file mode 100644
index 000000000000..925560d27414
--- /dev/null
+++ b/kde-apps/kdeartwork-weatherwallpapers/files/kdeartwork-weatherwallpapers-15.08.3-kf5-port.patch
@@ -0,0 +1,49 @@
+--- a/CMakeLists.txt	2013-10-18 18:04:24.000000000 +0200
++++ b/CMakeLists.txt	2015-12-19 14:20:50.523356947 +0100
+@@ -3,9 +3,14 @@
+ set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules )
+ 
+ # search packages used by KDE
+-find_package(KDE4 REQUIRED)
+-include (KDE4Defaults)
+-include (MacroLibrary)
++cmake_minimum_required(VERSION 2.8.12)
++
++find_package(ECM 0.0.9 REQUIRED NO_MODULE)
++set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
++
++include(KDEInstallDirs)
++include(KDECMakeSettings)
++include(ECMOptionalAddSubdirectory)
+ 
+ add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
+ add_definitions( -DQT_NO_CAST_FROM_ASCII )
+@@ -14,18 +19,17 @@
+ include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES})
+ 
+ 
+-macro_optional_add_subdirectory(ColorSchemes)
+-macro_optional_add_subdirectory(IconThemes)
+-macro_optional_add_subdirectory(emoticons)
+-macro_optional_add_subdirectory(kscreensaver)
++ecm_optional_add_subdirectory(ColorSchemes)
++ecm_optional_add_subdirectory(IconThemes)
++ecm_optional_add_subdirectory(emoticons)
++ecm_optional_add_subdirectory(kscreensaver)
+ if (Q_WS_X11)
+-   macro_optional_add_subdirectory(kwin-styles)
++   ecm_optional_add_subdirectory(kwin-styles)
+ endif (Q_WS_X11)
+-macro_optional_add_subdirectory(styles)
+-macro_optional_add_subdirectory(wallpapers)
+-macro_optional_add_subdirectory(HighResolutionWallpapers)
+-macro_optional_add_subdirectory(WeatherWallpapers)
+-macro_optional_add_subdirectory(desktopthemes)
++ecm_optional_add_subdirectory(styles)
++ecm_optional_add_subdirectory(wallpapers)
++ecm_optional_add_subdirectory(HighResolutionWallpapers)
++ecm_optional_add_subdirectory(WeatherWallpapers)
++ecm_optional_add_subdirectory(desktopthemes)
+ 
+-macro_display_feature_log()
+ 
diff --git a/kde-apps/kdeartwork-weatherwallpapers/kdeartwork-weatherwallpapers-15.08.3-r1.ebuild b/kde-apps/kdeartwork-weatherwallpapers/kdeartwork-weatherwallpapers-15.08.3-r1.ebuild
new file mode 100644
index 000000000000..5adef3627bfc
--- /dev/null
+++ b/kde-apps/kdeartwork-weatherwallpapers/kdeartwork-weatherwallpapers-15.08.3-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KMNAME="kdeartwork"
+KDE_AUTODEPS="false"
+KDE_SCM="svn"
+inherit kde5
+
+DESCRIPTION="Weather aware wallpapers. Changes with weather outside"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="$(add_frameworks_dep extra-cmake-modules)"
+RDEPEND="
+	$(add_kdeapps_dep kdeartwork-wallpapers)
+	!kde-apps/kdeartwork-weatherwallpapers:4
+"
+
+PATCHES=( "${FILESDIR}/${P}-kf5-port.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		-DDISABLE_ALL_OPTIONAL_SUBDIRECTORIES=TRUE
+		-DBUILD_WeatherWallpapers=TRUE
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-apps/kdenlive/Manifest b/kde-apps/kdenlive/Manifest
index df3aa910c2c8..84addd066111 100644
--- a/kde-apps/kdenlive/Manifest
+++ b/kde-apps/kdenlive/Manifest
@@ -1,3 +1,4 @@
 DIST kdenlive-0.9.10.tar.bz2 4666332 SHA256 f68fdb39173e69ce422fdd57bbc4ced47711317e538b0101eee6a1bc9cedb763 SHA512 47314e4a095a74fb6e0d9aec8450d857a3624c0127372c88c94a73ae504f565b77c8197970dc61f9a2478664069e6bf822495b50c92491a4aae5d43c9afc4e2a WHIRLPOOL fd6c2b23ad2d2dc157decaaa4df072366617bcd9e37cbaa03633a6279695d033c3e2365c82b7f0cf0e064978177052cd5b74481bc51ce1842abaf39bca776063
 DIST kdenlive-0.9.8.tar.bz2 3342895 SHA256 870d68a19ac6012e09d3eedfd9b63983a79b5bcc9eabd465720466ed3fcd4128 SHA512 910405e0d1c03d4547cdd3bb2d36da0eeed5b20615c39ccd5740807bbf5e5cfcfa5474341db256812b619e2342827c3e997f15dddfef36bc8637ce0113b7ae0b WHIRLPOOL 3330a0c9b4769411f6bdd03ca2b2405aa348eb13d72d033d77d8685b93f6df6297c9e6a5772c9105488c07b9a56d75261ee42113c522ce46f3c9f1179d4784e1
 DIST kdenlive-15.08.3.tar.xz 3017204 SHA256 13be7e16d16aa78c448b5922b20759633b69ed5a26442248132f377b231f1d4d SHA512 604197b8ffc3a6a97ee83f70a7bb1694afcc7d1dda589738e49349b734d31ed08c2aeb7e09c61cdc108c149d8f35cf38f13c6ab87ae2b56669fd07462c35b5f8 WHIRLPOOL 69456da7f097de1ec5912e8fa920ebc0fe487b95886040ca793710435c58543b2e6e2c6164fa0601ca2912a471d33e038147b23845a138cdac7bc0d969f933fc
+DIST kdenlive-15.12.0.tar.xz 3624480 SHA256 5a6f4ae4bd07c64b90a3ebe88775b457c9c1d8b3a23820203d86df114183fbf8 SHA512 33d093cc905b607b7e7ef66cb0d2d9922afb1c220e3bee88f2d003a6147e8e801ad1d6dcf2bc1441f871d7895e3890d885be4c79f9016096a29b4d0fcadfa754 WHIRLPOOL a1b263db7f3dd40c5572969612d073c520105d3903b6ca30289a05ed7eea205b2fa052d5d35a27ac32a3d35fdc018df52d11e5ddad7c6d719d0d77413203afe3
diff --git a/kde-apps/kdenlive/kdenlive-15.12.0.ebuild b/kde-apps/kdenlive/kdenlive-15.12.0.ebuild
new file mode 100644
index 000000000000..fff994bae68e
--- /dev/null
+++ b/kde-apps/kdenlive/kdenlive-15.12.0.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Non-linear video editing suite by KDE"
+HOMEPAGE="https://www.kdenlive.org/"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="v4l"
+
+RDEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kbookmarks)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep knotifyconfig)
+	$(add_frameworks_dep kplotting)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep solid)
+	dev-qt/qtdbus:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtopengl:5
+	dev-qt/qtscript:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	>=media-libs/mlt-0.9.8[ffmpeg,-kde,kdenlive,melt,-qt4,sdl,xml]
+	virtual/ffmpeg[encode,sdl,X]
+	virtual/opengl
+	v4l? ( media-libs/libv4l )
+"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package v4l LibV4L2)
+	)
+
+	kde5_src_configure
+}
diff --git a/media-gfx/graphviz/graphviz-2.38.0-r1.ebuild b/media-gfx/graphviz/graphviz-2.38.0-r1.ebuild
index d9fb22ac7865..254dfa104db9 100644
--- a/media-gfx/graphviz/graphviz-2.38.0-r1.ebuild
+++ b/media-gfx/graphviz/graphviz-2.38.0-r1.ebuild
@@ -5,7 +5,7 @@
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
 
-inherit autotools eutils flag-o-matic java-pkg-opt-2 multilib python-single-r1
+inherit autotools eutils flag-o-matic java-pkg-opt-2 multilib python-single-r1 qmake-utils
 
 DESCRIPTION="Open Source Graph Visualization Software"
 HOMEPAGE="http://www.graphviz.org/"
@@ -26,7 +26,7 @@ RDEPEND="
 	dev-libs/libltdl:0
 	>=media-libs/fontconfig-2.3.95
 	>=media-libs/freetype-2.1.10
-	>=media-libs/gd-2.0.34[fontconfig,jpeg,png,truetype,zlib]
+	>=media-libs/gd-2.0.34:=[fontconfig,jpeg,png,truetype,zlib]
 	>=media-libs/libpng-1.2:0
 	!<=sci-chemistry/cluster-1.3.081231
 	virtual/jpeg:0
@@ -166,6 +166,9 @@ src_prepare() {
 	# replace the whitespace with tabs
 	sed -i -e 's:  :\t:g' doc/info/Makefile.am || die
 
+	# use correct version of qmake. bug #567236
+	sed -i -e "/AC_CHECK_PROGS(QMAKE/a AC_SUBST(QMAKE,$(qt4_get_bindir)/qmake)" configure.ac || die
+
 	# workaround for http://www.graphviz.org/mantisbt/view.php?id=1895
 	use elibc_FreeBSD && append-flags $(test-flags -fno-builtin-sincos)
 
diff --git a/media-sound/lastfmplayer/lastfmplayer-1.5.4.27091-r3.ebuild b/media-sound/lastfmplayer/lastfmplayer-1.5.4.27091-r3.ebuild
index 6ed96c24db5d..090e8145b530 100644
--- a/media-sound/lastfmplayer/lastfmplayer-1.5.4.27091-r3.ebuild
+++ b/media-sound/lastfmplayer/lastfmplayer-1.5.4.27091-r3.ebuild
@@ -3,7 +3,7 @@
 # $Id$
 
 EAPI=5
-inherit eutils multilib readme.gentoo toolchain-funcs qt4-r2
+inherit eutils multilib readme.gentoo toolchain-funcs qmake-utils qt4-r2
 
 MY_P="${P/lastfmplayer/lastfm}+dfsg"
 
@@ -84,7 +84,7 @@ src_compile() {
 		einfo "Building DBUS plugin"
 		emake -C "${S}"/src/dbus || die "failed to build dbus extension"
 	fi
-	cd i18n; lrelease *.ts
+	cd i18n; "$(qt4_get_bindir)"/lrelease *.ts
 }
 
 src_install() {
diff --git a/net-firewall/fwknop/files/fwknopd.init-r1 b/net-firewall/fwknop/files/fwknopd.init
index 9e8ecdc36d97..9e8ecdc36d97 100644
--- a/net-firewall/fwknop/files/fwknopd.init-r1
+++ b/net-firewall/fwknop/files/fwknopd.init
diff --git a/net-firewall/fwknop/fwknop-2.6.7-r1.ebuild b/net-firewall/fwknop/fwknop-2.6.7-r1.ebuild
deleted file mode 100644
index 006ebd0a0569..000000000000
--- a/net-firewall/fwknop/fwknop-2.6.7-r1.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=1
-DISABLE_AUTOFORMATTING=1
-
-DISTUTILS_OPTIONAL=1
-# Python extension supports only Python2
-# See https://github.com/mrash/fwknop/issues/167
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools-utils distutils-r1 linux-info readme.gentoo systemd
-
-DESCRIPTION="Single Packet Authorization and Port Knocking application"
-HOMEPAGE="http://www.cipherdyne.org/fwknop/ https://github.com/mrash/fwknop"
-SRC_URI="https://github.com/mrash/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="client extras firewalld gdbm gpg iptables python server udp-server"
-
-RDEPEND="
-	client? ( net-misc/wget[ssl] )
-	gpg? (
-		dev-libs/libassuan
-		dev-libs/libgpg-error
-	)
-	python? ( ${PYTHON_DEPS} )
-"
-DEPEND="${RDEPEND}
-	gdbm? ( sys-libs/gdbm )
-	gpg? ( app-crypt/gpgme )
-	firewalld? ( net-firewall/firewalld[${PYTHON_USEDEP}] )
-	iptables? ( net-firewall/iptables )
-	server? ( !udp-server? ( net-libs/libpcap ) )
-"
-
-REQUIRED_USE="
-	python? ( ${PYTHON_REQUIRED_USE} )
-	firewalld? ( server )
-	iptables? ( server )
-	server? ( ^^ ( firewalld iptables ) )
-	udp-server? ( server )
-"
-
-DOCS=( ChangeLog README.md )
-DOC_CONTENTS="
-Example configuration files were installed in /etc/fwknopd directory.
-Please edit them to fit your needs and then remove the .example suffix.
-
-fwknopd supports several backends: firewalld, iptables, ipfw, pf, ipf.
-You can set the desired backend via FIREWALL_EXE option in fwknopd.conf
-instead of the default one chosen at compile time.
-"
-
-pkg_pretend() {
-	if use server; then
-		if ! linux_config_exists || ! linux_chkconfig_present NETFILTER_XT_MATCH_COMMENT; then
-			ewarn "fwknopd uses the iptables 'comment' match to expire SPA rules,"
-			ewarn "which is a major security feature and is enabled by default."
-			ewarn "Please either enable NETFILTER_XT_MATCH_COMMENT support in your"
-			ewarn "kernel, or set the appropriate ENABLE_{FIREWD,IPT}_COMMENT_CHECK"
-			ewarn "to 'N' in your fwknopd.conf file."
-		fi
-	fi
-}
-
-src_prepare() {
-	# Install example configs with .example suffix
-	if use server; then
-		sed -i -e 's/conf;/conf.example;/g' "${S}"/Makefile.am || die
-	fi
-
-	autotools-utils_src_prepare
-
-	if use python; then
-		cd "${S}"/python || die
-		distutils-r1_src_prepare
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		--localstatedir=/run
-		--enable-digest-cache
-		$(use_enable client)
-		$(use_enable !gdbm file-cache)
-		$(use_enable server)
-		$(use_enable udp-server)
-		$(use_with gpg gpgme)
-	)
-	use firewalld && myeconfargs+=(--with-firewalld=/usr/sbin/firewalld)
-	use iptables && myeconfargs+=(--with-iptables=/sbin/iptables)
-
-	autotools-utils_src_configure
-}
-
-src_compile() {
-	autotools-utils_src_compile
-
-	if use python; then
-		cd "${S}"/python || die
-		distutils-r1_src_compile
-	fi
-}
-
-src_install() {
-	autotools-utils_src_install
-	prune_libtool_files --modules
-
-	if use server; then
-		newinitd "${FILESDIR}/fwknopd.init-r1" fwknopd
-		newconfd "${FILESDIR}/fwknopd.confd" fwknopd
-		systemd_dounit extras/systemd/fwknopd.service
-		systemd_newtmpfilesd extras/systemd/fwknopd.tmpfiles.conf fwknopd.conf
-		readme.gentoo_create_doc
-	fi
-
-	use extras && dodoc "${S}/extras/apparmor/usr.sbin.fwknopd"
-
-	if use python; then
-		# Unset DOCS since distutils-r1.eclass interferes
-		local DOCS=()
-		cd "${S}"/python || die
-		distutils-r1_src_install
-	fi
-}
-
-pkg_postinst() {
-	use server && readme.gentoo_print_elog
-}
diff --git a/net-firewall/fwknop/fwknop-2.6.7-r2.ebuild b/net-firewall/fwknop/fwknop-2.6.7-r2.ebuild
index 46dbcae86577..50e95fe2c11c 100644
--- a/net-firewall/fwknop/fwknop-2.6.7-r2.ebuild
+++ b/net-firewall/fwknop/fwknop-2.6.7-r2.ebuild
@@ -113,7 +113,7 @@ src_install() {
 	prune_libtool_files --modules
 
 	if use server; then
-		newinitd "${FILESDIR}/fwknopd.init-r1" fwknopd
+		newinitd "${FILESDIR}/fwknopd.init" fwknopd
 		newconfd "${FILESDIR}/fwknopd.confd" fwknopd
 		systemd_dounit extras/systemd/fwknopd.service
 		systemd_newtmpfilesd extras/systemd/fwknopd.tmpfiles.conf fwknopd.conf
diff --git a/net-libs/libaccounts-glib/Manifest b/net-libs/libaccounts-glib/Manifest
index b6f057c78168..8b5f871f34c3 100644
--- a/net-libs/libaccounts-glib/Manifest
+++ b/net-libs/libaccounts-glib/Manifest
@@ -1 +1,2 @@
 DIST libaccounts-glib-1.18.tar.gz 579435 SHA256 7aab9ec2ba3ae2548125f4bb330ed433e8066c672e32101a339cbb7f4657ff56 SHA512 133b336cd000f302f14d4285d5a3c6d032a2b5497bf8ce5cd22175e6c847b54e4f8919a6c37786c9b39bac874146683a1bc0547db3f2563e3fe7a3d686d82b85 WHIRLPOOL 102cdd1261bff9980c14f6563bcc41fc561b1751cc6adcc5ed7f6045800c8974443a99512f18352d2ebecd58ee9f69bebd30b52a8106fb15d59095705afaefe9
+DIST libaccounts-glib-1.19.tar.gz 126032 SHA256 098362920817fb2e4429814b8a26451c00bddd5e4702ab584a37fda42a539e50 SHA512 1f0dfb3ee9faa32e08c839130bb2fb32d71ab57973d9a5704e145d192815795c3a8ddb4cc004e12647dffb02bd6e5f3ae908dfd7006e14f9b18e6454b5eb3d76 WHIRLPOOL 36e7a5b33dbc5ffdbffb0cdcfe21d07c624601002b3959d25698fcad786bc3b00ada074597042dbb45e95bc8b7518b66f24fefc8bbebf6b516ddc91c233ba4b2
diff --git a/net-libs/libaccounts-glib/libaccounts-glib-1.19.ebuild b/net-libs/libaccounts-glib/libaccounts-glib-1.19.ebuild
new file mode 100644
index 000000000000..62eefee92da2
--- /dev/null
+++ b/net-libs/libaccounts-glib/libaccounts-glib-1.19.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools eutils vcs-snapshot
+
+DESCRIPTION="Accounts SSO (Single Sign-On) management library for GLib applications"
+HOMEPAGE="https://01.org/gsso/"
+SRC_URI="https://gitlab.com/accounts-sso/libaccounts-glib/repository/archive.tar.gz?ref=VERSION_1.19 -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+DEPEND="
+	dev-db/sqlite:3
+	dev-libs/glib:2
+	dev-libs/libxml2
+"
+
+RDEPEND="${DEPEND}"
+
+RESTRICT="test"
+
+DOCS=( AUTHORS NEWS )
+
+src_prepare() {
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-python \
+		--disable-tests \
+		$(use_enable debug)
+}
+
+src_install() {
+	default
+	prune_libtool_files
+}
diff --git a/net-libs/libsignon-glib/Manifest b/net-libs/libsignon-glib/Manifest
index 48c9856f6ca9..ef6cea77fdaf 100644
--- a/net-libs/libsignon-glib/Manifest
+++ b/net-libs/libsignon-glib/Manifest
@@ -1 +1,2 @@
 DIST libsignon-glib-1.12.tar.xz 42384 SHA256 bd7e3be291e3173f20dda5376e1387be5d1705b12a00885e93f2cc900a9b4463 SHA512 5d5a3918898dce9d8b10597ac95428bef4753a1c626b6e7fef54e9024327b0849ddb628b25801504c336cf6fe2ebc16e5264bb576ecab16457ccf17918f042cf WHIRLPOOL 5766ad1fe50a6637d2f8e5fe6b092599112c9b6fb56dd44502568d41d61d3208d8d5a00ce1c698848f3fbeb0eb0a1ee82bcbebaff74428a97f634589e56d9def
+DIST libsignon-glib-1.13.tar.gz 51601 SHA256 8e0e450e719c16f79d3c3aadb98656ed5967a2f2cd24c1d9cd5747e670a087bc SHA512 aaae6a37a113685eb36ddccd497e387617cf0900506638cbafbac282c4d63ade41f4c915ad6f04214c58af580b70d9062ecf3e1618b6f5fe07dad50c5dc125a6 WHIRLPOOL 8f0d1d51588e42c9fac51883a9ecb08b6ad4949fc8f335c2259f967ea8f3555b04b3ca46f323b20591a2bc85dc1b5bba3968fec1be3e4dfd7a9464e2c5d6880e
diff --git a/net-libs/libsignon-glib/libsignon-glib-1.13.ebuild b/net-libs/libsignon-glib/libsignon-glib-1.13.ebuild
new file mode 100644
index 000000000000..36b0e0b0d693
--- /dev/null
+++ b/net-libs/libsignon-glib/libsignon-glib-1.13.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2015 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 autotools python-r1 vcs-snapshot
+
+DESCRIPTION="GLib binding for the D-Bus API provided by signond"
+HOMEPAGE="https://01.org/gsso/"
+SRC_URI="https://gitlab.com/accounts-sso/libsignon-glib/repository/archive.tar.gz?ref=VERSION_1.13 -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc python test"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	dev-libs/glib:2
+	net-libs/signond
+"
+DEPEND="${RDEPEND}
+	dev-util/gdbus-codegen
+	python? ( ${PYTHON_DEPS} )
+	doc? ( dev-util/gtk-doc )
+"
+
+DOCS=( AUTHORS NEWS README )
+
+# needs more love
+RESTRICT="test"
+
+src_prepare() {
+	if ! use doc; then
+		epatch "${FILESDIR}/${PN}-1.12-doc-disable.patch"
+	fi
+
+	eautoreconf
+}
+
+src_configure() {
+	myconfigure() {
+		local myeconfargs=(
+			$(use_enable debug)
+			$(use_enable doc gtk-doc)
+			$(use_enable python)
+			$(use_enable test tests)
+		)
+
+		econf "${myeconfargs[@]}"
+	}
+
+	if use python; then
+		python_copy_sources
+		python_foreach_impl run_in_build_dir myconfigure
+	else
+		myconfigure
+	fi
+}
+
+src_compile() {
+	# fails to compile with more than one thread
+	MAKEOPTS="${MAKEOPTS} -j1"
+	default
+	if use python; then
+		python_foreach_impl run_in_build_dir default
+	fi
+}
+
+src_install() {
+	default
+	if use python; then
+		python_foreach_impl run_in_build_dir default
+	fi
+}
diff --git a/net-libs/signond/Manifest b/net-libs/signond/Manifest
index e9e947a305bd..744e61a5e9ae 100644
--- a/net-libs/signond/Manifest
+++ b/net-libs/signond/Manifest
@@ -1 +1,2 @@
 DIST signon-8.57.tar.bz2 197988 SHA256 239a2c6bb39c338402d9ae29287fbc439f422f82e7e6d060be23104173620bee SHA512 98bdee0b15fbc0ade1158df95f727ba56ae2966117d8ce7074b4f355dc3be0db27ab52340654da8ab4324e6d8d160c65802e1bed295ac3ad02ddc720581bbdb3 WHIRLPOOL e7bc4f31e2d59ce361b45c77f0eb838e601bf55e24e53413fec3ec91feaec7fad85581b1dba80cb9350584a10822202af748e74f46bc06dc96b2aeff52bf105b
+DIST signond-8.58.tar.gz 277287 SHA256 301e2e3b6919585c8ffc56f73ec1f0f9b18a533e1db88461e9fa4e2acf75a34a SHA512 74c9f32ea99c869c0aa72b5816962336869131ea4e8484c53636b35f2ed669a49cbc0ccf10c2c446697892235b94cf2c74f8d5402f430081d7d51421646eec91 WHIRLPOOL 7cff41e9ca37627a6a80a3c23d960958543ee2344ee24771d5e02c6a519d82f68a5003bf9a2bb413c9cbf20f7b450adaf9a82160cd422146431fce237d87d084
diff --git a/net-libs/signond/signond-8.58.ebuild b/net-libs/signond/signond-8.58.ebuild
new file mode 100644
index 000000000000..9343cf8f51f0
--- /dev/null
+++ b/net-libs/signond/signond-8.58.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit qmake-utils vcs-snapshot
+
+DESCRIPTION="Signon daemon for libaccounts-glib"
+HOMEPAGE="https://01.org/gsso/"
+SRC_URI="https://gitlab.com/accounts-sso/signond/repository/archive.tar.gz?ref=VERSION_8.58 -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RESTRICT="test"
+
+# libproxy[kde] results in segfaults due to symbol collisions with qt4
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsql:5
+	net-libs/libproxy[-kde]
+"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )
+	test? ( dev-qt/qttest:5 )
+"
+
+src_prepare() {
+	# ensure qt5 version of binary is used
+	sed -e "s|qdbusxml2cpp|$(qt5_get_bindir)/&|" -i src/signond/signond.pro || die
+
+	# install docs to correct location
+	sed -e "s|share/doc/\$\${PROJECT_NAME}|share/doc/${PF}|" -i doc/doc.pri || die
+
+	# don't install example plugin
+	sed -e "/example/d" -i src/plugins/plugins.pro || die
+
+	# make tests optional
+	use test || sed -i -e '/^SUBDIRS/s/tests//' signon.pro || die "couldn't disable tests"
+
+	# make docs optional
+	use doc || sed -e "/include(\s*doc\/doc.pri\s*)/d" -i \
+		signon.pro -i lib/SignOn/SignOn.pro lib/plugins/plugins.pro || die
+}
+
+src_configure() {
+	eqmake5
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+}
diff --git a/perl-core/Math-BigInt/Manifest b/perl-core/Math-BigInt/Manifest
index c981014e85a5..7f3517750df8 100644
--- a/perl-core/Math-BigInt/Manifest
+++ b/perl-core/Math-BigInt/Manifest
@@ -1 +1,2 @@
 DIST Math-BigInt-1.9993.tar.gz 215143 SHA256 d937c0d1afbb3ddd9b666177faf56471b6c2d1917863db5879d04a2d1a69bf7e SHA512 23ae7d11094f6bf5df45a2c3a01a7d9895b244156b8f48497edbfee4de0e56588e59abb4b1fa8808f2e221bd63eae175cd13987c7dc93867b8f969fbf54b6f15 WHIRLPOOL 70d9899003d1b547b066170fb397d03cfddd0edfdeb9beadf4998ee59f4b18fcbce480bf371ef2f3d35ec86f30b883fcdf2a70765cf239b0f73320766c8048e0
+DIST Math-BigInt-1.999710.tar.gz 225641 SHA256 879514c3dda33b6f05816569ca1a0f31b650df87660ecf80afbd60e396118610 SHA512 a5f938f5f2c61fd1b4c5c01caa99104aea2a009c8f6e089b465d52948a631cd7cb2df2c54917d9e4bd0bc34281c3a8aa865eb3bf7e6e84f15cff1eb79ccf358d WHIRLPOOL 73e26895de11824008b41e39968903c9a7b888a5b199e64f235e2b86e2360df8b095e6a9f2e29c3c29a385025e33cbbd88dc3f84220c6fd89add49596a1814ee
diff --git a/perl-core/Math-BigInt/Math-BigInt-1.999.710.ebuild b/perl-core/Math-BigInt/Math-BigInt-1.999.710.ebuild
new file mode 100644
index 000000000000..049411973d59
--- /dev/null
+++ b/perl-core/Math-BigInt/Math-BigInt-1.999.710.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DIST_AUTHOR=PJACKLAM
+DIST_VERSION=1.999710
+inherit perl-module
+
+DESCRIPTION="Arbitrary size floating point math package"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~ppc-macos ~x86-solaris"
+IUSE="test"
+
+RDEPEND="
+	>=virtual/perl-Math-Complex-1.390.0
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? ( >=virtual/perl-Test-Simple-0.930.100 )
+"
+
+PDEPEND="
+	>=virtual/perl-Math-BigInt-FastCalc-0.270.0
+	>=virtual/perl-bignum-0.220.0
+	>=virtual/perl-Math-BigRat-0.260.200
+"
+# where does this come from?
diff --git a/profiles/package.mask b/profiles/package.mask
index fe7fd710348d..d08f6a52eba2 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -30,12 +30,13 @@
 
 #--- END OF EXAMPLES ---
 
-# Andreas K. Hüttel <dilfridge@gentoo.org> (21 Dec 2015)
-# Preparation for the Perl 5.22.1 version bump; work in
-# progress
-=dev-lang/perl-5.22.1
-=virtual/perl-Module-CoreList-5.201.512.130
-=virtual/perl-Storable-2.530.100
+# Patrick Lauer <patrick@gentoo.org> (20 Dec 2015)
+# Mask TOFU release that doesn't work #567768 and friends
+=app-crypt/gkeys-gen-0.1-r1
+
+# Patrick Lauer <patrick@gentoo.org> (20 Dec 2015)
+# Ebuild uninstallable #557090
+=app-crypt/gkeys-0.1-r1
 
 # Michał Górny <mgorny@gentoo.org> (18 Dec 2015)
 # Contains privilege escalation vulnerability that could be used to
@@ -268,12 +269,6 @@ sys-fs/bedup
 # apache-2.4.17 includes support for http2 now.
 www-apache/mod_h2
 
-# Hans de Graaff <graaff@gentoo.org> (11 Oct 2015)
-# Ruby 1.9 is no longer maintained upstream since January
-# 2015, bug 536852.
-# Masked for removal in 30 days.
-=dev-lang/ruby-1.9*
-
 # Mike Pagano <mpagano@gentoo.org> (2 Oct 2015)
 # A regression in kernel 4.1.9 could lead to a system
 # lockup.  This has been fixed in gentoo-sources-4.1.9-r1
@@ -793,25 +788,6 @@ kde-misc/kgtk
 # - no SLOTting yet!
 =dev-scheme/guile-2.0.0
 
-# Ryan Hill <dirtyepic@gentoo.org> (30 Mar 2011)
-# Masked indefinitely (until 0.40 is released).
-# https://bugs.gentoo.org/354423
->=app-pda/libopensync-0.30
->=app-pda/libopensync-plugin-file-0.30
->=app-pda/libopensync-plugin-irmc-0.30
->=app-pda/libopensync-plugin-palm-0.30
->=app-pda/libopensync-plugin-python-0.30
-app-pda/libopensync-plugin-syncml
-app-pda/libopensync-plugin-vformat
-app-pda/osynctool
-
-# Ryan Hill <dirtyepic@gentoo.org> (30 Mar 2011)
-# Work in progress
-# https://bugs.gentoo.org/show_bug.cgi?id=354423
-app-pda/libopensync-plugin-gnokii
-app-pda/libopensync-plugin-gpe
-app-pda/multisync-gui
-
 # Markos Chandras <hwoarang@gentoo.org> (01 Nov 2010)
 # Masking alpha releases
 net-analyzer/ncrack
@@ -855,17 +831,6 @@ sys-auth/pam_keystore
 # available in the tree.
 ~app-i18n/skk-jisyo-9999
 =app-misc/sleepyhead-9999
-=app-pda/libsyncml-9999
-=app-pda/libopensync-9999
-=app-pda/osynctool-9999
-=app-pda/libopensync-plugin-file-9999
-=app-pda/libopensync-plugin-gnokii-9999
-=app-pda/libopensync-plugin-gpe-9999
-=app-pda/libopensync-plugin-irmc-9999
-=app-pda/libopensync-plugin-palm-9999
-=app-pda/libopensync-plugin-python-9999
-=app-pda/libopensync-plugin-syncml-9999
-=app-pda/libopensync-plugin-vformat-9999
 app-portage/layman-dbtools
 =www-plugins/google-talkplugin-9999
 
diff --git a/sci-chemistry/gperiodic/Manifest b/sci-chemistry/gperiodic/Manifest
index 659d4e28d9ce..8da8b7b16f3b 100644
--- a/sci-chemistry/gperiodic/Manifest
+++ b/sci-chemistry/gperiodic/Manifest
@@ -1 +1,2 @@
 DIST gperiodic-2.0.10.tar.gz 131213 SHA256 78d72870c51c39e4a35c804c05b8ef5e39f88d42eced52b2934e21d74fb8d096 SHA512 23d0074ad5b0f9e25e8eee63f8c375e2448b1ee7c00f89e965b7dd8ce3f60f20251d7699a2f7a767228316144b946a5ac204a3e478c395767133f7fc801b51ba WHIRLPOOL b758b622bfb980aad45b0bb6e2850579408959c3bf700f4dbb21d4bc64168d2a589a9ed5974f75b5eaf7f6c9d593c69dbc9b470957b01457caa30eb356850f14
+DIST gperiodic-3.0.1.tar.gz 375347 SHA256 d023e6f3b8aef773331c5f87d1de17f5fa120e67f7b6da1439ca7861a2df0905 SHA512 3bf47359dda1a029f3528ea04d28cd75909bceb535f6e1dc6c90f5a17b668e0dd98900ddd83633649383ff4e2fc588265275e0e4a27897ecc4ac6db4e93befc1 WHIRLPOOL 8700f0ad254d7ece507b4c01d54ce510121b266d3b533d6035d17ef236d6310008ba2bd80900e92697bbc42c985632421c2be87a2f4bea43903c0207df231198
diff --git a/sci-chemistry/gperiodic/files/gperiodic-3.0.1-makefile.patch b/sci-chemistry/gperiodic/files/gperiodic-3.0.1-makefile.patch
new file mode 100644
index 000000000000..a7a402a1a781
--- /dev/null
+++ b/sci-chemistry/gperiodic/files/gperiodic-3.0.1-makefile.patch
@@ -0,0 +1,66 @@
+ Makefile | 36 ++++++++++++++----------------------
+ 1 file changed, 14 insertions(+), 22 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 7e86dc4..9bd4fe8 100644
+--- a/Makefile
++++ b/Makefile
+@@ -14,8 +14,8 @@ enable_nls ?= 1
+ 	$(CC) -c $(CFLAGS) $(CPPFLAGS) $<
+ 
+ all: 
+-	make gperiodic
+-	make -C po/ all enable_nls=$(enable_nls)
++	$(MAKE) gperiodic
++	$(MAKE) -C po/ all enable_nls=$(enable_nls)
+ 	intltool-merge -d po gperiodic.desktop.in gperiodic.desktop
+ 
+ gperiodic: gperiodic.o
+@@ -29,24 +29,16 @@ gpdata.o: gpdata.c gperiodic.h
+ gperiodic.o: gperiodic.c gperiodic.h table_data.h
+ 
+ install:
+-	mkdir -p $(DESTDIR)$(bindir)
+-	install -m 755 gperiodic $(DESTDIR)$(bindir)
+-	mkdir -p $(DESTDIR)$(datadir)/applications
+-	install -m 644 gperiodic.desktop $(DESTDIR)$(datadir)/applications
+-	mkdir -p $(DESTDIR)$(datadir)/pixmaps
+-	install -m 644 icons/gperiodic.png $(DESTDIR)$(datadir)/pixmaps
+-	install -m 644 icons/gperiodic.xpm $(DESTDIR)$(datadir)/pixmaps
+-	mkdir -p $(DESTDIR)$(mandir)
+-	install -m 644 gperiodic.1 $(DESTDIR)$(mandir)
+-	mkdir -p $(DESTDIR)$(iconsdir)/hicolor/16x16/apps
+-	mkdir -p $(DESTDIR)$(iconsdir)/hicolor/32x32/apps
+-	mkdir -p $(DESTDIR)$(iconsdir)/hicolor/48x48/apps
+-	mkdir -p $(DESTDIR)$(iconsdir)/hicolor/64x64/apps
+-	install -m 644 icons/hicolor/16x16/apps/gperiodic.png $(DESTDIR)$(iconsdir)/hicolor/16x16/apps
+-	install -m 644 icons/hicolor/32x32/apps/gperiodic.png $(DESTDIR)$(iconsdir)/hicolor/32x32/apps
+-	install -m 644 icons/hicolor/48x48/apps/gperiodic.png $(DESTDIR)$(iconsdir)/hicolor/48x48/apps
+-	install -m 644 icons/hicolor/64x64/apps/gperiodic.png $(DESTDIR)$(iconsdir)/hicolor/64x64/apps
+-	make -C po/ install enable_nls=$(enable_nls) datadir=$(datadir) DESTDIR=$(DESTDIR)
++	install -D -m 755 gperiodic $(DESTDIR)$(bindir)/gperiodic
++	install -D -m 644 gperiodic.desktop $(DESTDIR)$(datadir)/applications/gperiodic.desktop
++	install -D -m 644 icons/gperiodic.png $(DESTDIR)$(datadir)/pixmaps/gperiodic.png
++	install -D -m 644 icons/gperiodic.xpm $(DESTDIR)$(datadir)/pixmaps/gperiodic.xpm
++	install -D -m 644 gperiodic.1 $(DESTDIR)$(mandir)/gperiodic.1
++	install -D -m 644 icons/hicolor/16x16/apps/gperiodic.png $(DESTDIR)$(iconsdir)/hicolor/16x16/apps/gperiodic.png
++	install -D -m 644 icons/hicolor/32x32/apps/gperiodic.png $(DESTDIR)$(iconsdir)/hicolor/32x32/apps/gperiodic.png
++	install -D -m 644 icons/hicolor/48x48/apps/gperiodic.png $(DESTDIR)$(iconsdir)/hicolor/48x48/apps/gperiodic.png
++	install -D -m 644 icons/hicolor/64x64/apps/gperiodic.png $(DESTDIR)$(iconsdir)/hicolor/64x64/apps/gperiodic.png
++	$(MAKE) -C po/ install enable_nls=$(enable_nls) datadir=$(datadir) DESTDIR=$(DESTDIR)
+ 
+ uninstall:
+ 	rm -f $(bindir)/gperiodic \
+@@ -58,10 +50,10 @@ uninstall:
+ 	      $(iconsdir)/hicolor/32x32/apps/gperiodic.png \
+ 	      $(iconsdir)/hicolor/48x48/apps/gperiodic.png \
+ 	      $(iconsdir)/hicolor/64x64/apps/gperiodic.png
+-	make -C po/ uninstall enable_nls=$(enable_nls) datadir=$(datadir) DESTDIR=$(DESTDIR)
++	$(MAKE) -C po/ uninstall enable_nls=$(enable_nls) datadir=$(datadir) DESTDIR=$(DESTDIR)
+ 
+ clean:
+ 	rm -f *.o gperiodic gperiodic.desktop
+-	make -C po/ clean
++	$(MAKE) -C po/ clean
+ 
+ .PHONY: install uninstall clean
diff --git a/sci-chemistry/gperiodic/files/gperiodic-3.0.1-nls.patch b/sci-chemistry/gperiodic/files/gperiodic-3.0.1-nls.patch
new file mode 100644
index 000000000000..4420ca68e585
--- /dev/null
+++ b/sci-chemistry/gperiodic/files/gperiodic-3.0.1-nls.patch
@@ -0,0 +1,20 @@
+ po/Makefile | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/po/Makefile b/po/Makefile
+index d7d7d78..c596e5b 100644
+--- a/po/Makefile
++++ b/po/Makefile
+@@ -26,10 +26,12 @@ endif
+ 
+ install: 
+ 	$(MAKE) all
++ifeq ($(enable_nls),1)
+ 	for f in $(FILES_MO) ; do \
+ 		mkdir -p $(DESTDIR)$(LOCALEDIR)/`basename $$f .mo`/LC_MESSAGES ; \
+ 		install -m 644 $$f $(DESTDIR)$(LOCALEDIR)/`basename $$f .mo`/LC_MESSAGES/$(PACKAGE).mo ; \
+ 	done
++endif
+ 
+ uninstall:
+ 	for f in $(FILES_MO) ; do \
diff --git a/sci-chemistry/gperiodic/gperiodic-2.0.10.ebuild b/sci-chemistry/gperiodic/gperiodic-2.0.10.ebuild
deleted file mode 100644
index 8aff46ededcd..000000000000
--- a/sci-chemistry/gperiodic/gperiodic-2.0.10.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Periodic table application for Linux"
-HOMEPAGE="http://www.frantz.fi/software/gperiodic.php"
-SRC_URI="http://www.frantz.fi/software/${P}.tar.gz"
-
-KEYWORDS="amd64 x86"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE="nls"
-
-RDEPEND="
-	sys-libs/ncurses:0
-	x11-libs/gtk+:2
-	x11-libs/cairo[X]
-	nls? ( sys-devel/gettext )"
-DEPEND="${RDEPEND}
-		virtual/pkgconfig"
-
-src_prepare() {
-	# The author has removed "unnecessary automake/autoconf setup"
-
-	sed -i -e "s|-DGTK_DISABLE_DEPRECATED|${CFLAGS}|" Makefile || die
-	sed -i -e "/make clean/d" Makefile || die
-	sed -i -e "s|CC=gcc|CC=$(tc-getCC)|" Makefile || die
-	if ! use nls; then
-		sed -i -e "/make -C po/d" Makefile || die
-	fi
-}
-
-src_install() {
-	sed -i -e "s|/usr/bin|${ED}/usr/bin|" Makefile || die
-	sed -i -e "s|/usr/share|${ED}/usr/share|" Makefile || die
-	sed -i -e "s|/usr/share|${ED}/usr/share|" po/Makefile || die
-
-	# Create directories - Makefile is quite broken.
-	dodir \
-		/usr/bin \
-		/usr/share/pixmaps \
-		/usr/share/applications
-
-	default
-
-	# The man page seems to have been removed too.
-	newdoc po/README README.translation
-}
diff --git a/sci-chemistry/gperiodic/gperiodic-3.0.1.ebuild b/sci-chemistry/gperiodic/gperiodic-3.0.1.ebuild
new file mode 100644
index 000000000000..5793eceec570
--- /dev/null
+++ b/sci-chemistry/gperiodic/gperiodic-3.0.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Periodic table application for Linux"
+HOMEPAGE="http://www.frantz.fi/software/gperiodic.php"
+SRC_URI="http://downloads.sourceforge.net/project/${PN}/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+LICENSE="GPL-2"
+IUSE="nls"
+MY_AVAILABLE_LINGUAS=" be bg cs da de es fi fr gl id is it lt ms nl pl pt_BR pt ru sv tr uk"
+IUSE="${IUSE} ${MY_AVAILABLE_LINGUAS// / linguas_}"
+
+RDEPEND="
+	sys-libs/ncurses:0
+	x11-libs/gtk+:2
+	x11-libs/cairo[X]
+	nls? ( sys-devel/gettext )"
+DEPEND="${RDEPEND}
+		virtual/pkgconfig"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-makefile.patch \
+		"${FILESDIR}"/${P}-nls.patch
+	for lang in ${MY_AVAILABLE_LINGUAS}; do
+		if ! use linguas_${lang}; then
+			einfo "Cleaning translation for ${lang}"
+			rm po/${lang}.po || die
+		fi
+	done
+}
+
+src_compile() {
+	local myopts
+	use nls && myopts="enable_nls=1" || myopts="enable_nls=0"
+	emake \
+		CFLAGS="${CFLAGS}" \
+		LDFLAGS="${LDFLAGS}" \
+		CC=$(tc-getCC) ${myopts}
+}
+
+src_install() {
+	local myopts
+	use nls && myopts="enable_nls=1" || myopts="enable_nls=0"
+	emake DESTDIR="${D}" ${myopts} install
+	dodoc AUTHORS ChangeLog README
+	newdoc po/README README.translation
+}
diff --git a/sci-libs/getdata/Manifest b/sci-libs/getdata/Manifest
index df04fe92d4c2..62511a01d9e2 100644
--- a/sci-libs/getdata/Manifest
+++ b/sci-libs/getdata/Manifest
@@ -1 +1,2 @@
 DIST getdata-0.8.5.tar.bz2 1015954 SHA256 ee0322c1cca62660daed7941b24d41fc902cd7989539dcba432f5514f682a64e SHA512 3a87ea2fbaa5491ac1d6faecdf10f0a80eef62fb8beefc6103f7f18e74efd404884f100f1d123b1fec672d1a09ea2c87e75626b7c62ea56b568a11cc44feaad0 WHIRLPOOL 7c4566bf7a56d99d41da7d007469d85ea5194f7b7417e6c5e976397f5514f9efd2ad47476f03e050f8dc30cd5348fc02eb7aa5048b14bf62fce629d602d7d84a
+DIST getdata-0.9.0.tar.xz 920652 SHA256 b38de059ff21df873e95978867eb82f716b89fc7e8e503e2cc7cef93d22685a2 SHA512 28d720141e34cc56a5166594d0a6ac293144d123706988ed170e40dd9d7aaf13b920305e8bd8343ecd7cbe43eee5d83720e3e5f5d2da0cdccdc1444725cc6844 WHIRLPOOL afc557f26b60edb5aa787fcff35aec2cd6b1bc599b74ddd1583b526f1c9d22e522baf093675f11c2367c42f28f236d53a1e88a7b6613acfa44f52cc277691ed2
diff --git a/sci-libs/getdata/files/getdata-0.9.0-serial-test.patch b/sci-libs/getdata/files/getdata-0.9.0-serial-test.patch
new file mode 100644
index 000000000000..ea17e548da2f
--- /dev/null
+++ b/sci-libs/getdata/files/getdata-0.9.0-serial-test.patch
@@ -0,0 +1,41 @@
+ bindings/Makefile.am             | 6 +-----
+ bindings/python/test/Makefile.am | 2 +-
+ 2 files changed, 2 insertions(+), 6 deletions(-)
+
+diff --git a/bindings/Makefile.am b/bindings/Makefile.am
+index ad9f0d2..9e333a5 100644
+--- a/bindings/Makefile.am
++++ b/bindings/Makefile.am
+@@ -38,10 +38,6 @@ if MAKE_MATLABBINDINGS
+ MATLAB_SUBDIR=matlab
+ endif
+ 
+-if MAKE_PYBINDINGS
+-PY_SUBDIR=python
+-endif
+-
+ if MAKE_PERLBINDINGS
+ PERL_SUBDIR=perl
+ endif
+@@ -55,7 +51,7 @@ noinst_PROGRAMS=make_parameters
+ make_parameters_SOURCES = make_parameters.c
+ nodist_make_parameters_SOURCES = ../src/getdata.h ../src/gd_config.h
+ 
+-SUBDIRS = . ${F77_SUBDIR} ${CXX_SUBDIR} ${IDL_SUBDIR} ${PY_SUBDIR} \
++SUBDIRS = . ${F77_SUBDIR} ${CXX_SUBDIR} ${IDL_SUBDIR} \
+ 					${PERL_SUBDIR} ${MATLAB_SUBDIR} ${PHP_SUBDIR}
+ 
+ make_parameters$(EXEEXT): $(make_parameters_SOURCES) \
+diff --git a/bindings/python/test/Makefile.am b/bindings/python/test/Makefile.am
+index 32d786f..f4be3de 100644
+--- a/bindings/python/test/Makefile.am
++++ b/bindings/python/test/Makefile.am
+@@ -18,7 +18,7 @@
+ # along with GetData; if not, write to the Free Software Foundation, Inc.,
+ # 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ #
+-AUTOMAKE_OPTIONS = foreign serial-tests
++AUTOMAKE_OPTIONS = foreign
+ 
+ if TEST_PYTHON
+ TESTS_ENVIRONMENT=${DL_LIBRARY_PATH}=../../../src/.libs:${${DL_LIBRARY_PATH}} PYTHONPATH=..:${PYTHONPATH} ${PYTHON}
diff --git a/sci-libs/getdata/getdata-0.8.5.ebuild b/sci-libs/getdata/getdata-0.8.5.ebuild
index 4282094c81c2..ef6d2b6390c1 100644
--- a/sci-libs/getdata/getdata-0.8.5.ebuild
+++ b/sci-libs/getdata/getdata-0.8.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -11,7 +11,7 @@ AUTOTOOLS_AUTORECONF=true
 FORTRAN_STANDARD="95"
 FORTRAN_NEEDED=fortran
 
-inherit autotools-utils fortran-2 python-r1
+inherit autotools-utils fortran-2 python-single-r1
 
 DESCRIPTION="Reference implementation of the Dirfile, format for time-ordered binary data"
 HOMEPAGE="http://getdata.sourceforge.net/"
diff --git a/sci-libs/getdata/getdata-0.9.0.ebuild b/sci-libs/getdata/getdata-0.9.0.ebuild
new file mode 100644
index 000000000000..6cd783a0afa0
--- /dev/null
+++ b/sci-libs/getdata/getdata-0.9.0.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+AUTOTOOLS_AUTORECONF=true
+
+FORTRAN_STANDARD="95"
+FORTRAN_NEEDED=fortran
+
+inherit autotools-utils fortran-2 python-single-r1
+
+DESCRIPTION="Reference implementation of the Dirfile, format for time-ordered binary data"
+HOMEPAGE="http://getdata.sourceforge.net/"
+SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.xz"
+
+SLOT="0"
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="bzip2 debug fortran lzma python perl static-libs"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+DEPEND="
+	bzip2? ( app-arch/bzip2 )
+	lzma? ( app-arch/xz-utils )
+	python? ( ${PYTHON_DEPS} )
+	perl? ( dev-lang/perl )"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-serial-test.patch
+	)
+
+src_configure() {
+	local myeconfargs=()
+	use perl && myeconfargs+=( --with-perl-dir=vendor )
+	myeconfargs+=(
+		--disable-idl
+		--without-libslim
+		--with-libz
+		--docdir="${EPREFIX}/usr/share/doc/${P}"
+		$(use_enable debug)
+		$(use_enable fortran)
+		$(use_enable fortran fortran95)
+		$(use_enable python)
+		$(use_enable perl)
+		$(use_with bzip2 libbz2)
+		$(use_with lzma liblzma)
+	)
+	autotools-utils_src_configure
+}
+
+src_compile() {
+	autotools-utils_src_compile
+
+	if use python; then
+		python_copy_sources
+		building() {
+			cd "${BUILD_DIR}"/bindings/python || die
+			sed "s:-lpython...:$(python_get_LIBS):g" -i Makefile || die
+			emake \
+				PYTHON_VERSION="${EPYTHON#python}" \
+				NUMPY_CPPFLAGS="-I${EPREFIX}$(python_get_sitedir)/numpy/core/include" \
+				PYTHON_CPPFLAGS="-I${EPREFIX}$(python_get_includedir)" \
+				pyexecdir="${EPREFIX}$(python_get_sitedir)" \
+				pythondir="${EPREFIX}$(python_get_sitedir)"
+		}
+		python_foreach_impl building
+	fi
+}
+
+src_install() {
+	autotools-utils_src_install
+	if use python; then
+		installation() {
+			cd "${BUILD_DIR}"/bindings/python || die
+			emake \
+				DESTDIR="${D}" \
+				PYTHON_VERSION="${EPYTHON#python}" \
+				NUMPY_CPPFLAGS="-I${EPREFIX}$(python_get_sitedir)/numpy/core/include" \
+				PYTHON_CPPFLAGS="-I${EPREFIX}$(python_get_includedir)" \
+				pyexecdir="${EPREFIX}$(python_get_sitedir)" \
+				pythondir="${EPREFIX}$(python_get_sitedir)" \
+				install
+				find \
+					"${ED}/$(python_get_sitedir)" \
+					-type f \( -name "*.a" -o -name "*.la" \) -delete || die
+		}
+		python_foreach_impl installation
+	fi
+}
diff --git a/sys-devel/flex/flex-2.6.0.ebuild b/sys-devel/flex/flex-2.6.0.ebuild
index b603320301d1..6fc951f26fe8 100644
--- a/sys-devel/flex/flex-2.6.0.ebuild
+++ b/sys-devel/flex/flex-2.6.0.ebuild
@@ -25,6 +25,14 @@ DEPEND="${RDEPEND}
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-out-of-tree-build.patch #567332
 	epatch "${FILESDIR}"/${P}-out-of-tree-test.patch #567332
+
+	# Disable running in the tests/ subdir as it has a bunch of built sources
+	# that cannot be made conditional (automake limitation). #568842
+	if ! use test ; then
+		sed -i \
+			-e '/^SUBDIRS =/,/^$/{/tests/d}' \
+			Makefile.in || die
+	fi
 }
 
 src_configure() {
diff --git a/sys-kernel/git-sources/Manifest b/sys-kernel/git-sources/Manifest
index 21372d1b127d..79b5362058ee 100644
--- a/sys-kernel/git-sources/Manifest
+++ b/sys-kernel/git-sources/Manifest
@@ -4,3 +4,4 @@ DIST patch-4.4-rc2.xz 6472332 SHA256 04a2fe6ce8711a01617e459d6908bfbd7715a0e4106
 DIST patch-4.4-rc3.xz 6514956 SHA256 41b73ce54efdde419218de2ca2b1bcc2bc135b5e33ab870e28eb328fca962855 SHA512 08ac846d999c8997b24a85b316218dc27c0f4adb5ab38186668705e1ca06cb576e198c702eaaf97cdbfce4a6f69805765b63c16c97271dd702bab05708ac7897 WHIRLPOOL bf01ded5974cfa6d1d887ea558ccd8b0deae88f2d8836614d0579ca25afd6a7aec1c726ee5c01506b33835f3f5c0cea5125a452969def053fda810299704658e
 DIST patch-4.4-rc4.xz 6583896 SHA256 e2a1f4198c0f56b0fb9cdf7056a3efb5c99d117e6c55341b69f8e77c01bea450 SHA512 45cfa607086fd41f37e374696042fed0c122449652282d334c3d72c808d609108e99eee538eb9a7529a0498986d31984fc3714a29bab01210548c07647fd8e83 WHIRLPOOL 78274ee4996eaf9951be09cf96c951617adf1e01c29284893720ba37bca1485e9182f8d7e237a288ef053d2a0160869898df39e9130d10c317c0d3ad91617684
 DIST patch-4.4-rc5.xz 6618504 SHA256 d976f02cae338d12981c1d9479077379ac7b7b8210fa216549ca24c51b68d85a SHA512 38f1d3b1999374850e7c857d35afeca38d7ae253face09cc689220b38aa0e87a53effcfee13ad6b821a0a7b8a1a9c0ab7a2c0b114d63dbf44f48a41f0c32483f WHIRLPOOL 765f27ca1270a2d3b0d0013a34f71d3891742e57b18f641eacb1ba070abfa8928a7bea7b8e42717ac6568930e83db5c6d113bee40d0a46b17abfb03778b1c42e
+DIST patch-4.4-rc6.xz 6663416 SHA256 e4dde89da4c186e16f0af79fb812314a1afb2746349b57831baebb9c762b6c78 SHA512 a8b362c98f76997070e2b8703836c00e5938c37c9c3cf77f4d68c77f78ee5935e305210681c8d45d534027abca249e0b607a57fc4f7df15b756c2a32e4401427 WHIRLPOOL c3e6ba088509c3aa27da021aac74602d90a308d6c66440646ac97a046e644428cd9749d98e3dbcadb9cf6526fb35fea621e83fbd73e1233be8d261060c2d27aa
diff --git a/sys-kernel/git-sources/git-sources-4.4_rc6.ebuild b/sys-kernel/git-sources/git-sources-4.4_rc6.ebuild
new file mode 100644
index 000000000000..5b6ded7aad84
--- /dev/null
+++ b/sys-kernel/git-sources/git-sources-4.4_rc6.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+UNIPATCH_STRICTORDER="yes"
+K_NOUSENAME="yes"
+K_NOSETEXTRAVERSION="yes"
+K_NOUSEPR="yes"
+K_SECURITY_UNSUPPORTED="yes"
+K_BASE_VER="4.3"
+K_EXP_GENPATCHES_NOUSE="1"
+ETYPE="sources"
+CKV="${PVR/-r/-git}"
+
+# only use this if it's not an _rc/_pre release
+[ "${PV/_pre}" == "${PV}" ] && [ "${PV/_rc}" == "${PV}" ] && OKV="${PV}"
+inherit kernel-2
+detect_version
+
+DESCRIPTION="The very latest -git version of the Linux kernel"
+HOMEPAGE="https://www.kernel.org"
+SRC_URI="${KERNEL_URI}"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+K_EXTRAEINFO="This kernel is not supported by Gentoo due to its unstable and
+experimental nature. If you have any issues, try a matching vanilla-sources
+ebuild -- if the problem is not there, please contact the upstream kernel
+developers at https://bugzilla.kernel.org and on the linux-kernel mailing list to
+report the problem so it can be fixed in time for the next kernel release."
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	>=sys-devel/patch-2.7.4"
+
+pkg_postinst() {
+	postinst_sources
+}
diff --git a/sys-process/iotop/iotop-0.6.ebuild b/sys-process/iotop/iotop-0.6.ebuild
index e25695ca6990..2e5f6e445a39 100644
--- a/sys-process/iotop/iotop-0.6.ebuild
+++ b/sys-process/iotop/iotop-0.6.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
 PYTHON_REQ_USE="ncurses(+)"
 
 inherit distutils-r1 linux-info
@@ -19,6 +19,7 @@ KEYWORDS="amd64 arm hppa ~ia64 ~mips ppc sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 CONFIG_CHECK="~TASK_IO_ACCOUNTING ~TASK_DELAY_ACCT ~TASKSTATS ~VM_EVENT_COUNTERS"
+
 DOCS=( NEWS README THANKS ChangeLog )
 
 PATCHES=( "${FILESDIR}"/${P}-setup.py3.patch )
diff --git a/virtual/perl-Math-BigInt/perl-Math-BigInt-1.999.710.ebuild b/virtual/perl-Math-BigInt/perl-Math-BigInt-1.999.710.ebuild
new file mode 100644
index 000000000000..909e3487a0fb
--- /dev/null
+++ b/virtual/perl-Math-BigInt/perl-Math-BigInt-1.999.710.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DESCRIPTION="Virtual for ${PN#perl-}"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~ppc-macos ~x86-solaris"
+IUSE=""
+
+RDEPEND="
+	~perl-core/${PN#perl-}-${PV}
+"
author	Ian Delaney <idella4@gentoo.org>	2015-12-21 10:33:54 +0800
committer	Ian Delaney <idella4@gentoo.org>	2015-12-21 10:33:54 +0800
commit	577c60980f1c38f5a985598776319df700d98a1e (patch)
tree	919d2a4a96c55d096700f3d85c4be99592d87c97
parent	app-misc/elasticsearch: remove old vns. 1.6.2, 1.7.1 (diff)
parent	net-firewall/fwknop: drop obsolete initscript revision suffix (diff)
download	gentoo-577c60980f1c38f5a985598776319df700d98a1e.tar.gz gentoo-577c60980f1c38f5a985598776319df700d98a1e.tar.bz2 gentoo-577c60980f1c38f5a985598776319df700d98a1e.zip