Fix /sbin/runscript for no-symlink profiles.

Package-Manager: portage-2.0.51.22-r2

diff --git a/sys-apps/baselayout/ChangeLog b/sys-apps/baselayout/ChangeLog
index ebb6ca08a9342aabd749d97241e748f4af870a5d..806c42a68dc2c258707e7cfca80fa58d356806fb 100644 (file)
--- a/sys-apps/baselayout/ChangeLog
+++ b/sys-apps/baselayout/ChangeLog
@@ -1,10 +1,14 @@
 # ChangeLog for sys-apps/baselayout
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.275 2005/09/04 19:38:59 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.276 2005/09/05 10:08:08 azarah 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
 
+  05 Sep 2005; Martin Schlemmer <azarah@gentoo.org>
+  baselayout-1.12.0_pre8-r2.ebuild:
+  Fix /sbin/runscript for no-symlink profiles.
+
   04 Sep 2005; Mike Frysinger <vapier@gentoo.org>
   baselayout-1.11.13-r1.ebuild, baselayout-1.12.0_pre8-r2.ebuild:
   Wrap symlink creation like we do with dir creation so readonly file systems

diff --git a/sys-apps/baselayout/Manifest b/sys-apps/baselayout/Manifest
index 3ea0ceb82672f19bed2d499384ff7417c04d16f2..bf8f660a685c4840079ecad70293a0a2b982e882 100644 (file)
--- a/sys-apps/baselayout/Manifest
+++ b/sys-apps/baselayout/Manifest
@@ -1,22 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 02eee2181bcc4e323fde15dc163bcee1 baselayout-1.12.0_pre8-r2.ebuild 19105
-MD5 e02bb32cac91dad28d3c05b731b37b04 metadata.xml 385
-MD5 10e1b8881d42750dd6e8e7cf343ea999 baselayout-1.12.0_pre7-r1.ebuild 18852
 MD5 839b1e7eb2ccdc96525414ab1c869e70 baselayout-1.11.13-r1.ebuild 18850
-MD5 24b1c59a39ab1977ba8bffceb8bfd897 ChangeLog 62937
-MD5 645ee27aa823d5fb836b8f160326201e files/baselayout-1.12.0_pre8-whitelist-fixes.patch 1236
+MD5 d4c630a60806a0f8809abb7304c7fbd5 baselayout-1.12.0_pre8-r2.ebuild 19202
+MD5 c19af6c1a4d5cc3fd9f7668c26bdeb71 ChangeLog 63073
+MD5 10e1b8881d42750dd6e8e7cf343ea999 baselayout-1.12.0_pre7-r1.ebuild 18852
+MD5 e02bb32cac91dad28d3c05b731b37b04 metadata.xml 385
 MD5 0f24c65f92bca9e5131d6ebd4ad6cfa0 files/digest-baselayout-1.12.0_pre8-r2 75
-MD5 caf4f58ffd12206e0cdf22834afceb4f files/baselayout-1.12.0_pre8-usr-remount-ro.patch 502
+MD5 7c0cd50e4ac1dc062f5e6ab578e95659 files/copyright 2099
 MD5 8dae78310577f3fb14c58704d529feb3 files/digest-baselayout-1.11.13-r1 70
-MD5 6d5643e0857fc0f32f026e33d453c0c8 files/digest-baselayout-1.12.0_pre7-r1 75
+MD5 caf4f58ffd12206e0cdf22834afceb4f files/baselayout-1.12.0_pre8-usr-remount-ro.patch 502
+MD5 645ee27aa823d5fb836b8f160326201e files/baselayout-1.12.0_pre8-whitelist-fixes.patch 1236
 MD5 8e94b4b8d22e16ea03fa08dd0475170a files/baselayout-1.12.0_pre7-ifconfig.patch 1327
-MD5 7c0cd50e4ac1dc062f5e6ab578e95659 files/copyright 2099
+MD5 6d5643e0857fc0f32f026e33d453c0c8 files/digest-baselayout-1.12.0_pre7-r1 75
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDG02LgIKl8Uu19MoRAvryAJ93YObCBgqrWXXA2XxW4/ThrB4fngCdHr5x
-QwF4UgH9UPVDuHQSj7h/LME=
-=H908
+iD8DBQFDHBlE1ZcsMnZjRyIRAt/QAKChpcNUcQfhMo+XWGGlXG2bNDHgZwCfdtx4
+kNhnvnXXMB0fLp9NZLkhMDY=
+=H8oe
 -----END PGP SIGNATURE-----

diff --git a/sys-apps/baselayout/baselayout-1.12.0_pre8-r2.ebuild b/sys-apps/baselayout/baselayout-1.12.0_pre8-r2.ebuild
index 9a868de53cddcc224f6d5958e4cd9efece92ae13..dcf3f9fb0116fdfbd5166eca78c78eae1a27b708 100644 (file)
--- a/sys-apps/baselayout/baselayout-1.12.0_pre8-r2.ebuild
+++ b/sys-apps/baselayout/baselayout-1.12.0_pre8-r2.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.12.0_pre8-r2.ebuild,v 1.2 2005/09/04 19:38:59 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.12.0_pre8-r2.ebuild,v 1.3 2005/09/05 10:08:08 azarah Exp $
 
 inherit flag-o-matic eutils toolchain-funcs multilib
 
@@ -57,13 +57,17 @@ src_unpack() {
 }
 
 src_compile() {
+       local libdir="lib"
+       
        use static && append-ldflags -static
 
+       [[ ${SYMLINK_LIB} == "yes" ]] && libdir=$(get_abi_LIBDIR "${DEFAULT_ABI}")
+
        make -C "${S}"/src \
                CC="$(tc-getCC)" \
                LD="$(tc-getCC) ${LDFLAGS}" \
                CFLAGS="${CFLAGS}" \
-               LIBDIR=$(get_libdir) || die
+               LIBDIR="${libdir}" || die
 }
 
 # ${PATH} should include where to get MAKEDEV when calling this