gentoo resync : 27.10.2018

7 files changed, 232 insertions, 20 deletions

diff --git a/sci-visualization/gnuplot/Manifest b/sci-visualization/gnuplot/Manifest
index 70d8f689cc26..7c6545928bbb 100644
--- a/sci-visualization/gnuplot/Manifest
+++ b/sci-visualization/gnuplot/Manifest
@@ -4,9 +4,11 @@ AUX gnuplot-5.2.2-regis.patch 1171 BLAKE2B 57d2faba0f01ca27de0ff39b9b9d01faeffcb
 DIST gnuplot-5.0.7.tar.gz 5100186 BLAKE2B 97fcefa12148fc2b581113c5283eb09217e87858ae293931758d0bb595fd7aaca4671216956211a3d30492be35f91809a975c9c80c25861c477e9235a8b5b309 SHA512 5d7241dc1472f87af8632110a1e88f83b5ea3f41e1bc8c89a45dc4662a3071d91a25bf9ae5196a2b8bef09c8079c22f635bb947c02def3416d78880d61eea919
 DIST gnuplot-5.2.2.tar.gz 5282973 BLAKE2B a15c72aaa8d62079ea3e9f20fa9fe3aaaf6036cf8dc67a784dee79ac7bd0ad7bfac754c9583b50c46deeef2f1bcd920d1094a5d1e19a1dae75405de8c3249621 SHA512 51d5b2234dae358580cc2794ed63f8a5b950baf73edc5362f5bb18d77e8066c3c010239c3b29840db11e5936cb9381bb57193de751bd274af5547a45d6d88b0b
 DIST gnuplot-5.2.4.tar.gz 5292321 BLAKE2B a2eee046de6707ffcaf1a5b175601c18da14db350095a949deed0e241d8476c177e2cecb35eab3059234231ad4be42e5e8a9e3083651313cc4b5997156813c67 SHA512 b276e379fe5e493a176750d9ccd84a8b02c8784b1d8701dc4252945a7e9e0455eebba0085d0d98824a4acf5da0def3b71ad3362803365a32e7c29f18af7854bb
-EBUILD gnuplot-5.0.7.ebuild 5791 BLAKE2B f265032ce8c78e4fa5cbffab38a55da2b4fe37b63d4d89b04a028cd79d1a6f902b61e066e6786c86acf903cb5fc9102fc68f2ae16db6de509c08f77ac8ac5875 SHA512 39806b825547a82d70ccf7cdad0473146f0a92a865b252544b24f03169f508511d9b05fc0288dfae6e8818d0db152f750be5543ada7bfcee9843b7a37a728f64
-EBUILD gnuplot-5.2.2.ebuild 5821 BLAKE2B 0770c52c8f005a8ffe9232ba0a4a60f895a0ac5d0de80475a293a941747e9b931e9cc9e320533372b8c4f9e820119a9622bbc6724b0dbdf08500eaddd5d8e5bf SHA512 104987d3025c523f4059348a928b71582e40f87151f9213e3b6c151136108d127501f52fe593e7a815ba97bd26b2d77a3154ebd73a7d50bd52a5879be4911421
-EBUILD gnuplot-5.2.4.ebuild 5818 BLAKE2B 0423a67f44464db5a0c6bf0ddaea9d9acc4b9a92af42d80f5d58be19a047cc8978b81d0cde349b7cbbf53c60964ae7e23b4dc8705d7bd9a016fdb6e093f3c597 SHA512 2c6b73072cecbb6b88d436d9a6987f817350af26da51b5e1c5752845bf5050077f086c1aba36f009c92cebdba7728ccd445c7f7ad3b2b97b01951c15114be969
-EBUILD gnuplot-5.2.9999.ebuild 5752 BLAKE2B e65c04ce1b2e05946fa3ee9d084bacf1da053fe89b07e999210dcb56ddc6dd5ff18446b514dafafd93c13d496c491646887d6d223470e44ca2989b3ecfc2daf3 SHA512 bd48a9cd5b51c97f1e614626b9a4a114dfeb771b68bdea554d94287d370433c35d1e167a06cdcb901c0e66677d205f589cd1dbbab181c17e8baa269f7beadb47
-EBUILD gnuplot-5.3.9999.ebuild 5192 BLAKE2B 80a911c85ea83eaf4dcdbe86ad90982507e725947475f3812c570398a95c8c792c676c51f0d0bfd5bdcbcb8cbcafeda610c25ffdc8d3dfe664cd073a4b69ff0f SHA512 b191a21c844774e3bb3faa99ea4ae17fc6d6fb558d1dd0369c6c5b14464ca94e23fb85c70721f0bd9746e70217093e6735f48c407193752118309f7adcc6a02e
+DIST gnuplot-5.2.5.tar.gz 5305288 BLAKE2B e9ba602cb8ae8f5f24758fcf8dc4f6e7530fe0286370fdf02e01a19be073c4d93ac1d03f3e1f1154212e269124f1c5305a22814d19f6e6989d70d8e1fb68f8f5 SHA512 e516f33b678963e13c2464679efec6c387e57df4f92a57d319baec8bbd29ab46e545cd5d70b2d17644d734040892769da745b8a5441467dcdb8f9c892a493ca4
+EBUILD gnuplot-5.0.7.ebuild 5788 BLAKE2B bfb963858fa676d86728061f6a57495c6da0a6bc5eb24dd43a0ea5793b7ccc0e83bab1df12b0b307764849cf3c0c49f9a1e038fdcf9e84dee0d0dcda3cedb83a SHA512 ae47de041b4a3b0a350bb18ca099a0f2c1a0b7c3e328da00a545bba69251f71611e783e62148135520f3726ef360367c5a6eb272774aa389b2443b1f73e6a93f
+EBUILD gnuplot-5.2.2.ebuild 5818 BLAKE2B 38651d4c15bdd83982d4982fa02dfc3108fc139c88caa529784f83d33628e0cb372e081dc45dd3b5e87f41b3b92123c369a47c860c15138b59d1235ca2d18ae1 SHA512 229d6740b12f9a048d3fbfbc462e00f6bab68d15e0e1731f7cfb4627cba4f41ab822ba1223bf0d85745be04c67edca1c4599cb4af48b2726165a110b5bbdbda0
+EBUILD gnuplot-5.2.4.ebuild 5815 BLAKE2B 08fc414eeb1e50f618c8a1cbe86906bb2eaa4a31fd5dfd791855ccd1d50ef275e700d227006b08e18517f0c85af299c705996e15beb28d8693416772d8a74b4f SHA512 36dc366abcd118e1ba676b8b031439502e17b33ff8474ea01560608d746cddb81ebd560b1cee1a2bef9141285a899a395df0261170f5a7029855dc9753b8790c
+EBUILD gnuplot-5.2.5.ebuild 5815 BLAKE2B 08fc414eeb1e50f618c8a1cbe86906bb2eaa4a31fd5dfd791855ccd1d50ef275e700d227006b08e18517f0c85af299c705996e15beb28d8693416772d8a74b4f SHA512 36dc366abcd118e1ba676b8b031439502e17b33ff8474ea01560608d746cddb81ebd560b1cee1a2bef9141285a899a395df0261170f5a7029855dc9753b8790c
+EBUILD gnuplot-5.2.9999.ebuild 5749 BLAKE2B 44d3a7b53370f7a234f2f9963ede97c9b78638fe788860cbdbe534b432d633e1a917eabd27f120f16101d768c6a0c052eaaadb21633062ac6a71cae6e23fc0b1 SHA512 ef46ad5ca57d656c31ca991a5332a10c72e878bc09705896631a400839dc737b84a568d589b1d5f7b7d0dbe4074e739f519a1f6a39c5089477ad18700a831889
+EBUILD gnuplot-5.3.9999.ebuild 5189 BLAKE2B caf4ce5aeaf52a310f9f5163384e9a5663b15dac659079141f02e11a6c64572b7307c1c52bf63ff4ddc313218c594858241d59a0036694211185a8bf73012f88 SHA512 ac03609bff28227681876cf336f4db56835a79eb3ca36832556ebce62f1047a3caea381d747b56f7e9e5a47fe07041465d9c82fe3f3bac8eaaf5924c7740d8de
 MISC metadata.xml 1267 BLAKE2B f3b0192ce2cd8d0fb10c2f4fb4bad9780f01746cb283c19e7ecc622c85470ed8a3b7193ca2f7abdee6fdb771719e0c0a9a8a5c7fd9320ef0dae1f1210e7e36cd SHA512 dc9f36a7f2ffb85eeafb41a2b5d0b61746ef3e1de049db18ba351108b887b4cf506ea871754918faae8b4989e5ee7dbfc9f7f48c5b9df55a3bbe782425dc0421
diff --git a/sci-visualization/gnuplot/gnuplot-5.0.7.ebuild b/sci-visualization/gnuplot/gnuplot-5.0.7.ebuild
index 73a772b926f5..8d3338bad0a1 100644
--- a/sci-visualization/gnuplot/gnuplot-5.0.7.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-5.0.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -91,10 +91,10 @@ src_prepare() {
 		SVGA console graphics, gnuplot needs to be set up as setuid root.
 		Please note that this is usually considered to be a security hazard.
 		As root, manually "chmod u+s /usr/bin/gnuplot".'
-	use gd && DOC_CONTENTS+='\n\nFor font support in png/jpeg/gif output,
+	use gd && DOC_CONTENTS+="\n\nFor font support in png/jpeg/gif output,
 		you may have to set the GDFONTPATH and GNUPLOT_DEFAULT_GDFONT
 		environment variables. See the FAQ file in /usr/share/doc/${PF}/
-		for more information.'
+		for more information."
 
 	mv configure.in configure.ac || die
 	eautoreconf
diff --git a/sci-visualization/gnuplot/gnuplot-5.2.2.ebuild b/sci-visualization/gnuplot/gnuplot-5.2.2.ebuild
index 0f63549de71a..b9ca6aa4f8c4 100644
--- a/sci-visualization/gnuplot/gnuplot-5.2.2.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-5.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -92,10 +92,10 @@ src_prepare() {
 		SVGA console graphics, gnuplot needs to be set up as setuid root.
 		Please note that this is usually considered to be a security hazard.
 		As root, manually "chmod u+s /usr/bin/gnuplot".'
-	use gd && DOC_CONTENTS+='\n\nFor font support in png/jpeg/gif output,
+	use gd && DOC_CONTENTS+="\n\nFor font support in png/jpeg/gif output,
 		you may have to set the GDFONTPATH and GNUPLOT_DEFAULT_GDFONT
 		environment variables. See the FAQ file in /usr/share/doc/${PF}/
-		for more information.'
+		for more information."
 
 	eautoreconf
 
diff --git a/sci-visualization/gnuplot/gnuplot-5.2.4.ebuild b/sci-visualization/gnuplot/gnuplot-5.2.4.ebuild
index b28e58c2381a..08d856ea6319 100644
--- a/sci-visualization/gnuplot/gnuplot-5.2.4.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-5.2.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -90,10 +90,10 @@ src_prepare() {
 		SVGA console graphics, gnuplot needs to be set up as setuid root.
 		Please note that this is usually considered to be a security hazard.
 		As root, manually "chmod u+s /usr/bin/gnuplot".'
-	use gd && DOC_CONTENTS+='\n\nFor font support in png/jpeg/gif output,
+	use gd && DOC_CONTENTS+="\n\nFor font support in png/jpeg/gif output,
 		you may have to set the GDFONTPATH and GNUPLOT_DEFAULT_GDFONT
 		environment variables. See the FAQ file in /usr/share/doc/${PF}/
-		for more information.'
+		for more information."
 
 	eautoreconf
 
diff --git a/sci-visualization/gnuplot/gnuplot-5.2.5.ebuild b/sci-visualization/gnuplot/gnuplot-5.2.5.ebuild
new file mode 100644
index 000000000000..08d856ea6319
--- /dev/null
+++ b/sci-visualization/gnuplot/gnuplot-5.2.5.ebuild
@@ -0,0 +1,210 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools flag-o-matic readme.gentoo-r1 toolchain-funcs wxwidgets
+
+DESCRIPTION="Command-line driven interactive plotting program"
+HOMEPAGE="http://www.gnuplot.info/"
+
+if [[ -z ${PV%%*9999} ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.code.sf.net/p/gnuplot/gnuplot-main"
+	EGIT_BRANCH="branch-5-2-stable"
+	MY_P="${PN}"
+	EGIT_CHECKOUT_DIR="${WORKDIR}/${MY_P}"
+else
+	MY_P="${P/_/.}"
+	SRC_URI="mirror://sourceforge/gnuplot/${MY_P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="gnuplot bitmap? ( free-noncomm )"
+SLOT="0"
+IUSE="aqua bitmap cairo compat doc examples +gd ggi latex libcaca libcerf lua qt5 readline regis svga wxwidgets X"
+
+RDEPEND="
+	cairo? (
+		x11-libs/cairo
+		x11-libs/pango )
+	gd? ( >=media-libs/gd-2.0.35-r3:2=[png] )
+	ggi? ( media-libs/libggi )
+	latex? (
+		virtual/latex-base
+		lua? (
+			dev-tex/pgf
+			>=dev-texlive/texlive-latexrecommended-2008-r2 ) )
+	libcaca? ( media-libs/libcaca )
+	lua? ( dev-lang/lua:0 )
+	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 )
+	wxwidgets? (
+		x11-libs/wxGTK:3.0[X]
+		x11-libs/cairo
+		x11-libs/pango
+		x11-libs/gtk+:2 )
+	X? ( x11-libs/libXaw )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? (
+		virtual/latex-base
+		dev-texlive/texlive-latexextra
+		app-text/ghostscript-gpl )
+	qt5? ( dev-qt/linguist-tools:5 )"
+
+S="${WORKDIR}/${MY_P}"
+
+GP_VERSION="${PV%.*}"
+E_SITEFILE="lisp/50${PN}-gentoo.el"
+TEXMF="${EPREFIX}/usr/share/texmf-site"
+
+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_user
+
+	if [[ -z ${PV%%*9999} ]]; then
+		local dir
+		for dir in config demo m4 term tutorial; do
+			emake -C "$dir" -f Makefile.am.in Makefile.am
+		done
+	fi
+
+	# Add special version identification as required by provision 2
+	# of the gnuplot license
+	sed -i -e "1s/.*/& (Gentoo revision ${PR})/" PATCHLEVEL || die
+
+	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".'
+	use svga && DOC_CONTENTS+='\n\nIn order to enable ordinary users to use
+		SVGA console graphics, gnuplot needs to be set up as setuid root.
+		Please note that this is usually considered to be a security hazard.
+		As root, manually "chmod u+s /usr/bin/gnuplot".'
+	use gd && DOC_CONTENTS+="\n\nFor font support in png/jpeg/gif output,
+		you may have to set the GDFONTPATH and GNUPLOT_DEFAULT_GDFONT
+		environment variables. See the FAQ file in /usr/share/doc/${PF}/
+		for more information."
+
+	eautoreconf
+
+	# Make sure we don't mix build & host flags.
+	sed -i \
+		-e 's:@CPPFLAGS@:$(BUILD_CPPFLAGS):' \
+		-e 's:@CFLAGS@:$(BUILD_CFLAGS):' \
+		-e 's:@LDFLAGS@:$(BUILD_LDFLAGS):' \
+		-e 's:@CC@:$(CC_FOR_BUILD):' \
+		docs/Makefile.in || die
+}
+
+src_configure() {
+	if ! use latex; then
+		sed -i -e '/SUBDIRS/s/LaTeX//' share/Makefile.in || die
+	fi
+
+	if use wxwidgets; then
+		WX_GTK_VER="3.0"
+		setup-wxwidgets
+	fi
+
+	tc-export CC CXX			#453174
+	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) \
+		$(use_with bitmap bitmap-terminals) \
+		$(use_with cairo) \
+		$(use_enable compat backwards-compatibility) \
+		$(use_with doc tutorial) \
+		$(use_with gd) \
+		"$(use_with ggi ggi "${EPREFIX}/usr/$(get_libdir)")" \
+		"$(use_with ggi xmi "${EPREFIX}/usr/$(get_libdir)")" \
+		"$(use_with libcaca caca "${EPREFIX}/usr/$(get_libdir)")" \
+		$(use_with libcerf) \
+		$(use_with lua) \
+		$(use_with regis) \
+		$(use_with svga linux-vga) \
+		$(use_with X x) \
+		--enable-stats \
+		$(use_with qt5 qt qt5) \
+		$(use_enable wxwidgets) \
+		DIST_CONTACT="https://bugs.gentoo.org/" \
+		EMACS=no
+}
+
+src_compile() {
+	# Prevent access violations, see bug 201871
+	export VARTEXFONTS="${T}/fonts"
+
+	# We believe that the following line is no longer needed.
+	# In case of problems file a bug report at bugs.gentoo.org.
+	#addwrite /dev/svga:/dev/mouse:/dev/tts/0
+
+	emake all
+
+	if use doc; then
+		# Avoid sandbox violation in epstopdf/ghostscript
+		addpredict /var/cache/fontconfig
+		if use cairo; then
+			emake -C docs pdf
+		else
+			ewarn "Cannot build figures unless cairo is enabled."
+			ewarn "Building documentation without figures."
+			emake -C docs pdf_nofig
+			mv docs/nofigures.pdf docs/gnuplot.pdf || die
+		fi
+		emake -C tutorial pdf
+	fi
+}
+
+src_install () {
+	emake DESTDIR="${D}" install
+
+	dodoc BUGS ChangeLog NEWS PGPKEYS README* RELEASE_NOTES TODO
+	newdoc term/PostScript/README README-ps
+	newdoc term/js/README README-js
+	use lua && newdoc term/lua/README README-lua
+	readme.gentoo_create_doc
+
+	if use examples; then
+		# Demo files
+		insinto /usr/share/${PN}/${GP_VERSION}
+		doins -r demo
+		rm -f "${ED%/}"/usr/share/${PN}/${GP_VERSION}/demo/Makefile*
+		rm -f "${ED%/}"/usr/share/${PN}/${GP_VERSION}/demo/binary*
+	fi
+
+	if use doc; then
+		# Manual, tutorial, FAQ
+		dodoc docs/gnuplot.pdf tutorial/{tutorial.dvi,tutorial.pdf} FAQ.pdf
+		# Documentation for making PostScript files
+		docinto psdoc
+		dodoc docs/psdoc/{*.doc,*.tex,*.ps,*.gpi,README}
+	fi
+}
+
+src_test() {
+	GNUTERM="unknown" default_src_test
+}
+
+pkg_postinst() {
+	use latex && texmf-update
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	use latex && texmf-update
+}
diff --git a/sci-visualization/gnuplot/gnuplot-5.2.9999.ebuild b/sci-visualization/gnuplot/gnuplot-5.2.9999.ebuild
index 70dc373cfd31..517402b50184 100644
--- a/sci-visualization/gnuplot/gnuplot-5.2.9999.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-5.2.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -89,10 +89,10 @@ src_prepare() {
 		SVGA console graphics, gnuplot needs to be set up as setuid root.
 		Please note that this is usually considered to be a security hazard.
 		As root, manually "chmod u+s /usr/bin/gnuplot".'
-	use gd && DOC_CONTENTS+='\n\nFor font support in png/jpeg/gif output,
+	use gd && DOC_CONTENTS+="\n\nFor font support in png/jpeg/gif output,
 		you may have to set the GDFONTPATH and GNUPLOT_DEFAULT_GDFONT
 		environment variables. See the FAQ file in /usr/share/doc/${PF}/
-		for more information.'
+		for more information."
 
 	eautoreconf
 
diff --git a/sci-visualization/gnuplot/gnuplot-5.3.9999.ebuild b/sci-visualization/gnuplot/gnuplot-5.3.9999.ebuild
index 60eb7036ba0e..b3ded5a93b29 100644
--- a/sci-visualization/gnuplot/gnuplot-5.3.9999.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-5.3.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -84,10 +84,10 @@ src_prepare() {
 	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".'
-	use gd && DOC_CONTENTS+='\n\nFor font support in png/jpeg/gif output,
+	use gd && DOC_CONTENTS+="\n\nFor font support in png/jpeg/gif output,
 		you may have to set the GDFONTPATH and GNUPLOT_DEFAULT_GDFONT
 		environment variables. See the FAQ file in /usr/share/doc/${PF}/
-		for more information.'
+		for more information."
 
 	eautoreconf