Version bump

Package-Manager: portage-2.2.0_alpha93/cvs/Linux x86_64

4 files changed, 117 insertions, 10 deletions

diff --git a/dev-util/quilt/ChangeLog b/dev-util/quilt/ChangeLog
index e6b06aa65ce2..889c28d5a010 100644
--- a/dev-util/quilt/ChangeLog
+++ b/dev-util/quilt/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/quilt
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/quilt/ChangeLog,v 1.52 2012/03/20 08:26:41 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/quilt/ChangeLog,v 1.53 2012/03/20 19:37:42 mpagano Exp $
+
+*quilt-0.60 (20 Mar 2012)
+
+  20 Mar 2012; Michael Pagano <mpagano@gentoo.org> +quilt-0.60.ebuild,
+  +files/quilt-0.60-no-graphviz.patch:
+  Version bump
 
   20 Mar 2012; Agostino Sarubbo <ago@gentoo.org> quilt-0.50.ebuild:
   Stable for amd64, wrt bug #408755
diff --git a/dev-util/quilt/Manifest b/dev-util/quilt/Manifest
index 5b0860f00918..ef5660a7d5c8 100644
--- a/dev-util/quilt/Manifest
+++ b/dev-util/quilt/Manifest
@@ -1,22 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX quilt-0.48-no-graphviz.patch 1040 RMD160 d8c293adde1feb32371e62ab439034b059e16ab4 SHA1 3480e5f58654c1ba13850cf06573ffc1c9d9508e SHA256 8069952ef70bfe42b46b6e9479ca598d2279f8964d125ce7f61d0ae5ed1f4abd
 AUX quilt-0.50-no-graphviz.patch 1477 RMD160 d5a9f93b61f25811c94a78444014bc50a5db9c93 SHA1 23b591f91b9613a3c1aa93b3d6a18e79c24e0f7c SHA256 b08f087361427a66bc3b2246090e947a7207b397d67dd6278a18398f9456adbb
+AUX quilt-0.60-no-graphviz.patch 1443 RMD160 afb284c770f4116cf4f3ff91850e358d119af6f9 SHA1 16c574d406d92a4bce914f3802893e63674703a9 SHA256 79a8fe2a6ebbe6099b9297f9ff75fe8f172716f53272ceed0a8b9c30455c3594
 DIST quilt-0.48.tar.gz 421146 RMD160 0ac18f31409077f2ae0adfcd3049ab5647812be3 SHA1 117e41d01a6ae2cbd6365b119e2b8891a20f0a16 SHA256 73fd760d3b5cbf06417576591dc37d67380d189392db9000c21b7cbebee49ffc
 DIST quilt-0.50.tar.gz 452769 RMD160 d4501ad0085a41f22c42834f5d0f0f0dbe8bf894 SHA1 1e7c4e6cd62ae981332bd10e9ebb732dd876cddb SHA256 fa4579628a98cf94472b36869e74f5cd0cb057d6fd13c1872a53f01c45aba8c3
+DIST quilt-0.60.tar.gz 442369 RMD160 b58268debdeb19d66a911df6d1ad47f5e56702db SHA1 c93c79598c55ba288f60babcc74a9fc9b04404b6 SHA256 3d72a292e432beb9a73f9d0acfe3a77c9b4d7e42209919bb244e9958c7cfe64b
 EBUILD quilt-0.48.ebuild 1623 RMD160 907c73d8cfb063327b2770140b1e8fde4862401f SHA1 33613e6b745dcec1ed8358e54ab4b14fcbbc41e5 SHA256 b34b34f1a67723a20c9686ed5ef25b78a2466e884df133e981cec074a0295bcf
 EBUILD quilt-0.50.ebuild 1605 RMD160 6f28fd80842a17cb284aa40355e2f7eba4cc71e5 SHA1 00d83da2c6633ff045fa677b10078facf125c84a SHA256 85094b70e9aaefade55b763f540e3db46b9e0f8e6a5fa7f40d75ee3f3b37c8f9
-MISC ChangeLog 7374 RMD160 2cb10a44abacd0e61a10fdef45e5cc9f1229f22f SHA1 f47af58621d1e65e376b83d943d483dc64f70430 SHA256 0c9bd0adfdf07256b06d773e3252134e3f44dd15e4afc3831814aff5bc8a114d
+EBUILD quilt-0.60.ebuild 1610 RMD160 ef0fd958b7933ca6af66eb0decd3f0b9ab732a81 SHA1 23e12d89a37a52ff236a274578af835b2bd6be49 SHA256 ccc5158756a85a05bd3f471f892e9a4c626d48c0fcb1eae8016b93bc3b64ada6
+MISC ChangeLog 7531 RMD160 335720c9e06652efccd80b8b75577106d1f4022e SHA1 3a2fd4127929c9274d1dc7c9a2e8fba71c0c2a51 SHA256 8b9ac47167e10475d8ab756cff6bd1c684a57ed765f2193a75b8b0edfe6670ca
 MISC metadata.xml 230 RMD160 097a7af6e26222c3bb952a3d8b5eb61f1ff8580d SHA1 9030a956b669dc0cdf6527baea97f508196d70e0 SHA256 7e08aa17b8ce9d72c01a0ea210dfecb736f72e1945463f07e72ee9bad822de34
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBCgAGBQJPaD9HAAoJEOTDgjZ80txdNuMH/1Ahif2Q9Sk1EzQZLeUiviOf
-ivhI9qY4dR3iqGIGZVM3n4S5oCWWUrEAgXXkcqaMtHe+9r6YbfrRQEBNyxY1f+KO
-UQlJ97qD4Hbmqq2CBDoEwmgJ+ULugSgOsZdYfkAOU7KcvYBey2095RMnxsL8kNgp
-hfgr0dJX3ORumNFogPC5Fq0NaVNdrkfLIPY45DO5M+6PY8CWxBwA+dJ3YpbYuvQh
-AZc+X8FO0k2K0KJ4SdHLibRZhOdfzRcyM/qdjH6KtP/N2kS6FnZ05pG+n23Fm+py
-YuJ33cKcfe57G7lB2HU/KKEuNe68rfiyZgE8GPZ/OnxLCIzoxJKWPIu7YPt50vM=
-=0JbJ
+iEYEAREIAAYFAk9o3JAACgkQPDPGULV25OMSHQCeN/P5wOM3ISpig9SA0RX2iGS4
+kAgAniwCJEt1YukuXuewTEfvX96frSyr
+=CbVG
 -----END PGP SIGNATURE-----
diff --git a/dev-util/quilt/files/quilt-0.60-no-graphviz.patch b/dev-util/quilt/files/quilt-0.60-no-graphviz.patch
new file mode 100644
index 000000000000..7e7409d95c91
--- /dev/null
+++ b/dev-util/quilt/files/quilt-0.60-no-graphviz.patch
@@ -0,0 +1,43 @@
+--- Makefile.in.orig	2012-03-20 14:59:48.308531073 -0400
++++ Makefile.in	2012-03-20 15:03:26.135623522 -0400
+@@ -76,8 +76,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	2012-03-20 15:04:06.994453283 -0400
++++ bash_completion	2012-03-20 15:07:37.335589189 -0400
+@@ -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 revert series setup snapshot top unapplied'
+ 
+@@ -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 2>/dev/null)" -- $cur ) )
+-		;;
+-	   esac
+-	   ;;
+ 	grep)
+ 	   _longopt grep
+ 	   COMPREPLY=( ${COMPREPLY[@]:-} $( compgen -W "-h" -- $cur ) )
diff --git a/dev-util/quilt/quilt-0.60.ebuild b/dev-util/quilt/quilt-0.60.ebuild
new file mode 100644
index 000000000000..a4442818fed2
--- /dev/null
+++ b/dev-util/quilt/quilt-0.60.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/quilt/quilt-0.60.ebuild,v 1.1 2012/03/20 19:37:42 mpagano Exp $
+
+inherit bash-completion-r1 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 ~arm ~ppc ~ppc64 ~sparc ~x86"
+IUSE="emacs graphviz"
+
+RDEPEND="sys-apps/ed
+	dev-util/diffstat
+	graphviz? ( media-gfx/graphviz )
+	>=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
+	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() {
+	emake 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
+	newbashcomp bash_completion ${PN}
+
+	# 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
+}