(#154673) Properly support wxGTK rather than autodetecting it.

Package-Manager: portage-2.1.2_rc1-r5

3 files changed, 27 insertions, 13 deletions

diff --git a/sci-visualization/gnuplot/ChangeLog b/sci-visualization/gnuplot/ChangeLog
index d9dbec214ee1..0946d1b6d768 100644
--- a/sci-visualization/gnuplot/ChangeLog
+++ b/sci-visualization/gnuplot/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-visualization/gnuplot
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/ChangeLog,v 1.5 2006/10/10 21:48:15 g2boojum Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/ChangeLog,v 1.6 2006/11/13 02:49:20 dberkholz Exp $
+
+  13 Nov 2006; Donnie Berkholz <dberkholz@gentoo.org>;
+  gnuplot-4.2_rc1.ebuild:
+  (#154673) Properly support wxGTK rather than autodetecting it.
 
 *gnuplot-4.2_rc1 (10 Oct 2006)
 
diff --git a/sci-visualization/gnuplot/Manifest b/sci-visualization/gnuplot/Manifest
index 8f6a17c6b1f9..b901c8511b94 100644
--- a/sci-visualization/gnuplot/Manifest
+++ b/sci-visualization/gnuplot/Manifest
@@ -16,14 +16,14 @@ EBUILD gnuplot-4.0-r1.ebuild 4035 RMD160 da631704672b672fd5df3227c644c1d0ea2f2ef
 MD5 35f3a02f93ddb452f196cc9b1182b90b gnuplot-4.0-r1.ebuild 4035
 RMD160 da631704672b672fd5df3227c644c1d0ea2f2eff gnuplot-4.0-r1.ebuild 4035
 SHA256 cba1f1628bead2a98303d72dc9d404bfc36f5ea10212edae13997f61a8ae150e gnuplot-4.0-r1.ebuild 4035
-EBUILD gnuplot-4.2_rc1.ebuild 4044 RMD160 bbfd1d2de87e9454c19ea2120c890dbd11de3a51 SHA1 dbf270aa7a1b8b31ea5031872af8b454fce33ad6 SHA256 b23a1a3443be7686662880638e8314382fd999f2f324a25a8b201545948f21a1
-MD5 4fdccb5844be38c51b397f6d717e1b40 gnuplot-4.2_rc1.ebuild 4044
-RMD160 bbfd1d2de87e9454c19ea2120c890dbd11de3a51 gnuplot-4.2_rc1.ebuild 4044
-SHA256 b23a1a3443be7686662880638e8314382fd999f2f324a25a8b201545948f21a1 gnuplot-4.2_rc1.ebuild 4044
-MISC ChangeLog 7188 RMD160 683a242e05dcc5f12de41ec83de5166aec1f8198 SHA1 8f3a08f2e0cc93aa0d98c9ba91de8aa46c79bb08 SHA256 6afc7f78c8fb1a61c7b7d711d64ff2303e3e9c38ebcfe2ec82bc29a47208e498
-MD5 d05c1b66021b8a35b2c18c9200589e15 ChangeLog 7188
-RMD160 683a242e05dcc5f12de41ec83de5166aec1f8198 ChangeLog 7188
-SHA256 6afc7f78c8fb1a61c7b7d711d64ff2303e3e9c38ebcfe2ec82bc29a47208e498 ChangeLog 7188
+EBUILD gnuplot-4.2_rc1.ebuild 4298 RMD160 b6b360a88811382b2f5b1921cc018ff0c357724a SHA1 1c9b2461830f6c6e5aefee1b1c034a8070b5abe7 SHA256 bdc2bde77c0dc996d1fbb4e6bdf93caa8d6d7c332fc7fbed8ddda66faedbcc6e
+MD5 9657204b67b3caa5cfaa4f1087058e14 gnuplot-4.2_rc1.ebuild 4298
+RMD160 b6b360a88811382b2f5b1921cc018ff0c357724a gnuplot-4.2_rc1.ebuild 4298
+SHA256 bdc2bde77c0dc996d1fbb4e6bdf93caa8d6d7c332fc7fbed8ddda66faedbcc6e gnuplot-4.2_rc1.ebuild 4298
+MISC ChangeLog 7336 RMD160 26cf49fdb004457ab8a997cc963b2a93f24402f9 SHA1 636bd1798c930f3b7ab0fbfed98fd3405fe57214 SHA256 43d7f109457214f5a1f2a357f1e91b26675c5f8248c40fa333fe25f611c224dc
+MD5 44eff9de61d7fd0907b2f8e96e438fb2 ChangeLog 7336
+RMD160 26cf49fdb004457ab8a997cc963b2a93f24402f9 ChangeLog 7336
+SHA256 43d7f109457214f5a1f2a357f1e91b26675c5f8248c40fa333fe25f611c224dc ChangeLog 7336
 MISC metadata.xml 220 RMD160 f220b5db3b6de3f59e08ab45bfaae138eaae63ee SHA1 e3b505cf1accaf86c17fdc78a3c98b08917d56ee SHA256 bcdae0f0c39207d696ad66e9c264b241cc25453afeadc3f6eb194a7e4452f770
 MD5 0d0ccbc08efef8b97818204479649574 metadata.xml 220
 RMD160 f220b5db3b6de3f59e08ab45bfaae138eaae63ee metadata.xml 220
diff --git a/sci-visualization/gnuplot/gnuplot-4.2_rc1.ebuild b/sci-visualization/gnuplot/gnuplot-4.2_rc1.ebuild
index 1d89518bff29..1e3a6a32c2a2 100644
--- a/sci-visualization/gnuplot/gnuplot-4.2_rc1.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-4.2_rc1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/gnuplot-4.2_rc1.ebuild,v 1.1 2006/10/10 21:48:15 g2boojum Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/gnuplot-4.2_rc1.ebuild,v 1.2 2006/11/13 02:49:20 dberkholz Exp $
 
-inherit eutils elisp-common
+inherit eutils elisp-common wxwidgets
 
 MY_P="${P/_/.}"
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/gnuplot/${MY_P}.tar.gz"
 LICENSE="gnuplot"
 SLOT="0"
 KEYWORDS="alpha amd64 ~hppa ia64 ppc ppc-macos ppc64 s390 sparc x86"
-IUSE="doc emacs gd ggi pdf plotutils png readline svga X xemacs"
+IUSE="doc emacs gd ggi pdf plotutils png readline svga X xemacs wxwindows"
 
 DEPEND="
 	xemacs? ( virtual/xemacs )
@@ -26,7 +26,11 @@ DEPEND="
 	X? ( || ( x11-libs/libXaw virtual/x11 ) )
 	svga? ( media-libs/svgalib )
 	readline? ( >=sys-libs/readline-4.2 )
-	plotutils? ( media-libs/plotutils )"
+	plotutils? ( media-libs/plotutils )
+	wxwindows? ( =x11-libs/wxGTK-2.6*
+		>=x11-libs/cairo-0.9
+		>=x11-libs/pango-1.10.3
+		>=x11-libs/gtk+-2.8 )"
 
 S=${WORKDIR}/${MY_P}
 
@@ -40,11 +44,17 @@ E_SITEFILE="50gnuplot-gentoo.el"
 #}
 
 src_compile() {
+	if use wxwindows; then
+		WX_GTK_VER="2.6"
+		need-wxwidgets unicode
+	fi
+
 	local myconf="--with-gihdir=/usr/share/${PN}/gih"
 
 	myconf="${myconf} $(use_with X x)"
 	myconf="${myconf} $(use_with svga linux-vga)"
 	myconf="${myconf} $(use_with gd)"
+	myconf="${myconf} $(use_with wxwindows wxwidgets)"
 	myconf="${myconf} $(use_with plotutils plot /usr/lib)"
 	myconf="${myconf} $(use_with png png /usr/lib)"
 	myconf="${myconf} $(use_with pdf pdf /usr/lib)"