diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2005-02-06 19:53:48 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2005-02-06 19:53:48 +0000 |
| commit | 8cc5f4c07217076c43f4612076bb148fcb9c063a (patch) | |
| tree | 0a5652c230f071559deaa06193658ec61dd4a12c /sys-apps/baselayout | |
| parent | added a patch to make compiling against the jdk15 possible, fixes #81008 (diff) | |
| download | historical-8cc5f4c07217076c43f4612076bb148fcb9c063a.tar.gz historical-8cc5f4c07217076c43f4612076bb148fcb9c063a.tar.bz2 historical-8cc5f4c07217076c43f4612076bb148fcb9c063a.zip | |
Dont install the 04multilib file if it only contains default lib paths ... thats just silly.
Package-Manager: portage-2.0.51-r15
Diffstat (limited to 'sys-apps/baselayout')
| -rw-r--r-- | sys-apps/baselayout/ChangeLog | 7 | ||||
| -rw-r--r-- | sys-apps/baselayout/Manifest | 4 | ||||
| -rw-r--r-- | sys-apps/baselayout/baselayout-1.11.9-r1.ebuild | 13 |
3 files changed, 16 insertions, 8 deletions
diff --git a/sys-apps/baselayout/ChangeLog b/sys-apps/baselayout/ChangeLog index 0dc4746fb313..9adcb164e15c 100644 --- a/sys-apps/baselayout/ChangeLog +++ b/sys-apps/baselayout/ChangeLog @@ -1,10 +1,15 @@ # ChangeLog for sys-apps/baselayout # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.206 2005/02/03 21:00:56 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.207 2005/02/06 19:53:48 vapier Exp $ # See the gentoo-src rc-scripts ChangeLog for up-to-date release information: # http://www.gentoo.org/cgi-bin/viewcvs.cgi/rc-scripts/ChangeLog?rev=HEAD&cvsroot=gentoo-src&content-type=text/vnd.viewcvs-markup + 06 Feb 2005; Mike Frysinger <vapier@gentoo.org> + baselayout-1.11.9-r1.ebuild: + Dont install the 04multilib file if it only contains default lib paths ... + thats just silly. + 03 Feb 2005; Jeremy Huddleston <eradicator@gentoo.org> baselayout-1.11.9-r1.ebuild: Keep lib32 in LDPATH if the dir exists and it's not a libdir. Otherwise diff --git a/sys-apps/baselayout/Manifest b/sys-apps/baselayout/Manifest index 9e1a11525375..f5d9e207ca0c 100644 --- a/sys-apps/baselayout/Manifest +++ b/sys-apps/baselayout/Manifest @@ -1,9 +1,9 @@ -MD5 2e2b3f569f7c24e996a6a9ae7dc3f5ea ChangeLog 46863 +MD5 eaf0b7ea2c8f262d6c930b2a516354bd ChangeLog 47038 MD5 313c753113888932800797c600f462ce baselayout-1.11.8-r3.ebuild 16882 MD5 e819385f8aa5ac0f1a8ad035a6b9c7f7 baselayout-1.9.4-r7.ebuild 18118 MD5 245e39f14052cacd4e495fa02ecf2163 baselayout-1.9.4-r6.ebuild 16835 MD5 e02bb32cac91dad28d3c05b731b37b04 metadata.xml 385 -MD5 d80dcfed01a9848a76f7fa0ab812ab5e baselayout-1.11.9-r1.ebuild 16896 +MD5 4fcb1ab439ee546905bc8bc88a77dc3d baselayout-1.11.9-r1.ebuild 16999 MD5 7c0cd50e4ac1dc062f5e6ab578e95659 files/copyright 2099 MD5 d50ca91cbb58c7528a60ddf5bb172956 files/sysvinit-2.84-selinux.patch 3206 MD5 dd7fbce62822fed1595f11078e23aa32 files/baselayout-1.8.6.13-r1-gcc2.patch 443 diff --git a/sys-apps/baselayout/baselayout-1.11.9-r1.ebuild b/sys-apps/baselayout/baselayout-1.11.9-r1.ebuild index 5a4b6e087d64..c235ff58e44c 100644 --- a/sys-apps/baselayout/baselayout-1.11.9-r1.ebuild +++ b/sys-apps/baselayout/baselayout-1.11.9-r1.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/sys-apps/baselayout/baselayout-1.11.9-r1.ebuild,v 1.2 2005/02/03 21:00:56 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.11.9-r1.ebuild,v 1.3 2005/02/06 19:53:48 vapier Exp $ inherit flag-o-matic eutils toolchain-funcs multilib @@ -257,15 +257,18 @@ src_install() { libdirs_env="${libdirs_env}:/lib32:/usr/lib32:/usr/local/lib32" fi - # List all the multilib libdirs in /etc/env/04multilib - echo "LDPATH=\"${libdirs_env}\"" > ${D}/etc/env.d/04multilib + # List all the multilib libdirs in /etc/env/04multilib (only if they're + # actually different from the normal + if [[ $(get_libdir) != "lib" ]] ; then + echo "LDPATH=\"${libdirs_env}\"" > ${D}/etc/env.d/04multilib + fi # As of baselayout-1.10-1-r1, sysvinit is its own package again, and # provides the inittab itself - rm -f ${D}/etc/inittab + rm -f "${D}"/etc/inittab # Stash the rc-lists for use during pkg_postinst - cp -r ${S}/rc-lists ${D}/usr/share/baselayout + cp -r "${S}"/rc-lists "${D}"/usr/share/baselayout # uclibc doesn't need nsswitch.conf... added by solar use uclibc && rm -f ${D}/etc/nsswitch.conf |