gentoo resync : 22.01.2021

3 files changed, 11 insertions, 46 deletions

diff --git a/dev-ruby/google-protobuf/Manifest b/dev-ruby/google-protobuf/Manifest
index 6dbd031515fd..bc4c491eb28d 100644
--- a/dev-ruby/google-protobuf/Manifest
+++ b/dev-ruby/google-protobuf/Manifest
@@ -1,9 +1,7 @@
-DIST google-protobuf-3.10.1-ruby.tar.gz 4905995 BLAKE2B 1dde3b6260918da8430c2ce69210462f339c492b2a4e53d5d9c1bea3747aead905370507fc4bd703560f6885c0f3f8393a998b875c19744ad94827109ecbb49f SHA512 aba0c4034c0d3b1759904adb6270eee94dd5dc568f433b219e3f1f70c0033993cdfa3bf476ad3f5767c7629edb9fd029c686405abf93731dde808286b336330d
 DIST google-protobuf-3.11.4-ruby.tar.gz 5140799 BLAKE2B 97b450c0623593efe6a42b66582ff183344b8831689e6a5b4d36096dbd57c33da9569bbf26578536aaf73ecd866ac0588b6cb7d55a6a9b9a6e840d4c57099001 SHA512 777bbb0e9e2375eaebe6b8c87abd660bac70ee469c9ad00dd25917b82d7fb5bbe33cf87f0d69c90e19d55c07a7285ec20974ba4768623ce9ccfadf147fd5e261
 DIST google-protobuf-3.12.4-ruby.tar.gz 5310348 BLAKE2B 2630941672963165467221843c10079a0ed966f2fdfcbc970b0b41e1ed3c7f78734496c1fbd3ec509c68999a14f637fff267b309cf82a8acf2bb5a948484f79b SHA512 c5d24502b9a6be0a606a19213186fe462e0de6830547003636f0897781f36d0bd7e4e7d9689d96390a0399ce04b6438cda3a0fe6f97f0feb700a110e90beef0c
-DIST google-protobuf-3.8.0-ruby.tar.gz 4934577 BLAKE2B 4b86ab216e8a8b2c99c3620da9417c0562498e9d4dbf4957db186f51c62b0ed73b1322635a076b2d4054e015bdf6c8c50cc7fd0cb78d24a93b29d2a5b48f66fe SHA512 ba27c64e5193cd4a144bf0c9dc0d195fbbe6e580aaca01960362f0f185074588ca40046d3bcea76e1deae7508b722f6c5be484ea957122ae8e98229c7c3a4ad2
-EBUILD google-protobuf-3.10.1.ebuild 888 BLAKE2B ffc528047578e425ab92acb742c77b185e108911ba809faa9882831ca5c1c62d902e06ce4fe84c3389abbb73a272053c06114f02f5116260bf84c8f212e25cd1 SHA512 591ff0ad95313bf23dcef49d6b7fc9a5d55a1f3f89aa8edb66c5095555275a5f5e7c8135b93f5b68acb9cdbdd0afe4fe6cf1139f9a445f7c27aad35efb5fd2bd
+DIST google-protobuf-3.13.0-ruby.tar.gz 5277913 BLAKE2B 168aaa5beef83be675cd2543ca8efeaf5174f5e7fd861a056b04b01c8c781dc7b1fcbd05068ae89f051dfacfdc47c34b19cc33c8d09dd3212d3827746e3408f2 SHA512 514efa65fc8a36bc0791e6d39bdfb07b2689e9c2a4b82536c657859b800e7bc1e1a0ae86a7ee33f30c43a473a49b5c346ce830ac0057b6da104ed37f90b8b0fd
 EBUILD google-protobuf-3.11.4.ebuild 956 BLAKE2B 1e795340a36991275e03f543609698517cf1134f5df4050ca5842b03800bc44344f3d7fb545fb8ef8813f7b71fb9328d4c7e92e2aada725a71c42a6656d57573 SHA512 82d89231f92b7f7d928a666f8e20d5709ce392712876506c8d3771d8fcf96ee870fd47bff6fdd927b06f1f451d869b4e5fe2a1c020d809f5d89bdaf236694851
 EBUILD google-protobuf-3.12.4.ebuild 957 BLAKE2B a23e4806a8ac69f5ae65143214e23632b215b80de65d24ab6c52cb8f54b66aefb0b80acc2274047caccdc14429dd89fe98a17a7bf236fa616448ebaadf33bd49 SHA512 02dcee02c57e781f673e02706e3dfb269ad75a04619082b7759002c18ca10ff54b24282c5ada699eee09706aedb82d0676b825069cb996ecbe155e5d417b36d7
-EBUILD google-protobuf-3.8.0.ebuild 913 BLAKE2B 8e1ea1aad0db1207f3c82e7065f28ee19cfe5cdffff91fb75113bb5963830d67c71c8be1b45e85fed77036d579a203775eabc207ff5ea5dbd9fd28eb638048b4 SHA512 cb217fcb8495f773778fc2e53e56a48828d3390907420c37cb0a711b545a07533ba6145d34ad322a8eb2a2586c94d9f34b32f8bc8624c4b7dca9b5f0b46aad9b
+EBUILD google-protobuf-3.13.0.ebuild 964 BLAKE2B 00217e4f50fe1246dc87d4256d283a00d5ae2c2c261cd82dd4b6a8e7d4eb6eb0b20693f12253139fac62d14bb91dd1af93a74bdd4a692ef7c8f96c12ebcbc44e SHA512 f883eaba02e0cbee13958c3f43d5f780058cadfc2142e9fc2ab93a5cd494ba854d233fd7cd94eddb229c4517aad44dab646ab4120a7ef19e5fe78eeaccf0dfc3
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/google-protobuf/google-protobuf-3.10.1.ebuild b/dev-ruby/google-protobuf/google-protobuf-3.13.0.ebuild
index 749ced3b808c..c61f42fc155a 100644
--- a/dev-ruby/google-protobuf/google-protobuf-3.10.1.ebuild
+++ b/dev-ruby/google-protobuf/google-protobuf-3.13.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26"
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
 
 RUBY_FAKEGEM_EXTRADOC="README.md"
 
@@ -20,10 +20,14 @@ SLOT="3"
 KEYWORDS="~amd64"
 IUSE=""
 
-DEPEND+=" test? ( >=dev-libs/protobuf-3.7.0 )"
+DEPEND+=" test? ( >=dev-libs/protobuf-3.12.0 )"
 
-each_ruby_prepare() {
-	sed -i -e 's:../src/protoc:protoc: ; /^task :build/ s/:compile,//' Rakefile || die
+all_ruby_prepare() {
+	sed -e '/extensiontask/ s:^:#:' \
+		-e '/ExtensionTask/,/^  end/ s:^:#:' \
+		-e 's:../src/protoc:protoc:' \
+		-e 's/:compile,//' \
+		-i Rakefile || die
 }
 
 each_ruby_configure() {
diff --git a/dev-ruby/google-protobuf/google-protobuf-3.8.0.ebuild b/dev-ruby/google-protobuf/google-protobuf-3.8.0.ebuild
deleted file mode 100644
index 5eefeb1f2412..000000000000
--- a/dev-ruby/google-protobuf/google-protobuf-3.8.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Protocol Buffers are Google's data interchange format"
-HOMEPAGE="https://developers.google.com/protocol-buffers"
-SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> ${P}-ruby.tar.gz"
-RUBY_S="protobuf-${PV}/ruby"
-
-LICENSE="BSD"
-SLOT="3"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND+=" test? ( >=dev-libs/protobuf-3.7.0 )"
-
-each_ruby_prepare() {
-	sed -i -e 's:../src/protoc:protoc: ; /^task :build/ s/:compile,//' Rakefile || die
-}
-
-each_ruby_configure() {
-	${RUBY} -Cext/google/protobuf_c extconf.rb
-}
-
-each_ruby_compile() {
-	emake -Cext/google/protobuf_c V=1
-	cp ext/google/protobuf_c/protobuf_c.so lib/google/ || die
-}