1 |
commit: 6ee53a45f539106e4e72763503d959e1eed0f781 |
2 |
Author: Stefan Strogin <stefan.strogin <AT> gmail <DOT> com> |
3 |
AuthorDate: Tue Jan 15 17:19:47 2019 +0000 |
4 |
Commit: Alexey Shvetsov <alexxy <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Jan 22 13:02:29 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ee53a45 |
7 |
|
8 |
app-text/ttf2pk2: use pkg-config instead of freetype-config |
9 |
|
10 |
Patch by Aidan Thornton, taken from a975bbac7 |
11 |
"app-text/xdvik: use pkg-config instead of freetype-config" |
12 |
|
13 |
Closes: https://bugs.gentoo.org/654770 |
14 |
Package-Manager: Portage-2.3.56, Repoman-2.3.12 |
15 |
Signed-off-by: Stefan Strogin <stefan.strogin <AT> gmail.com> |
16 |
Closes: https://github.com/gentoo/gentoo/pull/10840 |
17 |
Signed-off-by: Alexey Shvetsov <alexxy <AT> gentoo.org> |
18 |
|
19 |
.../ttf2pk2-2.0_p20170524-freetype2-config.patch | 23 ++++++++++ |
20 |
app-text/ttf2pk2/ttf2pk2-2.0_p20170524-r1.ebuild | 50 ++++++++++++++++++++++ |
21 |
2 files changed, 73 insertions(+) |
22 |
|
23 |
diff --git a/app-text/ttf2pk2/files/ttf2pk2-2.0_p20170524-freetype2-config.patch b/app-text/ttf2pk2/files/ttf2pk2-2.0_p20170524-freetype2-config.patch |
24 |
new file mode 100644 |
25 |
index 00000000000..d5cb45c662c |
26 |
--- /dev/null |
27 |
+++ b/app-text/ttf2pk2/files/ttf2pk2-2.0_p20170524-freetype2-config.patch |
28 |
@@ -0,0 +1,23 @@ |
29 |
+--- m4/kpse-freetype2-flags.m4 2018-09-19 10:19:06.437789178 +0100 |
30 |
++++ m4/kpse-freetype2-flags.m4 2018-09-19 10:23:48.556050046 +0100 |
31 |
+@@ -21,17 +21,10 @@ |
32 |
+ |
33 |
+ # KPSE_FREETYPE2_OPTIONS([WITH-SYSTEM]) |
34 |
+ # ------------------------------------- |
35 |
+-AC_DEFUN([KPSE_FREETYPE2_OPTIONS], [_KPSE_LIB_OPTIONS([freetype2], [$1], [freetype-config])]) |
36 |
++AC_DEFUN([KPSE_FREETYPE2_OPTIONS], [_KPSE_LIB_OPTIONS([freetype2], [$1], [pkg-config])]) |
37 |
+ |
38 |
+ # KPSE_FREETYPE2_SYSTEM_FLAGS |
39 |
+ # --------------------------- |
40 |
+ AC_DEFUN([KPSE_FREETYPE2_SYSTEM_FLAGS], [dnl |
41 |
+-AC_REQUIRE([AC_CANONICAL_HOST])[]dnl |
42 |
+-AC_CHECK_TOOL([FT2_CONFIG], [freetype-config], [false])[]dnl |
43 |
+-if $FT2_CONFIG --ftversion >/dev/null 2>&1; then |
44 |
+- FREETYPE2_INCLUDES=`$FT2_CONFIG --cflags` |
45 |
+- FREETYPE2_LIBS=`$FT2_CONFIG --libs` |
46 |
+-elif test "x$need_freetype2:$with_system_freetype2" = xyes:yes; then |
47 |
+- AC_MSG_ERROR([did not find freetype-config required for system freetype2 library]) |
48 |
+-fi |
49 |
+-]) # KPSE_FREETYPE2_SYSTEM_FLAGS |
50 |
++_KPSE_PKG_CONFIG_FLAGS([freetype2], [freetype2])]) |
51 |
++ |
52 |
|
53 |
diff --git a/app-text/ttf2pk2/ttf2pk2-2.0_p20170524-r1.ebuild b/app-text/ttf2pk2/ttf2pk2-2.0_p20170524-r1.ebuild |
54 |
new file mode 100644 |
55 |
index 00000000000..091da8ab17b |
56 |
--- /dev/null |
57 |
+++ b/app-text/ttf2pk2/ttf2pk2-2.0_p20170524-r1.ebuild |
58 |
@@ -0,0 +1,50 @@ |
59 |
+# Copyright 1999-2019 Gentoo Authors |
60 |
+# Distributed under the terms of the GNU General Public License v2 |
61 |
+ |
62 |
+EAPI=5 |
63 |
+ |
64 |
+inherit epatch autotools |
65 |
+ |
66 |
+DESCRIPTION="Freetype 2 based TrueType font to TeX's PK format converter" |
67 |
+HOMEPAGE="http://tug.org/texlive/" |
68 |
+SRC_URI="mirror://gentoo/texlive-${PV#*_p}-source.tar.xz" |
69 |
+ |
70 |
+LICENSE="GPL-2" |
71 |
+SLOT="0" |
72 |
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
73 |
+IUSE="" |
74 |
+ |
75 |
+# Note about blockers: it is a freetype2 based replacement for ttf2pk and |
76 |
+# ttf2tfm from freetype1, so block freetype1. |
77 |
+# It installs some data that collides with |
78 |
+# dev-texlive/texlive-langcjk-2011[source]. Hope it'd be fixed with 2012, |
79 |
+# meanwhile we can start dropping freetype1. |
80 |
+RDEPEND=">=dev-libs/kpathsea-6.2.1 |
81 |
+ media-libs/freetype:2 |
82 |
+ sys-libs/zlib |
83 |
+ !media-libs/freetype:1 |
84 |
+ !=dev-texlive/texlive-langcjk-2011*[source]" |
85 |
+DEPEND="${RDEPEND} |
86 |
+ app-arch/xz-utils |
87 |
+ virtual/pkgconfig" |
88 |
+ |
89 |
+S=${WORKDIR}/texlive-${PV#*_p}-source/texk/${PN} |
90 |
+ |
91 |
+src_prepare () { |
92 |
+ # Bug 654770 |
93 |
+ cd "${WORKDIR}/texlive-${PV#*_p}-source" |
94 |
+ epatch "${FILESDIR}"/ttf2pk2-2.0_p20170524-freetype2-config.patch |
95 |
+ cd "${S}" |
96 |
+ eautoreconf |
97 |
+} |
98 |
+ |
99 |
+src_configure() { |
100 |
+ econf --with-system-kpathsea \ |
101 |
+ --with-system-freetype2 \ |
102 |
+ --with-system-zlib |
103 |
+} |
104 |
+ |
105 |
+src_install() { |
106 |
+ emake DESTDIR="${D}" install |
107 |
+ dodoc BUGS README TODO ChangeLog |
108 |
+} |