gentoo auto-resync : 31:03:2024 - 02:13:53

6 files changed, 81 insertions, 13 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 56be917e6c55..078bfcf2d60a 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/quilt/Manifest b/dev-util/quilt/Manifest
index c69651f74e6a..24bb9daf0a71 100644
--- a/dev-util/quilt/Manifest
+++ b/dev-util/quilt/Manifest
@@ -1,5 +1,7 @@
 AUX quilt-0.66-no-graphviz.patch 1464 BLAKE2B b1a67706f29f3986de0202a4ea68aa2f001989354bf9ab91996cb4f5dbb6578baf28fc1ac781a18525d04fb92d9f6d554efcc598dabbdf1a35b0f63b93c3cd8d SHA512 3f935a6e137998f7d0391ef87f5324c8882490001b37333de22efc068bda8a7e84ccefc3e85616c3aa93894acb8a0841a2b089c59c6a658d1157298d4132707c
 DIST quilt-0.67.tar.gz 543713 BLAKE2B 691b42378a862bfaa8ac9ca042d03d149aaada05894e1d9b92ad4ddf213bf13674c08b72788626ed49c8ccbc792c31e5bc827f8911bf7b0e23733fbc75fca1d1 SHA512 2dcf9396444484e1664f3dc9bf6a024d11fbaac4e984a295b269bab2649e254dafe3dd89d8f79cfaf1c33d2aa80a803ea55eef4debbc1ebc8d3459ecfa52e4ec
+DIST quilt-0.68.tar.gz 551096 BLAKE2B b012d0ccc0efaa2b645eafe9279a511a9fbd7546f22f35aebdb5488bde433e841472b907cacdd5f451e20a15b348f651028591f9a2d5b195613948f754c06cb5 SHA512 a2a58b330ccb3dd55b1f280310d506c605166bceedf7439582cdf8a198ca4aa34a375fd8bfd4027c540481bcdf5e6175eafd19707aaabe194b01cf7caa40572e
 EBUILD quilt-0.67.ebuild 1635 BLAKE2B bf9eddd2db8cb9af9071fc56190f1e39f33059ff13e1573168b4761d0d1b0a4cad152b8615188cc3e08ff4b97fd4b18a0041a0509b1f8cfc77b55ebf32a0bc64 SHA512 90b9a56938b6a9a69a96806adc294b924bed0588582bf115cbfb4805829df1d7fbfb2d677e94645558d01884c1463c33524d032825adc5858b2f3f7affec116a
-EBUILD quilt-9999.ebuild 1753 BLAKE2B 43c45bf862f375e67dca43843ea827445110c47ec5e5a09459bba43538855759b7042a71ec6bfb8fc38d83b116a1236cee5997bf0d262c53638ae4999afddac9 SHA512 dc90d323e45d952b7edf51edc027eb6a0428dc5082ee43f8b3acfecfcfedf7d54ade30817f2e7612d17938d6a38d309ab135e19e5f7a8c6473b023863c72bacf
+EBUILD quilt-0.68.ebuild 1671 BLAKE2B c1d76aedf1e97189ba961d2b5f3f3bafba9449381444af8447aebc2bb71a56708ff6674f9ff9fd79742a65edb842008f4e5ede9f776a15eaa10eb0c107093ba6 SHA512 60636a6fdb8b07dd22388b672b0fdc43519a45872eddd78df48dfaa70c27d02db65c876cc5e25e2e84c5b518799defaf84c9e9138f52e513a8bd8a65d6b6e63d
+EBUILD quilt-9999.ebuild 1783 BLAKE2B 620a0cfac832d96aea589e0838d87159d20f3145ce3b1359871a9f0772804ce29992d204896c806ce979fedc30694163a56976e934fe250abe2b4b8e6fe7e3b1 SHA512 933d14a132b5d4c40f3678149d620699a166744883ea7eae0287799028e46cc39e5cee6861f61efd4b9a8e6bbf6d079ca049ea5373f52a3adf7734c901209d4c
 MISC metadata.xml 298 BLAKE2B a42ceb6cf539b835364f7e18417130c37e774dbe59786a7224e5eed1d0938d06630255f4959b8d250c3e436bdb098dcea460ccec48d737b67e838c9ff64ba48e SHA512 8ff3ddf90a99f6b142859c3c2cfca2f1049b71e29f8aff55bee07e8352b523c236c8a515e7c8f4259e6abfb950a22d1b5e1085a4a6b36e313d88d4af9a6254f9
diff --git a/dev-util/quilt/quilt-0.68.ebuild b/dev-util/quilt/quilt-0.68.ebuild
new file mode 100644
index 000000000000..f3192f796103
--- /dev/null
+++ b/dev-util/quilt/quilt-0.68.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+inherit bash-completion-r1
+
+DESCRIPTION="quilt patch manager"
+HOMEPAGE="https://savannah.nongnu.org/projects/quilt"
+SRC_URI="https://savannah.nongnu.org/download/quilt/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
+IUSE="emacs graphviz"
+# unresolved test failures
+RESTRICT="test"
+
+RDEPEND="sys-apps/ed
+	dev-util/diffstat
+	graphviz? ( media-gfx/graphviz )
+	elibc_Darwin? ( app-misc/getopt )
+	elibc_SunOS? ( app-misc/getopt )
+	>=sys-apps/coreutils-9.4-r1
+	app-arch/zstd:="
+
+PDEPEND="emacs? ( app-emacs/quilt-el )"
+
+pkg_setup() {
+	use graphviz && return 0
+	echo
+	elog "If you intend to use the folding functionality (graphical illustration of the"
+	elog "patch stack) then you'll need to remerge this package with USE=graphviz."
+	echo
+}
+
+src_prepare() {
+	# Add support for USE=graphviz
+	use graphviz || PATCHES+=( "${FILESDIR}"/${PN}-0.66-no-graphviz.patch )
+	default
+}
+
+src_configure() {
+	[[ ${CHOST} == *-darwin* || ${CHOST} == *-solaris* ]] && \
+		myconf="${myconf} --with-getopt=${EPREFIX}/usr/bin/getopt-long"
+	econf ${myconf}
+}
+
+src_install() {
+	emake BUILD_ROOT="${D}" install
+
+	rm -rf "${ED}"/usr/share/doc/${P}
+	dodoc AUTHORS COPYING NEWS TODO "doc/README" "doc/README.MAIL" "doc/quilt.pdf"
+
+	rm -rf "${ED}"/etc/bash_completion.d
+	newbashcomp bash_completion ${PN}
+
+	# Remove the compat symlinks
+	rm -rf "${ED}"/usr/share/quilt/compat
+
+	# Remove Emacs mode; newer version is in app-emacs/quilt-el, bug 247500
+	rm -rf "${ED}"/usr/share/emacs
+}
diff --git a/dev-util/quilt/quilt-9999.ebuild b/dev-util/quilt/quilt-9999.ebuild
index 799dff34026d..326eb8360cd1 100644
--- a/dev-util/quilt/quilt-9999.ebuild
+++ b/dev-util/quilt/quilt-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -27,6 +27,7 @@ RDEPEND="
 	elibc_SunOS? ( app-misc/getopt )
 	>=sys-apps/coreutils-8.32-r1
 	graphviz? ( media-gfx/graphviz )
+	app-arch/zstd:=
 "
 
 src_prepare() {
@@ -54,7 +55,7 @@ src_install() {
 	newbashcomp bash_completion ${PN}
 
 	rm -rf "${ED}"/usr/share/doc/${PN}
-	dodoc AUTHORS TODO "doc/README" "doc/README.MAIL" "doc/quilt.pdf"
+	dodoc AUTHORS COPYING NEWS TODO "doc/README" "doc/README.MAIL" "doc/quilt.pdf"
 
 	# Remove the compat symlinks
 	rm -rf "${ED}"/usr/share/quilt/compat
diff --git a/dev-util/shards/Manifest b/dev-util/shards/Manifest
index 8850fc72bc91..5dc1789ec6f2 100644
--- a/dev-util/shards/Manifest
+++ b/dev-util/shards/Manifest
@@ -1,6 +1,6 @@
 DIST crystal-molinillo-0.2.0.tar.gz 23959 BLAKE2B 257dcca66583db87a802b27b1f100e226eb0b6ac53708d110040d7b5560f429a82f11595e303af4922f22917d922d60ea380fb395d254dc3b3ce24f4183395b6 SHA512 7c00a6a3ee4864b712ad8b703557f10498ba0b25491a55ae2f6c02d574034ec5bf8b87df777c3d34eb9cc4c87eebdcf6567c153e9edf3bc3c1b9ac4306ce3dc2
-DIST shards-0.17.3.tar.gz 72539 BLAKE2B 2be15469df4b8a53ebd480815487f782717ce9d436cddf6acc2559e4c5dd61f06a1089d34b0a31aab2ab3e5334cd10abe513edd2cbe92b84d0fbd1cfc6cb09e5 SHA512 0789cf1fcc0df0f2d7657c034a157f05c0d65ee2c2ecda1f3d8b2d2f1274d584769f8600985fc463bc6632fe0a0822bdc40250aef2a92d1d612d0548ed0f4d2a
 DIST shards-0.17.4.tar.gz 73231 BLAKE2B 8480d6a56fadf1dfac44262fe260365f910ba8004f2361cae5646c2fa77a0e71c46b91c9a707e7b3825ed94a31eb94dc43d16b6d7e1da5efcc52a22ea39a51bb SHA512 82c7f2e4bb9b280a49cfb1a0468b2fe0a551d55b91b74e01d50478ff3b2652b872b225a345f8f7816f5130141603baad96387df2b0df45e7ec79c2d47956c011
-EBUILD shards-0.17.3.ebuild 1192 BLAKE2B 6bd7e041d4f09573c615ffd3602ddf40e2b2329fc35d7ced0479cb9e5ff95bc4d32ceacfdb6a0edc991d5d227040cd759da569431917d6871b2043e7bcae74b0 SHA512 4dfced023fab1f45c58032a00fad841c4dc246f1669d55ac135b8b1ac9a3fccf917485314713611b691047f73cc1f5db26bbe11493b2fba52e02f2e5c71e38e9
+DIST shards-0.18.0.tar.gz 79910 BLAKE2B 8ca2a79d89f5eb7202a8f86d39817a5d60bababbcc7a02450b30d0e0923b6e6e07db0accdc53b7de1fb9f238db797f8b6737f195666abaae5d208b884c0e86c0 SHA512 99f325792ab13bb1301e29b5b9cc09b10bb081c85d5f67e1a2d9dddd9b1118e23048630ffb7a8a740924b119f774cf22a8f3f223338a82a5c242460bb68f2eb7
 EBUILD shards-0.17.4.ebuild 1192 BLAKE2B fe98082141ec2e7bae48e3a0d6b649070f19d52bee761572ecedf2b31eae5737ce5ab6e35ecc1d7b6c9a403e4018e0780b0a6cf95b2898a3d6e8517635804a4f SHA512 4975a16782342eef7201b9264b538bef9651bdfb0f6a4d4dea0cef117ff6747c7f85f6a5a8c6dfe52addb0bedd6196f65321a584666b6ed7fbf3d379b81401b9
+EBUILD shards-0.18.0.ebuild 1209 BLAKE2B 34e90c87beae21ce76b0b82cf08587a470eeb664e577796818623c863c66e933a034110d28118e3356ae6c2bc7f62b1d0a0882243c3b9c2089fc1bf60dc37c01 SHA512 75df0e87aef71c11f9a055853f7778e741353379a8059b82c75b169d65c51ff4fbbf64889aae1f6330074e87bde45e99b3dac866cad4482895f05911ccf95280
 MISC metadata.xml 410 BLAKE2B d1c98e949a9c44a8bb295b1c800d735ae3575e5826cad4749ed7da13fb7ca58043eae458f3f8d5a0b00017b59a9854693f6c0ed812dee3296c24fc1ec57397db SHA512 c6821307655656a756bc711a9271d5d6e506257354e975c71211f7c353476ed80f4269358f75e34d8271bf5099fec8eb38f840b262fa91f1f2c4783c174657ca
diff --git a/dev-util/shards/shards-0.17.3.ebuild b/dev-util/shards/shards-0.18.0.ebuild
index 7632e49c8393..0f0cbfd373dc 100644
--- a/dev-util/shards/shards-0.17.3.ebuild
+++ b/dev-util/shards/shards-0.18.0.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 inherit multiprocessing toolchain-funcs
 
-CRYSTAL_MOLINILLO_PV=0.2.0
-CRYSTAL_MOLINILLO_P=crystal-molinillo-${CRYSTAL_MOLINILLO_PV}
+CRYSTAL_MOLINILLO_PV="0.2.0"
+CRYSTAL_MOLINILLO_P="crystal-molinillo-${CRYSTAL_MOLINILLO_PV}"
 
 DESCRIPTION="Dependency manager for the Crystal language"
 HOMEPAGE="https://github.com/crystal-lang/shards/"
@@ -19,14 +19,16 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64"
-RESTRICT="test"  # missing files in tarball
+KEYWORDS="~amd64"
+RESTRICT="test"  # Missing files in the tarball.
 
 RDEPEND="
 	>dev-lang/crystal-0.11.1
 	dev-libs/libyaml:=
 "
-DEPEND="${RDEPEND}"
+DEPEND="
+	${RDEPEND}
+"
 
 DOCS=( CHANGELOG.md README.md SPEC.md )
 
@@ -37,7 +39,7 @@ src_prepare() {
 
 	# bundle crystal-molinillo to bootstrap 'shards'
 	mkdir -p lib || die
-	ln -s ../../${CRYSTAL_MOLINILLO_P} lib/molinillo || die
+	ln -s "../../${CRYSTAL_MOLINILLO_P}" lib/molinillo || die
 
 	tc-export CC
 }
@@ -49,7 +51,7 @@ src_compile() {
 
 src_install() {
 	exeinto /usr/bin
-	doexe bin/${PN}
+	doexe "bin/${PN}"
 
 	doman man/*
 	einstalldocs