1 |
commit: 8908efb62371e75c7e5d82450d22913d624addc2 |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Mar 15 17:11:56 2019 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Mar 15 17:14:04 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8908efb6 |
7 |
|
8 |
media-libs/freetype: Bumped live ebuild to EAPI-7 |
9 |
|
10 |
Package-Manager: Portage-2.3.62, Repoman-2.3.12 |
11 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
12 |
|
13 |
media-libs/freetype/freetype-9999.ebuild | 25 ++++++++++++++----------- |
14 |
1 file changed, 14 insertions(+), 11 deletions(-) |
15 |
|
16 |
diff --git a/media-libs/freetype/freetype-9999.ebuild b/media-libs/freetype/freetype-9999.ebuild |
17 |
index e9f895c9ce0..2563974f72b 100644 |
18 |
--- a/media-libs/freetype/freetype-9999.ebuild |
19 |
+++ b/media-libs/freetype/freetype-9999.ebuild |
20 |
@@ -1,9 +1,9 @@ |
21 |
-# Copyright 1999-2018 Gentoo Authors |
22 |
+# Copyright 1999-2019 Gentoo Authors |
23 |
# Distributed under the terms of the GNU General Public License v2 |
24 |
|
25 |
-EAPI=6 |
26 |
+EAPI=7 |
27 |
|
28 |
-inherit flag-o-matic libtool multilib multilib-build multilib-minimal toolchain-funcs |
29 |
+inherit flag-o-matic libtool multilib-build multilib-minimal toolchain-funcs |
30 |
|
31 |
DESCRIPTION="A high-quality and portable font engine" |
32 |
HOMEPAGE="https://www.freetype.org/" |
33 |
@@ -26,7 +26,8 @@ LICENSE="|| ( FTL GPL-2+ )" |
34 |
SLOT="2" |
35 |
RESTRICT="!bindist? ( bindist )" # bug 541408 |
36 |
|
37 |
-RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] |
38 |
+RDEPEND=" |
39 |
+ >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] |
40 |
bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] ) |
41 |
harfbuzz? ( >=media-libs/harfbuzz-1.3.0[truetype,${MULTILIB_USEDEP}] ) |
42 |
png? ( >=media-libs/libpng-1.2.51:0=[${MULTILIB_USEDEP}] ) |
43 |
@@ -37,8 +38,10 @@ RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] |
44 |
>=x11-libs/libXdmcp-1.1.1-r1[${MULTILIB_USEDEP}] |
45 |
) |
46 |
)" |
47 |
-DEPEND="${RDEPEND} |
48 |
- virtual/pkgconfig" |
49 |
+DEPEND="${RDEPEND}" |
50 |
+BDEPEND=" |
51 |
+ virtual/pkgconfig |
52 |
+" |
53 |
PDEPEND="infinality? ( media-libs/fontconfig-infinality )" |
54 |
|
55 |
PATCHES=( |
56 |
@@ -71,11 +74,11 @@ _egit_repo_handler() { |
57 |
} |
58 |
|
59 |
src_fetch() { |
60 |
- _egit_repo_handler fetch |
61 |
+ _egit_repo_handler ${EBUILD_PHASE} |
62 |
} |
63 |
|
64 |
src_unpack() { |
65 |
- _egit_repo_handler unpack |
66 |
+ _egit_repo_handler ${EBUILD_PHASE} |
67 |
} |
68 |
|
69 |
src_prepare() { |
70 |
@@ -207,7 +210,7 @@ multilib_src_install() { |
71 |
local ft2demo |
72 |
for ft2demo in ../ft2demos-${PV}/bin/*; do |
73 |
./libtool --mode=install $(type -P install) -m 755 "$ft2demo" \ |
74 |
- "${ED%/}"/usr/bin || die |
75 |
+ "${ED}"/usr/bin || die |
76 |
done |
77 |
fi |
78 |
} |
79 |
@@ -219,8 +222,8 @@ multilib_src_install_all() { |
80 |
local header |
81 |
find src/truetype include/freetype/internal -name '*.h' | \ |
82 |
while read header; do |
83 |
- mkdir -p "${ED%/}/usr/include/freetype2/internal4fontforge/$(dirname ${header})" || die |
84 |
- cp ${header} "${ED%/}/usr/include/freetype2/internal4fontforge/$(dirname ${header})" || die |
85 |
+ mkdir -p "${ED}/usr/include/freetype2/internal4fontforge/$(dirname ${header})" || die |
86 |
+ cp ${header} "${ED}/usr/include/freetype2/internal4fontforge/$(dirname ${header})" || die |
87 |
done |
88 |
fi |