Force usage of wxGTK-2.4 by using wxgtk2-2.4-config script. Fix broken linkage when --as-needed is used.

Package-Manager: portage-2.1.1-r1

4 files changed, 43 insertions, 11 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/Manifest b/net-dialup/multiimonc/Manifest
index c0392cc61544..718fda208f91 100644
--- a/net-dialup/multiimonc/Manifest
+++ b/net-dialup/multiimonc/Manifest
@@ -1,16 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 0.3.6-TextScrollWindow.diff 731 RMD160 218c92e7d156f6281eae08f1988ff45ab04a7782 SHA1 e6f178a855d0a1c43fc7e634c873c211ab9a066a SHA256 0a75d0b767f66925d2cc7b054714386a600d7800c4e04c1a1195607b5a435c41
 MD5 27a94c69d14897cce8aad4061b77b3f1 files/0.3.6-TextScrollWindow.diff 731
 RMD160 218c92e7d156f6281eae08f1988ff45ab04a7782 files/0.3.6-TextScrollWindow.diff 731
 SHA256 0a75d0b767f66925d2cc7b054714386a600d7800c4e04c1a1195607b5a435c41 files/0.3.6-TextScrollWindow.diff 731
+AUX multiimonc-0.3.6-as-needed.patch 495 RMD160 c8b48e039d3c093e26b4c58e519d6824fd7edbb5 SHA1 2c1410e801d5cc448c79fd467d2b1c065b671e0b SHA256 cbec4f44e1eb45b3ba337b4ed9a2683cce7c5fe8d61984a0b885581110342478
+MD5 bfa98c69a04152cd7b22942eaf0abd88 files/multiimonc-0.3.6-as-needed.patch 495
+RMD160 c8b48e039d3c093e26b4c58e519d6824fd7edbb5 files/multiimonc-0.3.6-as-needed.patch 495
+SHA256 cbec4f44e1eb45b3ba337b4ed9a2683cce7c5fe8d61984a0b885581110342478 files/multiimonc-0.3.6-as-needed.patch 495
 DIST MultiImonC-0.3.6.tar.bz2 157788 RMD160 a35e8fb244c1032be989a395ef255f71d4f38033 SHA1 37442819edea98a472061f9fe0912ccf135a51db SHA256 26229209c65d7ea6c96c1aa44f918187c7a8be23e02286305b683187a74f672a
-EBUILD multiimonc-0.3.6.ebuild 844 RMD160 1413c6e3bc7b0c11574614eb07f5fdb7ed6d643c SHA1 de74143869662c4f9189c19f2964519bf0cde957 SHA256 337d8cc048d34c0d70322ebef39e8cc5da8fd58493aacd5e155dbab624dd6858
-MD5 6caf4c7c6a9e44e324d635727a1b87ef multiimonc-0.3.6.ebuild 844
-RMD160 1413c6e3bc7b0c11574614eb07f5fdb7ed6d643c multiimonc-0.3.6.ebuild 844
-SHA256 337d8cc048d34c0d70322ebef39e8cc5da8fd58493aacd5e155dbab624dd6858 multiimonc-0.3.6.ebuild 844
-MISC ChangeLog 2924 RMD160 e3c5fb738509f3827cb820ad6e623bc400f8f751 SHA1 440a87b0832ca71fec1ea8a22bde7c97382b0b1f SHA256 dfd54e6a219c596869dc036ea129655fa5a2530bf4b5273041046e60f21bcb4c
-MD5 e34ffcd845a03b42a715009858145401 ChangeLog 2924
-RMD160 e3c5fb738509f3827cb820ad6e623bc400f8f751 ChangeLog 2924
-SHA256 dfd54e6a219c596869dc036ea129655fa5a2530bf4b5273041046e60f21bcb4c ChangeLog 2924
+EBUILD multiimonc-0.3.6.ebuild 945 RMD160 7aa6dd28f92d014fee7cbec122d50ca6f68a4468 SHA1 679777138cca74ff05f0bee3f0253046cb4f28b9 SHA256 b15f164987e7bfc1ca12ca349290816861abb6b4c5e978bdc14e8e9c2c4d73b0
+MD5 8ad9c64c500a2a134fb91be324f4e80d multiimonc-0.3.6.ebuild 945
+RMD160 7aa6dd28f92d014fee7cbec122d50ca6f68a4468 multiimonc-0.3.6.ebuild 945
+SHA256 b15f164987e7bfc1ca12ca349290816861abb6b4c5e978bdc14e8e9c2c4d73b0 multiimonc-0.3.6.ebuild 945
+MISC ChangeLog 3149 RMD160 9e3f01540250d67a8dc41f9a88e183a11618adfe SHA1 ead428c88cfe3203ad9666f391eedf2b45ecae8d SHA256 c27e30aaaf3d300d44275012dc9ced55791777ceae536a02a33e68103e0aa922
+MD5 6dc7e59c925f091ad4e25402d2e0234f ChangeLog 3149
+RMD160 9e3f01540250d67a8dc41f9a88e183a11618adfe ChangeLog 3149
+SHA256 c27e30aaaf3d300d44275012dc9ced55791777ceae536a02a33e68103e0aa922 ChangeLog 3149
 MISC metadata.xml 265 RMD160 b9d964d363483413084bdbb54678b177153c3178 SHA1 bb67d715e17b8b2555653fd9d04436b273117f86 SHA256 c98e123a347feaa228796478d41d3616c6f943dab5e55decad4c402e2104eddb
 MD5 105890931c84b395ad1cfc353cf3dbad metadata.xml 265
 RMD160 b9d964d363483413084bdbb54678b177153c3178 metadata.xml 265
@@ -18,3 +25,10 @@ SHA256 c98e123a347feaa228796478d41d3616c6f943dab5e55decad4c402e2104eddb metadata
 MD5 4cf22549a76b4daab52336df794aed7a files/digest-multiimonc-0.3.6 253
 RMD160 fa1ea3c0e5166a4b47a20d11bccecd9c16365512 files/digest-multiimonc-0.3.6 253
 SHA256 98996f0c44a0d374db4bbf5e5875165a8f765d1800d2837ad307b907eecf43e3 files/digest-multiimonc-0.3.6 253
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFXwNs3sf9c6kjmR8RAptQAJ9SBudYLvDwDPnzZGWHsCO0vRIIzgCfSBDg
+x0l2PKOxTcviEGGAQ4U/gjw=
+=dW6D
+-----END PGP SIGNATURE-----
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"
 }