[gentoo-commits] repo/gentoo:master commit in: dev-util/quilt/files/, dev-util/quilt/

[gentoo-commits] repo/gentoo:master commit in: dev-util/quilt/files/, dev-util/quilt/

[Mikle Kolyada]

commit:     c8b670b8e1c6754feb74cbb93e25f907cab72855
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 20 08:58:11 2019 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sun Oct 20 08:58:23 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8b670b8

dev-util/quilt: Dop old

Package-Manager: Portage-2.3.76, Repoman-2.3.16
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>

 dev-util/quilt/Manifest                           |  1 -
 dev-util/quilt/files/quilt-0.50-no-graphviz.patch | 47 ------------------
 dev-util/quilt/quilt-0.50.ebuild                  | 60 -----------------------
 3 files changed, 108 deletions(-)

diff --git a/dev-util/quilt/Manifest b/dev-util/quilt/Manifest
index f76cb68f8b3..380e0647ab0 100644
--- a/dev-util/quilt/Manifest
+++ b/dev-util/quilt/Manifest
@@ -1,2 +1 @@
-DIST quilt-0.50.tar.gz 452769 BLAKE2B 5d466d1feca8a1f702db9d5f2bb4340331d06e413992fc8f30111d48daf71f560d60444ddb49cc06096552f32feb44cfd369f370222f574cea4664f4324d04fa SHA512 c6258872bc591b35e93ba09cc17b4954696faf391aff71b7789cc8cc58c4c54e51b605896937bd1aa54545eed6bf1e9b70352ad9b643f869154e6953c0340365
 DIST quilt-0.66.tar.gz 413069 BLAKE2B 41201d54cb26d4761413365fe19b65bd6971ada1e69198d2edbc346df6a3060ff3af4d80551d68ab4ffe003183bc0a28515ce1d070db95f2b1a04a0680ac4fb2 SHA512 c2cb75c0937612e1e0da25b713acf629b6b5aacbd8254d8bd17220b63c7b8ca996cd9d0315a32d67d54a4a7dc01b212cdda33afaacf3db063da757f1973306f4

diff --git a/dev-util/quilt/files/quilt-0.50-no-graphviz.patch b/dev-util/quilt/files/quilt-0.50-no-graphviz.patch
deleted file mode 100644
index 04e0d7d3a9a..00000000000
--- a/dev-util/quilt/files/quilt-0.50-no-graphviz.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-Index: b/Makefile.in
-===================================================================
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -82,8 +82,7 @@ QUILT :=	$(QUILT_IN)
- SRC +=		$(QUILT_SRC:%=quilt/%)
- DIRT +=		$(QUILT_IN:%=quilt/%)
- 
--SCRIPTS_IN :=	patchfns parse-patch inspect dependency-graph edmail	\
--		remove-trailing-ws
-+SCRIPTS_IN :=	patchfns parse-patch inspect edmail remove-trailing-ws
- 
- SCRIPTS_SRC :=	$(SCRIPTS_IN:%=%.in)
- SCRIPTS :=	$(SCRIPTS_IN)
-Index: b/bash_completion
-===================================================================
---- a/bash_completion
-+++ b/bash_completion
-@@ -95,7 +95,7 @@ _quilt_completion()
-     prev=${COMP_WORDS[COMP_CWORD-1]}
- 
-     # quilt sub commands 
--    cmds='add annotate applied delete diff edit files fold fork graph \
-+    cmds='add annotate applied delete diff edit files fold fork \
-           grep header import mail new next patches pop previous push refresh \
- 	  remove rename revert series setup snapshot top unapplied'
- 
-@@ -189,19 +189,6 @@ _quilt_completion()
- 	        ;;
- 	   esac
- 	   ;;
--	graph)
--	   case $prev in
--	     -T)
--	     	COMPREPLY=( $( compgen -W "ps" -- $cur ) )
--		;;
--	     --edge-labels)
--	        COMPREPLY=( $( compgen -W "files" -- $cur ) )
--		;;
--	     *)
--		COMPREPLY=( $( compgen -W "-T -h --all --reduce --lines --edge-labels $(quilt applied 2>/dev/null)" -- $cur ) )
--		;;
--	   esac
--	   ;;
- 	grep)
- 	   _longopt grep
- 	   COMPREPLY=( ${COMPREPLY[@]:-} $( compgen -W "-h" -- $cur ) )

diff --git a/dev-util/quilt/quilt-0.50.ebuild b/dev-util/quilt/quilt-0.50.ebuild
deleted file mode 100644
index d5d270c6d42..00000000000
--- a/dev-util/quilt/quilt-0.50.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit bash-completion-r1 eutils
-
-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 ppc ppc64 sparc x86"
-IUSE="emacs graphviz"
-
-RDEPEND="sys-apps/ed
-	dev-util/diffstat
-	graphviz? ( media-gfx/graphviz )
-	>=sys-apps/coreutils-8.5"
-
-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
-	epause 5
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Add support for USE=graphviz
-	use graphviz || epatch "${FILESDIR}/${P}-no-graphviz.patch"
-
-	# Some tests are somewhat broken while being run from within portage, work
-	# fine if you run them manually
-	rm "${S}"/test/delete.test "${S}"/test/mail.test
-}
-
-src_install() {
-	emake BUILD_ROOT="${D}" install || die "make install failed"
-
-	rm -rf "${D}"/usr/share/doc/${P}
-	dodoc AUTHORS TODO quilt.changes doc/README doc/README.MAIL \
-		doc/quilt.pdf
-
-	rm -rf "${D}"/etc/bash_completion.d
-	newbashcomp bash_completion ${PN}
-
-	# Remove the compat symlinks
-	rm -rf "${D}"/usr/share/quilt/compat
-
-	# Remove Emacs mode; newer version is in app-emacs/quilt-el, bug 247500
-	rm -rf "${D}"/usr/share/emacs
-}

[gentoo-commits] repo/gentoo:master commit in: dev-util/quilt/files/, dev-util/quilt/

[Ulrich Müller]

commit:     a2984645dbb71ab7057c5c0930fab972e2cfccf5
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 17 11:55:16 2024 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Tue Sep 17 13:33:00 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2984645

dev-util/quilt: Install the Emacs mode

A separate package for app-emacs/quilt-el made sense in the past when
it had its own upstream. This is no longer the case; nowadays the Gentoo
packages are built from the same tarball.

Bug: https://bugs.gentoo.org/247500
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 dev-util/quilt/files/50quilt-gentoo.el             |  7 ++
 .../files/quilt-el-0.45.4-header-window.patch      | 13 ++++
 dev-util/quilt/quilt-0.68-r1.ebuild                | 76 ++++++++++++++++++++++
 3 files changed, 96 insertions(+)

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
+}