Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/static-dev/
Date: Sat, 27 Aug 2022 23:00:04
Message-Id: 1661619670.9e6bd0b440cda7abd4452fb87013a8e6819ef0a3.sam@gentoo
1 commit: 9e6bd0b440cda7abd4452fb87013a8e6819ef0a3
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Sat Aug 27 17:01:10 2022 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Sat Aug 27 17:01:10 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e6bd0b4
7
8 sys-fs/static-dev: fix EbuildReservedName
9
10 Signed-off-by: Sam James <sam <AT> gentoo.org>
11
12 sys-fs/static-dev/static-dev-0.1-r2.ebuild | 8 ++++----
13 1 file changed, 4 insertions(+), 4 deletions(-)
14
15 diff --git a/sys-fs/static-dev/static-dev-0.1-r2.ebuild b/sys-fs/static-dev/static-dev-0.1-r2.ebuild
16 index ca46b76ab1e5..c915e4e6bc45 100644
17 --- a/sys-fs/static-dev/static-dev-0.1-r2.ebuild
18 +++ b/sys-fs/static-dev/static-dev-0.1-r2.ebuild
19 @@ -1,4 +1,4 @@
20 -# Copyright 1999-2021 Gentoo Authors
21 +# Copyright 1999-2022 Gentoo Authors
22 # Distributed under the terms of the GNU General Public License v2
23
24 EAPI=7
25 @@ -13,7 +13,7 @@ KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
26 RDEPEND="sys-apps/makedev"
27
28 pkg_pretend() {
29 - abort() {
30 + bailout() {
31 eerror "We have detected that you currently use udev or devfs or devtmpfs"
32 eerror "and this ebuild cannot install to the same mount-point."
33 die "Cannot install on udev/devfs tmpfs."
34 @@ -26,13 +26,13 @@ pkg_pretend() {
35
36 # We want to not clobber udev (tmpfs) or older devfs setups.
37 if [[ -d ${ROOT}/dev/.udev || -c ${ROOT}/dev/.devfs ]] ; then
38 - abort
39 + bailout
40 fi
41
42 # We also want to not clobber newer devtmpfs setups.
43 if [[ -z ${ROOT} ]] && \
44 ! awk '$2 == "/dev" && $3 == "devtmpfs" { exit 1 }' /proc/mounts ; then
45 - abort
46 + bailout
47 fi
48 }