gentoo resync : 25.09.2021

3 files changed, 2 insertions, 45 deletions

diff --git a/dev-ruby/bcrypt_pbkdf/Manifest b/dev-ruby/bcrypt_pbkdf/Manifest
index b59001ec343f..a1a764192977 100644
--- a/dev-ruby/bcrypt_pbkdf/Manifest
+++ b/dev-ruby/bcrypt_pbkdf/Manifest
@@ -1,5 +1,3 @@
-DIST bcrypt_pbkdf-1.0.0.gem 24576 BLAKE2B 0d5b1d90d57dbae986fcbb92cabb0ea598d6b928dc97026e8d2078f41898e0c143544a004a561c0a392504baa4b845a27f9c1e19c369f6342f7ace9de7f04d3f SHA512 b582407617633f5277cde9251ed1fd2ca408ae8bd19cc73f107d7932bed38061dc0099d3033ff5def1b586507392c33d8c50815fb156322f0dd08fbbe4a8e967
 DIST bcrypt_pbkdf-1.1.0.gem 24576 BLAKE2B 4fb9449c23c1a1caefbe7acae630eff9c6ee22b77d1eaed6475400ab2b37186d3f15b867cdad364daaaf27d6b817d6a2a49cfbf567a889264fdd64903f06cf89 SHA512 a7b9f123274a2f93e183be7339149b1df3b185331fdc63af58e342ae4bb734fdcf709214a50922218b837481349948e10ec879f9b8e1a6928b1b7b5617f83be5
-EBUILD bcrypt_pbkdf-1.0.0.ebuild 1091 BLAKE2B 87453b2647c98479ff54e8fc45ed48ae875682134feb4751bc6094d39a452d539e7a1d176818523392d174c00502b559ef625e2a740bba06b841ef55f2c54da7 SHA512 0cdf6de34b390231c2933b2257577c69a18fde6511b8e73ad9e114abda76d596ab6959d018a63829f5944a576291f9907058a5ff4bf51b2fa930438cc9e6dbc4
-EBUILD bcrypt_pbkdf-1.1.0-r1.ebuild 1110 BLAKE2B c686e78906f7187b109b8937e498607dc16fb3e364d0f15b1e35280f7e0d0bcade08c2f39bf0aab69133caee061ac72d5ca8df19566caf0985db62406ac5cd6b SHA512 e333371574905c879a9bbebd3607a7cd3405232bd48ed3d7c76c14944f17cb518f1f7e58fc6c2909340665256d72a86f73521f5a1ffc3023e520fcc53050aa67
+EBUILD bcrypt_pbkdf-1.1.0-r1.ebuild 1106 BLAKE2B 1d8c8864df0632965ad5c8af4a413e61f264ab03cfc37aabed8edf6124efbcb2e284ddc1893711d1eb65c0141e34a44e503b7a3e1827600c93d5965a10bc1e84 SHA512 ea67dcafc15c2195ffd4dbca596d8697fa534423b79ebf1933696881023a6ad0fd6a2a4ae3528b65b9d353266ac344f5338b8e053fae7a727caa922bc79ef03e
 MISC metadata.xml 352 BLAKE2B f2c9cc325b0c9edf94cb0f2817dda3582647fcc80cfe85732598dc04b892c1d3f81bff8e7ec45254aad4390c28a833fd75a8af1c5c0a9f5d82df0e7013edfb4c SHA512 361cb72236f48394a7481261e8c55fd3c25f3212e6e11caf341d7b95d264c0eca3dd80f165cf6655a606b04a16f1204112f05683b05ca3be4f3b8b0a687ea2b7
diff --git a/dev-ruby/bcrypt_pbkdf/bcrypt_pbkdf-1.0.0.ebuild b/dev-ruby/bcrypt_pbkdf/bcrypt_pbkdf-1.0.0.ebuild
deleted file mode 100644
index 9969222909a0..000000000000
--- a/dev-ruby/bcrypt_pbkdf/bcrypt_pbkdf-1.0.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Implements bcrypt_pdkfd (a variant of PBKDF2 with bcrypt-based PRF)"
-HOMEPAGE="https://github.com/net-ssh/bcrypt_pbkdf-ruby"
-
-LICENSE="MIT"
-SLOT="1"
-KEYWORDS="amd64 ~arm ppc ppc64 x86"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/rbnacl )"
-
-all_ruby_prepare() {
-	# Don't use a ruby-bundled version of libsodium
-	sed -i -e '/rbnacl\/libsodium/ s:^:#:' test/bcrypt_pnkdf/engine_test.rb || die
-
-	# Avoid unneeded rake-compiler dependency
-	sed -i -e '/extensiontask/ s:^:#:' -e '/ExtensionTask/,/^end/ s:^:#:' Rakefile || die
-}
-
-each_ruby_configure() {
-	${RUBY} -Cext/mri extconf.rb || die
-
-	# Some methods may not be inlined on x86 but they are not defined either, bug 629164
-	sed -i -e 's:-Wl,--no-undefined::' ext/mri/Makefile || die
-}
-
-each_ruby_compile() {
-	emake V=1 -Cext/mri
-	cp ext/mri/bcrypt_pbkdf_ext.so lib/ || die
-}
diff --git a/dev-ruby/bcrypt_pbkdf/bcrypt_pbkdf-1.1.0-r1.ebuild b/dev-ruby/bcrypt_pbkdf/bcrypt_pbkdf-1.1.0-r1.ebuild
index 020dc3d821f9..37813069391f 100644
--- a/dev-ruby/bcrypt_pbkdf/bcrypt_pbkdf-1.1.0-r1.ebuild
+++ b/dev-ruby/bcrypt_pbkdf/bcrypt_pbkdf-1.1.0-r1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/net-ssh/bcrypt_pbkdf-ruby"
 
 LICENSE="MIT"
 SLOT="1"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ppc ppc64 x86"
 IUSE=""
 
 ruby_add_bdepend "test? ( virtual/ruby-ssl )"