summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2013-02-09 07:39:33 +0000
committerMike Frysinger <vapier@gentoo.org>2013-02-09 07:39:33 +0000
commit8e1594e295ce72a0cd23a515570e84bb1ec65923 (patch)
treeb2c71584c07d393ce62719ddf56d5856d51c5ba2 /media-libs/fontconfig
parentRemove vulnerable versions. (diff)
downloadgentoo-2-8e1594e295ce72a0cd23a515570e84bb1ec65923.tar.gz
gentoo-2-8e1594e295ce72a0cd23a515570e84bb1ec65923.tar.bz2
gentoo-2-8e1594e295ce72a0cd23a515570e84bb1ec65923.zip
Drop cross-compiling hacks since upstream handles it now #284762.
(Portage version: 2.2.0_alpha161/cvs/Linux x86_64, signed Manifest commit with key FB7C4156)
Diffstat (limited to 'media-libs/fontconfig')
-rw-r--r--media-libs/fontconfig/ChangeLog5
-rw-r--r--media-libs/fontconfig/fontconfig-2.10.2.ebuild19
2 files changed, 8 insertions, 16 deletions
diff --git a/media-libs/fontconfig/ChangeLog b/media-libs/fontconfig/ChangeLog
index 5aec09c08279..5ff3e54674ba 100644
--- a/media-libs/fontconfig/ChangeLog
+++ b/media-libs/fontconfig/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for media-libs/fontconfig
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/ChangeLog,v 1.162 2013/02/08 14:57:19 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/ChangeLog,v 1.163 2013/02/09 07:39:33 vapier Exp $
+
+ 09 Feb 2013; Mike Frysinger <vapier@gentoo.org> fontconfig-2.10.2.ebuild:
+ Drop cross-compiling hacks since upstream handles it now #284762.
*fontconfig-2.10.2 (08 Feb 2013)
diff --git a/media-libs/fontconfig/fontconfig-2.10.2.ebuild b/media-libs/fontconfig/fontconfig-2.10.2.ebuild
index 1bc2a53c8531..1ee1d7f3e750 100644
--- a/media-libs/fontconfig/fontconfig-2.10.2.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.10.2.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/fontconfig-2.10.2.ebuild,v 1.1 2013/02/08 14:57:19 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/fontconfig-2.10.2.ebuild,v 1.2 2013/02/09 07:39:33 vapier Exp $
EAPI=5
-inherit autotools eutils libtool toolchain-funcs readme.gentoo
+inherit autotools eutils libtool readme.gentoo
DESCRIPTION="A library for configuring and customizing font access"
HOMEPAGE="http://fontconfig.org/"
@@ -46,16 +46,6 @@ src_prepare() {
}
src_configure() {
- local myconf
- if tc-is-cross-compiler; then
- myconf="--with-arch=${ARCH}"
- sed -i -e "s:^CFLAGS = @CFLAGS@:CFLAGS =:g" \
- fc-case/Makefile.in \
- fc-lang/Makefile.in \
- fc-glyphname/Makefile.in \
- fc-arch/Makefile.in
- fi
-
# always enable docs to install manpages
econf \
$(use_enable static-libs static) \
@@ -64,15 +54,14 @@ src_configure() {
--localstatedir=/var \
--with-default-fonts=/usr/share/fonts \
--with-add-fonts=/usr/local/share/fonts \
- --with-templatedir=/etc/fonts/conf.avail \
- ${myconf}
+ --with-templatedir=/etc/fonts/conf.avail
}
src_install() {
emake DESTDIR="${D}" install
emake DESTDIR="${D}" -C doc install-man
- find "${ED}" -name '*.la' -exec rm -f {} +
+ find "${ED}" -name '*.la' -delete
#fc-lang directory contains language coverage datafiles
#which are needed to test the coverage of fonts.