First try at separating RDEPEND and DEPEND; add pkgconfig to DEPEND.

Package-Manager: portage-2.1.2_rc1-r5

3 files changed, 18 insertions, 12 deletions

diff --git a/sci-visualization/gnuplot/ChangeLog b/sci-visualization/gnuplot/ChangeLog
index 0946d1b6d768..f1de866c712f 100644
--- a/sci-visualization/gnuplot/ChangeLog
+++ b/sci-visualization/gnuplot/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-visualization/gnuplot
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/ChangeLog,v 1.6 2006/11/13 02:49:20 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/ChangeLog,v 1.7 2006/11/13 02:55:13 dberkholz Exp $
+
+  13 Nov 2006; Donnie Berkholz <dberkholz@gentoo.org>;
+  gnuplot-4.2_rc1.ebuild:
+  First try at separating RDEPEND and DEPEND; add pkgconfig to DEPEND.
 
   13 Nov 2006; Donnie Berkholz <dberkholz@gentoo.org>;
   gnuplot-4.2_rc1.ebuild:
diff --git a/sci-visualization/gnuplot/Manifest b/sci-visualization/gnuplot/Manifest
index b901c8511b94..d5a826bdcc8f 100644
--- a/sci-visualization/gnuplot/Manifest
+++ b/sci-visualization/gnuplot/Manifest
@@ -16,14 +16,14 @@ EBUILD gnuplot-4.0-r1.ebuild 4035 RMD160 da631704672b672fd5df3227c644c1d0ea2f2ef
 MD5 35f3a02f93ddb452f196cc9b1182b90b gnuplot-4.0-r1.ebuild 4035
 RMD160 da631704672b672fd5df3227c644c1d0ea2f2eff gnuplot-4.0-r1.ebuild 4035
 SHA256 cba1f1628bead2a98303d72dc9d404bfc36f5ea10212edae13997f61a8ae150e gnuplot-4.0-r1.ebuild 4035
-EBUILD gnuplot-4.2_rc1.ebuild 4298 RMD160 b6b360a88811382b2f5b1921cc018ff0c357724a SHA1 1c9b2461830f6c6e5aefee1b1c034a8070b5abe7 SHA256 bdc2bde77c0dc996d1fbb4e6bdf93caa8d6d7c332fc7fbed8ddda66faedbcc6e
-MD5 9657204b67b3caa5cfaa4f1087058e14 gnuplot-4.2_rc1.ebuild 4298
-RMD160 b6b360a88811382b2f5b1921cc018ff0c357724a gnuplot-4.2_rc1.ebuild 4298
-SHA256 bdc2bde77c0dc996d1fbb4e6bdf93caa8d6d7c332fc7fbed8ddda66faedbcc6e gnuplot-4.2_rc1.ebuild 4298
-MISC ChangeLog 7336 RMD160 26cf49fdb004457ab8a997cc963b2a93f24402f9 SHA1 636bd1798c930f3b7ab0fbfed98fd3405fe57214 SHA256 43d7f109457214f5a1f2a357f1e91b26675c5f8248c40fa333fe25f611c224dc
-MD5 44eff9de61d7fd0907b2f8e96e438fb2 ChangeLog 7336
-RMD160 26cf49fdb004457ab8a997cc963b2a93f24402f9 ChangeLog 7336
-SHA256 43d7f109457214f5a1f2a357f1e91b26675c5f8248c40fa333fe25f611c224dc ChangeLog 7336
+EBUILD gnuplot-4.2_rc1.ebuild 4320 RMD160 1037bdff5f88d4d1ce609fbb3983676571ce255c SHA1 af081dac089c46b7e4260cc15951a6201ca7e030 SHA256 264d62e5d1c05c49a26553933e6dcb808f1a86d7d2fd4ce6b70a0a41fd3ce199
+MD5 32228ddb9188c3bdeed0cc788826c7c3 gnuplot-4.2_rc1.ebuild 4320
+RMD160 1037bdff5f88d4d1ce609fbb3983676571ce255c gnuplot-4.2_rc1.ebuild 4320
+SHA256 264d62e5d1c05c49a26553933e6dcb808f1a86d7d2fd4ce6b70a0a41fd3ce199 gnuplot-4.2_rc1.ebuild 4320
+MISC ChangeLog 7489 RMD160 23d98ddab36894e63d209b2c18dd5a9724e5fc79 SHA1 f4a1e31c351eb6e530cb7079c98aa2c9a383927f SHA256 db9ee3a35c9b8538317ed8f2b1e2ff32de74dcd5723e269df3f8b9b05365284d
+MD5 585b458c6fbf28e690d8ee1ad21c2577 ChangeLog 7489
+RMD160 23d98ddab36894e63d209b2c18dd5a9724e5fc79 ChangeLog 7489
+SHA256 db9ee3a35c9b8538317ed8f2b1e2ff32de74dcd5723e269df3f8b9b05365284d ChangeLog 7489
 MISC metadata.xml 220 RMD160 f220b5db3b6de3f59e08ab45bfaae138eaae63ee SHA1 e3b505cf1accaf86c17fdc78a3c98b08917d56ee SHA256 bcdae0f0c39207d696ad66e9c264b241cc25453afeadc3f6eb194a7e4452f770
 MD5 0d0ccbc08efef8b97818204479649574 metadata.xml 220
 RMD160 f220b5db3b6de3f59e08ab45bfaae138eaae63ee metadata.xml 220
diff --git a/sci-visualization/gnuplot/gnuplot-4.2_rc1.ebuild b/sci-visualization/gnuplot/gnuplot-4.2_rc1.ebuild
index 1e3a6a32c2a2..3a8d38e34f0e 100644
--- a/sci-visualization/gnuplot/gnuplot-4.2_rc1.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-4.2_rc1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/gnuplot-4.2_rc1.ebuild,v 1.2 2006/11/13 02:49:20 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/gnuplot-4.2_rc1.ebuild,v 1.3 2006/11/13 02:55:13 dberkholz Exp $
 
 inherit eutils elisp-common wxwidgets
 
@@ -15,7 +15,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 ~hppa ia64 ppc ppc-macos ppc64 s390 sparc x86"
 IUSE="doc emacs gd ggi pdf plotutils png readline svga X xemacs wxwindows"
 
-DEPEND="
+RDEPEND="
 	xemacs? ( virtual/xemacs )
 	emacs? ( virtual/emacs !app-emacs/gnuplot-mode )
 	pdf? ( media-libs/pdflib )
@@ -23,7 +23,7 @@ DEPEND="
 	png? ( media-libs/libpng )
 	gd? ( >=media-libs/gd-2 )
 	doc? ( virtual/tetex )
-	X? ( || ( x11-libs/libXaw virtual/x11 ) )
+	X? ( x11-libs/libXaw )
 	svga? ( media-libs/svgalib )
 	readline? ( >=sys-libs/readline-4.2 )
 	plotutils? ( media-libs/plotutils )
@@ -31,6 +31,8 @@ DEPEND="
 		>=x11-libs/cairo-0.9
 		>=x11-libs/pango-1.10.3
 		>=x11-libs/gtk+-2.8 )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
 
 S=${WORKDIR}/${MY_P}