diff options
| author |   Jeremy Huddleston <eradicator@gentoo.org> | 2005-03-21 21:50:34 +0000 |
|---|---|---|
| committer | Jeremy Huddleston <eradicator@gentoo.org> | 2005-03-21 21:50:34 +0000 |
| commit | 71c37f2a90565ff211871f55cf94713f47033276 (patch) | |
| tree | 6f8f23ab89bbb3fa33d02a73c7b866bd9ca146e6 /x11-libs | |
| parent | patch it up (Manifest recommit) (diff) | |
| download | gentoo-2-71c37f2a90565ff211871f55cf94713f47033276.tar.gz gentoo-2-71c37f2a90565ff211871f55cf94713f47033276.tar.bz2 gentoo-2-71c37f2a90565ff211871f55cf94713f47033276.zip | |
amd64 cleanups.
(Portage version: 2.0.51.19)
Diffstat (limited to 'x11-libs')
| -rw-r--r-- | x11-libs/openmotif/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-libs/openmotif/openmotif-2.1.30-r11.ebuild | 14 |
2 files changed, 13 insertions, 7 deletions
diff --git a/x11-libs/openmotif/ChangeLog b/x11-libs/openmotif/ChangeLog index a7a96e0d64b9..b1d5f677bee5 100644 --- a/x11-libs/openmotif/ChangeLog +++ b/x11-libs/openmotif/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-libs/openmotif # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/ChangeLog,v 1.102 2005/03/14 13:57:30 lanius Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/ChangeLog,v 1.103 2005/03/21 21:50:34 eradicator Exp $ + + 21 Mar 2005; Jeremy Huddleston <eradicator@gentoo.org> + openmotif-2.1.30-r11.ebuild: + amd64 cleanups. 14 Mar 2005; Heinrich Wendel <lanius@gentoo.org> openmotif-2.1.30-r11.ebuild, openmotif-2.2.3-r5.ebuild: diff --git a/x11-libs/openmotif/openmotif-2.1.30-r11.ebuild b/x11-libs/openmotif/openmotif-2.1.30-r11.ebuild index 03719a0ab8a6..9056414f9f34 100644 --- a/x11-libs/openmotif/openmotif-2.1.30-r11.ebuild +++ b/x11-libs/openmotif/openmotif-2.1.30-r11.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.1.30-r11.ebuild,v 1.5 2005/03/14 13:57:30 lanius Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.1.30-r11.ebuild,v 1.6 2005/03/21 21:50:34 eradicator Exp $ inherit eutils flag-o-matic multilib @@ -24,11 +24,6 @@ DEPEND="${RDEPEND} SLOT="2.1" -pkg_setup() { - # multilib includes don't work right in this package... - [ -n "${ABI}" ] && append-flags "-I/usr/include/gentoo-multilib/${ABI}" -} - src_unpack() { local cfg="${S}/config/cf/site.def" @@ -69,9 +64,16 @@ src_unpack() { epatch ${FILESDIR}/${PN}-2.1.30-imake-ansi.patch epatch ${FILESDIR}/${PN}-2.1.30-uil-bad_grammar_fix.diff use ppc-macos && epatch ${FILESDIR}/${PN}-2.1.30-darwin-netbsd.diff + + if use amd64 && has_multilib_profile && [[ ${ABI} == "amd64" ]] ; then + sed -i 's:__i386__:__x86_64__:g' ${S}/config/cf/*.cf ${S}/config/imake/* ${S}/config/makedepend/* + fi } src_compile() { + # multilib includes don't work right in this package... + has_multilib_profile && append-flags "-I/usr/include/gentoo-multilib/${ABI}" + # glibc-2.3.2-r1/gcc-3.2.3 /w `-mcpu=athlon-xp -O2', right-clicking # in nedit triggers DPMS monitor standby instead of popping up the # context menu. this doesn't happen on my `stable' test partition |