Re-organized dependencies for pkg-config (bug #217278)

Package-Manager: portage-2.1.5_rc4

4 files changed, 26 insertions, 10 deletions

diff --git a/sci-visualization/gwyddion/ChangeLog b/sci-visualization/gwyddion/ChangeLog
index 8aac1ea62bae..7f0e967f6232 100644
--- a/sci-visualization/gwyddion/ChangeLog
+++ b/sci-visualization/gwyddion/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-visualization/gwyddion
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gwyddion/ChangeLog,v 1.11 2008/01/07 14:18:19 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gwyddion/ChangeLog,v 1.12 2008/04/21 16:09:51 bicatali Exp $
+
+  21 Apr 2008; Sébastien Fabbro <bicatali@gentoo.org> gwyddion-2.5.ebuild,
+  gwyddion-2.9.ebuild:
+  Re-organized dependencies for pkg-config (bug #217278)
 
 *gwyddion-2.9 (07 Jan 2008)
 
diff --git a/sci-visualization/gwyddion/Manifest b/sci-visualization/gwyddion/Manifest
index 8c39f812b81b..4c09f6393b44 100644
--- a/sci-visualization/gwyddion/Manifest
+++ b/sci-visualization/gwyddion/Manifest
@@ -1,6 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST gwyddion-2.5.tar.bz2 2085657 RMD160 8be42bb051997f15e8c4c86c59742059783102ba SHA1 c575797512afbcc00590d0253ae904500343e364 SHA256 22c9f616a44e0328d577e506aef81d90b20b9838a6ffc4bc880d0784d3283ae1
 DIST gwyddion-2.9.tar.bz2 2330381 RMD160 9d9dfea2fe6e72c1b716d86720d79317308caf1b SHA1 47912e378ef994e6438e02e4fab5db495877b618 SHA256 e619f2a0a7a8d1bf37b982893e3953b5d4a77a729716442504b9ca1485c983ff
-EBUILD gwyddion-2.5.ebuild 953 RMD160 821ba1bde4dc57b697e69d4ccf3b8c219250cf71 SHA1 3e5f52c611b9783d07db0b925281772d946cce24 SHA256 8da5a6e0d72c2ea419e462709b7e97256cad8048e5b2c16e4685f19d4cc6b742
-EBUILD gwyddion-2.9.ebuild 986 RMD160 9e26e5131945a37bc4b0773d1d7e2596111a70b0 SHA1 41fadcd55f1b88a955908b45107185354bc727f6 SHA256 26c128962f802e82408842f2266b81be128c6a1b284f8e1ea1767928993a10ec
-MISC ChangeLog 2207 RMD160 c882b9fe11880744aebd7d8e8d551cbd097fc709 SHA1 ac035fb03c5e3d096b836462fcab3078621c9a0d SHA256 98c559e91fda56e163af3ad0c20c2d130083b758211d109b021851ef35c4056e
+EBUILD gwyddion-2.5.ebuild 974 RMD160 68f43965b2e20b027df6bdf6824c080e62983328 SHA1 b6943df7dbe45018c501f1f65cc1295fa09cf2ea SHA256 b812addbdc8675337cffc76ae9070955ac1523eb839a5f89361f68094ee54fb4
+EBUILD gwyddion-2.9.ebuild 1007 RMD160 4dea5448d6ac8ae18a01bb940ca8e13e9231940e SHA1 d9b674cc3abfb495f6083e564b1d4e1752dcfe24 SHA256 8f66f8e81de458081a0ba8173873948ecabb08f1c27bc84537d352d4b17763e1
+MISC ChangeLog 2364 RMD160 06c01368fcf90c7fd13d1030a685a4955f1fcc68 SHA1 92eb50625ab36975070c682c015d90be3296dc41 SHA256 486ee28714adbb2f4b527b5aa6cf8709d7a6f67a35533498c9911066b713cf24
 MISC metadata.xml 557 RMD160 275cbb6542e6af1d71e051c87c8080e2ade0a3a9 SHA1 325d6404aa11a93a377402e42a156edde187183b SHA256 baf6898f6825a6a2ef6bd47265f8c34b52f5b3a5c48e10c8f995e20a729f9259
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFIDLxY1ycZbhPLE2ARAsLdAJ9I5m5MJ53OBmQBt6+OzjYndo/mQACdEECU
+4ODolhGo0/onxDgTlYW8mxI=
+=jGjw
+-----END PGP SIGNATURE-----
diff --git a/sci-visualization/gwyddion/gwyddion-2.5.ebuild b/sci-visualization/gwyddion/gwyddion-2.5.ebuild
index 3bc2e27a7518..60ed89a21b76 100644
--- a/sci-visualization/gwyddion/gwyddion-2.5.ebuild
+++ b/sci-visualization/gwyddion/gwyddion-2.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gwyddion/gwyddion-2.5.ebuild,v 1.3 2008/01/07 12:00:43 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gwyddion/gwyddion-2.5.ebuild,v 1.4 2008/04/21 16:09:51 bicatali Exp $
 
 DESCRIPTION="A software framework for SPM data analysis"
 HOMEPAGE="http://gwyddion.net/"
@@ -11,13 +11,14 @@ SLOT="0"
 KEYWORDS="amd64 ~x86"
 IUSE="python perl ruby nls"
 
-DEPEND="virtual/opengl
+RDEPEND="virtual/opengl
 	python? ( virtual/python )
 	perl? ( dev-lang/perl )
 	ruby? ( virtual/ruby )
 	>=x11-libs/gtk+-2.6
-	dev-util/pkgconfig
 	x11-libs/gtkglext"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
 
 src_compile() {
 	econf \
diff --git a/sci-visualization/gwyddion/gwyddion-2.9.ebuild b/sci-visualization/gwyddion/gwyddion-2.9.ebuild
index 69b1de6a2853..42e23edf3c4c 100644
--- a/sci-visualization/gwyddion/gwyddion-2.9.ebuild
+++ b/sci-visualization/gwyddion/gwyddion-2.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gwyddion/gwyddion-2.9.ebuild,v 1.1 2008/01/07 14:18:19 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gwyddion/gwyddion-2.9.ebuild,v 1.2 2008/04/21 16:09:51 bicatali Exp $
 
 DESCRIPTION="A software framework for SPM data analysis"
 HOMEPAGE="http://gwyddion.net/"
@@ -11,15 +11,16 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="python perl ruby nls"
 
-DEPEND="virtual/opengl
+RDEPEND="virtual/opengl
 	python? ( virtual/python )
 	perl? ( dev-lang/perl )
 	ruby? ( virtual/ruby )
 	>=x11-libs/gtk+-2.8
 	x11-libs/pango
 	x11-libs/cairo
-	dev-util/pkgconfig
 	x11-libs/gtkglext"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
 
 src_compile() {
 	econf \