gentoo resync : 27.10.2021

3 files changed, 7 insertions, 61 deletions

diff --git a/dev-ruby/brotli/Manifest b/dev-ruby/brotli/Manifest
index 9fe6199bc4d9..5eea7e736584 100644
--- a/dev-ruby/brotli/Manifest
+++ b/dev-ruby/brotli/Manifest
@@ -1,6 +1,4 @@
-DIST brotli-0.2.3.tar.gz 63304 BLAKE2B 96321a480e855ae7e77b93c06fd09153611a8a273ba66a8952093f844f6ccfa908d4bcabfd4dde084813f7f3961e8843208ed71f78e91f924bfe7e2ddece3628 SHA512 7d057d0055836c79744b802bb2401630375cc924035e9a45069c54e5df32711b9aa25234f4743aea729526028b804c518f36112ab721a6761b55311d07a8b79e
 DIST brotli-0.4.0.tar.gz 9460 BLAKE2B b5d5e490c3ab086d6817c1ecc9143aefe88487d65d6774bda939b25bdb6aaaea4e28d99e01d49b90dbbccceba6643c0b5fdab0cea930eaf1661454996e61fab7 SHA512 7d1d2a1343aec11e840d840358d7d27b4ef93954bc17170d581b16d46191902b6fdf6380344f0d172e5e7f3fc0948146312659a44dc95973ec30ac3344f4a656
-EBUILD brotli-0.2.3.ebuild 986 BLAKE2B dfcad5e93280a21981299cb43db6596c2130adeedac5f7b48f1bc76d00d40a9fecdb7ef34d9f8d7c8c375fc52efbe2c438a6edc0c8c46201627c502c4a32d7c9 SHA512 5832aa66d5423ce7b6d664e094da67007099f0a4dc0c66e6b4feda1544513c92a24493c55dabead65197b821397626ef9b0342d0bbf2751631e0b4e75643fb63
 EBUILD brotli-0.4.0-r1.ebuild 875 BLAKE2B 9cbc276ffc10de7a5ce46b0b26e4139690067fed26e34e6e1ad6c7a902b58e23e34dd3704f9190879b8dc12fe4cea614523ff53a09958b0b39ca6f2008e29942 SHA512 189b2873ab67943c31745762bbf20aab87365d1b606cb16a8b53fd38a86f1be2ce61a6171d7ee06fb5c732b9f9a09dbb84bc6a2eac1fd2f9ea401cf4bb64b8d9
-EBUILD brotli-0.4.0.ebuild 986 BLAKE2B dfcad5e93280a21981299cb43db6596c2130adeedac5f7b48f1bc76d00d40a9fecdb7ef34d9f8d7c8c375fc52efbe2c438a6edc0c8c46201627c502c4a32d7c9 SHA512 5832aa66d5423ce7b6d664e094da67007099f0a4dc0c66e6b4feda1544513c92a24493c55dabead65197b821397626ef9b0342d0bbf2751631e0b4e75643fb63
+EBUILD brotli-0.4.0-r2.ebuild 875 BLAKE2B 909353e53876dc2c25903561a20bdd1bc0474dc6bd98dcb5d61b1b4f594ad6dccbcfc27c91d59b38090897e5f5e8c1d57c73c29452938bd30efa03478b29cddc SHA512 232f8316dba8f5cc9c5a628e411443e972489020a3fc9236e460acd8a9fb5e6580251e769e56f4582f12d5c5c2e9fab4ba6dca03151cb5b7a1f025ae1d4997ea
 MISC metadata.xml 340 BLAKE2B 25156a37a996a4091ff75bb3cc45ba8d9fc65653fab708f0779a6606113492f0b0723b914d43e9dea4a6eb0d06325c5b4a31212b1389b82f845ef1a541a0f2fe SHA512 0b7485f8ba6fa314acda731d7f5cca43dbca1fab14cc928d2c239635b91dae19a10c2680b3c9526e6018c6f515d57ec87354e2e76ad75863408c38b9d5153ecc
diff --git a/dev-ruby/brotli/brotli-0.2.3.ebuild b/dev-ruby/brotli/brotli-0.4.0-r2.ebuild
index 3684034a1b87..b8f10a86c71f 100644
--- a/dev-ruby/brotli/brotli-0.2.3.ebuild
+++ b/dev-ruby/brotli/brotli-0.4.0-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
+EAPI=8
+USE_RUBY="ruby26 ruby27 ruby30"
 
 RUBY_FAKEGEM_EXTRADOC="README.md"
 
@@ -12,6 +12,8 @@ RUBY_FAKEGEM_BINWRAP=""
 
 RUBY_FAKEGEM_GEMSPEC="brotli.gemspec"
 
+RUBY_FAKEGEM_EXTENSIONS=(ext/brotli/extconf.rb)
+
 inherit ruby-fakegem
 
 DESCRIPTION="Brotli compressor/decompressor"
@@ -31,15 +33,6 @@ RESTRICT="test"
 
 all_ruby_prepare() {
 	sed -e 's/git ls-files -z -- spec/find spec -print0/' \
-		-e 's/git ls-files -z/find . -print0/' \
+		-e 's/git ls-files -z/find * -print0/' \
 		-i ${RUBY_FAKEGEM_GEMSPEC} || die
 }
-
-each_ruby_configure() {
-	${RUBY} -Cext/brotli extconf.rb || die
-}
-
-each_ruby_compile() {
-	emake V=1 -Cext/brotli
-	mv ext/brotli/brotli.so lib/brotli/ || die
-}
diff --git a/dev-ruby/brotli/brotli-0.4.0.ebuild b/dev-ruby/brotli/brotli-0.4.0.ebuild
deleted file mode 100644
index 3684034a1b87..000000000000
--- a/dev-ruby/brotli/brotli-0.4.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_GEMSPEC="brotli.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Brotli compressor/decompressor"
-HOMEPAGE="https://github.com/miyucy/brotli"
-SRC_URI="https://github.com/miyucy/brotli/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND+=" >=app-arch/brotli-1.0.7"
-DEPEND+=" >=app-arch/brotli-1.0.7"
-
-# Depends on the test data in app-arch/brotli
-RESTRICT="test"
-
-all_ruby_prepare() {
-	sed -e 's/git ls-files -z -- spec/find spec -print0/' \
-		-e 's/git ls-files -z/find . -print0/' \
-		-i ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_configure() {
-	${RUBY} -Cext/brotli extconf.rb || die
-}
-
-each_ruby_compile() {
-	emake V=1 -Cext/brotli
-	mv ext/brotli/brotli.so lib/brotli/ || die
-}