Removing quilt-el from package. Emerge dev-util/quilt-el for support. See bug #247500 for more info. Thanks to Ulm. Other minor quoting fixes.

(Portage version: 2.2_rc14/cvs/Linux 2.6.27-gentoo-r3 i686)

3 files changed, 68 insertions, 4 deletions

diff --git a/dev-util/quilt/ChangeLog b/dev-util/quilt/ChangeLog
index ac011ce1816f..7cfc4c4e1edf 100644
--- a/dev-util/quilt/ChangeLog
+++ b/dev-util/quilt/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/quilt
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/quilt/ChangeLog,v 1.38 2008/11/17 20:08:58 mpagano Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/quilt/ChangeLog,v 1.39 2008/11/20 15:38:52 mpagano Exp $
+
+*quilt-0.47-r1 (20 Nov 2008)
+
+  20 Nov 2008; Michael Pagano <mpagano@gentoo.org> quilt-0.45-r1.ebuild,
+  +quilt-0.47-r1.ebuild:
+  Removing quilt-el from package. Emerge dev-util/quilt-el for support. See
+  bug #247500 for more info. Thanks to Ulm. Other minor quoting fixes.
 
   17 Nov 2008; Mike Pagano <mpagano@gentoo.org>
   +files/quilt-0.47-no-graphviz.patch:
diff --git a/dev-util/quilt/quilt-0.45-r1.ebuild b/dev-util/quilt/quilt-0.45-r1.ebuild
index fc66dacbf4a6..551155ed02e0 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-2008 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.6 2008/01/23 04:32:20 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/quilt/quilt-0.45-r1.ebuild,v 1.7 2008/11/20 15:38:52 mpagano Exp $
 
 inherit bash-completion eutils
 
@@ -42,10 +42,10 @@ src_unpack() {
 src_install() {
 	make BUILD_ROOT="${D}" install || die "make install failed"
 
-	rm -rf ${D}/usr/share/doc/${P}
+	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
+	rm -rf "${D}"/etc/bash_completion.d
 	dobashcompletion bash_completion
 }
diff --git a/dev-util/quilt/quilt-0.47-r1.ebuild b/dev-util/quilt/quilt-0.47-r1.ebuild
new file mode 100644
index 000000000000..74f192ae96b4
--- /dev/null
+++ b/dev-util/quilt/quilt-0.47-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/quilt/quilt-0.47-r1.ebuild,v 1.1 2008/11/20 15:38:52 mpagano 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 ~sparc ~x86"
+IUSE="graphviz"
+
+RDEPEND="sys-apps/ed
+	dev-util/diffstat
+	graphviz? ( media-gfx/graphviz )
+	|| ( >=sys-apps/coreutils-6.10-r1 sys-apps/mktemp )"
+
+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() {
+	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
+
+	# Remove Emacs mode; newer version is in app-emacs/quilt-el, bug 247500
+	rm -rf "${D}"/usr/share/emacs
+}