[gentoo-commits] repo/gentoo:master commit in: sci-visualization/gnuplot/files/, sci-visualization/gnuplot/

["Ulrich Müller" <ulm@gentoo.org>]

commit:     f799bef8d9836659126a079ed99e5510d1f08707
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 23 07:17:27 2019 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Tue Jul 23 07:18:51 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f799bef8

sci-visualization/gnuplot: Fix compilation with USE=caca.

Closes: https://bugs.gentoo.org/690014
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 sci-visualization/gnuplot/files/gnuplot-5.2.6-caca.patch | 13 +++++++++++++
 sci-visualization/gnuplot/gnuplot-5.2.6.ebuild           |  1 +
 sci-visualization/gnuplot/gnuplot-5.2.7.ebuild           |  1 +
 3 files changed, 15 insertions(+)

diff --git a/sci-visualization/gnuplot/files/gnuplot-5.2.6-caca.patch b/sci-visualization/gnuplot/files/gnuplot-5.2.6-caca.patch
new file mode 100644
index 00000000000..4441e4b8c03
--- /dev/null
+++ b/sci-visualization/gnuplot/files/gnuplot-5.2.6-caca.patch
@@ -0,0 +1,13 @@
+https://bugs.gentoo.org/690014
+https://sourceforge.net/p/gnuplot/mailman/message/34342174/
+
+--- gnuplot-5.2.6-orig/configure.ac
++++ gnuplot-5.2.6/configure.ac
+@@ -1224,6 +1224,7 @@
+ if test "${enable_qt_ok}" = yes \
+   || test "${enable_wxwidgets_ok}" = yes \
+   || test "$GGI_SUPPORT" = yes \
++  || test "$with_caca" = yes \
+   || test "$no_x" != yes; then
+     enable_mouse=yes;
+ fi

diff --git a/sci-visualization/gnuplot/gnuplot-5.2.6.ebuild b/sci-visualization/gnuplot/gnuplot-5.2.6.ebuild
index fbf26430056..6ee94c17ade 100644
--- a/sci-visualization/gnuplot/gnuplot-5.2.6.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-5.2.6.ebuild
@@ -70,6 +70,7 @@ src_prepare() {
 	eapply "${FILESDIR}"/${PN}-5.0.1-fix-underlinking.patch
 	eapply "${FILESDIR}"/${PN}-5.0.6-no-picins.patch
 	eapply "${FILESDIR}"/${PN}-5.2.2-regis.patch
+	eapply "${FILESDIR}"/${PN}-5.2.6-caca.patch
 	eapply_user
 
 	if [[ -z ${PV%%*9999} ]]; then

diff --git a/sci-visualization/gnuplot/gnuplot-5.2.7.ebuild b/sci-visualization/gnuplot/gnuplot-5.2.7.ebuild
index 4ea9c17d144..9ac0df288a5 100644
--- a/sci-visualization/gnuplot/gnuplot-5.2.7.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-5.2.7.ebuild
@@ -70,6 +70,7 @@ src_prepare() {
 	eapply "${FILESDIR}"/${PN}-5.0.1-fix-underlinking.patch
 	eapply "${FILESDIR}"/${PN}-5.0.6-no-picins.patch
 	eapply "${FILESDIR}"/${PN}-5.2.2-regis.patch
+	eapply "${FILESDIR}"/${PN}-5.2.6-caca.patch
 	eapply_user
 
 	if [[ -z ${PV%%*9999} ]]; then