summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2008-05-07 06:24:18 +0000
committerUlrich Müller <ulm@gentoo.org>2008-05-07 06:24:18 +0000
commitdd70b66b76726f5b548adecf3cc9965cef92ff66 (patch)
tree0357d2968f8144c9035ab851fdca5b1650536fae /x11-libs/openmotif
parentFix patch name. (bug #220217) (diff)
downloadgentoo-2-dd70b66b76726f5b548adecf3cc9965cef92ff66.tar.gz
gentoo-2-dd70b66b76726f5b548adecf3cc9965cef92ff66.tar.bz2
gentoo-2-dd70b66b76726f5b548adecf3cc9965cef92ff66.zip
Better fix for libtool-2.2 breakage, bug 220599.
(Portage version: 2.1.5_rc7)
Diffstat (limited to 'x11-libs/openmotif')
-rw-r--r--x11-libs/openmotif/ChangeLog5
-rw-r--r--x11-libs/openmotif/openmotif-2.3.0-r2.ebuild10
2 files changed, 7 insertions, 8 deletions
diff --git a/x11-libs/openmotif/ChangeLog b/x11-libs/openmotif/ChangeLog
index 3f00a23cb197..ec1f0385416e 100644
--- a/x11-libs/openmotif/ChangeLog
+++ b/x11-libs/openmotif/ChangeLog
@@ -1,10 +1,9 @@
# ChangeLog for x11-libs/openmotif
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/ChangeLog,v 1.177 2008/05/06 20:49:18 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/ChangeLog,v 1.178 2008/05/07 06:24:18 ulm Exp $
06 May 2008; Ulrich Mueller <ulm@gentoo.org> openmotif-2.3.0-r2.ebuild:
- Call eautoconf and eautomake explicitely, fixes breakage with libtool-2.2,
- bug 220599.
+ Fix breakage with libtool-2.2, bug 220599.
04 May 2008; Ulrich Mueller <ulm@gentoo.org> openmotif-2.3.0-r2.ebuild:
Add X.Org vendor string to aliases for virtual bindings.
diff --git a/x11-libs/openmotif/openmotif-2.3.0-r2.ebuild b/x11-libs/openmotif/openmotif-2.3.0-r2.ebuild
index a8d71d6555b4..e23b3fd2f8d3 100644
--- a/x11-libs/openmotif/openmotif-2.3.0-r2.ebuild
+++ b/x11-libs/openmotif/openmotif-2.3.0-r2.ebuild
@@ -1,8 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.3.0-r2.ebuild,v 1.7 2008/05/06 20:49:18 ulm Exp $
-
-WANT_AUTOMAKE=1.9
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.3.0-r2.ebuild,v 1.8 2008/05/07 06:24:18 ulm Exp $
inherit eutils flag-o-matic multilib autotools
@@ -70,11 +68,13 @@ src_unpack() {
# disable compilation of demo binaries
sed -i -e '/^SUBDIRS/{:x;/\\$/{N;bx;};s/[ \t\n\\]*demos//;}' Makefile.am
+ # fix libtool-2.2 breakage, bug 220599
+ sed -i -e 's/LT_HAVE/FINDXFT_HAVE/g' ac_find_xft.m4
+
# add X.Org vendor string to aliases for virtual bindings
echo -e '"The X.Org Foundation"\t\t\t\t\tpc' >>bindings/xmbind.alias
- eautoconf
- eautomake
+ AT_M4DIR=. eautoreconf
}
src_compile() {