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/readline/readline-4.3-r5.ebuild.orig (-3 / +45 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/readline/readline-4.3-r5.ebuild,v 1.22 2005/01/27 03:36:04 vapier Exp $
3
# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/readline-4.3-r5.ebuild,v 1.22 2005/01/27 03:36:04 vapier Exp $
4
4
5
inherit eutils gnuconfig
5
inherit eutils gnuconfig multilib
6
6
7
# Official patches
7
# Official patches
8
PLEVEL="x001 x002 x003 x004 x005"
8
PLEVEL="x001 x002 x003 x004 x005"
Lines 20-26 Link Here
20
# We must be certain that we have a bash that is linked
20
# We must be certain that we have a bash that is linked
21
# to its internal readline, else we may get problems.
21
# to its internal readline, else we may get problems.
22
DEPEND=">=app-shells/bash-2.05b-r2
22
DEPEND=">=app-shells/bash-2.05b-r2
23
	>=sys-libs/ncurses-5.2-r2"
23
	>=sys-libs/ncurses-5.2-r2
24
	!app-emulation/emul-linux-x86-baselibs"
24
25
25
src_unpack() {
26
src_unpack() {
26
	unpack ${P}.tar.gz
27
	unpack ${P}.tar.gz
Lines 35-43 Link Here
35
	sed -i -e 's:^SHLIB_LIBS=:SHLIB_LIBS=-lncurses:' support/shobj-conf || die "sed"
36
	sed -i -e 's:^SHLIB_LIBS=:SHLIB_LIBS=-lncurses:' support/shobj-conf || die "sed"
36
37
37
	gnuconfig_update
38
	gnuconfig_update
39
	if use amd64 && has_multilib_profile; then
40
		cp -ar ${S} ${S}-x86
41
		mv ${S} ${S}-amd64
42
	fi
38
}
43
}
39
44
40
src_compile() {
45
src_compile() {
46
	if use amd64 && has_multilib_profile; then
47
		local OABI=${ABI}
48
		local OPWD=${PWD}
49
		ABI="x86"
50
		cd ${S}-x86
51
		src_compile-multilib
52
		ABI="amd64"
53
		cd ${S}-amd64
54
		src_compile-multilib
55
		ABI=${OABI}
56
		cd ${OPWD}
57
		unset OABI
58
		unset OPWD
59
	else
60
		src_compile-multilib
61
	fi
62
}
63
64
src_compile-multilib() {
41
	# the --libdir= is needed because if lib64 is a directory, it will default
65
	# the --libdir= is needed because if lib64 is a directory, it will default
42
	# to using that... even if CONF_LIBDIR isnt set or we're using a version
66
	# to using that... even if CONF_LIBDIR isnt set or we're using a version
43
	# of portage without CONF_LIBDIR support.
67
	# of portage without CONF_LIBDIR support.
Lines 48-55 Link Here
48
	emake || die
72
	emake || die
49
}
73
}
50
74
51
52
src_install() {
75
src_install() {
76
	if use amd64 && has_multilib_profile; then
77
		local OABI=${ABI}
78
		local OPWD=${PWD}
79
		ABI="x86"
80
		cd ${S}-x86
81
		src_install-multilib
82
		ABI="amd64"
83
		cd ${S}-amd64
84
		src_install-multilib
85
		ABI=${OABI}
86
		cd ${OPWD}
87
		unset OABI
88
		unset OPWD
89
	else
90
		src_install-multilib
91
	fi
92
}
93
94
src_install-multilib() {
53
	# portage 2.0.50's einstall causes sandbox violations if lib64 is a
95
	# portage 2.0.50's einstall causes sandbox violations if lib64 is a
54
	# directory, since readline's configure automatically sets libdir for you.
96
	# directory, since readline's configure automatically sets libdir for you.
55
	make DESTDIR="${D}" install || die
97
	make DESTDIR="${D}" install || die

Return to bug 83811