| 1 |
ottxor 14/02/27 00:20:57 |
| 2 |
|
| 3 |
Modified: ChangeLog unpacker.eclass |
| 4 |
Log: |
| 5 |
added lzip support (bug #501912) |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.1149 eclass/ChangeLog |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1149&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1149&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1148&r2=1.1149 |
| 13 |
|
| 14 |
Index: ChangeLog |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v |
| 17 |
retrieving revision 1.1148 |
| 18 |
retrieving revision 1.1149 |
| 19 |
diff -u -r1.1148 -r1.1149 |
| 20 |
--- ChangeLog 25 Feb 2014 13:01:49 -0000 1.1148 |
| 21 |
+++ ChangeLog 27 Feb 2014 00:20:57 -0000 1.1149 |
| 22 |
@@ -1,6 +1,9 @@ |
| 23 |
# ChangeLog for eclass directory |
| 24 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
| 25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1148 2014/02/25 13:01:49 mgorny Exp $ |
| 26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1149 2014/02/27 00:20:57 ottxor Exp $ |
| 27 |
+ |
| 28 |
+ 27 Feb 2014; Christoph Junghans <ottxor@g.o> unpacker.eclass: |
| 29 |
+ added lzip support (bug #501912) |
| 30 |
|
| 31 |
25 Feb 2014; Michał Górny <mgorny@g.o> git-r3.eclass: |
| 32 |
Use git init+fetch rather than clone in order to fix checking out to |
| 33 |
|
| 34 |
|
| 35 |
|
| 36 |
1.16 eclass/unpacker.eclass |
| 37 |
|
| 38 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/unpacker.eclass?rev=1.16&view=markup |
| 39 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/unpacker.eclass?rev=1.16&content-type=text/plain |
| 40 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/unpacker.eclass?r1=1.15&r2=1.16 |
| 41 |
|
| 42 |
Index: unpacker.eclass |
| 43 |
=================================================================== |
| 44 |
RCS file: /var/cvsroot/gentoo-x86/eclass/unpacker.eclass,v |
| 45 |
retrieving revision 1.15 |
| 46 |
retrieving revision 1.16 |
| 47 |
diff -u -r1.15 -r1.16 |
| 48 |
--- unpacker.eclass 18 Feb 2014 06:13:50 -0000 1.15 |
| 49 |
+++ unpacker.eclass 27 Feb 2014 00:20:57 -0000 1.16 |
| 50 |
@@ -1,6 +1,6 @@ |
| 51 |
-# Copyright 1999-2013 Gentoo Foundation |
| 52 |
+# Copyright 1999-2014 Gentoo Foundation |
| 53 |
# Distributed under the terms of the GNU General Public License v2 |
| 54 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/unpacker.eclass,v 1.15 2014/02/18 06:13:50 vapier Exp $ |
| 55 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/unpacker.eclass,v 1.16 2014/02/27 00:20:57 ottxor Exp $ |
| 56 |
|
| 57 |
# @ECLASS: unpacker.eclass |
| 58 |
# @MAINTAINER: |
| 59 |
@@ -25,6 +25,13 @@ |
| 60 |
# `pbzip2` and `bzip2`. Make sure your choice accepts the "-dc" options. |
| 61 |
# Note: this is meant for users to set, not ebuilds. |
| 62 |
|
| 63 |
+# @ECLASS-VARIABLE: UNPACKER_LZIP |
| 64 |
+# @DEFAULT_UNSET |
| 65 |
+# @DESCRIPTION: |
| 66 |
+# Utility to use to decompress lzip files. Will dynamically pick between |
| 67 |
+# `pdlzip` and `lzip`. Make sure your choice accepts the "-dc" options. |
| 68 |
+# Note: this is meant for users to set, not ebuilds. |
| 69 |
+ |
| 70 |
# for internal use only (unpack_pdv and unpack_makeself) |
| 71 |
find_unpackable_file() { |
| 72 |
local src=$1 |
| 73 |
@@ -344,6 +351,9 @@ |
| 74 |
comp="gzip -dc" ;; |
| 75 |
*.lzma|*.xz|*.txz) |
| 76 |
comp="xz -dc" ;; |
| 77 |
+ *.lz) |
| 78 |
+ : ${UNPACKER_LZIP:=$(type -P pdlzip || type -P lzip)} |
| 79 |
+ comp="${UNPACKER_LZIP} -dc" ;; |
| 80 |
*) comp="" ;; |
| 81 |
esac |
| 82 |
|
| 83 |
@@ -438,6 +448,8 @@ |
| 84 |
d="app-arch/xz-utils" ;; |
| 85 |
*.zip) |
| 86 |
d="app-arch/unzip" ;; |
| 87 |
+ *.lz) |
| 88 |
+ d="|| ( app-arch/pdlzip app-arch/lzip )" ;; |
| 89 |
esac |
| 90 |
deps+=" ${d}" |
| 91 |
done |
Archives