Install demos through USE=examples, #374187

(Portage version: 2.2.0_alpha45/git/Linux x86_64, signed Manifest commit with key 70EB7916)

5 files changed, 55 insertions, 35 deletions

diff --git a/sci-visualization/gnuplot/ChangeLog b/sci-visualization/gnuplot/ChangeLog
index 2f2be4a9a..d9daf856c 100644
--- a/sci-visualization/gnuplot/ChangeLog
+++ b/sci-visualization/gnuplot/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  16 Jul 2011; Justin Lecher <jlec@gentoo.org> gnuplot-4.4.9999.ebuild,
+  gnuplot-4.5.9999.ebuild, metadata.xml:
+  Install demos through USE=examples, #374187
+
   28 May 2011; Christoph Junghans <ottxor@gentoo.org> gnuplot-4.5.9999.ebuild:
   sync with tree
 
diff --git a/sci-visualization/gnuplot/Manifest b/sci-visualization/gnuplot/Manifest
index 0ae1bfef2..adf8ceae4 100644
--- a/sci-visualization/gnuplot/Manifest
+++ b/sci-visualization/gnuplot/Manifest
@@ -1,18 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
-EBUILD gnuplot-4.4.9999.ebuild 6720 RMD160 09d192b4085df09adeb4ad66b5de2eb7b31eefbc SHA1 66173b65314a771779ea89ee80c29bb0337b6559 SHA256 5e6c8ec4a074f61fab73f5c0a4de88baca921d30972d752e4f71b1bce8078e26
-EBUILD gnuplot-4.5.9999.ebuild 6832 RMD160 5cc96cef98b6a5d083d52a10ee957b49b097c39c SHA1 8eb8baf18a35e1a96175d0b68d2b011e4a262d2f SHA256 3009cd11b55cf6850145744850f52b3c97986560ce6c1b51359947d63d04462e
-MISC ChangeLog 4118 RMD160 5016f07de5f13c76d8ebad2731aa15a823bd87ca SHA1 ccad7d8e2fc8fe294d6e01404363543718b42455 SHA256 edb6c773a6c3c40af07783ff7e82d62186c65f26f67543b7db4d03f527d84c3b
-MISC metadata.xml 558 RMD160 38403f46dbda503120e268b33e00d9e2d80417b4 SHA1 71ccd940653854f1bc2adadd2db8d17ad52eb911 SHA256 69317d2d81295354baf28dd54c2de54a96a56a804ff79ea5f7085b7d9c0176e6
+EBUILD gnuplot-4.4.9999.ebuild 6772 RMD160 14a71029e976134da77d8cc291f6a48d74404126 SHA1 baccdf68da2040100db23053cffc62d2235c0e75 SHA256 e8e8dcf88b92d8478d26aff95ca6d693f2f343000fc003c43050d6ae269fa24f
+EBUILD gnuplot-4.5.9999.ebuild 6884 RMD160 90b8253dca1f26aee9b064a62bfe3d69ce1636af SHA1 b005f492a053af64ec677bcd871db34643f64c71 SHA256 2336e04a47ae18fba6685501379cc87bfa69516bc3d8a9c60ca36d0999eff3ca
+MISC ChangeLog 4278 RMD160 02c1230fc99a042b28999dfd651634e18420b2ff SHA1 c31478f7a137e7e1e08dbdcb4f617903a55a6dbf SHA256 95fe827f7d225b2b0d806d1ddff287a495a5c0a44c92ee8306428b1a4edd154e
+MISC metadata.xml 554 RMD160 0b1ac62fa528d46129d3635e88d68c2c5faf31dd SHA1 9e1cdbe94aaabe9182381f957f0d2801e3883234 SHA256 4a87cb1ea6c9bcf688d68a07ea65b357fe309b940241e257448bd61186a9d60d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBAgAGBQJN4PP5AAoJEOeBhlrCAAWG13EIALXhvySjy7RFuCqEpZo1Mnwf
-c0IPBV2hA6CXp+VLxzK/1MPo0Xdp3LiXVdRYjkagO/qs7H6qZxWU/3NEuTCX8gNR
-dNNWyYdlcQ3juFCY3WSCfYe6srg0/zIGV1fq//WxICgE8Eio4+Klj5WdHjwuaZfJ
-oEPSJsbi3UrjlEBSrNTdQ1YdP6PGpuzErz/VaR0u4z5w6Ew3qTyNk6rn3e5PkLyb
-CIFa+DcBuJdOGUYhXFn5t1HZkJlaGElUO18VKoep81YSvQBWG3LVs/MjqcxRUbD1
-3tMH3F4cz2JyLclGoSo5gom/N69+9Uf2HkO6kwIieUTeaxpXSysg+XXKErfq6FA=
-=twxO
+iEYEAREKAAYFAk4hw3wACgkQgAnW8HDreRZ4VgCgrH0sWPEo95WlgwhFPuOd/5e4
+/7gAoJHpALA54pK2m7tP4slseQNfPiNZ
+=b+oZ
 -----END PGP SIGNATURE-----
diff --git a/sci-visualization/gnuplot/gnuplot-4.4.9999.ebuild b/sci-visualization/gnuplot/gnuplot-4.4.9999.ebuild
index be4fc1caf..3d9a9c1b8 100644
--- a/sci-visualization/gnuplot/gnuplot-4.4.9999.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-4.4.9999.ebuild
@@ -26,38 +26,46 @@ 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 ) )
 	!emacs? ( !xemacs? ( || ( virtual/emacs 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"
@@ -192,12 +200,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.5.9999.ebuild b/sci-visualization/gnuplot/gnuplot-4.5.9999.ebuild
index 38988874e..b1e1ea861 100644
--- a/sci-visualization/gnuplot/gnuplot-4.5.9999.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-4.5.9999.ebuild
@@ -26,17 +26,21 @@ 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 qt4 readline svga thin-splines wxwidgets X xemacs"
+IUSE="cairo doc emacs examples +gd ggi latex lua plotutils qt4 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 )
@@ -45,21 +49,25 @@ RDEPEND="!app-emacs/gnuplot-mode
 		>=x11-libs/qt-svg-4.5 )
 	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 ) )
 	!emacs? ( !xemacs? ( || ( virtual/emacs app-xemacs/texinfo ) ) )"
 
 S="${WORKDIR}/${MY_P}"
+
 GP_VERSION="${PV%.*}"
 E_SITEFILE="50${PN}-gentoo.el"
 TEXMF="${EPREFIX}/usr/share/texmf-site"
@@ -195,12 +203,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 28c5899c4..b66be8a3b 100644
--- a/sci-visualization/gnuplot/metadata.xml
+++ b/sci-visualization/gnuplot/metadata.xml
@@ -10,9 +10,9 @@
 		<email>ulm@gentoo.org</email>
 	</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='qt4'>Build Qt4 terminal</flag>
+		<flag name="thin-splines">Enable thin plate splines</flag>
+		<flag name="qt4">Build Qt4 terminal</flag>
 	</use>
 </pkgmetadata>