gentoo resync : 02.09.2020

3 files changed, 75 insertions, 5 deletions

diff --git a/app-text/discount/Manifest b/app-text/discount/Manifest
index 63f3c1957d62..6ce59655fd49 100644
--- a/app-text/discount/Manifest
+++ b/app-text/discount/Manifest
@@ -1,6 +1,8 @@
-AUX gethopt-undefined.patch 518 BLAKE2B aedc512451453d3e09d8572bbd3d2304947487553ba02b61b365f954b8cedd3ecc6a4ab2a5e35ef08985fbdf28d1a31894c38ad5916b83794c31c1bad37c882b SHA512 39f3eea0b1c9e1e0b4d34a09ef2aebb787088608b078c593fd02ca7ba715cf6cf114e8ae9ebc263945ebc8d9d1ef6fc00c9e749481d637a884d3ded3f7712af3
+AUX gethopt-undefined.patch 358 BLAKE2B ccc264eece330bc0c8979731410488b070c91e73381ed4f00ff95f04c5f023948f304dd70c0f8ec4ff67abf266d80ce8931fa46f53486e2e0e003f151fbda4b7 SHA512 a7504f3ab60ff49b72e475e558e128522757874d4328abf7e488313dff7c2fc3650fffc12a03109601a14348f24f21a83ed0e83f9d6fe1176207ac2692800dc1
 DIST discount-2.2.4.tar.bz2 99482 BLAKE2B b04c372cef27d0a4a09a588eb66376dc70494eefe5c8a9e7aedb8075f081a6f32eafbb9671c29deea7d89128f4f30c93d38c17268eccbb1c917db6c1b7d3e040 SHA512 0650e0ce3f6948e3a30fdaa1a810e895f64621c55df46c7a5ed8755e65c1b718b7a1d1a1bfe0a87a3a59fbb13fca8907718f1aa095125a4b6e152602b8e490cf
 DIST discount-2.2.6.tar.bz2 102303 BLAKE2B 6ffcb64ff8889d79832b28db9a824e5a30bd194a6746dd08e4782cb4b7e60cf47c44f244884fc10372fc2b052fff7d70e6c263e6f4175829d1aedbc8c2ea15c6 SHA512 b67395afed0899563e28fdd2ddd5016d4f382b6b7e46612d12853d701ba191b90771d40e1223e24e3fbf497cad01fdd2e1c67a6b2bf4f6cf082f3fbe981bd002
+DIST discount-2.2.7.tar.bz2 102277 BLAKE2B 58ec3bce2b8fc41a090d9b81b4326cbf54e36bf774f4f9ef63c2a2b1d34ba464e9f0a021f19b4fef165da426742af3045a631af005371d1a8a4cd81dc0be3367 SHA512 1b61eb7c625bb50da0dbe97350a0ccbb15930ccaef449c4b4659950907bce3c0564dabf20578379a7fdd0e375f5d4d5b61acd34db474a85e942b60373688bd08
 EBUILD discount-2.2.4.ebuild 1821 BLAKE2B f4a6861947e64cff3200ecddbc162543df545cc6b06fb87394c6f5a64d1637c11cafea16db2417352e33600ff6e946e5250bf0feb15c29c6cea130dee72eb663 SHA512 0a73f39f35c11fb0dc7f5321ee754516db1f24e4b1c9dbf831dd9cc3be248ede956093c1b04360b11edca04f5d33f5ee45c18537cefbe3f9ff9b5ac39cafc75f
 EBUILD discount-2.2.6.ebuild 1695 BLAKE2B cfbbb57f39a7da1c13a3aa259ad7cf104c5878eed9fe693e43abd0b755a218f203ed4feb25c8f226159d6ae2b3d3ff6a41a04c9c9570d81acd8a166bc278ef89 SHA512 1e15684ee950a536168ac56806138e49dc473d2f5e525dde90dd4bb7113340a6e9022f38a72690e24b852d5f1db80768f203e33b8f43410c5bf794a2878ccdcc
+EBUILD discount-2.2.7.ebuild 1695 BLAKE2B cfbbb57f39a7da1c13a3aa259ad7cf104c5878eed9fe693e43abd0b755a218f203ed4feb25c8f226159d6ae2b3d3ff6a41a04c9c9570d81acd8a166bc278ef89 SHA512 1e15684ee950a536168ac56806138e49dc473d2f5e525dde90dd4bb7113340a6e9022f38a72690e24b852d5f1db80768f203e33b8f43410c5bf794a2878ccdcc
 MISC metadata.xml 244 BLAKE2B 24ebafa89c32f799b62237b0d9442143de8ccb86c1625f2a49dd91ec9caa63cadc52000005b5b5ef148df89e907e1407330a8d8411ffb5f4facaf629a3184cb8 SHA512 d7a2290eb2970ef7fb9bea275b209c7ace388daadcf3e317b099767d72c7d9f0b894e23492f02e973d27010a7568e48549e4f502c9628efc3133012680304784
diff --git a/app-text/discount/discount-2.2.7.ebuild b/app-text/discount/discount-2.2.7.ebuild
new file mode 100644
index 000000000000..9cb5d5ea9f15
--- /dev/null
+++ b/app-text/discount/discount-2.2.7.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+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 ~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/files/gethopt-undefined.patch b/app-text/discount/files/gethopt-undefined.patch
index 5b081877a7a2..b74e2e79bc1a 100644
--- a/app-text/discount/files/gethopt-undefined.patch
+++ b/app-text/discount/files/gethopt-undefined.patch
@@ -1,12 +1,11 @@
-diff -aur discount-2.2.6/Makefile.in discount-2.2.6-new/Makefile.in
---- discount-2.2.6/Makefile.in	2019-04-16 03:28:20.000000000 +1200
-+++ discount-2.2.6-new/Makefile.in	2020-06-21 07:39:32.256757588 +1200
+--- 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)
++pandoc_headers: pandoc_headers.o $(MKDLIB) $(COMMON)
  	$(LINK) -o pandoc_headers pandoc_headers.o $(COMMON) -lmarkdown 
  
  branch.o: tools/branch.c config.h