summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2009-08-07 22:17:07 +0000
committerUlrich Müller <ulm@gentoo.org>2009-08-07 22:17:07 +0000
commit38afa00b2347521a133a570090a675d3b0485759 (patch)
tree04eeaadd2d263d9f09c94c945c790682e6be0ba8 /sci-visualization/gnuplot/gnuplot-4.2.5-r1.ebuild
parentVersion bump (fixes bug #279641). (diff)
downloadgentoo-2-38afa00b2347521a133a570090a675d3b0485759.tar.gz
gentoo-2-38afa00b2347521a133a570090a675d3b0485759.tar.bz2
gentoo-2-38afa00b2347521a133a570090a675d3b0485759.zip
Some changes related to wxwidgets.eclass, bug 280112.
(Portage version: 2.2_rc33/cvs/Linux i686)
Diffstat (limited to 'sci-visualization/gnuplot/gnuplot-4.2.5-r1.ebuild')
-rw-r--r--sci-visualization/gnuplot/gnuplot-4.2.5-r1.ebuild14
1 files changed, 7 insertions, 7 deletions
diff --git a/sci-visualization/gnuplot/gnuplot-4.2.5-r1.ebuild b/sci-visualization/gnuplot/gnuplot-4.2.5-r1.ebuild
index a2179205f11d..396157f68d00 100644
--- a/sci-visualization/gnuplot/gnuplot-4.2.5-r1.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-4.2.5-r1.ebuild
@@ -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 @@ RDEPEND="
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 @@ S="${WORKDIR}/${MY_P}"
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 @@ src_configure() {
-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)"