gentoo resync : 28.04.2021

20 files changed, 253 insertions, 52 deletions

diff --git a/sci-visualization/Manifest.gz b/sci-visualization/Manifest.gz
index 20f98c1e12e5..f15894c6bf9a 100644
--- a/sci-visualization/Manifest.gz
+++ b/sci-visualization/Manifest.gz
diff --git a/sci-visualization/epix/Manifest b/sci-visualization/epix/Manifest
index a58986fb1d62..be8f69a8f1b2 100644
--- a/sci-visualization/epix/Manifest
+++ b/sci-visualization/epix/Manifest
@@ -1,5 +1,5 @@
 AUX 50epix-gentoo.el 298 BLAKE2B 236677e59724ddda6cca138c5e049250798a249373558caa1d2f85b432710352d86cf4c4a90ac4556da4857d5aa4bbf2dbae816a2338808a6a79d44eed0fcd75 SHA512 7033d169194cffe4265569f1b048e9ec1929dc98257eb4fb63f486be1ab8162e80fa75fd3943c81b5f9a8eb0e13665e66852ef1f9fbf7cfaee949f5d56fbe9a3
 AUX epix-1.2.10-autotools.patch 2701 BLAKE2B 1478b23499deda305b94b26e9b680131bcecf6dc633d35187f9e9fc3fa7ee500e6b679eb6ade85564b631e7d207c3e0c0cb4ee1caf42779ff1477e1a55e5fd31 SHA512 c94beae67c28ceff6cd4445272574e6cb93f4c181cddb4023587d20e2fed1bea523891191f80b6dd8870f167cbcae2567cd014b6a20aafbb6a74624c76e54cac
 DIST epix-1.2.11_withpdf.tar.bz2 1709429 BLAKE2B db9cba5b94e27742347f8fc85366399016438681a7016077966e5048b9a178404af8305da7d170722aaac82d85283552f87fbba76b21e788fee546b0e0aebf43 SHA512 16d0edf13711e469a13faba83d47fbab983277a95cfed0e343089258da0b8a56104af9fc217aaa70928c50f10e7d152df93c3638cf2a65a2833142645a829a45
-EBUILD epix-1.2.11-r2.ebuild 1520 BLAKE2B a835904a26a36ed9c86e57d26ea30a84bd3f24d0b6a824495f391a0d969c6c255a65a6b3f6effc72e18656200d885137b2081819bad8f80a8d5dbec92b1449cc SHA512 23affe8ea12267299b5c68829ea32b6fc7ee760320c492f3f6981f8dacb3e1d0a0cdcd98065896d88d351dafedb31d4aed496ad9d1e24c4e9e9b25e6206ff4d5
+EBUILD epix-1.2.11-r3.ebuild 1520 BLAKE2B 18be4038da89c7d289e5187ac9a767acc77ea0e62a1389d168ca79d5a9e78976f11ce1fd2179067471da4c5d819016553fcefeaa21513456f309f4540c8cea41 SHA512 3f9fecddb0699610577dd3ff8215b2be5ac6abb012e8867535cd86ee67bc065268c3cf26af0fdb35963c8bf8e42df48acc1ad71a2f01cc97a13b86d1ea9739f7
 MISC metadata.xml 779 BLAKE2B 2e6405de37d7ed3e85eb865d140a599b1de484f9cc5c35eda7be384259b34bbed06aa84dffc8a5b1b05c6db18a5d0bd1b0f28c9969a8aac933582bf0d1c9cc2a SHA512 b0cb62a782873b0e2e115f18495f520f3fb5cf06052d6fdae023a65a3a40fb2eaf355ffacf0243149d9890d8f56be87dbbdaf459b05ae32b877037e7ff2bc5e9
diff --git a/sci-visualization/epix/epix-1.2.11-r2.ebuild b/sci-visualization/epix/epix-1.2.11-r3.ebuild
index 7d479a0bc449..747862885521 100644
--- a/sci-visualization/epix/epix-1.2.11-r2.ebuild
+++ b/sci-visualization/epix/epix-1.2.11-r3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-inherit elisp-common bash-completion-r1 autotools eutils
+inherit elisp-common bash-completion-r1 autotools epatch
 
 DESCRIPTION="2- and 3-D plotter for creating images (to be used in LaTeX)"
 HOMEPAGE="https://mathcs.holycross.edu/~ahwang/current/ePiX.html"
@@ -52,7 +52,7 @@ src_install() {
 	if use examples; then
 		cd samples || die
 		docinto examples
-		doins *.xp *.flx *c *h README
+		dodoc *.xp *.flx *c *h README
 	fi
 }
 
diff --git a/sci-visualization/ggobi/Manifest b/sci-visualization/ggobi/Manifest
index 84131d20249e..20e166f5e1bc 100644
--- a/sci-visualization/ggobi/Manifest
+++ b/sci-visualization/ggobi/Manifest
@@ -3,5 +3,5 @@ AUX ggobi-2.1.11-Wformat-security.patch 1109 BLAKE2B e629aa6d52caecb00c962f531ea
 AUX ggobi-2.1.8-plugindir.patch 499 BLAKE2B 9e436b43ff668d49f83d718dd6b296c8ef19ec5c8a6654a0629de6c947dd8794422c023ccbdf8545a2b4292af22bc6554b2006aaf0a550773982a511c704e4b3 SHA512 07108552ac0bda21fec8b7aa83e25a51abd1fcc6630347d1e1348b467a0d246c91f6400d148b6781961a8e38eb31a0c96a86de0df48984a351c072f950d2be11
 AUX ggobi-2.1.9-as-needed.patch 1716 BLAKE2B 113e51badbfedcc06265af6859256db11f1b9833e5aab336d498ca9a40bb93e495eb23fe328312878cf47e7bc2fbd5e4a25c42fb6ff5053d07879a010ac63641 SHA512 6e96f461e71630b68ba0ecc48fa94f8b7ab211cd26c95b91d65604a23c3fa13b20316e90397f857857c21cd8ddc6a8f67efcc7ec62a8d2c48c349b532aad8797
 DIST ggobi_2.1.11.orig.tar.bz2 2787709 BLAKE2B e4b853f3212abda00150e6a3b3a344638225bdc564c109632c7ca2f9cb8cc41d35af9df1ee153d2ede3bd3191d9219e2bdd6bd6bc9c64f42447dfe17562361f1 SHA512 d34c6569d05d1e680101b62745012940c1e18c1588cd37b89b26b89e9eed9bab8fc53e0585a595b6cb4c9f2bb7d603ca4252cb6a6ba344bbc24e5cc5fd8a6dc1
-EBUILD ggobi-2.1.11.ebuild 1353 BLAKE2B da7f9eed2fdb84aa513f5db0dbf793845dfbf0d0bb6ba74e59eb5fa13b629992f7e192794bfab4f8076c9eb995fb00c6c2bedb817698593ca3b8d66c0dd00733 SHA512 cb4a0275df15740938a54f3573941e8fd2f2f50c711b856f9b0611c7aff066c939a53c6ed7b84f94c91945a5668cecac36920868f57fa0909724935ccdc4c42e
+EBUILD ggobi-2.1.11.ebuild 1353 BLAKE2B 11d873b0912d86f12526b120829347e86a32e752eb47b44c4851802a9dcce53e96b89ae1e649d8ebd27f13d9afb740627191c3dc62252d4827573410fa16e7f9 SHA512 39d4bd9bc3e4dc7fc1fd85b5c6917f92e3d1ce0649bf722a92490d7ac90a4ebe65253133fc25aad04621ad5b0ae345f26ebfd3687cd7ce152b689aaec3ee1cd7
 MISC metadata.xml 624 BLAKE2B cea18e65c4dcf76c174bd3bc9a6c6f8299ac11adfaecc60eb6ef2f4a225fb61d79e3a2d888ea2812466e773543db72afe032c13a1ffa7526669bb8e48872610e SHA512 81e5eddaf2de7b9ff5f2e3c6cf5f555586c140101fb5562419daf02127132a9a35928e95cdc4916b51715953a27a516f5dae72f2ed1a5e31110ff0cd7a1d7f16
diff --git a/sci-visualization/ggobi/ggobi-2.1.11.ebuild b/sci-visualization/ggobi/ggobi-2.1.11.ebuild
index 5c9ba5817bb7..a3a40cec5a40 100644
--- a/sci-visualization/ggobi/ggobi-2.1.11.ebuild
+++ b/sci-visualization/ggobi/ggobi-2.1.11.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-inherit eutils autotools xdg
+inherit epatch autotools xdg
 
 DESCRIPTION="Visualization program for exploring high-dimensional data"
 HOMEPAGE="http://www.ggobi.org/"
diff --git a/sci-visualization/gle/Manifest b/sci-visualization/gle/Manifest
index 1d950741d63b..518ecf32fed6 100644
--- a/sci-visualization/gle/Manifest
+++ b/sci-visualization/gle/Manifest
@@ -3,5 +3,5 @@ AUX gle-4.2.5-c++14.patch 1113 BLAKE2B a75d450b3f067d3f1158618fbdbed69352e9660a6
 AUX gle-4.2.5-jpeg-9c.patch 685 BLAKE2B bfcb90439c6cdd2bd75b9e5d30232dd816f348dfdf9ee7067e848741c4050a441869e04513ae04f92569ad3854a77fe9c739be6ebd1ca5ff5988af6ba5020d99 SHA512 55c1f8fd59cbe71b14d1755bceb5fb02ebfbf0e71eafc39837b513ba48be7421c51352c60d127fc4744628eb6e403eadb703bf24a49dea5652c08ae749a67590
 AUX gle-4.2.5-parallel.patch 572 BLAKE2B 03617a63dac035582a90cd0d872c114cc8b4426e05483130ead443a6d136f7c54cafabd7312e0c8eae5c90b704bd4d0a475f49feea69de464deba2c47970c066 SHA512 95d2c9fb1023f6f468b7258c52c04635dfe297da579de0bf429d90bfc1849348191f0821f18b048057271260ad0a9511fd811bdb1494fe51aa1dcd84276b2259
 DIST gle-graphics-4.2.5f-src.tar.gz 2330270 BLAKE2B 46435a2366a278a88786a2dd0e0cbcc48d3ba2fc6d895fb07c81216089a10b2223b2ba692b951ee01a6ab014e84cce9aa3969d063ddf7d04501820aa33084c5c SHA512 d459b24577c9c3f8825c368f864532c97d0a37c94018276a60c941d17dce0e55fe738f7eda3227a47848f2fb32fea1dcec29d9751a5be92cde4d8d38a2eeb0f5
-EBUILD gle-4.2.5-r1.ebuild 2174 BLAKE2B 7e8b351ea6daa4caeb4d3823bb369de5d9cebf189e8a2f354d80ae101c3bbff90a5aa782c91a0e1613644ccd4c51b60b6312d74bac93f58a8881a63f8fc89fdc SHA512 30b7245234b611889bf082e376a64c160b62fbdbfdf6194d94d09fbe9e4729cbc4bc3cb3b38b834db981fbaaf8a0373ed4d6e2391e169e8a373ee186611bfb4a
+EBUILD gle-4.2.5-r1.ebuild 2167 BLAKE2B 1ddd7ac42774d96c9f1ab07b077b4938dc9df773a1821506e81c03a8f82bdbad5038e008d888963093c8794649b868289c393b227bf2beb3464ff9064abaf3dc SHA512 aa541e860b0bed8da5a5a1b21c7462e84b8fd68a195cc3381edc706d89c90d1dbe2403488049ce7313e30e5a46cd089dd840575c40aa78cc9d4f8259f614eaa0
 MISC metadata.xml 725 BLAKE2B a9da0308b21e8f2faea7a58fcba4ed9c4d2a136fc64992768236dd3c21705f3f324abfa83a0b598234a86e7bac5539be2b527ea6efa56fd4b44e44c43428ba45 SHA512 745264b5ccf026947f5a3c0a39b4199589d7831ec1f5de7c03f82b48ebbc590d57d973a7007a09d71135b60cf8129d38eeaab2a95785b62f76fccc6727db61ee
diff --git a/sci-visualization/gle/gle-4.2.5-r1.ebuild b/sci-visualization/gle/gle-4.2.5-r1.ebuild
index dee5f4ae58c9..9c52191e544f 100644
--- a/sci-visualization/gle/gle-4.2.5-r1.ebuild
+++ b/sci-visualization/gle/gle-4.2.5-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit eutils elisp-common flag-o-matic autotools
+inherit elisp-common flag-o-matic autotools
 
 DESCRIPTION="Graphics Layout Engine"
 HOMEPAGE="http://glx.sourceforge.net/"
diff --git a/sci-visualization/gnuplot/Manifest b/sci-visualization/gnuplot/Manifest
index c06589d7bcef..de681bc53ff9 100644
--- a/sci-visualization/gnuplot/Manifest
+++ b/sci-visualization/gnuplot/Manifest
@@ -1,6 +1,7 @@
 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.4.1.tar.gz 5608076 BLAKE2B 7b2c30acd16b1aec3be9341c019449882a9231afe196bb05dc5d7925681296986de2be3463ca19d62ff1cea6dece0586b6bc8a54881c4fc2ec372635264ebb3d SHA512 2371830636d4c9ee93e9d6566dc2889e96ece3660b63ef4cfb6514e233510e5abaf4f93863bbe9a418f11db8e3b12a15242556aae52bb69591ad7d26e6581121
-EBUILD gnuplot-5.4.1-r1.ebuild 5121 BLAKE2B eb8ccc8f5efc3351dc29045c2868778156c1f25495f916c2cca18434bb64a2b28159852784d81109ad219fad01c6665b9e33b7aea5367f24cd494f88b48701e9 SHA512 71c2561e1576f7859864eea33e56565a5493433b300aacfbd6d392ed049e5157b6c99d4fac3891ec7c691df2e597a5f91b176d160d9385cc02f654262d59c4d2
-EBUILD gnuplot-5.5.9999-r1.ebuild 5129 BLAKE2B d740fb7e7aed7424aa82004a7cfbfac5474117a2160e0fd39164b0adba5948dda63c81083c13ee48c94256e56edddb97add8c76041bb6cb8c71d18a1ef805df3 SHA512 876fb7792dc31c27b204ad2a30c6333905c99c03126d3edbf517dfabad870169d42df5ccce7aed3e66dde9dd699abba7a347ea4513436c1724438bca0967180d
+EBUILD gnuplot-5.4.1-r1.ebuild 5112 BLAKE2B cbda6dc26ff05c4b6469e8ba0eae6904cc2c4ce589878e5b52b50e2027cc7cd92cabbe909d9c95e5bc561368cb4437463e519d88c5cc0048bc7e41e18a9684d6 SHA512 27bf7527327905338ef4bc356fe31c6db151f307058515de074340b9f96e9184e17a301d05d6aafdb962493817e49e964381c5ee03736307173f0c73275199fd
+EBUILD gnuplot-5.4.1-r2.ebuild 5099 BLAKE2B 13d76018e6800afca391f71a1820a322b57ef0e61fd4a38a1a04258a185ea01d97edc18f621842b799b5f9fd24101379d785fd58a3d751029cb777da2245afeb SHA512 a912f8ca065989a4861539ffda711960df8804ca7fc84c50891f8454104ef539be2d47299ec938667a0fdceaa2ba8dde58963ed1c2d1e9c883c2f8bf5d97f3d2
+EBUILD gnuplot-5.5.9999-r1.ebuild 5100 BLAKE2B 951612f52afede49d5a93e906c063c70e5f97342f5586aa124ea79525d73b10faef7c346f5f32a7b5f48b0357d9a02ed9b25af20c26f3b42262e29439a55402f SHA512 edbfda82aacefeea9d37ecd2ec7520b5e36d1a5b2d15c9c83ebb5002f485d223e0243e45799306772a7d57a15a07282d9e03d369c793f198e8fef7214c304f01
 MISC metadata.xml 1069 BLAKE2B 2f42ec584b402482270c5f975c6001702f2d5cf367e9f86c190af4b91d97e3c807434e1963a5e1ed856751f592cf1d28cc25897674f92894409497b173e84e8a SHA512 7433f704ff9bee279a70346522595532c221462a915acedb44be85838a472c8a064670a31f72792d10df038b96595e61788c625614a691e956840b39fc063feb
diff --git a/sci-visualization/gnuplot/gnuplot-5.4.1-r1.ebuild b/sci-visualization/gnuplot/gnuplot-5.4.1-r1.ebuild
index b9535e91c7e2..ff93661495b2 100644
--- a/sci-visualization/gnuplot/gnuplot-5.4.1-r1.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-5.4.1-r1.ebuild
@@ -4,6 +4,7 @@
 EAPI=7
 
 LUA_COMPAT=( lua5-{1,2,3} )
+WX_GTK_VER="3.0-gtk3"
 
 inherit autotools flag-o-matic lua-single readme.gentoo-r1 toolchain-funcs wxwidgets
 
@@ -52,7 +53,7 @@ RDEPEND="
 	readline? ( sys-libs/readline:0= )
 	libcerf? ( sci-libs/libcerf )
 	wxwidgets? (
-		x11-libs/wxGTK:3.0-gtk3[X]
+		x11-libs/wxGTK:${WX_GTK_VER}[X]
 		x11-libs/cairo
 		x11-libs/pango
 		x11-libs/gtk+:3 )
@@ -112,10 +113,7 @@ src_configure() {
 		sed -i -e '/SUBDIRS/s/LaTeX//' share/Makefile.in || die
 	fi
 
-	if use wxwidgets; then
-		WX_GTK_VER="3.0-gtk3"
-		setup-wxwidgets
-	fi
+	use wxwidgets && setup-wxwidgets
 
 	tc-export CC CXX			#453174
 	tc-export_build_env BUILD_CC
diff --git a/sci-visualization/gnuplot/gnuplot-5.4.1-r2.ebuild b/sci-visualization/gnuplot/gnuplot-5.4.1-r2.ebuild
new file mode 100644
index 000000000000..1dd56629fad6
--- /dev/null
+++ b/sci-visualization/gnuplot/gnuplot-5.4.1-r2.ebuild
@@ -0,0 +1,206 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1,2,3} )
+WX_GTK_VER="3.0-gtk3"
+
+inherit autotools flag-o-matic lua-single 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="master"
+	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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+fi
+
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="gnuplot"
+SLOT="0"
+IUSE="aqua bitmap cairo doc examples +gd ggi latex libcaca libcerf lua qt5 readline regis wxwidgets X"
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
+
+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? ( ${LUA_DEPS} )
+	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 )
+	wxwidgets? (
+		x11-libs/wxGTK:${WX_GTK_VER}[X]
+		x11-libs/cairo
+		x11-libs/pango
+		x11-libs/gtk+:3 )
+	X? ( x11-libs/libXaw )"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? (
+		virtual/latex-base
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-langgreek
+		app-text/ghostscript-gpl )
+	qt5? ( dev-qt/linguist-tools:5 )"
+
+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
+	"${FILESDIR}"/${PN}-5.0.6-no-picins.patch
+)
+
+pkg_setup() {
+	use lua && lua-single_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	if [[ ${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
+
+	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
+
+	use wxwidgets && setup-wxwidgets
+
+	tc-export CC CXX			#453174
+	tc-export_build_env BUILD_CC
+	export CC_FOR_BUILD=${BUILD_CC}
+
+	econf \
+		--with-texdir="${TEXMF}/tex/latex/${PN}" \
+		--with-readline=$(usex readline gnu builtin) \
+		$(use_with bitmap bitmap-terminals) \
+		$(use_with cairo) \
+		$(use_with gd) \
+		"$(use_with ggi ggi "${EPREFIX}/usr/$(get_libdir)")" \
+		"$(use_with libcaca caca "${EPREFIX}/usr/$(get_libdir)")" \
+		$(use_with libcerf) \
+		$(use_with lua) \
+		$(use_with regis) \
+		$(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"
+
+	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
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	dodoc BUGS NEWS PGPKEYS README* RELEASE_NOTES
+	newdoc term/PostScript/README README-ps
+	newdoc term/js/README README-js
+	use lua && newdoc term/lua/README README-lua
+
+	local DOC_CONTENTS='Gnuplot no longer links against pdflib. 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,
+		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."
+	readme.gentoo_create_doc
+
+	if use examples; then
+		# Demo files
+		insinto /usr/share/${PN}/${GP_VERSION}
+		doins -r demo
+		rm "${ED}"/usr/share/${PN}/${GP_VERSION}/demo/binary{1,2,3} || die
+		rm "${ED}"/usr/share/${PN}/${GP_VERSION}/demo/plugin/*.{o,so} || die
+	fi
+
+	if use doc; then
+		# Manual, FAQ
+		dodoc docs/gnuplot.pdf FAQ.pdf
+		# Documentation for making PostScript files
+		docinto psdoc
+		dodoc docs/psdoc/{*.doc,*.tex,*.ps,*.gpi,README}
+	fi
+}
+
+src_test() {
+	emake check GNUTERM="dumb"
+}
+
+pkg_postinst() {
+	use latex && texmf-update
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	use latex && texmf-update
+}
diff --git a/sci-visualization/gnuplot/gnuplot-5.5.9999-r1.ebuild b/sci-visualization/gnuplot/gnuplot-5.5.9999-r1.ebuild
index 7bfcd53167fe..306871a94a96 100644
--- a/sci-visualization/gnuplot/gnuplot-5.5.9999-r1.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-5.5.9999-r1.ebuild
@@ -4,6 +4,7 @@
 EAPI=7
 
 LUA_COMPAT=( lua5-{1,2,3} )
+WX_GTK_VER="3.0-gtk3"
 
 inherit autotools flag-o-matic lua-single readme.gentoo-r1 toolchain-funcs wxwidgets
 
@@ -52,7 +53,7 @@ RDEPEND="
 	readline? ( sys-libs/readline:0= )
 	libcerf? ( sci-libs/libcerf )
 	wxwidgets? (
-		x11-libs/wxGTK:3.0-gtk3[X]
+		x11-libs/wxGTK:${WX_GTK_VER}[X]
 		x11-libs/cairo
 		x11-libs/pango
 		x11-libs/gtk+:3 )
@@ -112,17 +113,12 @@ src_configure() {
 		sed -i -e '/SUBDIRS/s/LaTeX//' share/Makefile.in || die
 	fi
 
-	if use wxwidgets; then
-		WX_GTK_VER="3.0-gtk3"
-		setup-wxwidgets
-	fi
+	use wxwidgets && setup-wxwidgets
 
 	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) \
@@ -183,8 +179,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 "${ED}"/usr/share/${PN}/${GP_VERSION}/demo/binary{1,2,3} || die
+		rm "${ED}"/usr/share/${PN}/${GP_VERSION}/demo/plugin/*.{o,so} || die
 	fi
 
 	if use doc; then
diff --git a/sci-visualization/gri/Manifest b/sci-visualization/gri/Manifest
index 5895d72a5b2c..eb4aeeafbd76 100644
--- a/sci-visualization/gri/Manifest
+++ b/sci-visualization/gri/Manifest
@@ -3,5 +3,5 @@ AUX gri-2.12.18-postscript.patch 3997 BLAKE2B 46793200eea3da08daeeffe7d6b979886b
 AUX gri-2.12.23-perl-5.16.patch 554 BLAKE2B 47249f252abc5591ae7df31b143bd3ea794d1cc205d541dbc8861d6f2599eab1079f829e57054797e5e77e716a749bbd80b5896de71cbc5ef388a77568cdd34c SHA512 63d5ab4d21d1d7382ce750040e88d855e605b1bdcc864f1b5d69d90cbc4f946b29dd976144d9bb68fea84b74ec707c7e00d7813b0d68648f7abf0649a98d1ff4
 AUX gri-2.12.23-texinfo5.patch 1035 BLAKE2B caf8229d55894ac59317977801b9e82e66b58a9bd7f1d8e3ce31f39e39f98a37c1050f29e6684200b09e8c6770008870829406cded2a8283ab195f7f090b5d13 SHA512 dff8276bd730c2b75c62775985fe4c9af7b0d8050b4d04e9e951bab60982e9f6d3c9afe9ee7bff6bf9886f7832f4299786855c2edd32d87d4985959bab0d3fda
 DIST gri-2.12.23.tar.gz 1668587 BLAKE2B c7b8e4db5b093599fb9a00870516e3e6a8a93436dc9881f0c889982acd26b9b8637eee261c84be69402361db11c41f7a0989cc29d6bfd5f770a2e8056c89463c SHA512 0b028c56e9603fd00480ad7a92461c1e60f7879d89bffb5b83a2ee52c8870546e584c75478777dbb2d4934095fe9a9d4efd2aa2ff756c1860459a1e0cc0b4216
-EBUILD gri-2.12.23-r1.ebuild 2168 BLAKE2B ca35acb40c7085d3520bdf00066bb6ae8753d1de36ce30384c0d957fe6695d83db6a4ffa6144c602507d9eba810da7f962ab0af8d64e1f62bfacd4913ad69fb5 SHA512 6efcac0ad6cb3cb1b28bb64cf25c528a18da22401fc9d6ec912e76451b6bf431ba01b45b84223419e964498f1f3c5559643b0fbb9def7b707bec02d16f6e950a
+EBUILD gri-2.12.23-r1.ebuild 2168 BLAKE2B 58003517b2e4f6721905f599ee11556e9985cf5c4e473bcf72989872a517e3ee1c2fc1af30eaca959d240ca2169f913f60131c38a3414682c921fc2ad2db684f SHA512 9318117bf59530c60979a4d0fde93428e7b382f5ddfd974c3ce40e1c30715e7b30fa14a0f887fd02d24f7086334cb7bb747a004d3bd7ef7c62af9fcdad177a07
 MISC metadata.xml 883 BLAKE2B 22e5cb939c8434b9f73d3a6fc605252612da0035a7826067850a97a7570a1d12d4cc150e0c855fec9958993a8cb01ccc054b1d98eb8f040f439c6b1ae1fd5b8c SHA512 baf48aea8fd50e2304aec88dc3b62c2d44d1282a411670f7b27696b831a514bfc576a29807d4a43bc9afc2ca766adb402ee794655576fa7c2121afae3a254296
diff --git a/sci-visualization/gri/gri-2.12.23-r1.ebuild b/sci-visualization/gri/gri-2.12.23-r1.ebuild
index 00c9320934ef..8940d2cd4c3e 100644
--- a/sci-visualization/gri/gri-2.12.23-r1.ebuild
+++ b/sci-visualization/gri/gri-2.12.23-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-inherit eutils elisp-common
+inherit epatch elisp-common
 
 DESCRIPTION="Language for scientific graphics programming"
 HOMEPAGE="http://gri.sourceforge.net/"
diff --git a/sci-visualization/labplot/Manifest b/sci-visualization/labplot/Manifest
index 3727b67cda1b..21a8d8904f90 100644
--- a/sci-visualization/labplot/Manifest
+++ b/sci-visualization/labplot/Manifest
@@ -1,4 +1,4 @@
-DIST labplot-2.8.1.tar.xz 13203288 BLAKE2B 59699faf0abe3355ab996321203c829b3aff5d7943c2688e955c0a84807a47a1e665d630dd052d6e3c005dc78cf7c613a87ccf5ce6cc2498bb694d9de838780a SHA512 9e03e70a1c0f167626583b2480b3d00743221ae5121e4f9cdc5170f292804fb41b03369c53bc729c006c61adb446ef05496f9789a3c89ffbb3bf51bcdc79c7ba
-EBUILD labplot-2.8.1.ebuild 2318 BLAKE2B 19afffe584982eff59a846e2e21db39311416a020a9727cf32aaabe1d12eba625105382376056f3e1f81dc8c12035b9041a6c5cf965f2a93333aa38f5804e7d0 SHA512 fd2f68e5cb18384bd4ce3847b9bfca0862fb82903928b9bcb9bf9322a6a4c703a9e0a3a564ceea976a5dcb772025714046af67beba86e480bcfacc838e9424e5
+DIST labplot-2.8.2.tar.xz 13235168 BLAKE2B 251d7f6293ea90a1a16a33f38f3b3657051545cff4b0acc3d3009a02387c4cadb61dad31b72466f0d197b1cccac6e9095687fcc694853c2a6ef41fa1a954c6a7 SHA512 fc550ccb00c5d9966b42f3a367daaebfa94909b65f0a146e4cd75f9a4ed50d00a917fa4c5fd6b6694bf2223d75a564db49697106ea663b0e17def4ce501b09e1
+EBUILD labplot-2.8.2.ebuild 2318 BLAKE2B 2ff30308bbd6f705e8eba5d2f56853b0ad4cb4a92673e0e1324add3c0d51bf4ea0923c9bdb7c160b089a5559d800efb1bbe46e428cbd2edb1394cbf2c946fb0e SHA512 fb145814a88f7d2f9c308e13197d9c12b79f413f9c97263cb4db38e718faa280532a0e0e5edf59eff6c58e752829ca366463f7147fd45dc927af496b0b4335ea
 EBUILD labplot-9999.ebuild 2372 BLAKE2B cfb99feec332be21bae60ace6e7ca1d938cc00ec64f8c8c553df5ccdd67c10aa8184b93234793cb548dd510a2b93ee2f649c4dfe2e4bc7eeb676c8ba1c2c694d SHA512 281d17374a89fc3b4a80753afea53529755a4dc61d0aeb7a52b8f66d452e24be836eb780fa42dba36b747c0ee5e6b1e2af4b5d35ff0a707ab2a3cc0bcaff0881
 MISC metadata.xml 968 BLAKE2B 559e66667254b34ec3d884d6fe1d04a08ecd5b47cda991a98771caef3dca44c2fed9b01509b82e74a5051a9b96724654108729050f70ea9bc78621fa8109d69d SHA512 da2eeb9e282fcadd6fcf51e9071619d6d1fe6ca5fa9c19bb19ff6337be48fcf0f5b394c5aab6d66580dbdd3ebfe4dc4bec5dd59cd66572b0e0554d2c14df00e9
diff --git a/sci-visualization/labplot/labplot-2.8.1.ebuild b/sci-visualization/labplot/labplot-2.8.2.ebuild
index 4378d86effff..33e94fdbc0bd 100644
--- a/sci-visualization/labplot/labplot-2.8.1.ebuild
+++ b/sci-visualization/labplot/labplot-2.8.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/sci-visualization/quickplot/Manifest b/sci-visualization/quickplot/Manifest
index cec84ad42200..df734a287f40 100644
--- a/sci-visualization/quickplot/Manifest
+++ b/sci-visualization/quickplot/Manifest
@@ -1,6 +1,6 @@
 AUX quickplot-1.0.1_rc-automake.patch 544 BLAKE2B ba3a3a2c6a8351a71a8fee0e8e9b663a7d824dd62608ba8de1678e8b1039a96365db56c329b50e82a73870bd584ae9d847bf1095eaa336438e9e2e923dc76a76 SHA512 bca9e0c2e2d7a3644ded230ef933fbc716a7ca87f62b20a47f930bf8f10a7bb7d8ba36869c4564c6370f566d6f57802b5b387e76b2d44aacd59ad544a8d73775
 DIST quickplot-0.10.6.tar.xz 445172 BLAKE2B bcb2c694cc6a3777b7d88a5fbd6562d2612f76b0fabde67562ddba44708db0674336b72f5223aa6043524e9c6cb057e518b076086f2c05370bef6eb54b07e8bf SHA512 10b5277d8d0b8febc3c663256f3912bdd9d879b3038a5fdd3a7adc223419893ee56b825f04b5bee29883f30acb3b6a329d8e314b049fef26d6220192767d4adb
 DIST quickplot-1.0.1rc.tar.gz 303055 BLAKE2B 52c8b60b0f79171358d81691f8824e39c1e3bafc1c084c3a52037e8cd1148e8bf68027ccc90593eca15fcbee0074d42ad7def1eb9d1f5c656b86e12adb6cfdcc SHA512 9cfaaafb7db379fb43b2975d588464288ac18eb21b3248fb02e5a30b0fa0950313a9818cfec23821046f9819d78255f02dff9970668a4b4ed8c4f452d6df3451
-EBUILD quickplot-0.10.6.ebuild 998 BLAKE2B 156205b729053992a6d80118c0bff6f90bbe8bdc2af9cb042fb692cf0ac8f088265331529c22566ffcb964f877c5ac062cf553d258a3ae09bbec8131860d573d SHA512 3ad72225a71f9c3e4c2c5e2f9e409ec0f30ffdc30817b46277590e314a089cfbea95cda0a874eb15baf0ff37942df0e4423c5bfebae2ec804ca455504a76f850
+EBUILD quickplot-0.10.6-r1.ebuild 913 BLAKE2B ffbddeef6843c940e33fad83c0f2445e7e9e28b8094085307d24bef00753ba81c109afd28ed354c562ca04005d1b8d2a02212c64ab1bd2b4038593d3efd1ef75 SHA512 08a9c86b2a0fda0edd61124765a5d53220dcfb0ad960b420d878cd34a84b6374b23b74b3784b10f6caf9eec985c3458177b716619616c4014acbde4a07def11a
 EBUILD quickplot-1.0.1_rc.ebuild 1032 BLAKE2B 825cc7a512a18099c844fd558997d2a1441b9023e1317027c06f02f8671466b09cd0d793c1ad5c6497c3f5ce043ed87f002a2ca854a73c320b80cb96699c0a91 SHA512 7ebd9fea51c58945cd0cc0c7cf06f103dbe1447a5f24412dfb3f96bb4c5f164ff2c9cb3590bc7eebce9eeb51f234ada59a55c20b6f87f5531acda8b001c5909b
 MISC metadata.xml 853 BLAKE2B 8e5a7f7a90c345657b2ae6b9460bad955899cecbdf38c9fa668f1da36a35928268368bb6339e43874733124b553ba6a2a8177a060e4dc5a9204ee3e88b5c74de SHA512 ec630df795d369d1ebbdb5cccf33b55134e6d4400d97caed721b0a02882c5cc321ac21c526b50d1556f9c4e21504a51dfbfdcb2b463ffa09d2f81d0890bf0cd9
diff --git a/sci-visualization/quickplot/quickplot-0.10.6.ebuild b/sci-visualization/quickplot/quickplot-0.10.6-r1.ebuild
index b3e060ecccee..0fb21de2d5b2 100644
--- a/sci-visualization/quickplot/quickplot-0.10.6.ebuild
+++ b/sci-visualization/quickplot/quickplot-0.10.6-r1.ebuild
@@ -1,11 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils eutils
+inherit autotools desktop
 
 DESCRIPTION="A fast interactive 2D plotter"
 HOMEPAGE="http://quickplot.sourceforge.net/"
@@ -20,23 +18,26 @@ RDEPEND="
 	media-libs/libsndfile
 	>=sys-libs/readline-0.6.2:0=
 	x11-libs/gtk+:3"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 src_prepare() {
+	default
+
 	sed '/libquickplot_la_LIBADD/s:$: -lm:g' -i Makefile.am || die
-	autotools-utils_src_prepare
+
+	eautoreconf
 }
 
 src_configure() {
-	local myeconfargs=(
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
-	)
-	autotools-utils_src_configure
+	econf --disable-static
 }
 
 src_install() {
-	autotools-utils_src_install
+	default
+
+	find "${ED}" -name '*.la' -delete || die
+
 	make_desktop_entry 'quickplot --no-pipe' Quickplot quickplot Graphics
 	mv "${ED}"/usr/share/applications/quickplot*.desktop \
 		"${ED}"/usr/share/applications/quickplot.desktop || die
diff --git a/sci-visualization/spectromatic/Manifest b/sci-visualization/spectromatic/Manifest
index 007f14541873..6992b2234f76 100644
--- a/sci-visualization/spectromatic/Manifest
+++ b/sci-visualization/spectromatic/Manifest
@@ -1,6 +1,6 @@
-AUX spectromatic-1.0-makefile.patch 1155 BLAKE2B b8161dcb5f32805b600b71aae245a39b58118e361a81cd5c02ea87065c2296b4b7728cfe579e2d43d6b8dce1d6d101257e436a6694566f373ea4d32c372e0d39 SHA512 695eba1642daa8a1f5379e1272731000e9de73a3152d9af923ed64331a4a249c17ea1e2adbb1c90b388c667730a88fb8cf529f2dfdfbf1812a1ab7191331f6d3
+AUX spectromatic-1.0-makefile.patch 1158 BLAKE2B 250fa533240e192e7391779d853c37c16b6f62e410e8dd7c034e47c172327bbbcd30b04001b3a0c537e1b276132b0cac38b7b1a23eec8d5cd4cb96bde3dace91 SHA512 f20f12b01fe947b7136cf20706e49e6d47c0dc9d6f82f9059c1a26227bf9668bd5643e3bc64c69ce4204d884095ebca5252c07bd9e7d5aff6ab166d889fadebf
 AUX spectromatic-1.0-stringliteral.patch 2111 BLAKE2B ceb51362812f6f7bc8c5bac252e6212fb267650cae1d32a9d4bdd61fb2df409c06e1338027303f0a2c6a55cef7a31106ed170ece8d877a9e51524158d6edc7d4 SHA512 a15ca056d2d9ff31223e17e4a95120e842850626f1cbff350091449d5e5929cdac731c67d58f1039fab848e3aeda1851cec6b2cb8d1b4ffd906660d264f29a71
 AUX spectromatic-1.0-waveheaderstruct-amd64.patch 3821 BLAKE2B 57bfd4e9e20cd2532ba04eb173a1640615edd614d8ed84099fdce4ef92118e21718cdfb8b79ce930e1422d2222181c90613c92b2045cabf9b1694da3caeb34b0 SHA512 45f861395dbe03bfc61120388d833e9997afd14888d4ef3583660676384eacb53755bcd95e4b39150cce6df1f11952260e4460bc15862249af928784e4ddf115
 DIST spectromatic_1.0-1.tar.gz 13724 BLAKE2B 91fb44ccdd1b41eb99204f654a02e7cff8e1798916936507a41c6f6d3c5726fe3d1d838d782d21604fdf1e1bd67760336cf41b4e016b10849b9f4cffe405cdf7 SHA512 b83acaacd21f7eb12ee3fd955073e8f95c02649de833a6087cf62786b20d8d1bf9a5b62920c17435510237797c6bc3a378921c4c1c2c4e4f74acbca49becfd6c
-EBUILD spectromatic-1.0-r3.ebuild 765 BLAKE2B 7670cf14269726526eb2ba36f9b218b66efac797e69e9d1d1ac65cc61713b792e0d022f7bb34e22dea53f735b16788cb344485b2acc8a58b362b9edf3007c324 SHA512 565a8b9e535bd9bdb2c657b40144bfe381dbc8389a605831890ff15c7cb2d997665ba74e561e361743ec0f5682cd9063dc6838eb48e069c6939667773555577b
+EBUILD spectromatic-1.0-r3.ebuild 765 BLAKE2B 37128434a379953399ff2cd2e2a2de95f5994632810dc699dfb5d3a8171495d674e3ed1f99f71be8b057b46f116cb506ea64e5fb7cb182ffe5e796786c376326 SHA512 7075dd46c428f36cf384752ce200077e80779dcd23e5b9250129a439e5b0b1c07bdb4d2dacb7624ffad58d790683fb14cad20924865fc628cf16377b503c7390
 MISC metadata.xml 887 BLAKE2B 6ee9e5ec6916eb124b245ba8b95a907f9230fbfe5bee2415a4b3eb7668c7c7b7ca8b9ca9f4c50425c22039a93e859da55fe9c6d1afe8b8777ec0917c07d9a8a4 SHA512 1271a92e21dbb7ee8915dd989eb82a2b04d82fd6c791f73a625d34e6192c0d9bc571ae64fd4158d9d9edd7c40d8c8deac988c2f6d682c051cbb1c5376468e715
diff --git a/sci-visualization/spectromatic/files/spectromatic-1.0-makefile.patch b/sci-visualization/spectromatic/files/spectromatic-1.0-makefile.patch
index 619aaecf7a89..ea1fa0a70eec 100644
--- a/sci-visualization/spectromatic/files/spectromatic-1.0-makefile.patch
+++ b/sci-visualization/spectromatic/files/spectromatic-1.0-makefile.patch
@@ -8,7 +8,7 @@ Fix install paths
  
 -CFLAGS = -O2 -Wall 
 -LIBS = -lgsl -lgslcblas -lpng -lm
-+LIBS = -lpng `pkg-config --libs gsl`
++LIBS = -lpng `${PKG_CONFIG} --libs gsl`
  DESTDIR =
 -TOPLEVEL_HOME = /usr
 +TOPLEVEL_HOME ?= /usr
diff --git a/sci-visualization/spectromatic/spectromatic-1.0-r3.ebuild b/sci-visualization/spectromatic/spectromatic-1.0-r3.ebuild
index d7bd8aaf7c93..b9337658357c 100644
--- a/sci-visualization/spectromatic/spectromatic-1.0-r3.ebuild
+++ b/sci-visualization/spectromatic/spectromatic-1.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,6 @@ SRC_URI="http://ieee.uow.edu.au/~daniel/software/spectromatic/dist/${MY_P}.tar.g
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
 
 RDEPEND="
 	media-libs/libpng:0=
@@ -29,6 +28,6 @@ PATCHES=(
 )
 
 src_configure() {
-	tc-export CC
+	tc-export CC PKG_CONFIG
 	export TOPLEVEL_HOME="${EPREFIX}/usr"
 }