Fix some old packages

author: Suren A. Chilingaryan <csa@suren.me> 2019-10-25 23:16:40 +0200
committer: Suren A. Chilingaryan <csa@suren.me> 2019-10-25 23:16:40 +0200
commit: b6d14cb5db40c2c8f80450b9ac2288d71b49ad68 (patch)
tree: b181bb0859681f93ec19f3d568e2c0dd23d18211
parent: dd2aea324c07fe1bd13143bb37eff11117b6130a (diff)
download: darklin4-b6d14cb5db40c2c8f80450b9ac2288d71b49ad68.tar.gz
darklin4-b6d14cb5db40c2c8f80450b9ac2288d71b49ad68.tar.bz2
darklin4-b6d14cb5db40c2c8f80450b9ac2288d71b49ad68.tar.xz
darklin4-b6d14cb5db40c2c8f80450b9ac2288d71b49ad68.zip
40 files changed, 1236 insertions, 363 deletions
diff --git a/app-admin/openshift-client-tools/Manifest b/app-admin/openshift-client-tools/Manifest
index 4680c42..9a13658 100644
--- a/app-admin/openshift-client-tools/Manifest
+++ b/app-admin/openshift-client-tools/Manifest
@@ -1,6 +1,2 @@
-DIST openshift-client-tools-1.3.2.tar.gz 44242362 BLAKE2B 4840709d0d96f21dd4058b3b4657780da3ddf7ecc89414bafc6252d36fe6e6abbd87fc910ea9a8501444a259bb88337794d5d3221608664816973f61e5a9ca2e SHA512 5a29eb6c915ade677a7bc834ecb1dcc4bfb5b933c9a50d1172ca0316e9710b045ba6dd7e7ae5fe4f221a59db7cc62822bae4ef6976277fbcb422b4be8498b0b8
-DIST openshift-client-tools-1.4.1.tar.gz 32505339 BLAKE2B 38573661d8f11d9c9501fecf733ed5495146f108d3233658eb2984c9626682158bdb621e85f6301a566ccafa54f49bf734ad108d929d188513770f181efba998 SHA512 c499bd86eb9fef06252f142ad22d076ed4ec1f2a2b478dc0ab388c0da43fecb80b839041c150ffc5ea3dbdbda21e57a873dee78b49b4e976226d8487ead69e10
-DIST openshift-client-tools-3.7.1.tar.gz 103203524 BLAKE2B ffd472b239e8a15fb4f36580ae04d7bab10d65a97ed5904e82f5ad9dfef24dd43e8d72f5b7e5bfed225f2e579e2544549682f10fc375cf20096f3439333400fc SHA512 74336a02aa334f8e9b608ea31ac52c51e6e362adcc647f92d247b1fefbe72faf45a92f0c8eda17c2ffe997891df873436707b9acc8abeba4a887153007537b9d
-EBUILD openshift-client-tools-1.3.2.ebuild 956 BLAKE2B 046a56fe90e4d4fb4f12d0256e1ab207926ea25876cd49b64ed4665b3df3a01290a7a4f7c59a816bdf2b9c6c77ef0b8593540e92105a0e2ce7678488c5febbb9 SHA512 2c720370ec92d48839178a68c32c6e59dfdbcfa90a0483fb1d04974b6acd4cca97399c9da6a3b9606e98fe99c6a78b8f3f189385b1a782e3baf93737f8d0a389
-EBUILD openshift-client-tools-1.4.1.ebuild 954 BLAKE2B 452805bb1be92246588dda115633dace6b4d72f7d7824d32d7e1095c6a0e4c74f4b4ae4ad750e0031622c1adb567c00691ff788b3eea1da4534969933ba46379 SHA512 5333889e0fe0d247a38abcf33409e62f749759b378af5295e3f9e8080a3e430e56f2b09d051acacaa74da742bab771d254e120b52c6ed5a0c46ef15ae9a10cdb
+DIST openshift-client-tools-3.7.1.tar.gz 103203908 BLAKE2B 0fba2ceb09f2c83e44eeea72cae1428506ceaad405947a3ad4d0fa4362c7441b948d37c9ded9048ac845666d74d0d5751f4d086b8988ccaaa380dc44353b7ad0 SHA512 ee2ddbe482dcf53c827423adf16e88adaa379b8914e214ba619ee87b0d84dfd53eaf52b687ef6140d24a7d7fb733908770d55901bbc96e5a430a343cba0b0a3e
 EBUILD openshift-client-tools-3.7.1.ebuild 1119 BLAKE2B cee91219906d85ad0eed649ba80c6420aecc46f58d0fe989992c602194b21c32c936e064ac770bcda4d43ade5d4ef848955522e07a27c2aee6e4f7c60c1f5d9e SHA512 21dd8666b1456efc0c9c05c60ff1db1c59ab6d3e321b0dcff8faa32dab9e493c25d378f7938cb077673c361c7a9419b110c0062ced0994c48b99a4097d7931fb
diff --git a/app-admin/openshift-client-tools/openshift-client-tools-1.3.2.ebuild b/app-admin/openshift-client-tools/openshift-client-tools-1.3.2.ebuild
deleted file mode 100644
index f755dd4..0000000
--- a/app-admin/openshift-client-tools/openshift-client-tools-1.3.2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-inherit bash-completion-r1
-
-DESCRIPTION="Enterprise Kubernetes for Developers (Client Tools)"
-HOMEPAGE="https://www.openshift.org"
-SRC_URI="https://github.com/openshift/origin/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="bash-completion kerberos"
-
-DEPEND="dev-lang/go
-	kerberos? ( app-crypt/mit-krb5 )"
-RDEPEND="bash-completion? ( >=app-shells/bash-completion-2.3-r1 )"
-
-S="${WORKDIR}/origin-${PV}"
-
-src_compile() {
-	use kerberos && MY_TAGS="-tags=gssapi"
-	emake all OS_GIT_MINOR="" OS_GIT_MAJOR="" OS_GIT_VERSION="v${PV}" WHAT="cmd/oc ${MY_TAGS}"
-}
-
-src_install() {
-	case "${ARCH}" in
-		x86)	MY_ARCH="386" ;;
-		*)		MY_ARCH="${ARCH}" ;;
-	esac
-
-	dobin "_output/local/bin/linux/${MY_ARCH}/oc"
-	doman docs/man/man1/oc*
-	use bash-completion && dobashcomp contrib/completions/bash/oc
-}
-\ No newline at end of file
diff --git a/app-admin/openshift-client-tools/openshift-client-tools-1.4.1.ebuild b/app-admin/openshift-client-tools/openshift-client-tools-1.4.1.ebuild
deleted file mode 100644
index 8b80422..0000000
--- a/app-admin/openshift-client-tools/openshift-client-tools-1.4.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-inherit bash-completion-r1
-
-DESCRIPTION="Enterprise Kubernetes for Developers (Client Tools)"
-HOMEPAGE="https://www.openshift.org"
-SRC_URI="https://github.com/openshift/origin/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="bash-completion kerberos"
-
-DEPEND="dev-lang/go
-	kerberos? ( app-crypt/mit-krb5 )"
-RDEPEND="bash-completion? ( >=app-shells/bash-completion-2.3-r1 )"
-
-S="${WORKDIR}/origin-${PV}"
-
-src_compile() {
-	use kerberos && MY_TAGS="-tags=gssapi"
-	emake all OS_GIT_MINOR="" OS_GIT_MAJOR="" OS_GIT_VERSION="v${PV}" WHAT="cmd/oc ${MY_TAGS}"
-}
-
-src_install() {
-	case "${ARCH}" in
-		x86)	MY_ARCH="386" ;;
-		*)		MY_ARCH="${ARCH}" ;;
-	esac
-
-	dobin "_output/local/bin/linux/${MY_ARCH}/oc"
-	doman docs/man/man1/oc*
-	use bash-completion && dobashcomp contrib/completions/bash/oc
-}
-\ No newline at end of file
diff --git a/dev-db/freetds/Manifest b/dev-db/freetds/Manifest
index d5fe79d..c71a786 100644
--- a/dev-db/freetds/Manifest
+++ b/dev-db/freetds/Manifest
@@ -6,8 +6,4 @@ AUX freetds-20080603-odbc-csa2.patch 12562 BLAKE2B 06aacfdd687f3dd8dedb68590262d
 AUX freetds-ds-connect_timeout.patch 492 BLAKE2B 4b9db9ae343ebfb28eafa3a979d140e3aae6e75bbc55e345e5e0c51a711d049bbbb01ed0a6204ddd13dd4284720c33051ab5ff270fb3f8ab10876444588b3232 SHA512 d2bfbff3aef576a53d7836b399fb958dd44c330f77386f9c2d1cdf7846f603d31c1c60492615bd297eea52d03c0c89cbbca80cc841b7c04179e9aa5db79f4c3a
 AUX freetds-ds-odbc.patch 7592 BLAKE2B 517879f2efa16ce7cfe8ae96956e6f13851ef4e4108ebd1a0310083f86f54980bec8ee4ac95b708778c65cca57dfae7a233cfb053161fc3bc33d7e18ce1923df SHA512 2b458b952e22e80b91d9e0c097f45708c1aef5c0f2c5d48200a19afc40d41008719c7c13000ac0b9ff1f9ddc00a2d693c5fd5758bc1a83a21b257819629ea8fb
 DIST freetds-0.82.tar.gz 1596755 BLAKE2B 373115c4f9cdbe82a2b510ca679a8f5421f8f5946d8cbc56c201f9e58eda990a97fd80ebf9851f74596e642eee8780316132570881762dfdf125cf9716b1472d SHA512 7c93153e1da06c8196702edac39cd5d9cd7d1289e71eec69211f379a0f0d4d384af2a920be2c4b2d87fea770f68417d633e29ceaaa0f6f5e140ccd1d28771276
-EBUILD freetds-0.82-r1.ebuild 996 BLAKE2B 94c441371d54b649c58273148af6628734074f3d679703023077cd69b95fef0f8742a9e48cb11da212e44d51b31a8e0ac9d5d05489b75ad4dcd906a9cbbf5fd1 SHA512 269c228dc791d79dc1dfd1a40fd0dd11e4f04eb7ff4e7956995f43c6ebaaa20d808d165c76f91ea4f9f47641be12c956dec34cfebefb7d43671c7e0c5dcfce27
-EBUILD freetds-0.82-r2.ebuild 1054 BLAKE2B 51b6292dfc629be9be2781a2e6d52e272eb6976ef90d7f655d63a63d11e5ed2daec327a911e5638e73263f456e22e1e0839797f96e20bced2238fa15cea404ad SHA512 160bb7fe66676d252da238de922a20b1d972f9067484342e32f1ffd93af1a6280dd154c10a1b394a1a99a542649459bc155abf7e0a78cd04cf138aebc8bd13ae
-EBUILD freetds-0.82-r3.ebuild 1007 BLAKE2B dc37e89177ddb7ccc3a09ce4fcda36e22941fb0b5abcbfaf723e2b6cc28f772f24d24d37500ec7e4fe8921c18ffa3b025fb28f0a8abcc082db29cfdc06f899c3 SHA512 e8b6b50b52ca3d374898a17fe24ea2f6668e86da1665ace8b637abbfbc575c9afa6fe342affb6adae58cee988a2ee7dd161647e877c8f2a205aa5c44a5f01652
-EBUILD freetds-0.82-r4.ebuild 1069 BLAKE2B f6a1afa59cd19cdc1fc80fc051286a66316a09d8b4fcc733da5e1d8aa7443559f5e6dae5967fcfc3092c95f89ae0069ebd2ab948df21c3fa850206475c1da818 SHA512 03e5e63a874a8a783b9d78b9866302cd36a8e7fbf9b9dd789a68d6b5512e1f5184aab082d87026c9732f58dbd69d674eecfec92d5edf71a63be71b040d7040d9
-EBUILD freetds-0.82-r5.ebuild 1067 BLAKE2B a4dfafdcc5e8bfdda1cd23c71fb892c57720d0d91ba1409036c9fdeafd49295031b18755951f0e74eacf2912f159d1e9002ddf1dd2ff497b65bb9f4b0a6e45ec SHA512 a3bd22d729c85bc7300c123e9b8d3ba84c9557195132a30b1b11ca7570ebaa0de11f1d530433a87ed72695a93ebf57c839b6af20e966cdbf80619c4d633944ee
+EBUILD freetds-0.82-r6.ebuild 1110 BLAKE2B 8ddd6268b5cd393a399aab440b048c8dd3e78e705f104a8e8c74251b537a1564a56620fde758d8aca6d7c8e927755336487e13298f772bb22b738a6589ec6635 SHA512 0c3d6e9878381d0019a76b9c938cd52ea1008d5a2a093c4fde999626fd5f3dc97fbecd381132e758490a70b77932b006938a21a08484ceff0cbba2a8aabe5e35
diff --git a/dev-db/freetds/freetds-0.82-r1.ebuild b/dev-db/freetds/freetds-0.82-r1.ebuild
deleted file mode 100644
index 11c93b1..0000000
--- a/dev-db/freetds/freetds-0.82-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/freetds/freetds-0.64.ebuild,v 1.11 2007/11/14 15:53:32 jer Exp $
-
-inherit eutils
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-DESCRIPTION="Tabular Datastream Library."
-HOMEPAGE="http://www.freetds.org/"
-SRC_URI="http://ibiblio.org/pub/Linux/ALPHA/freetds/stable/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="odbc mssql"
-
-DEPEND="odbc? ( dev-db/unixODBC )"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	cd ${S}
-
-	epatch "${FILESDIR}"/${PN}-ds-odbc.patch || die
-}
-
-src_compile() {
-	local myconf
-	use odbc && myconf="--with-unixodbc=/usr"
-	use mssql && myconf="${myconf} --enable-msdblib"
-	econf --with-tdsver=7.0 ${myconf} --cache-file="${S}/config.cache" || die "econf failed"
-	emake || die "emake failed"
-}
-
-RESTRICT="test"
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-}
diff --git a/dev-db/freetds/freetds-0.82-r2.ebuild b/dev-db/freetds/freetds-0.82-r2.ebuild
deleted file mode 100644
index 39586d7..0000000
--- a/dev-db/freetds/freetds-0.82-r2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/freetds/freetds-0.64.ebuild,v 1.11 2007/11/14 15:53:32 jer Exp $
-
-inherit eutils
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-DESCRIPTION="Tabular Datastream Library."
-HOMEPAGE="http://www.freetds.org/"
-SRC_URI="http://ibiblio.org/pub/Linux/ALPHA/freetds/stable/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="odbc mssql"
-
-DEPEND="odbc? ( dev-db/unixODBC )"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	cd ${S}
-
-#	epatch "${FILESDIR}"/${PN}-ds-odbc.patch || die
-	epatch "${FILESDIR}"/SQLGetData.utf8.odbc.c.diff || die
-}
-
-src_compile() {
-	local myconf
-	use odbc && myconf="--with-unixodbc=/usr"
-	use mssql && myconf="${myconf} --enable-msdblib"
-	econf --with-tdsver=7.0 ${myconf} --cache-file="${S}/config.cache" || die "econf failed"
-	emake || die "emake failed"
-}
-
-RESTRICT="test"
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-}
diff --git a/dev-db/freetds/freetds-0.82-r3.ebuild b/dev-db/freetds/freetds-0.82-r3.ebuild
deleted file mode 100644
index 3d26269..0000000
--- a/dev-db/freetds/freetds-0.82-r3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/freetds/freetds-0.64.ebuild,v 1.11 2007/11/14 15:53:32 jer Exp $
-
-inherit eutils
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-DESCRIPTION="Tabular Datastream Library."
-HOMEPAGE="http://www.freetds.org/"
-SRC_URI="http://ibiblio.org/pub/Linux/ALPHA/freetds/stable/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="odbc mssql"
-
-DEPEND="odbc? ( dev-db/unixODBC )"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	cd ${S}
-
-	epatch "${FILESDIR}"/SQLGetData.utf8.odbc.c-r3.diff || die
-}
-
-src_compile() {
-	local myconf
-	use odbc && myconf="--with-unixodbc=/usr"
-	use mssql && myconf="${myconf} --enable-msdblib"
-	econf --with-tdsver=7.0 ${myconf} --cache-file="${S}/config.cache" || die "econf failed"
-	emake || die "emake failed"
-}
-
-RESTRICT="test"
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-}
diff --git a/dev-db/freetds/freetds-0.82-r4.ebuild b/dev-db/freetds/freetds-0.82-r4.ebuild
deleted file mode 100644
index 8355034..0000000
--- a/dev-db/freetds/freetds-0.82-r4.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/freetds/freetds-0.64.ebuild,v 1.11 2007/11/14 15:53:32 jer Exp $
-
-inherit eutils
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-DESCRIPTION="Tabular Datastream Library."
-HOMEPAGE="http://www.freetds.org/"
-SRC_URI="http://ibiblio.org/pub/Linux/ALPHA/freetds/stable/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="odbc mssql"
-
-DEPEND="odbc? ( dev-db/unixODBC )"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	cd ${S}
-
-	epatch "${FILESDIR}"/SQLGetData.utf8.odbc.c-r3.diff || die
-	epatch "${FILESDIR}"/freetds-ds-connect_timeout.patch || die
-}
-
-src_compile() {
-	local myconf
-	use odbc && myconf="--with-unixodbc=/usr"
-	use mssql && myconf="${myconf} --enable-msdblib"
-	econf --with-tdsver=7.0 ${myconf} --cache-file="${S}/config.cache" || die "econf failed"
-	emake || die "emake failed"
-}
-
-RESTRICT="test"
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-}
diff --git a/dev-db/freetds/freetds-0.82-r5.ebuild b/dev-db/freetds/freetds-0.82-r6.ebuild
index 97c03a6..0dfc66b 100644
--- a/dev-db/freetds/freetds-0.82-r5.ebuild
+++ b/dev-db/freetds/freetds-0.82-r6.ebuild
@@ -7,7 +7,8 @@ inherit eutils
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
 DESCRIPTION="Tabular Datastream Library."
 HOMEPAGE="http://www.freetds.org/"
-SRC_URI="http://ibiblio.org/pub/Linux/ALPHA/freetds/stable/${P}.tar.gz"
+#SRC_URI="http://ibiblio.org/freetds/stable/${P}.tar.gz"
+SRC_URI="http://ibiblio.org/freetds/old/0.82/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="odbc mssql"
diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 1800709..5991e41 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -38,4 +38,7 @@ AUX php529-ds-odbc64.patch 502 BLAKE2B 8010a1fbb49b73d0dc48b29396a3376a9ee39db2d
 AUX php532-ds-odbc_timeout.patch 1583 BLAKE2B 12965ca8203d445fe8858e997c639066879c9a0e1276b8bc3d64116c6997d0ffae6531ae6c7fe7bac300e874b95c3da2f4e3f68d1f11aae9cec06d7a5b5eb41f SHA512 c237e5bc37c556e2bebe57f6f2e93a3fa5b1e35582dc3746bb74a654fb7491dfedb404e72b44413c78237adc0db6ca8567c9022c21c9bf44881eefdb061b60b1
 AUX php547-ds-odbc_blob.patch 632 BLAKE2B df19229863ffc52c6e2ff53f9e3a7d03d10afda2c682575d3a1d5980af6a0c8ae0882393b3ea93de4606abf8f58471faac8d0c2c89bd8097e746b51ba3fd40c8 SHA512 7fff693338f4bb090c0aa1dc2fb70695f1380779e3dc8226001fc2893041fee74bc56d71e797c56057f21d093aa50c3cb347ada31e9fb491365ea28f7999aeca
 DIST php-5.5.17.tar.bz2 13269227 BLAKE2B 7f63fe3df281ec864e87a5f1195ddd4c99a5682ee1cd38740efcf179d13f9a8e6e367b3a9f0aa8ddb4d72f990255954548e5260c08cb31703a17fb0239112931 SHA512 898ab5ae1bcd7def149d63c919cbffa2d9708052a230465d39e53b46d39ec124f52ba31e6440f0ad96ec1e6e4fe4dec3e52bcb4f9a2e7d0af7cdcc94e81e493b
+DIST php-5.6.40.tar.xz 12472236 BLAKE2B f41147eaec9b15e965540f9e871691cc88848dd619bae6af85e7bba0130b71ce91bad5cdbbadbb537c42df83369f5c731007339a9d9e21e689e913c135201afc SHA512 997b5a952a60cf9166671cc91fcc34c674dd62bfd5cb0a9cdf3fdf2d088b5d19943d94c1cf193f8ab71fc4957d9a9a4c7c2fb8826f937501c1c0a0858f10e329
+DIST php-patches-7.1.31bp.tar.bz2 37219 BLAKE2B 4f3ead2f69adf00ac1317371172c8adbb823f597cd8e3cafe7044d6a46671437fd2e5eaef4309a6fd5825123394044543284d3cbe892c918353a5b07c12b7401 SHA512 eb52679d035ceb4124c8e9175024f4f753e20d139479af4a57e01de941991716b2ce37f6190242c1bec46fd5305bad1f91613b04ee849a0d94f4a33ce013781e
 EBUILD php-5.5.17-r1.ebuild 22508 BLAKE2B 9309e88071d1b0110ea3ddc45afa6c9c42e597921db49fa7d7e1de8c03ca15e90b3a7221f5548f475be296783eabfe5c4d09b91e8acbfb7986a235c63e5a8087 SHA512 5d52e3e720027af33771eb06b725bae81f656110233b24de65f184310e22efb3c0034dcb0b1e8ba56bdff5498a2e2c88a31c41074709aa463a95fe263bfa2b7c
+EBUILD php-5.6.40-r6.ebuild 22945 BLAKE2B ce6cc73791974c39ca920a1b5f393376d033b0f00ef7c71f7ade9d6013bfe495c17ef61691eb4f75372b3e97034874eab2757756c4acae5bce0e7be2fba5579c SHA512 5833e71475fab8a53b48f44543a28b28b2280aae263fe17b57be1bc756438884003a1ff878ef5aa16e1c84be0b207c4e96d428c08d5a82cc1e67d892b9cc914e
diff --git a/dev-lang/php/php-5.6.40-r6.ebuild b/dev-lang/php/php-5.6.40-r6.ebuild
new file mode 100644
index 0000000..95731ef
--- /dev/null
+++ b/dev-lang/php/php-5.6.40-r6.ebuild
@@ -0,0 +1,788 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit autotools flag-o-matic systemd
+
+PATCH_V="7.1.31bp"
+
+DESCRIPTION="The PHP language runtime engine"
+HOMEPAGE="https://secure.php.net/"
+SRC_URI="https://php.net/distributions/${P}.tar.xz
+	https://gitweb.gentoo.org/proj/php-patches.git/snapshot/php-patches-${PATCH_V}.tar.bz2"
+
+LICENSE="PHP-3.01
+	BSD
+	Zend-2.0
+	bcmath? ( LGPL-2.1+ )
+	fpm? ( BSD-2 )
+	gd? ( gd )
+	unicode? ( BSD-2 LGPL-2.1 )"
+
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+
+# We can build the following SAPIs in the given order
+SAPIS="embed cli cgi fpm apache2"
+
+# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
+IUSE="${IUSE}
+	${SAPIS/cli/+cli}
+	threads"
+
+IUSE="${IUSE} acl bcmath berkdb bzip2 calendar cdb cjk
+	coverage crypt +ctype curl debug
+	enchant exif +fileinfo +filter firebird
+	+flatfile ftp gd gdbm gmp +hash +iconv imap inifile
+	intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl
+	mhash mssql mysql libmysqlclient mysqli nls
+	oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
+	readline recode selinux +session sharedmem
+	+simplexml snmp soap sockets spell sqlite ssl
+	sybase-ct sysvipc systemd tidy +tokenizer truetype unicode vpx wddx
+	+xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib"
+
+# The supported (that is, autodetected) versions of BDB are listed in
+# the ./configure script. Other versions *work*, but we need to stick to
+# the ones that can be detected to avoid a repeat of bug #564824.
+COMMON_DEPEND="
+	>=app-eselect/eselect-php-0.9.1[apache2?,fpm?]
+	>=dev-libs/libpcre-8.32[unicode]
+	fpm? ( acl? ( sys-apps/acl ) )
+	apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] )
+	berkdb? ( || (	sys-libs/db:5.3
+					sys-libs/db:5.1
+					sys-libs/db:4.8
+					sys-libs/db:4.7
+					sys-libs/db:4.6
+					sys-libs/db:4.5 ) )
+	bzip2? ( app-arch/bzip2:0= )
+	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
+	cjk? ( !gd? (
+		virtual/jpeg:0
+		media-libs/libpng:0=
+		sys-libs/zlib:0=
+	) )
+	coverage? ( dev-util/lcov )
+	crypt? ( >=dev-libs/libmcrypt-2.4 )
+	curl? ( >=net-misc/curl-7.10.5 )
+	enchant? ( app-text/enchant )
+	exif? ( !gd? (
+		virtual/jpeg:0
+		media-libs/libpng:0=
+		sys-libs/zlib:0=
+	) )
+	firebird? ( dev-db/firebird )
+	gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= )
+	gdbm? ( >=sys-libs/gdbm-1.8.0:0= )
+	gmp? ( dev-libs/gmp:0= )
+	iconv? ( virtual/libiconv )
+	imap? ( virtual/imap-c-client[kerberos=,ssl=] )
+	intl? ( dev-libs/icu:= )
+	iodbc? ( dev-db/libiodbc )
+	kerberos? ( virtual/krb5 )
+	ldap? ( >=net-nds/openldap-1.2.11 )
+	ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 )
+	libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) )
+	mssql? ( dev-db/freetds[mssql] )
+	libmysqlclient? (
+		mysql? ( <dev-db/mysql-connector-c-8.0:0= )
+		mysqli? ( <dev-db/mysql-connector-c-8.0:0= )
+	)
+	nls? ( sys-devel/gettext )
+	oci8-instant-client? ( dev-db/oracle-instantclient-basic )
+	odbc? ( >=dev-db/unixODBC-1.8.13 )
+	postgres? ( dev-db/postgresql:* )
+	qdbm? ( dev-db/qdbm )
+	readline? ( sys-libs/readline:0= )
+	recode? ( app-text/recode )
+	sharedmem? ( dev-libs/mm )
+	simplexml? ( >=dev-libs/libxml2-2.6.8 )
+	snmp? ( >=net-analyzer/net-snmp-5.2 )
+	soap? ( >=dev-libs/libxml2-2.6.8 )
+	spell? ( >=app-text/aspell-0.50 )
+	sqlite? ( >=dev-db/sqlite-3.7.6.3 )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	sybase-ct? ( dev-db/freetds )
+	tidy? ( app-text/htmltidy )
+	truetype? (
+		=media-libs/freetype-2*
+		>=media-libs/t1lib-5.0.0
+		!gd? (
+			virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= )
+	)
+	unicode? ( dev-libs/oniguruma:= )
+	vpx? ( media-libs/libvpx:0= )
+	wddx? ( >=dev-libs/libxml2-2.6.8 )
+	xml? ( >=dev-libs/libxml2-2.6.8 )
+	xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv )
+	xmlreader? ( >=dev-libs/libxml2-2.6.8 )
+	xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
+	xpm? (
+		x11-libs/libXpm
+		virtual/jpeg:0
+		media-libs/libpng:0= sys-libs/zlib:0=
+	)
+	xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
+	zip? ( sys-libs/zlib:0= )
+	zlib? ( sys-libs/zlib:0= )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	virtual/mta
+	fpm? (
+		selinux? ( sec-policy/selinux-phpfpm )
+		systemd? ( sys-apps/systemd ) )"
+
+DEPEND="${COMMON_DEPEND}
+	app-arch/xz-utils
+	>=sys-devel/bison-3.0.1
+	sys-devel/flex
+	>=sys-devel/m4-1.4.3
+	>=sys-devel/libtool-1.5.18"
+
+# Without USE=readline or libedit, the interactive "php -a" CLI will hang.
+REQUIRED_USE="
+	|| ( cli cgi fpm apache2 embed )
+	cli? ( ^^ ( readline libedit ) )
+	truetype? ( gd zlib )
+	vpx? ( gd zlib )
+	cjk? ( gd zlib )
+	exif? ( gd zlib )
+	xpm? ( gd zlib )
+	gd? ( zlib )
+	simplexml? ( xml )
+	soap? ( xml )
+	wddx? ( xml )
+	xmlrpc? ( || ( xml iconv ) )
+	xmlreader? ( xml )
+	xslt? ( xml )
+	ldap-sasl? ( ldap )
+	mhash? ( hash )
+	phar? ( hash )
+	recode? ( !imap !mysql !mysqli !libmysqlclient )
+	libmysqlclient? ( || (
+		mysql
+		mysqli
+		pdo
+	) )
+
+	qdbm? ( !gdbm )
+	readline? ( !libedit )
+	sharedmem? ( !threads )
+"
+
+PHP_MV="$(ver_cut 1)"
+
+php_install_ini() {
+	local phpsapi="${1}"
+
+	# work out where we are installing the ini file
+	php_set_ini_dir "${phpsapi}"
+
+	# Always install the production INI file, bug 611214.
+	local phpinisrc="php.ini-production-${phpsapi}"
+	cp php.ini-production "${phpinisrc}" || die
+
+	# default to /tmp for save_path, bug #282768
+	sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" || die
+
+	# Set the extension dir
+	sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" \
+		-i "${phpinisrc}" || die
+
+	# Set the include path to point to where we want to find PEAR packages
+	sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die
+
+	dodir "${PHP_INI_DIR#${EPREFIX}}"
+	insinto "${PHP_INI_DIR#${EPREFIX}}"
+	newins "${phpinisrc}" php.ini
+
+	elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
+	elog
+
+	dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
+	dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
+
+	if use opcache; then
+		elog "Adding opcache to $PHP_EXT_INI_DIR"
+		echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> \
+			 "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
+		dosym "${PHP_EXT_INI_DIR#${EPREFIX}}/opcache.ini" \
+			  "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
+	fi
+
+	# SAPI-specific handling
+	if [[ "${sapi}" == "fpm" ]] ; then
+		einfo "Installing FPM config file php-fpm.conf"
+		insinto "${PHP_INI_DIR#${EPREFIX}}"
+		doins sapi/fpm/php-fpm.conf
+	fi
+
+	dodoc php.ini-{development,production}
+}
+
+php_set_ini_dir() {
+	PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
+	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
+	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
+}
+
+src_prepare() {
+	local patchdir="${WORKDIR}/php-patches-${PATCH_V}"
+
+	eapply "${patchdir}/"
+
+	# Copy test binaries from patches
+	local ext_src
+	for ext_src in exif iconv ; do
+		cp "${patchdir}/${ext_src}/"* "ext/${ext_src}/tests/" || die
+	done
+
+	# Change PHP branding
+	# Get the alpha/beta/rc version
+	sed -re	"s|^(PHP_EXTRA_VERSION=\").*(\")|\1-pl${PR/r/}-gentoo\2|g" \
+		-i configure.in || die "Unable to change PHP branding"
+
+	# Patch PHP to show Gentoo as the server platform
+	sed -e 's/PHP_UNAME=`uname -a | xargs`/PHP_UNAME=`uname -s -n -r -v | xargs`/g' \
+		-i configure.in || die "Failed to fix server platform name"
+
+	# Prevent PHP from activating the Apache config,
+	# as we will do that ourselves
+	sed -i \
+		-e "s,-i -a -n php${PHP_MV},-i -n php${PHP_MV},g" \
+		-e "s,-i -A -n php${PHP_MV},-i -n php${PHP_MV},g" \
+		configure sapi/apache2filter/config.m4 sapi/apache2handler/config.m4 \
+		|| die
+
+	# Patch PHP to support heimdal instead of mit-krb5
+	if has_version "app-crypt/heimdal" ; then
+		sed -e 's|gssapi_krb5|gssapi|g' -i acinclude.m4 \
+			|| die "Failed to fix heimdal libname"
+		sed -e 's|PHP_ADD_LIBRARY(k5crypto, 1, $1)||g' -i acinclude.m4 \
+			|| die "Failed to fix heimdal crypt library reference"
+	fi
+
+	eapply_user
+
+	# Force rebuilding aclocal.m4
+	rm -f aclocal.m4 || die "failed to remove aclocal.m4 in src_prepare"
+
+	mv configure.in configure.ac || die
+
+	eautoreconf
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# http://bugs.php.net/bug.php?id=48795, bug #343481
+		sed -i -e '/BUILD_CGI="\\$(CC)/s/CC/CXX/' configure || die
+	fi
+}
+
+src_configure() {
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+	addpredict /var/lib/net-snmp/mib_indexes #nowarn
+
+	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
+
+	# The php-fpm config file wants localstatedir to be ${EPREFIX}/var
+	# and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002.
+	local our_conf=(
+		--prefix="${PHP_DESTDIR}"
+		--mandir="${PHP_DESTDIR}/man"
+		--infodir="${PHP_DESTDIR}/info"
+		--libdir="${PHP_DESTDIR}/lib"
+		--with-libdir="$(get_libdir)"
+		--localstatedir="${EPREFIX}/var"
+		--without-pear
+		$(use_enable threads maintainer-zts)
+	)
+
+	our_conf+=(
+		$(use_enable bcmath bcmath)
+		$(use_with bzip2 bz2 "${EPREFIX}/usr")
+		$(use_enable calendar calendar)
+		$(use_enable coverage gcov)
+		$(use_enable ctype ctype)
+		$(use_with curl curl "${EPREFIX}/usr")
+		$(use_enable xml dom)
+		$(use_with enchant enchant "${EPREFIX}/usr")
+		$(use_enable exif exif)
+		$(use_enable fileinfo fileinfo)
+		$(use_enable filter filter)
+		$(use_enable ftp ftp)
+		$(use_with nls gettext "${EPREFIX}/usr")
+		$(use_with gmp gmp "${EPREFIX}/usr")
+		$(use_enable hash hash)
+		$(use_with mhash mhash "${EPREFIX}/usr")
+		$(use_with iconv iconv \
+			$(use elibc_glibc || use elibc_musl || use elibc_FreeBSD || echo "${EPREFIX}/usr"))
+		$(use_enable intl intl)
+		$(use_enable ipv6 ipv6)
+		$(use_enable json json)
+		$(use_with kerberos kerberos "${EPREFIX}/usr")
+		$(use_enable xml libxml)
+		$(use_with xml libxml-dir "${EPREFIX}/usr")
+		$(use_enable unicode mbstring)
+		$(use_with crypt mcrypt "${EPREFIX}/usr")
+		$(use_with mssql mssql "${EPREFIX}/usr")
+		$(use_with unicode onig "${EPREFIX}/usr")
+		$(use_with ssl openssl "${EPREFIX}/usr")
+		$(use_with ssl openssl-dir "${EPREFIX}/usr")
+		$(use_enable pcntl pcntl)
+		$(use_enable phar phar)
+		$(use_enable pdo pdo)
+		$(use_enable opcache opcache)
+		$(use_with postgres pgsql "${EPREFIX}/usr")
+		$(use_enable posix posix)
+		$(use_with spell pspell "${EPREFIX}/usr")
+		$(use_with recode recode "${EPREFIX}/usr")
+		$(use_enable simplexml simplexml)
+		$(use_enable sharedmem shmop)
+		$(use_with snmp snmp "${EPREFIX}/usr")
+		$(use_enable soap soap)
+		$(use_enable sockets sockets)
+		$(use_with sqlite sqlite3 "${EPREFIX}/usr")
+		$(use_with sybase-ct sybase-ct "${EPREFIX}/usr")
+		$(use_enable sysvipc sysvmsg)
+		$(use_enable sysvipc sysvsem)
+		$(use_enable sysvipc sysvshm)
+		$(use_with tidy tidy "${EPREFIX}/usr")
+		$(use_enable tokenizer tokenizer)
+		$(use_enable wddx wddx)
+		$(use_enable xml xml)
+		$(use_enable xmlreader xmlreader)
+		$(use_enable xmlwriter xmlwriter)
+		$(use_with xmlrpc xmlrpc)
+		$(use_with xslt xsl "${EPREFIX}/usr")
+		$(use_enable zip zip)
+		$(use_with zlib zlib "${EPREFIX}/usr")
+		$(use_enable debug debug)
+	)
+
+	# DBA support
+	if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
+		|| use qdbm ; then
+		our_conf+=( "--enable-dba${shared}" )
+	fi
+
+	# DBA drivers support
+	our_conf+=(
+		$(use_with cdb cdb)
+		$(use_with berkdb db4 "${EPREFIX}/usr")
+		$(use_enable flatfile flatfile)
+		$(use_with gdbm gdbm "${EPREFIX}/usr")
+		$(use_enable inifile inifile)
+		$(use_with qdbm qdbm "${EPREFIX}/usr")
+	)
+
+	# Support for the GD graphics library
+	our_conf+=(
+		$(use_with truetype freetype-dir "${EPREFIX}/usr")
+		$(use_with truetype t1lib "${EPREFIX}/usr")
+		$(use_enable cjk gd-jis-conv)
+		$(use_with gd jpeg-dir "${EPREFIX}/usr")
+		$(use_with gd png-dir "${EPREFIX}/usr")
+		$(use_with xpm xpm-dir "${EPREFIX}/usr")
+		$(use_with vpx vpx-dir "${EPREFIX}/usr")
+	)
+	# enable gd last, so configure can pick up the previous settings
+	our_conf+=( $(use_with gd gd) )
+
+	# IMAP support
+	if use imap ; then
+		our_conf+=(
+			$(use_with imap imap "${EPREFIX}/usr")
+			$(use_with ssl imap-ssl "${EPREFIX}/usr")
+		)
+	fi
+
+	# Interbase/firebird support
+	our_conf+=( $(use_with firebird interbase "${EPREFIX}/usr") )
+
+	# LDAP support
+	if use ldap ; then
+		our_conf+=(
+			$(use_with ldap ldap "${EPREFIX}/usr")
+			$(use_with ldap-sasl ldap-sasl "${EPREFIX}/usr")
+		)
+	fi
+
+	# MySQL support
+	local mysqllib="mysqlnd"
+	local mysqlilib="mysqlnd"
+	use libmysqlclient && mysqllib="${EPREFIX}/usr"
+	use libmysqlclient && mysqlilib="${EPREFIX}/usr/bin/mysql_config"
+
+	our_conf+=( $(use_with mysql mysql "${mysqllib}") )
+	our_conf+=( $(use_with mysqli mysqli "${mysqlilib}") )
+
+	local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock"
+	if use mysql || use mysqli ; then
+		our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") )
+	fi
+
+	# ODBC support
+	our_conf+=(
+		$(use_with odbc unixODBC "${EPREFIX}/usr")
+		$(use_with iodbc iodbc "${EPREFIX}/usr")
+	)
+
+	# Oracle support
+	our_conf+=( $(use_with oci8-instant-client oci8) )
+
+	# PDO support
+	if use pdo ; then
+		our_conf+=(
+			$(use_with mssql pdo-dblib)
+			$(use_with mysql pdo-mysql "${mysqllib}")
+			$(use_with postgres pdo-pgsql)
+			$(use_with sqlite pdo-sqlite "${EPREFIX}/usr")
+			$(use_with firebird pdo-firebird "${EPREFIX}/usr")
+			$(use_with odbc pdo-odbc "unixODBC,${EPREFIX}/usr")
+			$(use_with oci8-instant-client pdo-oci)
+		)
+	fi
+
+	# readline/libedit support
+	our_conf+=(
+		$(use_with readline readline "${EPREFIX}/usr")
+		$(use_with libedit libedit "${EPREFIX}/usr")
+	)
+
+	# Session support
+	if use session ; then
+		our_conf+=( $(use_with sharedmem mm "${EPREFIX}/usr") )
+	else
+		our_conf+=( $(use_enable session session) )
+	fi
+
+	# Use pic for shared modules such as apache2's mod_php
+	our_conf+=( --with-pic )
+
+	# we use the system copy of pcre
+	# --with-pcre-regex affects ext/pcre
+	# --with-pcre-dir affects ext/filter and ext/zip
+	our_conf+=(
+		--with-pcre-regex="${EPREFIX}/usr"
+		--with-pcre-dir="${EPREFIX}/usr"
+	)
+
+	# Catch CFLAGS problems
+	# Fixes bug #14067.
+	# Changed order to run it in reverse for bug #32022 and #12021.
+	replace-cpu-flags "k6*" "i586"
+
+	# Cache the ./configure test results between SAPIs.
+	our_conf+=( --cache-file="${T}/config.cache" )
+
+	# Support user-passed configuration parameters
+	our_conf+=( ${EXTRA_ECONF:-} )
+
+	# Support the Apache2 extras, they must be set globally for all
+	# SAPIs to work correctly, especially for external PHP extensions
+
+	mkdir -p "${WORKDIR}/sapis-build" || die
+	for one_sapi in $SAPIS ; do
+		use "${one_sapi}" || continue
+		php_set_ini_dir "${one_sapi}"
+
+		# The BUILD_DIR variable is used to determine where to output
+		# the files that autotools creates. This was all originally
+		# based on the autotools-utils eclass.
+		BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}"
+		cp -a "${S}" "${BUILD_DIR}" || die
+		cd "${BUILD_DIR}" || die
+
+		local sapi_conf=(
+			--with-config-file-path="${PHP_INI_DIR}"
+			--with-config-file-scan-dir="${PHP_EXT_INI_DIR_ACTIVE}"
+		)
+
+		for sapi in $SAPIS ; do
+			case "$sapi" in
+				cli|cgi|embed|fpm)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf+=( "--enable-${sapi}" )
+						if [[ "fpm" == "${sapi}" ]] ; then
+							sapi_conf+=(
+								$(use_with acl fpm-acl)
+								$(use_with systemd fpm-systemd)
+							)
+						fi
+					else
+						sapi_conf+=( "--disable-${sapi}" )
+					fi
+					;;
+
+				apache2)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf+=( --with-apxs2="${EPREFIX}/usr/bin/apxs" )
+					else
+						sapi_conf+=( --without-apxs2 )
+					fi
+					;;
+			esac
+		done
+
+		# Construct the $myeconfargs array by concatenating $our_conf
+		# (the common args) and $sapi_conf (the SAPI-specific args).
+		local myeconfargs=( "${our_conf[@]}" )
+		myeconfargs+=( "${sapi_conf[@]}" )
+
+		pushd "${BUILD_DIR}" > /dev/null || die
+		econf "${myeconfargs[@]}"
+		popd > /dev/null || die
+	done
+}
+
+src_compile() {
+	# snmp seems to run during src_compile, too (bug #324739)
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+	addpredict /var/lib/net-snmp/mib_indexes #nowarn
+
+	for sapi in ${SAPIS} ; do
+		if use "${sapi}"; then
+			cd "${WORKDIR}/sapis-build/$sapi" || \
+				die "Failed to change dir to ${WORKDIR}/sapis-build/$1"
+			emake
+		fi
+	done
+}
+
+src_install() {
+	# see bug #324739 for what happens when we don't have that
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+
+	# grab the first SAPI that got built and install common files from there
+	local first_sapi=""
+	for sapi in $SAPIS ; do
+		if use $sapi ; then
+			first_sapi=$sapi
+			break
+		fi
+	done
+
+	# Makefile forgets to create this before trying to write to it...
+	dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
+
+	# Install php environment (without any sapis)
+	cd "${WORKDIR}/sapis-build/$first_sapi" || die
+	emake INSTALL_ROOT="${D}" \
+		install-build install-headers install-programs
+
+	local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
+
+	# Create the directory where we'll put version-specific php scripts
+	keepdir "/usr/share/php${PHP_MV}"
+
+	local sapi="", file=""
+	local sapi_list=""
+
+	for sapi in ${SAPIS}; do
+		if use "${sapi}" ; then
+			einfo "Installing SAPI: ${sapi}"
+			cd "${WORKDIR}/sapis-build/${sapi}" || die
+
+			if [[ "${sapi}" == "apache2" ]] ; then
+				# We're specifically not using emake install-sapi as libtool
+				# may cause unnecessary relink failures (see bug #351266)
+				insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
+				newins ".libs/libphp5$(get_libname)" \
+					   "libphp${PHP_MV}$(get_libname)"
+				keepdir "/usr/$(get_libdir)/apache2/modules"
+			else
+				# needed each time, php_install_ini would reset it
+				local dest="${PHP_DESTDIR#${EPREFIX}}"
+				into "${dest}"
+				case "$sapi" in
+					cli)
+						source="sapi/cli/php"
+						;;
+					cgi)
+						source="sapi/cgi/php-cgi"
+						;;
+					fpm)
+						source="sapi/fpm/php-fpm"
+						;;
+					embed)
+						source="libs/libphp${PHP_MV}$(get_libname)"
+						;;
+					*)
+						die "unhandled sapi in src_install"
+						;;
+				esac
+
+				if [[ "${source}" == *"$(get_libname)" ]]; then
+					dolib.so "${source}"
+				else
+					dobin "${source}"
+					local name="$(basename ${source})"
+					dosym "${dest}/bin/${name}" "/usr/bin/${name}${SLOT}"
+				fi
+			fi
+
+			php_install_ini "${sapi}"
+
+			# construct correct SAPI string for php-config
+			# thanks to ferringb for the bash voodoo
+			if [[ "${sapi}" == "apache2" ]]; then
+				sapi_list="${sapi_list:+${sapi_list} }apache2handler"
+			else
+				sapi_list="${sapi_list:+${sapi_list} }${sapi}"
+			fi
+		fi
+	done
+
+	# Installing opcache module
+	if use opcache ; then
+		into "${PHP_DESTDIR#${EPREFIX}}"
+		dolib.so "modules/opcache$(get_libname)"
+	fi
+
+	# Install env.d files
+	newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}"
+	sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
+	sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
+
+	# set php-config variable correctly (bug #278439)
+	sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
+		"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" || die
+
+	if use fpm ; then
+		if use systemd; then
+			systemd_newunit "${FILESDIR}/php-fpm_at.service" \
+							"php-fpm@${SLOT}.service"
+		else
+			systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" \
+							"php-fpm@${SLOT}.service"
+		fi
+	fi
+}
+
+src_test() {
+	echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+	PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
+	if [[ ! -x "${PHP_BIN}" ]] ; then
+		ewarn "Test phase requires USE=cli, skipping"
+		return
+	else
+		export TEST_PHP_EXECUTABLE="${PHP_BIN}"
+	fi
+
+	if [[ -x "${WORKDIR}/sapis/cgi/php-cgi" ]] ; then
+		export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis/cgi/php-cgi"
+	fi
+
+	REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n  -d \
+					  "session.save_path=${T}" \
+					  "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d \
+					  "session.save_path=${T}"
+
+	for name in ${EXPECTED_TEST_FAILURES}; do
+		mv "${name}.out" "${name}.out.orig" 2>/dev/null || die
+	done
+
+	local failed="$(find -name '*.out')"
+	if [[ ${failed} != "" ]] ; then
+		ewarn "The following test cases failed unexpectedly:"
+		for name in ${failed}; do
+			ewarn "  ${name/.out/}"
+		done
+	else
+		einfo "No unexpected test failures, all fine"
+	fi
+
+	if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
+		local passed=""
+		for name in ${EXPECTED_TEST_FAILURES}; do
+			[[ -f "${name}.diff" ]] && continue
+			passed="${passed} ${name}"
+		done
+		if [[ ${passed} != "" ]] ; then
+			einfo "The following test cases passed unexpectedly:"
+			for name in ${passed}; do
+				ewarn "  ${passed}"
+			done
+		else
+			einfo "None of the known-to-fail tests passed, all fine"
+		fi
+	fi
+}
+
+pkg_postinst() {
+	# Output some general info to the user
+	if use apache2 ; then
+		elog
+		elog "To enable PHP in apache, you will need to add \"-D PHP\" to"
+		elog "your apache2 command. OpenRC users can append that string to"
+		elog "APACHE2_OPTS in /etc/conf.d/apache2."
+		elog
+		elog "The apache module configuration file 70_mod_php.conf is"
+		elog "provided (and maintained) by eselect-php."
+		elog
+	fi
+
+	# Create the symlinks for php
+	for m in ${SAPIS}; do
+		[[ ${m} == 'embed' ]] && continue;
+		if use $m ; then
+			local ci=$(eselect php show $m)
+			if [[ -z $ci ]]; then
+				eselect php set $m php${SLOT} || die
+				einfo "Switched ${m} to use php:${SLOT}"
+				einfo
+			elif [[ $ci != "php${SLOT}" ]] ; then
+				elog "To switch $m to use php:${SLOT}, run"
+				elog "    eselect php set $m php${SLOT}"
+				elog
+			fi
+		fi
+	done
+
+	# Remove dead symlinks for SAPIs that were just disabled. For
+	# example, if the user has the cgi SAPI enabled, then he has an
+	# eselect-php symlink for it. If he later reinstalls PHP with
+	# USE="-cgi", that symlink will break. This call to eselect is
+	# supposed to remove that dead link per bug 572436.
+	eselect php cleanup || die
+
+	if ! has "php${SLOT/./-}" ${PHP_TARGETS}; then
+	   elog "To build extensions for this version of PHP, you will need to"
+	   elog "add php${SLOT/./-} to your PHP_TARGETS USE_EXPAND variable."
+	   elog
+	fi
+
+	# Warn about the removal of PHP_INI_VERSION if the user has it set.
+	if [[ -n "${PHP_INI_VERSION}" ]]; then
+		ewarn 'The PHP_INI_VERSION variable has been phased out. You may'
+		ewarn 'remove it from your configuration at your convenience. See'
+		ewarn
+		ewarn '  https://bugs.gentoo.org/611214'
+		ewarn
+		ewarn 'for more information.'
+	fi
+
+	elog "For details on how version slotting works, please see"
+	elog "the wiki:"
+	elog
+	elog "  https://wiki.gentoo.org/wiki/PHP"
+	elog
+}
+
+pkg_postrm() {
+	# This serves two purposes. First, if we have just removed the last
+	# installed version of PHP, then this will remove any dead symlinks
+	# belonging to eselect-php. Second, if a user upgrades slots from
+	# (say) 5.6 to 7.0 and depcleans the old slot, then this will update
+	# his existing symlinks to point to the new 7.0 installation. The
+	# latter is bug 432962.
+	#
+	# Note: the eselect-php package may not be installed at this point,
+	# so we can't die() if this command fails.
+	eselect php cleanup
+}
diff --git a/dev-libs/pocl/Manifest b/dev-libs/pocl/Manifest
index 6c2e2a9..11d4f40 100644
--- a/dev-libs/pocl/Manifest
+++ b/dev-libs/pocl/Manifest
@@ -1,6 +1,8 @@
 AUX vendor_opencl_libs_location.epatch 1099 BLAKE2B bbef79afe947160f0a1ab2357206511176f02cd1c955399d029ba9641f6dfb6728294d601dbffb4162dc3071fd956ff53c5c4117dc4e094435bed64b5e0eb016 SHA512 8309619b6a232dab53f9fb40925f6925671a8a40754c7f8626a0edad69e84bcde7c4222513752aa6c7516cd9b65bb0164d816ac76d6c4254563b0f893fda7685
 DIST pocl-1.1.tar.gz 1545659 BLAKE2B cda94315724dbf22aa539c45a31ac32880ba905d49ecc1be1e08bb67cb87e417da2e1117146d344a6dcd4f3e5a90ade77992be1dd6c94fb7a8999f18cd3523ab SHA512 f785d1a8bbceab86ae220c0c78dc81fc292333ac30bc02cf627aca02d9efc9f659d97c26c227e7ba66fa56d8abdcb23df2d100e5bc4d5c670c48646edefa19af
 DIST pocl-1.2.tar.gz 1603374 BLAKE2B c08c532badc86afa7b8e87fd8adfc7a5959211e35726faf519ef1581ef45f9cd1640aa8719cd5fa8124309cee58d04bfd5fdf4d54528a785f559ddd348b45a4b SHA512 c765fe02f220f707d2e46edfb2782195dc987bd984aeb7f3d14dd767cd96944ffba85c7276415f7b4471de5d1a9c9a0d3ed4285c1c3955ef581aa935a5a0eaa0
+DIST pocl-1.4.tar.gz 1560972 BLAKE2B 7af82fa53a3f354961bec2a89ab3e23dee6ca02bf5497bc4fbeb84ffcda93683465a1a66e7f7d9c1b11ddf96fbe94bd82a8bf3774826fbddf7e02fdba34dd41f SHA512 ef4911638c76d988c120b69a991e54773a6b8bde49433c2e0f1703c374fa65a4fa64ebcaec94569863458032c17d8cb9879dc501b7e3a43b2c24524bce1b6098
 EBUILD pocl-1.1.ebuild 585 BLAKE2B 900ac15f1b8d7e66f34a7a30274e2ee5270cbe2230318bf700230320fac1712ac5b2a8c7c9674df97ef9ca55e8d73465d52affb3cbb08217eeb68209a52e9fd1 SHA512 f6b5f74b2b87185c926dbf5e87c779270604f65f7ec5271936f1bfbe7151f1bd8a42ebfe247ee78f0588eaa56ddc3df28ea2981dc7418189023c9c17f0e4a311
 EBUILD pocl-1.2.ebuild 731 BLAKE2B adc3ea7072da473a989f4e11c035dec3515a7c09f7f10ebefd737330e267cc06b516d3336588220a8308e4a75fea36b9116090d0b17f0449d5e001f41c1007c6 SHA512 d6d1d85a32b9cc1cf79f6a6f72c4346b13a8434238facbe2fa90b29807921073e778c3c7b3f430838c926a9a77a36d049d1c54bc6e740c114a0ce2a077e53bb5
+EBUILD pocl-1.4.ebuild 835 BLAKE2B 25ed43bcedff4cae53587b962f70c0b0e0481c4974a3a4b3a340d5b46d0631dd100cac1bf9dd31ac823fa554e41c6a01176aabac30c5afac10d9de33a9160b51 SHA512 3759df0e4dd8f708ebe38519268b8a820b1853c21c162dd02ad23068fc45233f68ff0975efdbae69d27959257656d0b264bea87632df2b738c70baa5c4212a78
 EBUILD pocl-9999.ebuild 941 BLAKE2B a24c0eec3145086c10595dedc5fdb509f47b7da0bd4710fa21b935907f09166eb923b06fcfabbb0ff07e785d3b9a6e8bdccf500f97082bc909e0543f94df5fe6 SHA512 d7a80b2b7685d505b66a6f4971a11c1321eac8c062112869d86fa426b4de4f1ce9e655227960362b6f2361bf6f6e46684722291113513514559c27d571bc76db
diff --git a/dev-libs/pocl/pocl-1.4.ebuild b/dev-libs/pocl/pocl-1.4.ebuild
new file mode 100644
index 0000000..1257feb
--- /dev/null
+++ b/dev-libs/pocl/pocl-1.4.ebuild
@@ -0,0 +1,37 @@
+EAPI="6"
+inherit cmake-utils cmake-multilib versionator
+
+DESCRIPTION="Portable Computing Language"
+HOMEPAGE="http://portablecl.org"
+
+PV_RC_SEPARATOR_FIXED=$(replace_version_separator '_' '-')
+PV_FILE_FORMAT=${PV_RC_SEPARATOR_FIXED^^}
+SRC_URI="https://github.com/pocl/pocl/archive/v${PV_FILE_FORMAT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${PV_FILE_FORMAT}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64"
+IUSE=""
+
+RDEPEND=">=sys-devel/llvm-6.0
+         sys-devel/clang
+         sys-apps/hwloc
+         "
+
+DEPEND="${RDEPEND}"
+
+PATCHES=("${FILESDIR}/vendor_opencl_libs_location.epatch"
+)
+
+
+src_configure() {
+        sed -i''  -e 's#typedef ptrdiff_t intptr_t#//typedef ptrdiff_t intptr_t#' include/pocl_types.h
+
+	local mycmakeargs=(
+            "-DENABLE_CUDA=ON"
+#	    "-DENABLE_HSA=ON"
+        )
+
+        cmake-multilib_src_configure
+}
diff --git a/dev-python/PyAutoGUI/Manifest b/dev-python/PyAutoGUI/Manifest
index a586c87..9255e7a 100644
--- a/dev-python/PyAutoGUI/Manifest
+++ b/dev-python/PyAutoGUI/Manifest
@@ -1 +1,3 @@
-EBUILD PyAutoGUI-0.9.31-r1.ebuild 551 SHA256 b691ee708286ef6fbff11a4eb68e1d54c415c9d85d8dfff1e3ba8722f5cfa470 SHA512 2b9c51b043d9d02cbc495d64cb56d58542db3dd18f18cf6934a59b2200d30ef5391f3b0bb999d4e1c6d6debceb350072ad2a65c8a9ad15ddcc49953219fc6207 WHIRLPOOL 54cd728acde7b05500490e55850f88f1d00aa4a05dd834af589563ee24d4206a57d1973690eb291639536d97c5a508ee60d0739f5684ded96ec40c3c726df3a8
+DIST PyAutoGUI-0.9.31.zip 55115 BLAKE2B a32d099ea10b77cd59e67c6fe36eb9e9909dfd372dc0d466e6d4c111072aff32fc8259534011b16fb1cb20de4568ebf7fda0808ddb53481fd3ba31ba9aa97714 SHA512 582ed1df331851302208ac1b9eae8653013031dd071b152975fd94a046b560eb58e7438e128fdd15a4067adc42788cb6753ca7ae0e9e1ea9ea0eeedd16c494ef
+EBUILD PyAutoGUI-0.9.31-r1.ebuild 545 BLAKE2B 16d653032074068926420a8c66b23d058f8500b91d4039da27aca3db551dd49cecfec457a396d7f0ac5cd333114813d4f1f22a186e26f03f3a83da763ca48f3c SHA512 f9f4ee736007284e86dc189f5ed4baa339ecfe96358c5e612f0cc3badcc3960ccc3c7bb38754707d4b58e8a79742e1148d53205a75c863e6b7b2c447884270af
+EBUILD PyAutoGUI-0.9.31-r2.ebuild 471 BLAKE2B 4e07e145d564afd780fe0fed28bc50f49a01d9965c40e3105d2ec6d582e23edbb4db4bb0082bc9b251edcd944b59135dfa596ec29b9988bc48052ea4d03d39b7 SHA512 afa46b8c62922b8a4d818490034f1ce10237acd3ae7a67577ce20aaede6a831d853b85d4b9d71f9e94d8fa5ee20fad207c050d940af60aff695bdbe4fdd24e61
diff --git a/dev-python/PyAutoGUI/PyAutoGUI-0.9.31-r1.ebuild b/dev-python/PyAutoGUI/PyAutoGUI-0.9.31-r1.ebuild
index 01d4112..ba1e70d 100644
--- a/dev-python/PyAutoGUI/PyAutoGUI-0.9.31-r1.ebuild
+++ b/dev-python/PyAutoGUI/PyAutoGUI-0.9.31-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=5
 
 REALNAME="PyAutoGUI"
 REALVERSION="0.9.31"
-REPO_URI="http://pypi.python.org/packages/source/${REALNAME:0:1}/${REALNAME}/"
+REPO_URI="https://pypi.org/packages/source/${REALNAME:0:1}/${REALNAME}/"
 SOURCEFILE="${REALNAME}-${REALVERSION}.zip"
 PYTHON_COMPAT=( python{2_7,2_7,2_7,3_3,3_4,3_5,3_3,3_3,3_4} )
 
diff --git a/dev-python/PyAutoGUI/PyAutoGUI-0.9.31-r2.ebuild b/dev-python/PyAutoGUI/PyAutoGUI-0.9.31-r2.ebuild
new file mode 100644
index 0000000..dd5bf06
--- /dev/null
+++ b/dev-python/PyAutoGUI/PyAutoGUI-0.9.31-r2.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_{1,2,3,4,5,6,7}} )
+
+inherit distutils-r1
+
+DESCRIPTION="A cross-platform module for GUI automation for human beings. Control the keyboard and mouse from a Python script."
+HOMEPAGE="https://github.com/asweigart/pyautogui"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
diff --git a/dev-python/PyMsgBox/Manifest b/dev-python/PyMsgBox/Manifest
index 7f2a663..a8da267 100644
--- a/dev-python/PyMsgBox/Manifest
+++ b/dev-python/PyMsgBox/Manifest
@@ -1 +1,3 @@
-EBUILD PyMsgBox-1.0.3-r1.ebuild 514 SHA256 689488cd70dbf026fbc2776cf436d8aefdcbc57caf7a3fb4540d556688b9763b SHA512 d98f5c8187e70b5ee9c71ed563d53f4806bb728c5fc4414799a364c8d4378968364224ad8b8a2db8649fcce96b42d9e6286f0270d9952547b2f47a0812de4bc4 WHIRLPOOL d7ab18bd5d558b080e6934e583dbd227a89b061596d9db335997e2f48a3fe3ae88f8213164138b7f9740149d6c019c126d2592082e9fa6a7c04142804e67afc0
+DIST PyMsgBox-1.0.3.zip 21516 BLAKE2B d539c02825f8ab318a3984bee2dce2951d94bc9c2ca039eb46771890d7515ed8aeeb65520008cde9be20af95a51dac7917d59f94790aa07867d3c76f9cc79fe9 SHA512 e8744dd45bb69b398fbf9a6358e23f796f469cf3748cbcbf9daeacd94e552c0969302ecfac4fe8f52c504d0b0b57f65db3b133ac0c2b048c7d784bebd7363e43
+EBUILD PyMsgBox-1.0.3-r1.ebuild 509 BLAKE2B c3764ce727db1da83ed34d3e8b2ca91185a3667ec889228c1553cfcecc0d20d67c3d1a8cd80ea9884b1f299b80f8adba81c9a123d38ae4e68216eae5872ff935 SHA512 f7ba77819dca8a83dbe1e58c10e5cc9d06fb645fa74d74f9d87fa9edcf726e31a769f6f4f6ba658308ab2e1164d0f8e72641499d1caf1b7a9a8c37113b4b2532
+EBUILD PyMsgBox-1.0.3-r2.ebuild 436 BLAKE2B a42e952d9a3be9bbdd869887d88fc0ea3ddf2dfc5a53a0183fb887de22dadafe2011d095e788bb547b1d60ad2b62be7379d882a5f5f330fbea81b7d106991085 SHA512 264510dfeec8351f3aeb0fa5c9b4ebd570bc763eddb6f1f5933ce14fb3e59b30d510d4cb5b30c175e1a1ad0676d36e409f795e1cf080c56ed9f4b21fbf7b9abe
diff --git a/dev-python/PyMsgBox/PyMsgBox-1.0.3-r1.ebuild b/dev-python/PyMsgBox/PyMsgBox-1.0.3-r1.ebuild
index e369ba0..5bbc5a9 100644
--- a/dev-python/PyMsgBox/PyMsgBox-1.0.3-r1.ebuild
+++ b/dev-python/PyMsgBox/PyMsgBox-1.0.3-r1.ebuild
@@ -5,8 +5,9 @@ EAPI=5
 
 REALNAME="PyMsgBox"
 REALVERSION="1.0.3"
-REPO_URI="http://pypi.python.org/packages/source/${REALNAME:0:1}/${REALNAME}/"
+REPO_URI="https://pypi.org/packages/source/${REALNAME:0:1}/${REALNAME}/"
 SOURCEFILE="${REALNAME}-${REALVERSION}.zip"
+
 PYTHON_COMPAT=( python{2_7,2_7,2_7,3_3,3_4,3_5,3_3,3_3,3_4} )
 
 inherit gs-pypi
diff --git a/dev-python/PyMsgBox/PyMsgBox-1.0.3-r2.ebuild b/dev-python/PyMsgBox/PyMsgBox-1.0.3-r2.ebuild
new file mode 100644
index 0000000..32d4fa3
--- /dev/null
+++ b/dev-python/PyMsgBox/PyMsgBox-1.0.3-r2.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_{1,2,3,4,5,6,7}} )
+
+inherit distutils-r1
+
+DESCRIPTION="A simple, cross-platform, pure Python module for JavaScript-like message boxes."
+HOMEPAGE="https://github.com/asweigart/PyMsgBox"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
diff --git a/dev-python/gnome-keyring-python/Manifest b/dev-python/gnome-keyring-python/Manifest
new file mode 100644
index 0000000..91e05db
--- /dev/null
+++ b/dev-python/gnome-keyring-python/Manifest
@@ -0,0 +1,3 @@
+DIST gnome-python-desktop-2.32.0.tar.bz2 621277 BLAKE2B a6ec5161eff68cbe9820a1ca1f31d39d9cd4c2e944564fe9ed36f06723bad8ec7525f488cdf6e5f9556ad42053e88e3cee3405146caf778df59aa639f0108099 SHA512 51beefd21fa3aa6242ba4c66e57d940372fbf4a84ffe34063339f6e7e7c22e76d281b25d5f113de3780a0dbf733c7e07142f05a285056cda26736323b4185d18
+EBUILD gnome-keyring-python-2.32.0-r1.ebuild 601 BLAKE2B 8709c303128c25ae049e2f85616b351069aff75ecc275fa00c29315fb7b9177de86234d7919028781774febe1186e5a9917e56797c1444a58937b079bff9c1f7 SHA512 03dcf5dda639267a3e627e6045958c7eaa6c4a54ece9869f7f638afcb1808ea2e72ff26fcc195b90ebd93e41b0c5579594e16355d0f5aa6c8c5ef67767148cf2
+MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-python/gnome-keyring-python/gnome-keyring-python-2.32.0-r1.ebuild b/dev-python/gnome-keyring-python/gnome-keyring-python-2.32.0-r1.ebuild
new file mode 100644
index 0000000..b70e208
--- /dev/null
+++ b/dev-python/gnome-keyring-python/gnome-keyring-python-2.32.0-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+GNOME_ORG_MODULE="gnome-python-desktop"
+G_PY_BINDINGS="gnomekeyring"
+PYTHON_COMPAT=( python2_7 )
+
+inherit gnome-python-common-r1
+
+DESCRIPTION="Python bindings for the interfacing with the GNOME keyring"
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd"
+IUSE="examples"
+
+RDEPEND=">=gnome-base/gnome-keyring-0.5.0
+	!<dev-python/gnome-python-desktop-2.22.0-r10"
+DEPEND="${RDEPEND}"
+
+EXAMPLES=( examples/keyring.py examples/keyring-async.py )
diff --git a/dev-python/gnome-keyring-python/metadata.xml b/dev-python/gnome-keyring-python/metadata.xml
new file mode 100644
index 0000000..3998080
--- /dev/null
+++ b/dev-python/gnome-keyring-python/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-util/decuda/Manifest b/dev-util/decuda/Manifest
deleted file mode 100644
index 7eab7f2..0000000
--- a/dev-util/decuda/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-AUX decuda-ds-setup.patch 2640 BLAKE2B f75a242ffae81bbef6efe3a6e357484b556dbd78f57ff32d5dbaf6271edad5d809d1450f13ae6f54b944032802e0d112f57b4709f3905fbde873c0e746f7cc23 SHA512 8f002344e46db4459146db57eb047cde5c2fb2e3c2a5a2ecb531bf3be9c78e4cd6ec7297290bfc441c06d87c7dcdab833954edf32355e7f3e8995e5e9309e275
-DIST decuda-0.4.2.tar.gz 143178 BLAKE2B 22017f908e6db1096a3c254acfb8c6cffa1bf883a3917486ef24b144bc3127dcf9a56f3b665177fc9888c2482e15ebd6e8cc8bf2ca78f1857ea45ba6dfd60b63 SHA512 db9a68d7896da89d65db81b5d2f0830270e87f93dffc2592d80003feaa6f04c13534f5adbf9a247bf7a8444e91bcc032c6b6c68fb73e37298e7c6ee142fb390f
-EBUILD decuda-0.4.2.ebuild 730 BLAKE2B dbf4b15e6ef661d3fcee4dbfb2e59d844538373d80aeb0f5d87cf4e372d00c0639bd4d6b1b691534bd4f51c6704dc3eaa83aea0678d189a2b1269b9d295b1631 SHA512 99508c2564353a25ed7b52248c730dbf305914d7932499fe15f8e56b6d0eacb5cd2c3d63a712c7da01bb99da5833f4b20566037b5c7cceca4f9dac32e72f20ec
diff --git a/dev-util/decuda/decuda-0.4.2.ebuild b/dev-util/decuda/decuda-0.4.2.ebuild
deleted file mode 100644
index 91bc3bb..0000000
--- a/dev-util/decuda/decuda-0.4.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpscorrelate/gpscorrelate-1.5.6.ebuild,v 1.3 2008/08/23 18:13:05 maekke Exp $
-
-inherit eutils
-
-MY_PV=${PV/_/-}
-
-DESCRIPTION="Assembler/Disassembler for NVIDIA CUDA binary (.cubin) format"
-HOMEPAGE="http://www.cs.rug.nl/~wladimir/decuda/"
-SRC_URI="http://www.cs.rug.nl/~wladimir/decuda/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-DEPEND="dev-lang/python"
-	
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-ds-setup.patch || die
-}
-
-src_install() {
-    python setup.py install --root="${D}" --no-compile
-    dobin cudasm decuda decudaraw
-}
diff --git a/dev-util/decuda/files/decuda-ds-setup.patch b/dev-util/decuda/files/decuda-ds-setup.patch
deleted file mode 100644
index 622bf5e..0000000
--- a/dev-util/decuda/files/decuda-ds-setup.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-diff -dPNur decuda-0.4.2/decuda decuda-0.4.2-ds/decuda
---- decuda-0.4.2/decuda	2007-12-02 18:57:04.000000000 +0100
-+++ decuda-0.4.2-ds/decuda	2008-11-27 18:18:35.000000000 +0100
-@@ -3,11 +3,12 @@
- # sm1_1 (G80) disassembler (decuda)
- # Wladimir J. van der Laan <laanwj@gmail.com>, 2007
- 
--from CubinFile import *
-+from Decuda.CubinFile import *
-+from Decuda.Formatter import AnsiFormatter
- from sys import stdout, stderr
- import sys, getopt
- 
--from version import VERSION
-+from Decuda.version import VERSION
- 
- def usage():
-     stdout.write("Decuda .cubin disassembler version %s\n" % VERSION)
-diff -dPNur decuda-0.4.2/decudaraw decuda-0.4.2-ds/decudaraw
---- decuda-0.4.2/decudaraw	2007-12-02 14:22:57.000000000 +0100
-+++ decuda-0.4.2-ds/decudaraw	2008-11-27 18:19:07.000000000 +0100
-@@ -2,8 +2,8 @@
- # sm1_1 (G80) disassembler (decuda)
- # Wladimir J. van der Laan <laanwj@gmail.com>, 2007
- 
--from Disass import *
--from CubinFile import *
-+from Decuda.Disass import *
-+from Decuda.CubinFile import *
- from sys import stdout, stderr
- import sys, getopt
- from array import array
-Files decuda-0.4.2/Util.pyc and decuda-0.4.2-ds/Util.pyc differ
-Files decuda-0.4.2/version.pyc and decuda-0.4.2-ds/version.pyc differ
-diff -dPNur decuda-0.4.2/setup.py decuda-0.4.2-ds/setup.py
---- decuda-0.4.2/setup.py	1970-01-01 01:00:00.000000000 +0100
-+++ decuda-0.4.2-ds/setup.py	2008-11-27 18:17:20.000000000 +0100
-@@ -0,0 +1,11 @@
-+from distutils.core import setup
-+
-+setup (name='Decuda',
-+      version='0.4.2',
-+      description='Assembler and disassembler for the NVIDIA CUDA binary (.cubin) format',
-+      author='Wladimir J. van der Laan',
-+      author_email='laanwj@gmail.com',
-+      url='http://www.cs.rug.nl/~wladimir/decuda/',
-+      packages=['Decuda'],
-+      package_dir={'Decuda': '.'},
-+)
-diff -dPNur decuda-0.4.2/cudasm decuda-0.4.2-ds/cudasm
---- decuda-0.4.2/cudasm	2007-12-02 18:57:04.000000000 +0100
-+++ decuda-0.4.2-ds/cudasm	2008-11-27 18:19:37.000000000 +0100
-@@ -3,12 +3,12 @@
- # sm1_1 (G80) disassembler (decuda)
- # Wladimir J. van der Laan <laanwj@gmail.com>, 2007
- 
--from Assembler import *
--from CubinFile import *
-+from Decuda.Assembler import *
-+from Decuda.CubinFile import *
- from sys import stdout, stderr
- import sys, getopt
- 
--from version import VERSION
-+from Decuda.version import VERSION
- 
- def usage():
-     stdout.write("Cudasm .cubin assembler version %s\n" % VERSION)
-diff -dPNur decuda-0.4.2/__init__.py decuda-0.4.2-ds/__init__.py
---- decuda-0.4.2/__init__.py	1970-01-01 01:00:00.000000000 +0100
-+++ decuda-0.4.2-ds/__init__.py	2008-11-27 22:20:05.000000000 +0100
-@@ -0,0 +1 @@
-+ 
-\ No newline at end of file
diff --git a/media-libs/libid3tag/Manifest b/media-libs/libid3tag/Manifest
index 9c59ebc..e787d46 100644
--- a/media-libs/libid3tag/Manifest
+++ b/media-libs/libid3tag/Manifest
@@ -1,14 +1,16 @@
 AUX 0.15.1b/libid3tag-0.15.1b-64bit-long.patch 567 BLAKE2B 1f1797d093abb56e87be3151f958d9bb06a9320cac1a441c0ebad6114d8e632e0da7ceede7ef6c218c95f4f3be8c7542e71a541f8fbaeaf358860b9fa01f17ab SHA512 f2c19dd5138d1cf58764dfb2acb58b4f36ad18749b0a29de9110f3bf81ae1c56c24701b4a906692863501c175fab81c44d486a94a7ee63ea67f552a68f14dcaa
-AUX 0.15.1b/libid3tag-0.15.1b-a_capella.patch 1365 BLAKE2B 84166df42a1620cf905a9b081a988e6737b3c7c77ad16e37294fb302260c788a63e10e8890dc1ea2022eb866f5474a80ae561025490e5ed8b15f4e4acb595e70 SHA512 496c624ad79bafb7255830bb4a9c638d837aa3d119435a1a7d16d138dad0626e9fcc50f1b6f3f7f03c346bd28e1da844be0c6e0ff38e850bf9852ad377fd0840
+AUX 0.15.1b/libid3tag-0.15.1b-a_capella.patch 1303 BLAKE2B 14ab259f31d2389735d35ecd138dac696368b35496c7de94513268fdbbaf3d9d56af74cd7dfcf2592bd14f5d1401c7a52e213851d24eb745d3e1904661b363e7 SHA512 a14fe71d32d620033afc73da9e4be3ecb1b88b750b96b5da960e3d323f0a45030e221d5a001ed9fbdb45d9072fa2f82946bae6a73a1e116355a88deada99435e
 AUX 0.15.1b/libid3tag-0.15.1b-compat.patch 452 BLAKE2B c43437ca0319e383e375cb7826f1afa61774f2fb3cb52136ad3a267ea17a4f6bb7532d82e0b354168464f16e69bb3e8a1ea8dd313f5895d9c2e5c8d6b928985f SHA512 91364db67a02106ebd0f8930f16adb25f078f707f95c695b0da6b42f1519e6aadd7cf181d19f2fea6454b3ed64d0388222f279bb1e5c802365b5d3faeb9f30c3
 AUX 0.15.1b/libid3tag-0.15.1b-file-write.patch 1344 BLAKE2B ba1e43314a4e286db21a6236929ef125294a1826724cf13a33c30a906a03dc2e6ec26acc66419c4007208ca8c99324178c3c932569e70c1cf699d7595c3b75ff SHA512 a24cd37eefd6dc282c71f59ea1f612c2347deb87a15bd6aa5c163a61cabe77a0cc882adabae35d5090c711f7f796fb6e3787968e506627336f0f0d4ad7957414
 AUX 0.15.1b/libid3tag-0.15.1b-fix_overflow.patch 324 BLAKE2B 229a97eb0c9d136a36a629185fde8541727d5fe5f4ecfb93c34fc8e0e70cd1024e0988d3f66f069e952d13040dfa13d1aa8b894b31b2b9dc92384a92d328548a SHA512 895d6a71540c8a60258e8900479bbce8f3eef67c9b0ff631130862778b3688568c5e363e0ba2a7b55a2e4a9109e22673eda69903e7bcaa77776de876cb09295b
 AUX 0.15.1b/libid3tag-0.15.1b-tag.patch 527 BLAKE2B 045268d964d4dddad836a1a8e2a75db9762d6fc442f95cc1155639979c120941876c35d31587378be69f0610449babb583ff41fd8d4f5c7e261a3b2ccee6590b SHA512 d610b108b896126ff721d1910e882ba06089aef1d3d8db60b6b76548b777f03962200fc5f046d96f1b655de4dff0a3031231f78094037c9506f7ad7798e01c8f
 AUX 0.15.1b/libid3tag-0.15.1b-unknown-encoding.patch 879 BLAKE2B 77541d2bc967a46a4557e614309f403ac8320fe1380117da21f99a9b80fb31b49fd06e6ba0234589102b26a733447ff17fe3a448e9400c7a904822354f7b5b97 SHA512 b5fab5bec89ac1d1180edae3871718170b442ec79ebde0536b50a70d6aba98761fd93fe79ebb81ee21a12643d5fb84085b7c7fd62c321284da1d61c48bd34809
-AUX 0.15.1b/libid3tag-0.15.1b-utf16.patchlibid3tag-0.15.1b-utf16.patch 753 BLAKE2B f40175f29ec3f890b835b4a648da6320cdb5fe0adf798312dc9b6c5849a91e67249d6b525b8be40b98e94e36be8504f79491aef0fec7817a87b8afb493d0cfa7 SHA512 d06dc1481b9dd4f541c3b94944a91a270a6c418612fb98eec3b71d04907d96f662fdcb678536dd584ee72e1451b04375969733e557c0eb00142f64affcb26697
+AUX 0.15.1b/libid3tag-0.15.1b-utf16.patchlibid3tag-0.15.1b-utf16.patch 583 BLAKE2B 1ce651271b297fb1aadf952549b44946ca15643b733abfe6573e898345748086b5db4641c52dea76b0d19b17ad86ddf67930ef265c1d43d93d641212c578356d SHA512 973d037f116dc9ac5d11895eb6043cbdb18c9d87165a20c4a1989fbcebdff067739d754b6233f41b8b6a88d9cf90848ef3ee22f1439e3ebdff0be6d6fc348a53
 AUX id3tag.pc 222 BLAKE2B ba92bbe9ffc85d906b845d81f5a2e8f3044f707fb3f11ddfe8e669d10dd5660262559d1c830b1655d6b416655ea6f7d3eca1296d50562bf932f3be21508ed1a4 SHA512 09a04b6ae35bacb91291ec432aab64c785ba43dae94f3c97f8cd2c4a91d27ed80cfd438703cd8a82472251b17a0929fc7dcc821ae33fd5820d2a2eb0864aa2b6
 AUX libid3tag-0.15.1b-ds-rcc.patch 7724 BLAKE2B 20b7793331828d8c96f79b98140c509c51dc7da32eba647ba4d8c26c8911345c1a5b470257a7e4d639514b15cedc9da01a5941dddeda695518838e15a5052596 SHA512 af4b716326b61b2bf43a7b8bf0b77927c46a56bfd12fd8829f9700d2ee3487ff6c826e83b33c5703f961520caf1899a0a8ef82e932350bfb4b0ef25c9b3dee4d
+AUX libid3tag-0.15.1b-fix-signature.patch 424 BLAKE2B f3dce1cb1372f175758b7c48b3ee3a6f1c95c840f7103116f9ea3ef805c5aa186c2c87747f02cb67fda1e4c13c806c5a0b32b304c2f66941fddac0942761b62e SHA512 3f320d1d8719afd84aa0cf2a9e5615f3f535f84d1987f12df0a9d3f2b7c02e2c87fbc3aa41d538cdc4f8a30e629de6f3fc3a4e79f23448fd39d4c0c438c803fb
 DIST libid3tag-0.15.1b.tar.gz 338143 BLAKE2B a4e4e66177eae9aaa251c71d605034488fdd9a0a207a41a41f85793ecbb763dd4a4c8f01183eb45a5c8563c4ad120e73b29578fd4c3bb8e467e39c5427b530b5 SHA512 ade7ce2a43c3646b4c9fdc642095174b9d4938b078b205cd40906d525acd17e87ad76064054a961f391edcba6495441450af2f68be69f116549ca666b069e6d3
 EBUILD libid3tag-0.15.1b-r1.ebuild 1183 BLAKE2B 8a4a260ddb5c01e22e31905cfc3651a98092ebc709ed03d7917fe42b9c95b709051de31028c93485f3f994a324ff7e0c3cc29c628a1bcddaec6dcc108623ece7 SHA512 badea955823e0fc32decd28ddb173a5c2fd1cea799a6c3dcd1c7d67644d268091fe2c13fb9d34cf6b3b951c53b0f4d0210074dd7d393b52180afb7d5c5ec8111
 EBUILD libid3tag-0.15.1b-r3.ebuild 1320 BLAKE2B b23f5636e68aa370d9fc8a625127f75d6fad18f7ae5339cfce9b696cbd0a761c1863b55a5c3e6923850133d7de329804e7173dfaf9eef55952cac71613431e6d SHA512 6380b53c7a0244cab28cae055bf2b1071157b819d1118d39001939214d83b435280414098ea6298375f67ac1fbff15b0270c1122576004f9e270f89c8d54ac13
 EBUILD libid3tag-0.15.1b-r4.ebuild 1354 BLAKE2B d790c247479e69264ccb1f4e0b295be818e712f397ed6f5677f5265f791d27e92b5f1069248e454d5211e555f0df6395f29297511a77ea8f8f4769b057229dbc SHA512 f48338a7766103172f5bd89fa03eb15de473110708edbde9ce67a388e33451038cccb80b5d9914966227c39ee476cdb5df7401812cb11fdc519ec5c5cd6d3b35
+EBUILD libid3tag-0.15.1b-r5.ebuild 1738 BLAKE2B c31c774bc230bedebd4edfe97a14781dffd005651adb9fd1434b15ee770db5778135ea572239cbdea58e371a6fa2d93415c77213e8229b67b151c6b7de54752b SHA512 c722a0e6bc9caef3ee85579ae7f93779d4eccb03756ca956075a7832bea9816de43e46f86f7e9bac5e64447fc9e2522bf30a35317d273c7ee5a0b703f958b1bb
diff --git a/media-libs/libid3tag/files/0.15.1b/libid3tag-0.15.1b-a_capella.patch b/media-libs/libid3tag/files/0.15.1b/libid3tag-0.15.1b-a_capella.patch
index a453080..2adc2e6 100644
--- a/media-libs/libid3tag/files/0.15.1b/libid3tag-0.15.1b-a_capella.patch
+++ b/media-libs/libid3tag/files/0.15.1b/libid3tag-0.15.1b-a_capella.patch
@@ -1,6 +1,6 @@
 diff -urNad /home/debian/mad/libid3tag-0.15.1b/libid3tag-0.15.1b/genre.dat libid3tag-0.15.1b/genre.dat
---- /home/debian/mad/libid3tag-0.15.1b/libid3tag-0.15.1b/genre.dat	2004-02-16 21:34:39.000000000 -0500
-+++ libid3tag-0.15.1b/genre.dat	2004-09-06 09:50:33.000000000 -0400
+--- a/libid3tag-0.15.1b/genre.dat	2004-02-16 21:34:39.000000000 -0500
++++ b/libid3tag-0.15.1b/genre.dat	2004-09-06 09:50:33.000000000 -0400
 @@ -277,8 +277,8 @@
    { 'P', 'u', 'n', 'k', ' ', 'R', 'o', 'c', 'k', 0 };
  static id3_ucs4_t const genre_DRUM_SOLO[] =
@@ -22,8 +22,8 @@ diff -urNad /home/debian/mad/libid3tag-0.15.1b/libid3tag-0.15.1b/genre.dat libid
    genre_DANCE_HALL,
    genre_GOA,
 diff -urNad /home/debian/mad/libid3tag-0.15.1b/libid3tag-0.15.1b/genre.dat.in libid3tag-0.15.1b/genre.dat.in
---- /home/debian/mad/libid3tag-0.15.1b/libid3tag-0.15.1b/genre.dat.in	2004-01-23 04:41:32.000000000 -0500
-+++ libid3tag-0.15.1b/genre.dat.in	2004-09-06 09:50:33.000000000 -0400
+--- a/libid3tag-0.15.1b/genre.dat.in	2004-01-23 04:41:32.000000000 -0500
++++ b/libid3tag-0.15.1b/genre.dat.in	2004-09-06 09:50:33.000000000 -0400
 @@ -153,7 +153,7 @@
  Duet
  Punk Rock
diff --git a/media-libs/libid3tag/files/0.15.1b/libid3tag-0.15.1b-utf16.patchlibid3tag-0.15.1b-utf16.patch b/media-libs/libid3tag/files/0.15.1b/libid3tag-0.15.1b-utf16.patchlibid3tag-0.15.1b-utf16.patch
index 72ed118..e2e6eae 100644
--- a/media-libs/libid3tag/files/0.15.1b/libid3tag-0.15.1b-utf16.patchlibid3tag-0.15.1b-utf16.patch
+++ b/media-libs/libid3tag/files/0.15.1b/libid3tag-0.15.1b-utf16.patchlibid3tag-0.15.1b-utf16.patch
@@ -1,6 +1,5 @@
-diff -urNad libid3tag-0.15.1b/utf16.c /tmp/dpep.tKvO7a/libid3tag-0.15.1b/utf16.c
---- libid3tag-0.15.1b/utf16.c	2006-01-13 15:26:29.000000000 +0100
-+++ /tmp/dpep.tKvO7a/libid3tag-0.15.1b/utf16.c	2006-01-13 15:27:19.000000000 +0100
+--- libid3tag-0.15.1b/utf16.c
++++ libid3tag-0.15.1b/utf16.c
 @@ -282,5 +282,18 @@
  
    free(utf16);
diff --git a/media-libs/libid3tag/files/libid3tag-0.15.1b-fix-signature.patch b/media-libs/libid3tag/files/libid3tag-0.15.1b-fix-signature.patch
new file mode 100644
index 0000000..a365811
--- /dev/null
+++ b/media-libs/libid3tag/files/libid3tag-0.15.1b-fix-signature.patch
@@ -0,0 +1,12 @@
+diff -pur libid3tag-0.15.1b-orig/compat.h libid3tag-0.15.1b/compat.h
+--- libid3tag-0.15.1b-orig/compat.h	2004-01-23 10:41:32.000000000 +0100
++++ libid3tag-0.15.1b/compat.h	2017-03-15 01:49:23.808834401 +0100
+@@ -34,7 +34,7 @@ struct id3_compat {
+ };
+ 
+ struct id3_compat const *id3_compat_lookup(register char const *,
+-					   register unsigned int);
++					   register size_t);
+ 
+ int id3_compat_fixup(struct id3_tag *);
+ 
diff --git a/media-libs/libid3tag/libid3tag-0.15.1b-r5.ebuild b/media-libs/libid3tag/libid3tag-0.15.1b-r5.ebuild
new file mode 100644
index 0000000..67269f9
--- /dev/null
+++ b/media-libs/libid3tag/libid3tag-0.15.1b-r5.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+# eutils for einstalldocs
+# SDS - autotools
+inherit epatch epunt-cxx eutils libtool ltprune multilib multilib-minimal autotools
+
+
+DESCRIPTION="The MAD id3tag library"
+HOMEPAGE="http://www.underbit.com/products/mad/"
+SRC_URI="mirror://sourceforge/mad/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="debug static-libs"
+
+RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-util/gperf"
+
+src_prepare() {
+	epunt_cxx #74489
+	epatch "${FILESDIR}/${PV}"/*.patch
+	# gperf 3.1 and newer generate code with a size_t length parameter,
+	# older versions are incompatible and take an unsigned int.
+	has_version '>=dev-util/gperf-3.1' && epatch "${FILESDIR}/${P}-fix-signature.patch"
+
+#SDS
+	epatch "${FILESDIR}"/libid3tag-0.15.1b-ds-rcc.patch || die
+	eautoreconf || die
+#EDS
+
+	elibtoolize #sane .so versionning on fbsd and .so -> .so.version symlink
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		$(use_enable static-libs static) \
+		$(use_enable debug debugging)
+}
+
+multilib_src_install() {
+	default
+
+	# This file must be updated with every version update
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins "${FILESDIR}"/id3tag.pc
+	sed -i \
+		-e "s:prefix=.*:prefix=${EPREFIX}/usr:" \
+		-e "s:libdir=\${exec_prefix}/lib:libdir=${EPREFIX}/usr/$(get_libdir):" \
+		-e "s:0.15.0b:${PV}:" \
+		"${ED}"/usr/$(get_libdir)/pkgconfig/id3tag.pc || die
+}
+
+multilib_src_install_all() {
+	prune_libtool_files --all
+	einstalldocs
+}
diff --git a/net-misc/rdesktop/Manifest b/net-misc/rdesktop/Manifest
index 8726967..62a1d1e 100644
--- a/net-misc/rdesktop/Manifest
+++ b/net-misc/rdesktop/Manifest
@@ -10,6 +10,8 @@ AUX rdesktop171-ds-xinerama.patch 5157 BLAKE2B c1d304a538e99cac4aa1daadf46e761d0
 DIST rdesktop-1.6.0.tar.gz 284728 BLAKE2B 94234707c67667204575fd5119e091aa15aa00f8887ccefa6dad95d52c0f51a9f770941ad9c1c2916024a8169d3575ffb9a4a247f07c0008407d86de24f76277 SHA512 ba7dcdeabdb85ce93b66e1a71d6c3aea7df244d9ed288aee79ea63680de2384ea313772eed2c6b861c53dd1564c8f8c6d6c5baf798fe9c405f3a17cf4f1b0756
 DIST rdesktop-1.7.1.tar.gz 298808 BLAKE2B 5fd1352fd190f11cfae9e95b9ee1f8cba30f37bd26d3484c1fa9b5af43f94e9e0e4713c2d98c979add8cdf0998b20e21e76b6de216c954f349cdfacf26516f03 SHA512 aaefbcda77a333ec065e42aa20e5335e48c51858dab860495528b399696c0ed6594ab9c5234716682e7ebef81d36cc6d157eedae700e0df209da9034d04887fc
 DIST rdesktop-1.8.3.tar.gz 320212 BLAKE2B daca0b78a8fcd0461f1c3251135bd980aaafacf8e0cd51ab731b576adb23006ec9f51858586e7e3a1a7f192b7830308e585984b4a31fb013748f8c6b3a8c47bb SHA512 06b94ad3b09430b05e424ef31a3e6f2388190b4920e348603cb66a414244896e0dc8906b9f12920e9406cf153ffa7f6507b23bf6713c3a675c0540a8ef57902d
+DIST rdesktop-1.9.0.tar.gz 368980 BLAKE2B c3545e1c0f8ff04adeb8f36e24684a0719a4d4bb0176491a1826b3c5c2976a96d96d773280ca5b27b936aa5f79957e7faec77be996048115d8f8c0a3f0cc0d6d SHA512 e101147b496ae70118c2756bf120007d4748aad9d9917d9ebc0878ffaf35764500861c548ef0528722777555c78e1d3d146b6f3691daa2b8657b0d3a541094f5
 EBUILD rdesktop-1.6.0-r2.ebuild 1954 BLAKE2B ab7b5fd6c2fb747d1b38c76bbb2bd3a88316619be97412f215c0b9a20205d7f5f57e6cc8a32460bfba5321665dc69f3bc64e11ab4086982db73732770f273707 SHA512 703d971ed4b02dde176d4bd4d23816f88cd09bd0d0d99463ffa7d6fe1c0f83b7ccb9716c6000657aa2b62b8dee69cba96ec931cc09339d66f8ea94961172faa1
 EBUILD rdesktop-1.7.1-r1.ebuild 2402 BLAKE2B 8b8edc1ea4ef2d9f4a2139e901ee6fbf4aaca8e5eeeeae5f1311257322a05081552e13670b8c06ce0e82b22c9f68a524b575d80c283c80c1e24f8191f3d7a191 SHA512 8c6731a4013a88a2fc1a16d7e5a68991cb0704854337488899ddc3e55e01a23e2b018cb6b0bc2fe69bb8e970e8adb0e98e0f204b2e56ea0d9ddd493b4291639b
 EBUILD rdesktop-1.8.3-r3.ebuild 1995 BLAKE2B 3be063e6b53de616c8f6b78892df3370242c23f0cc7b83fefab94c8b429c15afd378e0f1d70f12b86761ac2a2991d46e5fd4e6035d6ff61b6dc35ef2c2d731bd SHA512 d51758b3c53e163b0b9aa0b75e087de543a442a6136b96e2ab4b50a53002172148004061314c05a6c18d360ace20feca0f88b10a3e29ad8953133b5443dc93af
+EBUILD rdesktop-1.9.0.ebuild 2003 BLAKE2B a426fd444815129abbe6de703f6e1dd97314863d1ff00998c74ba76dde3332f30f6d14cf9242973a30cee92473cf87c3117a7aefd1247aa965e82e684b60c70a SHA512 7a412105cb7f4678b436a2c96e2c46ed9e9f55a3c5a0748496e9d8efef8be52f271a2d86015d677ff2dcd5f4334f9d6e99a2915a70b7dd89b6cc51e8566d7f31
diff --git a/net-misc/rdesktop/rdesktop-1.9.0.ebuild b/net-misc/rdesktop/rdesktop-1.9.0.ebuild
new file mode 100644
index 0000000..140cc89
--- /dev/null
+++ b/net-misc/rdesktop/rdesktop-1.9.0.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils
+
+MY_PV=${PV/_/-}
+
+DESCRIPTION="A Remote Desktop Protocol Client"
+HOMEPAGE="http://rdesktop.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="alsa ao debug ipv6 kerberos libressl libsamplerate oss pcsc-lite xrandr"
+
+S=${WORKDIR}/${PN}-${MY_PV}
+
+RDEPEND="
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:= )
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXau
+	x11-libs/libXdmcp
+	alsa? ( media-libs/alsa-lib )
+	ao? ( >=media-libs/libao-0.8.6 )
+	kerberos? ( net-libs/libgssglue )
+	libsamplerate? ( media-libs/libsamplerate )
+	pcsc-lite? ( >=sys-apps/pcsc-lite-1.6.6 )
+	xrandr? ( x11-libs/libXrandr )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	x11-libs/libXt"
+
+src_prepare() {
+	# Prevent automatic stripping
+	local strip="$(echo '$(STRIP) $(DESTDIR)$(bindir)/rdesktop')"
+	sed -i -e "s:${strip}::" Makefile.in \
+		|| die "sed failed in Makefile.in"
+
+	# Automagic dependencies
+	epatch "${FILESDIR}"/${PN}-1.6.0-sound_configure.patch
+	epatch "${FILESDIR}"/${PN}-1.8.3-xrandr_configure.patch
+
+#SDS
+#        epatch "${FILESDIR}"/rdesktop171-ds-xinerama.patch
+#EDS
+
+	epatch_user
+
+	eautoreconf
+}
+
+src_configure() {
+	if use ao; then
+		sound_conf=$(use_with ao sound libao)
+	else if use alsa; then
+			sound_conf=$(use_with alsa sound alsa)
+		else
+			sound_conf=$(use_with oss sound oss)
+		fi
+	fi
+
+	econf \
+		--with-openssl="${EPREFIX}"/usr \
+		$(use_with debug) \
+		$(use_with ipv6) \
+		$(use_with libsamplerate) \
+		$(use_with xrandr) \
+		$(use_enable kerberos credssp) \
+		$(use_enable pcsc-lite smartcard) \
+		${sound_conf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc doc/HACKING doc/TODO doc/keymapping.txt
+}
diff --git a/sci-geosciences/mkgmap/Manifest b/sci-geosciences/mkgmap/Manifest
index d14460c..cefbb77 100644
--- a/sci-geosciences/mkgmap/Manifest
+++ b/sci-geosciences/mkgmap/Manifest
@@ -1,2 +1,4 @@
 DIST mkgmap-r3620-src.tar.gz 1685777 BLAKE2B 5398b017f613b8296603d9577ad323583d750b655c820e69c48c81402d21265ebd094ebff2b4f6d33ba7f045e92ba4f238438a3fe0c9e8805c9c96f4fd9e1fc9 SHA512 1dfefb323fedb84cb39a316064c7f3d3c6b8c0a1616b7dfbee7cf7e8b6c4046a526f2460262a25d4f89750c6debe29051eaa01ba6ccd6478e61bc735d5890a75
-EBUILD mkgmap-3620.ebuild 1164 BLAKE2B 196b7be8967ac6be65c5a14de132273425b28dc37be34c865a80cccdcf75452ac135b9a532d876ae548bc9cc4ebce9247156b79e3123bdcb0deaabe9691b794a SHA512 89c9c4a3391ba1f53ab52e0adc494e7c090d67c9662ca3249c3352f1ef925431d132c5df705d7db3044609e56c9099368a0c2ebad7d3f4cc52776179c17d9af5
+DIST mkgmap-r4315-src.tar.gz 1774433 BLAKE2B b97081d80ab25db975681ad7ae28e5b896d65110c6e94e9c22882b621aa5d1b49fb296fa94a7f48c69ba42fd9906f2b3466335837d02386356b46a25e6d9e32f SHA512 14bbb47de50c9a0a9516a7c4fbeb752cf876a3fe63d1c56213d71ed6775e51cc210c24fe4a9bce993741da495a932483acbe875dd5ae70c9042bc927b01e622b
+EBUILD mkgmap-3620.ebuild 1162 BLAKE2B 63b1dc9eb6feb07c1eab0142586748f429bac57e82f02b3383cf8856107fb964993e798a10d918ae19489f3d036bd0dff990e678df750c88f3b17fac0ee2fcb1 SHA512 369ae5ead7eb2552987829fcaba80e2724ae1ec80a75b73038793dc2f4999691adcf31f4b760e56dad392277b29d9005d8417443cf8633f7d029762c132513fb
+EBUILD mkgmap-4315.ebuild 1164 BLAKE2B 96147183c8d2d79a75221ff8e0e6010a34d5c71baa0bb684e0ce2ef20f27744e2ce8df4ec6b0acb706f97c29f6b6355ecf01f08b2aa5ddfcb8d18170ce020962 SHA512 1cb10f1b31a18d78f4eda1fcab53de8e1ca861a8e7398a39af0e10834de6b36505a1605a7401495fa8e59216e952bbcb5f8431467307b66fa32007d8644f5f51
diff --git a/sci-geosciences/mkgmap/mkgmap-3620.ebuild b/sci-geosciences/mkgmap/mkgmap-3620.ebuild
index 31feb0e..653cd44 100644
--- a/sci-geosciences/mkgmap/mkgmap-3620.ebuild
+++ b/sci-geosciences/mkgmap/mkgmap-3620.ebuild
@@ -9,8 +9,7 @@ inherit java-pkg-2 java-ant-2
 
 DESCRIPTION="Tool to create garmin maps"
 HOMEPAGE="http://www.mkgmap.org.uk"
-SRC_URI="http://www.mkgmap.org.uk/snapshots/${PN}-r${PV}-src.tar.gz"
-
+SRC_URI="http://www.mkgmap.org.uk/download/${PN}-r${PV}-src.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
@@ -23,8 +22,8 @@ RDEPEND=">=virtual/jre-1.7"
 S="${WORKDIR}/${PN}-r${PV}"
 
 src_compile() {
-	JAVACFLAGS="-source 1.7 -target 1.7" eant dist || die
-	#JAVACFLAGS="-source 1.7 -target 1.7" ant -Dmaven.mode.offline=true -Dbuild.sysclasspath=ignore -Dmaven.test.skip=true dist
+	#JAVACFLAGS="-source 1.7 -target 1.7" eant dist || die
+	JAVACFLAGS="-source 1.7 -target 1.7" ant -Dmaven.mode.offline=true -Dbuild.sysclasspath=ignore -Dmaven.test.skip=true dist
 }
 
 src_install() {
diff --git a/sci-geosciences/mkgmap/mkgmap-4315.ebuild b/sci-geosciences/mkgmap/mkgmap-4315.ebuild
new file mode 100644
index 0000000..d7b8393
--- /dev/null
+++ b/sci-geosciences/mkgmap/mkgmap-4315.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mkgmap/mkgmap-1995.ebuild,v 1.1 2011/08/02 16:45:45 scarabeus Exp $
+
+EAPI=4
+
+JAVA_ANT_ENCODING=UTF-8
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Tool to create garmin maps"
+HOMEPAGE="http://www.mkgmap.org.uk"
+SRC_URI="http://www.mkgmap.org.uk/download/${PN}-r${PV}-src.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE=""
+DEPEND=">=virtual/jdk-1.7"
+#DEPEND=">=dev-java/fastutil-6.5.4"
+RDEPEND=">=virtual/jre-1.7"
+
+S="${WORKDIR}/${PN}-r${PV}"
+
+src_compile() {
+	JAVACFLAGS="-source 1.7 -target 1.7" eant dist || die
+	#JAVACFLAGS="-source 1.7 -target 1.7" ant -Dmaven.mode.offline=true -Dbuild.sysclasspath=ignore -Dmaven.test.skip=true dist
+}
+
+src_install() {
+	java-pkg_newjar "dist/${PN}.jar" || die "java-pkg_newjar failed"
+	java-pkg_dolauncher "${PN}" --jar "${PN}.jar" || die "java-pkg_dolauncher failed"
+
+	dodir /usr/share/${PN}/lib/lib/
+	java-pkg_jarinto /usr/share/${PN}/lib/lib/
+	java-pkg_dojar dist/lib/*.jar || die "java-pkg_dojar failed"
+
+	dodoc dist/README
+	doman dist/doc/mkgmap.1
+}
diff --git a/sys-apps/mkinitrd/Manifest b/sys-apps/mkinitrd/Manifest
index 5bb9abe..de889db 100644
--- a/sys-apps/mkinitrd/Manifest
+++ b/sys-apps/mkinitrd/Manifest
@@ -1,6 +1,7 @@
 AUX mdadm-ds-static.patch 666 BLAKE2B da10e2d68ec47dd47a9ca36496032ba79c2d492dec821db2b322a81fa7ac4969d05b3ab0892de615b7b865ede0731db9914768efbb62a8c11992e1a31c1e75df SHA512 ac2c5cac8bb65a634c6b55d5338d1353e5979b18bd27d2147d13df565d3cf021b4cf4755bf9d548ead0a8e779fd5e06792bfa7247e62fdd06b270eb2db542c49
 AUX mkinitrd-4.2.17-mdk.patch.bz2 21102 BLAKE2B 8528467febea22709bb02e415292528fd6785292b5595a0f4517dbf03d0fe487227d15ac7978804b2ddc2c08fda0dae083c0bc0c37681a532018227979c27dbf SHA512 659bbe3d2e15f3f59e3bb21d73b420c35c29c3e63e56c97faa15deeb6c3615005c3cc0e7577f7b8b44924499f8e8cb45492dd212422516ba6e52457feea13b73
 AUX mkinitrd-6.0.93-ds.diff 4274 BLAKE2B 33fd6f22fb45a58cdc83b67b81fc45ba1c724ee7d7619e5bf6f4fbe4c4da573aa41e0be54f0ba53c62f967bd0ed07b237a69ebe6d9c063743ed586539435c434 SHA512 dd9880bf594bfd131f0df94ebb904605cfdc4632ee19e552b051956bd4eefe3f7f2189234e03e49db3fcfe041ed6e8859173e71801cf411732a334b4394e8491
+AUX mkinitrd-6.0.93-ds2.diff 4039 BLAKE2B c8f54db7ec8f931cf34d516e193168901888bd8b0128d15f6286dd2e5f2a041153ca569ae055edce3ca4b2877d5c8e470cb47dd7ede11a99bc224cb62c984cde SHA512 c7442a1678e98234517d90084bede37e9fbc725932c09ab234b7390ba2e3417da6c43a2a6bc9982acf71d369f3a4aa27574f6f37ae6ddb2b0f43ae956b521e37
 AUX mkinitrd-ds-grubby_compile.patch 915 BLAKE2B 2a62f8ab88557eecbdfb1f15d6881cd62d3d2dc4aece72d4134d2c06d2207da52be6adbd4138b240c4cdbb8d7ec51b9d2fa32ffb72e156cd4bab9932de398d7b SHA512 1349b7774b92ef954ea3a3421f67261ccc4f660cfb1a9d7d51e6026feb9f551f8e4f315af59c55ea88c2effda0baa4cd21976e89c51fb9ef8e42f29324d62576
 AUX mkinitrd-ds-raid.patch 627 BLAKE2B ea2580e116f2a02b173bccbf00dba5b77dcaeb89b3ae4e89c2be433f2d626bf9ec6d6fa5f1816645a634cb733ed8e39b6f23ca113bf3b62ae136a463fc33c988 SHA512 742fac5f4e6ec84a1b65a429235c73997cf4eb9438ab7cce31027616b8a488a702e50004ad752de9404a6ff57528c72eaa4ad21e07bfce1deae812558db96d74
 AUX mkinitrd-ds-vitalsunion.diff 1724 BLAKE2B 2f1ba8d3d85fe5f8d992f74f479b6041f932fd48c19aadeb61fa1bd2dba3675f7487cdc6fb042b53e1ee3684ec50ae115a7d0b6d4f8a30060044abfba414d5dc SHA512 f212f5dfe69eaefaa0c1d2d9294203d64572a6bb8dce7f88ad2380f10b4141985a2acdee62301a1867cf24ac6eedf479adaf79790f0eb41e5335ff6af9f16e5c
@@ -13,4 +14,4 @@ DIST mdadm-2.1.tar.bz2 103201 BLAKE2B febcdb43e3e87cc92b60de232883f985480d9b972b
 DIST mkinitrd-4.2.17.tar.bz2 65568 BLAKE2B 576efc36c78fb2fd9840858fc44f7c40382c8e2132c13960ec7106f7165e84c3bd3c0846cb4f2583934eb37dcdfc7191eca6c1548f68ca0a06907226e4d400c8 SHA512 8bf3b65543cf167d8c5e74b058003322b3d0e23620a98714a7b819ebbab56e03d9213611fc1bf56a5063d10e3ef341f79e89e0af987db2ea80e71e5355febf49
 DIST mkinitrd-6.0.93.tar.bz2 124410 BLAKE2B 5b0877f1fac709db8561ff829aac29972a1efbf46b2c52430d744ad537827a7ed4e2c89a1d12ddc09188a91e9e70c7294a5781d460018eda7dbdba4ff3d891c0 SHA512 080019cffd561e00ca055528265fd30dd475e6fc82e0676ca153ab388aa2f731cd8929822d06fc6fec2f770eb1577e592e99b247e64985c4df6f3b8d4167b9e7
 EBUILD mkinitrd-4.2.17-r3.ebuild 1867 BLAKE2B a62466cca52f8ea329d775e772dd01bdf871ddb8ed33359902be4995876287921ec8311094ffba25e509e3b3c0f748fe58b714fdd4afd60ad7107f46d9c77031 SHA512 1300ac21a5dd0a4e9b667a81a70e28eff201011476b5ffc3616c17e3bc5e98576b9595bdde49782d91129c2a6541fb7957620f5d881faf25701f896cf09b051e
-EBUILD mkinitrd-6.0.93-r1.ebuild 1148 BLAKE2B b434b4acaa874553b9df83b347aa5f03b1f58d26fbcb75718612a5d80d3e8525a1294917822f4d9930df4e956504984bbd74f16e88229a57e76f5af6fd59fe1c SHA512 81e3b2868ba9782c275f24455211812d2ec40fbc210816caa83792105d14dad894fd15b3a45751d49ec78ae870c9a095d03aefa5fa0bfa41356f46e4306c4691
+EBUILD mkinitrd-6.0.93-r2.ebuild 1202 BLAKE2B 897e2fe4965bf9c46206e78014402b0a5c55205d2fa535c8a65a756502c84475b6d07727fc390477356b8624791c8b0b3119e8023857e9f0c3e5afed1faf8119 SHA512 0bc2b57d8246ca08f51869e2d0267fd116b06e5cf091c72613ac49a2d3239f8f31691b5178bab17276b08983b48413d6dd9069246c89f3b94fcfa02dfd1d16ee
diff --git a/sys-apps/mkinitrd/files/mkinitrd-6.0.93-ds2.diff b/sys-apps/mkinitrd/files/mkinitrd-6.0.93-ds2.diff
new file mode 100644
index 0000000..fa41433
--- /dev/null
+++ b/sys-apps/mkinitrd/files/mkinitrd-6.0.93-ds2.diff
@@ -0,0 +1,113 @@
+diff -dPNur mkinitrd-6.0.93-orig/bdevid/python/Makefile mkinitrd-6.0.93/bdevid/python/Makefile
+--- mkinitrd-6.0.93-orig/bdevid/python/Makefile	2019-10-25 20:25:33.733753651 +0200
++++ mkinitrd-6.0.93/bdevid/python/Makefile	2019-10-25 20:39:23.029000459 +0200
+@@ -25,7 +25,7 @@
+ include $(TOPDIR)/Makefile.inc
+ 
+ SITELIB := $(shell python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)[1:]")
+-PYVER := $(shell python -c "import sys; print sys.version[0:3]")
++PYVER := $(shell python2 -c "import sys; print (sys.version[0:3])")
+ CFLAGS += -I/usr/include/python$(PYVER)
+ CFLAGS += -I$(TOPDIR)/nash/include -I$(TOPDIR)/bdevid/include
+ LDFLAGS = -shared -L$(TOPDIR)/nash -L$(TOPDIR)/bdevid
+diff -dPNur mkinitrd-6.0.93-orig/bdevid/sysfs.c mkinitrd-6.0.93/bdevid/sysfs.c
+--- mkinitrd-6.0.93-orig/bdevid/sysfs.c	2009-09-02 10:41:45.000000000 +0200
++++ mkinitrd-6.0.93/bdevid/sysfs.c	2019-10-25 20:36:16.444012869 +0200
+@@ -30,6 +30,8 @@
+ #include <errno.h>
+ #include <unistd.h>
+ 
++#include <sys/sysmacros.h>
++
+ #include <nash.h>
+ 
+ #include "bdevid.h"
+diff -dPNur mkinitrd-6.0.93-orig/nash/block.c mkinitrd-6.0.93/nash/block.c
+--- mkinitrd-6.0.93-orig/nash/block.c	2019-10-25 20:25:31.293714823 +0200
++++ mkinitrd-6.0.93/nash/block.c	2019-10-25 20:34:13.839051611 +0200
+@@ -36,8 +36,8 @@
+ #include <envz.h>
+ 
+ #include <blkid/blkid.h>
+-
+ #include <linux/blkpg.h>
++#include <sys/sysmacros.h>
+ 
+ #include <nash.h>
+ #include "lib.h"
+diff -dPNur mkinitrd-6.0.93-orig/nash/devtree.c mkinitrd-6.0.93/nash/devtree.c
+--- mkinitrd-6.0.93-orig/nash/devtree.c	2019-10-25 20:25:32.020726392 +0200
++++ mkinitrd-6.0.93/nash/devtree.c	2019-10-25 20:34:54.382699987 +0200
+@@ -26,6 +26,7 @@
+ #include <string.h>
+ #include <errno.h>
+ #include <ctype.h>
++#include <sys/sysmacros.h>
+ 
+ #include <nash.h>
+ #include "list.h"
+diff -dPNur mkinitrd-6.0.93-orig/nash/dm.c mkinitrd-6.0.93/nash/dm.c
+--- mkinitrd-6.0.93-orig/nash/dm.c	2019-10-25 20:25:31.514718340 +0200
++++ mkinitrd-6.0.93/nash/dm.c	2019-10-25 20:33:20.023191276 +0200
+@@ -30,6 +30,7 @@
+ 
+ #include <libdevmapper.h>
+ #include <parted/parted.h>
++#include <sys/sysmacros.h>
+ 
+ #include <nash.h>
+ 
+diff -dPNur mkinitrd-6.0.93-orig/nash/Makefile mkinitrd-6.0.93/nash/Makefile
+--- mkinitrd-6.0.93-orig/nash/Makefile	2019-10-25 20:25:33.724753507 +0200
++++ mkinitrd-6.0.93/nash/Makefile	2019-10-25 20:29:45.448764596 +0200
+@@ -31,7 +31,7 @@
+ 
+ include ../Makefile.inc
+ 
+-CFLAGS += -I$(TOPDIR)/nash/include -I$(TOPDIR)/bdevid/include
++CFLAGS += -I$(TOPDIR)/nash/include -I$(TOPDIR)/bdevid/include -I/usr/include/tirpc
+ 
+ LDFLAGS += -Wl,-rpath-link,$(TOPDIR)/bdevid:$(TOPDIR)/nash
+ 
+@@ -39,6 +39,7 @@
+ nash_LIBS += -ldevmapper -lparted -lblkid
+ nash_LIBS += -luuid -lpopt -lresolv -ldl -lelf
+ nash_LIBS += -lm
++nash_LIBS += -ltirpc
+ # We need to link against libgcc_s directly, or it'll /dlopen() it during
+ # backtrace()!  This is not teh way!!!1!!!one!!!.
+ nash_LIBS += -lgcc_s
+diff -dPNur mkinitrd-6.0.93-orig/nash/nash.c mkinitrd-6.0.93/nash/nash.c
+--- mkinitrd-6.0.93-orig/nash/nash.c	2019-10-25 20:25:32.636736194 +0200
++++ mkinitrd-6.0.93/nash/nash.c	2019-10-25 20:28:32.810606074 +0200
+@@ -60,6 +60,7 @@
+ #include <argz.h>
+ #include <asm/unistd.h>
+ #include <linux/fs.h>
++#include <sys/sysmacros.h>
+ 
+ #include <libdevmapper.h>
+ 
+diff -dPNur mkinitrd-6.0.93-orig/nash/procdev.c mkinitrd-6.0.93/nash/procdev.c
+--- mkinitrd-6.0.93-orig/nash/procdev.c	2009-09-02 10:41:45.000000000 +0200
++++ mkinitrd-6.0.93/nash/procdev.c	2019-10-25 20:32:15.464159654 +0200
+@@ -20,6 +20,8 @@
+  */
+ 
+ #define _GNU_SOURCE 1
++#include <sys/sysmacros.h>
++
+ #include "lib.h"
+ 
+ static struct proc_dev_info proc_dev_info[] = {
+diff -dPNur mkinitrd-6.0.93-orig/nash/waitdev.c mkinitrd-6.0.93/nash/waitdev.c
+--- mkinitrd-6.0.93-orig/nash/waitdev.c	2019-10-25 20:25:32.637736210 +0200
++++ mkinitrd-6.0.93/nash/waitdev.c	2019-10-25 20:32:07.404030893 +0200
+@@ -27,6 +27,7 @@
+ #include <string.h>
+ #include <unistd.h>
+ #include <bdevid.h>
++#include <sys/sysmacros.h>
+ 
+ #include <nash.h>
+ #include "block.h"
diff --git a/sys-apps/mkinitrd/mkinitrd-6.0.93-r1.ebuild b/sys-apps/mkinitrd/mkinitrd-6.0.93-r2.ebuild
index 4498e66..2412cbd 100644
--- a/sys-apps/mkinitrd/mkinitrd-6.0.93-r1.ebuild
+++ b/sys-apps/mkinitrd/mkinitrd-6.0.93-r2.ebuild
@@ -30,6 +30,7 @@ src_unpack() {
 	done
 	epatch "${FILESDIR}"/mkinitrd-ds-vitalsunion.diff || die
 	epatch "${FILESDIR}"/mkinitrd-6.0.93-ds.diff || die
+	epatch "${FILESDIR}"/mkinitrd-6.0.93-ds2.diff || die
 	find . -name "Makefile*" -exec sed -i 's|-Werror||g' {} \;
 	sed -i -e 's|CFLAGS\s*[\?]=|CFLAGS +=|g' -e 's|LDFLAGS\s*[\?]=|LDFLAGS +=|g' Makefile.inc
 }
diff --git a/x11-terms/xterm/Manifest b/x11-terms/xterm/Manifest
index 373dad5..49869e4 100644
--- a/x11-terms/xterm/Manifest
+++ b/x11-terms/xterm/Manifest
@@ -18,4 +18,4 @@ AUX xterm-ds-sm.patch 3587 BLAKE2B cb6d5649617723e691650e31722bc74468dd25202f02e
 AUX xterm-ds-utf8mode.patch 476 BLAKE2B 5b17c0ac6da348bb1666bce8a83a3f1bc43a2fbc21ae596f8627b1cc4716b1c73d52113a993bc56fdcb4ff92546f00d9590a57d8c773c5ed530807f9cc746a7a SHA512 38f3de8f682bbf9adece113538eec5cfd4285a477c9c6d7c282dc71808ea39f641bf50ca97884ecb0d3c67e4ba1a86fc89a3f974f58cbceaf8a6f0277b7be5c0
 AUX xterm215-ds-copy.patch 1460 BLAKE2B 7b5e27479f4710c298ad347809c95cc561b2088d6addac7058e27a86123af0e3a05ac21884cea2f6fbac989e37f144d589b636e425aca205dee8d164aae358f7 SHA512 7030d834ae057cc2834cb919798ff5e45d6bebaaa2122c8b5620138cd67cf3d7c6baebaa6aba79904611bc9d373f76258a92d0b2939f24806ea9e6070ec12420
 DIST xterm-278.tgz 996716 BLAKE2B b51f0ef61fb80f2d00e5af925cd70411ad4160877dd64ece848f6fd105a0befea2932e3765f42454921191b66fb108bfebff8081bc8d935a2cc7b0c5ea6bc56b SHA512 4ddbf2003b54c2d2a082465d3ef160840dd1d27f253ba57c9c033477f6d005653093c506cd216072cf032e2ccb136de647b031a6999d8c5ccd5cfb641c50c994
-EBUILD xterm-278-r2.ebuild 3164 BLAKE2B 2542fd065957f5c143b1c8a6ffa78f0856441decf6fd7f0570ee29e7062cae0623be85d3e377e750216504d9bc6d8bad168aa80173d4169645d19b5ae514fa3c SHA512 50b0c94cd0fc184853a4f0d3920fbe50234c8268710e7191abe0e04ad4f2c39f782ddd62812ffac90ecea151dc59e27410ec0cb5046cdb39bd33fee52464314d
+EBUILD xterm-278-r2.ebuild 3168 BLAKE2B 1586b9a5fffb620e250936299796260a54ea869c2ee6c14feac6ce9ed3b927411d395bdd3540d15e7cb071ada803d2c057445d2017fedd87a2d57dfba80d2b31 SHA512 673852242ec522641e7379786a8a0743f24ed35dd63ba0c2581e68aaf9892675643bae5df0f3b2f67477f33df0be7b1289c70213ffbd15a05857599ec8b753c5
diff --git a/x11-terms/xterm/xterm-278-r2.ebuild b/x11-terms/xterm/xterm-278-r2.ebuild
index 6409683..1c0f721 100644
--- a/x11-terms/xterm/xterm-278-r2.ebuild
+++ b/x11-terms/xterm/xterm-278-r2.ebuild
@@ -7,7 +7,7 @@ inherit eutils multilib
 
 DESCRIPTION="Terminal Emulator for X Windows"
 HOMEPAGE="http://dickey.his.com/xterm/"
-SRC_URI="ftp://invisible-island.net/${PN}/${P}.tgz"
+SRC_URI="ftp://ftp.invisible-island.net/${PN}/${P}.tgz"
 
 LICENSE="MIT"
 SLOT="0"
author	Suren A. Chilingaryan <csa@suren.me>	2019-10-25 23:16:40 +0200
committer	Suren A. Chilingaryan <csa@suren.me>	2019-10-25 23:16:40 +0200
commit	b6d14cb5db40c2c8f80450b9ac2288d71b49ad68 (patch)
tree	b181bb0859681f93ec19f3d568e2c0dd23d18211
parent	dd2aea324c07fe1bd13143bb37eff11117b6130a (diff)
download	darklin4-b6d14cb5db40c2c8f80450b9ac2288d71b49ad68.tar.gz darklin4-b6d14cb5db40c2c8f80450b9ac2288d71b49ad68.tar.bz2 darklin4-b6d14cb5db40c2c8f80450b9ac2288d71b49ad68.tar.xz darklin4-b6d14cb5db40c2c8f80450b9ac2288d71b49ad68.zip