gentoo auto-resync : 12:02:2023 - 09:56:54

5 files changed, 10 insertions, 71 deletions

diff --git a/dev-ruby/diva/Manifest b/dev-ruby/diva/Manifest
index f9232f1a4b01..cca44ddb9780 100644
--- a/dev-ruby/diva/Manifest
+++ b/dev-ruby/diva/Manifest
@@ -1,8 +1,5 @@
-DIST diva-1.0.2.tar.gz 13638 BLAKE2B 461e8487e06749d0482b86fd30945dc83d53daea06750628839c899b6f8d419599c9cc322b62f58d3eb956a2a99a3674dd591c4bb2fc5483bd1853bc40154634 SHA512 b60d80ca55c98a2f6fcf269aa4a2188f2239b871b0e77f328490d5924a6d0e6801c67d0eef4de28b584303f38bed3752a3ceb2c1e4f2c7d17be13dad03c643b5
-DIST diva-1.1.0.tar.gz 15859 BLAKE2B 58e9ca4d9f1b8f4fb3a75cb16437d565fc99a358ce20017a6b6a6a3c505fcc07347141b51b450c8d6eb34869ad5e1040f62e8e92188736799e4d96280194cb05 SHA512 1d53618b11ab49e8c4837ea23326a8c428f1c098e1c3b6e3c3850d7d978dd5fde5a5e23287fa3eb890fbc5c9f0c5609fe92c0368ac72c6fdfbe30dca4df68de9
 DIST diva-1.1.1.tar.gz 15974 BLAKE2B 2a3b497181a931eb6cf6c43b9d43ff9e0e7a34a753864bec422b69c6d01aa39b5f9dcc6abd54b85ca27b34d38a647c3e80450c2d7dd9cea1c62859eb3366d28d SHA512 36c7048cba2774567191b40ff88fa7804b61cb9334992dadd43a62f18be6635aa48753593ccba93a7c0438adfb7d75266b26b7a62e102aaf99afff7401c4e99a
-EBUILD diva-1.0.2-r2.ebuild 749 BLAKE2B c5a03821dd00693a807a5650e221deeac6dd85a91120347dee5a2d76b75f843554922eb598afefc77f4702953c6bbb25243ff2dc992bf01f22f5fcb0d6b31b4a SHA512 d1b3035916d9848ebed62100568ad31bc141349824ae0248c5ecaed5a3a4b4c238a8ac755f791e281c37a76b6085875080d339c4d690497ffabddd54414eb3ed
-EBUILD diva-1.1.0.ebuild 806 BLAKE2B 045fda2c1cf24d83574e6005ef8c0d406dd9cbe26bb78ec364c234657aa99a51ec143065c9b42d7c74e62db0bbe465dd783db5e3b230dffb6ac0f99c029b2bd3 SHA512 2863b07d39c99712d0a50a221ca7eb00bcd072638bd3c2c7a78ccfebd439206c629142937ae28837944a0c99e2b7d96d209c97d50209c4391aedb7ec85422cdc
+DIST diva-2.0.1.tar.gz 16964 BLAKE2B 768f9fa670db229db424a069adcfa4706c2b9969d143cffbbaeeafc9b1a2eeaa6b4a1c53de90206a4625f65f89a2c478957c3b53a21eb00f89a470e6071a6d57 SHA512 248f2b9770bd8d097fdfd7edfd574358d3e47c907d8c7e15b6e4b9cc5b72e9b7b428bac211e4d5a4e516c206afb82ecb069103c85835a1c65ed646e68e4a0a6e
 EBUILD diva-1.1.1-r1.ebuild 890 BLAKE2B 71e332dcb484baccaa6b2db223886eac37e4d660094c6c3e5c51584a321cdfaca330ee63597284b900390933ad63bdde037d9ba75339358ea04d33e3595d13b7 SHA512 d59ac3a8df27c9dc8c0cd57a9426783ae59cca12a57879031e5f9816d880c4d9eba4849ea2e64fda0fe2bf510bb540077f0be2691920a279f0804e9366a842ea
-EBUILD diva-1.1.1.ebuild 806 BLAKE2B 722dc2f8f69ed25d8fa5d9906efa01f5ee536042e481c576a0b572f7929212db9458e305c45d397a700f7069a50ea89f66a658f2ab635538a5fd0153ae7c6cae SHA512 7e501388c0a3b9f6af73dabaad82afb5783a961861173b247cefb9c82211b1a555901e0e8f3a5e9def1351b88ce7569e5b61650f4f6f3f9217b3d9f9d4da5360
-MISC metadata.xml 428 BLAKE2B 60e3e72fabb06df16796be60dd22f9a54b960a6bf8cf36eeac02893246694df282ebb1f95bfd7b434065737cb0c0cb5a1c97975342e20959abf790082e594c9a SHA512 cd07530fc72aa675ecec8f88c4b8a5f93583f7bc6f2b08a80b4e472ca6542cfa2560643222d0b7a9dede5c01a860efaacd9bde3fa32f4854b4e7f30ef61d63ba
+EBUILD diva-2.0.1.ebuild 890 BLAKE2B 52fce9061dc198fc4603e48469a00b2309e07be591c7d817cfcb284eb7c915dfb95588f5a048b3c015282ac22ce5b0df58dfdedbc6fb6616ae889b356e16c7cb SHA512 4bf179bc601352b5a4e84268991dea2894b938ba4a25bd76ecc62cc5d9c87b6b7f56153f8e91dcfe28c40842c9fd3175cee4f7e46dea9d432498845cca85d6f7
+MISC metadata.xml 479 BLAKE2B 2537793f2fb1c7cc2af71a8aac9152180dcca5d41f2f57d261a7b3e00bee04156fe78e3df444f6e00cb940bace4db0533bb22eddc7faa26fcfd7960b97d24f9b SHA512 85607cbe0553043886689e05f3f955fca1b0c7381044d3d95d5eb47f1cd23c48524d7a8810fe305c913e8bddc0dcbbbe1084bf13e87176854f70bedabcdaa6d0
diff --git a/dev-ruby/diva/diva-1.0.2-r2.ebuild b/dev-ruby/diva/diva-1.0.2-r2.ebuild
deleted file mode 100644
index 33ea669f02bc..000000000000
--- a/dev-ruby/diva/diva-1.0.2-r2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_GEMSPEC="diva.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Implementation of expression for handling things"
-HOMEPAGE="https://github.com/toshia/diva https://rubygems.org/gems/diva"
-SRC_URI="https://github.com/toshia/diva/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-ruby_add_rdepend "<dev-ruby/addressable-2.9"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/ s:^:#:' Rakefile || die
-	sed -i -e '/addressable/ s/2.8/2.9/' -e 's/git ls-files -z/find -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/diva/diva-1.1.0.ebuild b/dev-ruby/diva/diva-1.1.0.ebuild
deleted file mode 100644
index e6aa6e3d1f78..000000000000
--- a/dev-ruby/diva/diva-1.1.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_GEMSPEC="diva.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Implementation of expression for handling things"
-HOMEPAGE="https://github.com/toshia/diva https://rubygems.org/gems/diva"
-SRC_URI="https://github.com/toshia/diva/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv"
-IUSE=""
-
-ruby_add_rdepend "<dev-ruby/addressable-2.9"
-ruby_add_bdepend "test? ( dev-ruby/simplecov )"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/ s:^:#:' Rakefile || die
-	sed -i -e '/addressable/ s/2.8/2.9/' -e 's/git ls-files -z/find -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/diva/diva-1.1.1.ebuild b/dev-ruby/diva/diva-2.0.1.ebuild
index 5b294900e814..94eb9a5e65a6 100644
--- a/dev-ruby/diva/diva-1.1.1.ebuild
+++ b/dev-ruby/diva/diva-2.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -19,13 +19,15 @@ SRC_URI="https://github.com/toshia/diva/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv"
+KEYWORDS="~amd64 ~riscv ~x86"
 IUSE=""
 
 ruby_add_rdepend "<dev-ruby/addressable-2.9"
-ruby_add_bdepend "test? ( dev-ruby/simplecov )"
 
 all_ruby_prepare() {
 	sed -i -e '/bundler/ s:^:#:' Rakefile || die
-	sed -i -e '/addressable/ s/2.8/2.9/' -e 's/git ls-files -z/find -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+	sed -i -e '/addressable/ s/2.8/2.9/' -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Avoid unneeded dependency on simplecov
+	sed -i -e '/simplecov/I s:^:#:' -e '1irequire "json"' test/test_helper.rb || die
 }
diff --git a/dev-ruby/diva/metadata.xml b/dev-ruby/diva/metadata.xml
index 21017a1f88d2..0ac8e7d4d47e 100644
--- a/dev-ruby/diva/metadata.xml
+++ b/dev-ruby/diva/metadata.xml
@@ -10,6 +10,7 @@
 		<name>Gentoo Ruby Project</name>
 	</maintainer>
 	<upstream>
+		<remote-id type="github">toshia/diva</remote-id>
 		<remote-id type="rubygems">diva</remote-id>
 	</upstream>
 </pkgmetadata>