diff options
Diffstat (limited to 'sys-apps/baselayout')
| -rw-r--r-- | sys-apps/baselayout/Manifest | 4 | ||||
| -rw-r--r-- | sys-apps/baselayout/baselayout-9999.ebuild | 39 | ||||
| -rw-r--r-- | sys-apps/baselayout/metadata.xml | 3 |
3 files changed, 36 insertions, 10 deletions
diff --git a/sys-apps/baselayout/Manifest b/sys-apps/baselayout/Manifest index f05554ea793d..18e32b20c25d 100644 --- a/sys-apps/baselayout/Manifest +++ b/sys-apps/baselayout/Manifest @@ -2,8 +2,8 @@ DIST baselayout-2.3.tar.bz2 32266 SHA256 e7bbd7d71ede6820a37738fd2e9010d54545fbd DIST baselayout-2.4.1.tar.bz2 31307 SHA256 d75ae329ba47f26e7c41c6e060f57a8f1f1a97420d39e6a49ab2bdb86c4a2c00 SHA512 e505ad81834aafb574ffee9bc1fce216c1c8c7fa11b0095580f87a37e4b9efb057ee78db7cd5affc64f05d5dd0592c671304414c119b37d86dfaa1e7b84ce7c1 WHIRLPOOL 9057ab259c8ef61bb56d13b237e343f6a7aec8fef61a0a9872fc7e0aa34a7dc772cd4701a76341d170eaa3ba328ad0b693d098189ca7f4aa9e5e32232f1d1801 EBUILD baselayout-2.3.ebuild 8346 SHA256 f81ee2b6b46b6ddd2f1098f02d31095d8a76b030b20395654dc5967cb5617bed SHA512 c2efae56623e39a6dcb13a064810c900bb22bdd9b04f31b1837c4a56a48cf2135eaaa3340c72e2ebf4ac5800d8ba2ee03083d2edf0c3181ff465b6a87cc7d4c1 WHIRLPOOL 4b6783f5b2204cc1b2efa2e29b0d1b4eb41864b47bbfff7d67b4fa5200ec2b6cbe22696c1bdabfc49c696bbeb9753f2f7b56a1265187bd6b6a93ef805cafefe5 EBUILD baselayout-2.4.1-r2.ebuild 8567 SHA256 26630dedefe8ef21c3ebcffe7afe2aeb43cd757f687bfb8a6d51aa2bc5a18a02 SHA512 54b918555d24639073a1526324fbd12273e5e8f799e7a2a591c5c1eb4e70bbbc161e4056b62a2de2ade1d912b5d1b2736e84a5c4cb552b7ffca7dc1427ee781b WHIRLPOOL 0bb44976d077bbba1489c7b77762596276c75adfb5767c48960892bb0bf990e5fbe179c636115a831aaee4878a25d590ad6640f45525b6e6bd0d550820e8e09d -EBUILD baselayout-9999.ebuild 8688 SHA256 965513b4fb9f6396d8bfe457de1890af36a130a84b3935189f87c1c39ff67b15 SHA512 0e36fe35bcfef3e6df92c43b3eb7111c8a5fa1003264529ce56332972cb5fbcda5db94f64f0f5fca74145eff953bea80685d053ff0ae265672912bff0c5278af WHIRLPOOL d945dac37e2ea93e4cdae684f9f4b1b8e3b8c2a667bea933be8da98962a14757a28ef2a80b5b2a8691e047e220200b9564b35c8da0650c8d5ee21f735b13d486 +EBUILD baselayout-9999.ebuild 9168 SHA256 bfefd742efd8d87c3f2da89601a8ef2620b578fd2212995b382d92b7410a41e1 SHA512 7901912868396280249acaf517c6dc915a5eb443e11eadd42e64368ebd34997635fe033db3fcf27c14fe9685699c96b64a2bfc130faa96bc6851aea84113884a WHIRLPOOL ebd4c7576a6be14d09dad356e08889169bce313a76f8b72cef8de940599566e80a6cc381340d5ccf6a4e8f13c8da388172b31db03f6761d255edd4c15721ba6c MISC ChangeLog 4857 SHA256 f10de10caa066cb3c6f2471c29bdaf6bad0de254216efda4ad288e46b254b970 SHA512 bae6a38f8780a29d06fb12b39479f36403392a63600ebd9032c8490fc51aa3bb1d162cf7a472fd38e0aa87770088e12a1d4df8d9591b8a28275bbf690fa62f4f WHIRLPOOL ec46fb22de2a7b079d4d1090526baa50519fb23575953a19651674ddec808318664eb3d462c2e89bcc6309cbb47211fb07f5a88e95819b4518c8e76c7529442b MISC ChangeLog-2008 101952 SHA256 cb360ccdd6458e3faa54214ea6370ade92265bafa1b1aa7789165b5dfee3e5c8 SHA512 d888de07f955094603497e06a083ffe33d3bfeeed7aede59bca5cd60a6c1d5334d691a8d0a7ae7534af6e82fcd8dbf522f9ac3024a468f5035a9245024cc726f WHIRLPOOL 97ee6ca2c4b9a3fc0a919cd6f286165b1eec32e32acb7f2c81e04464fd7a34cc5847e7087795479a5475bc25eaea89ae28b56bcfd11f3d51c6153d83c26f9bdb MISC ChangeLog-2015 10095 SHA256 a8ecc0cc040723fa4d9a740e520286b574cf05ef977c06ca6cfb10ab27bbcfae SHA512 106ae36b21ec3806f06ed2b1e3a39e4e88f2dd004915e3b56765bbe43751a00d14188c066ff31a8465684db9fd918d3b6046686a1708435a2c91eb6fec754a07 WHIRLPOOL 2e154d06840d6b39ed1a968820352dfd713d257abb2e2e97a5db53c6c4816a4a9ad2288e6cfc61388d22b22049503855a9e6402c576785f53fb62a506bf6e6c4 -MISC metadata.xml 358 SHA256 b31b751b50e8a91d4e0569671cf55e89dca561c724db408f3015d544d66852b7 SHA512 37306b4ebf69803889059875a22ceccde18725cc21e5a598496c30a377e6cb1d3d9ca88123121b2a70c2436b3a77530415169b53165de93ea8510cc41fbb589f WHIRLPOOL c1d2fd649ef108432ddc6c251df0afcc444b14b90da75a48e93bd6eb0b04c3f35bf703bdc9371e5537144ee8392c7c7868895b50ec0a815c4e1403c898a2283c +MISC metadata.xml 447 SHA256 6e1e531b3bf0e6fcc15cd6d216d4bbc84ff6760cbd1e6032f04aa862c3060071 SHA512 df8ef8945e71112074f70af3fb2ffc0d83ffd0b25827f802b96924436b6a7f184ffcfef495d543bddc3007e7a1ea5429ca696e2ad6dfb09a0541e504f7d135d1 WHIRLPOOL 2171397c67f23fc03ffb39768b7df87e8998ea046a8c2b2a2fe32e4f8091b8dd96b685de54ed212a296a095821961240eb3da3c5d5114bfe74378516140313cb diff --git a/sys-apps/baselayout/baselayout-9999.ebuild b/sys-apps/baselayout/baselayout-9999.ebuild index 98795ba6d00f..7e43ea7af598 100644 --- a/sys-apps/baselayout/baselayout-9999.ebuild +++ b/sys-apps/baselayout/baselayout-9999.ebuild @@ -3,7 +3,7 @@ EAPI=6 -inherit eutils multilib versionator prefix +inherit multilib versionator prefix DESCRIPTION="Filesystem baselayout and init scripts" HOMEPAGE="https://www.gentoo.org/" @@ -18,7 +18,7 @@ fi LICENSE="GPL-2" SLOT="0" -IUSE="build kernel_linux" +IUSE="build usrmerge kernel_linux" pkg_setup() { multilib_layout @@ -26,15 +26,22 @@ pkg_setup() { # Create our multilib dirs - the Makefile has no knowledge of this multilib_layout() { - local libdir libdirs=$(get_all_libdirs) def_libdir=$(get_abi_LIBDIR $DEFAULT_ABI) + local def_libdir libdir libdirs + def_libdir=$(get_abi_LIBDIR $DEFAULT_ABI) + libdirs=$(get_all_libdirs) : ${libdirs:=lib} # it isn't that we don't trust multilib.eclass... - [ -z "${def_libdir}" ] && die "your DEFAULT_ABI=$DEFAULT_ABI appears to be invalid" + [ -z "${def_libdir}" ] && + die "your DEFAULT_ABI=$DEFAULT_ABI appears to be invalid" # figure out which paths should be symlinks and which should be directories local dirs syms exp d for libdir in ${libdirs} ; do - exp=( {,usr/,usr/local/}${libdir} ) + if ! use usrmerge; then + exp=( {,usr/,usr/local/}${libdir} ) + else + exp=( {usr/,usr/local/}${libdir} ) + fi for d in "${exp[@]}" ; do # most things should be dirs if [ "${SYMLINK_LIB}" = "yes" ] && [ "${libdir}" = "lib" ] ; then @@ -56,8 +63,13 @@ multilib_layout() { # setup symlinks and dirs where we expect them to be; do not migrate # data ... just fall over in that case. - local prefix - for prefix in "${EROOT}"{,usr/,usr/local/} ; do + local prefix prefix_lst + if ! use usrmerge; then + prefix_lst="${EROOT}"{,usr/,usr/local/} + else + prefix_lst="${EROOT}"{usr/,usr/local/} + fi + for prefix in "${prefix_lst}"; do if [ "${SYMLINK_LIB}" = yes ] ; then # we need to make sure "lib" points to the native libdir if [ -h "${prefix}lib" ] ; then @@ -115,6 +127,13 @@ multilib_layout() { fi fi done + if use usrmerge; then + for libdir in ${libdirs}; do + if [[ ! -e "${EROOT}${libdir}" ]]; then + ln -s usr/"${libdir}" "${EROOT}${libdir}" + fi + done + fi } pkg_preinst() { @@ -135,7 +154,11 @@ pkg_preinst() { # Also, we cannot reference $S as binpkg will break so we do this. multilib_layout if use build ; then - emake -C "${ED}/usr/share/${PN}" DESTDIR="${EROOT}" layout || die + if ! use usrmerge; then + emake -C "${ED}/usr/share/${PN}" DESTDIR="${EROOT}" layout + else + emake -C "${ED}/usr/share/${PN}" DESTDIR="${EROOT}" layout-usrmerge + fi fi rm -f "${ED}"/usr/share/${PN}/Makefile } diff --git a/sys-apps/baselayout/metadata.xml b/sys-apps/baselayout/metadata.xml index 53e04953d604..452b01304667 100644 --- a/sys-apps/baselayout/metadata.xml +++ b/sys-apps/baselayout/metadata.xml @@ -9,4 +9,7 @@ <email>base-system@gentoo.org</email> <name>Gentoo Base System</name> </maintainer> +<use> + <flag name="usrmerge">Activate the /usr merge when stages are built</flag> +</use> </pkgmetadata> |