diff options
| author |   Christoph Junghans <ottxor@gentoo.org> | 2014-05-01 19:27:14 +0000 |
|---|---|---|
| committer | Christoph Junghans <ottxor@gentoo.org> | 2014-05-01 19:27:14 +0000 |
| commit | db873dbd1dc584d88a638dc1fe617bafa8e64a8b (patch) | |
| tree | 127acf7844e1cb5ff9d7b584c87c35288c1d4d48 /eclass | |
| parent | Bump to 1.26.1 (diff) | |
| download | historical-db873dbd1dc584d88a638dc1fe617bafa8e64a8b.tar.gz historical-db873dbd1dc584d88a638dc1fe617bafa8e64a8b.tar.bz2 historical-db873dbd1dc584d88a638dc1fe617bafa8e64a8b.zip | |
add app-arch/plzip support (bug #509264)
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 5 | ||||
| -rw-r--r-- | eclass/unpacker.eclass | 8 |
2 files changed, 8 insertions, 5 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 9b8326f0cf0a..d37bbe12b09f 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1235 2014/05/01 13:34:02 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1236 2014/05/01 19:27:14 ottxor Exp $ + + 01 May 2014; Christoph Junghans <ottxor@gentoo.org> unpacker.eclass: + add app-arch/plzip support (bug #509264) 01 May 2014; Justin Lecher <jlec@gentoo.org> python-utils-r1.eclass: Add missing @DESCRIPTION diff --git a/eclass/unpacker.eclass b/eclass/unpacker.eclass index 83dddfd16d14..076115f0e111 100644 --- a/eclass/unpacker.eclass +++ b/eclass/unpacker.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/unpacker.eclass,v 1.16 2014/02/27 00:20:57 ottxor Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/unpacker.eclass,v 1.17 2014/05/01 19:27:14 ottxor Exp $ # @ECLASS: unpacker.eclass # @MAINTAINER: @@ -29,7 +29,7 @@ ___ECLASS_ONCE_UNPACKER="recur -_+^+_- spank" # @DEFAULT_UNSET # @DESCRIPTION: # Utility to use to decompress lzip files. Will dynamically pick between -# `pdlzip` and `lzip`. Make sure your choice accepts the "-dc" options. +# `plzip`, `pdlzip` and `lzip`. Make sure your choice accepts the "-dc" options. # Note: this is meant for users to set, not ebuilds. # for internal use only (unpack_pdv and unpack_makeself) @@ -352,7 +352,7 @@ _unpacker() { *.lzma|*.xz|*.txz) comp="xz -dc" ;; *.lz) - : ${UNPACKER_LZIP:=$(type -P pdlzip || type -P lzip)} + : ${UNPACKER_LZIP:=$(type -P plzip || type -P pdlzip || type -P lzip)} comp="${UNPACKER_LZIP} -dc" ;; *) comp="" ;; esac @@ -449,7 +449,7 @@ unpacker_src_uri_depends() { *.zip) d="app-arch/unzip" ;; *.lz) - d="|| ( app-arch/pdlzip app-arch/lzip )" ;; + d="|| ( app-arch/plzip app-arch/pdlzip app-arch/lzip )" ;; esac deps+=" ${d}" done |