1 |
zmedico 13/02/27 19:54:27 |
2 |
|
3 |
Modified: fontconfig-2.10.2-r1.ebuild ChangeLog |
4 |
Log: |
5 |
Fix for prefix and add ~arm-linux + ~x86-linux keywords. |
6 |
|
7 |
(Portage version: 2.2.0_alpha163_p18/cvs/Linux i686, signed Manifest commit with key 0xFDE8EF85AE5719A3) |
8 |
|
9 |
Revision Changes Path |
10 |
1.3 media-libs/fontconfig/fontconfig-2.10.2-r1.ebuild |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/fontconfig/fontconfig-2.10.2-r1.ebuild?rev=1.3&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/fontconfig/fontconfig-2.10.2-r1.ebuild?rev=1.3&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/fontconfig/fontconfig-2.10.2-r1.ebuild?r1=1.2&r2=1.3 |
15 |
|
16 |
Index: fontconfig-2.10.2-r1.ebuild |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/media-libs/fontconfig/fontconfig-2.10.2-r1.ebuild,v |
19 |
retrieving revision 1.2 |
20 |
retrieving revision 1.3 |
21 |
diff -u -r1.2 -r1.3 |
22 |
--- fontconfig-2.10.2-r1.ebuild 26 Feb 2013 20:33:12 -0000 1.2 |
23 |
+++ fontconfig-2.10.2-r1.ebuild 27 Feb 2013 19:54:27 -0000 1.3 |
24 |
@@ -1,6 +1,6 @@ |
25 |
# Copyright 1999-2013 Gentoo Foundation |
26 |
# Distributed under the terms of the GNU General Public License v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/fontconfig-2.10.2-r1.ebuild,v 1.2 2013/02/26 20:33:12 mgorny Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/fontconfig-2.10.2-r1.ebuild,v 1.3 2013/02/27 19:54:27 zmedico Exp $ |
29 |
|
30 |
EAPI=5 |
31 |
|
32 |
@@ -13,7 +13,7 @@ |
33 |
|
34 |
LICENSE="MIT" |
35 |
SLOT="1.0" |
36 |
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" |
37 |
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux" |
38 |
IUSE="doc static-libs" |
39 |
|
40 |
# Purposefully dropped the xml USE flag and libxml2 support. Expat is the |
41 |
@@ -44,7 +44,7 @@ |
42 |
DOC_CONTENTS="Please make fontconfig configuration changes using |
43 |
\`eselect fontconfig\`. Any changes made to /etc/fonts/fonts.conf will be |
44 |
overwritten. If you need to reset your configuration to upstream defaults, |
45 |
- delete the directory ${ROOT}etc/fonts/conf.d/ and re-emerge fontconfig." |
46 |
+ delete the directory ${EROOT}etc/fonts/conf.d/ and re-emerge fontconfig." |
47 |
} |
48 |
|
49 |
src_configure() { |
50 |
@@ -52,10 +52,10 @@ |
51 |
$(use_enable doc docbook) |
52 |
# always enable docs to install manpages |
53 |
--enable-docs |
54 |
- --localstatedir=/var |
55 |
- --with-default-fonts=/usr/share/fonts |
56 |
- --with-add-fonts=/usr/local/share/fonts |
57 |
- --with-templatedir=/etc/fonts/conf.avail |
58 |
+ --localstatedir="${EPREFIX}"/var |
59 |
+ --with-default-fonts="${EPREFIX}"/usr/share/fonts |
60 |
+ --with-add-fonts="${EPREFIX}"/usr/local/share/fonts |
61 |
+ --with-templatedir="${EPREFIX}"/etc/fonts/conf.avail |
62 |
) |
63 |
|
64 |
autotools-multilib_src_configure |
65 |
@@ -82,9 +82,9 @@ |
66 |
|
67 |
dodoc doc/fontconfig-user.{txt,pdf} |
68 |
|
69 |
- if [[ -e ${D}usr/share/doc/fontconfig/ ]]; then |
70 |
- mv "${D}"usr/share/doc/fontconfig/* "${D}"/usr/share/doc/${P} |
71 |
- rm -rf "${D}"usr/share/doc/fontconfig |
72 |
+ if [[ -e ${ED}usr/share/doc/fontconfig/ ]]; then |
73 |
+ mv "${ED}"usr/share/doc/fontconfig/* "${ED}"/usr/share/doc/${P} |
74 |
+ rm -rf "${ED}"usr/share/doc/fontconfig |
75 |
fi |
76 |
|
77 |
# Changes should be made to /etc/fonts/local.conf, and as we had |
78 |
@@ -94,7 +94,7 @@ |
79 |
|
80 |
# As of fontconfig 2.7, everything sticks their noses in here. |
81 |
dodir /etc/sandbox.d |
82 |
- echo 'SANDBOX_PREDICT="/var/cache/fontconfig"' > "${D}"/etc/sandbox.d/37fontconfig |
83 |
+ echo 'SANDBOX_PREDICT="/var/cache/fontconfig"' > "${ED}"/etc/sandbox.d/37fontconfig |
84 |
|
85 |
readme.gentoo_create_doc |
86 |
} |
87 |
@@ -104,15 +104,15 @@ |
88 |
# /etc/fonts/conf.d/ contains symlinks to ../conf.avail/ to include various |
89 |
# config files. If we install as-is, we'll blow away user settings. |
90 |
ebegin "Syncing fontconfig configuration to system" |
91 |
- if [[ -e ${ROOT}/etc/fonts/conf.d ]]; then |
92 |
- for file in "${ROOT}"/etc/fonts/conf.avail/*; do |
93 |
+ if [[ -e ${EROOT}/etc/fonts/conf.d ]]; then |
94 |
+ for file in "${EROOT}"/etc/fonts/conf.avail/*; do |
95 |
f=${file##*/} |
96 |
- if [[ -L ${ROOT}/etc/fonts/conf.d/${f} ]]; then |
97 |
- [[ -f ${D}etc/fonts/conf.avail/${f} ]] \ |
98 |
- && ln -sf ../conf.avail/"${f}" "${D}"etc/fonts/conf.d/ &>/dev/null |
99 |
+ if [[ -L ${EROOT}/etc/fonts/conf.d/${f} ]]; then |
100 |
+ [[ -f ${ED}etc/fonts/conf.avail/${f} ]] \ |
101 |
+ && ln -sf ../conf.avail/"${f}" "${ED}"etc/fonts/conf.d/ &>/dev/null |
102 |
else |
103 |
- [[ -f ${D}etc/fonts/conf.avail/${f} ]] \ |
104 |
- && rm "${D}"etc/fonts/conf.d/"${f}" &>/dev/null |
105 |
+ [[ -f ${ED}etc/fonts/conf.avail/${f} ]] \ |
106 |
+ && rm "${ED}"etc/fonts/conf.d/"${f}" &>/dev/null |
107 |
fi |
108 |
done |
109 |
fi |
110 |
@@ -120,14 +120,14 @@ |
111 |
} |
112 |
|
113 |
pkg_postinst() { |
114 |
- einfo "Cleaning broken symlinks in "${ROOT}"etc/fonts/conf.d/" |
115 |
- find -L "${ROOT}"etc/fonts/conf.d/ -type l -delete |
116 |
+ einfo "Cleaning broken symlinks in "${EROOT}"etc/fonts/conf.d/" |
117 |
+ find -L "${EROOT}"etc/fonts/conf.d/ -type l -delete |
118 |
|
119 |
readme.gentoo_print_elog |
120 |
|
121 |
if [[ ${ROOT} = / ]]; then |
122 |
ebegin "Creating global font cache" |
123 |
- /usr/bin/fc-cache -srf |
124 |
+ "${EPREFIX}"/usr/bin/fc-cache -srf |
125 |
eend $? |
126 |
fi |
127 |
} |
128 |
|
129 |
|
130 |
|
131 |
1.167 media-libs/fontconfig/ChangeLog |
132 |
|
133 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/fontconfig/ChangeLog?rev=1.167&view=markup |
134 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/fontconfig/ChangeLog?rev=1.167&content-type=text/plain |
135 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/fontconfig/ChangeLog?r1=1.166&r2=1.167 |
136 |
|
137 |
Index: ChangeLog |
138 |
=================================================================== |
139 |
RCS file: /var/cvsroot/gentoo-x86/media-libs/fontconfig/ChangeLog,v |
140 |
retrieving revision 1.166 |
141 |
retrieving revision 1.167 |
142 |
diff -u -r1.166 -r1.167 |
143 |
--- ChangeLog 26 Feb 2013 20:33:12 -0000 1.166 |
144 |
+++ ChangeLog 27 Feb 2013 19:54:27 -0000 1.167 |
145 |
@@ -1,6 +1,9 @@ |
146 |
# ChangeLog for media-libs/fontconfig |
147 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
148 |
-# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/ChangeLog,v 1.166 2013/02/26 20:33:12 mgorny Exp $ |
149 |
+# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/ChangeLog,v 1.167 2013/02/27 19:54:27 zmedico Exp $ |
150 |
+ |
151 |
+ 27 Feb 2013; Zac Medico <zmedico@g.o> fontconfig-2.10.2-r1.ebuild: |
152 |
+ Fix for prefix and add ~arm-linux + ~x86-linux keywords. |
153 |
|
154 |
26 Feb 2013; Michał Górny <mgorny@g.o> fontconfig-2.10.2-r1.ebuild: |
155 |
Drop removed --with-freetype-config. Fontconfig uses pkg-config now. |