Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 666418 | Differences between
and this patch

Collapse All | Expand All

(-)a/media-libs/fontconfig/fontconfig-2.13.1.ebuild (-18 / +19 lines)
Lines 15-20 SLOT="1.0" Link Here
15
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"
15
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"
16
IUSE="doc static-libs"
16
IUSE="doc static-libs"
17
17
18
BDEPEND="dev-util/gperf
19
	>=sys-devel/gettext-0.19.8
20
	virtual/pkgconfig[${MULTILIB_USEDEP}]
21
	doc? (
22
		=app-text/docbook-sgml-dtd-3.1*
23
		app-text/docbook-sgml-utils[jadetex]
24
	)"
18
# Purposefully dropped the xml USE flag and libxml2 support.  Expat is the
25
# Purposefully dropped the xml USE flag and libxml2 support.  Expat is the
19
# default and used by every distro.  See bug #283191.
26
# default and used by every distro.  See bug #283191.
20
RDEPEND=">=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]
27
RDEPEND=">=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]
Lines 22-33 RDEPEND=">=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}] Link Here
22
	!elibc_Darwin? ( sys-apps/util-linux[${MULTILIB_USEDEP}] )
29
	!elibc_Darwin? ( sys-apps/util-linux[${MULTILIB_USEDEP}] )
23
	elibc_Darwin? ( sys-libs/native-uuid )
30
	elibc_Darwin? ( sys-libs/native-uuid )
24
	virtual/libintl[${MULTILIB_USEDEP}]"
31
	virtual/libintl[${MULTILIB_USEDEP}]"
25
DEPEND="${RDEPEND}
32
DEPEND="${RDEPEND}"
26
	virtual/pkgconfig
27
	dev-util/gperf
28
	>=sys-devel/gettext-0.19.8
29
	doc? ( =app-text/docbook-sgml-dtd-3.1*
30
		app-text/docbook-sgml-utils[jadetex] )"
31
PDEPEND="!x86-winnt? ( app-eselect/eselect-fontconfig )
33
PDEPEND="!x86-winnt? ( app-eselect/eselect-fontconfig )
32
	virtual/ttf-fonts"
34
	virtual/ttf-fonts"
33
35
Lines 46-52 pkg_setup() { Link Here
46
	DOC_CONTENTS="Please make fontconfig configuration changes using
48
	DOC_CONTENTS="Please make fontconfig configuration changes using
47
	\`eselect fontconfig\`. Any changes made to /etc/fonts/fonts.conf will be
49
	\`eselect fontconfig\`. Any changes made to /etc/fonts/fonts.conf will be
48
	overwritten. If you need to reset your configuration to upstream defaults,
50
	overwritten. If you need to reset your configuration to upstream defaults,
49
	delete the directory ${EROOT%/}/etc/fonts/conf.d/ and re-emerge fontconfig."
51
	delete the directory ${EROOT}/etc/fonts/conf.d/ and re-emerge fontconfig."
50
}
52
}
51
53
52
src_prepare() {
54
src_prepare() {
Lines 116-124 multilib_src_install_all() { Link Here
116
118
117
	dodoc doc/fontconfig-user.{txt,pdf}
119
	dodoc doc/fontconfig-user.{txt,pdf}
118
120
119
	if [[ -e ${ED}usr/share/doc/fontconfig/ ]];  then
121
	if [[ -e ${ED}/usr/share/doc/fontconfig/ ]];  then
120
		mv "${ED}"usr/share/doc/fontconfig/* "${ED}"/usr/share/doc/${P} || die
122
		mv "${ED}"/usr/share/doc/fontconfig/* "${ED}"/usr/share/doc/${P} || die
121
		rm -rf "${ED}"usr/share/doc/fontconfig
123
		rm -rf "${ED}"/usr/share/doc/fontconfig
122
	fi
124
	fi
123
125
124
	# Changes should be made to /etc/fonts/local.conf, and as we had
126
	# Changes should be made to /etc/fonts/local.conf, and as we had
Lines 144-154 pkg_preinst() { Link Here
144
		for file in "${EROOT}"/etc/fonts/conf.avail/*; do
146
		for file in "${EROOT}"/etc/fonts/conf.avail/*; do
145
			f=${file##*/}
147
			f=${file##*/}
146
			if [[ -L ${EROOT}/etc/fonts/conf.d/${f} ]]; then
148
			if [[ -L ${EROOT}/etc/fonts/conf.d/${f} ]]; then
147
				[[ -f ${ED}etc/fonts/conf.avail/${f} ]] \
149
				[[ -f ${ED}/etc/fonts/conf.avail/${f} ]] \
148
					&& ln -sf ../conf.avail/"${f}" "${ED}"etc/fonts/conf.d/ &>/dev/null
150
					&& ln -sf ../conf.avail/"${f}" "${ED}"/etc/fonts/conf.d/ &>/dev/null
149
			else
151
			else
150
				[[ -f ${ED}etc/fonts/conf.avail/${f} ]] \
152
				[[ -f ${ED}/etc/fonts/conf.avail/${f} ]] \
151
					&& rm "${ED}"etc/fonts/conf.d/"${f}" &>/dev/null
153
					&& rm "${ED}"/etc/fonts/conf.d/"${f}" &>/dev/null
152
			fi
154
			fi
153
		done
155
		done
154
	fi
156
	fi
Lines 156-167 pkg_preinst() { Link Here
156
}
158
}
157
159
158
pkg_postinst() {
160
pkg_postinst() {
159
	einfo "Cleaning broken symlinks in ${EROOT%/}/etc/fonts/conf.d/"
161
	einfo "Cleaning broken symlinks in ${EROOT}/etc/fonts/conf.d/"
160
	find -L "${EROOT}"etc/fonts/conf.d/ -type l -delete
162
	find -L "${EROOT}"/etc/fonts/conf.d/ -type l -delete
161
163
162
	readme.gentoo_print_elog
164
	readme.gentoo_print_elog
163
165
164
	if [[ ${ROOT} = / ]]; then
166
	if [[ ${ROOT} == "" ]]; then
165
		multilib_pkg_postinst() {
167
		multilib_pkg_postinst() {
166
			ebegin "Creating global font cache for ${ABI}"
168
			ebegin "Creating global font cache for ${ABI}"
167
			"${EPREFIX}"/usr/bin/${CHOST}-fc-cache -srf
169
			"${EPREFIX}"/usr/bin/${CHOST}-fc-cache -srf
168
- 

Return to bug 666418