[gentoo-commits] gentoo-x86 commit in sci-visualization/gnuplot: ChangeLog gnuplot-4.2.5-r1.ebuild

["Ulrich Mueller (ulm)" <ulm@gentoo.org>]

ulm         09/08/07 22:17:07

  Modified:             ChangeLog gnuplot-4.2.5-r1.ebuild
  Log:
  Some changes related to wxwidgets.eclass, bug 280112.
  (Portage version: 2.2_rc33/cvs/Linux i686)

Revision  Changes    Path
1.113                sci-visualization/gnuplot/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/gnuplot/ChangeLog?rev=1.113&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/gnuplot/ChangeLog?rev=1.113&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/gnuplot/ChangeLog?r1=1.112&r2=1.113

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/ChangeLog,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- ChangeLog	1 Aug 2009 12:08:20 -0000	1.112
+++ ChangeLog	7 Aug 2009 22:17:07 -0000	1.113
@@ -1,6 +1,11 @@
 # ChangeLog for sci-visualization/gnuplot
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/ChangeLog,v 1.112 2009/08/01 12:08:20 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/ChangeLog,v 1.113 2009/08/07 22:17:07 ulm Exp $
+
+  07 Aug 2009; Ulrich Mueller <ulm@gentoo.org> gnuplot-4.2.5-r1.ebuild:
+  Move code related to wxwidgets.eclass back to src_configure (it had been
+  moved to global scope for 4.2.4-r1). Depend on wxGTK:2.8[X]. Thanks to
+  darkside and dirtyepic, bug 280112.
 
   01 Aug 2009; Sébastien Fabbro <bicatali@gentoo.org>
   gnuplot-4.2.3-r2.ebuild, gnuplot-4.2.4-r1.ebuild, gnuplot-4.2.5.ebuild,



1.4                  sci-visualization/gnuplot/gnuplot-4.2.5-r1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/gnuplot/gnuplot-4.2.5-r1.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/gnuplot/gnuplot-4.2.5-r1.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/gnuplot/gnuplot-4.2.5-r1.ebuild?r1=1.3&r2=1.4

Index: gnuplot-4.2.5-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/gnuplot-4.2.5-r1.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gnuplot-4.2.5-r1.ebuild	1 Aug 2009 12:08:20 -0000	1.3
+++ gnuplot-4.2.5-r1.ebuild	7 Aug 2009 22:17:07 -0000	1.4
@@ -1,9 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/gnuplot-4.2.5-r1.ebuild,v 1.3 2009/08/01 12:08:20 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/gnuplot-4.2.5-r1.ebuild,v 1.4 2009/08/07 22:17:07 ulm Exp $
 
 EAPI=2
-WX_GTK_VER="2.8"
 
 inherit autotools elisp-common eutils multilib wxwidgets
 
@@ -36,7 +35,7 @@
 	svga? ( media-libs/svgalib )
 	readline? ( >=sys-libs/readline-4.2 )
 	plotutils? ( media-libs/plotutils )
-	wxwidgets? ( =x11-libs/wxGTK-2.8*
+	wxwidgets? ( x11-libs/wxGTK:2.8[X]
 		>=x11-libs/cairo-0.9
 		>=x11-libs/pango-1.10.3
 		>=x11-libs/gtk+-2.8 )"
@@ -47,10 +46,6 @@
 E_SITEFILE="50${PN}-gentoo.el"
 TEXMF="/usr/share/texmf-site"
 
-pkg_setup() {
-	use wxwidgets && wxwidgets_pkg_setup
-}
-
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-4.2.2-disable_texi_generation.patch #194216
 	epatch "${FILESDIR}"/${PN}-4.2.3-app-defaults.patch #219323
@@ -74,6 +69,11 @@
 			-e '/^SUBDIRS/ s/LaTeX//' share/LaTeX/Makefile.in || die
 	fi
 
+	if use wxwidgets; then
+		WX_GTK_VER="2.8"
+		need-wxwidgets unicode
+	fi
+
 	local myconf="--with-gihdir=/usr/share/${PN}/gih"
 
 	myconf="${myconf} $(use_with X x)"