commit: a3a7afa711daa429827d3538570572cc109ada60 Author: William Hubbs <williamh <AT> gentoo <DOT> org> AuthorDate: Wed May 23 21:26:25 2018 +0000 Commit: William Hubbs <williamh <AT> gentoo <DOT> org> CommitDate: Wed May 23 21:28:38 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3a7afa7
sys-apps/baselayout: change usrmerge use flag to split-usr This is so we will be in line with systemd's usage of split-usr. Package-Manager: Portage-2.3.24, Repoman-2.3.6 sys-apps/baselayout/baselayout-9999.ebuild | 10 +++++----- sys-apps/baselayout/metadata.xml | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sys-apps/baselayout/baselayout-9999.ebuild b/sys-apps/baselayout/baselayout-9999.ebuild index cef8791471a..2d016a01e5b 100644 --- a/sys-apps/baselayout/baselayout-9999.ebuild +++ b/sys-apps/baselayout/baselayout-9999.ebuild @@ -17,7 +17,7 @@ fi LICENSE="GPL-2" SLOT="0" -IUSE="build kernel_FreeBSD kernel_linux usrmerge" +IUSE="build kernel_FreeBSD kernel_linux +split-usr" pkg_setup() { multilib_layout @@ -35,7 +35,7 @@ multilib_layout() { # figure out which paths should be symlinks and which should be directories local dirs syms exp d for libdir in ${libdirs} ; do - if ! use usrmerge ; then + if use split-usr ; then exp=( {,usr/,usr/local/}${libdir} ) else exp=( {usr/,usr/local/}${libdir} ) @@ -62,7 +62,7 @@ multilib_layout() { # setup symlinks and dirs where we expect them to be; do not migrate # data ... just fall over in that case. local prefix prefix_lst - if ! use usrmerge ; then + if use split-usr ; then prefix_lst="${EROOT}"{,usr/,usr/local/} else prefix_lst="${EROOT}"{usr/,usr/local/} @@ -125,7 +125,7 @@ multilib_layout() { fi fi done - if use usrmerge ; then + if ! use split-usr ; then for libdir in ${libdirs}; do if [[ ! -e "${EROOT}${libdir}" ]]; then ln -s usr/"${libdir}" "${EROOT}${libdir}" @@ -145,7 +145,7 @@ pkg_preinst() { # Also, we cannot reference $S as binpkg will break so we do this. multilib_layout if use build ; then - if ! use usrmerge ; then + if use split-usr ; then emake -C "${ED}/usr/share/${PN}" DESTDIR="${EROOT}" layout else emake -C "${ED}/usr/share/${PN}" DESTDIR="${EROOT}" layout-usrmerge diff --git a/sys-apps/baselayout/metadata.xml b/sys-apps/baselayout/metadata.xml index 452b0130466..8a7288dd9a8 100644 --- a/sys-apps/baselayout/metadata.xml +++ b/sys-apps/baselayout/metadata.xml @@ -10,6 +10,6 @@ <name>Gentoo Base System</name> </maintainer> <use> - <flag name="usrmerge">Activate the /usr merge when stages are built</flag> + <flag name="split-usr">Enable this if /bin and /usr/bin are separate directories</flag> </use> </pkgmetadata>