Be consistant and usBe consistant and use same libdir for make and make install of...

Package-Manager: portage-2.1.1_pre4-r3

diff --git a/sys-apps/baselayout/ChangeLog b/sys-apps/baselayout/ChangeLog
index a1bcb6d9de47cdc1bde4704dda46b9749365616f..2f757c165f66cee28daba2446f6ef1d4b51bd856 100644 (file)
--- a/sys-apps/baselayout/ChangeLog
+++ b/sys-apps/baselayout/ChangeLog
@@ -1,10 +1,15 @@
 # ChangeLog for sys-apps/baselayout
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.335 2006/08/04 13:46:55 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.336 2006/08/05 13:00:23 herbs Exp $
 
 # See the rc-scripts ChangeLog in subversion for release info:
 # http://sources.gentoo.org/viewcvs.py/*checkout*/baselayout/trunk/ChangeLog
 
+  05 Aug 2006; Herbie Hopkins <herbs@gentoo.org>
+  baselayout-1.12.4-r1.ebuild:
+  Be consistent and use the same libdir for make and make install of the
+  baselayout utilities (was causing problems on no-symlink profiles).
+
 *baselayout-1.12.4-r1 (04 Aug 2006)
 
   04 Aug 2006; Roy Marples <uberlord@gentoo.org>

diff --git a/sys-apps/baselayout/Manifest b/sys-apps/baselayout/Manifest
index c83cf2f9fb0045797caea82266699c0a296299f0..452905e5b378166c47943eb63cb8f6c10f11d35c 100644 (file)
--- a/sys-apps/baselayout/Manifest
+++ b/sys-apps/baselayout/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX baselayout-1.11.0-split-out-udev.patch 7413 RMD160 48eef541397ec0a21230de93518eed8a1ea63c16 SHA1 2dfa7e66c361459c8fce482b70d9e75ee51180bd SHA256 397221c066cbbb65d572df431b4babde766dc92d9177005e522e0df8faa25030
 MD5 8d10a229861f862fca52cd8e3bc655d9 files/baselayout-1.11.0-split-out-udev.patch 7413
 RMD160 48eef541397ec0a21230de93518eed8a1ea63c16 files/baselayout-1.11.0-split-out-udev.patch 7413
@@ -58,9 +61,9 @@ AUX copyright 2099 RMD160 43e295598125f39e375a1fcee6e642e37c8b8bd8 SHA1 3d5da783
 MD5 7c0cd50e4ac1dc062f5e6ab578e95659 files/copyright 2099
 RMD160 43e295598125f39e375a1fcee6e642e37c8b8bd8 files/copyright 2099
 SHA256 38db4636f65ce40ea505a6337138b041ac6be5998982193d16b1fbdeebb2bacd files/copyright 2099
-DIST baselayout-1.12.1.tar.bz2 217878 RMD160 bf29b30435c1a82f693472f2b011d6bf74b9194c SHA1 63762c1e6e2afbda0e1446472d2f27fff753f22a SHA256 63bb66086aab5bd94068dda7b571f9dbb59cf0cbbeb563b418780690614cb75c
+DIST baselayout-1.12.1.tar.bz2 215516 RMD160 8194f5caf7b9d8643ae9ff027a38a48117f4c685 SHA1 acb35aa453147a7b1c08d7047a9bf21931aa9688 SHA256 a9e07bf08d30f4057ae718f91d5d3ffdd07befdb44eaab420a15bffa538e3dd5
 DIST baselayout-1.12.4.tar.bz2 216448 RMD160 125e0b8c0f02266fa72ce95d4d3ba93311871d57 SHA1 26a2fa93db01aecd92d2ae47f193fad0949dc316 SHA256 f09ae36d84ff7f52baf44494dedafcb26a1cbb4e5a0f9ba5ef5f553bc21373da
-DIST rc-scripts-1.6.13.tar.bz2 156148 RMD160 c267e0862ffb0af4e7b016332e962ad3fb54723e SHA256 89f924fffbe4b9f84970a2fa559262d24714ee5c15c3d3bf6ebd6d95e25484c0
+DIST rc-scripts-1.6.13.tar.bz2 156148 RMD160 c267e0862ffb0af4e7b016332e962ad3fb54723e SHA1 6f370fe293f83974af26d042448dc101b1603eb1 SHA256 89f924fffbe4b9f84970a2fa559262d24714ee5c15c3d3bf6ebd6d95e25484c0
 DIST rc-scripts-1.6.14.tar.bz2 159580 RMD160 564997e6d116ce9d24fd5dcdb885504bce14809e SHA1 428f5971116b1c8d6465e6b826c5cc89621d84db SHA256 d269f2e7749e4034adc5d87bb618901348f6869939a40dba79ba763ea76633ee
 DIST rc-scripts-1.6.15.tar.bz2 161524 RMD160 f69c3d5a9e742bf7b7c997d49d443617779f3d39 SHA1 e3039dc8fe7ddfc31d88f4b9e1c833fe9607f85c SHA256 55d20018624141fa2ae92c843fa93c6d4b77fc89a493949d5ad391bce5b9888a
 EBUILD baselayout-1.11.13-r2.ebuild 19014 RMD160 3d1348291157e3f973f4ad16e4f222fd32645593 SHA1 e07be587ab059a3f0ec5c1b6d331d9b7d839ebee SHA256 236d09bf8aed1a3f73c26bdb287957a21212646ecb6eec21abaafa9ef6e3b2ef
@@ -79,18 +82,18 @@ EBUILD baselayout-1.12.1.ebuild 19415 RMD160 e12d0150231dfe38fec05c5316cb6b9637b
 MD5 d7f68b6d2164b7ebfa5e25d43543d66d baselayout-1.12.1.ebuild 19415
 RMD160 e12d0150231dfe38fec05c5316cb6b9637bbe9d9 baselayout-1.12.1.ebuild 19415
 SHA256 9422ea78b2db6fe777ab452915fc6cc76fa9137c7e2d0efb26725756c8773845 baselayout-1.12.1.ebuild 19415
-EBUILD baselayout-1.12.4-r1.ebuild 19462 RMD160 14c51a201ad8766ed157119b2b52df38336194e8 SHA1 c92d07ad690c55b6e0d69e0801f6ea974efbf29d SHA256 580e865fd599fcb8e360e3d2e359ef01c10ced5e15948da1852550fff0e99cd3
-MD5 c8561d009c87d4afadf31f418927b8b2 baselayout-1.12.4-r1.ebuild 19462
-RMD160 14c51a201ad8766ed157119b2b52df38336194e8 baselayout-1.12.4-r1.ebuild 19462
-SHA256 580e865fd599fcb8e360e3d2e359ef01c10ced5e15948da1852550fff0e99cd3 baselayout-1.12.4-r1.ebuild 19462
+EBUILD baselayout-1.12.4-r1.ebuild 19552 RMD160 1e366522b45ca7baf54953044be13db99ac98072 SHA1 71e56f8b7ed2882b9416c21cc194bc3175d22019 SHA256 83cbe0e76241db2799142733009ddc4090cbb80d3482ce97f0e35d5fcf10e867
+MD5 8fd7170a03badfd70fce6794e1e0a417 baselayout-1.12.4-r1.ebuild 19552
+RMD160 1e366522b45ca7baf54953044be13db99ac98072 baselayout-1.12.4-r1.ebuild 19552
+SHA256 83cbe0e76241db2799142733009ddc4090cbb80d3482ce97f0e35d5fcf10e867 baselayout-1.12.4-r1.ebuild 19552
 EBUILD baselayout-1.12.4.ebuild 19415 RMD160 57574bfc1b7e851d378032cacb438ac2c3eafc9e SHA1 7048b04aefacff91aef0c742fdcb317ec711777a SHA256 5cb28241d589a2f494b42552b1e52bf9e4026e1fb9eaa6d9288603e7b79e6c41
 MD5 daa582ec8c3e2890cb66b659cce7e017 baselayout-1.12.4.ebuild 19415
 RMD160 57574bfc1b7e851d378032cacb438ac2c3eafc9e baselayout-1.12.4.ebuild 19415
 SHA256 5cb28241d589a2f494b42552b1e52bf9e4026e1fb9eaa6d9288603e7b79e6c41 baselayout-1.12.4.ebuild 19415
-MISC ChangeLog 76469 RMD160 b3a4026bd13ee01f8e4fc7d732bf90b5f9ae0de2 SHA1 2ab0267dcc8b163d34a49ad2eb55dc7b7d1f0a12 SHA256 4c80eca50fc2f2f773066b54f752702ebb48fe215162744fe48d1448b050ac7a
-MD5 f34dc35d9cf83338a3445461f069e66e ChangeLog 76469
-RMD160 b3a4026bd13ee01f8e4fc7d732bf90b5f9ae0de2 ChangeLog 76469
-SHA256 4c80eca50fc2f2f773066b54f752702ebb48fe215162744fe48d1448b050ac7a ChangeLog 76469
+MISC ChangeLog 76690 RMD160 004306543566edc75859c2324ca5104e90526d59 SHA1 d1733599202a4f5203f4cd139fb227c0b8fb07ad SHA256 17ba0a348cd88e4fcb37a9e9bb1fa59c45f78657bd6b13eb09a141664162c58e
+MD5 2d091caf3d9ff44a952798bea9cb81dc ChangeLog 76690
+RMD160 004306543566edc75859c2324ca5104e90526d59 ChangeLog 76690
+SHA256 17ba0a348cd88e4fcb37a9e9bb1fa59c45f78657bd6b13eb09a141664162c58e ChangeLog 76690
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -104,12 +107,19 @@ SHA256 939da19d06f033b18784c7ab4a9d168d9b68caaf4cdbafde33ae754a10af754d files/di
 MD5 45d5d54f514daeb8d7eedb2a553101b0 files/digest-baselayout-1.11.15-r3 256
 RMD160 5e19a5d090c498d3b79d59e869a95a7a05cfe562 files/digest-baselayout-1.11.15-r3 256
 SHA256 634668e30943316fee0925f0cda440d80319cb9072270573bcbbdbac5986b40b files/digest-baselayout-1.11.15-r3 256
-MD5 07ee7b9e0871a145f53ece8e35976fa7 files/digest-baselayout-1.12.1 256
-RMD160 57b2f3aa83bfe62da844ddd0fa7f69bbd040032d files/digest-baselayout-1.12.1 256
-SHA256 3fc5f9d5aa89bb49ac203fbbb627c0c710a56bb63bb9e639087ab8af700da4f0 files/digest-baselayout-1.12.1 256
+MD5 3a465bae830e121519bef9682559a6a2 files/digest-baselayout-1.12.1 256
+RMD160 173a3f9fce25eeb8def155ca3c8de3d2c8e64586 files/digest-baselayout-1.12.1 256
+SHA256 26098d67da6a8b829a372e3a74eded308b9e24ae3440552e57f4f23c23b15e67 files/digest-baselayout-1.12.1 256
 MD5 74e011b91fea32a3e88247cf09e24790 files/digest-baselayout-1.12.4 256
 RMD160 e55e4eb4ede73a8b9a8b542a45ba9cedcbee69c7 files/digest-baselayout-1.12.4 256
 SHA256 a5d5b90fb977a6aa1d11b1d41e921709965cc1205d74a66f59d23e39ac1d2676 files/digest-baselayout-1.12.4 256
 MD5 74e011b91fea32a3e88247cf09e24790 files/digest-baselayout-1.12.4-r1 256
 RMD160 e55e4eb4ede73a8b9a8b542a45ba9cedcbee69c7 files/digest-baselayout-1.12.4-r1 256
 SHA256 a5d5b90fb977a6aa1d11b1d41e921709965cc1205d74a66f59d23e39ac1d2676 files/digest-baselayout-1.12.4-r1 256
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFE1JZy2G5bA0cA/ScRAp0eAJ4oigrmUGr+gu+R80k+iDGYEhVLCwCgl5IZ
+fFQQjJ7n1fsplgaO6ninXFU=
+=S2Q8
+-----END PGP SIGNATURE-----

diff --git a/sys-apps/baselayout/baselayout-1.12.4-r1.ebuild b/sys-apps/baselayout/baselayout-1.12.4-r1.ebuild
index 35276d76b6e7c77f9706992ff7c4baf6d432344f..f8df82798a200c211e245ad281c17d95ccf49573 100644 (file)
--- a/sys-apps/baselayout/baselayout-1.12.4-r1.ebuild
+++ b/sys-apps/baselayout/baselayout-1.12.4-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-apps/baselayout/baselayout-1.12.4-r1.ebuild,v 1.1 2006/08/04 13:46:55 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.12.4-r1.ebuild,v 1.2 2006/08/05 13:00:23 herbs Exp $
 
 inherit flag-o-matic eutils toolchain-funcs multilib
 
@@ -383,8 +383,11 @@ src_install() {
        #
        # Install baselayout utilities
        #
+       local libdir="lib"
+       [[ ${SYMLINK_LIB} == "yes" ]] && libdir=$(get_abi_LIBDIR "${DEFAULT_ABI}")
+
        cd "${S}"/src
-       make DESTDIR="${D}" LIBDIR="$(get_libdir)" install || die
+       make DESTDIR="${D}" LIBDIR="${libdir}" install || die
 
        # Hack to fix bug 9849, continued in pkg_postinst
        unkdir

diff --git a/sys-apps/baselayout/files/digest-baselayout-1.12.1 b/sys-apps/baselayout/files/digest-baselayout-1.12.1
index a84e8c27e3e3a08fb194c74b8dde43e53f8e5dce..3d246268d4c3ead2787bf000dd7134eb37fdb549 100644 (file)
--- a/sys-apps/baselayout/files/digest-baselayout-1.12.1
+++ b/sys-apps/baselayout/files/digest-baselayout-1.12.1
@@ -1,3 +1,3 @@
-MD5 b7b750362e4f67209604620f321bc546 baselayout-1.12.1.tar.bz2 217878
-RMD160 bf29b30435c1a82f693472f2b011d6bf74b9194c baselayout-1.12.1.tar.bz2 217878
-SHA256 63bb66086aab5bd94068dda7b571f9dbb59cf0cbbeb563b418780690614cb75c baselayout-1.12.1.tar.bz2 217878
+MD5 a06d07824f5b619403020288b392b27b baselayout-1.12.1.tar.bz2 215516
+RMD160 8194f5caf7b9d8643ae9ff027a38a48117f4c685 baselayout-1.12.1.tar.bz2 215516
+SHA256 a9e07bf08d30f4057ae718f91d5d3ffdd07befdb44eaab420a15bffa538e3dd5 baselayout-1.12.1.tar.bz2 215516