gentoo auto-resync : 18:09:2024 - 12:11:36

4 files changed, 99 insertions, 0 deletions

diff --git a/dev-util/quilt/Manifest b/dev-util/quilt/Manifest
index 24bb9daf0a71..4e91ecf2616e 100644
--- a/dev-util/quilt/Manifest
+++ b/dev-util/quilt/Manifest
@@ -1,7 +1,10 @@
+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 1945 BLAKE2B 6babacce675a33dc4ad3bd2151d08499095b2852aad4bb4753b39b84993879452cadb09c1a62bfa168863255929718037bd77974aaa82c1a4135506ddfd809de SHA512 d05742df0eb022c6bd79681db9400d3e6dd40a36d15153c09ca116f03d91bd76a1135fe7050179bb4246e6991587f4f8402e604a84bee134fef3a0e4029fb7cd
 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/files/50quilt-gentoo.el b/dev-util/quilt/files/50quilt-gentoo.el
new file mode 100644
index 000000000000..e5b51e318d73
--- /dev/null
+++ b/dev-util/quilt/files/50quilt-gentoo.el
@@ -0,0 +1,7 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'quilt-mode "quilt"
+  "Toggle quilt-mode. With positive arg, enable quilt-mode." t)
+(autoload 'quilt-hook "quilt"
+  "Enable quilt mode for quilt-controlled files.")
+(add-hook 'find-file-hook 'quilt-hook)
+(add-hook 'after-revert-hook 'quilt-hook)
diff --git a/dev-util/quilt/files/quilt-el-0.45.4-header-window.patch b/dev-util/quilt/files/quilt-el-0.45.4-header-window.patch
new file mode 100644
index 000000000000..eae848e804f5
--- /dev/null
+++ b/dev-util/quilt/files/quilt-el-0.45.4-header-window.patch
@@ -0,0 +1,13 @@
+Delete window after editing is complete
+Patch from flameeyes
+
+--- a/lib/quilt.el
++++ b/lib/quilt.el
+@@ -399,6 +399,7 @@
+     (cd quilt-header-directory)
+     (shell-command (concat "EDITOR=cat quilt -r header <" tmp))
+     (kill-buffer (current-buffer))
++    (delete-window)
+     (delete-file tmp)))
+ 
+ (defvar quilt-header-mode-map (make-keymap))
diff --git a/dev-util/quilt/quilt-0.68-r1.ebuild b/dev-util/quilt/quilt-0.68-r1.ebuild
new file mode 100644
index 000000000000..6e8b0c278193
--- /dev/null
+++ b/dev-util/quilt/quilt-0.68-r1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+inherit bash-completion-r1 elisp-common
+
+DESCRIPTION="quilt patch manager"
+HOMEPAGE="https://savannah.nongnu.org/projects/quilt"
+SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2 GPL-1+"  # any GPL version for quilt.el
+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="!app-emacs/quilt-el
+	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:="
+
+PATCHES=( "${FILESDIR}"/${PN}-el-0.45.4-header-window.patch )
+
+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() {
+	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}"/usr/share/doc/${P}
+	dodoc AUTHORS COPYING NEWS TODO "doc/README" "doc/README.MAIL" "doc/quilt.pdf"
+
+	# Remove misplaced Emacs mode
+	rm -rf "${ED}"/usr/share/emacs || die
+
+	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
+}