Cleaning out the older versions. Adding sys-apps/mktemp to RDEPEND (thanks to Dustin J. Mitchell <dustin at v.igoro.us> in #186917). Backporting vapier's changes from 0.45-r1 to 0.42-r1.

(Portage version: 2.1.3.3)

16 files changed, 19 insertions, 221 deletions

diff --git a/dev-util/quilt/ChangeLog b/dev-util/quilt/ChangeLog
index a4faeeb0c7bf..bc7cbd0cc3f4 100644
--- a/dev-util/quilt/ChangeLog
+++ b/dev-util/quilt/ChangeLog
@@ -1,6 +1,14 @@
 # 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.25 2007/05/03 13:57:15 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/quilt/ChangeLog,v 1.26 2007/08/11 12:51:12 phreak Exp $
+
+  11 Aug 2007; Christian Heim <phreak@gentoo.org> -quilt-0.32-r1.ebuild,
+  -quilt-0.39.ebuild, -quilt-0.40.ebuild, -quilt-0.42.ebuild,
+  quilt-0.42-r1.ebuild, -quilt-0.44.ebuild, -quilt-0.45.ebuild,
+  quilt-0.45-r1.ebuild, quilt-0.46.ebuild:
+  Cleaning out the older versions. Adding sys-apps/mktemp to RDEPEND (thanks
+  to Dustin J. Mitchell <dustin at v.igoro.us> in #186917). Backporting
+  vapier's changes from 0.45-r1 to 0.42-r1.
 
   01 May 2007; Christian Heim <phreak@gentoo.org> quilt-0.45-r1.ebuild,
   quilt-0.46.ebuild:
diff --git a/dev-util/quilt/files/digest-quilt-0.32-r1 b/dev-util/quilt/files/digest-quilt-0.32-r1
deleted file mode 100644
index 16e2fdb38f85..000000000000
--- a/dev-util/quilt/files/digest-quilt-0.32-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 cb7922bdacbc6e99e432d967fbea71d6 quilt-0.32.tar.gz 284294
-RMD160 91c09d5edbd6ae564d0151d9387d168ca8cd675b quilt-0.32.tar.gz 284294
-SHA256 b9dfc26d059f566ef27fab5c4827d2cc9028a9415e2a20542fd25f5e3ea0aca7 quilt-0.32.tar.gz 284294
diff --git a/dev-util/quilt/files/digest-quilt-0.39 b/dev-util/quilt/files/digest-quilt-0.39
deleted file mode 100644
index 45d437e711e1..000000000000
--- a/dev-util/quilt/files/digest-quilt-0.39
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 08398028b0c39d41fca4ab2236540dfb quilt_0.39.orig.tar.gz 325861
-RMD160 815c1180f50291bf6a61a33defc2ebd7bb130938 quilt_0.39.orig.tar.gz 325861
-SHA256 220b99f068398794da1319e7747a47f75ef0e573c1fe970f423a3e96a511bd0f quilt_0.39.orig.tar.gz 325861
diff --git a/dev-util/quilt/files/digest-quilt-0.40 b/dev-util/quilt/files/digest-quilt-0.40
deleted file mode 100644
index 28cab16ed8a5..000000000000
--- a/dev-util/quilt/files/digest-quilt-0.40
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 12305c1b114e9ca0a31980117b65a903 quilt_0.40.orig.tar.gz 334556
-RMD160 3416a29384a9831e9d9a2c856a4ff3fe1ec6edf5 quilt_0.40.orig.tar.gz 334556
-SHA256 c8f4efa48b225be583f9ffd197a033bfe47cdafca54281eea84301ca90b090bb quilt_0.40.orig.tar.gz 334556
diff --git a/dev-util/quilt/files/digest-quilt-0.42 b/dev-util/quilt/files/digest-quilt-0.42
deleted file mode 100644
index e15184a42a71..000000000000
--- a/dev-util/quilt/files/digest-quilt-0.42
+++ /dev/null
@@ -1,3 +0,0 @@
-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.44 b/dev-util/quilt/files/digest-quilt-0.44
deleted file mode 100644
index 1e8d9b0c97f0..000000000000
--- a/dev-util/quilt/files/digest-quilt-0.44
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 90ec3740a590d86af40f81792885f446 quilt-0.44.tar.gz 397241
-RMD160 f4659a1beea0c9235abf90800ea8034772517789 quilt-0.44.tar.gz 397241
-SHA256 67b6c9117bf435fac115992367b26951be894018866d6bdde39ca8e0d0c48bf2 quilt-0.44.tar.gz 397241
diff --git a/dev-util/quilt/files/digest-quilt-0.45 b/dev-util/quilt/files/digest-quilt-0.45
deleted file mode 100644
index 4d749db5cfa2..000000000000
--- a/dev-util/quilt/files/digest-quilt-0.45
+++ /dev/null
@@ -1,3 +0,0 @@
-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/quilt-0.32-r1.ebuild b/dev-util/quilt/quilt-0.32-r1.ebuild
deleted file mode 100644
index 7e2bdef734a3..000000000000
--- a/dev-util/quilt/quilt-0.32-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/quilt/quilt-0.32-r1.ebuild,v 1.3 2006/08/26 07:40:02 wormo Exp $
-
-inherit bash-completion
-
-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=""
-
-RDEPEND="dev-util/diffstat
-	media-gfx/graphviz"
-
-src_install() {
-	make BUILD_ROOT="${D}" install || die "make install failed"
-
-	rm -rf ${D}/usr/share/doc/${P}
-	dodoc AUTHORS BUGS quilt.changes doc/README doc/quilt.pdf \
-		doc/sample.quiltrc
-
-	rm -rf ${D}/etc/bash_completion.d
-	dobashcompletion bash_completion ${PN}
-}
diff --git a/dev-util/quilt/quilt-0.39.ebuild b/dev-util/quilt/quilt-0.39.ebuild
deleted file mode 100644
index 7f6bfdffdc44..000000000000
--- a/dev-util/quilt/quilt-0.39.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/quilt/quilt-0.39.ebuild,v 1.3 2006/08/26 07:40:02 wormo Exp $
-
-inherit bash-completion
-
-DESCRIPTION="quilt patch manager"
-HOMEPAGE="http://savannah.nongnu.org/projects/quilt"
-#SRC_URI="http://savannah.nongnu.org/download/quilt/${P}.tar.gz"
-# There are packages hosted at the savannah site, but the maintainers do not
-# update them.  Which means we either have to hit the deb package or the suse
-# RPM for a current version.
-# yuck.
-SRC_URI="mirror://debian/pool/main/q/quilt/${P//-/_}.orig.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
-IUSE=""
-
-RDEPEND="dev-util/diffstat
-	media-gfx/graphviz"
-
-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.40.ebuild b/dev-util/quilt/quilt-0.40.ebuild
deleted file mode 100644
index 65e345cf28ff..000000000000
--- a/dev-util/quilt/quilt-0.40.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/quilt/quilt-0.40.ebuild,v 1.4 2006/08/26 07:40:02 wormo Exp $
-
-inherit bash-completion
-
-DESCRIPTION="quilt patch manager"
-HOMEPAGE="http://savannah.nongnu.org/projects/quilt"
-#SRC_URI="http://savannah.nongnu.org/download/quilt/${P}.tar.gz"
-# There are packages hosted at the savannah site, but the maintainers do not
-# update them.  Which means we either have to hit the deb package or the suse
-# RPM for a current version.
-# yuck.
-SRC_URI="mirror://debian/pool/main/q/quilt/${P//-/_}.orig.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE=""
-
-RDEPEND="dev-util/diffstat
-	media-gfx/graphviz"
-
-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.42-r1.ebuild b/dev-util/quilt/quilt-0.42-r1.ebuild
index 4b0040d7fe82..d13b45c8d992 100644
--- a/dev-util/quilt/quilt-0.42-r1.ebuild
+++ b/dev-util/quilt/quilt-0.42-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.2 2007/03/07 11:15:54 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/quilt/quilt-0.42-r1.ebuild,v 1.3 2007/08/11 12:51:12 phreak Exp $
 
 inherit bash-completion eutils
 
@@ -15,13 +15,15 @@ IUSE="graphviz"
 
 RDEPEND="sys-apps/ed
 	dev-util/diffstat
-	graphviz? ( media-gfx/graphviz )"
+	graphviz? ( media-gfx/graphviz )
+	sys-apps/mktemp"
 
 # The tests are somewhat broken while being run from within portage, work fine
 # if you run them manually
 RESTRICT="test"
 
 pkg_setup() {
+	use graphviz && return 0
 	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."
diff --git a/dev-util/quilt/quilt-0.42.ebuild b/dev-util/quilt/quilt-0.42.ebuild
deleted file mode 100644
index 745e41bbffa4..000000000000
--- a/dev-util/quilt/quilt-0.42.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/quilt/quilt-0.42.ebuild,v 1.4 2006/08/26 07:40:02 wormo Exp $
-
-inherit bash-completion
-
-DESCRIPTION="quilt patch manager"
-HOMEPAGE="http://savannah.nongnu.org/projects/quilt"
-SRC_URI="http://savannah.nongnu.org/download/quilt/${P}.tar.gz"
-# There are packages hosted at the savannah site, but the maintainers do not
-# update them.  Which means we either have to hit the deb package or the suse
-# RPM for a current version.
-# yuck.
-#SRC_URI="mirror://debian/pool/main/q/quilt/${P//-/_}.orig.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE=""
-
-RDEPEND="sys-apps/ed
-	dev-util/diffstat
-	media-gfx/graphviz"
-
-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.44.ebuild b/dev-util/quilt/quilt-0.44.ebuild
deleted file mode 100644
index fe9b7292daa0..000000000000
--- a/dev-util/quilt/quilt-0.44.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/quilt/quilt-0.44.ebuild,v 1.1 2006/02/22 16:06:49 ka0ttic Exp $
-
-inherit bash-completion
-
-DESCRIPTION="quilt patch manager"
-HOMEPAGE="http://savannah.nongnu.org/projects/quilt"
-SRC_URI="http://savannah.nongnu.org/download/quilt/${P}.tar.gz"
-# There are packages hosted at the savannah site, but the maintainers do not
-# update them.  Which means we either have to hit the deb package or the suse
-# RPM for a current version.
-# yuck.
-#SRC_URI="mirror://debian/pool/main/q/quilt/${P//-/_}.orig.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND="sys-apps/ed
-	dev-util/diffstat
-	media-gfx/graphviz"
-
-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.45-r1.ebuild b/dev-util/quilt/quilt-0.45-r1.ebuild
index 8e5139dda951..a2a94c809cff 100644
--- a/dev-util/quilt/quilt-0.45-r1.ebuild
+++ b/dev-util/quilt/quilt-0.45-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.4 2007/05/01 07:44:03 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/quilt/quilt-0.45-r1.ebuild,v 1.5 2007/08/11 12:51:12 phreak Exp $
 
 inherit bash-completion eutils
 
@@ -15,7 +15,8 @@ IUSE="graphviz"
 
 RDEPEND="sys-apps/ed
 	dev-util/diffstat
-	graphviz? ( media-gfx/graphviz )"
+	graphviz? ( media-gfx/graphviz )
+	sys-apps/mktemp"
 
 pkg_setup() {
 	use graphviz && return 0
diff --git a/dev-util/quilt/quilt-0.45.ebuild b/dev-util/quilt/quilt-0.45.ebuild
deleted file mode 100644
index ecd45e59e629..000000000000
--- a/dev-util/quilt/quilt-0.45.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/quilt/quilt-0.45.ebuild,v 1.3 2006/12/08 23:40:14 lu_zero Exp $
-
-inherit bash-completion
-
-DESCRIPTION="quilt patch manager"
-HOMEPAGE="http://savannah.nongnu.org/projects/quilt"
-SRC_URI="http://savannah.nongnu.org/download/quilt/${P}.tar.gz"
-# There are packages hosted at the savannah site, but the maintainers do not
-# update them.  Which means we either have to hit the deb package or the suse
-# RPM for a current version.
-# yuck.
-#SRC_URI="mirror://debian/pool/main/q/quilt/${P//-/_}.orig.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ppc ppc64 ~x86"
-IUSE=""
-
-RDEPEND="sys-apps/ed
-	dev-util/diffstat
-	media-gfx/graphviz"
-
-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
index 58c4c6869297..a4585d597163 100644
--- a/dev-util/quilt/quilt-0.46.ebuild
+++ b/dev-util/quilt/quilt-0.46.ebuild
@@ -1,6 +1,6 @@
 # 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.4 2007/05/01 07:44:03 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/quilt/quilt-0.46.ebuild,v 1.5 2007/08/11 12:51:12 phreak Exp $
 
 inherit bash-completion eutils
 
@@ -15,7 +15,8 @@ IUSE="graphviz"
 
 RDEPEND="sys-apps/ed
 	dev-util/diffstat
-	graphviz? ( media-gfx/graphviz )"
+	graphviz? ( media-gfx/graphviz )
+	sys-apps/mktemp"
 
 pkg_setup() {
 	use graphviz && return 0