public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: dev-util/quilt/files/
@ 2016-11-17 15:49 Michael Palimaka
  0 siblings, 0 replies; 5+ messages in thread
From: Michael Palimaka @ 2016-11-17 15:49 UTC (permalink / raw
  To: gentoo-commits

commit:     97e0dc42bcdb2d0602a2f3efd079ca4f66802701
Author:     Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sat Nov 12 20:22:50 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Nov 17 15:48:44 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97e0dc42

dev-util/quilt: remove unused patch

 dev-util/quilt/files/quilt-0.48-no-graphviz.patch | 34 -----------------------
 1 file changed, 34 deletions(-)

diff --git a/dev-util/quilt/files/quilt-0.48-no-graphviz.patch b/dev-util/quilt/files/quilt-0.48-no-graphviz.patch
deleted file mode 100644
index 4ae5ba0..00000000
--- a/dev-util/quilt/files/quilt-0.48-no-graphviz.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- Makefile.in.orig	2009-02-24 13:49:47.000000000 -0500
-+++ Makefile.in	2009-02-24 13:50:21.000000000 -0500
-@@ -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)
---- bash_completion.orig	2009-02-24 13:49:52.000000000 -0500
-+++ bash_completion	2009-02-24 13:50:46.000000000 -0500
-@@ -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)" -- $cur ) )
--		;;
--	   esac
--	   ;;
- 	grep)
- 	   _longopt grep
- 	   COMPREPLY=( ${COMPREPLY[@]:-} $( compgen -W "-h" -- $cur ) )


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-util/quilt/files/
@ 2019-04-26 11:37 Mike Pagano
  0 siblings, 0 replies; 5+ messages in thread
From: Mike Pagano @ 2019-04-26 11:37 UTC (permalink / raw
  To: gentoo-commits

commit:     6ad3f008db63785d0a96693ed22d27464a9e576b
Author:     Mike Pagano <mpagano <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 26 11:36:31 2019 +0000
Commit:     Mike Pagano <mpagano <AT> gentoo <DOT> org>
CommitDate: Fri Apr 26 11:37:11 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ad3f008

dev-util/quilt: Add missing patch file

Signed-off-by: Mike Pagano <mpagano <AT> gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11

 dev-util/quilt/files/quilt-0.66.ebuild | 60 ++++++++++++++++++++++++++++++++++
 1 file changed, 60 insertions(+)

diff --git a/dev-util/quilt/files/quilt-0.66.ebuild b/dev-util/quilt/files/quilt-0.66.ebuild
new file mode 100644
index 00000000000..0657d72ccb2
--- /dev/null
+++ b/dev-util/quilt/files/quilt-0.66.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris"
+IUSE="emacs graphviz elibc_Darwin elibc_SunOS"
+
+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.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
+}
+
+src_prepare() {
+	# Add support for USE=graphviz
+	use graphviz || eapply -p0 "${FILESDIR}/${P}-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 || die "make install failed"
+
+	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
+}


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-util/quilt/files/
@ 2019-04-26 12:34 Mike Pagano
  0 siblings, 0 replies; 5+ messages in thread
From: Mike Pagano @ 2019-04-26 12:34 UTC (permalink / raw
  To: gentoo-commits

commit:     ad69f3ce1d51b8d4d191b1e5582e8bd55f94bf61
Author:     Mike Pagano <mpagano <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 26 12:34:02 2019 +0000
Commit:     Mike Pagano <mpagano <AT> gentoo <DOT> org>
CommitDate: Fri Apr 26 12:34:08 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad69f3ce

dev-util/quilt: Remove wrong file

Signed-off-by: Mike Pagano <mpagano <AT> gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11

 dev-util/quilt/files/quilt-0.66.ebuild | 60 ----------------------------------
 1 file changed, 60 deletions(-)

diff --git a/dev-util/quilt/files/quilt-0.66.ebuild b/dev-util/quilt/files/quilt-0.66.ebuild
deleted file mode 100644
index 0657d72ccb2..00000000000
--- a/dev-util/quilt/files/quilt-0.66.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-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 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris"
-IUSE="emacs graphviz elibc_Darwin elibc_SunOS"
-
-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.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
-}
-
-src_prepare() {
-	# Add support for USE=graphviz
-	use graphviz || eapply -p0 "${FILESDIR}/${P}-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 || die "make install failed"
-
-	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
-}


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-util/quilt/files/
@ 2019-04-26 12:42 Mike Pagano
  0 siblings, 0 replies; 5+ messages in thread
From: Mike Pagano @ 2019-04-26 12:42 UTC (permalink / raw
  To: gentoo-commits

commit:     9d80e446ebfeea7b2f5eb0497dc0bada91d7e244
Author:     Mike Pagano <mpagano <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 26 12:42:46 2019 +0000
Commit:     Mike Pagano <mpagano <AT> gentoo <DOT> org>
CommitDate: Fri Apr 26 12:42:54 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d80e446

dev-util/quilt: Add graphviz patch for 0.66

Signed-off-by: Mike Pagano <mpagano <AT> gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11

 dev-util/quilt/files/quilt-0.66-no-graphviz.patch | 43 +++++++++++++++++++++++
 1 file changed, 43 insertions(+)

diff --git a/dev-util/quilt/files/quilt-0.66-no-graphviz.patch b/dev-util/quilt/files/quilt-0.66-no-graphviz.patch
new file mode 100644
index 00000000000..324a38dfef4
--- /dev/null
+++ b/dev-util/quilt/files/quilt-0.66-no-graphviz.patch
@@ -0,0 +1,43 @@
+--- Makefile.in.orig	2017-04-12 09:27:40.853018901 -0400
++++ Makefile.in	2017-04-12 09:36:16.584315529 -0400
+@@ -78,8 +78,7 @@ QUILT :=	$(QUILT_IN)
+ SRC +=		$(QUILT_SRC:%=quilt/%)
+ DIRT +=		$(QUILT_IN:%=quilt/%)
+
+-SCRIPTS_IN :=	patchfns inspect-wrapper dependency-graph edmail	\
+-		remove-trailing-ws backup-files
++SCRIPTS_IN := patchfns inspect-wrapper edmail remove-trailing-ws backup-files
+
+ SCRIPTS_SRC :=	$(SCRIPTS_IN:%=%.in)
+ SCRIPTS :=	$(SCRIPTS_IN)
+--- bash_completion.orig	2017-04-12 09:27:57.643126246 -0400
++++ bash_completion	2017-04-12 09:30:27.673938451 -0400
+@@ -28,7 +28,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 upgrade'
+
+@@ -122,19 +122,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 --quiltrc - applied 2>/dev/null)" -- $cur ) )
+-		;;
+-	   esac
+-	   ;;
+	grep)
+		type _longopt &> /dev/null && _longopt grep
+		COMPREPLY=( "${COMPREPLY[@]}" $( compgen -W "-h" -- $cur ) )


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-util/quilt/files/
@ 2019-04-26 12:44 Mike Pagano
  0 siblings, 0 replies; 5+ messages in thread
From: Mike Pagano @ 2019-04-26 12:44 UTC (permalink / raw
  To: gentoo-commits

commit:     75d377b5b6da79c036a5a7e938df75bc635b2e6d
Author:     Mike Pagano <mpagano <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 26 12:43:55 2019 +0000
Commit:     Mike Pagano <mpagano <AT> gentoo <DOT> org>
CommitDate: Fri Apr 26 12:44:01 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75d377b5

dev-util/quilt: Remove unused patches

Signed-off-by: Mike Pagano <mpagano <AT> gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11

 .../quilt/files/quilt-0.63-bash-completion.patch   | 17 ---------
 dev-util/quilt/files/quilt-0.63-no-graphviz.patch  | 43 ----------------------
 dev-util/quilt/files/quilt-0.65-no-graphviz.patch  | 43 ----------------------
 3 files changed, 103 deletions(-)

diff --git a/dev-util/quilt/files/quilt-0.63-bash-completion.patch b/dev-util/quilt/files/quilt-0.63-bash-completion.patch
deleted file mode 100644
index c85caca5c9e..00000000000
--- a/dev-util/quilt/files/quilt-0.63-bash-completion.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- bash_completion.orig	2014-10-21 18:15:29.549789267 -0400
-+++ bash_completion	2014-10-21 18:15:38.489789221 -0400
-@@ -11,8 +11,6 @@
- # completion to work then you must set QUILT_PC in your global environment
- # (for example in ~/.profile) and not just in your quiltrc file.
- 
--if type quilt &> /dev/null ; then
--
- if ! type _expand &> /dev/null ; then
-     # This function expands tildes in pathnames
-     #
-@@ -310,5 +308,3 @@ _quilt_completion()
- && _quilt_complete_opt="-o filenames"
- complete -F _quilt_completion $_quilt_complete_opt quilt
- unset -v _quilt_complete_opt
--
--fi

diff --git a/dev-util/quilt/files/quilt-0.63-no-graphviz.patch b/dev-util/quilt/files/quilt-0.63-no-graphviz.patch
deleted file mode 100644
index 80458120f4f..00000000000
--- a/dev-util/quilt/files/quilt-0.63-no-graphviz.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- Makefile.in.orig	2014-10-21 17:08:25.639810130 -0400
-+++ Makefile.in	2014-10-21 17:09:03.269809935 -0400
-@@ -79,8 +79,7 @@ QUILT :=	$(QUILT_IN)
- SRC +=		$(QUILT_SRC:%=quilt/%)
- DIRT +=		$(QUILT_IN:%=quilt/%)
- 
--SCRIPTS_IN :=	patchfns inspect dependency-graph edmail	\
--		remove-trailing-ws backup-files
-+SCRIPTS_IN :=  patchfns inspect edmail remove-trailing-ws backup-files
- 
- SCRIPTS_SRC :=	$(SCRIPTS_IN:%=%.in)
- SCRIPTS :=	$(SCRIPTS_IN)
---- bash_completion.orig	2014-10-21 17:09:08.789809906 -0400
-+++ bash_completion	2014-10-21 17:09:53.189809676 -0400
-@@ -100,7 +100,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'
- 
-@@ -194,19 +194,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 --quiltrc - applied 2>/dev/null)" -- $cur ) )
--		;;
--	   esac
--	   ;;
- 	grep)
- 	   _longopt grep
- 	   COMPREPLY=( ${COMPREPLY[@]:-} $( compgen -W "-h" -- $cur ) )

diff --git a/dev-util/quilt/files/quilt-0.65-no-graphviz.patch b/dev-util/quilt/files/quilt-0.65-no-graphviz.patch
deleted file mode 100644
index ea06a9eebef..00000000000
--- a/dev-util/quilt/files/quilt-0.65-no-graphviz.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- Makefile.in.orig	2017-04-12 09:27:40.853018901 -0400
-+++ Makefile.in	2017-04-12 09:36:16.584315529 -0400
-@@ -78,8 +78,7 @@ QUILT :=	$(QUILT_IN)
- SRC +=		$(QUILT_SRC:%=quilt/%)
- DIRT +=		$(QUILT_IN:%=quilt/%)
- 
--SCRIPTS_IN :=	patchfns inspect-wrapper dependency-graph edmail	\
--		remove-trailing-ws backup-files
-+SCRIPTS_IN := patchfns inspect-wrapper edmail remove-trailing-ws backup-files
- 
- SCRIPTS_SRC :=	$(SCRIPTS_IN:%=%.in)
- SCRIPTS :=	$(SCRIPTS_IN)
---- bash_completion.orig	2017-04-12 09:27:57.643126246 -0400
-+++ bash_completion	2017-04-12 09:30:27.673938451 -0400
-@@ -28,7 +28,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 upgrade'
- 
-@@ -122,19 +122,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 --quiltrc - applied 2>/dev/null)" -- $cur ) )
--		;;
--	   esac
--	   ;;
- 	grep)
- 	   type _longopt &> /dev/null && _longopt grep
- 	   COMPREPLY=( "${COMPREPLY[@]}" $( compgen -W "-h" -- $cur ) )


^ permalink raw reply related	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2019-04-26 12:44 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-04-26 11:37 [gentoo-commits] repo/gentoo:master commit in: dev-util/quilt/files/ Mike Pagano
  -- strict thread matches above, loose matches on Subject: below --
2019-04-26 12:44 Mike Pagano
2019-04-26 12:42 Mike Pagano
2019-04-26 12:34 Mike Pagano
2016-11-17 15:49 Michael Palimaka

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox