From a738387921b44792e192c36145e913304b74d472 Mon Sep 17 00:00:00 2001 From: Dmitry Date: Wed, 23 Aug 2017 13:11:28 +0300 Subject: app-text/discount: version bump to 2.2.2. This also enables pkg-config file generation. Drop unnecessary src_test() since all tests are fixed in new release. Gentoo-Bug: https://bugs.gentoo.org/628610 Closes: https://github.com/gentoo/gentoo/pull/5516 --- app-text/discount/Manifest | 2 +- app-text/discount/discount-2.2.0.ebuild | 70 --------------------------------- app-text/discount/discount-2.2.2.ebuild | 67 +++++++++++++++++++++++++++++++ app-text/discount/metadata.xml | 8 ++++ 4 files changed, 76 insertions(+), 71 deletions(-) delete mode 100644 app-text/discount/discount-2.2.0.ebuild create mode 100644 app-text/discount/discount-2.2.2.ebuild (limited to 'app-text/discount') diff --git a/app-text/discount/Manifest b/app-text/discount/Manifest index 394f7de24e47..9de50647c960 100644 --- a/app-text/discount/Manifest +++ b/app-text/discount/Manifest @@ -1,2 +1,2 @@ DIST discount-2.1.8a.tar.bz2 85161 SHA256 c01502f4eedba8163dcd30c613ba5ee238a068f75291be127856261727e03526 SHA512 a1eba7076a27da56136b8057189c5474a36bf11f8233cbae270c8a0cf9b070332b4dcdbbbecfbfbe1d8c19961ccaf87cee27ebe855c6bc6558d8ccc423553c96 WHIRLPOOL 5d7148f6c4e9f84a5290fffafa417c4684517df6fce0deec773beb2f89b4416b7849aa50351c27338653b8950b68c3c49ba223d31e347ad7562b0cb040761114 -DIST discount-2.2.0.tar.bz2 88387 SHA256 b25395c29c2c08836199eb2eae87b56e6b545e77f5fbf921678aa1dc0ddab9f3 SHA512 04b66496ca53a2ab73cba2a8f9d8e77efd13f318b188611aaaebc4fd036a02cd188aa712337df414ff3b7ac65d2ced17020085cae10338e8af47e5b9552d981a WHIRLPOOL 1b4f30e924c4f38bc0685eb78c609c461e282dd54c6f588098ffb86dc03330ab45c68340dea5dd965cd26b42771ffc379c9ef828bbfc3a79f593b75f483c3e1d +DIST discount-2.2.2.tar.bz2 89288 SHA256 ec7916731e3ef8516336333f8b7aa9e2af51e57c0017b1e03fa43f1ba6978f64 SHA512 67d882c0a334592230332815c543458b3c916a950bf7983f8a468fbc9f61154b4023d4bf451b76639fcb3a076506b48118f192a8e21f2535b3f49c7f081bbdf3 WHIRLPOOL 30ea10c83c54ffe43720486b8cec652d5f0ed60263904f9a8f902baa9feef7fdb4abab4ee69f0be12311c0631b53dfd8816d40cd43e755f31a2afa0eb46a3c87 diff --git a/app-text/discount/discount-2.2.0.ebuild b/app-text/discount/discount-2.2.0.ebuild deleted file mode 100644 index d5834838024b..000000000000 --- a/app-text/discount/discount-2.2.0.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -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 ~ia64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="minimal 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,-s ,,' \ - -e 's/\(LDCONFIG=\).*/\1:/' \ - -e 's/\(.\)\$FLAGS/& \1$LDFLAGS/' \ - configure.inc || die "sed configure.inc failed" - - # Add LDFLAGS and CPPFLAGS hackily. - sed -i \ - -e 's/^CC[ \t]*=.*/& $(CPPFLAGS)/' \ - -e 's/^LFLAGS[ \t]*=.*/& $(LDFLAGS)/' \ - Makefile.in || die "Cannot fix LDFLAGS and CPPFLAGS" -} - -src_configure() { - local configure_call=( - ./configure.sh - --libdir="${EPREFIX}"usr/"$(get_libdir)" - --prefix="${EPREFIX}"usr - --mandir="${EPREFIX}"usr/share/man - --shared - $(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[@]} || die" - "${configure_call[@]}" || die -} - -src_test() { - # I can't get these to pass; might be fixed in the future. The rest - # work fine. - rm -rf tests/muñoz.t || die 'failed to remove failing tests' - default -} - -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.2.ebuild b/app-text/discount/discount-2.2.2.ebuild new file mode 100644 index 000000000000..a16f7b4e4025 --- /dev/null +++ b/app-text/discount/discount-2.2.2.ebuild @@ -0,0 +1,67 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +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 ~ia64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="minimal 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,-s ,,' \ + -e 's/\(LDCONFIG=\).*/\1:/' \ + -e 's/\(.\)\$FLAGS/& \1$LDFLAGS/' \ + configure.inc || die "sed configure.inc failed" + + # Add LDFLAGS and CPPFLAGS hackily. + sed -i \ + -e 's/^CC[ \t]*=.*/& $(CPPFLAGS)/' \ + -e 's/^LFLAGS[ \t]*=.*/& $(LDFLAGS)/' \ + Makefile.in || die "Cannot fix LDFLAGS and CPPFLAGS" +} + +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[@]}" + "${configure_call[@]}" || die +} + +src_install() { + emake \ + DESTDIR="${D}" \ + $(usex minimal install install.everything) \ + SAMPLE_PFX="${PN}-" + + insinto /usr/$(get_libdir)/pkgconfig + doins libmarkdown.pc +} + +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/metadata.xml b/app-text/discount/metadata.xml index 097975e3adc2..f5a6787777d1 100644 --- a/app-text/discount/metadata.xml +++ b/app-text/discount/metadata.xml @@ -1,4 +1,12 @@ + + reagentoo@gmail.com + Dmitry Baranov + + + proxy-maint@gentoo.org + Proxy Maintainers + -- cgit v1.2.3-65-gdbad