summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlin Năstac <mrness@gentoo.org>2006-11-18 12:58:08 +0000
committerAlin Năstac <mrness@gentoo.org>2006-11-18 12:58:08 +0000
commit6f6ee76918ba7131fc3c00a7b8f8571c8140a30d (patch)
treec92a663529f4e5f3029caac36b4fff8994146473 /net-dialup
parentfix depend for bug #133422 (diff)
downloadgentoo-2-6f6ee76918ba7131fc3c00a7b8f8571c8140a30d.tar.gz
gentoo-2-6f6ee76918ba7131fc3c00a7b8f8571c8140a30d.tar.bz2
gentoo-2-6f6ee76918ba7131fc3c00a7b8f8571c8140a30d.zip
Force usage of wxGTK-2.4 by using wxgtk2-2.4-config script. Fix broken linkage when --as-needed is used.
(Portage version: 2.1.1-r1)
Diffstat (limited to 'net-dialup')
-rw-r--r--net-dialup/multiimonc/ChangeLog7
-rw-r--r--net-dialup/multiimonc/files/multiimonc-0.3.6-as-needed.patch12
-rw-r--r--net-dialup/multiimonc/multiimonc-0.3.6.ebuild5
3 files changed, 21 insertions, 3 deletions
diff --git a/net-dialup/multiimonc/ChangeLog b/net-dialup/multiimonc/ChangeLog
index 2dd2c50d4b39..8c4616308908 100644
--- a/net-dialup/multiimonc/ChangeLog
+++ b/net-dialup/multiimonc/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for net-dialup/multiimonc
# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/multiimonc/ChangeLog,v 1.8 2006/03/12 18:37:26 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/multiimonc/ChangeLog,v 1.9 2006/11/18 12:58:08 mrness Exp $
+
+ 18 Nov 2006; Alin Nastac <mrness@gentoo.org>
+ +files/multiimonc-0.3.6-as-needed.patch, multiimonc-0.3.6.ebuild:
+ Force usage of wxGTK-2.4 by using wxgtk2-2.4-config script. Fix broken
+ linkage when --as-needed is used.
12 Mar 2006; Alin Nastac <mrness@gentoo.org> multiimonc-0.3.6.ebuild:
Remove virtual/libc dependency. Quote $S, $FILESDIR and $D.
diff --git a/net-dialup/multiimonc/files/multiimonc-0.3.6-as-needed.patch b/net-dialup/multiimonc/files/multiimonc-0.3.6-as-needed.patch
new file mode 100644
index 000000000000..d95eea0ee6e3
--- /dev/null
+++ b/net-dialup/multiimonc/files/multiimonc-0.3.6-as-needed.patch
@@ -0,0 +1,12 @@
+diff -Nru MultiImonC-0.3.6.orig/configure.in MultiImonC-0.3.6/configure.in
+--- MultiImonC-0.3.6.orig/configure.in 2005-02-20 13:21:24.000000000 +0200
++++ MultiImonC-0.3.6/configure.in 2006-11-18 14:46:43.311666500 +0200
+@@ -46,7 +46,7 @@
+ CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS"
+ CXXFLAGS="$CXXFLAGS $WX_CXXFLAGS_ONLY -Wall -fno-rtti"
+ CFLAGS="$CFLAGS $WX_CFLAGS_ONLY"
+-LDFLAGS="$LDFLAGS $WX_LIBS"
++LIBS="$LIBS $WX_LIBS"
+
+ WX_PREFIX=`$WX_CONFIG_NAME --prefix`
+ WX_VERSION=`$WX_CONFIG_NAME --version`
diff --git a/net-dialup/multiimonc/multiimonc-0.3.6.ebuild b/net-dialup/multiimonc/multiimonc-0.3.6.ebuild
index 1056708fc63a..3e2ceb6cee9d 100644
--- a/net-dialup/multiimonc/multiimonc-0.3.6.ebuild
+++ b/net-dialup/multiimonc/multiimonc-0.3.6.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/multiimonc/multiimonc-0.3.6.ebuild,v 1.7 2006/03/12 18:37:26 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/multiimonc/multiimonc-0.3.6.ebuild,v 1.8 2006/11/18 12:58:08 mrness Exp $
inherit eutils
@@ -22,10 +22,11 @@ src_unpack() {
cd "${S}/src"
epatch "${FILESDIR}/${PV}-TextScrollWindow.diff" || die "epatch failed"
cd "${S}"
+ epatch "${FILESDIR}/${P}-as-needed.patch" || die "epatch failed"
}
src_compile() {
- econf || die "could not configure"
+ econf --with-wx-config=wxgtk2-2.4-config || die "could not configure"
emake || die "emake failed"
}