diff options
| author |   Danny van Dyk <kugelfang@gentoo.org> | 2005-03-31 15:52:22 +0000 |
|---|---|---|
| committer | Danny van Dyk <kugelfang@gentoo.org> | 2005-03-31 15:52:22 +0000 |
| commit | 1ed6d46446fd83891121fa9b239a69d83d2939cf (patch) | |
| tree | 3be8bad8c8192aeee898a833a1b122cc8e3112db /app-arch | |
| parent | Changed the profile's README to reflect status change to 'stable'. (diff) | |
| download | historical-1ed6d46446fd83891121fa9b239a69d83d2939cf.tar.gz historical-1ed6d46446fd83891121fa9b239a69d83d2939cf.tar.bz2 historical-1ed6d46446fd83891121fa9b239a69d83d2939cf.zip | |
Fixed BUG #87280 (multilib-strict).
Package-Manager: portage-2.0.51.19
Diffstat (limited to 'app-arch')
| -rw-r--r-- | app-arch/bzip2/ChangeLog | 5 | ||||
| -rw-r--r-- | app-arch/bzip2/Manifest | 20 | ||||
| -rw-r--r-- | app-arch/bzip2/bzip2-1.0.2-r5.ebuild | 13 |
3 files changed, 26 insertions, 12 deletions
diff --git a/app-arch/bzip2/ChangeLog b/app-arch/bzip2/ChangeLog index 5c83b6f4d1dd..280fd355c60c 100644 --- a/app-arch/bzip2/ChangeLog +++ b/app-arch/bzip2/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for app-arch/bzip2 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-arch/bzip2/ChangeLog,v 1.20 2005/02/19 18:30:39 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/bzip2/ChangeLog,v 1.21 2005/03/31 15:52:22 kugelfang Exp $ + + 31 Mar 2005; Danny van Dyk <kugelfang@gentoo.org> bzip2-1.0.2-r5.ebuild: + Fixed BUG #87280 (multilib-strict). *bzip2-1.0.2-r5 (19 Feb 2005) diff --git a/app-arch/bzip2/Manifest b/app-arch/bzip2/Manifest index 2edc1094b99c..734765da7d68 100644 --- a/app-arch/bzip2/Manifest +++ b/app-arch/bzip2/Manifest @@ -1,10 +1,20 @@ -MD5 b27b5513009cfea21410262cfdf17a97 ChangeLog 5405 +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +MD5 216e16cec6ff6867a1d92b4476c7c292 ChangeLog 5522 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164 -MD5 8d5d6886165251e7650695b21f687367 bzip2-1.0.2-r5.ebuild 2167 MD5 22b441db0edaf8a367830aeaface6d31 bzip2-1.0.2-r4.ebuild 2125 +MD5 c7ae74d80c4fd172fc83b5f41de30ea4 bzip2-1.0.2-r5.ebuild 2203 +MD5 382f154f0ba01de10aff6207652d6799 files/digest-bzip2-1.0.2-r5 63 +MD5 cc73bebefba3a38c58fc49b49d7d25a7 files/bzip2-1.0.2-NULL-ptr-check.patch 838 MD5 9c63b399f71b03f2a58b061c1e038d0c files/bzip2-1.0.2-saneso.patch 457 MD5 382f154f0ba01de10aff6207652d6799 files/digest-bzip2-1.0.2-r4 63 -MD5 5f7a98f0aaaed6554126d30e28383ee0 files/bzip2-1.0.2-progress.patch 6141 -MD5 cc73bebefba3a38c58fc49b49d7d25a7 files/bzip2-1.0.2-NULL-ptr-check.patch 838 MD5 378e8d34dd95cc65b7f65565df5d85f7 files/bzip2-1.0.2-makefile-CFLAGS.patch 841 -MD5 382f154f0ba01de10aff6207652d6799 files/digest-bzip2-1.0.2-r5 63 +MD5 5f7a98f0aaaed6554126d30e28383ee0 files/bzip2-1.0.2-progress.patch 6141 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.2.6 (GNU/Linux) + +iD8DBQFCTB0t5mJXAu5GbtIRAlMhAJwMPDaWIDkm71+Kg/KMlRctmHoq6wCdF0hv +j00j0BNc3pFnxO+YeMHYNiA= +=kfvg +-----END PGP SIGNATURE----- diff --git a/app-arch/bzip2/bzip2-1.0.2-r5.ebuild b/app-arch/bzip2/bzip2-1.0.2-r5.ebuild index 2a44e0d0b0d3..e00a58a90ba9 100644 --- a/app-arch/bzip2/bzip2-1.0.2-r5.ebuild +++ b/app-arch/bzip2/bzip2-1.0.2-r5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-arch/bzip2/bzip2-1.0.2-r5.ebuild,v 1.1 2005/02/19 18:30:39 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/bzip2/bzip2-1.0.2-r5.ebuild,v 1.2 2005/03/31 15:52:22 kugelfang Exp $ inherit toolchain-funcs flag-o-matic @@ -23,6 +23,9 @@ src_unpack() { epatch "${FILESDIR}"/${P}-saneso.patch epatch "${FILESDIR}"/${P}-progress.patch sed -i -e 's:\$(PREFIX)/man:\$(PREFIX)/share/man:g' Makefile || die + # make the Makefile multilib aware <kugelfang@gentoo.org> + sed -i -e "s:\/lib\(\ \|\/\|$\):\/$(get_libdir)\1:g" Makefile \ + || die "sed failed: get_libdir" use static && append-flags -static @@ -58,12 +61,10 @@ src_install() { fi done - [[ -z ${CONF_LIBDIR} ]] && CONF_LIBDIR="lib" - [[ ${CONF_LIBDIR} != "lib" ]] && mv ${D}/usr/lib ${D}/usr/${CONF_LIBDIR} dolib.so "${S}"/libbz2.so.${PV} - dosym libbz2.so.${PV} /usr/${CONF_LIBDIR}/libbz2.so.1.0 - dosym libbz2.so.${PV} /usr/${CONF_LIBDIR}/libbz2.so - dosym libbz2.so.${PV} /usr/${CONF_LIBDIR}/libbz2.so.1 + dosym libbz2.so.${PV} /usr/$(get_libdir)/libbz2.so.1.0 + dosym libbz2.so.${PV} /usr/$(get_libdir)/libbz2.so + dosym libbz2.so.${PV} /usr/$(get_libdir)/libbz2.so.1 dodoc README CHANGES Y2K_INFO docinto txt |