fix FEATURES="test" and remove static from USE flags

Package-Manager: portage-2.1.3.16

4 files changed, 31 insertions, 24 deletions

diff --git a/gnome-extra/gnome-keyring-manager/ChangeLog b/gnome-extra/gnome-keyring-manager/ChangeLog
index 278ef581c88d..7a2620db50ad 100644
--- a/gnome-extra/gnome-keyring-manager/ChangeLog
+++ b/gnome-extra/gnome-keyring-manager/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-extra/gnome-keyring-manager
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-keyring-manager/ChangeLog,v 1.49 2007/10/14 13:29:54 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-keyring-manager/ChangeLog,v 1.50 2007/10/28 11:36:50 eva Exp $
+
+  28 Oct 2007; Gilles Dartiguelongue <eva@gentoo.org>
+  gnome-keyring-manager-2.18.0.ebuild, gnome-keyring-manager-2.20.0.ebuild:
+  fix dependency on docbook-xml-dtd with FEATURES="test" and remove static
+  useflag
 
 *gnome-keyring-manager-2.20.0 (14 Oct 2007)
 
diff --git a/gnome-extra/gnome-keyring-manager/Manifest b/gnome-extra/gnome-keyring-manager/Manifest
index 20642359c855..11cf602363b8 100644
--- a/gnome-extra/gnome-keyring-manager/Manifest
+++ b/gnome-extra/gnome-keyring-manager/Manifest
@@ -17,18 +17,18 @@ EBUILD gnome-keyring-manager-2.16.0-r1.ebuild 973 RMD160 b648eef9e93c79eabc41a85
 MD5 4384d29f2ce45523a1883aea8a78de4c gnome-keyring-manager-2.16.0-r1.ebuild 973
 RMD160 b648eef9e93c79eabc41a857d5c8935dabc833ac gnome-keyring-manager-2.16.0-r1.ebuild 973
 SHA256 81cec0cc94ce46476e61b2111e0b55121ef2752926306ac84bc14a656f735d1f gnome-keyring-manager-2.16.0-r1.ebuild 973
-EBUILD gnome-keyring-manager-2.18.0.ebuild 879 RMD160 b4dee3a92d0ef095eef059275959dcb3e62d4747 SHA1 7b307b4dd855e61f36b1c3b2ab3b0855f5e150c8 SHA256 24ab2cfb4640af8af49fd4f7fde243d4e9c73e5f594ba0a67999de911e800f8e
-MD5 35d65ad8271bc17c3521a876bf01f27f gnome-keyring-manager-2.18.0.ebuild 879
-RMD160 b4dee3a92d0ef095eef059275959dcb3e62d4747 gnome-keyring-manager-2.18.0.ebuild 879
-SHA256 24ab2cfb4640af8af49fd4f7fde243d4e9c73e5f594ba0a67999de911e800f8e gnome-keyring-manager-2.18.0.ebuild 879
-EBUILD gnome-keyring-manager-2.20.0.ebuild 885 RMD160 541a92b1a41c4c7ad80c32e47b6791c605ef30b6 SHA1 695d9c705992aa8bd02842f7556fb0951a57a9a5 SHA256 846ed51de0d913d3debe4b2ef7cc7939dff18c2e4b3969e41e77d8fd37cf44ce
-MD5 18a58028b572bb49d593532816a1ec1f gnome-keyring-manager-2.20.0.ebuild 885
-RMD160 541a92b1a41c4c7ad80c32e47b6791c605ef30b6 gnome-keyring-manager-2.20.0.ebuild 885
-SHA256 846ed51de0d913d3debe4b2ef7cc7939dff18c2e4b3969e41e77d8fd37cf44ce gnome-keyring-manager-2.20.0.ebuild 885
-MISC ChangeLog 6817 RMD160 2bb23200d9c9e7a0c4019995edd98e10ab3fe316 SHA1 ff420dac936f6dfee5f20bcc7726380c0d7054b0 SHA256 54c1a463e70d3c701c60455befb72be36d442f4e329815c17fda4c02a7989195
-MD5 c531578cdb7194ae4c4ed1d147f30d25 ChangeLog 6817
-RMD160 2bb23200d9c9e7a0c4019995edd98e10ab3fe316 ChangeLog 6817
-SHA256 54c1a463e70d3c701c60455befb72be36d442f4e329815c17fda4c02a7989195 ChangeLog 6817
+EBUILD gnome-keyring-manager-2.18.0.ebuild 896 RMD160 1dd7122447ac683d9964794d9c65c9f6425c0c43 SHA1 f6d3f6ac47f4409f3e46a3069cf2088612b39354 SHA256 972ca9a2142cda4bf6b90807daee5b38dd800c4a8a31bf0a6965e88cc78c0ee9
+MD5 af926cb346bf1a99d9808368b61c01ae gnome-keyring-manager-2.18.0.ebuild 896
+RMD160 1dd7122447ac683d9964794d9c65c9f6425c0c43 gnome-keyring-manager-2.18.0.ebuild 896
+SHA256 972ca9a2142cda4bf6b90807daee5b38dd800c4a8a31bf0a6965e88cc78c0ee9 gnome-keyring-manager-2.18.0.ebuild 896
+EBUILD gnome-keyring-manager-2.20.0.ebuild 903 RMD160 f60a4f2b4ed6a90481cd1b7fbd5654b0deea1734 SHA1 9b175d4190ed088d0aa2a1adf69f3eb002e0f83f SHA256 1fb7fe67800ac28cc8a6da48f290ef54bbfb2bf593e22f93144c07ef05e51ae1
+MD5 177af42e591d7eca941ec7105b060890 gnome-keyring-manager-2.20.0.ebuild 903
+RMD160 f60a4f2b4ed6a90481cd1b7fbd5654b0deea1734 gnome-keyring-manager-2.20.0.ebuild 903
+SHA256 1fb7fe67800ac28cc8a6da48f290ef54bbfb2bf593e22f93144c07ef05e51ae1 gnome-keyring-manager-2.20.0.ebuild 903
+MISC ChangeLog 7033 RMD160 c3d5f7a2ee8c3662ce93033d3e1966cb626a771a SHA1 1c1cfe854a332286904db5cc4eb0be2d1fef69ec SHA256 7857049ff2987c260367c7af79f9fc0e809a8de61c986aa43d72d0b6cd066970
+MD5 4ed6c3772f939bcb33de2c91e8b6ed2f ChangeLog 7033
+RMD160 c3d5f7a2ee8c3662ce93033d3e1966cb626a771a ChangeLog 7033
+SHA256 7857049ff2987c260367c7af79f9fc0e809a8de61c986aa43d72d0b6cd066970 ChangeLog 7033
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
@@ -48,7 +48,7 @@ SHA256 79e04140f834491b3c0aa03acaf5724c9fdd3c357dae0a5e8589866e2b4afda3 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHEhnf1fmVwcYIWAYRAo7IAJ0XvA6eQesP66wwuGbYXw/0OVZMYQCfTfgY
-5oR4c20Ykk8e+0CwxZe1D3E=
-=zoFg
+iD8DBQFHJIJt1fmVwcYIWAYRAp2mAKDk04FY2Awp90uFzCnxAXzaZkrdkACgvnjD
+MweN+aerUwMUlKo05c3YFZ0=
+=OzEi
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/gnome-keyring-manager/gnome-keyring-manager-2.18.0.ebuild b/gnome-extra/gnome-keyring-manager/gnome-keyring-manager-2.18.0.ebuild
index 221b307d1c4d..b39e72b21df4 100644
--- a/gnome-extra/gnome-keyring-manager/gnome-keyring-manager-2.18.0.ebuild
+++ b/gnome-extra/gnome-keyring-manager/gnome-keyring-manager-2.18.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-keyring-manager/gnome-keyring-manager-2.18.0.ebuild,v 1.9 2007/09/22 08:01:56 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-keyring-manager/gnome-keyring-manager-2.18.0.ebuild,v 1.10 2007/10/28 11:36:50 eva Exp $
 
 inherit gnome2
 
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.gnome.org/"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="static"
+IUSE="test"
 
 RDEPEND=">=x11-libs/gtk+-2.6
 	>=gnome-base/libglade-2
@@ -22,10 +22,11 @@ DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.28
 	>=dev-util/pkgconfig-0.9
 	>=app-text/scrollkeeper-0.3.8
-	>=app-text/gnome-doc-utils-0.3.2"
+	>=app-text/gnome-doc-utils-0.3.2
+	test? ( ~app-text/docbook-xml-dtd-4.2 )"
 
 DOCS="AUTHORS ChangeLog HACKING NEWS README TODO"
 
 pkg_setup() {
-	G2CONF="${G2CONF} $(use_enable static) --disable-scrollkeeper"
+	G2CONF="${G2CONF} --disable-scrollkeeper"
 }
diff --git a/gnome-extra/gnome-keyring-manager/gnome-keyring-manager-2.20.0.ebuild b/gnome-extra/gnome-keyring-manager/gnome-keyring-manager-2.20.0.ebuild
index 0ac32a6c4366..012fed0efc60 100644
--- a/gnome-extra/gnome-keyring-manager/gnome-keyring-manager-2.20.0.ebuild
+++ b/gnome-extra/gnome-keyring-manager/gnome-keyring-manager-2.20.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-keyring-manager/gnome-keyring-manager-2.20.0.ebuild,v 1.1 2007/10/14 13:29:54 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-keyring-manager/gnome-keyring-manager-2.20.0.ebuild,v 1.2 2007/10/28 11:36:50 eva Exp $
 
 inherit gnome2
 
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.gnome.org/"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="static"
+IUSE="test"
 
 RDEPEND=">=x11-libs/gtk+-2.6
 	>=gnome-base/libglade-2
@@ -22,10 +22,11 @@ DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.28
 	>=dev-util/pkgconfig-0.9
 	>=app-text/scrollkeeper-0.3.8
-	>=app-text/gnome-doc-utils-0.3.2"
+	>=app-text/gnome-doc-utils-0.3.2
+	test? ( ~app-text/docbook-xml-dtd-4.2 )"
 
 DOCS="AUTHORS ChangeLog HACKING NEWS README TODO"
 
 pkg_setup() {
-	G2CONF="${G2CONF} $(use_enable static) --disable-scrollkeeper"
+	G2CONF="${G2CONF} --disable-scrollkeeper"
 }