[gentoo-commits] repo/gentoo:master commit in: sys-apps/baselayout/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Mike Gilbert" <floppym@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/baselayout/
Date: Sat, 28 Jan 2023 02:17:38 +0000 (UTC)	[thread overview]
Message-ID: <1674872253.3dcff3b5a60cd6fbead3da67835600db188b6972.floppym@gentoo> (raw)

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
 }

next             reply	other threads:[~2023-01-28  2:17 UTC|newest]

Thread overview: 128+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-01-28  2:17 Mike Gilbert [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-10-01 20:02 [gentoo-commits] repo/gentoo:master commit in: sys-apps/baselayout/ Sam James
2025-09-14 15:37 Mike Gilbert
2025-09-14  6:34 Sam James
2025-06-17  3:28 Sam James
2024-11-04 19:54 Mike Gilbert
2024-11-04 19:52 Mike Gilbert
2024-11-03 23:37 Mike Gilbert
2024-04-30 18:52 Arthur Zamarin
2024-03-12  1:43 Mike Gilbert
2024-02-15 21:17 William Hubbs
2024-02-09 12:18 Andreas K. Hüttel
2024-02-08 17:37 Mike Gilbert
2023-12-15  7:14 Sam James
2023-11-12 10:38 Fabian Groffen
2023-08-22 16:09 William Hubbs
2023-08-22 16:09 William Hubbs
2023-08-21 22:47 William Hubbs
2023-08-19  6:23 Sam James
2023-07-18 22:41 Sam James
2023-07-18 22:41 Sam James
2023-07-18 22:41 Sam James
2023-07-09  1:32 Mike Gilbert
2023-07-09  1:32 Mike Gilbert
2023-07-05  0:41 Mike Gilbert
2023-03-04  5:34 Arthur Zamarin
2023-01-29  0:10 William Hubbs
2023-01-29  0:10 William Hubbs
2023-01-28 22:14 William Hubbs
2023-01-28 22:14 William Hubbs
2023-01-28 22:06 William Hubbs
2023-01-28 22:06 William Hubbs
2023-01-28 21:00 Mike Gilbert
2023-01-28  0:38 Mike Gilbert
2023-01-28  0:20 William Hubbs
2023-01-28  0:08 William Hubbs
2023-01-27 22:38 Mike Gilbert
2023-01-27 21:47 William Hubbs
2023-01-27 18:21 William Hubbs
2023-01-27 18:19 William Hubbs
2023-01-27 17:30 William Hubbs
2023-01-26  3:51 William Hubbs
2023-01-26  0:13 William Hubbs
2023-01-24 22:58 Andreas K. Hüttel
2023-01-04  6:37 William Hubbs
2023-01-04  6:21 William Hubbs
2022-11-14 21:03 Mike Gilbert
2022-11-14 20:26 Arthur Zamarin
2022-09-18 21:50 William Hubbs
2022-09-18  3:12 Mike Gilbert
2022-07-17 15:50 Fabian Groffen
2022-07-14 19:30 Fabian Groffen
2022-05-28 21:01 William Hubbs
2022-05-28 20:59 Jakov Smolić
2022-01-04 10:30 David Seifert
2022-01-04  3:29 Sam James
2021-11-15  9:27 Jakov Smolić
2021-09-29  0:19 William Hubbs
2021-09-28 17:59 William Hubbs
2021-09-27 22:09 William Hubbs
2021-09-27 20:58 William Hubbs
2021-09-27 20:38 William Hubbs
2021-09-27 20:10 William Hubbs
2021-09-27 18:28 William Hubbs
2021-09-25 22:37 William Hubbs
2021-09-24 23:15 William Hubbs
2021-09-24 21:16 William Hubbs
2021-09-24 19:11 William Hubbs
2021-06-12 19:43 Andreas K. Hüttel
2021-05-12 20:11 William Hubbs
2021-04-16 16:38 William Hubbs
2021-04-16 16:26 William Hubbs
2020-11-14 17:07 William Hubbs
2020-08-30 21:59 Sam James
2020-08-30 21:51 Sam James
2020-08-20 15:28 William Hubbs
2020-08-20 14:51 William Hubbs
2020-08-20 14:47 William Hubbs
2020-02-17  2:39 William Hubbs
2020-02-10  4:31 William Hubbs
2020-02-10  4:31 William Hubbs
2020-02-08 14:18 David Seifert
2019-10-16 18:29 William Hubbs
2019-05-04 18:36 Mikle Kolyada
2019-03-03 18:54 William Hubbs
2018-11-30 12:14 Jeroen Roovers
2018-11-12 11:13 Lars Wendler
2018-11-08  0:15 William Hubbs
2018-07-25 16:36 William Hubbs
2018-07-22 16:47 William Hubbs
2018-05-31 20:03 William Hubbs
2018-05-29  0:53 William Hubbs
2018-05-28 20:19 William Hubbs
2018-05-28 20:14 William Hubbs
2018-05-24 17:13 William Hubbs
2018-05-24 15:49 William Hubbs
2018-05-24  3:36 William Hubbs
2018-05-23 22:06 William Hubbs
2018-05-23 21:28 William Hubbs
2018-03-20 21:24 William Hubbs
2018-03-19 18:46 William Hubbs
2018-02-07 19:51 William Hubbs
2018-02-07  0:20 William Hubbs
2018-02-06 18:57 William Hubbs
2018-01-12  4:19 Mike Frysinger
2017-12-10 21:41 Michał Górny
2017-11-17 22:23 William Hubbs
2017-10-06 19:02 William Hubbs
2017-10-03 18:00 William Hubbs
2017-10-03 17:50 William Hubbs
2017-10-03 15:48 William Hubbs
2017-10-02 18:28 William Hubbs
2017-09-04  6:27 Benda XU
2017-08-09 18:59 Tim Harder
2017-08-09  9:19 Guilherme Amadio
2017-06-09 18:44 William Hubbs
2017-01-20 16:14 Mike Frysinger
2017-01-17 16:23 Lars Wendler
2016-12-21 11:23 Thomas Deutschmann
2016-12-17 10:15 Aaron Bauman
2016-10-26 16:44 Markus Meier
2016-10-12 10:08 Jeroen Roovers
2016-10-04  7:37 Tobias Klausmann
2016-09-03 11:06 Michał Górny
2016-09-03 11:06 Michał Górny
2016-09-01 21:44 William Hubbs
2016-08-24  1:26 William Hubbs
2016-06-30  3:00 Benda XU

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:97df516f916 dfblob:294492d1164 dfblob:845f7f7a8df
dfblob:97ceb30c329 )
 OR (
bs:"[gentoo-commits] repo/gentoo:master commit in: sys-apps/baselayout/" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1674872253.3dcff3b5a60cd6fbead3da67835600db188b6972.floppym@gentoo \
    --to=floppym@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox