1 |
commit: 5dee949abbff6f5c5a99f0b905bfb84b4fca3b13 |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri May 4 11:11:43 2018 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri May 4 11:11:43 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5dee949a |
7 |
|
8 |
media-libs/ftgl: Don't use freetype-config. |
9 |
|
10 |
Package-Manager: Portage-2.3.35, Repoman-2.3.9 |
11 |
|
12 |
.../files/ftgl-2.1.3_rc5-freetype_pkgconfig.patch | 11 +++++++ |
13 |
media-libs/ftgl/files/ftgl-2.1.3_rc5-gentoo.patch | 8 ++--- |
14 |
.../ftgl/files/ftgl-2.1.3_rc5-underlink.patch | 4 +-- |
15 |
media-libs/ftgl/ftgl-2.1.3_rc5.ebuild | 37 ++++++++++++---------- |
16 |
4 files changed, 38 insertions(+), 22 deletions(-) |
17 |
|
18 |
diff --git a/media-libs/ftgl/files/ftgl-2.1.3_rc5-freetype_pkgconfig.patch b/media-libs/ftgl/files/ftgl-2.1.3_rc5-freetype_pkgconfig.patch |
19 |
new file mode 100644 |
20 |
index 00000000000..89cc4c00c41 |
21 |
--- /dev/null |
22 |
+++ b/media-libs/ftgl/files/ftgl-2.1.3_rc5-freetype_pkgconfig.patch |
23 |
@@ -0,0 +1,11 @@ |
24 |
+--- ftgl-2.1.3~rc5/configure.ac |
25 |
++++ ftgl-2.1.3~rc5/configure.ac |
26 |
+@@ -41,7 +41,7 @@ |
27 |
+ |
28 |
+ AC_PATH_X |
29 |
+ |
30 |
+-AC_CHECK_FT2([9.0.3],[], |
31 |
++PKG_CHECK_MODULES(FT2, freetype2 >= 9.0.3,, |
32 |
+ [AC_MSG_ERROR([FreeType2 is required to compile this library])]) |
33 |
+ |
34 |
+ AC_PATH_XTRA |
35 |
|
36 |
diff --git a/media-libs/ftgl/files/ftgl-2.1.3_rc5-gentoo.patch b/media-libs/ftgl/files/ftgl-2.1.3_rc5-gentoo.patch |
37 |
index 945c8742c64..885051a01d4 100644 |
38 |
--- a/media-libs/ftgl/files/ftgl-2.1.3_rc5-gentoo.patch |
39 |
+++ b/media-libs/ftgl/files/ftgl-2.1.3_rc5-gentoo.patch |
40 |
@@ -1,5 +1,5 @@ |
41 |
---- configure.ac.old 2008-11-21 14:41:15.000000000 +0100 |
42 |
-+++ configure.ac 2008-11-21 14:44:19.000000000 +0100 |
43 |
+--- a/configure.ac |
44 |
++++ b/configure.ac |
45 |
@@ -50,8 +50,7 @@ |
46 |
FTGL_CHECK_GLUT |
47 |
FTGL_CHECK_FONT |
48 |
@@ -31,8 +31,8 @@ |
49 |
if test "x${LATEX}" != "xno"; then |
50 |
AC_MSG_CHECKING(for a4.sty and a4wide.sty) |
51 |
if "${KPSEWHICH}" a4.sty >/dev/null 2>&1; then |
52 |
---- Makefile.am.old 2008-11-24 22:35:16.000000000 +0100 |
53 |
-+++ Makefile.am 2008-11-24 22:36:32.000000000 +0100 |
54 |
+--- a/Makefile.am |
55 |
++++ b/Makefile.am |
56 |
@@ -24,16 +24,6 @@ |
57 |
m4 \ |
58 |
$(NULL) |
59 |
|
60 |
diff --git a/media-libs/ftgl/files/ftgl-2.1.3_rc5-underlink.patch b/media-libs/ftgl/files/ftgl-2.1.3_rc5-underlink.patch |
61 |
index 30bfba04c7d..ae152ff8571 100644 |
62 |
--- a/media-libs/ftgl/files/ftgl-2.1.3_rc5-underlink.patch |
63 |
+++ b/media-libs/ftgl/files/ftgl-2.1.3_rc5-underlink.patch |
64 |
@@ -1,5 +1,5 @@ |
65 |
---- demo/Makefile.am.old 2011-05-20 11:13:18.822445466 +0200 |
66 |
-+++ demo/Makefile.am 2011-05-20 11:13:28.271042994 +0200 |
67 |
+--- a/demo/Makefile.am |
68 |
++++ b/demo/Makefile.am |
69 |
@@ -17,7 +17,7 @@ |
70 |
$(NULL) |
71 |
c_demo_CFLAGS = $(FT2_CFLAGS) $(GL_CFLAGS) |
72 |
|
73 |
diff --git a/media-libs/ftgl/ftgl-2.1.3_rc5.ebuild b/media-libs/ftgl/ftgl-2.1.3_rc5.ebuild |
74 |
index 3e89417da63..068c13cabe6 100644 |
75 |
--- a/media-libs/ftgl/ftgl-2.1.3_rc5.ebuild |
76 |
+++ b/media-libs/ftgl/ftgl-2.1.3_rc5.ebuild |
77 |
@@ -1,13 +1,13 @@ |
78 |
-# Copyright 1999-2017 Gentoo Foundation |
79 |
+# Copyright 1999-2018 Gentoo Foundation |
80 |
# Distributed under the terms of the GNU General Public License v2 |
81 |
|
82 |
-EAPI=5 |
83 |
-inherit eutils flag-o-matic autotools |
84 |
+EAPI=6 |
85 |
+inherit autotools flag-o-matic |
86 |
|
87 |
-MY_PV=${PV/_/-} |
88 |
-MY_PV2=${PV/_/\~} |
89 |
-MY_P=${PN}-${MY_PV} |
90 |
-MY_P2=${PN}-${MY_PV2} |
91 |
+MY_PV="${PV/_/-}" |
92 |
+MY_PV2="${PV/_/~}" |
93 |
+MY_P="${PN}-${MY_PV}" |
94 |
+MY_P2="${PN}-${MY_PV2}" |
95 |
|
96 |
DESCRIPTION="library to use arbitrary fonts in OpenGL applications" |
97 |
HOMEPAGE="http://ftgl.sourceforge.net/" |
98 |
@@ -22,14 +22,19 @@ DEPEND=">=media-libs/freetype-2.0.9 |
99 |
virtual/opengl |
100 |
virtual/glu |
101 |
media-libs/freeglut" |
102 |
-RDEPEND=${DEPEND} |
103 |
+RDEPEND="${DEPEND} |
104 |
+ virtual/pkgconfig" |
105 |
|
106 |
-S=${WORKDIR}/${MY_P2} |
107 |
+S="${WORKDIR}/${MY_P2}" |
108 |
+ |
109 |
+PATCHES=( |
110 |
+ "${FILESDIR}"/${P}-gentoo.patch |
111 |
+ "${FILESDIR}"/${P}-underlink.patch |
112 |
+ "${FILESDIR}"/${P}-freetype_pkgconfig.patch |
113 |
+) |
114 |
|
115 |
src_prepare() { |
116 |
- epatch \ |
117 |
- "${FILESDIR}"/${P}-gentoo.patch \ |
118 |
- "${FILESDIR}"/${P}-underlink.patch |
119 |
+ default |
120 |
sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.ac || die |
121 |
eautoreconf |
122 |
} |
123 |
@@ -40,8 +45,8 @@ src_configure() { |
124 |
} |
125 |
|
126 |
src_install() { |
127 |
- DOCS="AUTHORS BUGS ChangeLog NEWS README TODO docs/projects_using_ftgl.txt" \ |
128 |
- default |
129 |
- rm -rf "${D}"/usr/share/doc/ftgl || die |
130 |
- prune_libtool_files |
131 |
+ local DOCS=( AUTHORS BUGS ChangeLog NEWS README TODO docs/projects_using_ftgl.txt) |
132 |
+ default |
133 |
+ rm -r "${ED%/}"/usr/share/doc/ftgl || die |
134 |
+ find "${ED}" -name '*.la' -delete || die |
135 |
} |