commit: 8e50789e30a5df46e36478cdd4e3a5b3569c6cb7
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 4 15:25:21 2016 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu Feb 4 15:25:21 2016 +0000
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=8e50789e
dev-util/quilt: sync
Package-Manager: portage-2.2.20-prefix
dev-util/quilt/Manifest | 3 +-
.../quilt/files/quilt-0.63-bash-completion.patch | 17 ++++++
dev-util/quilt/files/quilt-0.63-no-graphviz.patch | 43 ++++++++++++++
dev-util/quilt/quilt-0.48.ebuild | 66 ----------------------
.../quilt/{quilt-0.60.ebuild => quilt-0.63.ebuild} | 35 +++++++-----
5 files changed, 81 insertions(+), 83 deletions(-)
diff --git a/dev-util/quilt/Manifest b/dev-util/quilt/Manifest
index cf5179f..77fc8c5 100644
--- a/dev-util/quilt/Manifest
+++ b/dev-util/quilt/Manifest
@@ -1,2 +1 @@
-DIST quilt-0.48.tar.gz 421146 SHA256
73fd760d3b5cbf06417576591dc37d67380d189392db9000c21b7cbebee49ffc SHA512
1c6c3f1497e07252effda381fa6adc2074161731ca3d9e6e9542485a77056f9db59abaf47c87d924bdf034cf7ca9e091368d222a6d41e29507a23fd17dccf44c
WHIRLPOOL
cb587508a3c6fc7a73cda3c0ecc83b4956fb51a807478f764476a38dadf9e91de1274f6f1cd76d4c7bb1cf0ff25191f33d6d36608ae69fc04435db6c737dc4d5
-DIST quilt-0.60.tar.gz 442369 SHA256
3d72a292e432beb9a73f9d0acfe3a77c9b4d7e42209919bb244e9958c7cfe64b SHA512
b257a8393145e8435cff5525843a79585903ea188f3f46af9dc4279b27ff92a51809ac197cb96dae03a81985af00d4302ded77bc142d10e75fd2add9926bf28f
WHIRLPOOL
e5c5c7dbc5586102df0ff59068a5ffc7182079729eb9f4dc50e97c04763b22dd8fa896b43f2e233735ea6ded81628b4549c98fbb7ba8d6200974d4bc9f48bee2
+DIST quilt-0.63.tar.gz 389593 SHA256
2846788221aa8844c54f10239c7cbc5e88031859162bcc285449446c3cfffe52 SHA512
e6d5c601805b664a5586a557799e7b321b6b28f7ccec708f52aa96371c987e5791aa54418c9b89d34154e4967ddfe7a261e37195fd29b6aa529e8fa6e5007c45
WHIRLPOOL
89b72f38d75e479fc8f030398757ab325ab46ff79baa7227fe122c4902d582374971c8c5f562611f0c024e8b56db01858669cd0427338f2368492ff118f31280
diff --git a/dev-util/quilt/files/quilt-0.63-bash-completion.patch
b/dev-util/quilt/files/quilt-0.63-bash-completion.patch
new file mode 100644
index 0000000..c85caca
--- /dev/null
+++ b/dev-util/quilt/files/quilt-0.63-bash-completion.patch
@@ -0,0 +1,17 @@
+--- bash_completion.orig 2014-10-21 18:15:29.549789267 -0400
++++ bash_completion 2014-10-21 18:15:38.489789221 -0400
+@@ -11,8 +11,6 @@
+ # completion to work then you must set QUILT_PC in your global environment
+ # (for example in ~/.profile) and not just in your quiltrc file.
+
+-if type quilt &> /dev/null ; then
+-
+ if ! type _expand &> /dev/null ; then
+ # This function expands tildes in pathnames
+ #
+@@ -310,5 +308,3 @@ _quilt_completion()
+ && _quilt_complete_opt="-o filenames"
+ complete -F _quilt_completion $_quilt_complete_opt quilt
+ unset -v _quilt_complete_opt
+-
+-fi
diff --git a/dev-util/quilt/files/quilt-0.63-no-graphviz.patch
b/dev-util/quilt/files/quilt-0.63-no-graphviz.patch
new file mode 100644
index 0000000..8045812
--- /dev/null
+++ b/dev-util/quilt/files/quilt-0.63-no-graphviz.patch
@@ -0,0 +1,43 @@
+--- Makefile.in.orig 2014-10-21 17:08:25.639810130 -0400
++++ Makefile.in 2014-10-21 17:09:03.269809935 -0400
+@@ -79,8 +79,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 2014-10-21 17:09:08.789809906 -0400
++++ bash_completion 2014-10-21 17:09:53.189809676 -0400
+@@ -100,7 +100,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'
+
+@@ -194,19 +194,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 --quiltrc - applied 2>/dev/null)" -- $cur ) )
+- ;;
+- esac
+- ;;
+ grep)
+ _longopt grep
+ COMPREPLY=( ${COMPREPLY[@]:-} $( compgen -W "-h" -- $cur ) )
diff --git a/dev-util/quilt/quilt-0.48.ebuild b/dev-util/quilt/quilt-0.48.ebuild
deleted file mode 100644
index cee223b..0000000
--- a/dev-util/quilt/quilt-0.48.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# 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.48.ebuild,v 1.7
2011/01/04 01:29:30 xmw 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-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="emacs graphviz"
-
-RDEPEND="sys-apps/ed
- dev-util/diffstat
- graphviz? ( media-gfx/graphviz )
- || ( >=sys-apps/coreutils-6.10-r1 sys-apps/mktemp )"
-
-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_compile() {
- local myconf=""
- [[ ${CHOST} == *"-darwin"* ]] && myconf="${myconf} --without-getopt"
- econf ${myconf}
- emake
-}
-
-src_install() {
- emake BUILD_ROOT="${D}" install || die "make install failed"
-
- rm -rf "${ED}"/usr/share/doc/${P}
- dodoc AUTHORS TODO quilt.changes doc/README doc/README.MAIL \
- doc/quilt.pdf
-
- rm -rf "${ED}"/etc/bash_completion.d
- dobashcompletion bash_completion
-
- # Remove the compat symlinks
- rm -rf "${ED}"/usr/share/quilt/compat
-
- # Remove Emacs mode; newer version is in app-emacs/quilt-el, bug 247500
- rm -rf "${ED}"/usr/share/emacs
-}
diff --git a/dev-util/quilt/quilt-0.60.ebuild b/dev-util/quilt/quilt-0.63.ebuild
similarity index 72%
rename from dev-util/quilt/quilt-0.60.ebuild
rename to dev-util/quilt/quilt-0.63.ebuild
index ef6a423..8bed910 100644
--- a/dev-util/quilt/quilt-0.60.ebuild
+++ b/dev-util/quilt/quilt-0.63.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 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.2
2013/06/10 19:37:35 hwoarang Exp $
+# $Id$
+
+EAPI="5"
inherit bash-completion-r1 eutils
@@ -10,13 +12,14 @@
SRC_URI="http://savannah.nongnu.org/download/quilt/${P}.tar.gz";
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris"
IUSE="emacs graphviz"
RDEPEND="sys-apps/ed
dev-util/diffstat
graphviz? ( media-gfx/graphviz )
- kernel_Darwin? ( app-misc/getopt )
+ elibc_Darwin? ( app-misc/getopt )
+ elibc_SunOS? ( app-misc/getopt )
>=sys-apps/coreutils-8.5"
PDEPEND="emacs? ( app-emacs/quilt-el )"
@@ -27,35 +30,37 @@ pkg_setup() {
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_compile() {
+src_prepare() {
+
+ # Apply bash-competion patch see bug #526294
+ epatch "${FILESDIR}/${P}-bash-completion.patch"
+
+ # Add support for USE=graphviz
+ use graphviz || epatch "${FILESDIR}/${P}-no-graphviz.patch"
+}
+
+src_configure() {
local myconf=""
- [[ ${CHOST} == *"-darwin"* ]] && \
- myconf="${myconf}
--with-getopt=\"${EPREFIX}\"/usr/bin/getopt-long"
+ [[ ${CHOST} == *-darwin* || ${CHOST} == *-solaris* ]] && \
+ myconf="${myconf} --with-getopt=${EPREFIX}/usr/bin/getopt-long"
econf ${myconf}
- emake
}
src_install() {
emake BUILD_ROOT="${D}" install || die "make install failed"
rm -rf "${ED}"/usr/share/doc/${P}
- dodoc AUTHORS TODO quilt.changes doc/README doc/README.MAIL \
- doc/quilt.pdf
+ dodoc AUTHORS TODO doc/README doc/README.MAIL doc/quilt.pdf
rm -rf "${ED}"/etc/bash_completion.d
newbashcomp bash_completion ${PN}
