commit: 43c1ed5917557811e7ae466ad2c5c3ff638c4a1a
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 7 13:14:13 2021 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Wed Apr 7 13:14:13 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43c1ed59
sci-visualization/gnuplot: Set WX_GTK_VER before inherit
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: David Seifert <soap <AT> gentoo.org>
sci-visualization/gnuplot/gnuplot-5.4.1-r1.ebuild | 8 +++-----
sci-visualization/gnuplot/gnuplot-5.4.1-r2.ebuild | 8 +++-----
sci-visualization/gnuplot/gnuplot-5.5.9999-r1.ebuild | 8 +++-----
3 files changed, 9 insertions(+), 15 deletions(-)
diff --git a/sci-visualization/gnuplot/gnuplot-5.4.1-r1.ebuild
b/sci-visualization/gnuplot/gnuplot-5.4.1-r1.ebuild
index b9535e91c7e..ff93661495b 100644
--- a/sci-visualization/gnuplot/gnuplot-5.4.1-r1.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-5.4.1-r1.ebuild
@@ -4,6 +4,7 @@
EAPI=7
LUA_COMPAT=( lua5-{1,2,3} )
+WX_GTK_VER="3.0-gtk3"
inherit autotools flag-o-matic lua-single readme.gentoo-r1 toolchain-funcs
wxwidgets
@@ -52,7 +53,7 @@ RDEPEND="
readline? ( sys-libs/readline:0= )
libcerf? ( sci-libs/libcerf )
wxwidgets? (
- x11-libs/wxGTK:3.0-gtk3[X]
+ x11-libs/wxGTK:${WX_GTK_VER}[X]
x11-libs/cairo
x11-libs/pango
x11-libs/gtk+:3 )
@@ -112,10 +113,7 @@ src_configure() {
sed -i -e '/SUBDIRS/s/LaTeX//' share/Makefile.in || die
fi
- if use wxwidgets; then
- WX_GTK_VER="3.0-gtk3"
- setup-wxwidgets
- fi
+ use wxwidgets && setup-wxwidgets
tc-export CC CXX #453174
tc-export_build_env BUILD_CC
diff --git a/sci-visualization/gnuplot/gnuplot-5.4.1-r2.ebuild
b/sci-visualization/gnuplot/gnuplot-5.4.1-r2.ebuild
index 036512103dd..be48f00ee31 100644
--- a/sci-visualization/gnuplot/gnuplot-5.4.1-r2.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-5.4.1-r2.ebuild
@@ -4,6 +4,7 @@
EAPI=7
LUA_COMPAT=( lua5-{1,2,3} )
+WX_GTK_VER="3.0-gtk3"
inherit autotools flag-o-matic lua-single readme.gentoo-r1 toolchain-funcs
wxwidgets
@@ -52,7 +53,7 @@ RDEPEND="
readline? ( sys-libs/readline:0= )
libcerf? ( sci-libs/libcerf )
wxwidgets? (
- x11-libs/wxGTK:3.0-gtk3[X]
+ x11-libs/wxGTK:${WX_GTK_VER}[X]
x11-libs/cairo
x11-libs/pango
x11-libs/gtk+:3 )
@@ -112,10 +113,7 @@ src_configure() {
sed -i -e '/SUBDIRS/s/LaTeX//' share/Makefile.in || die
fi
- if use wxwidgets; then
- WX_GTK_VER="3.0-gtk3"
- setup-wxwidgets
- fi
+ use wxwidgets && setup-wxwidgets
tc-export CC CXX #453174
tc-export_build_env BUILD_CC
diff --git a/sci-visualization/gnuplot/gnuplot-5.5.9999-r1.ebuild
b/sci-visualization/gnuplot/gnuplot-5.5.9999-r1.ebuild
index 5373eb6b38a..fd660d8cfb8 100644
--- a/sci-visualization/gnuplot/gnuplot-5.5.9999-r1.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-5.5.9999-r1.ebuild
@@ -4,6 +4,7 @@
EAPI=7
LUA_COMPAT=( lua5-{1,2,3} )
+WX_GTK_VER="3.0-gtk3"
inherit autotools flag-o-matic lua-single readme.gentoo-r1 toolchain-funcs
wxwidgets
@@ -52,7 +53,7 @@ RDEPEND="
readline? ( sys-libs/readline:0= )
libcerf? ( sci-libs/libcerf )
wxwidgets? (
- x11-libs/wxGTK:3.0-gtk3[X]
+ x11-libs/wxGTK:${WX_GTK_VER}[X]
x11-libs/cairo
x11-libs/pango
x11-libs/gtk+:3 )
@@ -112,10 +113,7 @@ src_configure() {
sed -i -e '/SUBDIRS/s/LaTeX//' share/Makefile.in || die
fi
- if use wxwidgets; then
- WX_GTK_VER="3.0-gtk3"
- setup-wxwidgets
- fi
+ use wxwidgets && setup-wxwidgets
tc-export CC CXX #453174
tc-export_build_env BUILD_CC
