gentoo auto-resync : 13:08:2024 - 11:06:03

3 files changed, 76 insertions, 6 deletions

diff --git a/app-shells/dash/Manifest b/app-shells/dash/Manifest
index d6135ae8f9b7..1b46d12b5d93 100644
--- a/app-shells/dash/Manifest
+++ b/app-shells/dash/Manifest
@@ -1,3 +1,4 @@
 DIST dash-0.5.12.tar.gz 246054 BLAKE2B f4c5e7088d7b591e0890a0e1363ef4f70074f4033ae34d3f82d71379cee78876e1e89b5d8e4afa3ce9380f8d94c3e8970c480a21257f87706112dd883667893e SHA512 13bd262be0089260cbd13530a9cf34690c0abeb2f1920eb5e61be7951b716f9f335b86279d425dbfae56cbd49231a8fdffdff70601a5177da3d543be6fc5eb17
-EBUILD dash-0.5.12.ebuild 1572 BLAKE2B 49a5d3f5ba87c66aa4ab23dce943e42b55936dcd819edf994b77b2d0147db86289228fd10f663e14e7f6432e33e8080ca652f1480515e74f4a2a8270cbf5ae2d SHA512 1ba449544c5df35be0969556aad44597339845a6073ae5ff63168d63e3a3264c884ae1b0f34fd05912aeaba3a0035ed40f17e8080fcce29cff5670da615c0fb3
+EBUILD dash-0.5.12.ebuild 1657 BLAKE2B a7eba6936a1b60405f99d8f73ce624c267978a74aa8453a38bc34f268a7da9622e3f681976be1d84aa3670f8b18f14124502bfdb450112d2f42d2dfe695453f9 SHA512 8cb7b67f847afb2307fdb43afc3ca63d6ff3a6b5a6b08fa582bd7d60f8b400c468070386856714ada05ad0d97535206ff955dbd260ae0c6c48921387dd0b0965
+EBUILD dash-9999.ebuild 1665 BLAKE2B 709bbab84bf65928234b3bbcfece1fc179fbac04b23b6688ee7789d4a4af6f0ccf17b526729c22674d0ebc5652a7cabe1a4637642a8a7ed422633805f63181ec SHA512 0c62b92267e027d3854bfa00ea63e67d80c29b56a4ef38156cb437fc614e037c921bfb0e62acd049d7abff6cd2b8b5b074895705575a07f1b3ecc3841e9f8660
 MISC metadata.xml 491 BLAKE2B 3d08132186e59ebe99a373e66213bfbba27182568e7eecbf508746d0906f980e3ebfdf216435a92b5493c13d40046dae037792258386d37f3eebcaa153fb3bf3 SHA512 8b441641d69c13cc5aeb93ad447c387b85d4b1958b67673df6ac5867073e4f204e6e06e35f3b92083266539bf3a0b1ee568aa2aa502ff8b27b9e54bed18b4d84
diff --git a/app-shells/dash/dash-0.5.12.ebuild b/app-shells/dash/dash-0.5.12.ebuild
index 7659ef8d0f3b..59890c831e69 100644
--- a/app-shells/dash/dash-0.5.12.ebuild
+++ b/app-shells/dash/dash-0.5.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -7,11 +7,16 @@ inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="Debian Almquist Shell"
 HOMEPAGE="http://gondor.apana.org.au/~herbert/dash/"
-SRC_URI="http://gondor.apana.org.au/~herbert/dash/files/${P}.tar.gz"
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/dash/dash.git"
+	inherit autotools git-r3
+else
+	SRC_URI="http://gondor.apana.org.au/~herbert/dash/files/${P}.tar.gz"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+fi
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="libedit static"
 
 BDEPEND="virtual/pkgconfig"
@@ -24,8 +29,7 @@ DEPEND="
 src_prepare() {
 	default
 
-	# Fix the invalid sort
-	sed -i -e 's/LC_COLLATE=C/LC_ALL=C/g' src/mkbuiltins || die
+	[[ ${PV} == 9999 ]] && eautoreconf
 
 	# Use pkg-config for libedit linkage
 	sed -i \
diff --git a/app-shells/dash/dash-9999.ebuild b/app-shells/dash/dash-9999.ebuild
new file mode 100644
index 000000000000..86b5b85b179a
--- /dev/null
+++ b/app-shells/dash/dash-9999.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="Debian Almquist Shell"
+HOMEPAGE="http://gondor.apana.org.au/~herbert/dash/"
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/dash/dash.git"
+	inherit autotools git-r3
+else
+	SRC_URI="http://gondor.apana.org.au/~herbert/dash/files/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="libedit static"
+
+BDEPEND="virtual/pkgconfig"
+RDEPEND="!static? ( libedit? ( dev-libs/libedit ) )"
+DEPEND="
+	${RDEPEND}
+	libedit? ( static? ( dev-libs/libedit[static-libs] ) )
+"
+
+src_prepare() {
+	default
+
+	[[ ${PV} == 9999 ]] && eautoreconf
+
+	# Use pkg-config for libedit linkage
+	sed -i \
+		-e "/LIBS/s:-ledit:\`$(tc-getPKG_CONFIG) --libs libedit $(usex static --static '')\`:" \
+		configure || die
+}
+
+src_configure() {
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		# don't redefine stat, open, dirent, etc. on Solaris
+		export ac_cv_func_stat64=yes
+		export ac_cv_func_open64=yes
+	fi
+
+	if [[ ${CHOST} == powerpc-*-darwin* ]] ; then
+		sed -i -e 's/= stpncpy(s, \([^,]\+\), \([0-9]\+\))/+= snprintf(s, \2, "%s", \1)/' \
+			src/jobs.c || die
+	fi
+
+	use static && append-ldflags -static
+
+	append-cppflags -DJOBS=$(usex libedit 1 0)
+
+	# Do not pass --enable-glob due to #443552.
+	local myeconfargs=(
+		CC_FOR_BUILD="$(tc-getBUILD_CC)"
+		--bindir="${EPREFIX}"/bin
+		--enable-fnmatch
+		$(use_with libedit)
+	)
+
+	econf "${myeconfargs[@]}"
+}