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

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

commit:     194a3e61996a67c6cd359dc53bd78598584ab065
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Fri Nov  6 12:48:10 2020 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Fri Nov  6 12:57:04 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=194a3e61

sci-visualization/gnuplot: Fix pkg-config call in configure.

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 .../gnuplot/files/gnuplot-5.4.0-pkg-config.patch   | 40 ++++++++++++++++++++++
 ...nuplot-5.4.0.ebuild => gnuplot-5.4.0-r1.ebuild} |  1 +
 2 files changed, 41 insertions(+)

diff --git a/sci-visualization/gnuplot/files/gnuplot-5.4.0-pkg-config.patch b/sci-visualization/gnuplot/files/gnuplot-5.4.0-pkg-config.patch
new file mode 100644
index 00000000000..aa98f27dc2b
--- /dev/null
+++ b/sci-visualization/gnuplot/files/gnuplot-5.4.0-pkg-config.patch
@@ -0,0 +1,40 @@
+From 87034e509b366078b746a3a70e05aaf497e34585 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ulrich=20M=C3=BCller?= <ulm@gentoo.org>
+Date: Fri, 6 Nov 2020 13:25:02 +0100
+Subject: [PATCH] configure.ac: move PKG_PROG_PKG_CONFIG to the beginning of
+ the file
+
+Bug #2349
+---
+ configure.ac | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 67ad1396c..606242ea3 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -88,6 +88,10 @@ AC_CHECK_MEMBERS([struct tm.tm_gmtoff, struct tm.__tm_gmtoff],,,[
+ #include <sys/types.h>
+ #include <time.h>])
+ 
++dnl explicit call to PKG_PROG_PKG_CONFIG because the first call to
++dnl PKG_CHECK_MODULES{,_NOFAIL} may not happen
++PKG_PROG_PKG_CONFIG
++
+ AC_ARG_WITH(libcerf,dnl
+ [  --without-libcerf       build without special functions from libcerf (default enabled)],,
+   [test -z "${with_libcerf}" && with_libcerf=yes])
+@@ -759,10 +763,6 @@ AC_ARG_ENABLE(raise-console,dnl
+   fi
+ 
+ 
+-dnl explicit call to PKG_PROG_PKG_CONFIG because the first call to
+-dnl PKG_CHECK_MODULES may not happen
+-PKG_PROG_PKG_CONFIG
+-
+ dnl  wxWidgets terminal
+ 
+ dnl wxWidgets terminal needs C++
+-- 
+2.29.2
+

diff --git a/sci-visualization/gnuplot/gnuplot-5.4.0.ebuild b/sci-visualization/gnuplot/gnuplot-5.4.0-r1.ebuild
similarity index 99%
rename from sci-visualization/gnuplot/gnuplot-5.4.0.ebuild
rename to sci-visualization/gnuplot/gnuplot-5.4.0-r1.ebuild
index a4baae2bd98..5b9eabee4ca 100644
--- a/sci-visualization/gnuplot/gnuplot-5.4.0.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-5.4.0-r1.ebuild
@@ -73,6 +73,7 @@ TEXMF="${EPREFIX}/usr/share/texmf-site"
 PATCHES=(
 	"${FILESDIR}"/${PN}-5.0.1-fix-underlinking.patch
 	"${FILESDIR}"/${PN}-5.0.6-no-picins.patch
+	"${FILESDIR}"/${PN}-5.4.0-pkg-config.patch
 )
 
 src_prepare() {