From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1472084-garchives=archives.gentoo.org@lists.gentoo.org>
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 49490158020
for <garchives@archives.gentoo.org>; Wed, 28 Dec 2022 00:33:04 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 7AC7CE0825;
Wed, 28 Dec 2022 00:33:03 +0000 (UTC)
Received: from smtp.gentoo.org (dev.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 6062FE0825
for <gentoo-commits@lists.gentoo.org>; Wed, 28 Dec 2022 00:33:03 +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 661E83410AA
for <gentoo-commits@lists.gentoo.org>; Wed, 28 Dec 2022 00:33:02 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 99BB87F1
for <gentoo-commits@lists.gentoo.org>; Wed, 28 Dec 2022 00:33:00 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
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" <sam@gentoo.org>
Message-ID: <1672187532.0a76df521dd7b668607ba7f366b853cd01adfc20.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: app-alternatives/awk/
X-VCS-Repository: repo/gentoo
X-VCS-Files: app-alternatives/awk/awk-1.ebuild app-alternatives/awk/awk-3.ebuild
X-VCS-Directories: app-alternatives/awk/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: 0a76df521dd7b668607ba7f366b853cd01adfc20
X-VCS-Branch: master
Date: Wed, 28 Dec 2022 00:33:00 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 21c68560-bc2f-4b76-8233-247924e8e7e0
X-Archives-Hash: 83b7612e6268c254a1594e97337f719d
commit: 0a76df521dd7b668607ba7f366b853cd01adfc20
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 27 23:51:17 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Dec 28 00:32:12 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a76df52
app-alternatives/awk: drop 1, 3
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-alternatives/awk/awk-1.ebuild | 19 ----------
app-alternatives/awk/awk-3.ebuild | 77 ---------------------------------------
2 files changed, 96 deletions(-)
diff --git a/app-alternatives/awk/awk-1.ebuild b/app-alternatives/awk/awk-1.ebuild
deleted file mode 100644
index cef6aea276d2..000000000000
--- a/app-alternatives/awk/awk-1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Virtual for awk implementation"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-LICENSE="metapackage"
-
-RDEPEND="
- || (
- >=sys-apps/gawk-4.0.1-r1
- sys-apps/mawk
- sys-apps/nawk
- sys-apps/busybox
- )"
diff --git a/app-alternatives/awk/awk-3.ebuild b/app-alternatives/awk/awk-3.ebuild
deleted file mode 100644
index 46ba60100171..000000000000
--- a/app-alternatives/awk/awk-3.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ALTERNATIVES=(
- gawk:sys-apps/gawk
- busybox:sys-apps/busybox
- mawk:sys-apps/mawk
- nawk:sys-apps/nawk
-)
-
-inherit app-alternatives
-
-DESCRIPTION="/bin/awk and /usr/bin/awk symlinks"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="split-usr"
-
-RDEPEND="
- !app-eselect/eselect-awk
-"
-
-src_install() {
- local alt=$(get_alternative)
- local root_prefix=
- use split-usr && root_prefix=../../bin/
-
- # We could consider setting AWK=... like we do for yacc & lex,
- # but it would need some testing with a fair amount of packages first,
- # as autoconf prefers gawk.
- case ${alt} in
- busybox)
- dosym "${root_prefix}busybox" /usr/bin/awk
- ;;
- *)
- dosym "${alt}" /usr/bin/awk
- ;;
- esac
-
- newman - awk.1 <<<".so ${alt}.1"
-
- if use split-usr; then
- dosym ../usr/bin/awk /bin/awk
- fi
-}
-
-pkg_preinst() {
- local v
- for v in ${REPLACING_VERSIONS}; do
- # if we are upgrading from a new enough version, leftover manpage
- # symlink cleanup was done already
- if ver_test "${v}" -ge 3; then
- return
- fi
- done
-
- # otherwise, remove leftover files/symlinks created by eselect-awk (sic!)
- shopt -s nullglob
- local files=( "${EROOT}"/usr/share/man/man1/awk.1* )
- shopt -u nullglob
-
- if [[ ${files[@]} ]]; then
- einfo "Cleaning up leftover manpage symlinks from eselect-awk ..."
- rm -v "${files[@]}" || die
- fi
-}
-
-pkg_postrm() {
- # make sure we don't leave the user without the symlinks, since
- # they've not been owned by any other package
- if [[ ! -h ${EROOT}/usr/bin/awk ]]; then
- ln -s gawk "${EROOT}/usr/bin/awk" || die
- fi
- if [[ ! -h ${EROOT}/bin/awk ]]; then
- ln -s ../usr/bin/awk "${EROOT}/bin/awk" || die
- fi
-}