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/sys-libs/db/db-4.1.25_p1-r4.ebuild.orig (-2 / +46 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/sys-libs/db/db-4.1.25_p1-r4.ebuild,v 1.17 2005/01/30 19:39:20 pauldv Exp $
3
# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.1.25_p1-r4.ebuild,v 1.17 2005/01/30 19:39:20 pauldv Exp $
4
4
5
inherit eutils gnuconfig db
5
inherit eutils gnuconfig db multilib
6
6
7
#Number of official patches
7
#Number of official patches
8
#PATCHNO=`echo ${PV}|sed -e "s,\(.*_p\)\([0-9]*\),\2,"`
8
#PATCHNO=`echo ${PV}|sed -e "s,\(.*_p\)\([0-9]*\),\2,"`
Lines 30-36 Link Here
30
IUSE="tcltk java doc nocxx bootstrap"
30
IUSE="tcltk java doc nocxx bootstrap"
31
31
32
DEPEND="tcltk? ( dev-lang/tcl )
32
DEPEND="tcltk? ( dev-lang/tcl )
33
	java? ( virtual/jdk )"
33
	java? ( virtual/jdk )
34
	!app-emulation/emul-linux-x86-baselibs"
34
RDEPEND="tcltk? ( dev-lang/tcl )
35
RDEPEND="tcltk? ( dev-lang/tcl )
35
	java? ( virtual/jre )"
36
	java? ( virtual/jre )"
36
37
Lines 48-56 Link Here
48
	epatch ${FILESDIR}/${PN}-4.1.25-java.patch
49
	epatch ${FILESDIR}/${PN}-4.1.25-java.patch
49
50
50
	gnuconfig_update "${S}/../dist"
51
	gnuconfig_update "${S}/../dist"
52
53
	if use amd64 && has_multilib_profile; then
54
		cp -ar ${S} ${S}-x86
55
		mv ${S} ${S}-amd64
56
	fi
51
}
57
}
52
58
53
src_compile() {
59
src_compile() {
60
	if use amd64 && has_multilib_profile; then
61
		local OABI=${ABI}
62
		local OPWD=$PWD
63
		ABI="x86"
64
		cd ${S}-x86
65
		src_compile-multilib
66
		ABI="amd64"
67
		cd ${S}-amd64
68
		src_compile-multilib
69
		ABI=${OABI}
70
		cd ${OPWD}
71
		unset OABI
72
		unset OPWD
73
	else
74
		src_compile-multilib
75
	fi
76
}
77
78
src_compile-multilib() {
54
	addwrite /proc/self/maps
79
	addwrite /proc/self/maps
55
80
56
	local myconf=""
81
	local myconf=""
Lines 91-96 Link Here
91
}
116
}
92
117
93
src_install() {
118
src_install() {
119
	if use amd64 && has_multilib_profile; then
120
		local OABI=${ABI}
121
		local OPWD=$PWD
122
		ABI="x86"
123
		cd ${S}-x86
124
		src_install-multilib
125
		ABI="amd64"
126
		cd ${S}-amd64
127
		src_install-multilib
128
		ABI=${OABI}
129
		cd ${OPWD}
130
		unset OABI
131
		unset OPWD
132
	else
133
		src_install-multilib
134
	fi
135
}
136
137
src_install-multilib() {
94
138
95
	einstall libdir="${D}/usr/$(get_libdir)" || die
139
	einstall libdir="${D}/usr/$(get_libdir)" || die
96
140

Return to bug 83811