diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-03-19 11:37:34 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-03-19 11:37:34 +0000 |
| commit | b7b97785ebbb2f11d24d14dab8b81ed274f4ce6a (patch) | |
| tree | 9fd110f9fc996e8a4213eeda994a8c112491b86d /sys-apps/baselayout | |
| parent | 066d27181e9a797ad9f8fc43b49fc9a10ff2f707 (diff) | |
gentoo resync : 19.03.2019
Diffstat (limited to 'sys-apps/baselayout')
| -rw-r--r-- | sys-apps/baselayout/Manifest | 2 | ||||
| -rw-r--r-- | sys-apps/baselayout/baselayout-9999.ebuild | 30 |
2 files changed, 28 insertions, 4 deletions
diff --git a/sys-apps/baselayout/Manifest b/sys-apps/baselayout/Manifest index dda51eec53c3..b79c07c32d2f 100644 --- a/sys-apps/baselayout/Manifest +++ b/sys-apps/baselayout/Manifest @@ -2,5 +2,5 @@ DIST baselayout-2.4.1.tar.bz2 31307 BLAKE2B da26f7fbeefa5efecb6e5d9ded6c2bf3148c DIST baselayout-2.6.tar.bz2 31871 BLAKE2B 4a51d173dc5a2837f78cd1247b5eadd89e7d0b5f2dbc72e75f027b0c23a5db9a386c53e756e80240f36ad4d63e3fe421bf9510c18321d7a31fda140ad47b2860 SHA512 5cad5faf56871ae951120643e29db0c39fea6dc845b4755382bd469eca32639ec6cd0cd046d3c439a7cc607b18770036f9c256260d35beaffb094e23cb13740b EBUILD baselayout-2.4.1-r2.ebuild 8575 BLAKE2B 2bcd6128ef70f86c75c6400c8f89285a164124bdc4882494dc93acef2be4b5c44db208643b6421e39f8459ae850634d3bd008defb75bee8b2b17b7688cede34b SHA512 f414d8e1ae7e7b9774f28166c930c4ae6d810f034ecf0eb158d5cac8c359085f59142b50fa5a55ad07c91797336aeb0ef49b56e5b83c33b5a891aa496a711c96 EBUILD baselayout-2.6-r1.ebuild 9560 BLAKE2B fb9e1121726ef88cec92dc1d44b7a350d751628dd64c93b17e1cf5ee86f5608306391d141e28c8b8e8478dc72ff14a16d2c813be45b875310ebfc12e5cfe1a8e SHA512 a4768c19b0b1d2d915c5bc56ab69f715879757df2f6566e5ee60b1026d1bdfb81e9435fe4aa8b6c7b1b1a14969f4eebc0e748fed6e6616ba9205e8001ab0a993 -EBUILD baselayout-9999.ebuild 8892 BLAKE2B 438db17b2d57e6c4f785cf7c86ed33a4d95b3e31740fd2c52b5a558570e446f4da246f402b33c7abdc3fbd14822bdf7bf317cc3a1438ba90b79aa50f29c4525f SHA512 4869fb45d97c0469ab51c6f4ec0e6dfeb98dab1eed481c49c0400c93092f27257e9777c0d0243713b9bb8f693e9b726853f82c4edaa38890ac3741d07ea05f73 +EBUILD baselayout-9999.ebuild 9569 BLAKE2B 2807bf573136e945e03de8ab7933182e60d259400ce4b2c09da232538223dbaa6d3529b157128f500f623a96de20fe60aaeb59ac254298f08047ac572405ba89 SHA512 86d32b5af8f8fcd2a0135325f831aa10bed8b0fc9cc960347288fe86854446272f47dec44985f24a0c8be52e67483a64c2f15e2be87c5aaf7504c32b2fad7043 MISC metadata.xml 460 BLAKE2B 5c30cc883f9ea3feeae2148cb58741c98e182ca0fff7c28458b3cc20023321395cbeda951426d12ff469105b43689ecaaa5f9c984396b72065c70b8c99843c38 SHA512 60728fd1a2702e79a717ea3e74247ac1e5c80a586a920597d985c87f0d84b30462ef04a36713a0945147d7f2b6c01052c08722c660b02fe82c4bba0407c582b1 diff --git a/sys-apps/baselayout/baselayout-9999.ebuild b/sys-apps/baselayout/baselayout-9999.ebuild index 0428b0afbb90..74c90b6df27a 100644 --- a/sys-apps/baselayout/baselayout-9999.ebuild +++ b/sys-apps/baselayout/baselayout-9999.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 @@ -25,11 +25,36 @@ pkg_setup() { # Create our multilib dirs - the Makefile has no knowledge of this multilib_layout() { - local def_libdir libdir libdirs + 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" @@ -62,7 +87,6 @@ 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 split-usr ; then prefix_lst=( "${EROOT}"{,usr/,usr/local/} ) else |