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) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id EA16F158094 for ; Sat, 27 Aug 2022 23:00:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7CD3EE0636; Sat, 27 Aug 2022 23:00:09 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 pigeon.gentoo.org (Postfix) with ESMTPS id E6253E069C for ; Sat, 27 Aug 2022 23:00:08 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 5BB4834161B for ; Sat, 27 Aug 2022 17:03:13 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8376259E for ; Sat, 27 Aug 2022 17:03:11 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1661619670.9e6bd0b440cda7abd4452fb87013a8e6819ef0a3.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/static-dev/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-fs/static-dev/static-dev-0.1-r2.ebuild X-VCS-Directories: sys-fs/static-dev/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 9e6bd0b440cda7abd4452fb87013a8e6819ef0a3 X-VCS-Branch: master Date: Sat, 27 Aug 2022 17:03:11 +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: 5099c53e-3c74-4584-b84d-720f0dec6835 X-Archives-Hash: da3dc970f9ea88a1f8beb4afd2932db3 commit: 9e6bd0b440cda7abd4452fb87013a8e6819ef0a3 Author: Sam James gentoo org> AuthorDate: Sat Aug 27 17:01:10 2022 +0000 Commit: Sam James gentoo org> CommitDate: Sat Aug 27 17:01:10 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e6bd0b4 sys-fs/static-dev: fix EbuildReservedName Signed-off-by: Sam James gentoo.org> sys-fs/static-dev/static-dev-0.1-r2.ebuild | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys-fs/static-dev/static-dev-0.1-r2.ebuild b/sys-fs/static-dev/static-dev-0.1-r2.ebuild index ca46b76ab1e5..c915e4e6bc45 100644 --- a/sys-fs/static-dev/static-dev-0.1-r2.ebuild +++ b/sys-fs/static-dev/static-dev-0.1-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -13,7 +13,7 @@ KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86" RDEPEND="sys-apps/makedev" pkg_pretend() { - abort() { + bailout() { eerror "We have detected that you currently use udev or devfs or devtmpfs" eerror "and this ebuild cannot install to the same mount-point." die "Cannot install on udev/devfs tmpfs." @@ -26,13 +26,13 @@ pkg_pretend() { # We want to not clobber udev (tmpfs) or older devfs setups. if [[ -d ${ROOT}/dev/.udev || -c ${ROOT}/dev/.devfs ]] ; then - abort + bailout fi # We also want to not clobber newer devtmpfs setups. if [[ -z ${ROOT} ]] && \ ! awk '$2 == "/dev" && $3 == "devtmpfs" { exit 1 }' /proc/mounts ; then - abort + bailout fi }