gentoo auto-resync : 16:10:2024 - 04:04:29

4 files changed, 30 insertions, 153 deletions

diff --git a/dev-util/quilt/Manifest b/dev-util/quilt/Manifest
index 0ff65ee377dc..d566dde5300f 100644
--- a/dev-util/quilt/Manifest
+++ b/dev-util/quilt/Manifest
@@ -1,10 +1,7 @@
 AUX 50quilt-gentoo.el 294 BLAKE2B e70d8e48f600246989c7007a139cd09e2453b07618170735cda7e836cb89ca985d22cd1e02bc1291adc9b66a9fe8b291bffd7c1be58ca25fb0862d873b961881 SHA512 02e74d02102e852c0f72a73dd897c29dd13bae4722d3bb543119bfd42c3e52b0ad78074657c7435e7a6cc0251484577a1a145cc567fc827749538fe8bceeaece
 AUX quilt-0.66-no-graphviz.patch 1464 BLAKE2B b1a67706f29f3986de0202a4ea68aa2f001989354bf9ab91996cb4f5dbb6578baf28fc1ac781a18525d04fb92d9f6d554efcc598dabbdf1a35b0f63b93c3cd8d SHA512 3f935a6e137998f7d0391ef87f5324c8882490001b37333de22efc068bda8a7e84ccefc3e85616c3aa93894acb8a0841a2b089c59c6a658d1157298d4132707c
 AUX quilt-el-0.45.4-header-window.patch 348 BLAKE2B 88c8f73cc51d49d0a1c5f15f3d8642cf8a8062fe03a0e99a1d8928279bfcdeeb95bba6787292cdf9919cadd4ca81fce96eeddff02efec47753e75fa5abe214ed SHA512 d57bda92c8196d71154aea4d48a3595c624aeb87b340272552a83f57d3429c55d02431f2cf9f20a122013d2baa60346988f3448a992db4d535d9961b71d7ac51
-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-0.68-r1.ebuild 1938 BLAKE2B f826b943348854e7b996a328637b32005a71357b23362185d3e7699d29e61e151890c9ad4670e4f90144df2c515e4582faf572a3442bd63c01805214d34cf18e SHA512 fbb71f33d986aa33c0118e23222e7c863d0e5c0f4402fc24aa38157c73c148644445c8dd38b7290468a74049a7f38f77ab5cbfed24df19f2910dec21f0d0fb31
-EBUILD quilt-0.68.ebuild 1671 BLAKE2B c1d76aedf1e97189ba961d2b5f3f3bafba9449381444af8447aebc2bb71a56708ff6674f9ff9fd79742a65edb842008f4e5ede9f776a15eaa10eb0c107093ba6 SHA512 60636a6fdb8b07dd22388b672b0fdc43519a45872eddd78df48dfaa70c27d02db65c876cc5e25e2e84c5b518799defaf84c9e9138f52e513a8bd8a65d6b6e63d
-EBUILD quilt-9999.ebuild 1783 BLAKE2B 620a0cfac832d96aea589e0838d87159d20f3145ce3b1359871a9f0772804ce29992d204896c806ce979fedc30694163a56976e934fe250abe2b4b8e6fe7e3b1 SHA512 933d14a132b5d4c40f3678149d620699a166744883ea7eae0287799028e46cc39e5cee6861f61efd4b9a8e6bbf6d079ca049ea5373f52a3adf7734c901209d4c
+EBUILD quilt-9999.ebuild 1949 BLAKE2B 9b8f33dbb4109a51974abc76e1465da799f72bdb86cfd989031147f939b86c37e18627964637ce3e7c683022431d5a89a380182097e57051adfa80f89fe999d2 SHA512 3859445b1c7a62cfd7ec537baff0619de90b8608867346c51d4932fc2737dce19a479c330a0324aa934ea84c049edf67a27dbb2f8a5df27204ff5f80b32588d2
 MISC metadata.xml 298 BLAKE2B a42ceb6cf539b835364f7e18417130c37e774dbe59786a7224e5eed1d0938d06630255f4959b8d250c3e436bdb098dcea460ccec48d737b67e838c9ff64ba48e SHA512 8ff3ddf90a99f6b142859c3c2cfca2f1049b71e29f8aff55bee07e8352b523c236c8a515e7c8f4259e6abfb950a22d1b5e1085a4a6b36e313d88d4af9a6254f9
diff --git a/dev-util/quilt/quilt-0.67.ebuild b/dev-util/quilt/quilt-0.67.ebuild
deleted file mode 100644
index 5b897856526e..000000000000
--- a/dev-util/quilt/quilt-0.67.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# 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-8.32-r1"
-
-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 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-0.68.ebuild b/dev-util/quilt/quilt-0.68.ebuild
deleted file mode 100644
index f3192f796103..000000000000
--- a/dev-util/quilt/quilt-0.68.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# 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 326eb8360cd1..625fa6eb02b3 100644
--- a/dev-util/quilt/quilt-9999.ebuild
+++ b/dev-util/quilt/quilt-9999.ebuild
@@ -7,19 +7,19 @@ EGIT_REPO_URI="https://git.savannah.gnu.org/git/quilt.git"
 
 [[ ${PV} == 9999 ]] && inherit git-r3
 
-inherit bash-completion-r1
+inherit bash-completion-r1 elisp-common
 
 DESCRIPTION="quilt patch manager"
 HOMEPAGE="https://savannah.nongnu.org/projects/quilt"
 [[ ${PV} == 9999 ]] || SRC_URI="https://savannah.nongnu.org/download/quilt/${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2 GPL-1+"  # any GPL version for quilt.el
 SLOT="0"
 [[ ${PV} == 9999 ]] || \
 KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
-IUSE="graphviz"
+IUSE="emacs graphviz"
 
-RDEPEND="
+RDEPEND="!app-emacs/quilt-el
 	dev-util/diffstat
 	mail-mta/sendmail
 	sys-apps/ed
@@ -30,42 +30,47 @@ RDEPEND="
 	app-arch/zstd:=
 "
 
-src_prepare() {
-
-	default
+PATCHES=( "${FILESDIR}"/${PN}-el-0.45.4-header-window.patch )
 
+src_prepare() {
 	# Add support for USE=graphviz
-	use graphviz || eapply "${FILESDIR}/${PN}-0.66-no-graphviz.patch"
+	use graphviz || PATCHES+=( "${FILESDIR}"/${PN}-0.66-no-graphviz.patch )
+	default
 
 	# remove failing test, because it fails on root-build
 	rm -rf test/delete.test
 }
 
 src_configure() {
-	local myconf=""
-	[[ ${CHOST} == *-darwin* || ${CHOST} == *-solaris* ]] && \
-		myconf="${myconf} --with-getopt=${EPREFIX}/usr/bin/getopt-long"
-	econf ${myconf}
+	local myconf=()
+	[[ ${CHOST} == *-darwin* || ${CHOST} == *-solaris* ]] \
+		&& myconf+=( "--with-getopt=${EPREFIX}/usr/bin/getopt-long" )
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	default
+	use emacs && elisp-compile lib/quilt.el
 }
 
 src_install() {
 	emake BUILD_ROOT="${D}" install
 
-	rm -rf "${ED}"/etc/bash_completion.d
-	newbashcomp bash_completion ${PN}
-
 	rm -rf "${ED}"/usr/share/doc/${PN}
 	dodoc AUTHORS COPYING NEWS TODO "doc/README" "doc/README.MAIL" "doc/quilt.pdf"
 
-	# Remove the compat symlinks
-	rm -rf "${ED}"/usr/share/quilt/compat
+	# Remove misplaced Emacs mode
+	rm -rf "${ED}"/usr/share/emacs || die
 
-	# Remove Emacs mode; newer version is in app-emacs/quilt-el, bug 247500
-	rm -rf "${ED}"/usr/share/emacs
-}
-
-pkg_postinst() {
-	if ! has_version -r 'app-emacs/quilt-el' ; then
-		elog "If you plan to use quilt with emacs consider installing \"app-emacs/quilt-el\""
+	if use emacs; then
+		elisp-install ${PN} lib/quilt.{el,elc}
+		elisp-site-file-install "${FILESDIR}"/50${PN}-gentoo.el
+		dodoc doc/README.EMACS
 	fi
+
+	rm -rf "${ED}"/etc/bash_completion.d
+	newbashcomp bash_completion ${PN}
+
+	# Remove the compat symlinks
+	rm -rf "${ED}"/usr/share/quilt/compat
 }