summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2006-03-13 23:55:47 +0000
committerMike Frysinger <vapier@gentoo.org>2006-03-13 23:55:47 +0000
commit9932c37f2cb54eafb4211d9848fae2ef8b433ef0 (patch)
treea2ae18e1b09d0a83ea46f0b98e670ae4345b49ff /sys-fs/e2fsprogs
parentadded ~amd64 closing bug #115613. (diff)
downloadhistorical-9932c37f2cb54eafb4211d9848fae2ef8b433ef0.tar.gz
historical-9932c37f2cb54eafb4211d9848fae2ef8b433ef0.tar.bz2
historical-9932c37f2cb54eafb4211d9848fae2ef8b433ef0.zip
add a sanity check for #125146
Package-Manager: portage-2.1_pre6-r2
Diffstat (limited to 'sys-fs/e2fsprogs')
-rw-r--r--sys-fs/e2fsprogs/Manifest14
-rw-r--r--sys-fs/e2fsprogs/e2fsprogs-1.38-r1.ebuild16
2 files changed, 21 insertions, 9 deletions
diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest
index 136485437236..60f6197885e9 100644
--- a/sys-fs/e2fsprogs/Manifest
+++ b/sys-fs/e2fsprogs/Manifest
@@ -4,9 +4,9 @@ Hash: SHA1
MD5 a791dc646aedf6ce0e16e477998bfafd ChangeLog 14304
RMD160 0ba70f4eaa068101c22e3ac58ea4ed0f67494628 ChangeLog 14304
SHA256 a21976ddc275fa704deda3167b8019b7230019732bf674944fc3cc54712d18b5 ChangeLog 14304
-MD5 a44a7c2a647a94b38639db5d9344d62c e2fsprogs-1.38-r1.ebuild 4098
-RMD160 bcfb7c1617210d6a0e3f13f3c9bafa011c4e1c6d e2fsprogs-1.38-r1.ebuild 4098
-SHA256 7b513e4c128e19f7613e17e0f096c8bc0a494bcebaf33ab2e9fb7d26cd8970aa e2fsprogs-1.38-r1.ebuild 4098
+MD5 8986850b7edd2b2b4cf855654f696f89 e2fsprogs-1.38-r1.ebuild 4474
+RMD160 48fc78b43f184655ac43bd17e9c267755e1d17d1 e2fsprogs-1.38-r1.ebuild 4474
+SHA256 03881165a13a1afd7d1e8c0d1758df14e4b2f5d9200d42efa98dd2e415a48d72 e2fsprogs-1.38-r1.ebuild 4474
MD5 6fbfc726ec96aa19955c90f44e25d3f9 e2fsprogs-1.38.ebuild 3733
RMD160 0c3f178dab7d5f01294f977b153a1f99d8ef3a8e e2fsprogs-1.38.ebuild 3733
SHA256 c56b40621fce536c2891fbb1d8932e5a379a80454a38d0b7c4d0bb3a94c48446 e2fsprogs-1.38.ebuild 3733
@@ -44,9 +44,9 @@ MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 metadata.xml 164
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.1 (GNU/Linux)
+Version: GnuPG v1.4.2.2 (GNU/Linux)
-iD8DBQFEEvWYoFw4q70f3SsRAh/wAJ4z9PhFEw+ecJNtFKchzbcynbAlpQCcCobZ
-75Ry7rnKdPTBp7C69PUpEEs=
-=iF9f
+iD8DBQFEFgb/2+ySkm8kpY0RAtOuAKC348E0lLNmv94TrBw4Br0PObCpMwCfX6gI
+vV0O3U7R0KqXcxWuEq4MBds=
+=mkXy
-----END PGP SIGNATURE-----
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.38-r1.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.38-r1.ebuild
index 06dbd877fd4e..70aa1b8c5acc 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.38-r1.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.38-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.38-r1.ebuild,v 1.11 2006/03/11 16:07:49 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.38-r1.ebuild,v 1.12 2006/03/13 23:55:47 vapier Exp $
inherit eutils flag-o-matic toolchain-funcs
@@ -20,6 +20,18 @@ DEPEND="${RDEPEND}
nls? ( sys-devel/gettext )
sys-apps/texinfo"
+pkg_setup() {
+ # sanity check for #125146
+ if [[ -L ${ROOT}/usr/$(get_libdir)/libcom_err.a ]] || \
+ [[ ! -e ${ROOT}/usr/$(get_libdir)/libcom_err.a ]]
+ then
+ rm -f "${ROOT}"/usr/$(get_libdir)/libcom_err.a
+ eerror "Your libcom_err.a is broken, please re-emerge com_err:"
+ eerror " # emerge com_err"
+ die "Mr. T pities the fool with a broken libcom_err.a"
+ fi
+}
+
src_unpack() {
unpack ${A}
cd "${S}"
@@ -107,7 +119,7 @@ src_install() {
dodir /$(get_libdir)
mv "${D}"/usr/$(get_libdir)/*.so* "${D}"/$(get_libdir)/
dolib.a lib/*.a || die "dolib.a"
- rm -f "${D}"/usr/$(get_libdir)/libcom_err.a
+ rm -f "${D}"/usr/$(get_libdir)/libcom_err.a #125146
local x
cd "${D}"/$(get_libdir)
for x in *.so ; do