summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2017-11-19 15:00:04 +0100
committerUlrich Müller <ulm@gentoo.org>2017-11-19 15:35:49 +0100
commit9fcb5e6cab02c502052772dd715c80299b8f5bcc (patch)
tree8e35526bb17832b9b10b6040bea19c5d0b1c8380 /sci-visualization
parentnet-libs/rpcsvc-proto: Add fake stable version (diff)
downloadgentoo-9fcb5e6cab02c502052772dd715c80299b8f5bcc.tar.gz
gentoo-9fcb5e6cab02c502052772dd715c80299b8f5bcc.tar.bz2
gentoo-9fcb5e6cab02c502052772dd715c80299b8f5bcc.zip
sci-visualization/gnuplot: Switch from Qt4 to Qt5.
Suggested-by: Andreas Eckstein <andreas.eckstein@gmx.net> Closes: https://bugs.gentoo.org/594570 Package-Manager: Portage-2.3.14, Repoman-2.3.6
Diffstat (limited to 'sci-visualization')
-rw-r--r--sci-visualization/gnuplot/gnuplot-5.0.7.ebuild21
-rw-r--r--sci-visualization/gnuplot/gnuplot-5.0.9999.ebuild21
-rw-r--r--sci-visualization/gnuplot/gnuplot-5.3.9999.ebuild21
3 files changed, 30 insertions, 33 deletions
diff --git a/sci-visualization/gnuplot/gnuplot-5.0.7.ebuild b/sci-visualization/gnuplot/gnuplot-5.0.7.ebuild
index 2a7de7b82e7..cfae414e61c 100644
--- a/sci-visualization/gnuplot/gnuplot-5.0.7.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-5.0.7.ebuild
@@ -26,7 +26,7 @@ fi
LICENSE="gnuplot bitmap? ( free-noncomm )"
SLOT="0"
-IUSE="aqua bitmap cairo compat doc examples +gd ggi latex libcaca libcerf lua qt4 readline svga wxwidgets X"
+IUSE="aqua bitmap cairo compat doc examples +gd ggi latex libcaca libcerf lua qt5 readline svga wxwidgets X"
RDEPEND="
cairo? (
@@ -41,9 +41,12 @@ RDEPEND="
>=dev-texlive/texlive-latexrecommended-2008-r2 ) )
libcaca? ( media-libs/libcaca )
lua? ( dev-lang/lua:0 )
- qt4? ( >=dev-qt/qtcore-4.5:4
- >=dev-qt/qtgui-4.5:4
- >=dev-qt/qtsvg-4.5:4 )
+ qt5? ( dev-qt/qtcore:5=
+ dev-qt/qtgui:5=
+ dev-qt/qtnetwork:5=
+ dev-qt/qtprintsupport:5=
+ dev-qt/qtsvg:5=
+ dev-qt/qtwidgets:5= )
readline? ( sys-libs/readline:0= )
libcerf? ( sci-libs/libcerf )
svga? ( media-libs/svgalib )
@@ -82,12 +85,6 @@ src_prepare() {
# of the gnuplot license
sed -i -e "1s/.*/& (Gentoo revision ${PR})/" PATCHLEVEL || die
- # hacky workaround
- # Please hack the buildsystem if you like
- if use prefix && use qt4; then
- append-ldflags -Wl,-rpath,"${EPREFIX}"/usr/$(get_libdir)/qt4
- fi
-
DOC_CONTENTS='Gnuplot no longer links against pdflib, see the ChangeLog
for details. You can use the "pdfcairo" terminal for PDF output.'
use cairo || DOC_CONTENTS+=' It is available with USE="cairo".'
@@ -126,6 +123,8 @@ src_configure() {
tc-export_build_env BUILD_CC
export CC_FOR_BUILD=${BUILD_CC}
+ use qt5 && append-cxxflags -std=c++11
+
econf \
--without-pdf \
--with-texdir="${TEXMF}/tex/latex/${PN}" \
@@ -143,7 +142,7 @@ src_configure() {
$(use_with svga linux-vga) \
$(use_with X x) \
--enable-stats \
- $(use_with qt4 qt qt4) \
+ $(use_with qt5 qt qt5) \
$(use_enable wxwidgets) \
DIST_CONTACT="https://bugs.gentoo.org/" \
EMACS=no
diff --git a/sci-visualization/gnuplot/gnuplot-5.0.9999.ebuild b/sci-visualization/gnuplot/gnuplot-5.0.9999.ebuild
index ef281474464..533cc767ff9 100644
--- a/sci-visualization/gnuplot/gnuplot-5.0.9999.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-5.0.9999.ebuild
@@ -26,7 +26,7 @@ fi
LICENSE="gnuplot bitmap? ( free-noncomm )"
SLOT="0"
-IUSE="aqua bitmap cairo compat doc examples +gd ggi latex libcaca libcerf lua qt4 readline svga wxwidgets X"
+IUSE="aqua bitmap cairo compat doc examples +gd ggi latex libcaca libcerf lua qt5 readline svga wxwidgets X"
RDEPEND="
cairo? (
@@ -41,9 +41,12 @@ RDEPEND="
>=dev-texlive/texlive-latexrecommended-2008-r2 ) )
libcaca? ( media-libs/libcaca )
lua? ( dev-lang/lua:0 )
- qt4? ( >=dev-qt/qtcore-4.5:4
- >=dev-qt/qtgui-4.5:4
- >=dev-qt/qtsvg-4.5:4 )
+ qt5? ( dev-qt/qtcore:5=
+ dev-qt/qtgui:5=
+ dev-qt/qtnetwork:5=
+ dev-qt/qtprintsupport:5=
+ dev-qt/qtsvg:5=
+ dev-qt/qtwidgets:5= )
readline? ( sys-libs/readline:0= )
libcerf? ( sci-libs/libcerf )
svga? ( media-libs/svgalib )
@@ -82,12 +85,6 @@ src_prepare() {
# of the gnuplot license
sed -i -e "1s/.*/& (Gentoo revision ${PR})/" PATCHLEVEL || die
- # hacky workaround
- # Please hack the buildsystem if you like
- if use prefix && use qt4; then
- append-ldflags -Wl,-rpath,"${EPREFIX}"/usr/$(get_libdir)/qt4
- fi
-
DOC_CONTENTS='Gnuplot no longer links against pdflib, see the ChangeLog
for details. You can use the "pdfcairo" terminal for PDF output.'
use cairo || DOC_CONTENTS+=' It is available with USE="cairo".'
@@ -126,6 +123,8 @@ src_configure() {
tc-export_build_env BUILD_CC
export CC_FOR_BUILD=${BUILD_CC}
+ use qt5 && append-cxxflags -std=c++11
+
econf \
--without-pdf \
--with-texdir="${TEXMF}/tex/latex/${PN}" \
@@ -143,7 +142,7 @@ src_configure() {
$(use_with svga linux-vga) \
$(use_with X x) \
--enable-stats \
- $(use_with qt4 qt qt4) \
+ $(use_with qt5 qt qt5) \
$(use_enable wxwidgets) \
DIST_CONTACT="https://bugs.gentoo.org/" \
EMACS=no
diff --git a/sci-visualization/gnuplot/gnuplot-5.3.9999.ebuild b/sci-visualization/gnuplot/gnuplot-5.3.9999.ebuild
index c2be8b92510..df97e58408f 100644
--- a/sci-visualization/gnuplot/gnuplot-5.3.9999.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-5.3.9999.ebuild
@@ -26,7 +26,7 @@ fi
LICENSE="gnuplot bitmap? ( free-noncomm )"
SLOT="0"
-IUSE="aqua bitmap cairo compat doc examples +gd ggi latex libcaca libcerf lua qt4 readline svga wxwidgets X"
+IUSE="aqua bitmap cairo compat doc examples +gd ggi latex libcaca libcerf lua qt5 readline svga wxwidgets X"
RDEPEND="
cairo? (
@@ -41,9 +41,12 @@ RDEPEND="
>=dev-texlive/texlive-latexrecommended-2008-r2 ) )
libcaca? ( media-libs/libcaca )
lua? ( dev-lang/lua:0 )
- qt4? ( >=dev-qt/qtcore-4.5:4
- >=dev-qt/qtgui-4.5:4
- >=dev-qt/qtsvg-4.5:4 )
+ qt5? ( dev-qt/qtcore:5=
+ dev-qt/qtgui:5=
+ dev-qt/qtnetwork:5=
+ dev-qt/qtprintsupport:5=
+ dev-qt/qtsvg:5=
+ dev-qt/qtwidgets:5= )
readline? ( sys-libs/readline:0= )
libcerf? ( sci-libs/libcerf )
svga? ( media-libs/svgalib )
@@ -82,12 +85,6 @@ src_prepare() {
# of the gnuplot license
sed -i -e "1s/.*/& (Gentoo revision ${PR})/" PATCHLEVEL || die
- # hacky workaround
- # Please hack the buildsystem if you like
- if use prefix && use qt4; then
- append-ldflags -Wl,-rpath,"${EPREFIX}"/usr/$(get_libdir)/qt4
- fi
-
DOC_CONTENTS='Gnuplot no longer links against pdflib, see the ChangeLog
for details. You can use the "pdfcairo" terminal for PDF output.'
use cairo || DOC_CONTENTS+=' It is available with USE="cairo".'
@@ -125,6 +122,8 @@ src_configure() {
tc-export_build_env BUILD_CC
export CC_FOR_BUILD=${BUILD_CC}
+ use qt5 && append-cxxflags -std=c++11
+
econf \
--with-texdir="${TEXMF}/tex/latex/${PN}" \
--with-readline=$(usex readline gnu builtin) \
@@ -141,7 +140,7 @@ src_configure() {
$(use_with svga linux-vga) \
$(use_with X x) \
--enable-stats \
- $(use_with qt4 qt qt4) \
+ $(use_with qt5 qt qt5) \
$(use_enable wxwidgets) \
DIST_CONTACT="https://bugs.gentoo.org/" \
EMACS=no