gentoo resync : 29.08.2018

14 files changed, 95 insertions, 37 deletions

diff --git a/net-nds/Manifest.gz b/net-nds/Manifest.gz
index 384003575716..78e1be60d204 100644
--- a/net-nds/Manifest.gz
+++ b/net-nds/Manifest.gz
diff --git a/net-nds/nsscache/Manifest b/net-nds/nsscache/Manifest
index 8f0506ff205e..ed49647e2e42 100644
--- a/net-nds/nsscache/Manifest
+++ b/net-nds/nsscache/Manifest
@@ -3,8 +3,8 @@ DIST nsscache-0.30-r3-gentoo-authorized-keys-command.py 11974 BLAKE2B 4272bab8d8
 DIST nsscache-0.30.tar.gz 109615 BLAKE2B 1b67da7241a974a541514849643115d8e6dd0e587dbd39e1919eaca5064b6fde79678c3443246444d1b8c75c4455ad008231ee1f1a6b74511d9a38e742be2c6e SHA512 22c58904eadd2e69405c42263c1c85c7b612151466386870fbea7685ab32835250a84f1acd83fca6f3289582c74df5371cbfb4f354679a302f240fd0ff334712
 DIST nsscache-0.31.tar.gz 108073 BLAKE2B c730786e4a273d039273f104d1458587741c5bc8b2e470d12a551765f3141aafb33df811feca432b493415e20c9abb07244b9c624e38053b95c15c5e41ba8303 SHA512 1be90b0217605f86d2effc6063a805fb604f535386cc9f2eb8b0244ab1293521fd1342f52e3fad98c7d95cf66db3dabf93747bf40ce5ed2bf70c8c07382001a4
 DIST nsscache-0.32.tar.gz 112333 BLAKE2B ac477eef53e8e9d8cdcc7a0d7b460046883aaba8836ec5d49f449aae0d4f0ea34cd10f89a98849a18e0a0b1b5d1eb4f4c99a138d6eb2bc6bc608a1cc33c28ac2 SHA512 c35f539ea017a328c1630031b7934c231b256d3f2198c6764954c42f36ed281432ff97667e5754692971b4f24be38887406f98718d5f49d364e1e3eebb32185f
-EBUILD nsscache-0.30-r2.ebuild 1293 BLAKE2B 950cd9ce22f6a0bee22fdfdfa78c45ab0316076a95e5905dea0f865f2b18932639a4ef5f0c4b1658f53ae7830aaf8f6e20bf93c5d0b29d4c6863c1764b79fb48 SHA512 918d608614d6a8860216edebc331b5510b38a52b67f972e8328ae18d054e42fcf4bbb6951c772a9b86a38db7e2b1ed332ec9a2eafa044931e381691de05ce1dc
-EBUILD nsscache-0.30.ebuild 1068 BLAKE2B 21cde7b80e28b50276fd561a2692912c4cd386d05dcf84aa92f615ee3b8c47f70e44c2332c837be3081fadebaca73e4e076cc389624dc170e52576708f48abdf SHA512 b5f7fdb4918671307863914ee2f7fca13bbbd1a76f3c821a412875b8944ba4fc40f9baa1949f76f688e56ce07f034257b518fba91378d69c5ae3d8bf22320ff4
-EBUILD nsscache-0.31.ebuild 1285 BLAKE2B df4a6f98e981b734f604fb6a5ba3ee9a4dbfd73f4fa19574efcb73e13e2a0c012c63f3709acd7787198bbf3792e46ffe5eac7a3bf961c2a24ce69f20980bb013 SHA512 b9ffe94822a25d39afc5e4e00c2dd1069507cffd93bfd14966284efa57b41ae3cc3eb3df9afb4d56023b096b2d7151601b17870aeb4c7235b00e6fbf5f08ce6d
-EBUILD nsscache-0.32.ebuild 1285 BLAKE2B df4a6f98e981b734f604fb6a5ba3ee9a4dbfd73f4fa19574efcb73e13e2a0c012c63f3709acd7787198bbf3792e46ffe5eac7a3bf961c2a24ce69f20980bb013 SHA512 b9ffe94822a25d39afc5e4e00c2dd1069507cffd93bfd14966284efa57b41ae3cc3eb3df9afb4d56023b096b2d7151601b17870aeb4c7235b00e6fbf5f08ce6d
-MISC metadata.xml 475 BLAKE2B 4e6fc0107678b38ea898e33ab9efb8048bfb2cfcb6b0f38188d5bbfb03dabda9c03e813fae12605de150c11a8145d78f80fcf2f36b5cfff3b1e304a105153736 SHA512 f4f569f764667a087ddad7c638eea619050ea4e40d5c5c60cef63bd02c85dd2095950295aa0b7a643f3694fa4b1bf5fdd351e8819a1d60b234c4bbfb447a192c
+EBUILD nsscache-0.30-r2.ebuild 1258 BLAKE2B bc58fdd5f12687ed17e2966d3a2480285c451b34b7152d6d769b6a3781b1270f9dc37d914c2d6c0c888f0520de26e9566b1524bf334d1671437f5de4c6f91c5f SHA512 3572ebb5a3f386e3b518ee8de4615e825f9a475a8cfc80e5075d3094580d4006c9c86b84dd8cc1d4ef3e2481eb73a0f07b8b380e1f4b30eb4b73b222905425d9
+EBUILD nsscache-0.30.ebuild 984 BLAKE2B f56a5d51be382f98abbc8db71de294d0227d7759e9ce9e288b356f41561c27d78bfb2c8a5487a7071cc3f893b8c51e776aed451116bdb28d2657a7001b0ab036 SHA512 e543dab6c1d1b79af6a19156eecf54f257e428798e002b349a6e0870253c3f326b78ad62d75ac086a40370172c8296fb72e0e52b3bd541c5c746a5bc67b53cb0
+EBUILD nsscache-0.31.ebuild 1250 BLAKE2B dac8feb0ae93798a2c6bd82491180ffdaf0185b7197fa271ccd48e2465eb7c3bdc6e1a6aced484736aa4ea1fde4ec947938736062825d10e32f999633daeea46 SHA512 97941a27a899a81330cd9ebaabe99f7c1c39c772cf8407171e9f6f743516e2da66bf9fa5efd363e62746f86f3fc7540f1729130fd8ae116025a708885748cca5
+EBUILD nsscache-0.32.ebuild 1250 BLAKE2B dac8feb0ae93798a2c6bd82491180ffdaf0185b7197fa271ccd48e2465eb7c3bdc6e1a6aced484736aa4ea1fde4ec947938736062825d10e32f999633daeea46 SHA512 97941a27a899a81330cd9ebaabe99f7c1c39c772cf8407171e9f6f743516e2da66bf9fa5efd363e62746f86f3fc7540f1729130fd8ae116025a708885748cca5
+MISC metadata.xml 397 BLAKE2B 98c367dda996085fb5d6edf8f398dc38d1210f1f475c89d953897cdb9c50c9ac10450f5ede28b6d24fe8f03cea5ed2e72aaac5c2a9b6959fb7b201692c91b0e0 SHA512 b75dde399e707628f36e0e711acd8fd2739afa735f41fd98e2fa47dc1cf4ba5e3b36a118dd8cf15ac456114d3d3cfcc601149145938e6033179a2bbd738ed6b1
diff --git a/net-nds/nsscache/metadata.xml b/net-nds/nsscache/metadata.xml
index 90ba820d293c..2391c0ec85c5 100644
--- a/net-nds/nsscache/metadata.xml
+++ b/net-nds/nsscache/metadata.xml
@@ -5,7 +5,6 @@
 		<email>robbat2@gentoo.org</email>
 	</maintainer>
 	<use>
-		<flag name="nssdb">Depend on sys-libs/libnss_db to handle dbm files.</flag>
 		<flag name="nsscache">Depend on sys-auth/libnss-cache to handle flat files</flag>
 	</use>
 	<upstream>
diff --git a/net-nds/nsscache/nsscache-0.30-r2.ebuild b/net-nds/nsscache/nsscache-0.30-r2.ebuild
index cdcb4c2d78e9..522bf5454392 100644
--- a/net-nds/nsscache/nsscache-0.30-r2.ebuild
+++ b/net-nds/nsscache/nsscache-0.30-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -16,14 +16,13 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-IUSE="nssdb nsscache"
+IUSE="nsscache"
 
 DEPEND="${PYTHON_DEPS}
 		dev-python/python-ldap[${PYTHON_USEDEP}]
 		dev-python/pycurl[${PYTHON_USEDEP}]
 		dev-python/bsddb3[${PYTHON_USEDEP}]"
 RDEPEND="${DEPEND}
-		nssdb? ( sys-libs/nss-db )
 		nsscache? ( >=sys-auth/libnss-cache-0.10 )"
 RESTRICT="test"
 S="${WORKDIR}/${PN}-version-${PV}"
diff --git a/net-nds/nsscache/nsscache-0.30.ebuild b/net-nds/nsscache/nsscache-0.30.ebuild
index f8d2a3f20ccd..822766f671c9 100644
--- a/net-nds/nsscache/nsscache-0.30.ebuild
+++ b/net-nds/nsscache/nsscache-0.30.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,14 +14,12 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-IUSE="nssdb nsscache"
+IUSE="nsscache"
 
 DEPEND="${PYTHON_DEPS}
 		dev-python/python-ldap[${PYTHON_USEDEP}]
-		dev-python/pycurl[${PYTHON_USEDEP}]
-		nssdb? ( dev-python/bsddb3[${PYTHON_USEDEP}] )"
+		dev-python/pycurl[${PYTHON_USEDEP}]"
 RDEPEND="${DEPEND}
-		nssdb? ( sys-libs/nss-db )
 		nsscache? ( >=sys-auth/libnss-cache-0.10 )"
 RESTRICT="test"
 S="${WORKDIR}/${PN}-version-${PV}"
diff --git a/net-nds/nsscache/nsscache-0.31.ebuild b/net-nds/nsscache/nsscache-0.31.ebuild
index b16d07c4ca6c..a62723e48c66 100644
--- a/net-nds/nsscache/nsscache-0.31.ebuild
+++ b/net-nds/nsscache/nsscache-0.31.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -17,14 +17,13 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-IUSE="nssdb nsscache"
+IUSE="nsscache"
 
 DEPEND="${PYTHON_DEPS}
 		dev-python/python-ldap[${PYTHON_USEDEP}]
 		dev-python/pycurl[${PYTHON_USEDEP}]
 		dev-python/bsddb3[${PYTHON_USEDEP}]"
 RDEPEND="${DEPEND}
-		nssdb? ( sys-libs/nss-db )
 		nsscache? ( >=sys-auth/libnss-cache-0.10 )"
 RESTRICT="test"
 S="${WORKDIR}/${PN}-version-${PV}"
diff --git a/net-nds/nsscache/nsscache-0.32.ebuild b/net-nds/nsscache/nsscache-0.32.ebuild
index b16d07c4ca6c..a62723e48c66 100644
--- a/net-nds/nsscache/nsscache-0.32.ebuild
+++ b/net-nds/nsscache/nsscache-0.32.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -17,14 +17,13 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-IUSE="nssdb nsscache"
+IUSE="nsscache"
 
 DEPEND="${PYTHON_DEPS}
 		dev-python/python-ldap[${PYTHON_USEDEP}]
 		dev-python/pycurl[${PYTHON_USEDEP}]
 		dev-python/bsddb3[${PYTHON_USEDEP}]"
 RDEPEND="${DEPEND}
-		nssdb? ( sys-libs/nss-db )
 		nsscache? ( >=sys-auth/libnss-cache-0.10 )"
 RESTRICT="test"
 S="${WORKDIR}/${PN}-version-${PV}"
diff --git a/net-nds/phpldapadmin/Manifest b/net-nds/phpldapadmin/Manifest
index 78557eabdb46..48241bc07797 100644
--- a/net-nds/phpldapadmin/Manifest
+++ b/net-nds/phpldapadmin/Manifest
@@ -2,6 +2,6 @@ AUX phpldapadmin-1.2.1.1-fix-magic-quotes.patch 829 BLAKE2B 833f2d7b8934b9547ce2
 AUX phpldapadmin-fix-php5.5-support.patch 5157 BLAKE2B 03bd6922b201445be6aba3695e8a162a1716b234d0f314f221dbbd6bdd6c731ec01b7f0c84821c29d6f2ab6f45a6b68c5d5dabe11a649fc26d648f020a74d184 SHA512 c0f990fea6e8f312d36f7eea754d3f4f1c2356a5e233c5df82fa1ce4b194d160ad40ce2ef85441f6686feecffae831770591e44cc67982bee63e870464da7f7b
 AUX postinstall2-en.txt 131 BLAKE2B 7ace4170aa9f57f1eb89319f11cee249be8bbec50dad798c0be22616d31a01a3cfeb6057485c8656318c0330c3d9b4ffb1d343978742618edfc6bbf9789807e8 SHA512 f465adc204ef40675848e39e37bab3f2eb5054549e3b787953793ece683df84a52373d23383601b3c53c6b98bf8f1de83c6d83be117be9c00da7058763709d6b
 DIST phpldapadmin-1.2.3.tgz 1115707 BLAKE2B 85f11713134f7af65a40cb2cab619590bdea9dfc23d2bfdec0b0837772f166f5b8cd61125b753167726abf109a5e5ac8607dc75a750299c61f895638c2d3b98a SHA512 58a57ca577586685ebd0d7fde7e299b8945d1693018c7803e19239b79f4b9d72a4d207d53c9f284268e32398108038efafcdb434e634619bfe87db3524d267b6
-EBUILD phpldapadmin-1.2.3-r1.ebuild 1388 BLAKE2B db30080ba78316d2e42af5a48b0309ce53f322b0bd60df92de55a382c832d386a2fdf68f76831ad6197edaf9bec25cd9ba2fedc962c0cd558dba9a1b14263833 SHA512 794749faa522e41d2b50413528a04673c8678a236e90c723c1d11c9ea51d2da2a0e493516f11a817ab09faa002b9bf78bce597984a178fa837c7bec53f69e4d9
-EBUILD phpldapadmin-1.2.3.ebuild 1145 BLAKE2B 18ffaf6a510d5d82b3b2f978793a0b3c5cd58415e57d2cf763ffd3bf03d8f02443f492685304883f7dbbccb2d53188f56d050e8fc61bed401951516e27ad2d7c SHA512 f7a55503c5dba3e6e35b9110d4323a0d39d17920280902316742852670fbae567d8fa1a9ea8b93fc78fe62b92eb9c070b11d1d296535536b42cfea91d50cf248
+EBUILD phpldapadmin-1.2.3-r1.ebuild 1355 BLAKE2B 0eb44b95e94244b5ae785c5ea7428068af025d439e56a96658f87897e3a1da2b90380c52787e764bc68fbb0f5e42e007c0d51739b15bdb8d5cc41b2df936588e SHA512 70d01949439b7d4374b247be934fb66ad78bd898e119932166dc9ebe0aa6a705ff36709098a4ce3bfae3bea6ddaa4bc17344c073c8aaf84483297ade272394c8
+EBUILD phpldapadmin-1.2.3.ebuild 1112 BLAKE2B 9e749edddaa9927317709e507eb8669434f119239f8c0b0e3101718e44312e2ed40416d9602389be179185f349bc7944409fe54950cae7346abb121fe76e9791 SHA512 08f6c6fb6bdbad3dc80b36d4544a7ff1aa2a49f1ef884287787b71f33afbf53569f035f0d92370e2541eac1e5c95cecd37797f9788eae2e0ebb695ab60ea7589
 MISC metadata.xml 593 BLAKE2B fbf89c9834ec8fc07ec9512ee6e3aa3fa13c9665f82a7e773b61ba974132badda5f5c7abccd2c2c63047b9e6e7d237a404b3c0c04d7fbd43a65d2612ce7ec6b7 SHA512 76e19473a162674546562e71b893a1f4a076bae09998b7ad4136421d60c33b2c64ae32fd2d618128417b56437fc6ed1ae823f4642c8c4facd81a36e72a2451b3
diff --git a/net-nds/phpldapadmin/phpldapadmin-1.2.3-r1.ebuild b/net-nds/phpldapadmin/phpldapadmin-1.2.3-r1.ebuild
index 075a0159c130..786fde03497b 100644
--- a/net-nds/phpldapadmin/phpldapadmin-1.2.3-r1.ebuild
+++ b/net-nds/phpldapadmin/phpldapadmin-1.2.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,7 +14,7 @@ KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
 IUSE=""
 
 RDEPEND="dev-lang/php[hash,ldap,session,xml,nls]
-		 || ( <dev-lang/php-5.3[pcre] >=dev-lang/php-5.3 )
+	>=dev-lang/php-5.3
 	virtual/httpd-php"
 
 need_httpd_cgi
diff --git a/net-nds/phpldapadmin/phpldapadmin-1.2.3.ebuild b/net-nds/phpldapadmin/phpldapadmin-1.2.3.ebuild
index 47ff7bff30dc..4dcabc71b146 100644
--- a/net-nds/phpldapadmin/phpldapadmin-1.2.3.ebuild
+++ b/net-nds/phpldapadmin/phpldapadmin-1.2.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,7 +14,7 @@ KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
 IUSE=""
 
 RDEPEND="dev-lang/php[hash,ldap,session,xml,nls]
-		 || ( <dev-lang/php-5.3[pcre] >=dev-lang/php-5.3 )
+	>=dev-lang/php-5.3
 	virtual/httpd-php"
 
 need_httpd_cgi
diff --git a/net-nds/rpcbind/Manifest b/net-nds/rpcbind/Manifest
index ce880c92534f..1abe54e4c414 100644
--- a/net-nds/rpcbind/Manifest
+++ b/net-nds/rpcbind/Manifest
@@ -2,6 +2,8 @@ AUX rpcbind-0.2.4-CVE-2017-8779.patch 646 BLAKE2B 648010974bfc732f39ad0eaea6a6f5
 AUX rpcbind.confd 68 BLAKE2B 2309602d38fd5119fc5e6c123ca9da7a6f86526a0dddad12e1be24a7af9724b5d1b389cf44299722fb4af7932b26fc2a62996bb815cebd258e56a3248e63b393 SHA512 f11f6785708bde3ace7b55c1585e283ed07078faf310077c3d26e8e584baec6152d3f86f3d99d7a34fd10f22a7de4d8d70568c9e7f914a82eeb786b08b379044
 AUX rpcbind.initd 414 BLAKE2B 38636c24567ab930a5222711112bb197f7bdf2289773adda1e19421459eee23ad3ea77118a053c72cda96d8d2ba8a2ab63faf8bf74d9b238ec4f37b059f62108 SHA512 43f26570fbff0970c5aa0a1ee5f4f561645d31c90e3bb997bd63e05678814f199263a5aaa5051bfe88622a156f8260825ffd905301d158cb410f25631d75cc55
 DIST rpcbind-0.2.4.tar.bz2 122781 BLAKE2B ac1c374a1081559bf09bc209256daa1bb530d71f0c7fe45cec4c9b87cf110c15251a05dce2cf2b78ffa4d902f817efed30350ad08a23e12a7f219f10fe626aa8 SHA512 f3966a7284e94bdf120a9b3f0dd66efa1fe8761df2313545a031f77b7c06e27d7955d2780469943deb537d34f95c4cf3f30de523ec9fab9f571322d7224b210c
+DIST rpcbind-1.2.5.tar.bz2 123502 BLAKE2B de0d10406aeffd75195c1fa1d0179b2c7c0ba54c3f3ac58ce9d7e9448d1dbe91a296ad69c45dee115e0a739aa9cfec53b750d3a5ca405e16605a92bbb2006859 SHA512 e884c4757950ccead0f9a07f50625a63e6f18f9bfae9fcfffa3e5fa4b7a66c3a99d9fa303061848fe8211509d5456f24ff26e4579af6e161a35522268f3ef3e4
 EBUILD rpcbind-0.2.4-r3.ebuild 1384 BLAKE2B 43fa1418a4a836cb1c76bf14c57ebfb801a6c5919d82e3d1bb07265438410869ee5b65d9eb384b93cd6d3b393dc79412df143496db70a669bb507c4ba03bde12 SHA512 389d0073ed7613e57655a38da3b6efc75f1e114eb50b203811fe78075fa4eca04b03064c3355dd7cd407fcaefc5139242dd68a3d1add874681b9057066f08de2
-EBUILD rpcbind-9999.ebuild 1266 BLAKE2B 04ed9cbd5f9d1a3ed2b2c356f1941f0f30e24d46797fff68421857264036505d59a9b3f532a0e9b600555bc449e00df220cd302957ee0dd6b63bebb96fd2410e SHA512 6da69890be97a614eece0a2d9e87593dd96456517ec0cd71db6ad361ef390395576cdcdb77a737c5e308e9bab75d4ee583c246402ecde7370d1ad6fca39d236a
-MISC metadata.xml 405 BLAKE2B e55c92d34f30b03f0305586b1ec0a5ceca21eae2f5ec21979b0ab21d18162607ad7c6a767d7e6b106820a2c02e11034f4c524816185fda8d0fbf3598a39ffb06 SHA512 accad1ef4202c9ebd7292ae6e1e68a1c59ddbfb741779a635058d54aa1efbf8b70b5e045d53dc9dba61256d5981e11c57b540a1c7b8fb38207863a6f2c50a5af
+EBUILD rpcbind-1.2.5.ebuild 1401 BLAKE2B 12e7b0b777f3e77b94ad59073031c61d69ca485ab83221d54e992bdcd1a8da162cc7d19a340271bb9dcb04e08d869d902fa1f2e14710691a669fcb1f48553646 SHA512 155442d872e210f34ee2de90413c8f60d9ce8adae234df72e7df5193162678bd5316549e28cf275ab98cfe143d3b0ba503b7afa7543ecee11913b144aa2fff19
+EBUILD rpcbind-9999.ebuild 1401 BLAKE2B 12e7b0b777f3e77b94ad59073031c61d69ca485ab83221d54e992bdcd1a8da162cc7d19a340271bb9dcb04e08d869d902fa1f2e14710691a669fcb1f48553646 SHA512 155442d872e210f34ee2de90413c8f60d9ce8adae234df72e7df5193162678bd5316549e28cf275ab98cfe143d3b0ba503b7afa7543ecee11913b144aa2fff19
+MISC metadata.xml 459 BLAKE2B d3625a12679bb29b5402e397618cb007079ca84ada8ef79ced347338a6dacb4473a58fcdf7350e16f8623442f601563acaa247f5f605df1d289876cb3fc4dde1 SHA512 1aa9e72521a4c4c22c78e5a5e9f32c89d66b50079b9e42dc4cb4a043561d6a48e9e76ab52c2803609479161bfd7b21c18689d5088594762c4e09fa1fa58dd3b1
diff --git a/net-nds/rpcbind/metadata.xml b/net-nds/rpcbind/metadata.xml
index 664c6a547a01..8b85a22052b2 100644
--- a/net-nds/rpcbind/metadata.xml
+++ b/net-nds/rpcbind/metadata.xml
@@ -5,6 +5,7 @@
 		<email>base-system@gentoo.org</email>
 	</maintainer>
 	<use>
+		<flag name="remotecalls">Enable remote calls</flag>
 		<flag name="warmstarts">Enables rpcbind to cache configuration for warm restarts</flag>
 	</use>
 	<upstream>
diff --git a/net-nds/rpcbind/rpcbind-1.2.5.ebuild b/net-nds/rpcbind/rpcbind-1.2.5.ebuild
new file mode 100644
index 000000000000..7e3bbeae8e85
--- /dev/null
+++ b/net-nds/rpcbind/rpcbind-1.2.5.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit systemd
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://linux-nfs.org/~steved/rpcbind.git"
+	inherit autotools git-r3
+else
+	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+fi
+
+DESCRIPTION="portmap replacement which supports RPC over various protocols"
+HOMEPAGE="https://sourceforge.net/projects/rpcbind/"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="debug remotecalls selinux systemd tcpd warmstarts"
+REQUIRED_USE="systemd? ( warmstarts )"
+
+CDEPEND=">=net-libs/libtirpc-0.2.3:=
+	systemd? ( sys-apps/systemd:= )
+	tcpd? ( sys-apps/tcp-wrappers )"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-rpcbind )"
+
+src_prepare() {
+	default
+	[[ ${PV} == "9999" ]] && eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--bindir="${EPREFIX}"/sbin
+		--sbindir="${EPREFIX}"/sbin
+		--with-statedir="${EPREFIX}"/run/${PN}
+		--with-systemdsystemunitdir=$(usex systemd "$(systemd_get_systemunitdir)" "no")
+		$(use_enable debug)
+		$(use_enable remotecalls rmtcalls)
+		$(use_enable warmstarts)
+		$(use_enable tcpd libwrap)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+}
diff --git a/net-nds/rpcbind/rpcbind-9999.ebuild b/net-nds/rpcbind/rpcbind-9999.ebuild
index 3a5262860d77..7e3bbeae8e85 100644
--- a/net-nds/rpcbind/rpcbind-9999.ebuild
+++ b/net-nds/rpcbind/rpcbind-9999.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=6
 
-inherit eutils systemd
+inherit systemd
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://linux-nfs.org/~steved/rpcbind.git"
@@ -18,7 +18,7 @@ HOMEPAGE="https://sourceforge.net/projects/rpcbind/"
 
 LICENSE="BSD"
 SLOT="0"
-IUSE="debug selinux systemd tcpd warmstarts"
+IUSE="debug remotecalls selinux systemd tcpd warmstarts"
 REQUIRED_USE="systemd? ( warmstarts )"
 
 CDEPEND=">=net-libs/libtirpc-0.2.3:=
@@ -30,17 +30,22 @@ RDEPEND="${CDEPEND}
 	selinux? ( sec-policy/selinux-rpcbind )"
 
 src_prepare() {
+	default
 	[[ ${PV} == "9999" ]] && eautoreconf
-	epatch_user
 }
 
 src_configure() {
-	econf \
-		--with-statedir="${EPREFIX}"/run/${PN} \
-		--with-systemdsystemunitdir=$(usex systemd "$(systemd_get_unitdir)" "no") \
-		$(use_enable tcpd libwrap) \
-		$(use_enable debug) \
+	local myeconfargs=(
+		--bindir="${EPREFIX}"/sbin
+		--sbindir="${EPREFIX}"/sbin
+		--with-statedir="${EPREFIX}"/run/${PN}
+		--with-systemdsystemunitdir=$(usex systemd "$(systemd_get_systemunitdir)" "no")
+		$(use_enable debug)
+		$(use_enable remotecalls rmtcalls)
 		$(use_enable warmstarts)
+		$(use_enable tcpd libwrap)
+	)
+	econf "${myeconfargs[@]}"
 }
 
 src_install() {