Install demos through USE=examples, #374187

(Portage version: 2.2.0_alpha45/cvs/Linux x86_64)

6 files changed, 95 insertions, 48 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/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>