Remove gzip --rsyncable option by Vincent de Phily (bug #420813).

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

4 files changed, 36 insertions, 4 deletions

diff --git a/app-arch/dpkg/ChangeLog b/app-arch/dpkg/ChangeLog
index 84ef713281be..6562c6fcdb60 100644
--- a/app-arch/dpkg/ChangeLog
+++ b/app-arch/dpkg/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-arch/dpkg
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/dpkg/ChangeLog,v 1.189 2012/06/10 17:38:37 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/dpkg/ChangeLog,v 1.190 2012/06/12 15:37:28 jer Exp $
+
+*dpkg-1.16.4.2-r1 (12 Jun 2012)
+
+  12 Jun 2012; Jeroen Roovers <jer@gentoo.org> -dpkg-1.16.4.2.ebuild,
+  +dpkg-1.16.4.2-r1.ebuild, +files/dpkg-1.16.4.2-gzip-rsyncable.patch:
+  Remove gzip --rsyncable option by Vincent de Phily (bug #420813).
 
   10 Jun 2012; Jeff Horelick <jdhore@gentoo.org> dpkg-1.16.2.ebuild:
   marked x86 per bug 413887
diff --git a/app-arch/dpkg/Manifest b/app-arch/dpkg/Manifest
index bc1485917836..1a00fd63b7b9 100644
--- a/app-arch/dpkg/Manifest
+++ b/app-arch/dpkg/Manifest
@@ -1,5 +1,9 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX dpkg-1.15.5.6-bootstrap.patch 853 RMD160 b6e73361f662971730b2078afbe9ca2b679680a1 SHA1 4266da38c786a3a7d5111a35bb2fb5f0c8656cf6 SHA256 05ed4c2b265556767820fdf31ea9bf0da09eaafae1e39b75d634be385f05ab13
 AUX dpkg-1.16.1-bootstrap.patch 860 RMD160 7058123ea84200030d61b7a6b8c5e05acb8fe1f8 SHA1 ddad0615370f997a750b6345b7460d1fefeef989 SHA256 5153c529dcc043592783f9f51ea7107e351a4a42afa3745c70f50b8d38ec8fd9
+AUX dpkg-1.16.4.2-gzip-rsyncable.patch 302 RMD160 144ee9dbabd513a8d0363e79cbd22e4dc9918854 SHA1 461d77dc63d9459ec734557e259da045e3f2238f SHA256 7d27e8a4aa6111ae34616759cb4e656808a3069f4cf0e3ad15d50f3adc4964a8
 DIST dpkg_1.16.0.3.tar.bz2 5322701 RMD160 f238419da5e1f9f7d527d5550ed21d51cd7e264d SHA1 6e16d18864d4845eeaf6262497fde44931a1638d SHA256 69669720020e67629d70aa5325e3c20c05cae7a9fc2d8abd442672c7b29e31d3
 DIST dpkg_1.16.1.1.tar.bz2 5432275 RMD160 979fd32b76aabd30a222df596bae55c6e228764a SHA1 578c312accfaabf240f1cb8f6e13cfdabd8d8027 SHA256 7bd9861ddfa7408ca790ca0d8fa8a3b585afcb900fdee5b658d42f9fca09202d
 DIST dpkg_1.16.1.2.tar.bz2 5347162 RMD160 7f38018b8e4dbb59a2bd14a534f35ace78ff47f1 SHA1 aa64afa8689b7a8e313fd56f4f07866c171d9e50 SHA256 d0ae363f41c4f1c23091afd9517d41de0f46b5ce7ecdda12dc4fbafa6dd55138
@@ -13,6 +17,13 @@ EBUILD dpkg-1.16.1.2.ebuild 2648 RMD160 856992b876b2e006e08f213f60347caaef1852a9
 EBUILD dpkg-1.16.1.ebuild 2646 RMD160 3ee8058cca5c3aa122e2cb886c0f023f8811a845 SHA1 841650b960d0e3c298e274ae913ff981f55799c5 SHA256 ab9147acd0e8d26e18eed50eacf4136481314b82bf9e1c00b0aa317fa45a8c66
 EBUILD dpkg-1.16.2.ebuild 2703 RMD160 2df82a8ded7d272f23a1beb0fd28f870951e6042 SHA1 5a6549855f5ddc42554867a67b572cd6fe2b850d SHA256 6c705bbdea37da630519df9756343e1c86bb7ed2782cf7492081c662168af775
 EBUILD dpkg-1.16.3.ebuild 2425 RMD160 418f8bfc148d3feb152779a34616f8dff7df0c6f SHA1 eca18f360788f44cd695a084929bd216e105ffcc SHA256 c75bc053fae9f16d857a4f97f8586a998e8cddc1de9f195c5637ba0098a4151c
-EBUILD dpkg-1.16.4.2.ebuild 2469 RMD160 bfa8bd66c7efe684f84604e3d6d53d7f1480add7 SHA1 5318e916301ac8ae56f0e73d88e118e2f3c7d021 SHA256 cfc814a3a76d86fa72419d930417dd89fb45d12e55267307fd1f34e5a31d2876
-MISC ChangeLog 25318 RMD160 e55998c75f44793324f23e1f0a0824996da6153b SHA1 88ce9d4f903c3d9b07cdfe779e90e9244e60ba14 SHA256 5fdd14ee80193edec9479c906455945cfd55c08f77e5a2ddaa3b13f245762e38
+EBUILD dpkg-1.16.4.2-r1.ebuild 2575 RMD160 a71f67a9c9eccc3b73888fab37ca47c1c2a0a571 SHA1 0a926a7c942459c6af85657863147b51cd65d794 SHA256 7076bfcb57e52cb3a72b2bc2164590ff6b597153f21677d94401ef80b1c44557
+MISC ChangeLog 25558 RMD160 cbdff587d1f3a8b663737af82e940053b96b9127 SHA1 0b9717c4a89e4d81b1320531586ef85033951a45 SHA256 feaa6b0c10ea9b9cf81b4bf8f5d89a1befb28a5dc732da9be189073cb8987598
 MISC metadata.xml 249 RMD160 91de35e671db35d8e1c3fe50177b6ec889466712 SHA1 d6956b17015162642aa95088fc3abbaee87d69d3 SHA256 d6077d4b746902b16a584be1c22f32bd2f88f2f5eff566ba8fb7b0b78a6827b7
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk/XYj4ACgkQVWmRsqeSphNRzQCcCIuDDQEOd5lkgqVGDN2hAv9b
+otgAn10dA0xQf0XO+M2ROEShi4KggH3/
+=sn9E
+-----END PGP SIGNATURE-----
diff --git a/app-arch/dpkg/dpkg-1.16.4.2.ebuild b/app-arch/dpkg/dpkg-1.16.4.2-r1.ebuild
index ed4ca5547828..2efef3f67194 100644
--- a/app-arch/dpkg/dpkg-1.16.4.2.ebuild
+++ b/app-arch/dpkg/dpkg-1.16.4.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/dpkg/dpkg-1.16.4.2.ebuild,v 1.2 2012/06/10 15:49:06 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/dpkg/dpkg-1.16.4.2-r1.ebuild,v 1.1 2012/06/12 15:37:28 jer Exp $
 
 EAPI=4
 
@@ -41,6 +41,9 @@ DEPEND="${RDEPEND}
 REQUIRED_USE="dselect? ( nls )"
 
 src_prepare() {
+	# do not expect Debian's gzip --rsyncable extension
+	epatch "${FILESDIR}"/${P}-gzip-rsyncable.patch
+
 	# Force the use of the running bash for get-version (this file is never
 	# installed, so no need to worry about hardcoding a temporary bash)
 	sed -i -e '1c\#!'"${BASH}" get-version || die
@@ -50,6 +53,7 @@ src_prepare() {
 	sed -i scripts/Makefile.am \
 		-e '/850_Dpkg_Compression.t/d' \
 		|| die "sed failed"
+
 	# test fails (bug #414095)
 	sed -i utils/Makefile.am \
 		-e '/^test_cases/d;/100_update_alternatives/d' || die
diff --git a/app-arch/dpkg/files/dpkg-1.16.4.2-gzip-rsyncable.patch b/app-arch/dpkg/files/dpkg-1.16.4.2-gzip-rsyncable.patch
new file mode 100644
index 000000000000..36610228c555
--- /dev/null
+++ b/app-arch/dpkg/files/dpkg-1.16.4.2-gzip-rsyncable.patch
@@ -0,0 +1,11 @@
+--- a/scripts/Dpkg/Compression.pm
++++ b/scripts/Dpkg/Compression.pm
+@@ -52,7 +52,7 @@
+ my $COMP = {
+     "gzip" => {
+ 	"file_ext" => "gz",
+-	"comp_prog" => [ "gzip", "--no-name", "--rsyncable" ],
++	"comp_prog" => [ "gzip", "--no-name"],
+ 	"decomp_prog" => [ "gunzip" ],
+ 	"default_level" => 9,
+     },