Support any compression format. Keep the correct file extension. Bug 384145.

Package-Manager: portage-2.2.0_alpha59/cvs/Linux x86_64

6 files changed, 40 insertions, 30 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/Manifest b/app-arch/deb2targz/Manifest
index bd88348cbdcd..495bf6b81902 100644
--- a/app-arch/deb2targz/Manifest
+++ b/app-arch/deb2targz/Manifest
@@ -1,16 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX deb2targz-lzma-support.patch 571 RMD160 bdd3e1601a28df1b39dd829099ba2cfefb6f6c89 SHA1 3fd16de0cfef8d2fe4e0db3c09cb5bb39eccffe4 SHA256 a045166c93a76538587fdd1c825494e96fa9b5eaac44f3249b8547db69372efd
+AUX deb2targz-any-data.patch 598 RMD160 3404ae069c09cabb1ab19a2bafce975c10bb71ed SHA1 61a4a256637422db40c063437eff05bb39f501f1 SHA256 f4a5404ee9f98bba948e83201832332494997b7e0b804c6f7572aa6f5c31a358
 DIST deb2targz 1947 RMD160 b1d2d064989ac3571bad4afdf73767db9cf963b4 SHA1 171337e6010b024a30388c4a475c889b89c65854 SHA256 f597319db098a9d6b5199e39b8a9ced0973d9ee84927286de4d5816d8e76a44b
-EBUILD deb2targz-1-r1.ebuild 685 RMD160 46c950dd17fb34456f9c12369127b21c42e5262e SHA1 ba4af1f5d4ae9f2180b8880b80d0ab0a6514f9f7 SHA256 dd212fdb4a2114c2bab8b0e15f68551e811904baaecca5b64e1cc615adb9b479
+EBUILD deb2targz-1-r2.ebuild 680 RMD160 5d10f032aa56564b3b8bf645c171b363b776a81b SHA1 4924ae3a6109fbe4e54f79fb867dfcfffab5d9f0 SHA256 75f965f1c148e2671ab319d095c832c7c2656e4ffecd3d22d7d05ead5fe494b5
 EBUILD deb2targz-1.ebuild 601 RMD160 dda05936e60196d2b03ca61ae84f67298c9795d0 SHA1 e664c5cc174d94c2b37f233ba0f68c5586bd5cae SHA256 4d0be39f146919027afe5a7e8ade93c9255e327b7d28ddfa3cb668f29b86eef8
-MISC ChangeLog 1612 RMD160 6aabb7396e6368326cd0bc6ce8ff22dd37681f2f SHA1 19c2367d857584bc0ed283f3cb0c43f28b2f9d59 SHA256 b6f69895d79a3f4779d61be1bd42638fa192680398423cf8ed886c21a8c511e3
-MISC metadata.xml 220 RMD160 2390b6ee3b22f50253c620e2c43e8041469f8fbb SHA1 ecc54fae084220817cadb04cea88ed1f410173da SHA256 ee7ebf67a80d38cd4390f0ef813962c0501b57fb1cad958fba2aa4677da06e8b
+MISC ChangeLog 1907 RMD160 032163f7273583d68b9005830b668d035b73652f SHA1 0e364a81e4b0d0a6d4c465aa2e857a622a20f91d SHA256 de5cd8e639be2d611241f2d7b490837f22bd5e26e41c0fd24f384a76dbdb9ff2
+MISC metadata.xml 309 RMD160 454502dcb6619bef2df188fc5694f540cbbb0093 SHA1 81456ec6858c3974f326fd60e58803dfd726bfaa SHA256 05f127d664692c72f24a48ce090e9569f38ec880de141f22e3774a8a5b7a6bc9
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk5cwGQACgkQp5vW4rUFj5pYVgCgkWeo/eLmCDyOsqhRyPnLGf5o
-RRsAnRaCGTD5XJZC5DDFwgFJLf6jcYE6
-=jk5l
+iF4EAREIAAYFAk58IrQACgkQC77qH+pIQ6T7xQD/eGZgjzXiW8XZoz1WOAed0rwr
+eOGbs2A0FrwanuOsB6QA+gMRjbqO7P6bu1VDfMuNGJ4UIa81SFw+A/1iG2p0ItGB
+=mx4J
 -----END PGP SIGNATURE-----
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>