| 1 |
commit: c99288edb7c658dafa1cd8056ab44f4569ad5075 |
| 2 |
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org> |
| 3 |
AuthorDate: Tue Sep 18 04:13:11 2018 +0000 |
| 4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Sep 18 07:15:53 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c99288ed |
| 7 |
|
| 8 |
media-libs/fontconfig: Various fixes mostly related to EAPI="7". |
| 9 |
|
| 10 |
Move CBUILD-side tools from DEPEND to BDEPEND. |
| 11 |
Add [${MULTILIB_USEDEP}] to dependency on virtual/pkgconfig. |
| 12 |
Fix usage of ${ED}, ${ROOT}, ${EROOT}. |
| 13 |
|
| 14 |
Closes: https://bugs.gentoo.org/666418 |
| 15 |
|
| 16 |
media-libs/fontconfig/fontconfig-2.13.1.ebuild | 36 ++++++++++++++------------ |
| 17 |
1 file changed, 19 insertions(+), 17 deletions(-) |
| 18 |
|
| 19 |
diff --git a/media-libs/fontconfig/fontconfig-2.13.1.ebuild b/media-libs/fontconfig/fontconfig-2.13.1.ebuild |
| 20 |
index 3b995391a94..6d02affef22 100644 |
| 21 |
--- a/media-libs/fontconfig/fontconfig-2.13.1.ebuild |
| 22 |
+++ b/media-libs/fontconfig/fontconfig-2.13.1.ebuild |
| 23 |
@@ -15,6 +15,13 @@ SLOT="1.0" |
| 24 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" |
| 25 |
IUSE="doc static-libs" |
| 26 |
|
| 27 |
+BDEPEND="dev-util/gperf |
| 28 |
+ >=sys-devel/gettext-0.19.8 |
| 29 |
+ virtual/pkgconfig[${MULTILIB_USEDEP}] |
| 30 |
+ doc? ( |
| 31 |
+ =app-text/docbook-sgml-dtd-3.1* |
| 32 |
+ app-text/docbook-sgml-utils[jadetex] |
| 33 |
+ )" |
| 34 |
# Purposefully dropped the xml USE flag and libxml2 support. Expat is the |
| 35 |
# default and used by every distro. See bug #283191. |
| 36 |
RDEPEND=">=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}] |
| 37 |
@@ -22,12 +29,7 @@ RDEPEND=">=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}] |
| 38 |
!elibc_Darwin? ( sys-apps/util-linux[${MULTILIB_USEDEP}] ) |
| 39 |
elibc_Darwin? ( sys-libs/native-uuid ) |
| 40 |
virtual/libintl[${MULTILIB_USEDEP}]" |
| 41 |
-DEPEND="${RDEPEND} |
| 42 |
- virtual/pkgconfig |
| 43 |
- dev-util/gperf |
| 44 |
- >=sys-devel/gettext-0.19.8 |
| 45 |
- doc? ( =app-text/docbook-sgml-dtd-3.1* |
| 46 |
- app-text/docbook-sgml-utils[jadetex] )" |
| 47 |
+DEPEND="${RDEPEND}" |
| 48 |
PDEPEND="!x86-winnt? ( app-eselect/eselect-fontconfig ) |
| 49 |
virtual/ttf-fonts" |
| 50 |
|
| 51 |
@@ -46,7 +48,7 @@ pkg_setup() { |
| 52 |
DOC_CONTENTS="Please make fontconfig configuration changes using |
| 53 |
\`eselect fontconfig\`. Any changes made to /etc/fonts/fonts.conf will be |
| 54 |
overwritten. If you need to reset your configuration to upstream defaults, |
| 55 |
- delete the directory ${EROOT%/}/etc/fonts/conf.d/ and re-emerge fontconfig." |
| 56 |
+ delete the directory ${EROOT}/etc/fonts/conf.d/ and re-emerge fontconfig." |
| 57 |
} |
| 58 |
|
| 59 |
src_prepare() { |
| 60 |
@@ -116,9 +118,9 @@ multilib_src_install_all() { |
| 61 |
|
| 62 |
dodoc doc/fontconfig-user.{txt,pdf} |
| 63 |
|
| 64 |
- if [[ -e ${ED}usr/share/doc/fontconfig/ ]]; then |
| 65 |
- mv "${ED}"usr/share/doc/fontconfig/* "${ED}"/usr/share/doc/${P} || die |
| 66 |
- rm -rf "${ED}"usr/share/doc/fontconfig |
| 67 |
+ if [[ -e ${ED}/usr/share/doc/fontconfig/ ]]; then |
| 68 |
+ mv "${ED}"/usr/share/doc/fontconfig/* "${ED}"/usr/share/doc/${P} || die |
| 69 |
+ rm -rf "${ED}"/usr/share/doc/fontconfig |
| 70 |
fi |
| 71 |
|
| 72 |
# Changes should be made to /etc/fonts/local.conf, and as we had |
| 73 |
@@ -144,11 +146,11 @@ pkg_preinst() { |
| 74 |
for file in "${EROOT}"/etc/fonts/conf.avail/*; do |
| 75 |
f=${file##*/} |
| 76 |
if [[ -L ${EROOT}/etc/fonts/conf.d/${f} ]]; then |
| 77 |
- [[ -f ${ED}etc/fonts/conf.avail/${f} ]] \ |
| 78 |
- && ln -sf ../conf.avail/"${f}" "${ED}"etc/fonts/conf.d/ &>/dev/null |
| 79 |
+ [[ -f ${ED}/etc/fonts/conf.avail/${f} ]] \ |
| 80 |
+ && ln -sf ../conf.avail/"${f}" "${ED}"/etc/fonts/conf.d/ &>/dev/null |
| 81 |
else |
| 82 |
- [[ -f ${ED}etc/fonts/conf.avail/${f} ]] \ |
| 83 |
- && rm "${ED}"etc/fonts/conf.d/"${f}" &>/dev/null |
| 84 |
+ [[ -f ${ED}/etc/fonts/conf.avail/${f} ]] \ |
| 85 |
+ && rm "${ED}"/etc/fonts/conf.d/"${f}" &>/dev/null |
| 86 |
fi |
| 87 |
done |
| 88 |
fi |
| 89 |
@@ -156,12 +158,12 @@ pkg_preinst() { |
| 90 |
} |
| 91 |
|
| 92 |
pkg_postinst() { |
| 93 |
- einfo "Cleaning broken symlinks in ${EROOT%/}/etc/fonts/conf.d/" |
| 94 |
- find -L "${EROOT}"etc/fonts/conf.d/ -type l -delete |
| 95 |
+ einfo "Cleaning broken symlinks in ${EROOT}/etc/fonts/conf.d/" |
| 96 |
+ find -L "${EROOT}"/etc/fonts/conf.d/ -type l -delete |
| 97 |
|
| 98 |
readme.gentoo_print_elog |
| 99 |
|
| 100 |
- if [[ ${ROOT} = / ]]; then |
| 101 |
+ if [[ ${ROOT} == "" ]]; then |
| 102 |
multilib_pkg_postinst() { |
| 103 |
ebegin "Creating global font cache for ${ABI}" |
| 104 |
"${EPREFIX}"/usr/bin/${CHOST}-fc-cache -srf |
Archives