gentoo resync : 10.11.2019

5 files changed, 13 insertions, 9 deletions

diff --git a/net-nds/Manifest.gz b/net-nds/Manifest.gz
index 56491de82e40..6ce841547949 100644
--- a/net-nds/Manifest.gz
+++ b/net-nds/Manifest.gz
diff --git a/net-nds/led/Manifest b/net-nds/led/Manifest
index 930a78fb0ac5..eeef070535aa 100644
--- a/net-nds/led/Manifest
+++ b/net-nds/led/Manifest
@@ -1,3 +1,3 @@
 DIST led-1.111.tar.gz 30636 BLAKE2B 54169c602b7b1feeff4fac4999d8c25ec56107234ddb62f9c6bcac2faed0c4f3bdba27ff666b2385d14bff8bdd01521ef3a981e77148af422ef73893bd985dc9 SHA512 e5078cbed72e406846f50be13fa2e475549b5e0f22eee8da19fca1bb097bc155ee38d289f3f1f89e47d4efae6d9d67eda8bec8a2dd9b90f52020dcd6ea2945e5
-EBUILD led-1.111.ebuild 673 BLAKE2B 8a15aa9a6518b043b8bbaace2e1e83e0bfe23cdbcac31abd5f8a836d787c599d13892e357f91cdd073650644bf3d6254a84f707968bbb63320ecb7b28a8b5b78 SHA512 882eeb2482d5770efde411fe2ccddbc3eb70e630690af6eb5b25e5e9b45046cc3deb1ffe66950c4ec19bc2e0321b9e4683007a7583fa76531b931f1b013d72aa
+EBUILD led-1.111.ebuild 699 BLAKE2B ff79bc72d764fccf43b7496a2138774c56855092177cb8873c3d6ef4ce4878f2e3726847a1914e19f5afc76c5a480d1fda000f139c66065697063cad71cb080f SHA512 f05f695789593009615085a06a9da05d97640c4bc64937d6bc63ba4f729bd66d4ab94126c327c7cc48385a66a8c9edb92c25bfedc4677eb2d3e0b1c4544efd9b
 MISC metadata.xml 333 BLAKE2B b5752f015f532d37755c1ccde2ac987db326f0e0962505825d7885e3a11670ee08db0280f5e7372999b0c99b89d2a68581c6b78045fb9c0a24bc0d55be6d4cab SHA512 455aeeda0952f143bd2ec87c4c7d47096a0d95e9587994d1fc9a89aaba738f814384006b4c6c1dda3ef37800cf32f9e658a1037b3f269a3590f461c77ec43ccf
diff --git a/net-nds/led/led-1.111.ebuild b/net-nds/led/led-1.111.ebuild
index dbd214b97ef8..441a72ed409c 100644
--- a/net-nds/led/led-1.111.ebuild
+++ b/net-nds/led/led-1.111.ebuild
@@ -1,26 +1,30 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
-inherit eutils
-DESCRIPTION="led is a general purpose LDAP editor"
+DESCRIPTION="A general purpose LDAP editor"
 HOMEPAGE="http://led.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
-DEPEND=">=dev-lang/perl-5.6.1
+RDEPEND=">=dev-lang/perl-5.6.1
 	dev-perl/perl-ldap
 	dev-perl/URI
 	virtual/perl-Digest-MD5
 	dev-perl/Authen-SASL"
+DEPEND=${RDEPEND}
 
-src_compile() {
+src_configure() {
 	# non-standard configure system!
-	perl Configure --prefix=/usr --generic --rfc2307 --shadow --iplanet
+	perl Configure --prefix=/usr --generic --rfc2307 --shadow --iplanet || die
+}
+
+src_compile() {
 	# parallel make bad
 	emake -j1
 }
diff --git a/net-nds/openldap/Manifest b/net-nds/openldap/Manifest
index a385d2b7f8d1..3acf55880d7a 100644
--- a/net-nds/openldap/Manifest
+++ b/net-nds/openldap/Manifest
@@ -26,5 +26,5 @@ DIST openldap-2.4.45.tgz 5672845 BLAKE2B e1f97553482a2e8630b62bc0f439af2484f1a23
 DIST openldap-2.4.48.tgz 5704883 BLAKE2B ef856ff0b22c9187e68e9c09583a176fe4c2ee1f5bfe6b169f03bc0058294170ec4d1aa1b164e28eecd2ef6bafab539c1b942b0bd74e93852205beeaff39aeef SHA512 cf694a415be0bd55cc7f606099da2ed461748efd276561944cd29d7f5a8252a9be799d8778fac2d4fa9f382731eb4ca48c6b85630cb58a3b8249843561ae8feb
 DIST rfc2307bis.schema-20140524 12262 BLAKE2B 98031f49e9bde1e4821e637af3382364d8344ed7017649686a088070d96a632dffa6c661552352656b1b159c0fd962965580069a64c7f3d5bb6a3ed75f60fd99 SHA512 83b89a1deeefc8566b97e7e865b9b6d04541099cbdf719e24538a7d27d61b6209e87ab9003a9f140bd9afd018ec569e71721e3a24090e1902c8b6659d2ba103e
 EBUILD openldap-2.4.45.ebuild 27926 BLAKE2B 639d13201517635fbefd53cf1b34b61bd906dca7245ba9337f4e5498c458171065425ab9db4ac7914fd8767ffe84e3dc1c94be2a5a44c4c60037ad7cc13357ba SHA512 b568fbb665aae0f324fabb3b3385d5d08bbf5e38d1b3481b808016f2e8acff4cd02b5607658659f81f210528c89d44128cf59c8a1a86d52f94976753f3992c01
-EBUILD openldap-2.4.48.ebuild 28962 BLAKE2B 162e2f064164651f8ebe389baaa1b90cef5ef4cc205005ccbf744d2cb4d1bdaa2596fb9f58c0f4753173081d1d1f89151250894ab952387f4a23c50e6f300666 SHA512 b90d23464e32547cdd4bc4bc70ea6c269a511a814fb6a1cd02614f1a960ee40279ebecb942d14830c5b085778b01d0d19e1569bc627c3c3b2fad69cb61f0a748
+EBUILD openldap-2.4.48.ebuild 28960 BLAKE2B fc6c6ec3b6b0fc2aaf5bd8b66965a2d665be6df15384d76b1c961dd188c8f4de70798b9a6216bdebf329182010ce86ab3d24b437f60c0eb56e8fbf09c00bdd33 SHA512 120b981d2cbf09a74487c7f2ee1a7cd47a0ba7314a7c07f0a5fde961a30d56fe0294d1a5c2ec1b5b9b5d7f46ee4127ed4628c9763ba7df033370e71c6e73b0f6
 MISC metadata.xml 922 BLAKE2B f99c4b3703f1a22dccbc0bbb109d11ba747c61229ebc811b036784dee829c4f7ce4bd85d4f5b8d7780cf20194d5175511129b9256416eea7daf4094e20d8c1a7 SHA512 fc9eb245cde878a93e08b8213f58b829266b2171ee73a74a39b47e700e506225da36e7d51952586f3d97ad6e0a3b3792fa59b5620bad0749afc87b8d59678ff9
diff --git a/net-nds/openldap/openldap-2.4.48.ebuild b/net-nds/openldap/openldap-2.4.48.ebuild
index a21942c9d286..ba833c3f7a0a 100644
--- a/net-nds/openldap/openldap-2.4.48.ebuild
+++ b/net-nds/openldap/openldap-2.4.48.ebuild
@@ -18,7 +18,7 @@ SRC_URI="ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/${P}.tgz
 
 LICENSE="OPENLDAP GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~x86-solaris"
 
 IUSE_DAEMON="crypt samba slp tcpd experimental minimal"
 IUSE_BACKEND="+berkdb"