commit: 3dcff3b5a60cd6fbead3da67835600db188b6972 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> AuthorDate: Sat Jan 28 02:16:54 2023 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Sat Jan 28 02:17:33 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3dcff3b5
sys-apps/baselayout: add 2.13, drop 2.12 Bug: https://bugs.gentoo.org/648880 Bug: https://bugs.gentoo.org/892267 Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> sys-apps/baselayout/Manifest | 2 +- ...aselayout-2.12.ebuild => baselayout-2.13.ebuild} | 21 ++++++++------------- 2 files changed, 9 insertions(+), 14 deletions(-) diff --git a/sys-apps/baselayout/Manifest b/sys-apps/baselayout/Manifest index 97df516f916b..294492d1164a 100644 --- a/sys-apps/baselayout/Manifest +++ b/sys-apps/baselayout/Manifest @@ -1,2 +1,2 @@ -DIST baselayout-2.12.tar.bz2 29275 BLAKE2B 5708137748e484555ed7f91301c5bc079189e744fc14f708d8b95ab82ad9392166690af6424ee486d95c7b0ce85b6f23fcadd7f95c31920a3424e86431d9b41f SHA512 8c4ad7cf459254c07d1a05300b5e9a600aa259a0f38c55e74c0a60a1a1f9da92c9de5de58cfb735738b64deb6955d6f80ae174925cded07c61c3371323dce152 +DIST baselayout-2.13.tar.bz2 29423 BLAKE2B a399e515297d3a936c5821205f1f0d6de844580099936be50e80a463b9fa6239aead52b7b371136680e263e326f7e6a1faea8cd8db0f11462cf0e8166707fc91 SHA512 ff16f20cf2c65258ab6d48c403607113f84fc57ffee6650652202746095f402f8c6a4f22040d0bb9310180945131bed6a0fda3717b39080a987e4f5224339095 DIST baselayout-2.9.tar.bz2 30200 BLAKE2B 3a997e847e853a5bcdce7eb06d50fda4727a6c408ca614bdc8dd576bfc9296d3c625c4e8791dbdb078dd5088f818e5ee98eea5d14d737f465ed225554da26180 SHA512 c07726141446c9d9202bac19642baf819b28a838814e1dd3c200d1768af64a913bd9188923029e0b0edf7e420d5aad7bdde278d6c24c4f40029fddbad28d8e02 diff --git a/sys-apps/baselayout/baselayout-2.12.ebuild b/sys-apps/baselayout/baselayout-2.13.ebuild similarity index 96% rename from sys-apps/baselayout/baselayout-2.12.ebuild rename to sys-apps/baselayout/baselayout-2.13.ebuild index 845f7f7a8dfb..97ceb30c3290 100644 --- a/sys-apps/baselayout/baselayout-2.12.ebuild +++ b/sys-apps/baselayout/baselayout-2.13.ebuild @@ -21,19 +21,6 @@ IUSE="build +split-usr" RDEPEND="!sys-apps/baselayout-prefix" -pkg_pretend() { - local stop= - if [[ ! -L ${EROOT}/var/run ]] && [[ -d ${EROOT}/var/run ]]; then - eerror "${EROOT}/var/run must be a symlink to ${EROOT}/run" - stop=1 - fi - if [[ ! -L ${EROOT}/var/lock ]] && [[ -d ${EROOT}/var/lock ]]; then - eerror "${EROOT}/var/lock must be a symlink to ${EROOT}/run/lock" - stop=1 - fi - [[ -z ${stop} ]] || die "please fix this before emerging baselayout" -} - pkg_setup() { multilib_layout } @@ -378,4 +365,12 @@ pkg_postinst() { ewarn "${EROOT}/etc/env.d/00basic is now ${EROOT}/etc/env.d/50baselayout" ewarn "Please migrate your changes." fi + + # Restore /var/run and /var/lock if we just removed them from 2.11 or 2.12 + if [[ ! -L ${EROOT}/var/run && ! -e ${EROOT}/var/run ]]; then + ln -s ../run "${EROOT}"/var/run + fi + if [[ ! -L ${EROOT}/var/lock && ! -e ${EROOT}/var/lock ]]; then + ln -s ../run/lock "${EROOT}"/var/lock + fi }