summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2011-01-29 10:58:47 +0000
committerUlrich Müller <ulm@gentoo.org>2011-01-29 10:58:47 +0000
commit0c427d5bc14a9dbeb5f9890ca35498f0d17c6cc7 (patch)
tree03931cad9b02562afd6d925d4ca0df48ac5d479d /x11-libs/openmotif
parentMove forward ~ppc keyword, not clear why this was dropped in the first place. (diff)
downloadgentoo-2-0c427d5bc14a9dbeb5f9890ca35498f0d17c6cc7.tar.gz
gentoo-2-0c427d5bc14a9dbeb5f9890ca35498f0d17c6cc7.tar.bz2
gentoo-2-0c427d5bc14a9dbeb5f9890ca35498f0d17c6cc7.zip
By default, disable building of static libs. Fix automake call in 2.2.3.
(Portage version: 2.1.9.35/cvs/Linux x86_64)
Diffstat (limited to 'x11-libs/openmotif')
-rw-r--r--x11-libs/openmotif/ChangeLog6
-rw-r--r--x11-libs/openmotif/openmotif-2.2.3-r11.ebuild6
-rw-r--r--x11-libs/openmotif/openmotif-2.3.3.ebuild5
3 files changed, 11 insertions, 6 deletions
diff --git a/x11-libs/openmotif/ChangeLog b/x11-libs/openmotif/ChangeLog
index 66458e2c1e28..64bb5129c744 100644
--- a/x11-libs/openmotif/ChangeLog
+++ b/x11-libs/openmotif/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for x11-libs/openmotif
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/ChangeLog,v 1.258 2011/01/15 19:44:24 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/ChangeLog,v 1.259 2011/01/29 10:58:47 ulm Exp $
+
+ 29 Jan 2011; Ulrich Mueller <ulm@gentoo.org> openmotif-2.2.3-r11.ebuild,
+ openmotif-2.3.3.ebuild:
+ By default, disable building of static libs. Fix automake call in 2.2.3.
15 Jan 2011; Kacper Kowalik <xarthisius@gentoo.org>
openmotif-2.3.3.ebuild:
diff --git a/x11-libs/openmotif/openmotif-2.2.3-r11.ebuild b/x11-libs/openmotif/openmotif-2.2.3-r11.ebuild
index 2921ac5a14da..1cb97b47a556 100644
--- a/x11-libs/openmotif/openmotif-2.2.3-r11.ebuild
+++ b/x11-libs/openmotif/openmotif-2.2.3-r11.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.2.3-r11.ebuild,v 1.3 2011/01/01 21:22:58 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.2.3-r11.ebuild,v 1.4 2011/01/29 10:58:47 ulm Exp $
EAPI=3
@@ -40,7 +40,7 @@ src_prepare() {
sed -i -e '/^SUBDIRS/{:x;/\\$/{N;bx;};s/=.*/= lib clients/;}' Makefile.am
sed -i -e '/^SUBDIRS/{:x;/\\$/{N;bx;};s/=.*/= uil/;}' clients/Makefile.am
- eautoreconf
+ AM_OPTS="--force-missing" eautoreconf
}
src_configure() {
@@ -56,7 +56,7 @@ src_configure() {
# feel free to fix properly if you care
append-flags -fno-strict-aliasing
- econf --with-x
+ econf --with-x --disable-static
}
src_compile() {
diff --git a/x11-libs/openmotif/openmotif-2.3.3.ebuild b/x11-libs/openmotif/openmotif-2.3.3.ebuild
index 7f8c17c285a8..f299207214cd 100644
--- a/x11-libs/openmotif/openmotif-2.3.3.ebuild
+++ b/x11-libs/openmotif/openmotif-2.3.3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.3.3.ebuild,v 1.14 2011/01/15 19:44:24 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.3.3.ebuild,v 1.15 2011/01/29 10:58:47 ulm Exp $
EAPI="3"
@@ -13,7 +13,7 @@ SRC_URI="ftp://ftp.ics.com/openmotif/${PV%.*}/${PV}/${P}.tar.gz"
LICENSE="MOTIF MIT"
SLOT="0"
KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~ppc-aix ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc examples jpeg png unicode xft"
+IUSE="doc examples jpeg png static-libs unicode xft"
# license allows distribution only for "open source operating systems"
RESTRICT="!kernel_linux? (
!kernel_FreeBSD? (
@@ -116,6 +116,7 @@ src_configure() {
fi
econf --with-x \
+ $(use_enable static-libs static) \
$(use_enable unicode utf8) \
$(use_enable xft) \
$(use_enable jpeg) \