[patch] fontconfig-2.6.0-r2.ebuild.diff

fontconfig-2.6.0-r2.ebuild.diff (text/plain), 1.64 KB, created by Lars Wendler (Polynomial-C) (RETIRED) on 2009-03-07 18:56:01 UTC

--- /usr/portage/media-libs/fontconfig/fontconfig-2.6.0-r2.ebuild	2008-12-07 13:08:37.000000000 +0100
+++ /usr/local/portage/media-libs/fontconfig/fontconfig-2.6.0-r2.ebuild	2009-03-07 19:52:14.000000000 +0100
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/fontconfig-2.6.0-r2.ebuild,v 1.13 2008/12/07 11:50:22 vapier Exp $
 
+EAPI="2"
 WANT_AUTOMAKE=1.9
 
 inherit eutils autotools libtool toolchain-funcs flag-o-matic
@@ -26,25 +27,12 @@
 	>=dev-libs/expat-1.95.3"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
-	doc? (	app-text/docbook-sgml-utils
+	doc? (	|| ( app-text/docbook-sgml-utils[jadetex]
+			app-text/docbook-sgml-utils[tetex] )
 		=app-text/docbook-sgml-dtd-3.1*	)"
 PDEPEND="app-admin/eselect-fontconfig"
 
-pkg_setup() {
-	#To get docbook2pdf
-	if use doc && !	{	built_with_use --missing false app-text/docbook-sgml-utils jadetex \
-				|| \
-				built_with_use --missing false app-text/docbook-sgml-utils tetex;
-			}
-	then
-		die "For this package to be built with the doc use flag, app-text/docbook-sgml-utils must be built with the jadetex use flag"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
+src_prepare() {
 	epunt_cxx #74077
 	epatch "${FILESDIR}"/${P}-parallel.patch
 	# Neeeded to get a sane .so versionning on fbsd, please dont drop
@@ -54,7 +42,7 @@
 	elibtoolize
 }
 
-src_compile() {
+src_configure() {
 	local myconf
 	if tc-is-cross-compiler; then
 		myconf="--with-arch=${ARCH}"
@@ -67,8 +55,6 @@
 		--with-default-fonts=/usr/share/fonts \
 		--with-add-fonts=/usr/local/share/fonts \
 		${myconf} || die
-
-	emake || die
 }
 
 src_install() {