From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1774594-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (4096 bits))
	(No client certificate requested)
	by finch.gentoo.org (Postfix) with ESMTPS id 4CB4415808A
	for <garchives@archives.gentoo.org>; Thu, 07 Aug 2025 01:12:28 +0000 (UTC)
Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange x25519)
	(No client certificate requested)
	(Authenticated sender: relay-lists.gentoo.org@gentoo.org)
	by smtp.gentoo.org (Postfix) with ESMTPSA id 364DE342096
	for <garchives@archives.gentoo.org>; Thu, 07 Aug 2025 01:12:28 +0000 (UTC)
Received: from bobolink.gentoo.org (localhost [127.0.0.1])
	by bobolink.gentoo.org (Postfix) with ESMTP id 8217211055F;
	Thu, 07 Aug 2025 01:12:21 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange x25519)
	(No client certificate requested)
	by bobolink.gentoo.org (Postfix) with ESMTPS id 787E411055F
	for <gentoo-commits@lists.gentoo.org>; Thu, 07 Aug 2025 01:12:21 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id 2F078342084
	for <gentoo-commits@lists.gentoo.org>; Thu, 07 Aug 2025 01:12:21 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id 73995322F
	for <gentoo-commits@lists.gentoo.org>; Thu, 07 Aug 2025 01:12:19 +0000 (UTC)
From: "Yixun Lan" <dlan@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Yixun Lan" <dlan@gentoo.org>
Message-ID: <1754527467.1e313378e4e8e4e0f46f75f09152e0acc6840dbc.dlan@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: app-shells/bash-completion/
X-VCS-Repository: repo/gentoo
X-VCS-Files: app-shells/bash-completion/bash-completion-2.16.0-r2.ebuild app-shells/bash-completion/bash-completion-9999.ebuild
X-VCS-Directories: app-shells/bash-completion/
X-VCS-Committer: dlan
X-VCS-Committer-Name: Yixun Lan
X-VCS-Revision: 1e313378e4e8e4e0f46f75f09152e0acc6840dbc
X-VCS-Branch: master
Date: Thu, 07 Aug 2025 01:12:19 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 8caead91-6ad5-49f0-8247-7ee985bb20f4
X-Archives-Hash: 047a883f333bd0fc1f91a42e66833522

commit:     1e313378e4e8e4e0f46f75f09152e0acc6840dbc
Author:     jinqiang zhang <peeweep <AT> 0x0 <DOT> ee>
AuthorDate: Mon Aug  4 15:05:26 2025 +0000
Commit:     Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Thu Aug  7 00:44:27 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e313378

app-shells/bash-completion: remove block net-fs/mc

net-fs/mc no longer have file collision with app-shells/bash-completion.

Closes: https://bugs.gentoo.org/639828
Closes: https://github.com/gentoo/gentoo/pull/43060
Signed-off-by: jinqiang zhang <peeweep <AT> 0x0.ee>
Signed-off-by: Yixun Lan <dlan <AT> gentoo.org>

 ...999.ebuild => bash-completion-2.16.0-r2.ebuild} | 61 ++++++++++------------
 .../bash-completion/bash-completion-9999.ebuild    |  2 -
 2 files changed, 29 insertions(+), 34 deletions(-)

diff --git a/app-shells/bash-completion/bash-completion-9999.ebuild b/app-shells/bash-completion/bash-completion-2.16.0-r2.ebuild
similarity index 71%
copy from app-shells/bash-completion/bash-completion-9999.ebuild
copy to app-shells/bash-completion/bash-completion-2.16.0-r2.ebuild
index 437c7a111cf9..11c8c8d1aecd 100644
--- a/app-shells/bash-completion/bash-completion-9999.ebuild
+++ b/app-shells/bash-completion/bash-completion-2.16.0-r2.ebuild
@@ -3,25 +3,30 @@
 
 EAPI=8
 
+BASHCOMP_P=bashcomp-2.0.3
 PYTHON_COMPAT=( python3_{10..13} )
 
-inherit autotools eapi9-ver git-r3 python-any-r1
+inherit autotools python-any-r1
 
 DESCRIPTION="Programmable Completion for bash"
 HOMEPAGE="https://github.com/scop/bash-completion"
-EGIT_REPO_URI="https://github.com/scop/bash-completion"
+SRC_URI="
+	https://github.com/scop/bash-completion/releases/download/${PV}/${P}.tar.xz
+	eselect? (
+		https://github.com/projg2/bashcomp2/releases/download/v${BASHCOMP_P#*-}/${BASHCOMP_P}.tar.gz
+	)
+"
 
 LICENSE="GPL-2+"
 SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="+eselect test"
 RESTRICT="!test? ( test )"
 
-# completion collision with net-fs/mc
 RDEPEND="
 	>=app-shells/bash-4.3_p30-r1:0
 	sys-apps/miscfiles
 	!<app-text/tree-2.1.1-r1
-	!!net-fs/mc
 "
 BDEPEND="
 	test? (
@@ -39,6 +44,7 @@ PDEPEND="
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.14.0-optimize-kernel-modules.patch
+	"${FILESDIR}"/${PN}-2.16.0-libsecret-completion.patch
 )
 
 strip_completions() {
@@ -56,9 +62,17 @@ strip_completions() {
 
 		# Now-dead symlinks to deprecated completions
 		hd ncal
+
+		# For GNU mailman, which isn't packaged. If mailman isn't installed,
+		# it triggers a QA warning.
+		arch
 	)
 
-	rm -v "${strip_completions[@]/#/${ED}/usr/share/bash-completion/completions/}" || die
+	local file
+	for file in "${strip_completions[@]}"; do
+		rm "${ED}"/usr/share/bash-completion/completions/${file} ||
+			die "stripping ${file} failed"
+	done
 
 	# remove deprecated completions (moved to other packages)
 	rm "${ED}"/usr/share/bash-completion/completions/_* || die
@@ -74,23 +88,13 @@ pkg_setup() {
 	use test && python-any-r1_pkg_setup
 }
 
-src_unpack() {
-	use eselect && git-r3_fetch https://github.com/projg2/bashcomp2
-	git-r3_fetch
-
-	use eselect && git-r3_checkout https://github.com/projg2/bashcomp2 \
-		"${WORKDIR}"/bashcomp2
-	git-r3_checkout
-}
-
 src_prepare() {
 	if use eselect; then
-		# generate and apply patch
-		emake -C "${WORKDIR}"/bashcomp2 bash-completion-blacklist-support.patch
-		eapply "${WORKDIR}"/bashcomp2/bash-completion-blacklist-support.patch
+		eapply "${WORKDIR}/${BASHCOMP_P}/bash-completion-blacklist-support.patch"
 	fi
 
 	default
+	# Only needed for ${PN}-2.16.0-libsecret-completion.patch
 	eautoreconf
 }
 
@@ -104,6 +108,11 @@ src_test() {
 		test/t/test_vi.py::TestVi::test_2
 		test/t/test_xmlwf.py::TestXmlwf::test_2 #bug 886159
 		test/t/test_xrandr.py::TestXrandr::test_output_filter
+		test/t/unit/test_unit_dequote.py
+		test/t/test_sudo.py::TestSudo::test_1 #bug 935400
+		test/t/test_xfreerdp.py::TestXfreerdp::test_6 #bug 935400
+		test/t/unit/test_unit_command_offset.py::TestUnitCommandOffset::test_cmd_quoted #bug 931744
+		test/t/test_make.py::TestMake::test_6 #bug 931744
 	)
 	local EPYTEST_IGNORE=(
 		# stupid test that async tests work
@@ -142,25 +151,13 @@ src_install() {
 
 	# install the eselect module
 	if use eselect; then
-		emake -C "${WORKDIR}"/bashcomp2 DESTDIR="${D}" \
-			PREFIX="${EPREFIX}/usr" install
+		insinto /usr/share/eselect/modules
+		doins "${WORKDIR}/${BASHCOMP_P}/bashcomp.eselect"
+		doman "${WORKDIR}/${BASHCOMP_P}/bashcomp.eselect.5"
 	fi
 }
 
 pkg_postinst() {
-	if ver_replacing -lt 2.1-r90; then
-		ewarn "For bash-completion autoloader to work, all completions need to"
-		ewarn "be installed in /usr/share/bash-completion/completions. You may"
-		ewarn "need to rebuild packages that installed completions in the old"
-		ewarn "location. You can do this using:"
-		ewarn
-		ewarn "$ find ${EPREFIX}/usr/share/bash-completion -maxdepth 1 -type f '!' -name 'bash_completion' -exec emerge -1v {} +"
-		ewarn
-		ewarn "After the rebuild, you should remove the old setup symlinks:"
-		ewarn
-		ewarn "$ find ${EPREFIX}/etc/bash_completion.d -type l -delete"
-	fi
-
 	if has_version 'app-shells/zsh'; then
 		elog
 		elog "If you are interested in using the provided bash completion functions with"

diff --git a/app-shells/bash-completion/bash-completion-9999.ebuild b/app-shells/bash-completion/bash-completion-9999.ebuild
index 437c7a111cf9..3489ced000b6 100644
--- a/app-shells/bash-completion/bash-completion-9999.ebuild
+++ b/app-shells/bash-completion/bash-completion-9999.ebuild
@@ -16,12 +16,10 @@ SLOT="0"
 IUSE="+eselect test"
 RESTRICT="!test? ( test )"
 
-# completion collision with net-fs/mc
 RDEPEND="
 	>=app-shells/bash-4.3_p30-r1:0
 	sys-apps/miscfiles
 	!<app-text/tree-2.1.1-r1
-	!!net-fs/mc
 "
 BDEPEND="
 	test? (