Gentoo Archives: gentoo-commits

From: Michael Sterrett <mr_bones_@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/ftgl/
Date: Fri, 18 Dec 2015 08:18:07
Message-Id: 1450426647.81f45df63edf53aa496c08f66b933f39b298e954.mr_bones_@gentoo
1 commit: 81f45df63edf53aa496c08f66b933f39b298e954
2 Author: Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
3 AuthorDate: Fri Dec 18 08:04:55 2015 +0000
4 Commit: Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
5 CommitDate: Fri Dec 18 08:17:27 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81f45df6
7
8 EAPI=5; minor tidying
9
10 Package-Manager: portage-2.2.24
11
12 media-libs/ftgl/ftgl-2.1.3_rc5.ebuild | 22 +++++++++-------------
13 1 file changed, 9 insertions(+), 13 deletions(-)
14
15 diff --git a/media-libs/ftgl/ftgl-2.1.3_rc5.ebuild b/media-libs/ftgl/ftgl-2.1.3_rc5.ebuild
16 index c34e22f..bcd6d71 100644
17 --- a/media-libs/ftgl/ftgl-2.1.3_rc5.ebuild
18 +++ b/media-libs/ftgl/ftgl-2.1.3_rc5.ebuild
19 @@ -2,8 +2,7 @@
20 # Distributed under the terms of the GNU General Public License v2
21 # $Id$
22
23 -EAPI=4
24 -
25 +EAPI=5
26 inherit eutils flag-o-matic autotools
27
28 MY_PV=${PV/_/-}
29 @@ -24,29 +23,26 @@ DEPEND=">=media-libs/freetype-2.0.9
30 virtual/opengl
31 virtual/glu
32 media-libs/freeglut"
33 -RDEPEND="${DEPEND}"
34 +RDEPEND=${DEPEND}
35
36 S=${WORKDIR}/${MY_P2}
37
38 -DOCS="AUTHORS BUGS ChangeLog INSTALL NEWS README TODO docs/projects_using_ftgl.txt"
39 -
40 src_prepare() {
41 - epatch "${FILESDIR}"/${P}-gentoo.patch \
42 + epatch \
43 + "${FILESDIR}"/${P}-gentoo.patch \
44 "${FILESDIR}"/${P}-underlink.patch
45 -# AT_M4DIR=m4 eautoreconf
46 sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.ac || die
47 eautoreconf
48 }
49
50 src_configure() {
51 strip-flags # ftgl is sensitive - bug #112820
52 - econf \
53 - $(use_enable static-libs static)
54 + econf $(use_enable static-libs static)
55 }
56
57 src_install() {
58 - default
59 - rm -rf "${D}"/usr/share/doc/ftgl
60 -
61 - find "${ED}" -name '*.la' -exec rm -f {} +
62 + DOCS="AUTHORS BUGS ChangeLog NEWS README TODO docs/projects_using_ftgl.txt" \
63 + default
64 + rm -rf "${D}"/usr/share/doc/ftgl || die
65 + prune_libtool_files
66 }