gentoo auto-resync : 24:03:2023 - 12:47:36

3 files changed, 5 insertions, 53 deletions

diff --git a/dev-ruby/git/Manifest b/dev-ruby/git/Manifest
index 5e84ffc96e30..b4db1c389043 100644
--- a/dev-ruby/git/Manifest
+++ b/dev-ruby/git/Manifest
@@ -1,9 +1,7 @@
-DIST git-1.13.0.tar.gz 219424 BLAKE2B 38d1821c59cbb743c50655e9426d77f76e77dda614a711b7d2185ed7f4caa853383ba85ecf05237da403061d002527c38a5c6e06cf5e6d482ac76bac49a0db56 SHA512 7920de37a3df67b743e91fb317bd0cba746d2343dfb77036398fc124d00eede7b9ade5dd2af5f26d65f1f24006608a29fca55d5be8a00557caaa31acd0b274d4
-DIST git-1.13.1.tar.gz 219640 BLAKE2B c87fce3f83130f7a75a10a21c4c980ec1d3594b20afa7b482f21077083076df7b4c462908a05c7b2fb3091e1fda00857ae40c4809e89f059f63ce12b119f307b SHA512 58cd7f38a5c1d5ab3d68cf2d4b026a80073f5dba3cb4895e220ecad5dbdf6a2df4e1e44570bde9256371c5089b81523aca4a5c686348bd04638f4dd09927e876
 DIST git-1.13.2.tar.gz 222112 BLAKE2B 13b2f8c67a27a147662fa019f6fac8f557e704fe1d0320188a097385f7692a190670ba375312e793d4d39fcf9ea7be8325394830c2c499b5132201f4a8f3f6ee SHA512 36425806c86e3c5d1a393ec657b60b8dafc88d92822270c299d3d1768c37d00e70b723d98a60127ab70de15809b27a49bcef5c8a972b88d7a516de093a643347
 DIST git-1.16.0.tar.gz 171700 BLAKE2B 92e518a9b282debad9a935882004f8047918ade0ceb660618e632087cfd44fbe952e45f0aa13d8b599e24c07a809622168637b58463578ec5882ec16afe194d5 SHA512 89e9180370b24e0240ba8226125c063ed008faf2c03905e3680a2e5e6b0dcb1d805f17755f259e9337e1418629057ba460e7ecadb8a4c98125a061b7f0116401
-EBUILD git-1.13.0-r1.ebuild 1310 BLAKE2B 8e07d2f03e4d698cb3ccd66719553ca18651a73387549ab7a1f8f80afd14e756cda74d548d57dba6ad24037e70992885208ab170c0b3e1ce07d61d924630099b SHA512 ce4483e7cd8a3679f00a170517050b0b2d00ea1e87bf8a5e9a0a91648b99a99442e2bb7c5ef5c76215bbfdff98224ee088007b20e133439fa54e5566047c384a
-EBUILD git-1.13.1.ebuild 1311 BLAKE2B c59850828f991c0ebab56f87d442bc2a4a6a45ecfc9d48a542b18c6340ae176c2d514080a0ae275196bfdd4d69892f163e04def4f69ec5bf3b20ec49740248fd SHA512 0edd92d9cde77118fd7ff25e1b0c4bf9b02b6436bf0f4d096c089ceae2d19a038d5200858ac96f7ebef56123d303f6da28524b7a438732ca1a6e3f57e3167b5f
+DIST git-1.18.0.tar.gz 175341 BLAKE2B 5a8dee1fef79c0386c59d37f37f2249c72600f2f11dbf2cc2c5bf63ff91f068c9c3164d24c2670585e8261d890f07b998255ddb80ce35ce53de09f402a4ec9e3 SHA512 520886b23758229cf25bfdd17e9d86e53d62feb6b2b3c155efe493db42d2f247a29bd629ff6c80ffa599ad429bcb6f09e44b015eeeecf9d9a5f4ee6ab3f1a265
 EBUILD git-1.13.2.ebuild 1312 BLAKE2B 7354ba2023336f28725e5db5026a23db26e7bae60680685e632f3481a6904847679784b8b754e975ac85b8085c02c06a472389df2b403e779df05f5576941aa3 SHA512 73b616c999c42553c1ead82395007fb8e3af0471ec11c253287493ebe31f3e618633b8fc01afef2bb66d5ad48fdf2e91ea57021737752ae79a5612b4fb0fef36
 EBUILD git-1.16.0.ebuild 1256 BLAKE2B c979e9a2109d1e6212bd2b05152fc0fc6fe7eed278e5d7f87ec8d884ba8fba8eb19c42b332633cd0c48e29a259bbaa6159a3f217a9e2c743f192ecd1e0987de8 SHA512 9a6dd3b85c108908b25957fab5dc43c7a07ed2a36443d9813ba93656ef07e973250f72ae76b175808833e7ba7c41a949961360e85cf19a831a8ddb0832761fd3
+EBUILD git-1.18.0.ebuild 1256 BLAKE2B c979e9a2109d1e6212bd2b05152fc0fc6fe7eed278e5d7f87ec8d884ba8fba8eb19c42b332633cd0c48e29a259bbaa6159a3f217a9e2c743f192ecd1e0987de8 SHA512 9a6dd3b85c108908b25957fab5dc43c7a07ed2a36443d9813ba93656ef07e973250f72ae76b175808833e7ba7c41a949961360e85cf19a831a8ddb0832761fd3
 MISC metadata.xml 391 BLAKE2B 3d03aece790440be04e0a72615824cb5aeb627e67b87b9457b7625a330c5d4736b77897a9b6655b0e45d99d134615090a95077fe2ee62131d572686f9a4bc682 SHA512 0ac01abe3193d7e8566420333c2bbf301bdc2ad3c4587ef9f48bf260322a3763eed3319c879472c0028cf8d63c73e82d24f2e2164692a06f3e14bd992e3b301c
diff --git a/dev-ruby/git/git-1.13.0-r1.ebuild b/dev-ruby/git/git-1.13.0-r1.ebuild
deleted file mode 100644
index 332f1e00004f..000000000000
--- a/dev-ruby/git/git-1.13.0-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="git.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Library for using Git in Ruby"
-HOMEPAGE="https://github.com/schacon/ruby-git"
-SRC_URI="https://github.com/schacon/ruby-git/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-RUBY_S="ruby-git-${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
-IUSE="test"
-
-DEPEND+="test? ( >=dev-vcs/git-1.6.0.0 app-arch/tar )"
-RDEPEND+=">=dev-vcs/git-1.6.0.0"
-
-ruby_add_rdepend ">=dev-ruby/addressable-2.8:0 >=dev-ruby/rchardet-1.8:1"
-
-ruby_add_bdepend "test? ( dev-ruby/bundler dev-ruby/minitar dev-ruby/test-unit:2 )"
-
-all_ruby_prepare() {
-	# Don't use hardcoded /tmp directory.
-	sed -i -e "s:/tmp:${TMPDIR}:" tests/units/test_archive.rb tests/test_helper.rb || die
-
-	sed -i -e 's/__dir__/"."/' -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	sed -i -e 's/1.12.0/'${PV}'/' lib/git/version.rb || die
-}
-
-each_ruby_test() {
-	git config --global user.email "git@example.com" || die
-	git config --global user.name "GitExample" || die
-	${RUBY} -Ilib:.:test -e 'Dir["tests/**/test_*.rb"].each {|f| require f}' || die
-}
diff --git a/dev-ruby/git/git-1.13.1.ebuild b/dev-ruby/git/git-1.18.0.ebuild
index d9cbcab1b2db..12bd3c3a5b13 100644
--- a/dev-ruby/git/git-1.13.1.ebuild
+++ b/dev-ruby/git/git-1.18.0.ebuild
@@ -12,8 +12,8 @@ RUBY_FAKEGEM_GEMSPEC="git.gemspec"
 inherit ruby-fakegem
 
 DESCRIPTION="Library for using Git in Ruby"
-HOMEPAGE="https://github.com/schacon/ruby-git"
-SRC_URI="https://github.com/schacon/ruby-git/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://github.com/ruby-git/ruby-git"
+SRC_URI="https://github.com/ruby-git/ruby-git/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 RUBY_S="ruby-git-${PV}"
 
 LICENSE="MIT"
@@ -33,12 +33,10 @@ all_ruby_prepare() {
 	sed -i -e "s:/tmp:${TMPDIR}:" tests/units/test_archive.rb tests/test_helper.rb || die
 
 	sed -i -e 's/__dir__/"."/' -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	sed -i -e 's/1.12.0/'${PV}'/' lib/git/version.rb || die
 }
 
 each_ruby_test() {
 	git config --global user.email "git@example.com" || die
 	git config --global user.name "GitExample" || die
-	${RUBY} -Ilib:.:test -e 'Dir["tests/**/test_*.rb"].each {|f| require f}' || die
+	${RUBY} -Ilib:.:tests -e 'Dir["tests/**/test_*.rb"].each {|f| require f}' || die
 }