1 |
commit: 525a5ca6f6bed2a67a79e376342dc6ccfd838c1d |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Apr 26 14:49:20 2018 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Apr 26 14:52:35 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=525a5ca6 |
7 |
|
8 |
media-libs/freetype: Ebuild adjustments. |
9 |
|
10 |
Package-Manager: Portage-2.3.31, Repoman-2.3.9 |
11 |
|
12 |
media-libs/freetype/freetype-9999.ebuild | 59 ++++++++++++++++---------------- |
13 |
1 file changed, 29 insertions(+), 30 deletions(-) |
14 |
|
15 |
diff --git a/media-libs/freetype/freetype-9999.ebuild b/media-libs/freetype/freetype-9999.ebuild |
16 |
index 4fa091f6769..ba2ddfe1a61 100644 |
17 |
--- a/media-libs/freetype/freetype-9999.ebuild |
18 |
+++ b/media-libs/freetype/freetype-9999.ebuild |
19 |
@@ -3,17 +3,11 @@ |
20 |
|
21 |
EAPI=6 |
22 |
|
23 |
-SCM= |
24 |
-[[ "${PV}" = 9999 ]] && SCM="autotools git-r3" |
25 |
-inherit flag-o-matic libtool multilib multilib-build multilib-minimal toolchain-funcs ${SCM} |
26 |
-unset SCM |
27 |
- |
28 |
-INFINALITY_PATCH="03-infinality-2.6.3-2016.03.26.patch" |
29 |
+inherit flag-o-matic libtool multilib multilib-build multilib-minimal toolchain-funcs |
30 |
|
31 |
DESCRIPTION="A high-quality and portable font engine" |
32 |
HOMEPAGE="https://www.freetype.org/" |
33 |
-IUSE="X +adobe-cff bindist bzip2 +cleartype_hinting debug fontforge harfbuzz |
34 |
- infinality png static-libs utils" |
35 |
+IUSE="X +adobe-cff bindist bzip2 +cleartype_hinting debug fontforge harfbuzz infinality png static-libs utils" |
36 |
|
37 |
if [[ "${PV}" != 9999 ]] ; then |
38 |
SRC_URI="mirror://sourceforge/freetype/${P/_/}.tar.bz2 |
39 |
@@ -23,7 +17,9 @@ if [[ "${PV}" != 9999 ]] ; then |
40 |
doc? ( mirror://sourceforge/freetype/${PN}-doc-${PV}.tar.bz2 |
41 |
mirror://nongnu/freetype/${PN}-doc-${PV}.tar.bz2 )" |
42 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" |
43 |
- IUSE+="doc" |
44 |
+ IUSE+=" doc" |
45 |
+else |
46 |
+ inherit autotools git-r3 |
47 |
fi |
48 |
|
49 |
LICENSE="|| ( FTL GPL-2+ )" |
50 |
@@ -52,33 +48,37 @@ PATCHES=( |
51 |
"${FILESDIR}"/${PN}-2.4.11-sizeof-types.patch # 459966 |
52 |
) |
53 |
|
54 |
-src_fetch() { |
55 |
+_egit_repo_handler() { |
56 |
if [[ "${PV}" = 9999 ]] ; then |
57 |
+ local phase="${1}" |
58 |
+ case ${phase} in |
59 |
+ fetch|unpack) |
60 |
+ :; |
61 |
+ ;; |
62 |
+ *) |
63 |
+ die "Please use this function with either \"fetch\" or \"unpack\"" |
64 |
+ ;; |
65 |
+ esac |
66 |
+ |
67 |
local EGIT_REPO_URI |
68 |
EGIT_REPO_URI="https://git.savannah.gnu.org/r/freetype/freetype2.git" |
69 |
- git-r3_src_fetch |
70 |
+ git-r3_src_${phase} |
71 |
if use utils ; then |
72 |
EGIT_REPO_URI="https://git.savannah.gnu.org/r/freetype/freetype2-demos.git" |
73 |
- git-r3_src_fetch |
74 |
+ local EGIT_CHECKOUT_DIR="${WORKDIR}/ft2demos-${PV}" |
75 |
+ git-r3_src_${phase} |
76 |
fi |
77 |
else |
78 |
default |
79 |
fi |
80 |
} |
81 |
|
82 |
+src_fetch() { |
83 |
+ _egit_repo_handler fetch |
84 |
+} |
85 |
+ |
86 |
src_unpack() { |
87 |
- if [[ "${PV}" = 9999 ]] ; then |
88 |
- local EGIT_REPO_URI |
89 |
- EGIT_REPO_URI="http://git.savannah.gnu.org/r/freetype/freetype2.git" |
90 |
- git-r3_src_unpack |
91 |
- if use utils ; then |
92 |
- EGIT_REPO_URI="http://git.savannah.gnu.org/r/freetype/freetype2-demos.git" |
93 |
- local EGIT_CHECKOUT_DIR="${WORKDIR}/ft2demos-${PV}" |
94 |
- git-r3_src_unpack |
95 |
- fi |
96 |
- else |
97 |
- default |
98 |
- fi |
99 |
+ _egit_repo_handler unpack |
100 |
} |
101 |
|
102 |
src_prepare() { |
103 |
@@ -174,8 +174,7 @@ multilib_src_configure() { |
104 |
LIBPNG_LDFLAGS="$($(tc-getPKG_CONFIG) --libs libpng)" |
105 |
) |
106 |
|
107 |
- ECONF_SOURCE="${S}" \ |
108 |
- econf "${myeconfargs[@]}" |
109 |
+ ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" |
110 |
} |
111 |
|
112 |
multilib_src_compile() { |
113 |
@@ -199,7 +198,7 @@ multilib_src_install() { |
114 |
local ft2demo |
115 |
for ft2demo in ../ft2demos-${PV}/bin/*; do |
116 |
./libtool --mode=install $(type -P install) -m 755 "$ft2demo" \ |
117 |
- "${ED}"/usr/bin || die |
118 |
+ "${ED%/}"/usr/bin || die |
119 |
done |
120 |
fi |
121 |
} |
122 |
@@ -211,8 +210,8 @@ multilib_src_install_all() { |
123 |
local header |
124 |
find src/truetype include/freetype/internal -name '*.h' | \ |
125 |
while read header; do |
126 |
- mkdir -p "${ED}/usr/include/freetype2/internal4fontforge/$(dirname ${header})" || die |
127 |
- cp ${header} "${ED}/usr/include/freetype2/internal4fontforge/$(dirname ${header})" || die |
128 |
+ mkdir -p "${ED%/}/usr/include/freetype2/internal4fontforge/$(dirname ${header})" || die |
129 |
+ cp ${header} "${ED%/}/usr/include/freetype2/internal4fontforge/$(dirname ${header})" || die |
130 |
done |
131 |
fi |
132 |
|
133 |
@@ -222,5 +221,5 @@ multilib_src_install_all() { |
134 |
dodoc -r docs/* |
135 |
fi |
136 |
|
137 |
- prune_libtool_files --all |
138 |
+ find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die |
139 |
} |