Gentoo Archives: gentoo-commits

From: "Nathan Phillip Brink (binki)" <binki@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-text/discount: discount-2.1.6-r1.ebuild ChangeLog discount-2.1.6.ebuild
Date: Wed, 31 Jul 2013 04:00:26
Message-Id: 20130731040020.BDF932171C@flycatcher.gentoo.org
1 binki 13/07/31 04:00:20
2
3 Modified: ChangeLog
4 Added: discount-2.1.6-r1.ebuild
5 Removed: discount-2.1.6.ebuild
6 Log:
7 Use prefix of “discount-” instead of “mkd” for overly-generic binary names to match the prefix chosen in fedora.
8
9 (Portage version: 2.2.0_alpha177-r1/cvs/Linux x86_64, signed Manifest commit with key 743A52E86BA81050)
10
11 Revision Changes Path
12 1.2 app-text/discount/ChangeLog
13
14 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/discount/ChangeLog?rev=1.2&view=markup
15 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/discount/ChangeLog?rev=1.2&content-type=text/plain
16 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/discount/ChangeLog?r1=1.1&r2=1.2
17
18 Index: ChangeLog
19 ===================================================================
20 RCS file: /var/cvsroot/gentoo-x86/app-text/discount/ChangeLog,v
21 retrieving revision 1.1
22 retrieving revision 1.2
23 diff -u -r1.1 -r1.2
24 --- ChangeLog 29 Jul 2013 04:55:01 -0000 1.1
25 +++ ChangeLog 31 Jul 2013 04:00:20 -0000 1.2
26 @@ -1,6 +1,13 @@
27 # ChangeLog for app-text/discount
28 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
29 -# $Header: /var/cvsroot/gentoo-x86/app-text/discount/ChangeLog,v 1.1 2013/07/29 04:55:01 binki Exp $
30 +# $Header: /var/cvsroot/gentoo-x86/app-text/discount/ChangeLog,v 1.2 2013/07/31 04:00:20 binki Exp $
31 +
32 +*discount-2.1.6-r1 (31 Jul 2013)
33 +
34 + 31 Jul 2013; Nathan Phillip Brink <binki@g.o>
35 + +discount-2.1.6-r1.ebuild, -discount-2.1.6.ebuild:
36 + Use prefix of “discount-” instead of “mkd” for overly-generic binary names to
37 + match the prefix chosen in fedora.
38
39 *discount-2.1.6 (29 Jul 2013)
40
41
42
43
44 1.1 app-text/discount/discount-2.1.6-r1.ebuild
45
46 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/discount/discount-2.1.6-r1.ebuild?rev=1.1&view=markup
47 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/discount/discount-2.1.6-r1.ebuild?rev=1.1&content-type=text/plain
48
49 Index: discount-2.1.6-r1.ebuild
50 ===================================================================
51 # Copyright 1999-2013 Gentoo Foundation
52 # Distributed under the terms of the GNU General Public License v2
53 # $Header: /var/cvsroot/gentoo-x86/app-text/discount/discount-2.1.6-r1.ebuild,v 1.1 2013/07/31 04:00:20 binki Exp $
54
55 EAPI=5
56
57 inherit eutils multilib
58
59 DESCRIPTION="An implementation of John Gruber's Markdown text to html language written in C"
60 HOMEPAGE="http://www.pell.portland.or.us/~orc/Code/discount/"
61 SRC_URI="http://www.pell.portland.or.us/~orc/Code/${PN}/${P}.tar.bz2"
62
63 LICENSE="BSD"
64 SLOT="0"
65 KEYWORDS="~amd64 ~x86"
66 IUSE="minimal"
67
68 src_prepare() {
69 epatch "${FILESDIR}"/${P}-portage-multilib-CFLAGS.patch
70
71 # for QA, we remove the Makefile’s usage of install -s.
72 # Drop ldconfig invocation.
73 # Force “librarian.sh” to respect LDFLAGS ($FLAGS should have CFLAGS
74 # at that point).
75 sed -i \
76 -e '/INSTALL_PROGRAM/s,-s ,,' \
77 -e 's/\(LDCONFIG=\).*/\1:/' \
78 -e 's/\(.\)\$FLAGS/& \1$LDFLAGS/' \
79 configure.inc || die "sed configure.inc failed"
80
81 # Add LDFLAGS and CPPFLAGS hackily.
82 sed -i \
83 -e 's/^CC[ \t]*=.*/& $(CPPFLAGS)/' \
84 -e 's/^LFLAGS[ \t]*=.*/& $(LDFLAGS)/' \
85 Makefile.in || die "Cannot fix LDFLAGS and CPPFLAGS"
86 }
87
88 src_configure() {
89 ./configure.sh \
90 --libdir="${EPREFIX}"usr/"$(get_libdir)" \
91 --prefix="${EPREFIX}"usr \
92 --mandir="${EPREFIX}"usr/share/man \
93 --shared \
94 $(usex minimal '' --enable-all-features) \
95 || die
96 }
97
98 src_install() {
99 emake DESTDIR="${D}" $(usex minimal install install.everything)
100
101 DISCOUNT_EBUILD_RENAMED_BINARIES=()
102 local bin
103 for bin in "${ED}"usr/bin/*; do
104 [[ ${bin} = */markdown || ${bin} =~ ${PN}[^/]*$ ]] && continue
105 DISCOUNT_EBUILD_RENAMED_BINARIES+=(${bin##*/})
106 mv "${bin}" "${bin%/*}/${PN}-${bin##*/}" || die
107 mv "${ED}"usr/share/man/man1/{,${PN}-}${bin##*/}.1 || die
108 done
109 }
110
111 pkg_postinst() {
112 if [[ ${DISCOUNT_EBUILD_RENAMED_BINARIES} ]]; then
113 local bin
114 elog "Some discount binaries with overly-generic names have been"
115 elog "prefixed. Please see"
116 elog "https://github.com/Orc/discount/issues/81 for discussion."
117 for bin in "${DISCOUNT_EBUILD_RENAMED_BINARIES[@]}"; do
118 elog " Renamed '${bin}' to '${PN}-${bin}'."
119 done
120 fi
121 }