diff options
| author |   Jeroen Roovers <jer@gentoo.org> | 2012-06-12 15:37:29 +0000 |
|---|---|---|
| committer | Jeroen Roovers <jer@gentoo.org> | 2012-06-12 15:37:29 +0000 |
| commit | 9369f476f1ab1f36a6f6306d9eb2c01300572d24 (patch) | |
| tree | 338972ba7d4684d5d5351dd070742266d192873a /app-arch/dpkg | |
| parent | Version bump. Ebuild by Arfrever. (diff) | |
| download | gentoo-2-9369f476f1ab1f36a6f6306d9eb2c01300572d24.tar.gz gentoo-2-9369f476f1ab1f36a6f6306d9eb2c01300572d24.tar.bz2 gentoo-2-9369f476f1ab1f36a6f6306d9eb2c01300572d24.zip | |
Remove gzip --rsyncable option by Vincent de Phily (bug #420813).
(Portage version: 2.2.0_alpha110/cvs/Linux x86_64)
Diffstat (limited to 'app-arch/dpkg')
| -rw-r--r-- | app-arch/dpkg/ChangeLog | 8 | ||||
| -rw-r--r-- | app-arch/dpkg/dpkg-1.16.4.2-r1.ebuild (renamed from app-arch/dpkg/dpkg-1.16.4.2.ebuild) | 6 | ||||
| -rw-r--r-- | app-arch/dpkg/files/dpkg-1.16.4.2-gzip-rsyncable.patch | 11 |
3 files changed, 23 insertions, 2 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/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, + }, |