summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2010-04-01 13:39:48 +0000
committerJeroen Roovers <jer@gentoo.org>2010-04-01 13:39:48 +0000
commit6a90f6441d56bfc5b64dba8280b7b7788bd034b8 (patch)
tree6a772f70ccc92a8a56a4a8cc931e444fdece9feb
parentStable for HPPA (bug #298067). (diff)
downloadhistorical-6a90f6441d56bfc5b64dba8280b7b7788bd034b8.tar.gz
historical-6a90f6441d56bfc5b64dba8280b7b7788bd034b8.tar.bz2
historical-6a90f6441d56bfc5b64dba8280b7b7788bd034b8.zip
Add some more die conditions.
Package-Manager: portage-2.2_rc67/cvs/Linux i686
-rw-r--r--app-arch/dpkg/ChangeLog5
-rw-r--r--app-arch/dpkg/Manifest4
-rw-r--r--app-arch/dpkg/dpkg-1.15.6.1.ebuild7
3 files changed, 10 insertions, 6 deletions
diff --git a/app-arch/dpkg/ChangeLog b/app-arch/dpkg/ChangeLog
index ebcc742a843f..050746ce9bc8 100644
--- 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.124 2010/03/25 05:04:30 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/dpkg/ChangeLog,v 1.125 2010/04/01 13:39:48 jer Exp $
+
+ 01 Apr 2010; Jeroen Roovers <jer@gentoo.org> dpkg-1.15.6.1.ebuild:
+ Add some more die conditions.
*dpkg-1.15.6.1 (25 Mar 2010)
diff --git a/app-arch/dpkg/Manifest b/app-arch/dpkg/Manifest
index 72050867fd02..aad18db7799b 100644
--- a/app-arch/dpkg/Manifest
+++ b/app-arch/dpkg/Manifest
@@ -11,7 +11,7 @@ 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.1.ebuild 2349 RMD160 b2d99e46ea726c79af5b8a8a8d21554eb631bc1b SHA1 84e58eba9b14fbc8fe17bf063cb01bb0a4de1089 SHA256 5f1a02c97bf688a04343e7de6fd1cb1fbdf258ba8aeb6b5e7193bf955d0f6ee2
+EBUILD dpkg-1.15.6.1.ebuild 2394 RMD160 d7d38d221f99ef9b3d9999d47930ec8bbd0c3dc3 SHA1 b38b99cdc8993c9454d3faca7dbb0038cdeccfae SHA256 02ebf09d6b696d2337f45406b3e86bb08b36b406c1f652215bda2f25a55e8943
EBUILD dpkg-1.15.6.ebuild 2345 RMD160 18f70af4747549213a6a462024c0f228f95aaa58 SHA1 3d197b90e1fbee789730735569fbbaac00afba58 SHA256 f4dbc5398661b28382f8e7eb3da10b82a931032f4a49a795d2f370f6dfa2a827
-MISC ChangeLog 16886 RMD160 053ac47be605cec5d624b932e24cd9da4ca9707d SHA1 08a90ca55c4e1e2ca1fc89ac5e61fa2977c34dbd SHA256 09abff14a51cb03f7c557828b976c5cfaaa96248e5ab70bd3931c0fae82be7c3
+MISC ChangeLog 16988 RMD160 00161e53057e867e909c703300d0929ffa78b111 SHA1 6d1d879089c714e294500cd0699ee21448b49e13 SHA256 ae3fe51c4984bc930d0151602b85417e4c4b7e989842bd582119e20543f3bb7b
MISC metadata.xml 249 RMD160 91de35e671db35d8e1c3fe50177b6ec889466712 SHA1 d6956b17015162642aa95088fc3abbaee87d69d3 SHA256 d6077d4b746902b16a584be1c22f32bd2f88f2f5eff566ba8fb7b0b78a6827b7
diff --git a/app-arch/dpkg/dpkg-1.15.6.1.ebuild b/app-arch/dpkg/dpkg-1.15.6.1.ebuild
index e0b168ae21cd..3884baf1375e 100644
--- a/app-arch/dpkg/dpkg-1.15.6.1.ebuild
+++ b/app-arch/dpkg/dpkg-1.15.6.1.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.1.ebuild,v 1.1 2010/03/25 05:04:30 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/dpkg/dpkg-1.15.6.1.ebuild,v 1.2 2010/04/01 13:39:48 jer Exp $
EAPI=3
@@ -42,8 +42,9 @@ src_prepare() {
# bug 310847
if [[ "${PV}" = "1.15.6.1" ]]; then
- sed -i lib/dpkg/test/Makefile.am -e '/t[_-]ar/d'
- sed -i scripts/Makefile.am -e '/850_Dpkg_Compression.t/d'
+ sed -i lib/dpkg/test/Makefile.am -e '/t[_-]ar/d' || die "sed failed"
+ sed -i scripts/Makefile.am -e '/850_Dpkg_Compression.t/d' \
+ || die "sed failed"
fi
eautoreconf