From 799091016bf8051e9e925a2fdc4cdd952702f007 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sat, 30 Dec 2006 07:12:59 +0000 Subject: [PATCH] use doenvd rather than writing to env.d ourselves Package-Manager: portage-2.1.2_rc4-r2 --- sys-apps/baselayout/Manifest | 78 +++++-------------- .../baselayout/baselayout-1.12.8-r1.ebuild | 5 +- .../baselayout-1.13.0_alpha10-r2.ebuild | 5 +- 3 files changed, 24 insertions(+), 64 deletions(-) diff --git a/sys-apps/baselayout/Manifest b/sys-apps/baselayout/Manifest index 6833c4dd7f7f..4b4b46c823f1 100644 --- a/sys-apps/baselayout/Manifest +++ b/sys-apps/baselayout/Manifest @@ -1,43 +1,10 @@ -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 -SHA256 397221c066cbbb65d572df431b4babde766dc92d9177005e522e0df8faa25030 files/baselayout-1.11.0-split-out-udev.patch 7413 -AUX baselayout-1.11.14-adsl.patch 501 RMD160 81db918f622eba2eef3f76e0441023998b367d3f SHA1 c9a51f5a089ca1ce9ddb5baa48476fa65ea6061f SHA256 5634f36c4f27ddae7a4a22c6dc7b6adad5f83cdb5d9f4291ce061d62361a71c8 -MD5 ec29ba4690f7c58a8d562195bc9eed42 files/baselayout-1.11.14-adsl.patch 501 -RMD160 81db918f622eba2eef3f76e0441023998b367d3f files/baselayout-1.11.14-adsl.patch 501 -SHA256 5634f36c4f27ddae7a4a22c6dc7b6adad5f83cdb5d9f4291ce061d62361a71c8 files/baselayout-1.11.14-adsl.patch 501 -AUX baselayout-1.11.14-depscan.patch 3198 RMD160 75cf15798fe495f7928d0dac4a620f6b4308b4e5 SHA1 216b408f4ba4966316de1ccd85603c971f000a51 SHA256 8baf535a28e952a251d729de9c88941849dcf1e0fc1de4fa6fa143a0cc5de12c -MD5 5651d7e5c42c69c9343cb156fc816f9d files/baselayout-1.11.14-depscan.patch 3198 -RMD160 75cf15798fe495f7928d0dac4a620f6b4308b4e5 files/baselayout-1.11.14-depscan.patch 3198 -SHA256 8baf535a28e952a251d729de9c88941849dcf1e0fc1de4fa6fa143a0cc5de12c files/baselayout-1.11.14-depscan.patch 3198 -AUX baselayout-1.11.14-essidnet.patch 619 RMD160 9cd29b7be10ef4c665be44a84c84df64fca8c64e SHA1 32527571765386bf3e1521dbc34f2d89b10fc4b1 SHA256 2fdce59727910e4ae4f30aedc0d1ae32b852bfc9f740e049676104052900407b -MD5 ab0d5a169769126f5c9d679a86244ee2 files/baselayout-1.11.14-essidnet.patch 619 -RMD160 9cd29b7be10ef4c665be44a84c84df64fca8c64e files/baselayout-1.11.14-essidnet.patch 619 -SHA256 2fdce59727910e4ae4f30aedc0d1ae32b852bfc9f740e049676104052900407b files/baselayout-1.11.14-essidnet.patch 619 -AUX baselayout-1.11.14-iwconfig.patch 609 RMD160 5e5178bb9e100509eefb6dc5bc8a478621941feb SHA1 3ef56b2ff98c55988b791a4be279b541d6bca1b4 SHA256 fba67a24d63c29407882894fc78bf6716329a923d7925e9f0cd2b6535afdd292 -MD5 00027c12be3e1ed7ce2787cfca1b5a6c files/baselayout-1.11.14-iwconfig.patch 609 -RMD160 5e5178bb9e100509eefb6dc5bc8a478621941feb files/baselayout-1.11.14-iwconfig.patch 609 -SHA256 fba67a24d63c29407882894fc78bf6716329a923d7925e9f0cd2b6535afdd292 files/baselayout-1.11.14-iwconfig.patch 609 +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX baselayout-1.11.14-man.patch 768 RMD160 b1743f52d71b6ff2bd0d8cb8106112d8fad9d5b7 SHA1 f61b8f985a27dc9f2dd834001602b008030e79ce SHA256 7c12d6ee90b14b3152c2256df5983d3e6d102ca53b5da3ca6505b8925a86a80a MD5 dff93a6f0914f6969d21482d2f36e75e files/baselayout-1.11.14-man.patch 768 RMD160 b1743f52d71b6ff2bd0d8cb8106112d8fad9d5b7 files/baselayout-1.11.14-man.patch 768 SHA256 7c12d6ee90b14b3152c2256df5983d3e6d102ca53b5da3ca6505b8925a86a80a files/baselayout-1.11.14-man.patch 768 -AUX baselayout-1.11.14-udev-sysinit.patch 1097 RMD160 533a2f4fb62eb1371413c120048b7f70a58fd41e SHA1 14556efed1eefb0e50c4f8041c3844324c8f60a4 SHA256 3bdaae5c1ce59856f77b57e8312a369b61fe1f3cbb17993454a699ea7703e0a6 -MD5 34964dc9fff04e8eaa948a9a60185e94 files/baselayout-1.11.14-udev-sysinit.patch 1097 -RMD160 533a2f4fb62eb1371413c120048b7f70a58fd41e files/baselayout-1.11.14-udev-sysinit.patch 1097 -SHA256 3bdaae5c1ce59856f77b57e8312a369b61fe1f3cbb17993454a699ea7703e0a6 files/baselayout-1.11.14-udev-sysinit.patch 1097 -AUX baselayout-1.11.14-udhcpc.patch 1301 RMD160 e07f8165814a29dee4aa044e6817f8b79193403f SHA1 8e317787579b3d481f57fb57e725d3f5290b09d9 SHA256 99c2274703515f7f52c8480e55c93beea28968a284abb351250bd14a111431fc -MD5 6a8967d43dfa400cdfbab80fc49a7e85 files/baselayout-1.11.14-udhcpc.patch 1301 -RMD160 e07f8165814a29dee4aa044e6817f8b79193403f files/baselayout-1.11.14-udhcpc.patch 1301 -SHA256 99c2274703515f7f52c8480e55c93beea28968a284abb351250bd14a111431fc files/baselayout-1.11.14-udhcpc.patch 1301 -AUX baselayout-1.11.14-uniqify.patch 2080 RMD160 3bbe90a05bd9db1ae552217ce5043cca80abf609 SHA1 34744cda846236acc73d1a1f91c926e7d629f05b SHA256 80290bcd0292af7911e865beae03e8e53d8d45486127ae394d3a843e1cdc8962 -MD5 08385e878922e351d020a26fed4de4de files/baselayout-1.11.14-uniqify.patch 2080 -RMD160 3bbe90a05bd9db1ae552217ce5043cca80abf609 files/baselayout-1.11.14-uniqify.patch 2080 -SHA256 80290bcd0292af7911e865beae03e8e53d8d45486127ae394d3a843e1cdc8962 files/baselayout-1.11.14-uniqify.patch 2080 -AUX baselayout-1.11.14-wpa_supplicant.patch 1163 RMD160 9524ecbb1080f47283f776a9eb8056d7224c04e7 SHA1 81dd6eda2aae8a8b31fdc5861a8544979b40ae61 SHA256 eda23993355ff52b646946f29f7b8450d50be85e052909e04f810cb78a8e589a -MD5 893fc11f23ec8cdcdc634b77fcef89f6 files/baselayout-1.11.14-wpa_supplicant.patch 1163 -RMD160 9524ecbb1080f47283f776a9eb8056d7224c04e7 files/baselayout-1.11.14-wpa_supplicant.patch 1163 -SHA256 eda23993355ff52b646946f29f7b8450d50be85e052909e04f810cb78a8e589a files/baselayout-1.11.14-wpa_supplicant.patch 1163 AUX baselayout-1.11.15-coldplug.patch 2449 RMD160 6a8838bbd2b724d305ff14ae66a935773931e51a SHA1 6df3abaf389b40d7b3371849e73d6b0507d63cf6 SHA256 626428986dd21c95b16d464e845ffa79dd535aaf089b91423e704e7d64562d26 MD5 cb8e034c5ef06038baec109c078305e8 files/baselayout-1.11.15-coldplug.patch 2449 RMD160 6a8838bbd2b724d305ff14ae66a935773931e51a files/baselayout-1.11.15-coldplug.patch 2449 @@ -103,17 +70,7 @@ DIST baselayout-1.12.5.tar.bz2 220693 RMD160 85f03fe3b0ff0521ec4226a1b6788575052 DIST baselayout-1.12.6.tar.bz2 221279 RMD160 4a9b6a0b3855e36a4b0214615d578e8d17dcabae SHA1 8164fe1923ccdf9d9e38ac0884e2bdd2061681e7 SHA256 c244469fa582c7733d2cf1b51865fac818beb8b2af60ec452ad147cb50eb8862 DIST baselayout-1.12.8.tar.bz2 218298 RMD160 2a47bf00db9c1e15ad2dd90e02dc55a896e3e01f SHA1 5d7274e64b8d17a77519e73303390f4d63f958ee SHA256 c05e126ee1b5bd63462db133c4e39ca45b0a999696f637f2a80d9c7b616eeeea DIST baselayout-1.13.0_alpha10.tar.bz2 255190 RMD160 930065e8fd850ad1247c639293ab05ff499409d1 SHA1 ae5f9e403610335a8e9e6e7ec4eed9a1ab62bd7f SHA256 ea78f92f45801c306458bc66a076d566893cac11e3dac429810629aea0738ef4 -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 -MD5 22a10db577b1b646d12ba31ed7b77a6c baselayout-1.11.13-r2.ebuild 19014 -RMD160 3d1348291157e3f973f4ad16e4f222fd32645593 baselayout-1.11.13-r2.ebuild 19014 -SHA256 236d09bf8aed1a3f73c26bdb287957a21212646ecb6eec21abaafa9ef6e3b2ef baselayout-1.11.13-r2.ebuild 19014 -EBUILD baselayout-1.11.14-r8.ebuild 19047 RMD160 062d37157c2e94b519e593de2830a36a3f33ba47 SHA1 c26ecddf270fd1548e96f266546e7e196a52e9c1 SHA256 43517b61ad82a60808325c74bd48c4163eac3260df73927bb70e666d2ef8831b -MD5 ff706a3403f889407502c24e2e95e4be baselayout-1.11.14-r8.ebuild 19047 -RMD160 062d37157c2e94b519e593de2830a36a3f33ba47 baselayout-1.11.14-r8.ebuild 19047 -SHA256 43517b61ad82a60808325c74bd48c4163eac3260df73927bb70e666d2ef8831b baselayout-1.11.14-r8.ebuild 19047 EBUILD baselayout-1.11.15-r3.ebuild 18814 RMD160 3477a96752088ec670ba87c8cc5a825e504374a9 SHA1 dffb788310268b4bbccc21dc55e8ce247b0100f5 SHA256 6568e5b5762128fdfd353dd359581cf6f7aafc60e5ffb2194a675df2aeeb6fda MD5 c13ac4da7c024396714a0f52c15bcb58 baselayout-1.11.15-r3.ebuild 18814 RMD160 3477a96752088ec670ba87c8cc5a825e504374a9 baselayout-1.11.15-r3.ebuild 18814 @@ -130,10 +87,10 @@ EBUILD baselayout-1.12.6.ebuild 19713 RMD160 2a19aa08e7a497843b40d2678ba8695580e MD5 bd19081e2814fc4989fb0648ba5fa709 baselayout-1.12.6.ebuild 19713 RMD160 2a19aa08e7a497843b40d2678ba8695580e6f75f baselayout-1.12.6.ebuild 19713 SHA256 c39675983cc1a94ddedb5822490cb3504230d8dad3df60d36f71e8d035b5d57a baselayout-1.12.6.ebuild 19713 -EBUILD baselayout-1.12.8-r1.ebuild 17078 RMD160 7df3193d2777bc3f1b5ead49891e3b0c6259125a SHA1 881a8cee8f48f5a9fe77b913e256f9993dfc5941 SHA256 5fcef16907759242e4c995b5b8851f5678e3ddd329317098668515de463af222 -MD5 761a13aab88ba1c63d877f00f2beb844 baselayout-1.12.8-r1.ebuild 17078 -RMD160 7df3193d2777bc3f1b5ead49891e3b0c6259125a baselayout-1.12.8-r1.ebuild 17078 -SHA256 5fcef16907759242e4c995b5b8851f5678e3ddd329317098668515de463af222 baselayout-1.12.8-r1.ebuild 17078 +EBUILD baselayout-1.12.8-r1.ebuild 17081 RMD160 700c880d4cf129d3f5010d3b0cc45095ce3929a5 SHA1 5e675b44d8f08c5988314dc7519806087aa92b69 SHA256 dfa6464688a8052672c16eb10621717552ed2462549d47f3c0690cca2aa7d06b +MD5 0c1b154ed054fceb54550f85b3cade92 baselayout-1.12.8-r1.ebuild 17081 +RMD160 700c880d4cf129d3f5010d3b0cc45095ce3929a5 baselayout-1.12.8-r1.ebuild 17081 +SHA256 dfa6464688a8052672c16eb10621717552ed2462549d47f3c0690cca2aa7d06b baselayout-1.12.8-r1.ebuild 17081 EBUILD baselayout-1.12.8.ebuild 17035 RMD160 b7088b2a5f8aad3ce43b920b965f1280f24c3be1 SHA1 a2110deb651437e356ae4f9ce9b7d5b0d6e4f89e SHA256 2de062a8fff51618f17af46395ab9a202d229d86e8e0f8fe713da344ec3d4d9a MD5 082aa588289d254af8bbdfbf37f0a05e baselayout-1.12.8.ebuild 17035 RMD160 b7088b2a5f8aad3ce43b920b965f1280f24c3be1 baselayout-1.12.8.ebuild 17035 @@ -142,10 +99,10 @@ EBUILD baselayout-1.13.0_alpha10-r1.ebuild 10022 RMD160 34d043897f9f887ceb23c14d MD5 a10b36ce27df1a86fcc4c4f7172ed47c baselayout-1.13.0_alpha10-r1.ebuild 10022 RMD160 34d043897f9f887ceb23c14d33b6376457502393 baselayout-1.13.0_alpha10-r1.ebuild 10022 SHA256 7aa0fa9cccbfab2ae027f0d86689bdf234b643d35a1e2aab2e512402bee0e168 baselayout-1.13.0_alpha10-r1.ebuild 10022 -EBUILD baselayout-1.13.0_alpha10-r2.ebuild 10063 RMD160 5a46dc4bee45fc90d7578de9ad934a8d3eee88c2 SHA1 5d7b566ca09395e530fac3b9c962b60b89ef6f4d SHA256 2e39caf73997a0e93eaadd83d66d0e24d96299bf87d000e99a3ebeb52efc8962 -MD5 7f3e54075ad1b122d3eb038a812cf2eb baselayout-1.13.0_alpha10-r2.ebuild 10063 -RMD160 5a46dc4bee45fc90d7578de9ad934a8d3eee88c2 baselayout-1.13.0_alpha10-r2.ebuild 10063 -SHA256 2e39caf73997a0e93eaadd83d66d0e24d96299bf87d000e99a3ebeb52efc8962 baselayout-1.13.0_alpha10-r2.ebuild 10063 +EBUILD baselayout-1.13.0_alpha10-r2.ebuild 10064 RMD160 8d1c8adaf854ed60d57eb464fbefcaae6b005ac2 SHA1 31eff179d8dcf83dd7a4494b9ff9f8e1c1d05861 SHA256 60ba424d6278af513d57be599018e9df744b711b9ae5311964a208757e283c57 +MD5 09a41cf5230e16f9cb0ccabd75db3f23 baselayout-1.13.0_alpha10-r2.ebuild 10064 +RMD160 8d1c8adaf854ed60d57eb464fbefcaae6b005ac2 baselayout-1.13.0_alpha10-r2.ebuild 10064 +SHA256 60ba424d6278af513d57be599018e9df744b711b9ae5311964a208757e283c57 baselayout-1.13.0_alpha10-r2.ebuild 10064 EBUILD baselayout-1.13.0_alpha10.ebuild 9979 RMD160 a6cd64566591832f7a27ceed9865c5243c0f55d3 SHA1 c677943150955e11a42236be5906f25d4cb9f4ff SHA256 426ef12358ae0ff7bd6e112fbea601bbf263f605b7c7ccd2e0858a837f6a9bd6 MD5 3142bbab3c121b88c30c92eef33acbba baselayout-1.13.0_alpha10.ebuild 9979 RMD160 a6cd64566591832f7a27ceed9865c5243c0f55d3 baselayout-1.13.0_alpha10.ebuild 9979 @@ -158,12 +115,6 @@ MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 metadata.xml 164 -MD5 dbf748aa02c9e8c31b53e571a9392a6e files/digest-baselayout-1.11.13-r2 256 -RMD160 c8c9c1fe8904c2c03a77e7411dae819a6e52118e files/digest-baselayout-1.11.13-r2 256 -SHA256 2222db604622b5c6bdb7dc746938339b82052f877f9a099c52cd7c9356177d62 files/digest-baselayout-1.11.13-r2 256 -MD5 00d79deae663edaa627c8bbc572c6967 files/digest-baselayout-1.11.14-r8 256 -RMD160 61e4bfb394dabe52a62e8b2b56102ad0e6f60d66 files/digest-baselayout-1.11.14-r8 256 -SHA256 939da19d06f033b18784c7ab4a9d168d9b68caaf4cdbafde33ae754a10af754d files/digest-baselayout-1.11.14-r8 256 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 @@ -191,3 +142,10 @@ SHA256 2aff7adae59490722f3880d409166e61514c4dd90043c810f172776627f80505 files/di MD5 a906c725ad1f2a7363333865e410227c files/digest-baselayout-1.13.0_alpha10-r2 280 RMD160 4f16b9967ebd8f5133edcbd9eee430020b4094ea files/digest-baselayout-1.13.0_alpha10-r2 280 SHA256 2aff7adae59490722f3880d409166e61514c4dd90043c810f172776627f80505 files/digest-baselayout-1.13.0_alpha10-r2 280 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.6 (GNU/Linux) + +iD8DBQFFlhG88bi6rjpTunYRAnrHAJ99VUfMmObAlJgGZNdbrxzxSFvfiQCeMz5+ +NSKv52bkLGUkMUREhTKlTg8= +=4H9+ +-----END PGP SIGNATURE----- diff --git a/sys-apps/baselayout/baselayout-1.12.8-r1.ebuild b/sys-apps/baselayout/baselayout-1.12.8-r1.ebuild index 18d116118082..70a27f234d1b 100644 --- a/sys-apps/baselayout/baselayout-1.12.8-r1.ebuild +++ b/sys-apps/baselayout/baselayout-1.12.8-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.8-r1.ebuild,v 1.1 2006/12/20 16:17:27 uberlord Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.12.8-r1.ebuild,v 1.2 2006/12/30 07:12:59 vapier Exp $ inherit flag-o-matic eutils toolchain-funcs multilib @@ -265,7 +265,8 @@ src_install() { # List all the multilib libdirs in /etc/env/04multilib (only if they're # actually different from the normal if has_multilib_profile || [[ $(get_libdir) != "lib" || -n ${CONF_MULTILIBDIR} ]]; then - echo "LDPATH=\"${libdirs_env}\"" > ${D}/etc/env.d/04multilib + echo "LDPATH=\"${libdirs_env}\"" > 04multilib + doenvd 04multilib fi # As of baselayout-1.10-1-r1, sysvinit is its own package again, and diff --git a/sys-apps/baselayout/baselayout-1.13.0_alpha10-r2.ebuild b/sys-apps/baselayout/baselayout-1.13.0_alpha10-r2.ebuild index 57d1119d3a7a..c602716433cf 100644 --- a/sys-apps/baselayout/baselayout-1.13.0_alpha10-r2.ebuild +++ b/sys-apps/baselayout/baselayout-1.13.0_alpha10-r2.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.13.0_alpha10-r2.ebuild,v 1.1 2006/12/20 22:14:17 uberlord Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.13.0_alpha10-r2.ebuild,v 1.2 2006/12/30 07:12:59 vapier Exp $ inherit flag-o-matic eutils toolchain-funcs multilib @@ -126,7 +126,8 @@ src_install() { if has_multilib_profile && [ -d /lib32 -o -d /usr/lib32 ] && ! hasq lib32 ${libdirs}; then libdirs_env="${libdirs_env}:/lib32:/usr/lib32:/usr/local/lib32" fi - echo "LDPATH=\"${libdirs_env}\"" > "${D}"/etc/env.d/04multilib + echo "LDPATH=\"${libdirs_env}\"" > 04multilib + doenvd 04multilib fi # rc-scripts version for testing of features that *should* be present -- 2.26.2