Importing the ebuilds from my overlay, fixing some bugs (#152124, a stripping bug; noone reported yet); also introduction a new USE flag, that adds/removes the graphviz dependency.

(Portage version: 2.1.2.1)

12 files changed, 310 insertions, 3 deletions

diff --git a/dev-util/quilt/ChangeLog b/dev-util/quilt/ChangeLog
index 7a499477b62c..4c74c541eff3 100644
--- a/dev-util/quilt/ChangeLog
+++ b/dev-util/quilt/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for dev-util/quilt
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/quilt/ChangeLog,v 1.20 2007/02/22 02:25:15 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/quilt/ChangeLog,v 1.21 2007/03/07 11:02:29 phreak Exp $
+
+*quilt-0.46 (07 Mar 2007)
+*quilt-0.45-r1 (07 Mar 2007)
+*quilt-0.42-r1 (07 Mar 2007)
+
+  07 Mar 2007; Christian Heim <phreak@gentoo.org>
+  +files/quilt-0.42-no-graphviz.patch,
+  +files/quilt-0.42-prevent-stripping.patch,
+  +files/quilt-0.45-no-graphviz.patch, +files/quilt-0.46-no-graphviz.patch,
+  metadata.xml, +quilt-0.42-r1.ebuild, +quilt-0.45-r1.ebuild,
+  +quilt-0.46.ebuild:
+  Importing the ebuilds from my overlay, fixing some bugs (#152124, a
+  stripping bug; noone reported yet); also introduction a new USE flag, that
+  adds/removes the graphviz dependency.
 
   22 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
   Transition to Manifest2.
diff --git a/dev-util/quilt/files/digest-quilt-0.42-r1 b/dev-util/quilt/files/digest-quilt-0.42-r1
new file mode 100644
index 000000000000..e15184a42a71
--- /dev/null
+++ b/dev-util/quilt/files/digest-quilt-0.42-r1
@@ -0,0 +1,3 @@
+MD5 c07d43f24f4a473cab4519732647086b quilt-0.42.tar.gz 355294
+RMD160 f8a2e9fce3e7170f499082f754cc9e2d99023f0b quilt-0.42.tar.gz 355294
+SHA256 a31f72d390c4abeebbd22ec6b79bed2090677908eeb946d3a1d4aa9c0d81b1fe quilt-0.42.tar.gz 355294
diff --git a/dev-util/quilt/files/digest-quilt-0.45-r1 b/dev-util/quilt/files/digest-quilt-0.45-r1
new file mode 100644
index 000000000000..4d749db5cfa2
--- /dev/null
+++ b/dev-util/quilt/files/digest-quilt-0.45-r1
@@ -0,0 +1,3 @@
+MD5 5f8dd5a041ca7c700b16620228f922aa quilt-0.45.tar.gz 399440
+RMD160 d3a7f919a348e3de68b9c805acd4bf15ebbdc747 quilt-0.45.tar.gz 399440
+SHA256 de7290f334baf631a14d031df304ee94cfb550aa69e7512aa589d21c2381c7d8 quilt-0.45.tar.gz 399440
diff --git a/dev-util/quilt/files/digest-quilt-0.46 b/dev-util/quilt/files/digest-quilt-0.46
new file mode 100644
index 000000000000..b019ec292553
--- /dev/null
+++ b/dev-util/quilt/files/digest-quilt-0.46
@@ -0,0 +1,3 @@
+MD5 4508546d1ed0257ef7c128b6121b7208 quilt-0.46.tar.gz 403984
+RMD160 508d6b4f8c1283b20acf8a757d4b3dfc3b8a7961 quilt-0.46.tar.gz 403984
+SHA256 47bf030565bb462840db694acc183273455714028c74974c5b3a3bd4ad29ad89 quilt-0.46.tar.gz 403984
diff --git a/dev-util/quilt/files/quilt-0.42-no-graphviz.patch b/dev-util/quilt/files/quilt-0.42-no-graphviz.patch
new file mode 100644
index 000000000000..707fc291d5e2
--- /dev/null
+++ b/dev-util/quilt/files/quilt-0.42-no-graphviz.patch
@@ -0,0 +1,28 @@
+Index: quilt-0.42/Makefile.in
+===================================================================
+--- quilt-0.42.orig/Makefile.in
++++ quilt-0.42/Makefile.in
+@@ -62,8 +62,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)
+ SRC +=		$(SCRIPTS_SRC:%=scripts/%)
+Index: quilt-0.42/bash_completion
+===================================================================
+--- quilt-0.42.orig/bash_completion
++++ quilt-0.42/bash_completion
+@@ -178,9 +178,6 @@ _quilt_completion()
+ 	fork)
+ 	  COMPREPLY=( )
+ 	  ;;
+-	graph)
+-	   COMPREPLY=( $( compgen -W "-h --all --reduce --lines --edge-labels $(quilt applied)" -- $cur ) )
+-	   ;;
+ 	grep)
+ 	   _longopt grep
+ 	   COMPREPLY=( ${COMPREPLY[@]:-} $( compgen -W "-h" -- $cur ) )
diff --git a/dev-util/quilt/files/quilt-0.42-prevent-stripping.patch b/dev-util/quilt/files/quilt-0.42-prevent-stripping.patch
new file mode 100644
index 000000000000..1f981977300e
--- /dev/null
+++ b/dev-util/quilt/files/quilt-0.42-prevent-stripping.patch
@@ -0,0 +1,13 @@
+Index: quilt-0.42/Makefile.in
+===================================================================
+--- quilt-0.42.orig/Makefile.in
++++ quilt-0.42/Makefile.in
+@@ -235,7 +235,7 @@ install : scripts
+ 	@INSTALL@ -m 644 scripts/patchfns $(BUILD_ROOT)$(SCRIPTS_DIR)
+ 
+ 	@INSTALL@ -d $(BUILD_ROOT)$(LIB_DIR)
+-	@INSTALL@ -m 755 -s $(LIB:%=lib/%) $(BUILD_ROOT)$(LIB_DIR)/
++	@INSTALL@ -m 755 $(LIB:%=lib/%) $(BUILD_ROOT)$(LIB_DIR)/
+ 
+ 	@INSTALL@ -d $(BUILD_ROOT)$(docdir)/$(PACKAGE)-$(VERSION)/
+ 	@INSTALL@ -m 644 doc/README \
diff --git a/dev-util/quilt/files/quilt-0.45-no-graphviz.patch b/dev-util/quilt/files/quilt-0.45-no-graphviz.patch
new file mode 100644
index 000000000000..1654b103b752
--- /dev/null
+++ b/dev-util/quilt/files/quilt-0.45-no-graphviz.patch
@@ -0,0 +1,45 @@
+diff -Nupr quilt-0.45.orig/Makefile.in quilt-0.45/Makefile.in
+--- quilt-0.45.orig/Makefile.in	2006-03-25 13:07:26.000000000 +0100
++++ quilt-0.45/Makefile.in	2006-12-27 15:18:36.000000000 +0100
+@@ -80,8 +80,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)
+diff -Nupr quilt-0.45.orig/bash_completion quilt-0.45/bash_completion
+--- quilt-0.45.orig/bash_completion	2006-02-03 08:38:15.000000000 +0100
++++ quilt-0.45/bash_completion	2006-12-27 15:17:58.000000000 +0100
+@@ -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 series setup snapshot top unapplied'
+ 
+@@ -188,19 +188,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 ) )
diff --git a/dev-util/quilt/files/quilt-0.46-no-graphviz.patch b/dev-util/quilt/files/quilt-0.46-no-graphviz.patch
new file mode 100644
index 000000000000..cdc1dffd65b7
--- /dev/null
+++ b/dev-util/quilt/files/quilt-0.46-no-graphviz.patch
@@ -0,0 +1,45 @@
+diff -Nurp quilt-0.46.orig/Makefile.in quilt-0.46/Makefile.in
+--- quilt-0.46.orig/Makefile.in	2006-10-11 14:36:10.000000000 +0200
++++ quilt-0.46/Makefile.in	2006-12-27 15:26:38.000000000 +0100
+@@ -81,8 +81,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)
+diff -Nurp quilt-0.46.orig/bash_completion quilt-0.46/bash_completion
+--- quilt-0.46.orig/bash_completion	2006-02-03 08:38:15.000000000 +0100
++++ quilt-0.46/bash_completion	2006-12-27 15:26:38.000000000 +0100
+@@ -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 series setup snapshot top unapplied'
+ 
+@@ -188,19 +188,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 ) )
diff --git a/dev-util/quilt/metadata.xml b/dev-util/quilt/metadata.xml
index 7bf3a5fd1e07..34444dc20cdb 100644
--- a/dev-util/quilt/metadata.xml
+++ b/dev-util/quilt/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 	<herd>dev-tools</herd>
 	<maintainer>
-		<email>ka0ttic@gentoo.org</email>
-		<name>Aaron Walker</name>
+		<email>phreak@gentoo.org</email>
+		<name>Christian Heim</name>
 	</maintainer>
 </pkgmetadata>
diff --git a/dev-util/quilt/quilt-0.42-r1.ebuild b/dev-util/quilt/quilt-0.42-r1.ebuild
new file mode 100644
index 000000000000..e5929c661be0
--- /dev/null
+++ b/dev-util/quilt/quilt-0.42-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/quilt/quilt-0.42-r1.ebuild,v 1.1 2007/03/07 11:02:29 phreak Exp $
+
+inherit bash-completion eutils
+
+DESCRIPTION="quilt patch manager"
+HOMEPAGE="http://savannah.nongnu.org/projects/quilt"
+SRC_URI="http://savannah.nongnu.org/download/quilt/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE="graphviz"
+
+RDEPEND="sys-apps/ed
+	dev-util/diffstat
+	graphviz? ( media-gfx/graphviz )"
+
+# The tests are somewhat broken while being run from within portage, work fine
+# if you run them manually
+RESTRICT="test"
+
+pkg_setup() {
+	echo
+	elog "If you intend to use the folding functionality (graphical illustration of the patch stack)"
+	elog "then you'll need to remerge this package with USE=graphviz."
+	echo
+	epause
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# quilt-0.4.2 prestrips the libraries. Prevent it!
+	epatch "${FILESDIR}"/${P}-prevent-stripping.patch
+
+	# Add support for a "no-graphviz" version
+	use graphviz || epatch "${FILESDIR}"/${P}-no-graphviz.patch
+}
+
+src_install() {
+	make 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 doc/sample.quiltrc
+
+	rm -rf "${D}"/etc/bash_completion.d
+	dobashcompletion bash_completion
+}
diff --git a/dev-util/quilt/quilt-0.45-r1.ebuild b/dev-util/quilt/quilt-0.45-r1.ebuild
new file mode 100644
index 000000000000..f272f5afc90d
--- /dev/null
+++ b/dev-util/quilt/quilt-0.45-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/quilt/quilt-0.45-r1.ebuild,v 1.1 2007/03/07 11:02:29 phreak Exp $
+
+inherit bash-completion eutils
+
+DESCRIPTION="quilt patch manager"
+HOMEPAGE="http://savannah.nongnu.org/projects/quilt"
+SRC_URI="http://savannah.nongnu.org/download/quilt/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ppc ppc64 ~x86"
+IUSE="graphviz"
+
+RDEPEND="sys-apps/ed
+	dev-util/diffstat
+	graphviz? ( media-gfx/graphviz )"
+
+# The tests are somewhat broken while being run from within portage, work fine
+# if you run them manually
+RESTRICT="test"
+
+pkg_setup() {
+	echo
+	elog "If you intend to use the folding functionality (graphical illustration of the patch stack)"
+	elog "then you'll need to remerge this package with USE=graphviz."
+	echo
+	epause
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Add support for USE=graphviz
+	use graphviz || epatch "${FILESDIR}/${P}-no-graphviz.patch"
+}
+
+src_install() {
+	make BUILD_ROOT="${D}" install || die "make install failed"
+
+	rm -rf ${D}/usr/share/doc/${P}
+	dodoc AUTHORS BUGS TODO quilt.changes doc/README doc/README.MAIL \
+		doc/quilt.pdf doc/sample.quiltrc
+
+	rm -rf ${D}/etc/bash_completion.d
+	dobashcompletion bash_completion
+}
diff --git a/dev-util/quilt/quilt-0.46.ebuild b/dev-util/quilt/quilt-0.46.ebuild
new file mode 100644
index 000000000000..95d30e864cab
--- /dev/null
+++ b/dev-util/quilt/quilt-0.46.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/quilt/quilt-0.46.ebuild,v 1.1 2007/03/07 11:02:29 phreak Exp $
+
+inherit bash-completion eutils
+
+DESCRIPTION="quilt patch manager"
+HOMEPAGE="http://savannah.nongnu.org/projects/quilt"
+SRC_URI="http://savannah.nongnu.org/download/quilt/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="graphviz"
+
+RDEPEND="sys-apps/ed
+	dev-util/diffstat
+	graphviz? ( media-gfx/graphviz )"
+
+# The tests are somewhat broken while being run from within portage, work fine
+# if you run them manually
+RESTRICT="test"
+
+pkg_setup() {
+	echo
+	elog "If you intend to use the folding functionality (graphical illustration of the patch stack)"
+	elog "then you'll need to remerge this package with USE=graphviz."
+	echo
+	epause
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Add support for USE=graphviz
+	use graphviz || epatch "${FILESDIR}/${P}-no-graphviz.patch"
+}
+
+src_install() {
+	make 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
+	dobashcompletion bash_completion
+
+	# Remove the compat symlinks
+	rm -rf "${D}"/usr/share/quilt/compat
+}