gentoo resync : 21.06.2020

3 files changed, 2 insertions, 45 deletions

diff --git a/dev-ruby/ruby-ldap/Manifest b/dev-ruby/ruby-ldap/Manifest
index e6690ea3f45d..73aba8678786 100644
--- a/dev-ruby/ruby-ldap/Manifest
+++ b/dev-ruby/ruby-ldap/Manifest
@@ -1,5 +1,3 @@
-DIST ruby-ldap-0.9.19.gem 91648 BLAKE2B 0ea6fe17ac2e4cd34a0834c6b95b1db4905e709010962959735cc3cedf9d50695d642b6042711b4f5154198fbe0bb5312903169ba8f1a7868b6f18d681a81682 SHA512 0ed931552df00c11855297ab44fd1c9a79e751937758d38189147f1d37cbce9b1da6fa42e64a9fd44610e948b1c13031013b7931ed473cd55b8425e64a50584a
 DIST ruby-ldap-0.9.20.gem 67072 BLAKE2B 626a35ab764dacfb37c727d867e1d435222730a3e7ea745ee4e7ec051ce3a822cc5a1230b463bc12f4a2390db667ed3b61deceb9842c014f64cdf43a26d285f9 SHA512 4f4902e7eaf4fe0cd421d58c73ce4e625d61ee20ef02363d3cf5754c66237e0f378ac433b234c2b86d5f5284ae03b7ae6c46d3575c512487bc1a931d021c9517
-EBUILD ruby-ldap-0.9.19.ebuild 1081 BLAKE2B dd52e7517f5633f2bacb9ea172163e71b59b1d698dd2cf4e83cc7121cef9d9fa2675078f7e7028a1255ea150e38db561e463d8dccb7c0f16a602cc817f96c973 SHA512 33898daf2dc296e9b2a4209202d32e6eb1dc6cdcada741dd93dca7a349afd3b98796c959e89834557089d6a89f23cd68c5839f5bc3e63dba5d371abea53f52b0
-EBUILD ruby-ldap-0.9.20.ebuild 1085 BLAKE2B 3698686e7817138c763a937db5dd62b0e622b00624d42b41352af1d556b9e4e24e1b034ee550a27905531336e5f5aa69cad0902ec33f2a8fa357a011b701c302 SHA512 b8f086dc973073a5d2deba9e3cf2992aa51b7ebdd3346f916350b601d9524c374f4eff683eed9db41aab74c5ffcd7b6823a15626b3d3a06f8fb5b4723d713400
+EBUILD ruby-ldap-0.9.20.ebuild 1081 BLAKE2B 09ebd446b34120915bfc4ee8c482562b5eb6a85467ada3affea29b144ce16e9f9337b15ebbc0c959a6dd044859ec1664147b48a7b43e1e6a44fe993e0caf8dd4 SHA512 801ef635ea979cbb34a1d957f31ecc82ae9099d39c1ba07156088167b34045c9eb983d0f226b6ffee40f6b4ad325866aee70665335c03d3afda9d0f35e6d0c7f
 MISC metadata.xml 390 BLAKE2B c6e77e29563ead438259a5643f24d5f9d69a3049e0e3a427ee44561f08c72ab2bf8c427a735606ca7a160d0f623538d12ed3d0020e2e817935152f956f70793f SHA512 55f9b63787f86238cf1f6a465e2eea49496be45c0e80fd0175b73434b93f7ce495c46b081833b5f3d7ff3322c1de31c86ba524f3327630908e424b0346dc02b2
diff --git a/dev-ruby/ruby-ldap/ruby-ldap-0.9.19.ebuild b/dev-ruby/ruby-ldap/ruby-ldap-0.9.19.ebuild
deleted file mode 100644
index bdbfa84e3bb8..000000000000
--- a/dev-ruby/ruby-ldap/ruby-ldap-0.9.19.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby22 ruby23 ruby24 ruby25"
-
-inherit multilib ruby-fakegem
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_TASK_TEST=""
-RUBY_FAKEGEM_EXTRADOC="ChangeLog FAQ NOTES README TODO"
-
-DESCRIPTION="A Ruby interface to some LDAP libraries"
-HOMEPAGE="https://github.com/bearded/ruby-ldap"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm hppa ppc ~ppc64 ~sparc x86 ~x86-macos"
-IUSE="ssl"
-DEPEND=">=net-nds/openldap-2
-	dev-libs/cyrus-sasl
-	ssl? ( dev-libs/openssl:0 )"
-RDEPEND="${DEPEND}"
-
-# Current test set is interactive due to certificate generation and requires
-# running LDAP daemon
-RESTRICT="test"
-
-each_ruby_configure() {
-	local myconf="--with-openldap2"
-	if ! use ssl ; then
-		myconf="${myconf} --without-libcrypto --without-libssl"
-	fi
-	${RUBY} extconf.rb ${myconf} || die "extconf.rb failed"
-	sed -i -e 's:-Wl,--no-undefined::' \
-		-e "s/^ldflags  = /ldflags = $\(LDFLAGS\) /" Makefile || die
-}
-
-each_ruby_compile() {
-	emake V=1
-	cp ldap$(get_modname) lib/ || die
-}
diff --git a/dev-ruby/ruby-ldap/ruby-ldap-0.9.20.ebuild b/dev-ruby/ruby-ldap/ruby-ldap-0.9.20.ebuild
index c64019245aa4..fe8e2531154b 100644
--- a/dev-ruby/ruby-ldap/ruby-ldap-0.9.20.ebuild
+++ b/dev-ruby/ruby-ldap/ruby-ldap-0.9.20.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="A Ruby interface to some LDAP libraries"
 HOMEPAGE="https://github.com/bearded/ruby-ldap"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-macos"
+KEYWORDS="amd64 ~arm hppa ppc ~ppc64 ~sparc x86 ~x86-macos"
 IUSE="ssl"
 DEPEND=">=net-nds/openldap-2
 	dev-libs/cyrus-sasl