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
commitc9f2f659306b3ded6aa005fdc4fc572bc018d7c3 (patch)
tree5675c9d9456866a4256de7c18012010aef2e3c18 /x11-libs
parentFix patch name. (bug #220217) (diff)
downloadhistorical-c9f2f659306b3ded6aa005fdc4fc572bc018d7c3.tar.gz
historical-c9f2f659306b3ded6aa005fdc4fc572bc018d7c3.tar.bz2
historical-c9f2f659306b3ded6aa005fdc4fc572bc018d7c3.zip
Better fix for libtool-2.2 breakage, bug 220599.
Package-Manager: portage-2.1.5_rc7
Diffstat (limited to 'x11-libs')
-rw-r--r--x11-libs/openmotif/ChangeLog5
-rw-r--r--x11-libs/openmotif/Manifest10
-rw-r--r--x11-libs/openmotif/openmotif-2.3.0-r2.ebuild10
3 files changed, 12 insertions, 13 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/Manifest b/x11-libs/openmotif/Manifest
index 8c5d8598e933..15dd9bdc0fc7 100644
--- a/x11-libs/openmotif/Manifest
+++ b/x11-libs/openmotif/Manifest
@@ -9,13 +9,13 @@ AUX openmotif-2.3.0-sensitivity-invisible.patch 6503 RMD160 98ddb9cc9e8c84e28a2d
DIST openmotif-2.3.0-manual.pdf.tgz 4195259 RMD160 45b1a17a653b01ccf0324e0bc70fd1ef5db5a395 SHA1 1d0f55928ad65ee321564ba962b1608cfd83bb96 SHA256 49692fd4d5441d2dbb5ca36199b209c8503452fda9b36e929d1aa3673bffaecb
DIST openmotif-2.3.0.tar.gz 5661471 RMD160 317c8d13d59c6fdd4a9f0e3b63000695f6677b6c SHA1 efb5f5fdc4cc43ef6065594f4ebe98953b7af15e SHA256 81d63e4145fab729621cba38bb0e88fccfbcbb5918473319e9b01a6fbe909544
EBUILD openmotif-2.3.0-r1.ebuild 4067 RMD160 257f83771727d649d545a82d9fef9cca1b4d649c SHA1 03f6fd49c6ba94ef2b29917efbedf0fa1763469a SHA256 2a2924d832c6aa289d12a878b27fe751b6c7257cf389ea12e71ad40be591fb33
-EBUILD openmotif-2.3.0-r2.ebuild 4173 RMD160 b51831fb9e9d61a068b674c9007013497f882fd4 SHA1 3e65f0bc52e456afef724ea7c922061a04ceb4c7 SHA256 14e06432f069a3ca66a92231e3b50bb49364fd9efa507d318ee3fac4f814dee4
-MISC ChangeLog 27679 RMD160 b32730b3f238ab36011afe83a3fd7ae4ae87d451 SHA1 2a327855b1f20001b052424cf3f44c44113d681e SHA256 fc93656b6816fd94af1ccf92e9844783e90517876320d4c01bab08566dd49920
+EBUILD openmotif-2.3.0-r2.ebuild 4250 RMD160 a697d290f577e152f76110990b7a2e483d5e58d2 SHA1 c82a58edd5b739358a4fb1be838fa0e800ede893 SHA256 378129c79416bcb0d1ce5710a6cae97b5e8b84cc8f141a8c4b51b54016a3077a
+MISC ChangeLog 27633 RMD160 4b7f75b31108b0aad6c127c576c6bfd09c00a2d0 SHA1 16e93dc3ba2fbc67c108833ac59355e9ed56f497 SHA256 6510d481c28517570a3961c8287e8e3fccc57f37cc57e4896e06e0b521ee426a
MISC metadata.xml 219 RMD160 e4108515c4905448a3f0666974dfe0606bee0527 SHA1 02c240887d922c73610257891793b3bdec27fc8e SHA256 c1572876b54cc63c7b7ecad4c9adf1b6460d166c41e84b1df0322c5df6497ffb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
-iEYEARECAAYFAkggxHIACgkQOeoy/oIi7uzMbQCfZu+3+Kv+4gjfy0LsJgzbazoP
-qTIAoKMUqRKDyXKBmuZBGhUHpUtIc7au
-=Tkx5
+iEYEARECAAYFAkghSzUACgkQOeoy/oIi7uxfzQCcC0evjci+0tyRcdFW+WQGPHwH
+mtoAoJ6Yvr02r/yS/DF1LXA74rg6I42p
+=xzTf
-----END PGP SIGNATURE-----
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() {