Fix by Martin Väth for typo in xzgrep #356627 by Diego Elio Pettenò.

(Portage version: 2.2.0_alpha25/cvs/Linux x86_64)

3 files changed, 119 insertions, 1 deletions

diff --git a/app-arch/xz-utils/ChangeLog b/app-arch/xz-utils/ChangeLog
index 05adaa78a327..53451c0c8298 100644
--- a/app-arch/xz-utils/ChangeLog
+++ b/app-arch/xz-utils/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-arch/xz-utils
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/xz-utils/ChangeLog,v 1.21 2011/02/05 08:29:54 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/xz-utils/ChangeLog,v 1.22 2011/03/01 01:54:09 vapier Exp $
+
+*xz-utils-5.0.1-r1 (01 Mar 2011)
+
+  01 Mar 2011; Mike Frysinger <vapier@gentoo.org> +xz-utils-5.0.1-r1.ebuild,
+  +files/xz-utils-5.0.1-xzgrep-typo.patch:
+  Fix by Martin Väth for typo in xzgrep #356627 by Diego Elio Pettenò.
 
 *xz-utils-5.0.1 (05 Feb 2011)
 
diff --git a/app-arch/xz-utils/files/xz-utils-5.0.1-xzgrep-typo.patch b/app-arch/xz-utils/files/xz-utils-5.0.1-xzgrep-typo.patch
new file mode 100644
index 000000000000..7bc8a4b3f9f3
--- /dev/null
+++ b/app-arch/xz-utils/files/xz-utils-5.0.1-xzgrep-typo.patch
@@ -0,0 +1,42 @@
+http://bugs.gentoo.org/356627
+
+From 399ff2690b17908552b44bf34065f2b11d1d7859 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Martin=20V=C3=A4th?= <vaeth@mathematik.uni-wuerzburg.de>
+Date: Mon, 28 Feb 2011 20:45:16 -0500
+Subject: [PATCH] xzgrep: fix typo in $0 parsing
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Reported-by: Diego Elio Pettenò <flameeyes@gentoo.org>
+Signed-off-by: Martin Väth <vaeth@mathematik.uni-wuerzburg.de>
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ src/scripts/xzgrep.in |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/scripts/xzgrep.in b/src/scripts/xzgrep.in
+index bfa9fb5..708f7de 100644
+--- a/src/scripts/xzgrep.in
++++ b/src/scripts/xzgrep.in
+@@ -27,7 +27,7 @@
+ xz='@xz@ --format=auto'
+ unset GZIP BZIP BZIP2
+ 
+-case ${0##/*} in
++case ${0##*/} in
+   *egrep*) prog=xzegrep; grep=${GREP:-egrep};;
+   *fgrep*) prog=xzfgrep; grep=${GREP:-fgrep};;
+   *)       prog=xzgrep; grep=${GREP:-grep};;
+@@ -35,7 +35,7 @@ esac
+ 
+ version="$prog (@PACKAGE_NAME@) @VERSION@"
+ 
+-usage="Usage: ${0##/*} [OPTION]... [-e] PATTERN [FILE]...
++usage="Usage: ${0##*/} [OPTION]... [-e] PATTERN [FILE]...
+ Look for instances of PATTERN in the input FILEs, using their
+ uncompressed contents if they are compressed.
+ 
+-- 
+1.7.4.1
+
diff --git a/app-arch/xz-utils/xz-utils-5.0.1-r1.ebuild b/app-arch/xz-utils/xz-utils-5.0.1-r1.ebuild
new file mode 100644
index 000000000000..3af05290c80b
--- /dev/null
+++ b/app-arch/xz-utils/xz-utils-5.0.1-r1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/xz-utils/xz-utils-5.0.1-r1.ebuild,v 1.1 2011/03/01 01:54:09 vapier Exp $
+
+# Remember: we cannot leverage autotools in this ebuild in order
+#           to avoid circular deps with autotools
+
+EAPI="2"
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://ctrl.tukaani.org/xz.git"
+	inherit git autotools
+	SRC_URI=""
+	EXTRA_DEPEND="sys-devel/gettext dev-vcs/cvs >=sys-devel/libtool-2" #272880 286068
+else
+	MY_P="${PN/-utils}-${PV/_}"
+	SRC_URI="http://tukaani.org/xz/${MY_P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+	S=${WORKDIR}/${MY_P}
+	EXTRA_DEPEND=
+fi
+
+inherit eutils multilib
+
+DESCRIPTION="utils for managing LZMA compressed files"
+HOMEPAGE="http://tukaani.org/xz/"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="nls static-libs +threads"
+
+RDEPEND="!<app-arch/lzma-4.63
+	!app-arch/lzma-utils
+	!<app-arch/p7zip-4.57"
+DEPEND="${RDEPEND}
+	${EXTRA_DEPEND}"
+
+if [[ ${PV} == "9999" ]] ; then
+src_prepare() {
+	eautopoint
+	eautoreconf
+}
+fi
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-xzgrep-typo.patch #356627
+}
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		$(use_enable threads) \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die
+	rm "${D}"/usr/share/doc/xz/COPYING* || die
+	mv "${D}"/usr/share/doc/{xz,${PF}} || die
+	prepalldocs
+	dodoc AUTHORS ChangeLog NEWS README THANKS
+}
+
+pkg_preinst() {
+	preserve_old_lib /usr/$(get_libdir)/liblzma.so.0
+}
+
+pkg_postinst() {
+	preserve_old_lib_notify /usr/$(get_libdir)/liblzma.so.0
+}