[gentoo-commits] proj/sci:master commit in: sci-visualization/gnuplot/

["Justin Lecher" <jlec@gentoo.org>]

commit:     0295cc2cae87bd65779222a6e2c954914d85a65c
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 16 16:59:40 2011 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sat Jul 16 16:59:40 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=0295cc2c

Install demos through USE=examples, #374187

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

---
 sci-visualization/gnuplot/ChangeLog               |    4 ++
 sci-visualization/gnuplot/gnuplot-4.4.9999.ebuild |   32 +++++++++++++-------
 sci-visualization/gnuplot/gnuplot-4.5.9999.ebuild |   28 ++++++++++++------
 sci-visualization/gnuplot/metadata.xml            |    6 ++--
 4 files changed, 47 insertions(+), 23 deletions(-)

diff --git a/sci-visualization/gnuplot/ChangeLog b/sci-visualization/gnuplot/ChangeLog
index 2f2be4a..d9daf85 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/gnuplot-4.4.9999.ebuild b/sci-visualization/gnuplot/gnuplot-4.4.9999.ebuild
index be4fc1c..3d9a9c1 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 3898887..b1e1ea8 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 28c5899..b66be8a 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>