79192, 79195, 79197

Package-Manager: portage-1.584-cvs

7 files changed, 98 insertions, 33 deletions

diff --git a/dev-util/quilt/ChangeLog b/dev-util/quilt/ChangeLog
index b412643ebddf..555fbe2b478c 100644
--- a/dev-util/quilt/ChangeLog
+++ b/dev-util/quilt/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/quilt
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/quilt/ChangeLog,v 1.3 2004/12/18 11:51:36 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/quilt/ChangeLog,v 1.4 2005/03/09 09:44:05 ferringb Exp $
+
+  09 Mar 2005; Brian Harring <ferringb@gentoo.org> quilt-0.32-r1.ebuild, 
+  quilt-0.37.ebuild:
+  Closed out #79192, #79195, and #79797. Thanks to James Rowe for the fixes/bugs.
 
   18 Dec 2004; Simon Stelling <blubb@gentoo.org> quilt-0.32.ebuild:
   added ~amd64
diff --git a/dev-util/quilt/Manifest b/dev-util/quilt/Manifest
index 372dbc5a086d..1e7265c16f2b 100644
--- a/dev-util/quilt/Manifest
+++ b/dev-util/quilt/Manifest
@@ -1,4 +1,6 @@
-MD5 ef12fd4e0c55e2f8938f1c8909673eff ChangeLog 563
+MD5 10922f45a9e893c6ee663b6852294812 ChangeLog 744
 MD5 28dd3af7d1d8a667a0da90ae01bffe1c metadata.xml 224
-MD5 874203785a86faf35a5da6f7fce2ebe6 quilt-0.32.ebuild 737
-MD5 c6fbb2eecd1ee85a0db63fea70a2416d files/digest-quilt-0.32 62
+MD5 600add3372ac26c3bf6c8e1475742449 quilt-0.37.ebuild 1416
+MD5 0f608afede0573baf93c098df7a50dc3 quilt-0.32-r1.ebuild 1158
+MD5 003c9ff8a9caa912eaa92f9eb99376f1 files/digest-quilt-0.37 67
+MD5 c6fbb2eecd1ee85a0db63fea70a2416d files/digest-quilt-0.32-r1 62
diff --git a/dev-util/quilt/files/digest-quilt-0.32 b/dev-util/quilt/files/digest-quilt-0.32-r1
index 030176c1007a..030176c1007a 100644
--- a/dev-util/quilt/files/digest-quilt-0.32
+++ b/dev-util/quilt/files/digest-quilt-0.32-r1
diff --git a/dev-util/quilt/files/digest-quilt-0.37 b/dev-util/quilt/files/digest-quilt-0.37
new file mode 100644
index 000000000000..ccfd5f15836d
--- /dev/null
+++ b/dev-util/quilt/files/digest-quilt-0.37
@@ -0,0 +1 @@
+MD5 7ec3c4154491504d5ecade76d17b8692 quilt_0.37.orig.tar.gz 317155
diff --git a/dev-util/quilt/quilt-0.32-r1.ebuild b/dev-util/quilt/quilt-0.32-r1.ebuild
new file mode 100644
index 000000000000..7f4a02b9a861
--- /dev/null
+++ b/dev-util/quilt/quilt-0.32-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2005 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.1 2005/03/09 09:44:05 ferringb 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"
+
+DEPEND="sys-devel/patch
+	>=sys-apps/sed-4
+	app-arch/bzip2
+	app-arch/gzip
+	dev-util/diffstat
+	sys-apps/gawk
+	sys-apps/sed
+	dev-lang/perl"
+
+src_install() {
+	make BUILD_ROOT="${D}" install || die
+	# Remove the installed doc dir, as it not only contains uncompressed
+	# files but it also breaks policy by being named ${P} instead of ${PF}.
+	rm -rf ${D}/usr/share/doc/${P}
+	dodoc AUTHORS BUGS quilt.changes doc/README doc/quilt.pdf \
+		doc/sample.quiltrc
+
+
+	# Install the bash completion file in the usual Gentoo way, so users
+	# can decide whether it should be enabled or not.
+	rm ${D}/etc/bash_completion.d/quilt
+	dobashcompletion bash_completion ${PN}
+}
+
+pkg_postinst() {
+	bash-completion_pkg_postinst
+}
diff --git a/dev-util/quilt/quilt-0.32.ebuild b/dev-util/quilt/quilt-0.32.ebuild
deleted file mode 100644
index 615032ebf339..000000000000
--- a/dev-util/quilt/quilt-0.32.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/quilt/quilt-0.32.ebuild,v 1.6 2005/02/02 23:47:23 vapier Exp $
-
-inherit 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="bash-completion"
-
-DEPEND="sys-devel/patch
-	>=sys-apps/sed-4
-	app-arch/bzip2
-	app-arch/gzip
-	dev-util/diffstat
-	sys-apps/gawk
-	sys-apps/sed
-	dev-lang/perl"
-
-src_install() {
-	make BUILD_ROOT="${D}" install || die
-	use bash-completion || rm -r "${D}"/etc/bash_completion.d
-	dodoc AUTHORS BUGS TODO
-}
diff --git a/dev-util/quilt/quilt-0.37.ebuild b/dev-util/quilt/quilt-0.37.ebuild
new file mode 100644
index 000000000000..db101c3ff688
--- /dev/null
+++ b/dev-util/quilt/quilt-0.37.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/quilt/quilt-0.37.ebuild,v 1.1 2005/03/09 09:44:05 ferringb 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"
+# 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"
+
+DEPEND="sys-devel/patch
+	>=sys-apps/sed-4
+	app-arch/bzip2
+	app-arch/gzip
+	dev-util/diffstat
+	sys-apps/gawk
+	sys-apps/sed
+	dev-lang/perl"
+
+src_install() {
+	make BUILD_ROOT="${D}" install || die
+	# Remove the installed doc dir, as it not only contains uncompressed
+	# files but it also breaks policy by being named ${P} instead of ${PF}.
+	rm -rf ${D}/usr/share/doc/${P}
+	dodoc AUTHORS BUGS quilt.changes doc/README doc/quilt.pdf \
+		doc/sample.quiltrc
+
+
+	# Install the bash completion file in the usual Gentoo way, so users
+	# can decide whether it should be enabled or not.
+	rm ${D}/etc/bash_completion.d/quilt
+	dobashcompletion bash_completion ${PN}
+}
+
+pkg_postinst() {
+	bash-completion_pkg_postinst
+}