Version bump. bug #396323. Thanks to Marco Paolone.

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

diff --git a/dev-util/quilt/ChangeLog b/dev-util/quilt/ChangeLog
index 1db37fb88fd8b616485dae2c33979d92f7dddf9b..48406b03a6a3210b5cb9c811609b5cc5fa842fd5 100644 (file)
--- a/dev-util/quilt/ChangeLog
+++ b/dev-util/quilt/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/quilt
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/quilt/ChangeLog,v 1.49 2011/01/04 01:29:30 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/quilt/ChangeLog,v 1.50 2011/12/29 23:00:52 mpagano Exp $
+
+*quilt-0.50 (29 Dec 2011)
+
+  29 Dec 2011; Michael Pagano <mpagano@gentoo.org> +quilt-0.50.ebuild,
+  +files/quilt-0.50-no-graphviz.patch:
+  Version bump. bug #396323. Thanks to Marco Paolone.
 
   04 Jan 2011; Michael Weber <xmw@gentoo.org> quilt-0.48.ebuild:
   arm stable (bug 327625)

diff --git a/dev-util/quilt/Manifest b/dev-util/quilt/Manifest
index 21a09eeeddea17f9275eef3dcda60efa48356a67..a4ed9659305b4956419db82484ad24d8f2781e5f 100644 (file)
--- a/dev-util/quilt/Manifest
+++ b/dev-util/quilt/Manifest
@@ -1,19 +1,32 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX quilt-0.42-no-graphviz.patch 977 RMD160 98f354290550ee2fa9d8631695d8fbb93173bc1e SHA1 097575bb252a3d94a704029d37b8532088fcdedc SHA256 b6befc22843c6d5bb82e56a12967649856895b504a0df9cbf81e413d1250a7fe
 AUX quilt-0.42-prevent-stripping.patch 516 RMD160 134e82f7d19d91e0a252690b98271dd6040a6e16 SHA1 4b44988197f939885885975a6390046152d77eef SHA256 a98a07afeb6fce3db1bc2623403f4eceb9a164ed35f5a4755907d430852fd957
 AUX quilt-0.45-no-graphviz.patch 1598 RMD160 48a217ebc3ad4513527293e9d2c7a41af4e0a25a SHA1 bcc4646be996e993b624e85835036a3e6c6cc8d4 SHA256 59a918e0cc46db9bc4cd268963b010dd5eb6e5e1e081bc3d51dffb756b4bd0d4
 AUX quilt-0.46-no-graphviz.patch 1598 RMD160 b4c2e0de0309c13f7b17faa375b023b0082650e9 SHA1 3cced5b65d8b7888eddaa698249ce035e75b2909 SHA256 d7858941e34bd101b178594ee00b8092c1ca2fed46b4b089ce014ca4adf17b8a
 AUX quilt-0.47-no-graphviz.patch 1466 RMD160 fe5038b58437d7a41909ad2d84db32b63e737625 SHA1 5b94cb42aaf560921ae590529323700aabc136ff SHA256 7faf081c7aa3b84659d8e3fd6b0aa0162fd9afa5b7f08bcccd06df007190f7c8
 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
 DIST quilt-0.42.tar.gz 355294 RMD160 f8a2e9fce3e7170f499082f754cc9e2d99023f0b SHA1 0ef01517e21f7798cbbd5fa1937155ed2160a3b2 SHA256 a31f72d390c4abeebbd22ec6b79bed2090677908eeb946d3a1d4aa9c0d81b1fe
 DIST quilt-0.45.tar.gz 399440 RMD160 d3a7f919a348e3de68b9c805acd4bf15ebbdc747 SHA1 35a08648b7bd9b16383b50f2ebc83caa4de51ad7 SHA256 de7290f334baf631a14d031df304ee94cfb550aa69e7512aa589d21c2381c7d8
 DIST quilt-0.46.tar.gz 403984 RMD160 508d6b4f8c1283b20acf8a757d4b3dfc3b8a7961 SHA1 9344c1289f262053beb0196645b41ea5d9cda597 SHA256 47bf030565bb462840db694acc183273455714028c74974c5b3a3bd4ad29ad89
 DIST quilt-0.47.tar.gz 421731 RMD160 6b76400466b52da02ce067b3722244448fb431a8 SHA1 028dadd5ab60b1df12edd18af600e59fe0a83525 SHA256 100a6a7d5012d36590e607ebc87535f62318cfe7368f4cd44cacb94a2cf938a2
 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
 EBUILD quilt-0.42-r1.ebuild 1489 RMD160 ca73f16b95378b4da3f07ccebcdd0d90578debef SHA1 85b81920c3ecd27c61f1174146911811d2282cb8 SHA256 d63c582f21361bc328342fdb9ff055a28012553e7de9bc8e9b6c09b0976471f0
 EBUILD quilt-0.45-r1.ebuild 1401 RMD160 ba5ed0e1613eeba5c103587f500ad396c3909072 SHA1 da5077922b505749d308bbb124a12d546bd3b94f SHA256 fc0edd59128d5709787eda4d7a2969dca57cddfffba87c7b3d8e5d44fdd033df
 EBUILD quilt-0.46.ebuild 1470 RMD160 a673ea35df2b6cf7eadf66bfe084f751afe63d6f SHA1 d5e05a776191d6774446e693fa75689330391dd9 SHA256 d10d3048c5def8faf44601a2cbf8fc24656d0824c1b300d1337299b398bbbc1c
 EBUILD quilt-0.47-r1.ebuild 1627 RMD160 794de2717fc584a801fc4a4029140aec47905565 SHA1 f9e69a2257038afc182a06ccfd058927947edeab SHA256 b4b0652f374f98b15b7ecd33fd58af3a0f35d3b5e0b53e6a62b6ab7da3e6e16f
 EBUILD quilt-0.47.ebuild 1475 RMD160 4303ae6aa883c6127c20f796c9439442ca9d8637 SHA1 ebd6664305f65e55f0ea36cfa0b7405fab11c2cb SHA256 bb00613edb5dd5f1696766d5802b7a94c507122089168ddf36e3e0becbe753f3
 EBUILD quilt-0.48.ebuild 1623 RMD160 907c73d8cfb063327b2770140b1e8fde4862401f SHA1 33613e6b745dcec1ed8358e54ab4b14fcbbc41e5 SHA256 b34b34f1a67723a20c9686ed5ef25b78a2466e884df133e981cec074a0295bcf
-MISC ChangeLog 6695 RMD160 fc9a261481c09b73d0251cf90247e65a796e845a SHA1 2f6d27742f665bd9bbd7da3b896c3fb266965dad SHA256 7ed00a791d8ed7b26a03a407c7958c67a1a31f18c47d26b15571b081badab5e0
+EBUILD quilt-0.50.ebuild 1610 RMD160 d89e3c50a64dd6d9b04eae716938a73b718c1d6d SHA1 395804990eb22a199fdacdf3ea9bbd55aa9f11e9 SHA256 163936c5f3e8095913e1571731c84feb82d2a2a23404a255f5ef99c3e1fca224
+MISC ChangeLog 6891 RMD160 4f800b392a14206291f50a038217bd4b5ec4bbf7 SHA1 a233b6010eb21ad12b4c15de7f124851ebdf80ac SHA256 2d22ba4ae46f05791efeb402293dc594520a38f4ad2e2ca7b657effcfe7553ea
 MISC metadata.xml 230 RMD160 097a7af6e26222c3bb952a3d8b5eb61f1ff8580d SHA1 9030a956b669dc0cdf6527baea97f508196d70e0 SHA256 7e08aa17b8ce9d72c01a0ea210dfecb736f72e1945463f07e72ee9bad822de34
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEAREIAAYFAk788S0ACgkQPDPGULV25OM/bQCffi4IBisiEE3Jyy3eM8JjH6Tx
+H1IAn1BmF9bNzNmgRlD8tpVWJwsGUREs
+=R5J2
+-----END PGP SIGNATURE-----

diff --git a/dev-util/quilt/files/quilt-0.50-no-graphviz.patch b/dev-util/quilt/files/quilt-0.50-no-graphviz.patch
new file mode 100644 (file)
index 0000000..04e0d7d
--- /dev/null
+++ b/dev-util/quilt/files/quilt-0.50-no-graphviz.patch
@@ -0,0 +1,47 @@
+Index: b/Makefile.in
+===================================================================
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -82,8 +82,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)
+Index: b/bash_completion
+===================================================================
+--- a/bash_completion
++++ b/bash_completion
+@@ -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.50.ebuild b/dev-util/quilt/quilt-0.50.ebuild
new file mode 100644 (file)
index 0000000..8d0c1ea
--- /dev/null
+++ b/dev-util/quilt/quilt-0.50.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/quilt/quilt-0.50.ebuild,v 1.1 2011/12/29 23:00:52 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
+}