diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2021-09-25 20:21:45 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2021-09-25 20:21:45 +0100 |
| commit | c719fdcee603a5a706a45d10cb598762d56a727d (patch) | |
| tree | 620cbf137661399a3fb1eff92914204f9a970713 /sys-apps/baselayout | |
| parent | cc4618c9ba3d974948ebf340b542d8cb01db2f55 (diff) | |
gentoo resync : 25.09.2021
Diffstat (limited to 'sys-apps/baselayout')
| -rw-r--r-- | sys-apps/baselayout/Manifest | 2 | ||||
| -rw-r--r-- | sys-apps/baselayout/baselayout-9999.ebuild | 11 |
2 files changed, 2 insertions, 11 deletions
diff --git a/sys-apps/baselayout/Manifest b/sys-apps/baselayout/Manifest index 1e3e17dcf5f0..345262162b8a 100644 --- a/sys-apps/baselayout/Manifest +++ b/sys-apps/baselayout/Manifest @@ -3,5 +3,5 @@ EBUILD baselayout-2.7-r1.ebuild 10197 BLAKE2B 5e5f767f37bdf286cd77d21512a855e1e2 EBUILD baselayout-2.7-r2.ebuild 10184 BLAKE2B febfaf2d2a646358c20e12039cd3b224a2fbcf5c12b566e8b33927fa5549b3f0d5b76392bf36cdefe7b14f84bf89b5caff5004ce54b862d238d5928d69526e87 SHA512 a5a45b479dfeac5212291d3d8053c822d06a45d8f82d24f8937b15bd3bf5fd6953ec3520121df243cea2cea52ea8d56894d27b03a272c85ca21ff52190551d8b EBUILD baselayout-2.7-r3.ebuild 11291 BLAKE2B f2794d10f18c74e358ce1e6fc1a9c3e29b7ab7b0cb0d656a53f990781707b29b9e173b96044c9c9e9c8d35b7b020624ad8e9d1bec1cd6b72f287e8c8759dc1cb SHA512 3eaec1f7a1bfd85dd26ad62b3756a7460e890cc893c6967aded70d85df722865664235924c6cbdb7d9be3572e94d059cf1df6a2b240a1e9923b3533ac68906eb EBUILD baselayout-2.7.ebuild 10024 BLAKE2B 490416f9367b1236ac8879b273acc2920f77f1fb23edba5bc825358270f434e0facb8f2794baebce5841b2be2ee3a4da5fffa026585555902e582ff36ab37bd3 SHA512 6a629e68f58d23f8d9653bccca3ad6d52610bd87ab73c5d6b12c9b6e9762f34f2deb452d689c99ea4d66f1c4dbe88e13991f1b2ea900720fd8c8d92067aaca71 -EBUILD baselayout-9999.ebuild 11291 BLAKE2B f2794d10f18c74e358ce1e6fc1a9c3e29b7ab7b0cb0d656a53f990781707b29b9e173b96044c9c9e9c8d35b7b020624ad8e9d1bec1cd6b72f287e8c8759dc1cb SHA512 3eaec1f7a1bfd85dd26ad62b3756a7460e890cc893c6967aded70d85df722865664235924c6cbdb7d9be3572e94d059cf1df6a2b240a1e9923b3533ac68906eb +EBUILD baselayout-9999.ebuild 10942 BLAKE2B 74c1d6bf2c6d3eb516fc0fad25dc9b8262a132dba25d02ec7df43a977586d1c118b3e5f0e1c97fdf5f8d11424ce76984e8bcdcff270af834456c3d6147205520 SHA512 589915bc9fe7b7a93e393b0f1ac5a978436c6c56b2415373f198992bc87f4d3d78faf4a2b3fd857a78be2fdf54b0d11e020e38bbbb6d125f7d11bd0a52a6d72a MISC metadata.xml 383 BLAKE2B 58d0d7a9d2b0e355ca13061b798db482b1894cb805e4c7f70d9b64f301f34aa784ec56783cb670e3c35a69ad383feb3c29d0b8f8164e5e05e24908127759a4aa SHA512 49775deed8635ddd8492a86887c85043e2a16ec46508c08c9eb669eee0aa29db1974c20a338fa09703bfc73fbff29c56d043b2749c0e7046347eb8186da59193 diff --git a/sys-apps/baselayout/baselayout-9999.ebuild b/sys-apps/baselayout/baselayout-9999.ebuild index c83d1da82dc4..84c0a536ea3c 100644 --- a/sys-apps/baselayout/baselayout-9999.ebuild +++ b/sys-apps/baselayout/baselayout-9999.ebuild @@ -215,8 +215,7 @@ src_prepare() { if use prefix; then hprefixify -e "/EUID/s,0,${EUID}," -q '"' etc/profile hprefixify etc/{env.d/50baselayout,shells} share.Linux/passwd - echo PATH=/usr/bin:/bin >> etc/env.d/99host - echo ROOTPATH=/usr/sbin:/sbin:/usr/bin:/bin >> etc/env.d/99host + echo PATH=/usr/sbin:/sbin:/usr/bin:/bin >> etc/env.d/99host fi # don't want symlinked directories in PATH on systems with usr-merge @@ -242,9 +241,6 @@ src_prepare() { ldpaths+=":${EPREFIX}/usr/local/${libdir}" done echo "LDPATH='${ldpaths#:}'" >> etc/env.d/50baselayout - - # rc-scripts version for testing of features that *should* be present - echo "Gentoo Base System release ${PV}" > etc/gentoo-release } src_install() { @@ -258,11 +254,6 @@ src_install() { # need the makefile in pkg_preinst insinto /usr/share/${PN} doins Makefile - - # This is needed for https://bugs.gentoo.org/732142 - dodir /usr/lib - mv "${ED}"/etc/os-release "${ED}"/usr/lib || die - dosym ../usr/lib/os-release /etc/os-release } pkg_postinst() { |