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/dev-libs/popt/popt-1.7-r1.ebuild.orig (-4 / +47 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/dev-libs/popt/popt-1.7-r1.ebuild,v 1.19 2005/02/21 05:04:30 vapier Exp $
3
# $Header: /var/cvsroot/gentoo-x86/dev-libs/popt/popt-1.7-r1.ebuild,v 1.19 2005/02/21 05:04:30 vapier Exp $
4
4
5
inherit libtool eutils
5
inherit libtool eutils multilib
6
6
7
DESCRIPTION="Parse Options - Command line parser"
7
DESCRIPTION="Parse Options - Command line parser"
8
HOMEPAGE="http://www.rpm.org/"
8
HOMEPAGE="http://www.rpm.org/"
Lines 13-33 Link Here
13
KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 ppc-macos s390 sh sparc x86"
13
KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 ppc-macos s390 sh sparc x86"
14
IUSE="nls"
14
IUSE="nls"
15
15
16
DEPEND="nls? ( sys-devel/gettext )"
16
DEPEND="nls? ( sys-devel/gettext )
17
		!app-emulation/emul-linux-x86-baselibs"
17
18
18
src_unpack() {
19
src_unpack() {
19
	unpack ${A}
20
	unpack ${A}
20
	cd "${S}"
21
	cd "${S}"
21
	elibtoolize
22
	elibtoolize
22
	use nls || touch ../rpm.c
23
	use nls || touch ../rpm.c
24
	if use amd64 && has_multilib_profile; then
25
		cp -ar ${S} ${S}-x86
26
		mv ${S} ${S}-amd64
27
	fi
23
}
28
}
24
29
25
src_compile() {
30
src_compile() {
26
	econf $(use_enable nls) || die
31
	if use amd64 && has_multilib_profile; then
32
		local OABI=${ABI}
33
		local OPWD=$PWD
34
		ABI="x86"
35
		cd ${S}-x86
36
		src_compile-multilib --libdir=/usr/lib32
37
		ABI="amd64"
38
		cd ${S}-amd64
39
		src_compile-multilib --libdir=/usr/lib64
40
		ABI=${OABI}
41
		cd ${OPWD}
42
		unset OABI
43
		unset OPWD
44
	else
45
		src_compile-multilib
46
	fi
47
}
48
49
src_compile-multilib() {
50
	econf ${1} $(use_enable nls) || die
27
	emake || die "emake failed"
51
	emake || die "emake failed"
28
}
52
}
29
53
30
src_install() {
54
src_install() {
31
	einstall || die
55
	if use amd64 && has_multilib_profile; then
56
		local OABI=${ABI}
57
		local OPWD=$PWD
58
		ABI="x86"
59
		cd ${S}-x86
60
		src_install-multilib
61
		ABI="amd64"
62
		cd ${S}-amd64
63
		src_install-multilib
64
		ABI=${OABI}
65
		cd ${OPWD}
66
		unset OABI
67
		unset OPWD
68
	else
69
		src_install-multilib
70
	fi
71
}
72
73
src_install-multilib() {
74
	einstall libdir=${D}/usr/$(get_libdir) || die
32
	dodoc CHANGES README
75
	dodoc CHANGES README
33
}
76
}

Return to bug 83811