From 79be8f00e2aa293669b8e22e1ef02d2d5c5f9e25 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Mon, 16 Jan 2023 17:57:56 +0000
Subject: gentoo auto-resync : 16:01:2023 - 17:57:56

---
 sys-apps/ed/Manifest          |  2 +-
 sys-apps/ed/ed-1.19-r1.ebuild | 58 +++++++++++++++++++++++++++++++++++++++++++
 sys-apps/ed/ed-1.19.ebuild    | 48 -----------------------------------
 3 files changed, 59 insertions(+), 49 deletions(-)
 create mode 100644 sys-apps/ed/ed-1.19-r1.ebuild
 delete mode 100644 sys-apps/ed/ed-1.19.ebuild

(limited to 'sys-apps/ed')

diff --git a/sys-apps/ed/Manifest b/sys-apps/ed/Manifest
index 9ddd1b8ed50e..6eaf9ff548b7 100644
--- a/sys-apps/ed/Manifest
+++ b/sys-apps/ed/Manifest
@@ -3,5 +3,5 @@ DIST ed-1.18.tar.lz.sig 72 BLAKE2B 9b498f1604d625c6b32ded636e0841ef384bf59c10ff0
 DIST ed-1.19.tar.lz 66448 BLAKE2B 139305a1d64e96f7eadcb462325918e5eee18de229ec8e1b3fac29dc9b8ef58ceea4cd7ffdbd3674fd7f421d90bc0c9e3557318eb57830d7cd46e579828fa95d SHA512 594d5cf895931783110ee1956078f6a77aee022fb67730cbc6f1d30521c120b97820a5eb349278575f85c4c1e17fea0e16a3bc22592edae53c6fd27941ee3d7e
 DIST ed-1.19.tar.lz.sig 72 BLAKE2B ada611148a6347d8953c65669b61f69eb0ed8d48f6dc4ffaab8975dd7e28f1d87e434493a77e817ca05874f741e243309529e60e95f2a7636148fa71c711f5e3 SHA512 03ff7cf2f337fdc94efaa1374ce95d37c29c556b2a9a13f7216e05e8e9e9efc95bcbb554bd05000b5283d5f20884f3f50b16f220fba8e6ff318b1b975c6a44c9
 EBUILD ed-1.18.ebuild 1183 BLAKE2B 23b5cb591455ad1c1dad946876f8b7b4297bc41ddc0cf7a909c83c8585a0f3144506f25495a043c0ade9f5e0501b4d2c7219b086917953059a92ae9f4f523110 SHA512 75bbec07b179c221e7399f709fca3e430a0c856f9acba11d65c5fe9c740c08526629ae85c3d302f2cedb285a071b54158341d7d63b2d6934fca3fe8bd820d5e2
-EBUILD ed-1.19.ebuild 1329 BLAKE2B 376b92f937cdafae376bc9c259a3b00431e9363c6459a693bdf92a297932d3124c4d9f137889dab64fe90e2302561a4480ae2fc5eb943a05d5e5b552df5ccf08 SHA512 f7f31316c09d8423f57d84063e577be55287482e30adb330f720d49c05d36c1d0c87a6e8e3ccd56b847ceb25ceeba88227d29bb73c966478f3daebd2767eacbd
+EBUILD ed-1.19-r1.ebuild 1720 BLAKE2B 5a5a46de12a7060ecbf4845fc32d71c22f275637ba0764d906d1e5ef5241a6e11c395c47662aa96ee1aef80e27bb40245f28038c02cc638ad9049603a48a6387 SHA512 88f11b0172ec7acef287bdc3239d054f59c07c2c4a9ca3d1cea3f6b2cb1d082a4542c0cf3dd21e4cbe8027ae8d356605cd3c1906380f1b0c57468edb81f184f4
 MISC metadata.xml 337 BLAKE2B 40506db26223e7d375b03972929e04e5684f0ee5d722248819d28d424daf9f2f4effd07a7491cdba9d77185712593fe8fd182c058bff2ff0ba4341aff383dc7d SHA512 5709e973094bd7fda825a3a223c04f8ce04ba9e2f609466c7cf56da4f62d4155562669bbfd808acd2f7db17434ca5871cdc50962a6bfdae3c4edeca1bb4736df
diff --git a/sys-apps/ed/ed-1.19-r1.ebuild b/sys-apps/ed/ed-1.19-r1.ebuild
new file mode 100644
index 000000000000..8f805d415665
--- /dev/null
+++ b/sys-apps/ed/ed-1.19-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2023 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/antoniodiazdiaz.asc
+inherit edo toolchain-funcs unpacker verify-sig
+
+MY_P="${PN}-${PV/_/-}"
+
+DESCRIPTION="Your basic line editor"
+HOMEPAGE="https://www.gnu.org/software/ed/"
+SRC_URI="
+	mirror://gnu/ed/${MY_P}.tar.lz
+	https://download.savannah.gnu.org/releases/ed/${MY_P}.tar.lz
+	verify-sig? (
+		mirror://gnu/ed/${MY_P}.tar.lz.sig
+		https://download.savannah.gnu.org/releases/ed/${MY_P}.tar.lz.sig
+	)
+"
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="GPL-2+"
+SLOT="0"
+if [[ ${PV} != *_rc* ]] ; then
+	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"
+fi
+
+# We don't use unpacker_src_uri_depends here right now because:
+# 1. unpacker_src_uri_depends doesn't flatten the deps (bug #891133) and emits
+# several || ( ... ) blocks (4).
+# 2. Portage doesn't handle several repeated identical || ( ...) blocks correctly
+# and takes ages to resolve (bug #891137). It should merge them together.
+BDEPEND="
+	sys-apps/texinfo
+	|| (
+		>=app-arch/xz-utils-5.4.0
+		app-arch/plzip
+		app-arch/pdlzip
+		app-arch/lzip
+	)
+	verify-sig? ( sec-keys/openpgp-keys-antoniodiazdiaz )
+"
+
+src_unpack() {
+	use verify-sig && verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.lz{,.sig}
+	unpacker "${DISTDIR}"/${MY_P}.tar.lz
+}
+
+src_configure() {
+	edo ./configure \
+		CC="$(tc-getCC)" \
+		CFLAGS="${CFLAGS}" \
+		LDFLAGS="${LDFLAGS}" \
+		CPPFLAGS="${CPPFLAGS}" \
+		--bindir="${EPREFIX}/bin" \
+		--prefix="${EPREFIX}/usr"
+}
diff --git a/sys-apps/ed/ed-1.19.ebuild b/sys-apps/ed/ed-1.19.ebuild
deleted file mode 100644
index 65951958803d..000000000000
--- a/sys-apps/ed/ed-1.19.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2023 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/antoniodiazdiaz.asc
-inherit edo toolchain-funcs unpacker verify-sig
-
-MY_P="${PN}-${PV/_/-}"
-
-DESCRIPTION="Your basic line editor"
-HOMEPAGE="https://www.gnu.org/software/ed/"
-SRC_URI="
-	mirror://gnu/ed/${MY_P}.tar.lz
-	https://download.savannah.gnu.org/releases/ed/${MY_P}.tar.lz
-	verify-sig? (
-		mirror://gnu/ed/${MY_P}.tar.lz.sig
-		https://download.savannah.gnu.org/releases/ed/${MY_P}.tar.lz.sig
-	)
-"
-S="${WORKDIR}"/${MY_P}
-
-LICENSE="GPL-2+"
-SLOT="0"
-if [[ ${PV} != *_rc* ]] ; then
-	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"
-fi
-
-BDEPEND="
-	sys-apps/texinfo
-	$(unpacker_src_uri_depends)
-	verify-sig? ( sec-keys/openpgp-keys-antoniodiazdiaz )
-"
-
-src_unpack() {
-	use verify-sig && verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.lz{,.sig}
-	unpacker "${DISTDIR}"/${MY_P}.tar.lz
-}
-
-src_configure() {
-	edo ./configure \
-		CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		CPPFLAGS="${CPPFLAGS}" \
-		--bindir="${EPREFIX}/bin" \
-		--prefix="${EPREFIX}/usr"
-}
-- 
cgit v1.2.3