Install demos through USE=examples, #374187

Package-Manager: portage-2.2.0_alpha45/cvs/Linux x86_64

7 files changed, 105 insertions, 62 deletions

diff --git a/sci-visualization/gnuplot/ChangeLog b/sci-visualization/gnuplot/ChangeLog
index 2e2dbeda2c9f..c5065d9151c1 100644
--- a/sci-visualization/gnuplot/ChangeLog
+++ b/sci-visualization/gnuplot/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-visualization/gnuplot
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/ChangeLog,v 1.158 2011/05/29 19:30:39 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/ChangeLog,v 1.159 2011/07/16 16:58:23 jlec Exp $
+
+  16 Jul 2011; Justin Lecher <jlec@gentoo.org> gnuplot-4.2.6-r2.ebuild,
+  gnuplot-4.4.2-r1.ebuild, gnuplot-4.4.3.ebuild, gnuplot-4.4.3-r1.ebuild,
+  metadata.xml:
+  Install demos through USE=examples, #374187
 
   29 May 2011; Christoph Junghans <ottxor@gentoo.org> gnuplot-4.4.3-r1.ebuild:
   Avoid emacs automagic (xemacs without texinfo - bug #366129#c10)
diff --git a/sci-visualization/gnuplot/Manifest b/sci-visualization/gnuplot/Manifest
index 97c5c0f1d1c1..141487f1d636 100644
--- a/sci-visualization/gnuplot/Manifest
+++ b/sci-visualization/gnuplot/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX gnuplot-4.2.2-disable_texi_generation.patch 763 RMD160 99368c05fe2907f445a49b4d0be782f0384f319e SHA1 17723d5e5a12eef274b6f9216c9a9cbbe05cba1e SHA256 87a3bed1e3be244a511f1cbeb9852484da59decdae75635ae900fbafe5db02f6
 AUX gnuplot-4.2.3-app-defaults.patch 2097 RMD160 d0764b54424cfec60b22e498b8624801559e3526 SHA1 bac7dd281e679a6c638f7ba1b211e13443221486 SHA256 91cab9715e99c5e394ac6e08f17ef8063d3f0b574e0404fc5e6b643b26fddaf3
@@ -11,20 +11,16 @@ DIST gnuplot-4.2.6.tar.gz 2936753 RMD160 3b1726e5327b17bb7b528198e62a12b9fe3e5a7
 DIST gnuplot-4.4.2.tar.gz 3299690 RMD160 077d6d353e0370d1f8463693380030722f5789af SHA1 35666be22e877ade5e272199d3d81555c141cef5 SHA256 37e8c8d4838fb84a3ad97a6c4823f086b929cb18d6613a2d0e8227ce0d4de9e4
 DIST gnuplot-4.4.3-texinfo-update.patch.gz 7519 RMD160 73188caf8edbc84d11b43ea16a93fb5c9bece959 SHA1 dbd8d69214ae99411a2ffcc63f309cd342622865 SHA256 6153e081a0165682b052188a0166408e353a03be5fa1465d889c75f56d32700a
 DIST gnuplot-4.4.3.tar.gz 3305912 RMD160 90290eb2b6b9404dc520080439bdee9056e61fc4 SHA1 a4d315b9288739e3cbaa04d8ddda7861b4009bd4 SHA256 6faa236ed5c744f34a9ac58ef89dab6177a15c5835dc3644a0a12779439426e6
-EBUILD gnuplot-4.2.6-r2.ebuild 6207 RMD160 82509ca48ef70de10a3d7606619b32ef22eb2ee2 SHA1 83a7c5272ceab4f6214a7c76d1e6ce91c71e9ef3 SHA256 3baf97adb0c118f66d0d2402a4ca84daff17995f7c58b4bc4480c6299e4af3a3
-EBUILD gnuplot-4.4.2-r1.ebuild 6127 RMD160 33002726f6e94e0eda1df996787806e443c705da SHA1 8c2dbe949e7b644c2e1ace9d404b889460b1775a SHA256 6ceea186fe74ca9d45dc5865a6c21a7acd77827e381c9311b9e5a8fae6e7dc24
-EBUILD gnuplot-4.4.3-r1.ebuild 6778 RMD160 e607ed6b62b5eb3015c344f3188a966dcbae28e1 SHA1 2a5b23473d2153b80fe5dd9c83bf565d4971bef1 SHA256 11117b2dadd8a72540d31b6dcb3e4d479eea643aabd2e62dc9d1b5face61a5df
-EBUILD gnuplot-4.4.3.ebuild 6187 RMD160 14cd8ee37e638ec9ccd4bee37162e70d547f3b6f SHA1 cfaffdb48e97e784250509d933e8b52b7ee4712d SHA256 f7bc48f05c53480634bfd2de68bb942a09cd78dc2dd851cdea345dbd664390c5
-MISC ChangeLog 29534 RMD160 c3915f4ddcb460c85dad6659af69bc499263c1d4 SHA1 0629208d32b3d71da5fe4eee53db531a6fb9b514 SHA256 0590155ceeb560eba96e605de219ace028018b492f92b0690bd2006a5418bbde
-MISC metadata.xml 511 RMD160 d1aca682659cec35000b5beb01d035313865a7e8 SHA1 f0168f6f851e7729a3033383f50e3495b813657e SHA256 dff37a68daad7ef0f042891288528d693183726bff6c685c3bf579a8dd228e75
+EBUILD gnuplot-4.2.6-r2.ebuild 6258 RMD160 ba090aa11ee9a08c29fc9ffa001ce824e06541dd SHA1 670f5c4b5bfc284b41ef6c8783dcb0c6759a07fe SHA256 efdbf8883e333b31cfdd192480f08c25faa15eb6e60ae1935cfb88bc798750da
+EBUILD gnuplot-4.4.2-r1.ebuild 6181 RMD160 63faef8bd6011bcc598e17671b987abbd27f598d SHA1 edf29dde8d42dc8909ae12071e9b603af61dfb99 SHA256 92d37d2469a9a6122f2405a1cd5f86980b0e2ae279d677c9e3ad886eed5fbf1f
+EBUILD gnuplot-4.4.3-r1.ebuild 6828 RMD160 c3ee8cd7e6418b8f93df2bde5c762a41f8d763c1 SHA1 a2755d0d35f3a337b9db5c50046448e0cd1f207c SHA256 cab3790acf6c01a4a7c4d598e34297896a1cbe0ce5475e4a36e273aefdb44bf0
+EBUILD gnuplot-4.4.3.ebuild 6241 RMD160 f024286f98a0982058c7286b2924bcdd219f48e8 SHA1 07f01e0cd6c64c3ede242f7773bb1ce9d9c4ce93 SHA256 38636622b9179300df93d2fb6360f706c33c2e1ff9ecacbab043503d41ef49f3
+MISC ChangeLog 29741 RMD160 68770d67c5087d16c6e3991db68de942049ca888 SHA1 541a492ae24a296fbbd7f3b4f89aca8d073d3a76 SHA256 1d0988000cb514737aee8407df062a1f15b4680edbade208d4fd9d7e77df9dbc
+MISC metadata.xml 509 RMD160 a1ad276fc5ada592433f6cd3f69ff4b2448c91b4 SHA1 26aaacf8bcd2a490930c8ce683279df4020f52d1 SHA256 34f7ad55b4740d51e95a59c878cb2f7c33bc8730acb80282652065eb76f64fe7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBAgAGBQJN4p7lAAoJEOeBhlrCAAWGOckH/0z8YY7oXO5xTyiImkCyfdPk
-Q2f86PBY9hvil0iPO6bG21HmxHQOk+Vc8aC6PRdTxxnZ3Pa0dDdfRWiMMgOdMwDA
-faLFun0AR91bPBwp9yTCrveZUTG5yIQxfmSahh7RNXpjkpCGs9Zpfr+OKX0bVYGN
-lFSAmGnGG3Xa3bEJQSDHczdVbnsrAWJ1seeUa4aISTGNu5mk+XqV33rbR9ZplIxS
-HgXpKZhE/Q9C7zxmWPLduGhgF4GMmBQdhJ4lpwR8ZPNSe6EGZWfsZCE1/egDUrgn
-FMmPSNarGQcOOkn6iBgqNEmb5LFKjCiKu2VqAUHpfIr9Lodvi810TYszb/HXgWU=
-=R9GB
+iEYEAREKAAYFAk4hwzUACgkQgAnW8HDreRZs/ACeLTDa5k3hNR4IPOYm6h9QQA/b
+m+AAoIy6QBf0M26NJTPB3NcwMFqVDkg6
+=q+Jn
 -----END PGP SIGNATURE-----
diff --git a/sci-visualization/gnuplot/gnuplot-4.2.6-r2.ebuild b/sci-visualization/gnuplot/gnuplot-4.2.6-r2.ebuild
index 3384fa763530..c9e4294e628c 100644
--- a/sci-visualization/gnuplot/gnuplot-4.2.6-r2.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-4.2.6-r2.ebuild
@@ -1,22 +1,23 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/gnuplot-4.2.6-r2.ebuild,v 1.4 2011/05/07 10:35:13 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/gnuplot-4.2.6-r2.ebuild,v 1.5 2011/07/16 16:58:23 jlec Exp $
 
 EAPI=2
 
 inherit autotools elisp-common eutils multilib wxwidgets
 
 MY_P="${P/_/-}"
+
 DESCRIPTION="Command-line driven interactive plotting program"
 HOMEPAGE="http://www.gnuplot.info/"
-SRC_URI="mirror://sourceforge/gnuplot/${MY_P}.tar.gz
+SRC_URI="
+	mirror://sourceforge/gnuplot/${MY_P}.tar.gz
 	mirror://gentoo/${PN}-4.2.5-lua-term.patch.bz2"
 
 LICENSE="gnuplot GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd"
-IUSE="doc emacs +gd ggi latex lua plotutils readline svga wxwidgets X xemacs"
-RESTRICT="wxwidgets? ( test )"
+IUSE="doc emacs examples +gd ggi latex lua plotutils readline svga wxwidgets X xemacs"
 
 RDEPEND="
 	xemacs? ( app-editors/xemacs app-xemacs/xemacs-base )
@@ -24,24 +25,31 @@ RDEPEND="
 	lua? ( >=dev-lang/lua-5.1 )
 	ggi? ( media-libs/libggi )
 	gd? ( >=media-libs/gd-2[png] )
-	latex? ( virtual/latex-base
-		lua? ( dev-tex/pgf
+	latex? (
+		virtual/latex-base
+		lua? (
+			dev-tex/pgf
 			>=dev-texlive/texlive-latexrecommended-2008-r2 ) )
 	X? ( x11-libs/libXaw )
 	svga? ( media-libs/svgalib )
 	readline? ( >=sys-libs/readline-4.2 )
 	plotutils? ( media-libs/plotutils )
-	wxwidgets? ( x11-libs/wxGTK:2.8[X]
+	wxwidgets? (
+		x11-libs/wxGTK:2.8[X]
 		>=x11-libs/cairo-0.9
 		>=x11-libs/pango-1.10.3
 		x11-libs/gtk+:2 )"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
-	doc? ( virtual/latex-base
+	doc? (
+		virtual/latex-base
 		app-text/ghostscript-gpl )
 	!emacs? ( xemacs? ( app-xemacs/texinfo ) )"
 
+RESTRICT="wxwidgets? ( test )"
+
 S="${WORKDIR}/${MY_P}"
+
 E_SITEFILE="50${PN}-gentoo.el"
 TEXMF="/usr/share/texmf-site"
 
@@ -178,10 +186,12 @@ src_install () {
 		TODO VERSION
 	use lua && newdoc term/lua/README README-lua
 
-	if use doc; then
+	if use examples; then
 		# Demo files
 		insinto /usr/share/${PN}/demo
 		doins demo/*
+	fi
+	if use doc; then
 		# Manual
 		dodoc docs/gnuplot.pdf
 		# Tutorial
diff --git a/sci-visualization/gnuplot/gnuplot-4.4.2-r1.ebuild b/sci-visualization/gnuplot/gnuplot-4.4.2-r1.ebuild
index 5090f384bfb9..8f77c1ace06c 100644
--- a/sci-visualization/gnuplot/gnuplot-4.4.2-r1.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-4.4.2-r1.ebuild
@@ -1,12 +1,13 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/gnuplot-4.4.2-r1.ebuild,v 1.4 2011/05/07 10:35:13 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/gnuplot-4.4.2-r1.ebuild,v 1.5 2011/07/16 16:58:23 jlec Exp $
 
 EAPI=3
 
 inherit elisp-common multilib wxwidgets
 
 MY_P="${P/_/-}"
+
 DESCRIPTION="Command-line driven interactive plotting program"
 HOMEPAGE="http://www.gnuplot.info/"
 SRC_URI="mirror://sourceforge/gnuplot/${MY_P}.tar.gz"
@@ -14,37 +15,45 @@ SRC_URI="mirror://sourceforge/gnuplot/${MY_P}.tar.gz"
 LICENSE="gnuplot GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 s390 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="cairo doc emacs +gd ggi latex lua plotutils readline svga thin-splines wxwidgets X xemacs"
-
-RESTRICT="wxwidgets? ( test )"
+IUSE="cairo doc emacs examples +gd ggi latex lua plotutils readline svga thin-splines wxwidgets X xemacs"
 
-RDEPEND="!app-emacs/gnuplot-mode
-	cairo? ( x11-libs/cairo
+RDEPEND="
+	!app-emacs/gnuplot-mode
+	cairo? (
+		x11-libs/cairo
 		x11-libs/pango )
 	emacs? ( virtual/emacs )
 	gd? ( media-libs/gd[png] )
 	ggi? ( media-libs/libggi )
-	latex? ( virtual/latex-base
-		lua? ( dev-tex/pgf
+	latex? (
+		virtual/latex-base
+		lua? (
+			dev-tex/pgf
 			>=dev-texlive/texlive-latexrecommended-2008-r2 ) )
 	lua? ( dev-lang/lua )
 	plotutils? ( media-libs/plotutils )
 	readline? ( sys-libs/readline )
 	svga? ( media-libs/svgalib )
-	wxwidgets? ( x11-libs/wxGTK:2.8[X]
+	wxwidgets? (
+		x11-libs/wxGTK:2.8[X]
 		x11-libs/cairo
 		x11-libs/pango
 		x11-libs/gtk+:2 )
 	X? ( x11-libs/libXaw )
-	xemacs? ( app-editors/xemacs
+	xemacs? (
+		app-editors/xemacs
 		app-xemacs/xemacs-base )"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
-	doc? ( virtual/latex-base
+	doc? (
+		virtual/latex-base
 		app-text/ghostscript-gpl )
 	!emacs? ( xemacs? ( app-xemacs/texinfo ) )"
 
+RESTRICT="wxwidgets? ( test )"
+
 S="${WORKDIR}/${MY_P}"
+
 GP_VERSION="${PV%.*}"
 E_SITEFILE="50${PN}-gentoo.el"
 TEXMF="${EPREFIX}/usr/share/texmf-site"
@@ -162,12 +171,14 @@ src_install () {
 	newdoc term/js/README README-js
 	use lua && newdoc term/lua/README README-lua
 
-	if use doc; then
+	if use examples; then
 		# Demo files
 		insinto /usr/share/${PN}/${GP_VERSION}
 		doins -r demo || die
 		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
 		dodoc docs/gnuplot.pdf
 		# Tutorial
diff --git a/sci-visualization/gnuplot/gnuplot-4.4.3-r1.ebuild b/sci-visualization/gnuplot/gnuplot-4.4.3-r1.ebuild
index e092a4f1fbbe..c6830e1de47d 100644
--- a/sci-visualization/gnuplot/gnuplot-4.4.3-r1.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-4.4.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/gnuplot-4.4.3-r1.ebuild,v 1.3 2011/05/29 19:30:39 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/gnuplot-4.4.3-r1.ebuild,v 1.4 2011/07/16 16:58:23 jlec Exp $
 
 EAPI=3
 
@@ -27,37 +27,45 @@ fi
 LICENSE="gnuplot GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="cairo doc emacs +gd ggi latex lua plotutils readline svga thin-splines wxwidgets X xemacs"
+IUSE="cairo doc emacs examples +gd ggi latex lua plotutils readline svga thin-splines wxwidgets X xemacs"
 
-RESTRICT="wxwidgets? ( test )"
-
-RDEPEND="!app-emacs/gnuplot-mode
-	cairo? ( x11-libs/cairo
+RDEPEND="
+	!app-emacs/gnuplot-mode
+	cairo? (
+		x11-libs/cairo
 		x11-libs/pango )
 	emacs? ( virtual/emacs )
 	gd? ( media-libs/gd[png] )
 	ggi? ( media-libs/libggi )
-	latex? ( virtual/latex-base
-		lua? ( dev-tex/pgf
+	latex? (
+		virtual/latex-base
+		lua? (
+			dev-tex/pgf
 			>=dev-texlive/texlive-latexrecommended-2008-r2 ) )
 	lua? ( dev-lang/lua )
 	plotutils? ( media-libs/plotutils )
 	readline? ( sys-libs/readline )
 	svga? ( media-libs/svgalib )
-	wxwidgets? ( x11-libs/wxGTK:2.8[X]
+	wxwidgets? (
+		x11-libs/wxGTK:2.8[X]
 		x11-libs/cairo
 		x11-libs/pango
 		x11-libs/gtk+:2 )
 	X? ( x11-libs/libXaw )
-	xemacs? ( app-editors/xemacs
+	xemacs? (
+		app-editors/xemacs
 		app-xemacs/xemacs-base )"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
-	doc? ( virtual/latex-base
+	doc? (
+		virtual/latex-base
 		app-text/ghostscript-gpl )
 	!emacs? ( xemacs? ( app-xemacs/texinfo ) )"
 
+RESTRICT="wxwidgets? ( test )"
+
 S="${WORKDIR}/${MY_P}"
+
 GP_VERSION="${PV%.*}"
 E_SITEFILE="50${PN}-gentoo.el"
 TEXMF="${EPREFIX}/usr/share/texmf-site"
@@ -188,12 +196,14 @@ src_install () {
 	newdoc term/js/README README-js
 	use lua && newdoc term/lua/README README-lua
 
-	if use doc; then
+	if use examples; then
 		# Demo files
 		insinto /usr/share/${PN}/${GP_VERSION}
 		doins -r demo || die
 		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
 		dodoc docs/gnuplot.pdf
 		# Tutorial
diff --git a/sci-visualization/gnuplot/gnuplot-4.4.3.ebuild b/sci-visualization/gnuplot/gnuplot-4.4.3.ebuild
index 44edb0c56470..c01df4f551d0 100644
--- a/sci-visualization/gnuplot/gnuplot-4.4.3.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-4.4.3.ebuild
@@ -1,12 +1,13 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/gnuplot-4.4.3.ebuild,v 1.3 2011/05/07 10:16:23 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/gnuplot-4.4.3.ebuild,v 1.4 2011/07/16 16:58:23 jlec Exp $
 
 EAPI=3
 
 inherit elisp-common multilib wxwidgets
 
 MY_P="${P/_/-}"
+
 DESCRIPTION="Command-line driven interactive plotting program"
 HOMEPAGE="http://www.gnuplot.info/"
 SRC_URI="mirror://sourceforge/gnuplot/${MY_P}.tar.gz"
@@ -14,37 +15,45 @@ SRC_URI="mirror://sourceforge/gnuplot/${MY_P}.tar.gz"
 LICENSE="gnuplot GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="cairo doc emacs +gd ggi latex lua plotutils readline svga thin-splines wxwidgets X xemacs"
-
-RESTRICT="wxwidgets? ( test )"
+IUSE="cairo doc emacs examples +gd ggi latex lua plotutils readline svga thin-splines wxwidgets X xemacs"
 
-RDEPEND="!app-emacs/gnuplot-mode
-	cairo? ( x11-libs/cairo
+RDEPEND="
+	!app-emacs/gnuplot-mode
+	cairo? (
+		x11-libs/cairo
 		x11-libs/pango )
 	emacs? ( virtual/emacs )
 	gd? ( media-libs/gd[png] )
 	ggi? ( media-libs/libggi )
-	latex? ( virtual/latex-base
-		lua? ( dev-tex/pgf
+	latex? (
+		virtual/latex-base
+		lua? (
+			dev-tex/pgf
 			>=dev-texlive/texlive-latexrecommended-2008-r2 ) )
 	lua? ( dev-lang/lua )
 	plotutils? ( media-libs/plotutils )
 	readline? ( sys-libs/readline )
 	svga? ( media-libs/svgalib )
-	wxwidgets? ( x11-libs/wxGTK:2.8[X]
+	wxwidgets? (
+		x11-libs/wxGTK:2.8[X]
 		x11-libs/cairo
 		x11-libs/pango
 		x11-libs/gtk+:2 )
 	X? ( x11-libs/libXaw )
-	xemacs? ( app-editors/xemacs
+	xemacs? (
+		app-editors/xemacs
 		app-xemacs/xemacs-base )"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
-	doc? ( virtual/latex-base
+	doc? (
+		virtual/latex-base
 		app-text/ghostscript-gpl )
 	!emacs? ( xemacs? ( app-xemacs/texinfo ) )"
 
+RESTRICT="wxwidgets? ( test )"
+
 S="${WORKDIR}/${MY_P}"
+
 GP_VERSION="${PV%.*}"
 E_SITEFILE="50${PN}-gentoo.el"
 TEXMF="${EPREFIX}/usr/share/texmf-site"
@@ -164,12 +173,14 @@ src_install () {
 	newdoc term/js/README README-js
 	use lua && newdoc term/lua/README README-lua
 
-	if use doc; then
+	if use examples; then
 		# Demo files
 		insinto /usr/share/${PN}/${GP_VERSION}
 		doins -r demo || die
 		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
 		dodoc docs/gnuplot.pdf
 		# Tutorial
diff --git a/sci-visualization/gnuplot/metadata.xml b/sci-visualization/gnuplot/metadata.xml
index 76e095ee0beb..8df9d4a1966f 100644
--- a/sci-visualization/gnuplot/metadata.xml
+++ b/sci-visualization/gnuplot/metadata.xml
@@ -10,8 +10,8 @@
 		<name>Christoph Junghans</name>
 	</maintainer>
 	<use>
-		<flag name='gd'>Add support for <pkg>media-libs/gd</pkg>.
+		<flag name="gd">Add support for <pkg>media-libs/gd</pkg>.
     		Needed for GIF, JPEG, and PNG image output.</flag>
-  		<flag name='thin-splines'>Enable thin plate splines</flag>
+		<flag name="thin-splines">Enable thin plate splines</flag>
 	</use>
 </pkgmetadata>