Disable ar test for this version (bug #310847).

Package-Manager: portage-2.2_rc67/cvs/Linux i686

diff --git a/app-arch/dpkg/ChangeLog b/app-arch/dpkg/ChangeLog
index 4ed9b1dd5d22e2e1ff9283a73c8b78a35e100a62..8c4339f26a6738bc56f5a58b66694b2427556da4 100644 (file)
--- a/app-arch/dpkg/ChangeLog
+++ b/app-arch/dpkg/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-arch/dpkg
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/dpkg/ChangeLog,v 1.120 2010/03/23 17:40:35 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/dpkg/ChangeLog,v 1.121 2010/03/24 05:24:57 jer Exp $
+
+  24 Mar 2010; Jeroen Roovers <jer@gentoo.org> dpkg-1.15.6.ebuild:
+  Disable ar test for this version (bug #310847).
 
   23 Mar 2010; Jeroen Roovers <jer@gentoo.org> dpkg-1.15.6.ebuild:
   Restrict test (bug #310847).

diff --git a/app-arch/dpkg/Manifest b/app-arch/dpkg/Manifest
index cb12d61d8f287691ddd907b53cc847f20ad7061d..0b132a10e5ba9e588e5133407766b6b0e791972c 100644 (file)
--- a/app-arch/dpkg/Manifest
+++ b/app-arch/dpkg/Manifest
@@ -10,6 +10,6 @@ EBUILD dpkg-1.15.2.ebuild 1486 RMD160 07cfabb8729e9d7e024c5605e2818eebce031c3f S
 EBUILD dpkg-1.15.5.5.ebuild 1657 RMD160 2bc0c9486eb0dbab4d5ac4d4db414822c2a83d08 SHA1 9c8e30450f70a6761e461fb0a55664d5493203b1 SHA256 d8941c1b5abc2cdc0dc0a3a0845e99dd86bf86f8d5eb98cfaf220979633f95aa
 EBUILD dpkg-1.15.5.6-r1.ebuild 2057 RMD160 d5f19fabe5759eaf378ce9d627dfe2443e3fc622 SHA1 d213c3a43bc37305f26eb58da1f496bca19536f0 SHA256 b6e7d60085cbed2a271a0ca97d5f9a0e30f5fa290d5d5e1ad2364c74a2152890
 EBUILD dpkg-1.15.5.6.ebuild 1667 RMD160 370ee9024598ab486bb9b0c924644cd73fcbbf5e SHA1 f25f1d553a39c546d9a20fcf843223b3c68c5b8f SHA256 7571e53e0ced6ebbdda2c108a338ed5c8b421c2c217f4d55b4168a22914ff1b1
-EBUILD dpkg-1.15.6.ebuild 1968 RMD160 5f86d0d92a98473f59c60f2d1a51179b684b83bb SHA1 56eeb80944e74a96570f90c1d11bd57533d76b53 SHA256 34640060c22816f1b37ca1f7d0495ac9a8f63d95340bec38b8f48105d3f7493a
-MISC ChangeLog 16323 RMD160 2b42f60e635408759f87359444e72f09c6bd7b57 SHA1 7eb74a24f3dd1cde915ad6eb2b63ad0b35d2786d SHA256 8062747e730e018e039ea175befed71515d0e2cf4809ac9b0377073e8cc21a87
+EBUILD dpkg-1.15.6.ebuild 2057 RMD160 c9777868df9201d5859d42af97d0ce16ac61fee8 SHA1 652ce36cd269530c86bb98cd0e5dbf2373f0e26d SHA256 437d7959955623d79033e50ef5ef92c066849c42164bb8924c2f7b95ff4ec257
+MISC ChangeLog 16441 RMD160 553eb23f3082a1d7d9e65b1855e983cb8ab12a05 SHA1 8d877423f4d77f37e74f9b78249ceca2ae593da4 SHA256 9387bfd1c020a044127e07ec9de287621273d851079e57f588196f0c587c27b0
 MISC metadata.xml 162 RMD160 ebe445a93e16f05a392ebdf3882b56b92931e37e SHA1 8bc26eb7c98535f3e31d2288f25fba83838857e5 SHA256 316a32c1e8ee9f6548707abec9a803d0a19feea1be10a19273cc04e0cd357644

diff --git a/app-arch/dpkg/dpkg-1.15.6.ebuild b/app-arch/dpkg/dpkg-1.15.6.ebuild
index dec4c814798a625601a473ff89975199719e41ef..1ef5a61149eed5b773941757ef8d60cb38d28242 100644 (file)
--- a/app-arch/dpkg/dpkg-1.15.6.ebuild
+++ b/app-arch/dpkg/dpkg-1.15.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/dpkg/dpkg-1.15.6.ebuild,v 1.2 2010/03/23 17:40:35 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/dpkg/dpkg-1.15.6.ebuild,v 1.3 2010/03/24 05:24:57 jer Exp $
 
 EAPI=3
 
@@ -14,7 +14,6 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris"
 IUSE="bzip2 nls test unicode zlib"
-RESTRICT="test"
 
 LANGS="sv de es ja fr hu pl ru"
 
@@ -41,6 +40,11 @@ src_prepare() {
        # installed, so no need to worry about hardcoding a temporary bash)
        sed -i -e '1c\#!'"${BASH}" get-version || die
 
+       # bug 310847
+       if [[ "${PV}" = "1.15.6" ]]; then
+               sed -i lib/dpkg/test/Makefile.am -e '/t[_-]ar/d'
+       fi
+
        eautoreconf
 }