gentoo auto-resync : 15:12:2023 - 08:46:53

4 files changed, 89 insertions, 1 deletions

diff --git a/app-misc/cdargs/Manifest b/app-misc/cdargs/Manifest
index 296b1c67cd1c..c8ef321db2f3 100644
--- a/app-misc/cdargs/Manifest
+++ b/app-misc/cdargs/Manifest
@@ -1,6 +1,9 @@
 AUX 50cdargs-gentoo.el 270 BLAKE2B d39eb5ffd0e910aae99706b6e802621180a090d6ee221b5fad300b37c3a337bfa6f7aa0e0673e6776b8090bad9e8ded919d242e2d47c293dd102a64b01238ba7 SHA512 ee6765ea4222102678d482a3728e2ba3aac0b0709b6148b7d7755421e00125be0b15a41bce2d8fce4340865a10863f519d5c87729aa66ec9216e9618cf059f75
 AUX cdargs-1.35-format_security.patch 212 BLAKE2B 0abb8f8e238f25425dac6fed3b43846370634e4129186b39b72772f6d6d761a67aff678a2388df576da4c230364e103a1609e3ddf57fb8550685ba642cafbe9c SHA512 33e96c48ccc4fb09359eb1720488f5ed231e3c5b40fbd7ce71ca0903e4c17095d60f9d3b2bc506402839ef6c6b8e88bba2548120a1c59464d83070e3d782d750
 AUX cdargs-1.35-tinfo.patch 482 BLAKE2B dd9d06363022048293034643d495fc16fd0d1fdfef8190034fbdfb1e6e1c4654a34da6454e1c0bf553880eb512202c208c9d4d9aead7ad4a8f4d7993ec0943fe SHA512 54bf6faa9dfafa7b6749cbd94518e8735e5cdc9a2dcd477e7d3a98a96d64a90277871761058c11a54722331edccb850fa20b4a1f857ef9e1520f9875951c6873
+AUX cdargs-2.1-musl.patch 473 BLAKE2B 785d4d8c2f0526354ec28e2bcaadc0280fa4105eca2fd62e78863e551e8b70ffb64cb5b33b88506a90885c3c9da2e657fec5f0046d950f5ea1f6f4602fe56cb4 SHA512 293c2adeeadd9dca9797fd10ef7d9b71698bbccaf146ca0791e557fede4bf022dc0d7d01cef3fe727f45c8c7fe451ddb460d0bd7057849be5e61399735d604fc
 DIST cdargs-1.35.tar.gz 74103 BLAKE2B 06fa5b4ed7c00dbcceeda28c2b02dd46431748434a692f3690885dc1141764e8aacef2e09cab57cf1baab32cb66c5c39a846a09fd6381723f47cd8dc98c8584f SHA512 13df5d18de6f62309a0ecccc0dd95508d81d1955f87cfd2962360d3b7d74c5cdc2b0d2e00f7a4f1e7556bfbcbd3e2ecf4847a1a48ab47442e6d2d5a36db0cf0c
+DIST cdargs-2.1.tar.gz 127945 BLAKE2B a0020de2f019985f40910ef95aeb189cd3bd6e701aab986e2b13ff3a43965c29bc940e7553ea8722147e2fd8e21ce852d075561832a9e4972cf9d3ba8ee043ba SHA512 5914d5d2096386db523115c0c6d26f6f328287e0e87d829e19217ab9ef34f70d7fd6af14d73d5020f61d90342ce8ec81a1364000531d2715ef6ba961ae0d222a
 EBUILD cdargs-1.35-r2.ebuild 1509 BLAKE2B 763746b9efc5f2dc87eae6d45b493aebf68a721df30e65cd7ad9c19c67e4ed62a69b42432603bc563ef5cf9d1fe8102d15687a982fc6d2c3db9342066010eda9 SHA512 8eee6d3ab9152b6d1167b0b01877f3ef508b9dd945e2261f1b094d4f429c83fca80bec9409e28010a907edf3d84d314056257500f833ed199e81d0d1969abfb1
-MISC metadata.xml 266 BLAKE2B 74ac06b4ea12603c8713e69cbff9ce6874266fc48ee5c846f0ac3d50bf577c3edb1e4b6690ec44fc4dd51e55e96dd5c2478831c9f754b04661fe7700d8baf66f SHA512 b996554131284e3556af42d2c5032c5b1635de67d48983096991935e7ee04c32aadc93e48cae5160861e86d64eb6fd4abafc40d9dd8b85ddc032b042a77677cb
+EBUILD cdargs-2.1.ebuild 1561 BLAKE2B b305eb3a1b78465272fba9050eb66435dec42a39eda65ed166f213113c2e6a4cbec6a4e1c72daae3a441b312e37afba373e5de9ec7b4284e8accdb0a6f56bc37 SHA512 ecc9bdcf10d45def5140d35c2fcbc901a7ebf8273d77655ea448b4f37ed98a2596b1af0276a77499fc9a6834361df121a287ebd0a7a7dc47efa0449675c0e4a4
+MISC metadata.xml 348 BLAKE2B d6a308b3fd2b95c6fdd591729fcabb944c6a1ee47b7d5a3792cee3a7ff075470d55073733fe94dd5666d3a9dfe78413f17a71ae1b5dc24a13a19ccb281427dc9 SHA512 ff1942c8865213cb70f3b76d1d38ddf95a2cf6d8b0a33f82f3a4fdf22ce3aa32a20ea5d2f3b7df173b122efde05610015ec7b41c4cb238ed1e8211e398fcbc6e
diff --git a/app-misc/cdargs/cdargs-2.1.ebuild b/app-misc/cdargs/cdargs-2.1.ebuild
new file mode 100644
index 000000000000..6c6b90b66a2e
--- /dev/null
+++ b/app-misc/cdargs/cdargs-2.1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson elisp-common
+
+DESCRIPTION="Bookmarks and browser for the shell builtin cd command"
+HOMEPAGE="https://www.skamphausen.de/cgi-bin/ska/CDargs https://github.com/cbxbiker61/cdargs"
+SRC_URI="https://github.com/cbxbiker61/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="emacs"
+
+DEPEND="
+	sys-libs/ncurses:0=
+	emacs? ( >=app-editors/emacs-23.1:* )
+"
+RDEPEND="${DEPEND}"
+
+SITEFILE=50${PN}-gentoo.el
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.35-format_security.patch
+	"${FILESDIR}"/${PN}-1.35-tinfo.patch
+	"${FILESDIR}"/${PN}-2.1-musl.patch
+)
+
+src_compile() {
+	meson_src_compile
+
+	use emacs && elisp-compile contrib/cdargs.el
+}
+
+src_install() {
+	meson_src_install
+
+	cd "${S}"/contrib || die
+	insinto /usr/share/cdargs
+	doins cdargs-bash.sh cdargs-tcsh.csh
+
+	if use emacs ; then
+		elisp-install ${PN} cdargs.{el,elc}
+		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+
+	elog "Add the following line to your ~/.bashrc to enable cdargs helper"
+	elog "functions/aliases in your environment:"
+	elog "[ -f /usr/share/cdargs/cdargs-bash.sh ] && \\ "
+	elog "		source /usr/share/cdargs/cdargs-bash.sh"
+	elog
+	elog "Users of tcshell will find cdargs-tcsh.csh there with a reduced"
+	elog "feature set.  See INSTALL file in the documentation directory for"
+	elog "more information."
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/app-misc/cdargs/files/cdargs-2.1-musl.patch b/app-misc/cdargs/files/cdargs-2.1-musl.patch
new file mode 100644
index 000000000000..81130482a500
--- /dev/null
+++ b/app-misc/cdargs/files/cdargs-2.1-musl.patch
@@ -0,0 +1,17 @@
+In Musl path max is in limits.h and not automatically pulled in
+
+Pascal Jäger <pascal.jaeger@leimstift.de> (2023-10-14)
+
+Bug: https://bugs.gentoo.org/713962
+upstream PR: https://github.com/cbxbiker61/cdargs/pull/8
+
+--- a/src/cdargs.cc
++++ b/src/cdargs.cc
+@@ -56,6 +56,7 @@ using namespace std;
+ # include <unistd.h>
+ # include <signal.h>
+ # include <string.h>
++# include <limits.h>
+ 
+ //# if defined(USE_NCURSES) && !defined(RENAMED_NCURSES)
+ # if defined(HAVE_NCURSES_H)
diff --git a/app-misc/cdargs/metadata.xml b/app-misc/cdargs/metadata.xml
index 6258504e5133..e895ffabed55 100644
--- a/app-misc/cdargs/metadata.xml
+++ b/app-misc/cdargs/metadata.xml
@@ -5,4 +5,7 @@
 		<email>shell-tools@gentoo.org</email>
 		<name>Gentoo Shell Tools Project</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">cbxbiker61/cdargs</remote-id>
+	</upstream>
 </pkgmetadata>