gentoo resync : 17.12.2017

6 files changed, 12 insertions, 217 deletions

diff --git a/sci-visualization/gnuplot/Manifest b/sci-visualization/gnuplot/Manifest
index 5fae2fe402a3..c496f7709c1e 100644
--- a/sci-visualization/gnuplot/Manifest
+++ b/sci-visualization/gnuplot/Manifest
@@ -1,15 +1,13 @@
 AUX gnuplot-5.0.1-fix-underlinking.patch 483 BLAKE2B 1719635d947a5d53fa5b6def65286aa1064e5a80d36d42670890bdda7dc849add342e3574dbee85f0546d953491271354c6946cc157207af700ab1cfde6d0249 SHA512 b5ac3ed830f201ba6018a81bc4860e6da0e41cc9cdc1ac8acc225bf41a0006cbd6e2f8e061ab2bd013ad55b105a02e915e256a09ca4e4faaf4791ea1c3199f28
 AUX gnuplot-5.0.6-no-picins.patch 956 BLAKE2B 41485f39f7640426624abcfa3f9231768044d11a6fdea838a964070465d2af00149bed5715a2a97ec6cfd1dddd32169a0694685d36c806982eb1b10676f4dd28 SHA512 fe66f0d8045be89d6464b9de9aa7d80196b4eccf0d0aab3daf6b0a121f5565bb96f11e0f96d9d9c296795b86e11300ddb9811100671fc4470d2dbf8097fbb02c
 DIST gnuplot-5.0.1.tar.gz 4963747 BLAKE2B 12ef41cf34a5cb8768391a00508656af5f642b1abd9be895a29814dfb4aed5c9fa611a780063667c95e7154382d64e8fbb5d93bef601d5d1dddc9e7bbad9ce0f SHA512 f68ccef8ecad0d5f7c2eb5dc2c97ba14abba6e3324c36bb9ede5f87eef613942376a26e42e55fa8e9c908e2b732aa0b9f34d6d5c386e3d5cf9685bbca60fa094
-DIST gnuplot-5.0.5.tar.gz 5078771 BLAKE2B 81513f3d6225a17b9a813507fe2ca8d55dcb952626ccf648f9c8b11861d6050dcf203a64c9d12abd3d8c446ce5d72e56c85ef195fe05256fa262db1c581307f1 SHA512 fd6efc3a869850fa1939a4c833c776395efaaaf6dccc63e3626cee2e39938923b06314368802155adf711ae3e5ca0e3dd1a88be348e8571f9d0be8790240c62c
 DIST gnuplot-5.0.6.tar.gz 5093897 BLAKE2B 9cbd432b8177175b39b4c0068b4852951903fb7d142608b2a7d624e29d8f5e6f4b700ecb3914b7de8e0fc8dcc22156d4cbf2e5b681412b3b5aca4738ec258759 SHA512 7f9b05725a8594dcfbf1f1fc8f1db9bf45e1b6841fa1089b2c2528a3e36f71baab16d5fbeb027e4dd3618461a4895d037cb9f43781bfee2cb078cb9583567d8d
 DIST gnuplot-5.0.7.tar.gz 5100186 BLAKE2B 97fcefa12148fc2b581113c5283eb09217e87858ae293931758d0bb595fd7aaca4671216956211a3d30492be35f91809a975c9c80c25861c477e9235a8b5b309 SHA512 5d7241dc1472f87af8632110a1e88f83b5ea3f41e1bc8c89a45dc4662a3071d91a25bf9ae5196a2b8bef09c8079c22f635bb947c02def3416d78880d61eea919
 DIST gnuplot-5.2.2.tar.gz 5282973 BLAKE2B a15c72aaa8d62079ea3e9f20fa9fe3aaaf6036cf8dc67a784dee79ac7bd0ad7bfac754c9583b50c46deeef2f1bcd920d1094a5d1e19a1dae75405de8c3249621 SHA512 51d5b2234dae358580cc2794ed63f8a5b950baf73edc5362f5bb18d77e8066c3c010239c3b29840db11e5936cb9381bb57193de751bd274af5547a45d6d88b0b
 EBUILD gnuplot-5.0.1-r1.ebuild 5692 BLAKE2B 62aa0d443aeb5690a274c1a7e389e506a152eac52a4d0ec36d412158c7bd963a8eee6d558b9f2b1608b4d8612879a34b89f476f21ebef5c4d73fc95c28f2e70d SHA512 6058590102387ce8899f50f2621fdb6221b2faa5f9778cda0cea465aa1501bc78c02c6e769f3f05297c8769f48087787fe20a9af7bc6e7038752c82d68993849
-EBUILD gnuplot-5.0.5.ebuild 5604 BLAKE2B 752bcf0e3f6596db923a2318fc5764aa54792a30f75ca2b7a754d11bdd0f504e82bef2567fbf5e4b7a2a57a88fea2b9ec7d923511bbbda471a307f0b9ff30db2 SHA512 c251c4a2f3eed5ab4c9ae8423546f1adb84592fe0cd018e5f08240c862599c964db0383ac098da6e7b32e5986ab5ce1991721ac40f7c4b3d6188386c56df883d
 EBUILD gnuplot-5.0.6.ebuild 5891 BLAKE2B fd3af7f1a8184ff2ea2464fae22525d7832eeb21e37b64739016bdf4a3e9ed58d3dce75cb5763c61e5ec0fda3c07a70cb72cb002d3365304e9656c2b38de2cae SHA512 53e558357ab52930975be0fa3bf2bba9578c62d2f98658eafe0bb9581c477aa56f64f378705de51e1d284b0f37365b10e159d9e229a1a10a14f1a6d544cb25cb
-EBUILD gnuplot-5.0.7.ebuild 5796 BLAKE2B 59ec226890cb5d5006d01e0549deda42222a9e2497bbbbd0f0cedf9e169461f1f2e942bfb9c07f17aa7705454eeb03e9460b64eda57ae856fe625b08f5422d90 SHA512 6a5efe9753bada89e45131b2775cccff5cc6288062af7d315c95919a458b12f4459bab72121ff6ebfb3fe1ceef8b9205550a322e1a50e323f7b0164f0fb94cc6
-EBUILD gnuplot-5.2.2.ebuild 5752 BLAKE2B fde7817c530dace58f048ac49f072c77cdea0cfbd2ed4298171894424fdfe671649b356b3a327a58c253ca4c9e549cfffb85a4602551c43ca1264e8fe3e4f152 SHA512 ce10cbde1e42887685c655d6c645b1096b2f128e338603c8597828b188fb6b27446569c044dc0b58118e5720c74851d265e2cad860824aee229d3e2ee4b7eecc
-EBUILD gnuplot-5.2.9999.ebuild 5773 BLAKE2B e1c688acf00bc074f14f3aaa015879f560632bd92e17d51029f25710ac3ba2a5ed34025330466b1b28e8dd35fdc258db6db7fcac75c2d226bf4bb214ddde1047 SHA512 976705b4cbf3c3632378ea3bc5eacfcba42af966242a818d7b6f5996973dd25f18868f95662e6b30f631e0c2c90aa16ca3673ba335308efa23682a79afd713f9
-EBUILD gnuplot-5.3.9999.ebuild 5760 BLAKE2B b60dd5efd0189a5b1b73204e64f036f9e49cc462dbbf85027a7bb47d77cae0bbf0d8919ef2ef12b26495642848c712444f00d85b1f30a062c249fddd8b74e1ec SHA512 a24ab4e92bf4a2680250c3d65c9882be4c81aecf000d01a77724876ea85f820476b8a21c9401f6a0e090e42f9c885106e13e44ac5c02e8e876577f9c86672998
+EBUILD gnuplot-5.0.7.ebuild 5830 BLAKE2B cb0609ed221db653ae7a25c41ec43afeac5358a8ce7334d4b127de353800bd14820c90d84c6b70ba1163f1c831a5a99e5bb33b46ee173d11b3566fe63d30f815 SHA512 a21375723ecf36385a2749c2710bb3e45448df198c373c190c5be0f293474cf97733a3ef8f8e16e83399d7dc85f6ff104110cf10e85c3ed98c5abfabd7852197
+EBUILD gnuplot-5.2.2.ebuild 5786 BLAKE2B 9fa3e7d0881cb7bc002be34e9a0b1efa52169bcd97de44ee5257a303fdcd0b6603fb695385907ff558d81492dbd553f9499995778ffa7b384e89df1474a49ff5 SHA512 0288e928706b88c9294bb65e18ea68c47902fc6ecddd790656c4d465eef5684f782780d9ea6e0680082fa79bed1650b4b7272f3a58b821ef9ecd8f65907cce17
+EBUILD gnuplot-5.2.9999.ebuild 5807 BLAKE2B 3a2afe5f7ac171bd54334c94ac51d7ecf289ef19d4ff0109598e997a1174bf1451885ba885c86e03ec488cbe7ce2df9a21a26e4f1dcfd30e7dd1e7cf4aee1e27 SHA512 c197bda66704c895b49a0935bdfa20fd8e85c9460966ad621a46f0bc195e1648c3329e53d3be43dab137fb4eb9ebdb84727e82ff748e02f9aadd0e5be21909d1
+EBUILD gnuplot-5.3.9999.ebuild 5794 BLAKE2B ca534f75fe5a9c39d93b9e750ec020aecacf426bec9c1852ce21879b44cbcb3e77c2599ea52dc02b69fb20b8a94a34b97225f5c793ea820985b40017ba5ecba5 SHA512 501777c51d6fd6fb63106857a25bdfc1038bcbaed039d5e9e351f2e80043ed88d90055f611c72964f60b4fe948d562db6ebe2c1c9adf1fb10940666c1d147d42
 MISC metadata.xml 1217 BLAKE2B 50ad1f750abe89f9b8b46da87d676d91777be370bd5d51f068b02697254c89e47c232a92d5c2e5316aa2c0ed7fd3905f5aa67fb7bb05b420180ee53a7f20945a SHA512 e97feeb58efc1064f7b5739306dde9435e4cb93c260d8999e292adefc99c45c8534ac5e4c06096c5fb79faea88562c76ef74868be0b112dcb8162ecbfa39a42c
diff --git a/sci-visualization/gnuplot/gnuplot-5.0.5.ebuild b/sci-visualization/gnuplot/gnuplot-5.0.5.ebuild
deleted file mode 100644
index cac060cf8d00..000000000000
--- a/sci-visualization/gnuplot/gnuplot-5.0.5.ebuild
+++ /dev/null
@@ -1,207 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# 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 cvs
-	ECVS_SERVER="gnuplot.cvs.sourceforge.net:/cvsroot/gnuplot"
-	ECVS_MODULE="gnuplot"
-	ECVS_BRANCH="HEAD"
-	ECVS_USER="anonymous"
-	ECVS_CVS_OPTIONS="-dP"
-	MY_P="${PN}"
-	SRC_URI=""
-	KEYWORDS=""
-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 qt4 readline 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 )
-	qt4? ( >=dev-qt/qtcore-4.5:4
-		>=dev-qt/qtgui-4.5:4
-		>=dev-qt/qtsvg-4.5:4 )
-	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 )"
-
-S="${WORKDIR}/${MY_P}"
-
-GP_VERSION="${PV%.*}"
-E_SITEFILE="lisp/50${PN}-gentoo.el"
-TEXMF="${EPREFIX}/usr/share/texmf-site"
-
-PATCHES=( "${FILESDIR}"/${PN}-5.0.1-fix-underlinking.patch )
-
-src_prepare() {
-	default
-
-	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
-
-	# 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".'
-	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.'
-
-	mv configure.in configure.ac || die
-	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"
-		need-wxwidgets unicode
-	fi
-
-	tc-export CC CXX			#453174
-	tc-export_build_env BUILD_CC
-	export CC_FOR_BUILD=${BUILD_CC}
-
-	econf \
-		--without-pdf \
-		--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 svga linux-vga) \
-		$(use_with X x) \
-		--enable-stats \
-		$(use_with qt4 qt qt4) \
-		$(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
-		emake -C docs gnuplot.pdf
-		emake -C tutorial pdf
-	fi
-}
-
-src_install () {
-	emake DESTDIR="${D}" install
-
-	dodoc BUGS ChangeLog NEWS PGPKEYS PORTING README*
-	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.0.7.ebuild b/sci-visualization/gnuplot/gnuplot-5.0.7.ebuild
index cfae414e61c7..1c2d9f218026 100644
--- a/sci-visualization/gnuplot/gnuplot-5.0.7.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-5.0.7.ebuild
@@ -61,7 +61,8 @@ DEPEND="${RDEPEND}
 	doc? (
 		virtual/latex-base
 		dev-texlive/texlive-latexextra
-		app-text/ghostscript-gpl )"
+		app-text/ghostscript-gpl )
+	qt5? ( dev-qt/linguist-tools:5 )"
 
 S="${WORKDIR}/${MY_P}"
 
diff --git a/sci-visualization/gnuplot/gnuplot-5.2.2.ebuild b/sci-visualization/gnuplot/gnuplot-5.2.2.ebuild
index 2b8515bf041c..9948859c4837 100644
--- a/sci-visualization/gnuplot/gnuplot-5.2.2.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-5.2.2.ebuild
@@ -61,7 +61,8 @@ DEPEND="${RDEPEND}
 	doc? (
 		virtual/latex-base
 		dev-texlive/texlive-latexextra
-		app-text/ghostscript-gpl )"
+		app-text/ghostscript-gpl )
+	qt5? ( dev-qt/linguist-tools:5 )"
 
 S="${WORKDIR}/${MY_P}"
 
diff --git a/sci-visualization/gnuplot/gnuplot-5.2.9999.ebuild b/sci-visualization/gnuplot/gnuplot-5.2.9999.ebuild
index 564bad1aca79..46862f95e71c 100644
--- a/sci-visualization/gnuplot/gnuplot-5.2.9999.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-5.2.9999.ebuild
@@ -61,7 +61,8 @@ DEPEND="${RDEPEND}
 	doc? (
 		virtual/latex-base
 		dev-texlive/texlive-latexextra
-		app-text/ghostscript-gpl )"
+		app-text/ghostscript-gpl )
+	qt5? ( dev-qt/linguist-tools:5 )"
 
 S="${WORKDIR}/${MY_P}"
 
diff --git a/sci-visualization/gnuplot/gnuplot-5.3.9999.ebuild b/sci-visualization/gnuplot/gnuplot-5.3.9999.ebuild
index 53fd0391582b..e5aae89a82c2 100644
--- a/sci-visualization/gnuplot/gnuplot-5.3.9999.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-5.3.9999.ebuild
@@ -61,7 +61,8 @@ DEPEND="${RDEPEND}
 	doc? (
 		virtual/latex-base
 		dev-texlive/texlive-latexextra
-		app-text/ghostscript-gpl )"
+		app-text/ghostscript-gpl )
+	qt5? ( dev-qt/linguist-tools:5 )"
 
 S="${WORKDIR}/${MY_P}"