From dc7cbdfa65fd814b3b9aa3c56257da201109e807 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 5 Apr 2019 21:17:31 +0100 Subject: gentoo resync : 05.04.2019 --- sys-apps/baselayout-prefix/Manifest | 13 +- .../baselayout-prefix-2.2-r5.ebuild | 28 +- .../baselayout-prefix-2.6-r1.ebuild | 336 +++++++++++++++++++++ .../files/baselayout-2.2-prefix-chaining.patch | 67 ---- sys-apps/baselayout-prefix/metadata.xml | 9 +- 5 files changed, 357 insertions(+), 96 deletions(-) create mode 100644 sys-apps/baselayout-prefix/baselayout-prefix-2.6-r1.ebuild delete mode 100644 sys-apps/baselayout-prefix/files/baselayout-2.2-prefix-chaining.patch (limited to 'sys-apps/baselayout-prefix') diff --git a/sys-apps/baselayout-prefix/Manifest b/sys-apps/baselayout-prefix/Manifest index 16eddbf03cf5..60ae468d5d4a 100644 --- a/sys-apps/baselayout-prefix/Manifest +++ b/sys-apps/baselayout-prefix/Manifest @@ -1,4 +1,11 @@ -AUX baselayout-2.2-prefix-chaining.patch 1957 BLAKE2B 7bcbe1eeaae4f75b03da92463a3852042d7366beaf141d6dbcd8589e9e83a09d5ea55e301831989ff37a5b07ecb3fcfd06c4516336ccc30859ed05deddb4e7cb SHA512 bb29ff88a7380094653adf9def87566123e3108a43d886560016d56df5f96b9b161270867fd9591012cb12175d78f9660a35f354fc5b3e05e526c5bb4711d90e DIST baselayout-2.2.tar.bz2 40744 BLAKE2B 3a1dfdd64b45d5aa8fb3ff9781aa9b1218095874a0bb6d9dd0d2da4c447945272b25258b53b7ea130f3e1067c799fc4c0d14e577f3a3f749f19d72734136e6e9 SHA512 a5199c42e835d9f2683cc94f3c4c47ecdc392316c24e0932845736e2e90479b0c5c8ad72ead8e0537f097405b7d7548d00b87b7ff8c9e3651486e3c5c0970b36 -EBUILD baselayout-prefix-2.2-r5.ebuild 3553 BLAKE2B 82b726d4bafeeb0ac5916df8e594e45f52182c5453d31aa9199a49ac4b430b1c7d592c66506fc416e59eddf1e0f15a1a8cb470ff6c52a5476f7d86077cf34dfd SHA512 a25e275a28a3bb8278c108db743aacca74284f287f343a1a277cb47deb8418c55f4c740838b516cc9774f93df04d697f4ce10ba061dab0ae962c3fea77290de4 -MISC metadata.xml 218 BLAKE2B 82037a8a13bcba2ae00b1c4db95363a5992fdae654412ff76e70f0cdbc6c28c3ad1a3aa9746763e7271c7ff2f30b6103403bde6437ccb45e6897dbe060e205c1 SHA512 5f03bbfedc0f66afc7bc45f1aeeccdfc3c775dd337fb280bb7e80e29f618898ce92a05c66c126e79333e33ce7f422169c5ff1cdeeb30b58475c712e9bdc4e79f +DIST baselayout-2.6.tar.bz2 31871 BLAKE2B 4a51d173dc5a2837f78cd1247b5eadd89e7d0b5f2dbc72e75f027b0c23a5db9a386c53e756e80240f36ad4d63e3fe421bf9510c18321d7a31fda140ad47b2860 SHA512 5cad5faf56871ae951120643e29db0c39fea6dc845b4755382bd469eca32639ec6cd0cd046d3c439a7cc607b18770036f9c256260d35beaffb094e23cb13740b +DIST baselayout-prefix-395424f90c8ca6969589905cbf86d74fae9d7ea6.patch 1760 BLAKE2B 227ea5a9f70e927ba19de675f408ad01c4d934575cfeb780a525a4e24afd46d9d91d4e4acf773403cb6ac4a493b81da1cad787a5c0e41096056ad4e233b3cfc8 SHA512 77b4c3cad19251497808b6a07a384846f3ebb2282860d55197cee03d373b16622ef3b6c95e411e1cbb79702f10fe2e9c43cfe4175cca1db3ea6c06c6b2331ac9 +DIST baselayout-prefix-5926fe447541607ed137d67ca84080326584b2fc.patch 809 BLAKE2B 237eb610b6935ec5139299f1dccc6260b31a1d47a82390d713fc759ef37de986de8392a82068c70c1f63f382a9212103025fe019614796f5b6a3b4ed0f81f8b2 SHA512 6cd1bf81d8619be27c20fcd703be9a97cc6129d9c13402172e7f16adf6e9b9eb0238edfd311ca8b98b3898876d2bf9686a2a3905510d26608773a3da5233ee95 +DIST baselayout-prefix-95a8e95af948014d024842892be1405d656ab5fc.patch 3754 BLAKE2B c64cf440d7dc27bd3c38ad93d242a28e3ae0df6ebef282249996bc2c463aa6c0941ea41fbee236ba77742ba5bff777cd3226054b80abe99a454f39d488f8e1c1 SHA512 8e2d44e9caedfa7159f374e39d416a7ceebd407ea9550d9aa52d0a87a44b7b805b1725f8eefd592eb5fbd9a5f3f851a28c18565f3b0e621530f4c51c109df24e +DIST baselayout-prefix-a054fcc408ad48f775f7379834385c6a707d7a53.patch 1166 BLAKE2B d9b3135fc77a1941e08c68f0981385bcab412fc4949a70c7b75e11e7f8a6ee1eff6b5be0804d06539ed9f02a6245c0161d3dfd6de9fb0bf68d0d07c724650707 SHA512 822065592f434fcbae42b48d475ac0d188e29773337c3154f162ff830b58dcf44c87e3091933d5a0c0cc7e89e4d0223f60cefc0e525ca29aa3c9a0f9a5e974bf +DIST baselayout-prefix-c88ceddbfc6a965dc0153aef21e012e774d9e30c.patch 2499 BLAKE2B 18f26331aec2b74c119f6064c79540f9a4dd90796841e8db10450b58b0fa7b7e10e6fd6c96e1f1e4b8d47c7cdc31628cf262a55eaca56e0ce23d6505ac73b0e1 SHA512 abd262fcbd3a7df57a9abbe54474517123e8cd8946f377c6e5be848b48b8638636b4e5a424ad76b59d61653c44473ad1423959ff8939ea388ede9514895e1ce2 +DIST baselayout-prefix-c9338e89cdb603c1e08998bba28fbc977a62fc51.patch 9370 BLAKE2B 0e665e08db0ddec93604103d65d6e5a9249afdd55b22106b95e232128b724acd680bc875401cba15bc9aefcc19eddc4cf55b056a83e00a5a3862352470321d04 SHA512 d91c9537f445a8fd4308d5392fc42149e8d08c9ee3282e382995cd32ee531d77d73a94437c9b436b67e8c44aa598147ef63cc79a72ec2e9a83b078c5776ede51 +EBUILD baselayout-prefix-2.2-r5.ebuild 2888 BLAKE2B f5ec243f42071caf10b9057967922052839a346bd7b01389fc7188f4a9cfae5a3fae3301de458e0784add09a34236561a60d31a847dd0ba207b8f616535bd5d1 SHA512 38cb894c196af88a88bc2e6ad95f4f4321267839484c3bd5dfaf122c0a8661ca98bcaea0ee0c230362a5aa977cd5c43198221a0d41cb2c864f03f0ce13ff0e5b +EBUILD baselayout-prefix-2.6-r1.ebuild 11002 BLAKE2B 3a0a6d8ca22c1ca654e2c182a520e94c538129529ceed81915883702f80a71eb5bdc2c2b6dab67345d824f005c9a82719011b809feff0ec980acb30ae930a7e6 SHA512 5518b2ae1b3e3e058c6fb104524654a6aae133be1bbaae65e1357ecb9c1afaded0d444429be18b3a7737bb6a45da5b99651442748624936fc9ac4b6c9fb0f8e2 +MISC metadata.xml 317 BLAKE2B 023b00acfd1afc0255ae1356c8a9627a2d3d81e762b8a7bbd155c2e5e626c4a7663ced36ac04590a127e3a845122a17e07f7c0614dec091919e958883e71ced2 SHA512 3893a08cbe1db5c7888ba808a3cf04c20c8ba5988078791a707978f91e56bf2049244e30096617bf5906e3ff4257538407a02645ceb1a49a61ffef57980bcb27 diff --git a/sys-apps/baselayout-prefix/baselayout-prefix-2.2-r5.ebuild b/sys-apps/baselayout-prefix/baselayout-prefix-2.2-r5.ebuild index 598159ce7569..5eb365ee62ad 100644 --- a/sys-apps/baselayout-prefix/baselayout-prefix-2.2-r5.ebuild +++ b/sys-apps/baselayout-prefix/baselayout-prefix-2.2-r5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -27,22 +27,6 @@ pkg_preinst() { rm -f "${EROOT}"/etc/._cfg????_gentoo-release } -src_prepare() { - if use prefix-chain; then - eapply "${FILESDIR}"/baselayout-${PV}-prefix-chaining.patch - - # need to set the PKG_CONFIG_PATH globally for this prefix, when - # chaining is enabled, since pkg-config may not be installed locally, - # but still .pc files should be found for all RDEPENDable prefixes in - # the chain. - echo "PKG_CONFIG_PATH=\"/usr/lib/pkgconfig:/usr/share/pkgconfig\"" >> etc/env.d/00basic - echo "PORTAGE_OVERRIDE_EPREFIX=\"${EPREFIX}\"" >> etc/env.d/00basic - echo "PORTAGE_CONFIGROOT=\"${EPREFIX}\"" >> etc/env.d/00basic - echo "EPREFIX=\"${EPREFIX}\"" >> etc/env.d/00basic - fi - default -} - src_install() { # make functions.sh available in /etc/init.d (from gentoo-functions) # Note: we cannot replace the symlink with a file here, or Portage will @@ -55,12 +39,10 @@ src_install() { -e "/PATH=/!s:/\(etc\|usr/bin\|bin\):\"${EPREFIX}\"/\1:g" \ -e "/PATH=/s|\([:\"]\)/|\1${EPREFIX}/|g" \ etc/profile > "${ED}"/etc/profile || die - if ! use prefix-chain; then - sed \ - -e "/PATH=.*\/sbin/s|\"$|:/usr/sbin:/sbin\"|" \ - -e "/PATH=.*\/bin/s|\"$|:/usr/bin:/bin\"|" \ - -i "${ED}"/etc/profile || die - fi + sed \ + -e "/PATH=.*\/sbin/s|\"$|:/usr/sbin:/sbin\"|" \ + -e "/PATH=.*\/bin/s|\"$|:/usr/bin:/bin\"|" \ + -i "${ED}"/etc/profile || die dodir etc/env.d sed \ -e "s:/\(etc/env.d\|opt\|usr\):${EPREFIX}/\1:g" \ diff --git a/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r1.ebuild b/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r1.ebuild new file mode 100644 index 000000000000..b689642fcbbf --- /dev/null +++ b/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r1.ebuild @@ -0,0 +1,336 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit multilib + +# just use "upstream" sources +MY_P=${P/-prefix/} +MY_PN=${PN/-prefix/} +S="${WORKDIR}/${MY_P}" + +DESCRIPTION="Filesystem baselayout and init scripts" +HOMEPAGE="https://www.gentoo.org/" +if [[ ${PV} = 9999 ]]; then + EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/${MY_PN}.git" + inherit git-r3 +else + SRC_URI="https://gitweb.gentoo.org/proj/${MY_PN}.git/snapshot/${MY_P}.tar.bz2" + KEYWORDS="~arm ~arm64 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" +fi + +LICENSE="GPL-2" +SLOT="0" +IUSE="build kernel_FreeBSD kernel_linux +split-usr" + +my_prefix_commits=( + # commits in reverse order as listed by: + # git log --decorate=no --oneline --no-abbrev-commit origin/master.. + a054fcc408ad48f775f7379834385c6a707d7a53 # also create etc/gentoo-release + 5926fe447541607ed137d67ca84080326584b2fc # create usr/bin during layout-usrmerge + 395424f90c8ca6969589905cbf86d74fae9d7ea6 # add prefix-stack support + 95a8e95af948014d024842892be1405d656ab5fc # add prefix-guest support + c88ceddbfc6a965dc0153aef21e012e774d9e30c # sync prefix usage for Makefile target 'layout' + c9338e89cdb603c1e08998bba28fbc977a62fc51 # add prefix support per Makefile target 'install' +) +for my_c in ${my_prefix_commits[*]} +do + SRC_URI+=" https://github.com/haubi/gentoo-baselayout/commit/${my_c}.patch -> ${PN}-${my_c}.patch" + PATCHES=( "${DISTDIR}/${PN}-${my_c}.patch" "${PATCHES[@]}" ) +done +unset my_prefix_commits my_c + +pkg_setup() { + multilib_layout +} + +# Create our multilib dirs - the Makefile has no knowledge of this +multilib_layout() { + use prefix && return 0 + local dir def_libdir libdir libdirs + local prefix prefix_lst + def_libdir=$(get_abi_LIBDIR $DEFAULT_ABI) + libdirs=$(get_all_libdirs) + : ${libdirs:=lib} # it isn't that we don't trust multilib.eclass... + + if [[ -z "${SYMLINK_LIB}" || ${SYMLINK_LIB} = no ]] ; then + prefix_lst=( "${EROOT}"{,usr/,usr/local/} ) + for prefix in ${prefix_lst[@]}; do + for libdir in ${libdirs}; do + dir="${prefix}${libdir}" + if [[ -e "${dir}" ]]; then + [[ ! -d "${dir}" ]] && + die "${dir} exists but is not a directory" + continue + fi + if ! use split-usr && [[ ${prefix} = ${EROOT} ]]; then + einfo "symlinking ${dir} to usr/${libdir}" + ln -s usr/${libdir} ${dir} || + die " Unable to make ${dir} symlink" + else + einfo "creating directory ${dir}" + mkdir -p "${dir}" || + die "Unable to create ${dir} directory" + fi + done + done + return 0 + fi + + [ -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 + if use split-usr ; 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 + [ ! -h "${d}" ] && [ -e "${d}" ] && dirs+=" ${d}" + else + [ -h "${d}" ] && syms+=" ${d}" + fi + done + done + if [ -n "${syms}${dirs}" ] ; then + ewarn "Your system profile has SYMLINK_LIB=${SYMLINK_LIB:-no}, so that means you need to" + ewarn "have these paths configured as follows:" + [ -n "${dirs}" ] && ewarn "symlinks to '${def_libdir}':${dirs}" + [ -n "${syms}" ] && ewarn "directories:${syms}" + ewarn "The ebuild will attempt to fix these, but only for trivial conversions." + ewarn "If things fail, you will need to manually create/move the directories." + echo + fi + + # setup symlinks and dirs where we expect them to be; do not migrate + # data ... just fall over in that case. + if use split-usr ; 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 + # it's already a symlink! assume it's pointing to right place ... + continue + elif [ -d "${prefix}lib" ] ; then + # "lib" is a dir, so need to convert to a symlink + ewarn "Converting ${prefix}lib from a dir to a symlink" + rm -f "${prefix}lib"/.keep + if rmdir "${prefix}lib" 2>/dev/null ; then + ln -s ${def_libdir} "${prefix}lib" || die + else + die "non-empty dir found where we needed a symlink: ${prefix}lib" + fi + else + # nothing exists, so just set it up sanely + ewarn "Initializing ${prefix}lib as a symlink" + mkdir -p "${prefix}" || die + rm -f "${prefix}lib" || die + ln -s ${def_libdir} "${prefix}lib" || die + mkdir -p "${prefix}${def_libdir}" #423571 + fi + else + # we need to make sure "lib" is a dir + if [ -h "${prefix}lib" ] ; then + # "lib" is a symlink, so need to convert to a dir + ewarn "Converting ${prefix}lib from a symlink to a dir" + rm -f "${prefix}lib" || die + if [ -d "${prefix}lib32" ] ; then + ewarn "Migrating ${prefix}lib32 to ${prefix}lib" + mv "${prefix}lib32" "${prefix}lib" || die + else + mkdir -p "${prefix}lib" || die + fi + elif [ -d "${prefix}lib" ] && ! has lib32 ${libdirs} ; then + # make sure the old "lib" ABI location does not exist; we + # only symlinked the lib dir on systems where we moved it + # to "lib32" ... + case ${CHOST} in + *-gentoo-freebsd*) ;; # We want it the other way on fbsd. + i?86*|x86_64*|powerpc*|sparc*|s390*) + if [[ -d ${prefix}lib32 && ! -h ${prefix}lib32 ]] ; then + rm -f "${prefix}lib32"/.keep + if ! rmdir "${prefix}lib32" 2>/dev/null ; then + ewarn "You need to merge ${prefix}lib32 into ${prefix}lib" + die "non-empty dir found where there should be none: ${prefix}lib32" + fi + fi + ;; + esac + else + # nothing exists, so just set it up sanely + ewarn "Initializing ${prefix}lib as a dir" + mkdir -p "${prefix}lib" || die + fi + fi + done + if ! use split-usr ; then + for libdir in ${libdirs}; do + if [[ ! -e "${EROOT}${libdir}" ]]; then + ln -s usr/"${libdir}" "${EROOT}${libdir}" + fi + done + fi +} + +pkg_preinst() { + # This is written in src_install (so it's in CONTENTS), but punt all + # pending updates to avoid user having to do etc-update (and make the + # pkg_postinst logic simpler). + rm -f "${EROOT}"/etc/._cfg????_gentoo-release + + # We need to install directories and maybe some dev nodes when building + # stages, but they cannot be in CONTENTS. + # Also, we cannot reference $S as binpkg will break so we do this. + multilib_layout + if use build ; then + if use split-usr ; then + emake -C "${ED}/usr/share/${PN}" DESTDIR="${ROOT}" layout + else + emake -C "${ED}/usr/share/${PN}" DESTDIR="${ROOT}" layout-usrmerge + fi + fi + rm -f "${ED}"/usr/share/${PN}/Makefile +} + +src_prepare() { + default + + # handle multilib paths. do it here because we want this behavior + # regardless of the C library that you're using. we do explicitly + # list paths which the native ldconfig searches, but this isn't + # problematic as it doesn't change the resulting ld.so.cache or + # take longer to generate. similarly, listing both the native + # path and the symlinked path doesn't change the resulting cache. + local libdir ldpaths + for libdir in $(get_all_libdirs) ; do + ldpaths+=":${EPREFIX}/${libdir}:${EPREFIX}/usr/${libdir}" + ldpaths+=":${EPREFIX}/usr/local/${libdir}" + done + echo "LDPATH='${ldpaths#:}'" >> etc/env.d/50baselayout +} + +src_configure() { + local OS + # although having a prefix, RAP uses full Linux baselayout + OS=$(usex prefix-stack prefix-stack \ + $(usex prefix-guest prefix-guest \ + $(usex kernel_FreeBSD BSD \ + Linux ) ) ) + # set up immutable Makefile variables once + sed -e "/^EPREFIX\s*?\?=\s*$/s|?\?=.*|= ${EPREFIX}|" \ + -e "/^BROOT\s*?\?=\s*$/s|?\?=.*|= ${BROOT}|" \ + -e "/^OS\s*?\?=\s*$/s|?\?=.*|= ${OS}|" \ + -i Makefile || die +} + +src_install() { + emake ROOT="${ROOT}" DESTDIR="${D}" install + dodoc ChangeLog + + # need the makefile in pkg_preinst + insinto /usr/share/${PN} + doins Makefile + + use prefix-guest || return 0 + + # add a dummy to avoid Portage shebang errors + dodir sbin + cat > "${ED}"/sbin/runscript <<- EOF + #!/usr/bin/env sh + source "${EPREFIX}/lib/gentoo/functions.sh" + + eerror "runscript/openrc-run not supported by Gentoo Prefix Base System release ${PV}" 1>&2 + exit 1 + EOF + chmod 755 "${ED}"/sbin/runscript || die + cp "${ED}"/sbin/{runscript,openrc-run} || die +} + +pkg_postinst() { + local x + + # We installed some files to /usr/share/baselayout instead of /etc to stop + # (1) overwriting the user's settings + # (2) screwing things up when attempting to merge files + # (3) accidentally packaging up personal files with quickpkg + # If they don't exist then we install them + for x in master.passwd passwd shadow group fstab ; do + [ -e "${EROOT}/etc/${x}" ] && continue + [ -e "${EROOT}/usr/share/baselayout/${x}" ] || continue + cp -p "${EROOT}/usr/share/baselayout/${x}" "${EROOT}"/etc + done + + # Force shadow permissions to not be world-readable #260993 + for x in shadow ; do + [ -e "${EROOT}/etc/${x}" ] && chmod o-rwx "${EROOT}/etc/${x}" + done + + # Take care of the etc-update for the user + if [ -e "${EROOT}"/etc/._cfg0000_gentoo-release ] ; then + mv "${EROOT}"/etc/._cfg0000_gentoo-release "${EROOT}"/etc/gentoo-release + fi + + # whine about users that lack passwords #193541 + if [[ -e "${EROOT}"/etc/shadow ]] ; then + local bad_users=$(sed -n '/^[^:]*::/s|^\([^:]*\)::.*|\1|p' "${EROOT}"/etc/shadow) + if [[ -n ${bad_users} ]] ; then + echo + ewarn "The following users lack passwords!" + ewarn ${bad_users} + fi + fi + + # whine about users with invalid shells #215698 + if [[ -e "${EROOT}"/etc/passwd ]] ; then + local bad_shells=$(awk -F: 'system("test -e " $7) { print $1 " - " $7}' "${EROOT}"/etc/passwd | sort) + if [[ -n ${bad_shells} ]] ; then + echo + ewarn "The following users have non-existent shells!" + ewarn "${bad_shells}" + fi + fi + + # https://bugs.gentoo.org/361349 + if use kernel_linux; then + mkdir -p "${EROOT}"/run + + local found fstype mountpoint + while read -r _ mountpoint fstype _; do + [[ ${mountpoint} = /run ]] && [[ ${fstype} = tmpfs ]] && found=1 + done < "${ROOT}"/proc/mounts + [[ -z ${found} ]] && + ewarn "You should reboot now to get /run mounted with tmpfs!" + fi + + for x in ${REPLACING_VERSIONS}; do + if ver_test ${x} -lt 2.4; then + ewarn "After updating ${EROOT}/etc/profile, please run" + ewarn "env-update && . ${EPREFIX}/etc/profile" + fi + + if ver_test ${x} -lt 2.6; then + ewarn "Please run env-update then log out and back in to" + ewarn "update your path." + fi + # clean up after 2.5 typos + # https://bugs.gentoo.org/show_bug.cgi?id=656380 + if [[ ${x} == 2.5 ]]; then + rm -fr "${EROOT}{,usr" + fi + done + + if [[ -e "${EROOT}"/etc/env.d/00basic ]]; then + ewarn "${EROOT}/etc/env.d/00basic is now ${EROOT}/etc/env.d/50baselayout" + ewarn "Please migrate your changes." + fi +} diff --git a/sys-apps/baselayout-prefix/files/baselayout-2.2-prefix-chaining.patch b/sys-apps/baselayout-prefix/files/baselayout-2.2-prefix-chaining.patch deleted file mode 100644 index fa86f86e4147..000000000000 --- a/sys-apps/baselayout-prefix/files/baselayout-2.2-prefix-chaining.patch +++ /dev/null @@ -1,67 +0,0 @@ ---- a/etc/profile -+++ b/etc/profile -@@ -4,6 +4,46 @@ - # environment for login shells. - # - -+# -+# for prefix-chaining, the very first thing to do is to load -+# the profiles for all chained instances above. -+# -+# TODO: is it safe in any case to shell source make.conf? -+# don't do any recursive expansion here. if the parent can -+# use READONLY_EPREFIX's, it has to have the same profile as -+# we have here, and thus it will source parents before -+# evaluating anything from itself. -+# -+if [[ -r /etc/portage/make.conf ]]; then -+ _ro_root=$(. /etc/portage/make.conf && echo $READONLY_EPREFIX) -+elif [[ -r /etc/make.conf ]]; then -+ _ro_root=$(. /etc/make.conf && echo $READONLY_EPREFIX) -+else -+ echo "Failed to read" /etc/portage/make.conf >&2 -+fi -+_ro_deps=${_ro_root#*:} -+_ro_root=${_ro_root%:*} -+if [ -n "${_ro_root}" -a -f "${_ro_root}/"etc/profile ]; then -+ . "${_ro_root}/"etc/profile -+fi -+ -+# -+# With prefix-chaining we want another set of variables that -+# should be retained for all prefixes. for example it is ok -+# to retain PKG_CONFIG_PATH if the parent of the chain can -+# be used to resolve RDEPEND... -+# -+if [[ -n "${_ro_root}" ]]; then -+ _ro_chained_path_vars="PATH MANPATH" -+ -+ [[ ${_ro_deps} == *RDEPEND* ]] && -+ _ro_chained_path_vars="${_ro_chained_path_vars} PKG_CONFIG_PATH" -+ -+ for var in ${_ro_chained_path_vars}; do -+ eval "_ro_backupenv_paths_${var}=\${${var}}" -+ done -+fi -+ - # Load environment settings from profile.env, which is created by - # env-update from the files in /etc/env.d - if [ -e /etc/profile.env ] ; then -@@ -61,3 +101,17 @@ - [ -r "$sh" ] && . "$sh" - done - unset sh -+ -+# -+# finally chain the save variables for previous prefixes in the chain. -+# -+if [[ -n "${_ro_chained_path_vars}" ]]; then -+ for var in ${_ro_chained_path_vars}; do -+ eval "export ${var}=\${${var}}:\${_ro_backupenv_paths_${var}}" -+ eval "unset _ro_backupenv_paths_${var}" -+ done -+fi -+ -+unset _ro_root -+unset _ro_deps -+unset _ro_chained_path_vars diff --git a/sys-apps/baselayout-prefix/metadata.xml b/sys-apps/baselayout-prefix/metadata.xml index 91e2eccbc46d..cbee92f245c3 100644 --- a/sys-apps/baselayout-prefix/metadata.xml +++ b/sys-apps/baselayout-prefix/metadata.xml @@ -1,7 +1,10 @@ - - prefix@gentoo.org - + + prefix@gentoo.org + + + Enable this if /bin and /usr/bin are separate directories + -- cgit v1.2.3