gentoo resync : 29.12.2022

4 files changed, 2 insertions, 85 deletions

diff --git a/app-text/discount/Manifest b/app-text/discount/Manifest
index 6416079c0aec..a8bc55c01040 100644
--- a/app-text/discount/Manifest
+++ b/app-text/discount/Manifest
@@ -1,6 +1,3 @@
-AUX gethopt-undefined.patch 358 BLAKE2B ccc264eece330bc0c8979731410488b070c91e73381ed4f00ff95f04c5f023948f304dd70c0f8ec4ff67abf266d80ce8931fa46f53486e2e0e003f151fbda4b7 SHA512 a7504f3ab60ff49b72e475e558e128522757874d4328abf7e488313dff7c2fc3650fffc12a03109601a14348f24f21a83ed0e83f9d6fe1176207ac2692800dc1
-DIST discount-2.2.7.tar.bz2 102277 BLAKE2B 58ec3bce2b8fc41a090d9b81b4326cbf54e36bf774f4f9ef63c2a2b1d34ba464e9f0a021f19b4fef165da426742af3045a631af005371d1a8a4cd81dc0be3367 SHA512 1b61eb7c625bb50da0dbe97350a0ccbb15930ccaef449c4b4659950907bce3c0564dabf20578379a7fdd0e375f5d4d5b61acd34db474a85e942b60373688bd08
 DIST discount-2.2.7b.tar.bz2 102685 BLAKE2B 1af4d47248e4a65ea1517b03d0b1a0b15eb79bdb7d1f00779515e2a1113b2a923f5d9e5d0a93d63cfc6c7257f11d3825d9baa55c7f2252fe3d2513785ab67ae3 SHA512 d68ffb85ae3e6d6ce8a2e506609bd4cb042617e350d113dd632a1ed81adb0b076df75ca4e70e97d43f3a3a2907555a9f28087a3762f41806289c526af3c55806
-EBUILD discount-2.2.7-r2.ebuild 1697 BLAKE2B f6a68291682e44d6adfa9fdb40fe7e1c1bbac2c0981fd86f223344053c6510b27b4c734613c0acc4f29b31f5ffc862924ceaeda442fc7a52f27f111d6ce7e882 SHA512 cd1653e485b7785f630017210eb5268ac7c42c362cd95e2bea38f977f99c79cfd3aef8c35aa292d6764868f404bb74f77b068596a3b17c7001488c7a0c761308
-EBUILD discount-2.2.7b.ebuild 1652 BLAKE2B 1f103a53134e6efdf07f512fd512f8d88cb022d5b2592de6eed09262de304106681e145387f3df96a3a9020b417e2c220aa6b7a1005011a7a17e7eab4ee428c5 SHA512 7aea9488cb0e4ea7d5d769c115f85ee8c7f38aa4e639bc673690de6574b88be50fe86cdf37fd9749cba68160a5cd616d00ca24a2dc3a41abe695b4e2dc777044
+EBUILD discount-2.2.7b.ebuild 1646 BLAKE2B 8899290dcd57c89c75f9b0f43f05d78ff4a118170b276336121d33a135bbad9d442efec9a5638ee89aeb2310b50fd560bf4f5983d23cdca64b8129e7a1aaa9cd SHA512 dad24beffca897253cba4be15436e2637666843ff88742009fc7d521b54234c771a53bf12fe1948ad3e12c1a4e52acf676e9d6f3ccd6c84347982402b2072f65
 MISC metadata.xml 245 BLAKE2B 4988fa1366a9b8a3769e503545339cdd493a0bdc362ca9237b158b94549de1f061477546b00fd3b21dc9325812423f7207071e22e3234d5c0b88c755197557d2 SHA512 e00be68ab9ad3acfce3d2d48721c47cf50e2c6358c9ceb45a2a23fc5303826ea26b9205ce4f230121c2e40c9c467367f2dc57863680899b21e8005034aa9118c
diff --git a/app-text/discount/discount-2.2.7-r2.ebuild b/app-text/discount/discount-2.2.7-r2.ebuild
deleted file mode 100644
index 10730afd7a96..000000000000
--- a/app-text/discount/discount-2.2.7-r2.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-DESCRIPTION="A Markdown-to HTML translator written in C"
-HOMEPAGE="http://www.pell.portland.or.us/~orc/Code/discount/"
-SRC_URI="http://www.pell.portland.or.us/~orc/Code/${PN}/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86"
-IUSE="minimal test"
-RESTRICT="!test? ( test )"
-
-PATCHES=( "${FILESDIR}"/gethopt-undefined.patch )
-
-src_prepare() {
-	default
-
-	# for QA, we remove the Makefile’s usage of install -s.
-	# Drop ldconfig invocation.
-	# Force “librarian.sh” to respect LDFLAGS ($FLAGS should have CFLAGS
-	# at that point).
-	sed -i \
-		-e '/INSTALL_PROGRAM/s,\$_strip ,,' \
-		-e 's/\(LDCONFIG=\).*/\1:/' \
-		-e 's/\(.\)\$FLAGS/& \1$LDFLAGS/' \
-		configure.inc || die "sed configure.inc failed"
-}
-
-src_configure() {
-	local configure_call=(
-		./configure.sh
-		--libdir="${EPREFIX}/usr/$(get_libdir)"
-		--prefix="${EPREFIX}/usr"
-		--mandir="${EPREFIX}/usr/share/man"
-		--shared
-		--pkg-config
-		$(usex minimal '' --enable-all-features)
-		# Enable deterministic HTML generation behavior. Otherwise, will
-		# actually call rand() as part of its serialization code...
-		--debian-glitch
-	)
-	einfo "Running ${configure_call[@]}"
-	CC="$(tc-getCC)" AR="$(tc-getAR)" \
-	"${configure_call[@]}" || die
-}
-
-src_compile() {
-	emake libmarkdown
-	emake
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		$(usex minimal install install.everything) \
-		SAMPLE_PFX="${PN}-"
-}
-
-pkg_postinst() {
-	if ! use minimal; then
-		elog 'Sample binaries with overly-generic names have been'
-		elog "prefixed with \"${PN}-\"."
-	fi
-}
diff --git a/app-text/discount/discount-2.2.7b.ebuild b/app-text/discount/discount-2.2.7b.ebuild
index e496c2708756..e53c8e7547af 100644
--- a/app-text/discount/discount-2.2.7b.ebuild
+++ b/app-text/discount/discount-2.2.7b.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.pell.portland.or.us/~orc/Code/${PN}/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86"
 IUSE="minimal test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-text/discount/files/gethopt-undefined.patch b/app-text/discount/files/gethopt-undefined.patch
deleted file mode 100644
index b74e2e79bc1a..000000000000
--- a/app-text/discount/files/gethopt-undefined.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -139,7 +139,7 @@
- 
- pandoc_headers.o: tools/pandoc_headers.c config.h
- 	$(BUILD) -c -o pandoc_headers.o tools/pandoc_headers.c
--pandoc_headers: pandoc_headers.o
-+pandoc_headers: pandoc_headers.o $(MKDLIB) $(COMMON)
- 	$(LINK) -o pandoc_headers pandoc_headers.o $(COMMON) -lmarkdown 
- 
- branch.o: tools/branch.c config.h