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

Collapse All | Expand All

(-)/usr/portage/media-libs/fontconfig/fontconfig-2.2.3.ebuild.orig (-3 / +51 lines)
Lines 2-8 Link Here
2
# Distributed under the terms of the GNU General Public License v2
2
# Distributed under the terms of the GNU General Public License v2
3
# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/fontconfig-2.2.3.ebuild,v 1.11 2005/02/17 16:31:02 j4rg0n Exp $
3
# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/fontconfig-2.2.3.ebuild,v 1.11 2005/02/17 16:31:02 j4rg0n Exp $
4
4
5
inherit eutils
5
inherit eutils multilib
6
6
7
DESCRIPTION="A library for configuring and customizing font access"
7
DESCRIPTION="A library for configuring and customizing font access"
8
HOMEPAGE="http://freedesktop.org/Software/fontconfig"
8
HOMEPAGE="http://freedesktop.org/Software/fontconfig"
Lines 17-23 Link Here
17
RDEPEND=">=media-libs/freetype-2.1.4
17
RDEPEND=">=media-libs/freetype-2.1.4
18
	>=dev-libs/expat-1.95.3"
18
	>=dev-libs/expat-1.95.3"
19
DEPEND="${RDEPEND}
19
DEPEND="${RDEPEND}
20
	>=sys-apps/sed-4"
20
	>=sys-apps/sed-4
21
	!app-emulation/emul-linux-x86-baselibs"
21
22
22
src_unpack() {
23
src_unpack() {
23
24
Lines 39-53 Link Here
39
	sed -i "s:\`date\`::" configure
40
	sed -i "s:\`date\`::" configure
40
41
41
	epunt_cxx #74077
42
	epunt_cxx #74077
43
44
	if use amd64 && has_multilib_profile; then
45
		cp -ar ${S} ${S}-x86
46
		mv ${S} ${S}-amd64
47
	fi
42
}
48
}
43
49
44
src_compile() {
50
src_compile() {
51
	if use amd64 && has_multilib_profile; then
52
		local OABI=${ABI}
53
		local OPWD=$PWD
54
		local OCFLAGS=${CFLAGS}
55
		ABI="x86"
56
		cd ${S}-x86
57
		CFLAGS="${OCFLAGS} -L/usr/lib32"
58
		src_compile-multilib --libdir=/usr/lib32 
59
		CFLAGS=${OCFLAGS}
60
		ABI="amd64"
61
		cd ${S}-amd64
62
		src_compile-multilib --libdir=/usr/lib64
63
		cd ${OPWD}
64
		ABI=${OABI}
65
		unset OCFLAGS
66
		unset OPWD
67
		unset OABI
68
	else
69
		src_compile-multilib
70
	fi
71
}
72
73
src_compile-multilib() {
45
74
46
	[ "${ARCH}" == "alpha" -a "${CC}" == "ccc" ] && \
75
	[ "${ARCH}" == "alpha" -a "${CC}" == "ccc" ] && \
47
		die "Dont compile fontconfig with ccc, it doesnt work very well"
76
		die "Dont compile fontconfig with ccc, it doesnt work very well"
48
77
49
	# disable docs only disables docs generation (!)
78
	# disable docs only disables docs generation (!)
50
	econf --disable-docs \
79
	econf ${1} --disable-docs \
51
		--with-docdir=/usr/share/doc/${PF} \
80
		--with-docdir=/usr/share/doc/${PF} \
52
		--x-includes=/usr/X11R6/include \
81
		--x-includes=/usr/X11R6/include \
53
		--x-libraries=/usr/X11R6/lib \
82
		--x-libraries=/usr/X11R6/lib \
Lines 64-69 Link Here
64
}
93
}
65
94
66
src_install() {
95
src_install() {
96
	if use amd64 && has_multilib_profile; then
97
		local OABI=${ABI}
98
		local OPWD=$PWD
99
		ABI="x86"
100
		cd ${S}-x86
101
		src_install-multilib
102
		ABI="amd64"
103
		cd ${S}-amd64
104
		src_install-multilib
105
		cd ${OPWD}
106
		ABI=${OABI}
107
		unset OPWD
108
		unset OABI
109
	else
110
		src_install-multilib
111
	fi
112
}
113
114
src_install-multilib() {
67
115
68
	make DESTDIR=${D} install || die
116
	make DESTDIR=${D} install || die
69
117

Return to bug 83811