summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2011-09-23 06:09:45 +0000
committerMike Gilbert <floppym@gentoo.org>2011-09-23 06:09:45 +0000
commit25779a73e639eb5aefd511d01a0703bcc7eed7cf (patch)
tree27258f16a2761ea0c1e0244761881acd58e7e8fa /app-arch
parentVersion bump. Removed old. (diff)
downloadgentoo-2-25779a73e639eb5aefd511d01a0703bcc7eed7cf.tar.gz
gentoo-2-25779a73e639eb5aefd511d01a0703bcc7eed7cf.tar.bz2
gentoo-2-25779a73e639eb5aefd511d01a0703bcc7eed7cf.zip
Support any compression format. Keep the correct file extension. Bug 384145.
(Portage version: 2.2.0_alpha59/cvs/Linux x86_64)
Diffstat (limited to 'app-arch')
-rw-r--r--app-arch/deb2targz/ChangeLog9
-rw-r--r--app-arch/deb2targz/deb2targz-1-r2.ebuild (renamed from app-arch/deb2targz/deb2targz-1-r1.ebuild)4
-rw-r--r--app-arch/deb2targz/files/deb2targz-any-data.patch17
-rw-r--r--app-arch/deb2targz/files/deb2targz-lzma-support.patch18
-rw-r--r--app-arch/deb2targz/metadata.xml4
5 files changed, 31 insertions, 21 deletions
diff --git a/app-arch/deb2targz/ChangeLog b/app-arch/deb2targz/ChangeLog
index 6c2516c8e186..b27145611a81 100644
--- a/app-arch/deb2targz/ChangeLog
+++ b/app-arch/deb2targz/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for app-arch/deb2targz
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/deb2targz/ChangeLog,v 1.13 2011/08/30 10:50:04 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/deb2targz/ChangeLog,v 1.14 2011/09/23 06:09:45 floppym Exp $
+
+*deb2targz-1-r2 (23 Sep 2011)
+
+ 23 Sep 2011; Mike Gilbert <floppym@gentoo.org> -deb2targz-1-r1.ebuild,
+ +deb2targz-1-r2.ebuild, +files/deb2targz-any-data.patch,
+ -files/deb2targz-lzma-support.patch, metadata.xml:
+ Support any compression format. Keep the correct file extension. Bug 384145.
*deb2targz-1-r1 (30 Aug 2011)
diff --git a/app-arch/deb2targz/deb2targz-1-r1.ebuild b/app-arch/deb2targz/deb2targz-1-r2.ebuild
index 6155b1c3a48d..959b86a3176e 100644
--- a/app-arch/deb2targz/deb2targz-1-r1.ebuild
+++ b/app-arch/deb2targz/deb2targz-1-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/deb2targz/deb2targz-1-r1.ebuild,v 1.1 2011/08/30 10:50:04 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/deb2targz/deb2targz-1-r2.ebuild,v 1.1 2011/09/23 06:09:45 floppym Exp $
EAPI=4
inherit base
@@ -18,7 +18,7 @@ DEPEND=""
RDEPEND="dev-lang/perl"
S=${WORKDIR}
-PATCHES=( "${FILESDIR}/${PN}-lzma-support.patch" )
+PATCHES=( "${FILESDIR}/${PN}-any-data.patch" )
src_unpack() {
cp "${DISTDIR}/${PN}" "${S}"
diff --git a/app-arch/deb2targz/files/deb2targz-any-data.patch b/app-arch/deb2targz/files/deb2targz-any-data.patch
new file mode 100644
index 000000000000..c8c42308ce1c
--- /dev/null
+++ b/app-arch/deb2targz/files/deb2targz-any-data.patch
@@ -0,0 +1,17 @@
+Support any/all compression formats for data.tar
+--- deb2targz
++++ deb2targz
+@@ -47,10 +47,11 @@
+ ($header, $data) = ($data =~ /(.*?)\n(.*)/s);
+ my($name, $num1, $num2, $num3, $num4, $len) = split /\s+/, $header;
+ #print "header='$header'\n\tname='$name', len=$len\n";
+- if ($name eq "data.tar.gz") {
++ if ($name =~ /^data\.tar(.*)$/) {
+ # Found it
++ my $ext = $1;
+ $data = substr($data, 0, $len);
+- $filename =~ s/\.deb$/.tar.gz/;
++ $filename =~ s/\.deb$/.tar$ext/;
+ my $fh = new IO::File(">$filename")
+ or die "can't write '$filename': $!";
+ print $fh $data;
diff --git a/app-arch/deb2targz/files/deb2targz-lzma-support.patch b/app-arch/deb2targz/files/deb2targz-lzma-support.patch
deleted file mode 100644
index 3999f6c66977..000000000000
--- a/app-arch/deb2targz/files/deb2targz-lzma-support.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- deb2targz-old 2011-03-07 03:24:22.000000000 +0600
-+++ deb2targz 2011-03-07 03:22:20.000000000 +0600
-@@ -59,4 +59,15 @@
- next FILE;
- }
-+ if ($name eq "data.tar.lzma") {
-+ # Found it
-+ $data = substr($data, 0, $len);
-+ $filename =~ s/\.deb$/.tar.gz/;
-+ my $fh = new IO::File(">$filename")
-+ or die "can't write '$filename': $!";
-+ print $fh $data;
-+ $fh->close();
-+ print "$0: wrote '$filename'\n";
-+ next FILE;
-+ }
-
- print "$0: skipping section '$name'\n";
diff --git a/app-arch/deb2targz/metadata.xml b/app-arch/deb2targz/metadata.xml
index fe0ea0a2b771..29de29100710 100644
--- a/app-arch/deb2targz/metadata.xml
+++ b/app-arch/deb2targz/metadata.xml
@@ -3,4 +3,8 @@
<pkgmetadata>
<herd>no-herd</herd>
<maintainer><email>chainsaw@gentoo.org</email></maintainer>
+<maintainer>
+ <email>floppym@gentoo.org</email>
+ <name>Mike Gilbert</name>
+</maintainer>
</pkgmetadata>