gentoo auto-resync : 16:02:2023 - 14:04:41

3 files changed, 72 insertions, 6 deletions

diff --git a/app-text/discount/Manifest b/app-text/discount/Manifest
index 8731499a2623..da4563a8db2e 100644
--- a/app-text/discount/Manifest
+++ b/app-text/discount/Manifest
@@ -1,5 +1,7 @@
 DIST discount-2.2.7b.tar.bz2 102685 BLAKE2B 1af4d47248e4a65ea1517b03d0b1a0b15eb79bdb7d1f00779515e2a1113b2a923f5d9e5d0a93d63cfc6c7257f11d3825d9baa55c7f2252fe3d2513785ab67ae3 SHA512 d68ffb85ae3e6d6ce8a2e506609bd4cb042617e350d113dd632a1ed81adb0b076df75ca4e70e97d43f3a3a2907555a9f28087a3762f41806289c526af3c55806
-DIST discount-3.0.0a_p20230126.tar.gz 140311 BLAKE2B 26858c25506dfd68f20d988ca425c0153887bae9574fa3b90b36bc97d90d78e58a4e43cc08ec4a91382015ec7f9e605eb743e98353a8029adcfad5ffb63c948e SHA512 888fc6fd530d1ae970d9b376243f2628113bce847855cfb595a174f7cb6f1bdb55939f686cc65b3b6e3ed4aa1a9b54db77c2c842e4b045ffb69304eb39a15899
+DIST discount-2.2.7c.tar.gz 133282 BLAKE2B 3258cfa34d58ef5944ae5282f6df061b8183bccc1ca7f9f3a39b3c001a8b86a4deb86b80d109d937e334b2773e5065a0f6c212ac7a79317ce2ae665778a023e2 SHA512 2a959fb24d7291b3a8c6d659b5c904b8c2f8b6d9b0666e998ca5313533cc25898b9c2114f7922272f3bc6b9bfe4bc486fe08c620b4cb2a2282624e128dc92781
+DIST discount-3.0.0a.tar.gz 140250 BLAKE2B 1e89f9c58c4d90157a9ccd925b89f098538c93191937e86eeefd32810e937feb78b6eeab96aead029fc35e4bf6699a40f67bdceb3c2d70fdc645fcd14091a3e7 SHA512 d86bfc6d3e11131622046418a1f54bd9dfa5f1233e510189cd2c89dc857da31e88ffbe6670cc506ca8b9763e8fb74ed215f1018f83e25767c77acb8a7c296b8a
 EBUILD discount-2.2.7b.ebuild 1652 BLAKE2B a55d28855b085b98046b7a5fc96c2444b6b6bd3ff788d52d4f0295c583da5aa4e69c9c1f2e48c08db88d2d16bb41f8a9311327dd5e61f746eaa5ad211d2d9d09 SHA512 76a08e533fbe813ae67e9214afa28be89fefba084ed5ad6476ba18c21bb4f88ced2b5a8c3f1813b003cb54c924363e6243e20f189e4fb7f1bbb1a90ae80ae0c1
-EBUILD discount-3.0.0a_p20230126.ebuild 1750 BLAKE2B 6da10ab18e0137972c0cfbf664b6144efc817d3269af089b7be89e01565ef04161e6a1a0bf5cb486dd68bcc3667d567faf29070f417977af740d3a033fce71ba SHA512 16f159317d3c96daa0bbdbff7eb1c9a1389e371dc4050dda0734fa13b20d51804a8d86b36367d8be4e76de63caa54a3f20056194114715d20866fe78aa2f0148
+EBUILD discount-2.2.7c.ebuild 1667 BLAKE2B b3edb96a39e67ad127bc2adf1327b4209d349649deee6f1c3846bde033e83de1283a3a30e46f919aedf41f28729634c64c9cec18dfe45c9b01f4f5c8ff3e29af SHA512 3dc83001bc31556bea852484a1f282f01fe0e29701b173895da2ecb0a37c780ab8a9f2a0bd133e996699c69a0c7e3bd84f17f7acfdd9a16fc81399e98078f9d6
+EBUILD discount-3.0.0a.ebuild 1667 BLAKE2B bafdb06df50ca341f6f40c8c0567c4a2032587546da1a286ed84a439d3ad98689494f84e478b0649034018b864ab6043a7e7e91b1c39f4c4f008d91cc4ceb7ee SHA512 844df1f7aba5a69316bb9e93da213869840c8bb1d0357f20d5499381800cfec8882d643759769799d1a58b92d22050eb5f5e0f053dd0d55607a9df4dc710ef6c
 MISC metadata.xml 322 BLAKE2B 579c1b4246170535bd97f123753663f46b753605fb7c90fe7ccb840fa2cd68264ad3b8c88641188e09d4b1ffba3db4658a510b39de48a99248c9bd356e941de0 SHA512 1ea9b286478e3b2aa48988c63fc275916eba1dabf1d589d14bf3ef1b8c266d0d6c8729076b5a4c89579de816289a82d32ad28e6a1b5b89902f57870f9da89c57
diff --git a/app-text/discount/discount-2.2.7c.ebuild b/app-text/discount/discount-2.2.7c.ebuild
new file mode 100644
index 000000000000..6472ea525508
--- /dev/null
+++ b/app-text/discount/discount-2.2.7c.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2023 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="https://github.com/Orc/discount/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/2.2.7"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="minimal test"
+RESTRICT="!test? ( test )"
+
+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-3.0.0a_p20230126.ebuild b/app-text/discount/discount-3.0.0a.ebuild
index 511c1685a741..4da7a0c94b27 100644
--- a/app-text/discount/discount-3.0.0a_p20230126.ebuild
+++ b/app-text/discount/discount-3.0.0a.ebuild
@@ -2,13 +2,12 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-COMMIT=5d13c2828da3567210b370bfd8555fdcf01d70bd
 
 inherit toolchain-funcs
 
 DESCRIPTION="A Markdown-to HTML translator written in C"
 HOMEPAGE="http://www.pell.portland.or.us/~orc/Code/discount/"
-SRC_URI="https://github.com/Orc/discount/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/Orc/discount/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/3.0.0"
@@ -16,8 +15,6 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="minimal test"
 RESTRICT="!test? ( test )"
 
-S="${WORKDIR}/${PN}-${COMMIT}"
-
 src_prepare() {
 	default