[patch] patch for fontconfig-2.2.3

fontconfig-2.2.3-amd64.2005.0.patch (text/plain), 2.12 KB, created by Dario Birtic on 2005-03-03 05:37:29 UTC

--- /usr/portage/media-libs/fontconfig/fontconfig-2.2.3.ebuild.orig	2005-03-03 13:50:52.261646163 +0100
+++ /usr/portage/media-libs/fontconfig/fontconfig-2.2.3.ebuild	2005-03-03 14:30:32.909230733 +0100
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/fontconfig-2.2.3.ebuild,v 1.11 2005/02/17 16:31:02 j4rg0n Exp $
 
-inherit eutils
+inherit eutils multilib
 
 DESCRIPTION="A library for configuring and customizing font access"
 HOMEPAGE="http://freedesktop.org/Software/fontconfig"
@@ -17,7 +17,8 @@
 RDEPEND=">=media-libs/freetype-2.1.4
 	>=dev-libs/expat-1.95.3"
 DEPEND="${RDEPEND}
-	>=sys-apps/sed-4"
+	>=sys-apps/sed-4
+	!app-emulation/emul-linux-x86-baselibs"
 
 src_unpack() {
 
@@ -39,15 +40,43 @@
 	sed -i "s:\`date\`::" configure
 
 	epunt_cxx #74077
+
+	if use amd64 && has_multilib_profile; then
+		cp -ar ${S} ${S}-x86
+		mv ${S} ${S}-amd64
+	fi
 }
 
 src_compile() {
+	if use amd64 && has_multilib_profile; then
+		local OABI=${ABI}
+		local OPWD=$PWD
+		local OCFLAGS=${CFLAGS}
+		ABI="x86"
+		cd ${S}-x86
+		CFLAGS="${OCFLAGS} -L/usr/lib32"
+		src_compile-multilib --libdir=/usr/lib32 
+		CFLAGS=${OCFLAGS}
+		ABI="amd64"
+		cd ${S}-amd64
+		src_compile-multilib --libdir=/usr/lib64
+		cd ${OPWD}
+		ABI=${OABI}
+		unset OCFLAGS
+		unset OPWD
+		unset OABI
+	else
+		src_compile-multilib
+	fi
+}
+
+src_compile-multilib() {
 
 	[ "${ARCH}" == "alpha" -a "${CC}" == "ccc" ] && \
 		die "Dont compile fontconfig with ccc, it doesnt work very well"
 
 	# disable docs only disables docs generation (!)
-	econf --disable-docs \
+	econf ${1} --disable-docs \
 		--with-docdir=/usr/share/doc/${PF} \
 		--x-includes=/usr/X11R6/include \
 		--x-libraries=/usr/X11R6/lib \
@@ -64,6 +93,25 @@
 }
 
 src_install() {
+	if use amd64 && has_multilib_profile; then
+		local OABI=${ABI}
+		local OPWD=$PWD
+		ABI="x86"
+		cd ${S}-x86
+		src_install-multilib
+		ABI="amd64"
+		cd ${S}-amd64
+		src_install-multilib
+		cd ${OPWD}
+		ABI=${OABI}
+		unset OPWD
+		unset OABI
+	else
+		src_install-multilib
+	fi
+}
+
+src_install-multilib() {
 
 	make DESTDIR=${D} install || die