gentoo resync : 20.11.2017

8 files changed, 358 insertions, 93 deletions

diff --git a/sci-visualization/gnuplot/Manifest b/sci-visualization/gnuplot/Manifest
index 2bb46a07d2a9..f1c628976ded 100644
--- a/sci-visualization/gnuplot/Manifest
+++ b/sci-visualization/gnuplot/Manifest
@@ -1,14 +1,17 @@
 AUX gnuplot-5.0.1-fix-underlinking.patch 483 SHA256 636e809614982d6271a1376f7b1d3278b59d08acc645bb81a44611e83ea1991d SHA512 b5ac3ed830f201ba6018a81bc4860e6da0e41cc9cdc1ac8acc225bf41a0006cbd6e2f8e061ab2bd013ad55b105a02e915e256a09ca4e4faaf4791ea1c3199f28 WHIRLPOOL 5dba603849e11ad1850771ecabe8a9b1d63c3c630a524d9c67a9fe096a5449618e0b59678aef8bc8cf7b1570eb06d740f8fc827d99d8d40c5ac5f9b799b47373
+AUX gnuplot-5.0.6-no-picins.patch 956 SHA256 bfa3449c2024e67da3e23c72482011c0ab083b1852d5a1827a243046d0951a1e SHA512 fe66f0d8045be89d6464b9de9aa7d80196b4eccf0d0aab3daf6b0a121f5565bb96f11e0f96d9d9c296795b86e11300ddb9811100671fc4470d2dbf8097fbb02c WHIRLPOOL 6a7e30e1db62bb3b850c99efd0daf72d88de127fc6b7338562a6ba567cc06bd3d4c18b6ed24e56eabc70edef422b39bbf136524bab2bc69bacbdc2098374d489
 DIST gnuplot-5.0.1.tar.gz 4963747 SHA256 7cbc557e71df581ea520123fb439dea5f073adcc9010a2885dc80d4ed28b3c47 SHA512 f68ccef8ecad0d5f7c2eb5dc2c97ba14abba6e3324c36bb9ede5f87eef613942376a26e42e55fa8e9c908e2b732aa0b9f34d6d5c386e3d5cf9685bbca60fa094 WHIRLPOOL 7c1d7ec4e999d5d78fadc67cee1186988dbb1cd53feef19094554aa215a19ee6b136d7b65e692cba42bfdb19a06f036fc3fbe1b78cb55f9d0f1b8a740341d15c
-DIST gnuplot-5.0.4.tar.gz 5051380 SHA256 151cb845728bde75eb9d1561b35140114a05a7c52a52bd35b4b2b3d944e0c31e SHA512 ebb6bf64cc7f333135d328f6b72d73ef3a3b62f5df28d746efa1589dd9d54fc359306c7c2bc5ad9671b53b0cc945a4388b087abf365dda7417fe21a93ff29dae WHIRLPOOL 73c952dd640879190d68c66df1d67c143ec3619c356f52357df637748be9324946f538ca3da222580f7376332dfc2a295634523d9864bd7342c43af0baa26053
 DIST gnuplot-5.0.5.tar.gz 5078771 SHA256 25f3e0bf192e01115c580f278c3725d7a569eb848786e12b455a3fda70312053 SHA512 fd6efc3a869850fa1939a4c833c776395efaaaf6dccc63e3626cee2e39938923b06314368802155adf711ae3e5ca0e3dd1a88be348e8571f9d0be8790240c62c WHIRLPOOL 586aa59439d92c1a05169b57b1c7369465914870788b20b394fef0591a84f134ce6f6707b370105f55277d326d3ab578904ac82355c8d97b7337a7980ab8e29e
 DIST gnuplot-5.0.6.tar.gz 5093897 SHA256 5bbe4713e555c2e103b7d4ffd45fca69551fff09cf5c3f9cb17428aaacc9b460 SHA512 7f9b05725a8594dcfbf1f1fc8f1db9bf45e1b6841fa1089b2c2528a3e36f71baab16d5fbeb027e4dd3618461a4895d037cb9f43781bfee2cb078cb9583567d8d WHIRLPOOL 3f3cf31f764af36d3761a17447ed8da98aec1148270eacc33c48605cf0dbff6dbde4b726403d4177da2104e6ff9baa4d48e0e3c65630a057ab1dc01f641daf5e
+DIST gnuplot-5.0.7.tar.gz 5100186 SHA256 0ad760ff013b4a9cf29853fa9b50c50030a33cd8fb86220a23abb466655136fc SHA512 5d7241dc1472f87af8632110a1e88f83b5ea3f41e1bc8c89a45dc4662a3071d91a25bf9ae5196a2b8bef09c8079c22f635bb947c02def3416d78880d61eea919 WHIRLPOOL f8382c7a0e9a460f6898eaa4c280db9d6088aa997c2685350c23d97b2ec09b14236f6caa057b41f7f02a513734a99a18da3383e9ed769e821204de14a11d35cf
+DIST gnuplot-5.2.2.tar.gz 5282973 SHA256 a416d22f02bdf3873ef82c5eb7f8e94146795811ef808e12b035ada88ef7b1a1 SHA512 51d5b2234dae358580cc2794ed63f8a5b950baf73edc5362f5bb18d77e8066c3c010239c3b29840db11e5936cb9381bb57193de751bd274af5547a45d6d88b0b WHIRLPOOL b8d81ae768946db0fbc5418d11291b491dd3968777e7a684df33efa7070638fdc4d918617043e465dbddbd2bc24da73a07f45a3c290e44d4356519f0658ec9ee
 EBUILD gnuplot-5.0.1-r1.ebuild 5692 SHA256 c8e358f2e1321906e215d51a81f3c777c9205b57321be97a8951d25a33fb3ed1 SHA512 6058590102387ce8899f50f2621fdb6221b2faa5f9778cda0cea465aa1501bc78c02c6e769f3f05297c8769f48087787fe20a9af7bc6e7038752c82d68993849 WHIRLPOOL efde2a5a906d40697310ccec9141f6bdbd38dcb50f660d97671ef661d23a713d59732f01fa98f1718d5b66df85615e6b0fd1ab874fe9fa994a3f60ce014dd75e
-EBUILD gnuplot-5.0.4.ebuild 5669 SHA256 cf4268a29f2d9b141f5a90235a279477cc5b27342fbf5c4738e213ae5b8d5336 SHA512 978f1d20657954c649780a8c2124a4aa95d1b81b5fdf49f6369f6679637c1e28bd948d90f98990404760ea0e007ff45e93351143d99e3c83525cc438d7a84a61 WHIRLPOOL 0b9d1f9448360b4d2ac3ff7f529e43ecc7dd15e91a7099be2aee33033c18bdb26fe31d7ccb6889d38e23167ad7bd0319f56e1b07674b66a7cf4fd267d6aae198
 EBUILD gnuplot-5.0.5.ebuild 5604 SHA256 06198c1feedefbf72c82a32b622b400d750f1d0e6ea8ef8a58204e88553cb53d SHA512 c251c4a2f3eed5ab4c9ae8423546f1adb84592fe0cd018e5f08240c862599c964db0383ac098da6e7b32e5986ab5ce1991721ac40f7c4b3d6188386c56df883d WHIRLPOOL fb4c7941b7fa4695dfc6f007c2dd35244f863a66779791d72f9f20045edda0db81c10d1aba1e2f7087794e2992ca7c7f783c4fe1ee13addb635a1de50dcf1c82
-EBUILD gnuplot-5.0.6.ebuild 5604 SHA256 06198c1feedefbf72c82a32b622b400d750f1d0e6ea8ef8a58204e88553cb53d SHA512 c251c4a2f3eed5ab4c9ae8423546f1adb84592fe0cd018e5f08240c862599c964db0383ac098da6e7b32e5986ab5ce1991721ac40f7c4b3d6188386c56df883d WHIRLPOOL fb4c7941b7fa4695dfc6f007c2dd35244f863a66779791d72f9f20045edda0db81c10d1aba1e2f7087794e2992ca7c7f783c4fe1ee13addb635a1de50dcf1c82
-EBUILD gnuplot-5.0.9999.ebuild 5617 SHA256 1269e993ce5310f73ad0e770b9d89246dc752fa8e2ad2bd34c85e04fb4b2418a SHA512 ad5e2f16c8309525d863621a564fc1aafdf834eb96f61b6f3f91d8c9dab2b55eedef34b7c77f07c90d3937252ceb35156265937858cba2afc173665bb44b187e WHIRLPOOL 97b856beb0d39c9e1627324fd9b340d6353d3ec176ec75c76f72667be168f7bd122873f9aa297cf13bd20e421f8387b637349c0b74d2670bb9f8ce1cf41b980b
-EBUILD gnuplot-5.1.9999.ebuild 5542 SHA256 9dfafd12a6b048259518a95f44b4e23741dc21a5be4702df5766a9661fbb593a SHA512 d4ebf26502c5b17b0e147fd5f478e15f145c15ca418b66735d80f7efb33c8129f895cdeca1962d91c42ba1704107c0d1b70696d8bc1f08fec3eb269f17287e07 WHIRLPOOL 0354f48c04472e07da3015661b7b7a71df6290bd65631922133f5bdc4472dfcf3df4852ab2596916814b30f44c09c24bdfc4d5781f7521c51a73fb7afee03773
+EBUILD gnuplot-5.0.6.ebuild 5877 SHA256 4cdaad9d1989206b404ec88443001d0a9a96b32b58370a2e167598a30ff0ce9a SHA512 1742e2ceb47424aa1c3526bb64960c2fe9376680eaf446689604f0030a70d9b201ac290bdea88c86f34ea782430ef38d4fd9bc9955242951331a634bf216796a WHIRLPOOL bcd47b52bd90b41f0de815699f9474fe8068e87cbc5ce9b9f6322d2da6abc30a0f325a05c0e3eeabb115b3c9b961b194d170434a640cd7511133918881c7211a
+EBUILD gnuplot-5.0.7.ebuild 5796 SHA256 2a53d00062ba73b23f4a24e2503cd6a61cb94704cd525289aa89a863657c7009 SHA512 6a5efe9753bada89e45131b2775cccff5cc6288062af7d315c95919a458b12f4459bab72121ff6ebfb3fe1ceef8b9205550a322e1a50e323f7b0164f0fb94cc6 WHIRLPOOL d83e7619d0585e9dabf4447874cb23481d1b2623a996bdfb98441181c953ce0183979151c34a38e4418bc85ebe5b4863af3db651f9979bea64b659635bf9a738
+EBUILD gnuplot-5.2.2.ebuild 5752 SHA256 059a473d654b6f5a0d03b54bba7902f2455ff28dcafab8e070adbf6a779ac1ec SHA512 ce10cbde1e42887685c655d6c645b1096b2f128e338603c8597828b188fb6b27446569c044dc0b58118e5720c74851d265e2cad860824aee229d3e2ee4b7eecc WHIRLPOOL 8f93671c3baf7078096a8c74e25fe3003ae730c43b6ca24a1180c75866db55214cc6747d85e9c5cf03aee9162d559f8dcc11a3fde4226b10382b0e6f9b99ca28
+EBUILD gnuplot-5.2.9999.ebuild 5773 SHA256 ce2c8fb03a7902b73e38b2a95edfbc7fd892036e03ead539090c889be227ca48 SHA512 976705b4cbf3c3632378ea3bc5eacfcba42af966242a818d7b6f5996973dd25f18868f95662e6b30f631e0c2c90aa16ca3673ba335308efa23682a79afd713f9 WHIRLPOOL e021feab2f0c480057c17b0cd0a104031263c760419e371b550995520658d204632b0e8a939403741462e90c83dd4dd72ef15ccdf61e1ff5805de31947b14a3f
+EBUILD gnuplot-5.3.9999.ebuild 5760 SHA256 aa2076c371470f2966b94bdcc260da19727ceb74a27e58955538584419bd1ed4 SHA512 a24ab4e92bf4a2680250c3d65c9882be4c81aecf000d01a77724876ea85f820476b8a21c9401f6a0e090e42f9c885106e13e44ac5c02e8e876577f9c86672998 WHIRLPOOL c9a45528b6b1fb52b83766e3ecfb6e14e716b1952c91e0b09e1c71430e20fd7b73b69948aa042c01b1dfaa5b317529bf811b4968af42785f68b48fb3f0d91ba2
 MISC ChangeLog 6805 SHA256 189ff4733326725d08cab997b43e907bebb96ebe28af7201cf420e327416eef2 SHA512 8aebaa653ee2bdcc9c42e68d4195991fd744b95a706a16586b50674f7e8dc513e9b9366b1c5679aa78da78eeb0a516b51c136522c425621790d3f14ddb50f1eb WHIRLPOOL d0c54fcb6e805b52bb13b1f175b7482ab05fcd308937ac600957cafc4a687d7df7ccacb5be1674a70f11b3ba733c1aeadde56e780acff5d7382c0a20ba31aa1c
 MISC ChangeLog-2015 43620 SHA256 71f96494865b1c06db75afdf7bc0813aae86cb84913756075e87899d97502ca8 SHA512 8f79b7dd12bbadc9c2f6e90f3cadefe783693174a19504847872f80ff7a62ab037ebeb7221aa7fd5ce5cf7fde86b3c55a14afb625d344a7ab27bc00be8698402 WHIRLPOOL 3c0e4fa5e788a5700d39cd137d71a2aeafad0df991ab301fc2e11bafd898386945234280d39e6ce4912da8429e148c9ea079257462c937ff34df0bd59c5f81ff
-MISC metadata.xml 1250 SHA256 08dcc4fd7b5f3152d19befb2de06a214d6fb69835cdf0f5609b6f22ada23e0eb SHA512 6f7195f01f62923757633f63c75f14f5c5dbf9b7ffd770af3e011873578128caebcd8b331ecf05bfc2f8e883b8062c29a3e937c026df1700d752a5455caa881c WHIRLPOOL c65f213f80566f99628e8e8ed2bb3086bcc26aadb078725566662a867d73a80afea8e2bd568e3f0ee9c1df566d571646dec7f893792193e5803f4f71ab6d76d3
+MISC metadata.xml 1217 SHA256 f376df44eb5168bc364ba1cc064b5f75cdb05f33c1bf16d77d356139bdafafac SHA512 e97feeb58efc1064f7b5739306dde9435e4cb93c260d8999e292adefc99c45c8534ac5e4c06096c5fb79faea88562c76ef74868be0b112dcb8162ecbfa39a42c WHIRLPOOL 9472a35d6c6773f5cf1fd23d66c678e33829cb81c231d5523b113f6b9fa9057e70a268ad6e481eb90406d8aaf3eb3b44126f564930f865ddc5325f7a7a088bd7
diff --git a/sci-visualization/gnuplot/files/gnuplot-5.0.6-no-picins.patch b/sci-visualization/gnuplot/files/gnuplot-5.0.6-no-picins.patch
new file mode 100644
index 000000000000..87408aebd447
--- /dev/null
+++ b/sci-visualization/gnuplot/files/gnuplot-5.0.6-no-picins.patch
@@ -0,0 +1,27 @@
+Do not require picins.sty.
+https://bugs.gentoo.org/577828#c4
+
+--- gnuplot-5.0.6-orig/docs/Makefile.am
++++ gnuplot-5.0.6/docs/Makefile.am
+@@ -189,7 +189,6 @@
+ 	  touch figures.idx ; \
+ 	  rm -f pdffigures.tex ; \
+ 	  ( echo "\usepackage{graphicx}" > pdffigures.tex ; \
+-	    echo "\usepackage{picins}" >> pdffigures.tex ; \
+ 	  ) ; \
+ 	  TEXINPUTS=.:$(srcdir):$(top_srcdir):${TEXINPUTS}: $(PDFLATEX) $< ; \
+ 	  TEXINPUTS=.:$(srcdir):$(top_srcdir):${TEXINPUTS}: $(PDFLATEX) $< ; \
+--- gnuplot-5.0.6-orig/docs/doc2tex.c
++++ gnuplot-5.0.6/docs/doc2tex.c
+@@ -170,9 +170,9 @@
+     case 'F':			/* embedded figure */
+ 	    if (figures) {
+ 		line[strlen(line)-1]=NUL;
+-		(void) fputs("\\parpic[r][rt]{\\includegraphics[width=3in,keepaspectratio]{",b);
++		(void) fputs("\\begin{figure}[htb]\n\\centering\\includegraphics[width=3in,keepaspectratio]{",b);
+ 		fputs(line+1, b);
+-		(void) fputs("}}\n",b);
++		(void) fputs("}\n\\end{figure}\n",b);
+ 	    }
+ 	    break;
+ 
diff --git a/sci-visualization/gnuplot/gnuplot-5.0.6.ebuild b/sci-visualization/gnuplot/gnuplot-5.0.6.ebuild
index cac060cf8d00..ed8eea3ee069 100644
--- a/sci-visualization/gnuplot/gnuplot-5.0.6.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-5.0.6.ebuild
@@ -17,11 +17,11 @@ if [[ -z ${PV%%*9999} ]]; then
 	ECVS_CVS_OPTIONS="-dP"
 	MY_P="${PN}"
 	SRC_URI=""
-	KEYWORDS=""
+	KEYWORDS="hppa ppc ppc64 x86"
 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"
+	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 )"
@@ -66,10 +66,10 @@ 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
+	eapply "${FILESDIR}"/${PN}-5.0.1-fix-underlinking.patch
+	eapply "${FILESDIR}"/${PN}-5.0.6-no-picins.patch
+	eapply_user
 
 	if [[ -z ${PV%%*9999} ]]; then
 		local dir
@@ -162,7 +162,14 @@ src_compile() {
 	if use doc; then
 		# Avoid sandbox violation in epstopdf/ghostscript
 		addpredict /var/cache/fontconfig
-		emake -C docs gnuplot.pdf
+		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
 }
diff --git a/sci-visualization/gnuplot/gnuplot-5.1.9999.ebuild b/sci-visualization/gnuplot/gnuplot-5.0.7.ebuild
index cbc8a7447f0a..cfae414e61c7 100644
--- a/sci-visualization/gnuplot/gnuplot-5.1.9999.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 )
@@ -67,7 +70,9 @@ E_SITEFILE="lisp/50${PN}-gentoo.el"
 TEXMF="${EPREFIX}/usr/share/texmf-site"
 
 src_prepare() {
-	default
+	eapply "${FILESDIR}"/${PN}-5.0.1-fix-underlinking.patch
+	eapply "${FILESDIR}"/${PN}-5.0.6-no-picins.patch
+	eapply_user
 
 	if [[ -z ${PV%%*9999} ]]; then
 		local dir
@@ -80,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".'
@@ -124,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}" \
@@ -141,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
@@ -160,7 +161,14 @@ src_compile() {
 	if use doc; then
 		# Avoid sandbox violation in epstopdf/ghostscript
 		addpredict /var/cache/fontconfig
-		emake -C docs gnuplot.pdf
+		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
 }
diff --git a/sci-visualization/gnuplot/gnuplot-5.0.9999.ebuild b/sci-visualization/gnuplot/gnuplot-5.2.2.ebuild
index e06fd330630b..2b8515bf041c 100644
--- a/sci-visualization/gnuplot/gnuplot-5.0.9999.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-5.2.2.ebuild
@@ -12,7 +12,7 @@ if [[ -z ${PV%%*9999} ]]; then
 	inherit cvs
 	ECVS_SERVER="gnuplot.cvs.sourceforge.net:/cvsroot/gnuplot"
 	ECVS_MODULE="gnuplot"
-	ECVS_BRANCH="branch-5-0-stable"
+	ECVS_BRANCH="HEAD"
 	ECVS_USER="anonymous"
 	ECVS_CVS_OPTIONS="-dP"
 	MY_P="${PN}"
@@ -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 )
@@ -66,10 +69,10 @@ 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
+	eapply "${FILESDIR}"/${PN}-5.0.1-fix-underlinking.patch
+	eapply "${FILESDIR}"/${PN}-5.0.6-no-picins.patch
+	eapply_user
 
 	if [[ -z ${PV%%*9999} ]]; then
 		local dir
@@ -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".'
@@ -100,7 +97,6 @@ src_prepare() {
 		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.
@@ -126,8 +122,9 @@ 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}" \
 		--with-readline=$(usex readline gnu builtin) \
 		$(use_with bitmap bitmap-terminals) \
@@ -143,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
@@ -162,7 +159,14 @@ src_compile() {
 	if use doc; then
 		# Avoid sandbox violation in epstopdf/ghostscript
 		addpredict /var/cache/fontconfig
-		emake -C docs gnuplot.pdf
+		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
 }
@@ -170,7 +174,7 @@ src_compile() {
 src_install () {
 	emake DESTDIR="${D}" install
 
-	dodoc BUGS ChangeLog NEWS PGPKEYS PORTING README*
+	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
diff --git a/sci-visualization/gnuplot/gnuplot-5.2.9999.ebuild b/sci-visualization/gnuplot/gnuplot-5.2.9999.ebuild
new file mode 100644
index 000000000000..564bad1aca79
--- /dev/null
+++ b/sci-visualization/gnuplot/gnuplot-5.2.9999.ebuild
@@ -0,0 +1,211 @@
+# 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="branch-5-2-stable"
+	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 qt5 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 )
+	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 )"
+
+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_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"
+		need-wxwidgets unicode
+	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 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 PORTING 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.0.4.ebuild b/sci-visualization/gnuplot/gnuplot-5.3.9999.ebuild
index da8e950ce6ee..53fd0391582b 100644
--- a/sci-visualization/gnuplot/gnuplot-5.0.4.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-5.3.9999.ebuild
@@ -1,18 +1,18 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-inherit autotools eutils flag-o-matic multilib readme.gentoo toolchain-funcs wxwidgets
+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 autotools cvs
+	inherit cvs
 	ECVS_SERVER="gnuplot.cvs.sourceforge.net:/cvsroot/gnuplot"
 	ECVS_MODULE="gnuplot"
-	ECVS_BRANCH="branch-5-0-stable"
+	ECVS_BRANCH="HEAD"
 	ECVS_USER="anonymous"
 	ECVS_CVS_OPTIONS="-dP"
 	MY_P="${PN}"
@@ -21,13 +21,12 @@ if [[ -z ${PV%%*9999} ]]; then
 else
 	MY_P="${P/_/.}"
 	SRC_URI="mirror://sourceforge/gnuplot/${MY_P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~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"
-	inherit autotools
+	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"
+IUSE="aqua bitmap cairo compat doc examples +gd ggi latex libcaca libcerf lua qt5 readline svga wxwidgets X"
 
 RDEPEND="
 	cairo? (
@@ -42,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 )
@@ -68,27 +70,21 @@ E_SITEFILE="lisp/50${PN}-gentoo.el"
 TEXMF="${EPREFIX}/usr/share/texmf-site"
 
 src_prepare() {
-	# Fix underlinking
-	epatch "${FILESDIR}"/${PN}-5.0.1-fix-underlinking.patch
+	eapply "${FILESDIR}"/${PN}-5.0.1-fix-underlinking.patch
+	eapply "${FILESDIR}"/${PN}-5.0.6-no-picins.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
-		#eautoreconf
 	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".'
@@ -101,7 +97,6 @@ src_prepare() {
 		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.
@@ -127,8 +122,9 @@ 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}" \
 		--with-readline=$(usex readline gnu builtin) \
 		$(use_with bitmap bitmap-terminals) \
@@ -144,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
@@ -163,7 +159,14 @@ src_compile() {
 	if use doc; then
 		# Avoid sandbox violation in epstopdf/ghostscript
 		addpredict /var/cache/fontconfig
-		emake -C docs gnuplot.pdf
+		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
 }
@@ -171,7 +174,7 @@ src_compile() {
 src_install () {
 	emake DESTDIR="${D}" install
 
-	dodoc BUGS ChangeLog NEWS PGPKEYS PORTING README*
+	dodoc BUGS ChangeLog NEWS PGPKEYS PORTING README* RELEASE_NOTES TODO
 	newdoc term/PostScript/README README-ps
 	newdoc term/js/README README-js
 	use lua && newdoc term/lua/README README-lua
@@ -181,8 +184,8 @@ src_install () {
 		# 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*
+		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
diff --git a/sci-visualization/gnuplot/metadata.xml b/sci-visualization/gnuplot/metadata.xml
index 151dd892920f..8700ea957399 100644
--- a/sci-visualization/gnuplot/metadata.xml
+++ b/sci-visualization/gnuplot/metadata.xml
@@ -1,32 +1,34 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>ulm@gentoo.org</email>
-    <name>Ulrich Müller</name>
-  </maintainer>
-  <maintainer type="person">
-    <email>junghans@gentoo.org</email>
-    <name>Christoph Junghans</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>sci@gentoo.org</email>
-    <name>Gentoo Science Project</name>
-  </maintainer>
-  <longdescription>
+<maintainer type="person">
+  <email>ulm@gentoo.org</email>
+  <name>Ulrich Müller</name>
+</maintainer>
+<maintainer type="person">
+  <email>junghans@gentoo.org</email>
+  <name>Christoph Junghans</name>
+</maintainer>
+<maintainer type="project">
+  <email>sci@gentoo.org</email>
+  <name>Gentoo Science Project</name>
+</maintainer>
+<longdescription>
   Gnuplot is a command-driven interactive function plotting program.
   It can be used to plot functions and data points in both two- and
   three-dimensional plots in many different formats. It is designed
   primarily for the visual display of scientific data.
 </longdescription>
-  <use>
-	<flag name="compat">Enable backwards compatibility with version 4 syntax</flag>
-    <flag name="gd">Add support for <pkg>media-libs/gd</pkg>.
+<use>
+  <flag name="compat">Enable backwards compatibility with version 4
+    syntax</flag>
+  <flag name="gd">Add support for <pkg>media-libs/gd</pkg>.
     Needed for GIF, JPEG, and PNG image output.</flag>
-    <flag name="libcerf">Enable special functions from <pkg>sci-libs/libcerf</pkg></flag>
-    <flag name="bitmap">Enable dot-matrix printers and pbm terminal</flag>
-  </use>
-  <upstream>
-    <remote-id type="sourceforge">gnuplot</remote-id>
-  </upstream>
+  <flag name="libcerf">Enable special functions from
+    <pkg>sci-libs/libcerf</pkg></flag>
+  <flag name="bitmap">Enable dot-matrix printers and pbm terminal</flag>
+</use>
+<upstream>
+  <remote-id type="sourceforge">gnuplot</remote-id>
+</upstream>
 </pkgmetadata>