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