[gentoo-commits] repo/gentoo:master commit in: sys-apps/sed/, sys-apps/sed/files/

[Sam James]

commit:     f2d65e46e675dd061336f8168e0a4f39aa299760
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 28 00:38:02 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Dec 28 00:38:02 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2d65e46

sys-apps/sed: drop 4.8, 4.8-r1

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-apps/sed/Manifest                              |  2 -
 .../files/sed-4.8-avoid-noreturn-diagnostic.patch  | 21 --------
 sys-apps/sed/sed-4.8-r1.ebuild                     | 60 ----------------------
 sys-apps/sed/sed-4.8.ebuild                        | 50 ------------------
 4 files changed, 133 deletions(-)

diff --git a/sys-apps/sed/Manifest b/sys-apps/sed/Manifest
index 6c15c512bef2..2ecd59ea0cf7 100644
--- a/sys-apps/sed/Manifest
+++ b/sys-apps/sed/Manifest
@@ -1,4 +1,2 @@
-DIST sed-4.8.tar.xz 1348048 BLAKE2B 62f6b6500cc9a20a35cafc2b09b12bb7da67fa0afb0b1b26153babc0023424b3126f44d29eba14c25fc4490996c90738b191c9440c66da6c120bbb9bc6f6df65 SHA512 7de25d9bc2981c63321c2223f3fbcab61d7b0df4fcf7d4394b72400b91993e1288d8bf53948ed5fffcf5a98c75265726a68ad4fb98e1d571bf768603a108c1c8
-DIST sed-4.8.tar.xz.sig 833 BLAKE2B 8e5b3c69a28ffbfa49ef6f769fbb72c6f1ec14e6e1e0cec3851d15d85e05560a8a74e28e037eefb916b10831b4afbe0e4735d713dc3b90d7d73de7d0b1176d0b SHA512 9b886bdbd18ee2d60608cee3fd2b4193a1b6c3309d887ee05828c14b89b7b515dbf042a9e0ebdd13e6ccfa42e3cd217a408c796d68c4ebedaaa64f795000f095
 DIST sed-4.9.tar.xz 1397092 BLAKE2B 6c7c7dc782b87c3bd0b5e826ba46c2f1dc7bd8c1159945fcf14b394711742964628774cf9f27d844b672721d7849e6c31992d82fafb9ed4118b7feb60406d1e1 SHA512 36157a4b4a2430cf421b7bd07f1675d680d9f1616be96cf6ad6ee74a9ec0fe695f8d0b1e1f0b008bbb33cc7fcde5e1c456359bbbc63f8aebdd4fedc3982cf6dc
 DIST sed-4.9.tar.xz.sig 833 BLAKE2B 256bb112aa3aec1a8d40544ef1b0a7570f35d66369047ed3d261c57f938042dcb4a169137eaed6639bcfb472e4a6fc6ebec2de243b2c4d4c0ba0e9081f92556d SHA512 ceb235850184b99017783486e182ade9db38313d20b2b34d23f54d8affe180f7a191139b993e8ec7718ca33eff732f547ca4b3b59aaf865feaae611dfeae5c46

diff --git a/sys-apps/sed/files/sed-4.8-avoid-noreturn-diagnostic.patch b/sys-apps/sed/files/sed-4.8-avoid-noreturn-diagnostic.patch
deleted file mode 100644
index d361780b548d..000000000000
--- a/sys-apps/sed/files/sed-4.8-avoid-noreturn-diagnostic.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-https://github.com/coreutils/gnulib/commit/0cc39712803ade7b2d4b89c36b143dad72404063
-
-From 0cc39712803ade7b2d4b89c36b143dad72404063 Sun Oct 18 00:00:00 2020
-From: Bruno Haible  <bruno@×××××.org>
-
-obstack: Fix a clang warning.
-* lib/obstack.c (print_and_abort): Mark as __attribute_noreturn__.
-
-diff --git a/lib/obstack.c b/lib/obstack.c
-index 6e82da054c..e6475a2a09 100644
---- a/lib/obstack.c
-+++ b/lib/obstack.c
-@@ -326,7 +326,7 @@ int obstack_exit_failure = EXIT_FAILURE;
- #   include <libio/iolibio.h>
- #  endif
- 
--static _Noreturn void
-+static __attribute_noreturn__ void
- print_and_abort (void)
- {
-   /* Don't change any of these strings.  Yes, it would be possible to add

diff --git a/sys-apps/sed/sed-4.8-r1.ebuild b/sys-apps/sed/sed-4.8-r1.ebuild
deleted file mode 100644
index de507fc75de2..000000000000
--- a/sys-apps/sed/sed-4.8-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/sed.asc
-inherit flag-o-matic verify-sig
-
-DESCRIPTION="Super-useful stream editor"
-HOMEPAGE="https://www.gnu.org/software/sed/"
-SRC_URI="mirror://gnu/sed/${P}.tar.xz"
-SRC_URI+=" verify-sig? ( mirror://gnu/sed/${P}.tar.xz.sig )"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="acl nls selinux static"
-
-RDEPEND="
-	!static? (
-		acl? ( virtual/acl )
-		nls? ( virtual/libintl )
-		selinux? ( sys-libs/libselinux )
-	)
-"
-DEPEND="${RDEPEND}
-	static? (
-		acl? ( virtual/acl[static-libs(+)] )
-		nls? ( virtual/libintl[static-libs(+)] )
-		selinux? ( sys-libs/libselinux[static-libs(+)] )
-	)
-"
-BDEPEND="nls? ( sys-devel/gettext )
-	verify-sig? ( sec-keys/openpgp-keys-sed )"
-
-PATCHES=(
-	"${FILESDIR}/${P}-avoid-noreturn-diagnostic.patch"
-)
-
-src_configure() {
-	use static && append-ldflags -static
-
-	local myconf=(
-		--exec-prefix="${EPREFIX}"
-		$(use_enable acl)
-		$(use_enable nls)
-		$(use_with selinux)
-		# rename to gsed for better BSD compatibility
-		--program-prefix=g
-	)
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-
-	# symlink to the standard name
-	dosym gsed /bin/sed
-	dosym gsed.1 /usr/share/man/man1/sed.1
-}

diff --git a/sys-apps/sed/sed-4.8.ebuild b/sys-apps/sed/sed-4.8.ebuild
deleted file mode 100644
index c756f9b2c1ca..000000000000
--- a/sys-apps/sed/sed-4.8.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/sed.asc
-inherit flag-o-matic verify-sig
-
-DESCRIPTION="Super-useful stream editor"
-HOMEPAGE="https://www.gnu.org/software/sed/"
-SRC_URI="mirror://gnu/sed/${P}.tar.xz"
-SRC_URI+=" verify-sig? ( mirror://gnu/sed/${P}.tar.xz.sig )"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="acl nls selinux static"
-
-RDEPEND="
-	!static? (
-		acl? ( virtual/acl )
-		nls? ( virtual/libintl )
-		selinux? ( sys-libs/libselinux )
-	)
-"
-DEPEND="${RDEPEND}
-	static? (
-		acl? ( virtual/acl[static-libs(+)] )
-		nls? ( virtual/libintl[static-libs(+)] )
-		selinux? ( sys-libs/libselinux[static-libs(+)] )
-	)
-"
-BDEPEND="nls? ( sys-devel/gettext )
-	verify-sig? ( sec-keys/openpgp-keys-sed )"
-
-PATCHES=(
-	"${FILESDIR}/${P}-avoid-noreturn-diagnostic.patch"
-)
-
-src_configure() {
-	use static && append-ldflags -static
-
-	local myconf=(
-		--exec-prefix="${EPREFIX}"
-		$(use_enable acl)
-		$(use_enable nls)
-		$(use_with selinux)
-	)
-	econf "${myconf[@]}"
-}