From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 2732715800F for ; Sat, 28 Jan 2023 02:17:43 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 53F05E0843; Sat, 28 Jan 2023 02:17:42 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 361BEE0843 for ; Sat, 28 Jan 2023 02:17:42 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3CF83341151 for ; Sat, 28 Jan 2023 02:17:41 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D9052771 for ; Sat, 28 Jan 2023 02:17:38 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1674872253.3dcff3b5a60cd6fbead3da67835600db188b6972.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/baselayout/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/baselayout/Manifest sys-apps/baselayout/baselayout-2.12.ebuild sys-apps/baselayout/baselayout-2.13.ebuild X-VCS-Directories: sys-apps/baselayout/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: 3dcff3b5a60cd6fbead3da67835600db188b6972 X-VCS-Branch: master Date: Sat, 28 Jan 2023 02:17:38 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: fb9e02c5-5cb9-4b3e-b9ab-e17a1cecd987 X-Archives-Hash: 18d3b99c4fd53274f10a8387715cee79 commit: 3dcff3b5a60cd6fbead3da67835600db188b6972 Author: Mike Gilbert gentoo org> AuthorDate: Sat Jan 28 02:16:54 2023 +0000 Commit: Mike Gilbert gentoo 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 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 }