gentoo auto-resync : 25:04:2023 - 06:11:52

6 files changed, 13 insertions, 31 deletions

diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index 9f3c744e35a3..624c0fa5f5a4 100644
--- a/dev-vcs/Manifest.gz
+++ b/dev-vcs/Manifest.gz
diff --git a/dev-vcs/git-extras/Manifest b/dev-vcs/git-extras/Manifest
index 9932d1582fa4..b25be31cf62a 100644
--- a/dev-vcs/git-extras/Manifest
+++ b/dev-vcs/git-extras/Manifest
@@ -1,7 +1,6 @@
-AUX git-extras-6.1.0-no-bash-completion-install.patch 556 BLAKE2B 9fbf1516888da9c5952fdaedf28987bcf46e62c6dd1342f810c9150625a78198224855dd18b386076a4fd689418c05d61cc8f0c5c0f747fb96ac6209a4fb402f SHA512 70d25e577174238f5fce6a3810146358904493a7ec3963eef6be8780de7b62bcda7e2c542e8f02cf2dd229acfc7368b72dfd4aff668fbc4e841eb6754b2036f2
 AUX git-extras-6.5.0-no-bash-completion-install.patch 803 BLAKE2B b87372a0df3ed314a360ff52eb0cbc01b0cbe52e5ec530ea47ec0bdaacf14a282aa78a1bf4309dba00f8727847b450f0b4d5cdd6deb05e67b2bbcd66394c294c SHA512 c910b8a0f5f4d2d84c6ab679f08fedc74b6625d27e7b72c4fac0fad71f39af3513c4094cdfea4235ae1fa611b3ff305ff48fa6d223638d82216c1dec4276793f
-DIST git-extras-6.4.0.tar.gz 163508 BLAKE2B bffbc8efcf1cf030bceb20b953e1cbbc067c8383ced38b786c21eb9bd9b7d3febd3d8aae652c0dd731de688d3cfa225c3aec91d6b9c590459b576db113ca0af0 SHA512 1b28d09d294f6d060b7639401e56c8d5e762614b5f6928ee6267e49af943e349e2399558ebac60008e8240218c13f00f8aea7dc07b71fec1e2dc25487bc847a3
 DIST git-extras-6.5.0.tar.gz 167015 BLAKE2B 44331744399f55f9c6bba26bd0eef95e87a5b8ed0a216f3a4a71397fd2ac7aad4325ef787e1970f54c5b8732d0d291c20d6103c8549f3a1eb315bd7fe884337e SHA512 1dbf350ab822f5317d57ca7b90b914a71d3ad83746a79a369e221d20ade606b07a8b0f702610f50d1551c5c3ca12517df18106c6066745b40bf966052bbe9a46
-EBUILD git-extras-6.4.0.ebuild 1133 BLAKE2B ddf932765927787de3c86a2bd7a09cfb6ff694c5780f30f376ab1f47ee8e420178d415c7d548b1848c4a9c5e5a5bc11bbe70b3544238f035121dd7724351c943 SHA512 4b76fad12abcab62bb43c22d676562843d728a3a146236e0dfd3823d9c28e60b6ff1fd8b4875c1e3e2f7c2206f76f6e85da567888ddf9d6cc93150ca427a7bb4
+DIST git-extras-7.0.0.tar.gz 169165 BLAKE2B 8b6ae331b761729d5f92cd350bf21f4f5ebb5098092e224f49db9fe5ef2cbdcd3fc2783af2fb74a8d22008d35675d9a753e753d5fa60e586dbbde919dab7ff80 SHA512 0768ea3de95f5b3de1912dced2c889c2dff823d5c4b8a796c73da043af36b75b3194760a30e8fe7c2525b681fe81fa45a438d0481f4a5166ff6de6d5d7d05927
 EBUILD git-extras-6.5.0.ebuild 1104 BLAKE2B 58d5bdcdfe826794e9c253fb862f64dc3e71851ff9fb8f511d867650d0e7d36ee20d5ce0932278e3db1cfd68b4dae619882111e02ccdc5571319efa046f1096d SHA512 c99d725e57b60d695c696c7a98bb0526c90138615a7952a2600743eb4a7825bb54b97b0df3801b8f2865343b50223739e5575b1fce25f66dbd5f6b229321cae3
+EBUILD git-extras-7.0.0.ebuild 1105 BLAKE2B 042f275b96c9398c44c0ecf5d585813c1e5c7f5bd51c81048c788042778199e11c2162847a8f8abae3ec0d743a5a9b1f89bfd97f87f8b9a1c6d444462ce9f80f SHA512 d70445fa3018dff31003e935f61244722471f1b9b0899ef28cda98e206c3c49df4ea8111f41aeeea6a052e2039577d38058d8b7ac02f7bfb1b273734a660f050
 MISC metadata.xml 318 BLAKE2B d62d3d04e485a54a0790bbe4390525d6f3ee34ce8ce0c863de54f80c54bfd78f60a32222c0ad101343c3ee7040d5894671a7669c8fc89082bef827cb4edff7ef SHA512 608c0ded622cf20a6d23659fd42295b4c3d70127896b35be659c6d200d649cf496eda5a217deb356754919e0e9d0b635ad38d9b23ae4badd9fdfcf9887f20258
diff --git a/dev-vcs/git-extras/files/git-extras-6.1.0-no-bash-completion-install.patch b/dev-vcs/git-extras/files/git-extras-6.1.0-no-bash-completion-install.patch
deleted file mode 100644
index c1d606c3a38c..000000000000
--- a/dev-vcs/git-extras/files/git-extras-6.1.0-no-bash-completion-install.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-We shouldn't install this manually via the Makefile - or to that location.
---- a/Makefile
-+++ b/Makefile
-@@ -69,8 +69,6 @@ install: check
- 		cp -f man/git-*.1 $(DESTDIR)$(MANPREFIX); \
- 		echo "cp -f man/git-*.1 $(DESTDIR)$(MANPREFIX)"; \
- 	fi
--	@mkdir -p $(DESTDIR)$(SYSCONFDIR)/bash_completion.d
--	cp -f etc/bash_completion.sh $(DESTDIR)$(SYSCONFDIR)/bash_completion.d/git-extras
- 	@echo ""
- 	@echo "If you are a zsh user, you may want to 'source $(CODE_DIR)etc/git-extras-completion.zsh'" \
- 		"and put this line into ~/.zshrc to enable zsh completion"
diff --git a/dev-vcs/git-extras/git-extras-6.4.0.ebuild b/dev-vcs/git-extras/git-extras-7.0.0.ebuild
index 5cf7cb509f5a..1c679d084497 100644
--- a/dev-vcs/git-extras/git-extras-6.4.0.ebuild
+++ b/dev-vcs/git-extras/git-extras-7.0.0.ebuild
@@ -1,7 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
+
+inherit bash-completion-r1
 
 DESCRIPTION="Git utilities -- repo summary, repl, changelog population, and many more"
 HOMEPAGE="https://github.com/tj/git-extras"
@@ -12,23 +14,15 @@ SLOT="0"
 KEYWORDS="~amd64 ~x64-macos"
 
 RDEPEND="
-	app-shells/bash
+	>=app-shells/bash-4.0:*
 	dev-vcs/git
 "
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-6.1.0-no-bash-completion-install.patch
-)
-
 src_prepare() {
 	default
 
 	# For now, don't force including the git completion
-	# sed -i -e "1 i source $(get_bashcompdir)\/git" etc/bash_completion.sh || die
-}
-
-src_configure() {
-	return
+	sed -i -e "1 i source $(get_bashcompdir)\/git" etc/bash_completion.sh || die
 }
 
 src_compile() {
@@ -40,6 +34,7 @@ src_install() {
 		DESTDIR="${D}" \
 		PREFIX="${EPREFIX}/usr" \
 		SYSCONFDIR="${EPREFIX}/etc" \
+		COMPL_DIR="${D}/$(get_bashcompdir)" \
 		install
 
 	# TODO: Unfortunately, none of the completion seems to
diff --git a/dev-vcs/subversion/Manifest b/dev-vcs/subversion/Manifest
index 26dc688270f8..6d0d59be0bb8 100644
--- a/dev-vcs/subversion/Manifest
+++ b/dev-vcs/subversion/Manifest
@@ -5,5 +5,5 @@ AUX svnserve.initd3 575 BLAKE2B 4bc540dd8693c792fca8fd1061a49608ce7ee9a82d79fc43
 AUX svnserve.xinetd 332 BLAKE2B 95af871ddd83c405cd4072a8bb6293376383d5437562aa604a5eff8e0f34c8763056bf1ea92b11be4f4d4ac5af3fa191b24d4c2040c3a41458103015e24bf09e SHA512 80b486507d03f430e189ef65901ed185f487651400bada5709f544954eb6175d20a11cf98893f80ec963e434c5db5642bf9d1603d698ad8bbf96b88fa45ddbae
 DIST subversion-1.10.0_rc1-patches-1.tar.xz 2984 BLAKE2B 7c9619b95ca6b433a58dc5baf3a1e1b14ef0017f714af81762b975d50a37b743788a4da65cf7f9eb8e633cbc813ad8dd974b530a19ec2d3fc74b75921f8f0c17 SHA512 aa7a25a253ea2da99520399d292d3e1602985392bae6dc5582003fdb9719d654638754b6e370b68b184ee6729ba3833bd511c09b2cb36f8f476b42063f55fbb2
 DIST subversion-1.14.2.tar.bz2 8606570 BLAKE2B cf15c61b932823fb18b52f83d84907386f068d2d40e14dbab94c42ad9d4c0fdf35d82db78036d7c1f2be47c2d51cdd27bfb966eb7607a52a21e072aeff76fb38 SHA512 20ada4688ca07d9fb8da4b7d53b5084568652a3b9418c65e688886bae950a16a3ff37710fcfc9c29ef14a89e75b2ceec4e9cf35d5876a7896ebc2b512cfb9ecc
-EBUILD subversion-1.14.2-r1.ebuild 12476 BLAKE2B 7c57efb352124c3caf6073b32cb4d858c9c6278d229a5efb9c647c26da4cab2047719185fc84d35966cfde5086ab97a1e8e85dd28dec928e63a801a80ac9882a SHA512 3a671fabf3268f3c38f65a3e0dbfb872106d4c5aa8e4bf7b03939f892dfa23c23092e4e885b51f544d07423a6a1977c5de83ec1e01457cd6d1661b930bfcab13
+EBUILD subversion-1.14.2-r1.ebuild 12587 BLAKE2B 512bc48fca82d878a2949e53d0d6202893d87a109e45b95237a179d85294fa5d4a7c5aa6ce83521b5725c2e71c6734de8ce6cba4dfc35795290d334512f8aa1d SHA512 bc2c847aef0e66cb182b48f19c062706a61617084351496205219480359b1bbd1f020bd51c0ff5f5c7ea750bb9172129fc570a0b2c1768acc0f867517a55e056
 MISC metadata.xml 819 BLAKE2B 1c4a8bd42cc1030719952aac2c72c40f175a22bd6eaf7e4d40638833d7a2d4c39f9da8a04bb57e1a6bcf99ade22fe7208e218f8f50d75501d835092d5ef4c105 SHA512 830789bd4225a2c5565466d8857c0cc184071962572e466bd8918ecd12b986d0017c2d6016d7d70d9a6dbbe15abce8497a2a31a5dd5e3feea5695533c417b11e
diff --git a/dev-vcs/subversion/subversion-1.14.2-r1.ebuild b/dev-vcs/subversion/subversion-1.14.2-r1.ebuild
index b5d43cf56b8c..2a9b803e1b87 100644
--- a/dev-vcs/subversion/subversion-1.14.2-r1.ebuild
+++ b/dev-vcs/subversion/subversion-1.14.2-r1.ebuild
@@ -134,12 +134,12 @@ pkg_setup() {
 		local rbslot
 		RB_VER=""
 		for rbslot in $(sed 's@\([[:digit:]]\+\)\([[:digit:]]\)@\1.\2@g' <<< ${USE_RUBY//ruby}) ; do
-			if has_version dev-lang/ruby:${rbslot} ;  then
+			# No break here as we want to pick the best (latest)
+			if has_version "dev-lang/ruby:${rbslot}" && has_version "virtual/rubygems[ruby_targets_ruby${rbslot}(-)]" ; then
 				RB_VER="${rbslot/.}"
-				break
 			fi
 		done
-		[[ -z "${RB_VER}" ]] && die "No useable ruby version found"
+		[[ -z "${RB_VER}" ]] && die "No usable ruby version found"
 	fi
 }