--- /usr/portage/sys-libs/pam/pam-0.77-r6.ebuild.orig 2005-03-03 14:52:54.885928700 +0100 +++ /usr/portage/sys-libs/pam/pam-0.77-r6.ebuild 2005-03-03 16:48:08.652526594 +0100 @@ -16,7 +16,8 @@ >=sys-devel/autoconf-2.59 >=sys-devel/automake-1.6 >=sys-devel/flex-2.5.4a-r5 - pwdb? ( >=sys-libs/pwdb-0.62 )" + pwdb? ( >=sys-libs/pwdb-0.62 ) + !app-emulation/emul-linux-x86-baselibs" # Have python sandbox issues currently ... # doc? ( app-text/sgmltools-lite ) @@ -32,7 +33,7 @@ # link statically to it - (09 Nov 2003). #inherit needs to be after DEPEND definition to protect RDEPEND -inherit gcc eutils flag-o-matic gnuconfig +inherit gcc eutils flag-o-matic gnuconfig multilib # Note that we link to static versions of glib (pam_console.so) # and pwdb (pam_pwdb.so) ... @@ -99,9 +100,41 @@ cp /usr/share/automake/install-sh . || die export WANT_AUTOCONF=2.5 autoconf || die + + 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 OS=${S} + local OPWD=$PWD + ABI="x86" + S=${OS}-x86 + cd ${S} + src_compile-multilib + ABI="amd64" + S=${OS}-amd64 + cd ${WORKDIR} + cd db-${BDB_VER}/dist || die + make distclean || die + cd ${S} + src_compile-multilib + S=${OS} + cd ${OPWD} + ABI=${OABI} + unset OPWD + unset OS + unset OABI + else + src_compile-multilib + fi +} + +src_compile-multilib() { export CFLAGS="${CFLAGS} -fPIC" if use berkdb @@ -210,6 +243,30 @@ } src_install() { + if use amd64 && has_multilib_profile; then + local OABI=${ABI} + local OS=${S} + local OPWD=$PWD + ABI="x86" + S=${OS}-x86 + cd ${S} + src_install-multilib + ABI="amd64" + S=${OS}-amd64 + cd ${S} + src_install-multilib + S=${OS} + cd ${OPWD} + ABI=${OABI} + unset OPWD + unset OS + unset OABI + else + src_install-multilib + fi +} + +src_install-multilib() { local x= einfo "Installing Linux-PAM ${PV}..."