Remove xkeyval from any-of-many dependency, bug 262897.

Package-Manager: portage-2.2_rc33/cvs/Linux i686

4 files changed, 28 insertions, 15 deletions

diff --git a/dev-tex/glossaries/ChangeLog b/dev-tex/glossaries/ChangeLog
index 6d49007708f8..29772f598566 100644
--- a/dev-tex/glossaries/ChangeLog
+++ b/dev-tex/glossaries/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-tex/glossaries
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tex/glossaries/ChangeLog,v 1.22 2009/03/18 20:49:42 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tex/glossaries/ChangeLog,v 1.23 2009/05/16 14:27:03 ulm Exp $
+
+  16 May 2009; Ulrich Mueller <ulm@gentoo.org> glossaries-1.14.ebuild,
+  glossaries-1.16.ebuild:
+  Remove xkeyval from any-of-many dependency since the package is going
+  away, bug 262897.
 
   18 Mar 2009; Brent Baude <ranger@gentoo.org> glossaries-1.16.ebuild:
   Marking glossaries-1.16 ppc stable for bug 253551
diff --git a/dev-tex/glossaries/Manifest b/dev-tex/glossaries/Manifest
index 7f6db9a0bdc2..ea5b07c6291f 100644
--- a/dev-tex/glossaries/Manifest
+++ b/dev-tex/glossaries/Manifest
@@ -1,6 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST glossaries-1.14.zip 760989 RMD160 f79aba2574e4128e802a72db9384f05c8d616933 SHA1 0b771fcbe36a77613e8d5e779b4a8e4599cecd47 SHA256 9e4075ec103fcd4c3d5113007134f298c4b1c6e4739f34a7e26394306a2a5cc3
 DIST glossaries-1.16.zip 782529 RMD160 11d69855bd12733a5094bc659219746b92e9d589 SHA1 536ce664773a492bbb7f8c980b8ee5a84678a856 SHA256 5feafdf60c73f788099c090cb207cb3616590195ba0ffc9859f1b6b2fd49b656
-EBUILD glossaries-1.14.ebuild 1129 RMD160 3ff7879682fb4b15eb03a6d5f472ba9ea30d45b6 SHA1 886c04c7daa3c69c60bac191d650e7d7628f942a SHA256 91f58570fadb6c132e9374029fcd251dee43ac55ff638099e6c82aa4910781a3
-EBUILD glossaries-1.16.ebuild 1141 RMD160 89c1be666fc98a06b83a7fd28047eef03330f7a8 SHA1 2084ecd2f0cda68b81977cf597434264bc54c6cf SHA256 b778ff55aeb1eef54d6add2c74e1c4a38259537306bb1ee4972dd66c6a96b260
-MISC ChangeLog 3186 RMD160 4e29566fa11d3f0ce9bd48509b23de9407ed9812 SHA1 62000e7a5034468f96605f0910c7c4809c28262f SHA256 2449f6a77f21af4335af59ecef4fca7d6dd99c41bc2b31f1109f3c4304453add
+EBUILD glossaries-1.14.ebuild 1055 RMD160 9f15d9e1e3cc3e9e2ba7f47392b71b745ce2f261 SHA1 9be6b65f0ac79c0f5f3311d0f07b1031b753d51d SHA256 3a10220f4e9547e1d9c527670f322d06464caf12e08ddb756998671dbaafc5f2
+EBUILD glossaries-1.16.ebuild 1105 RMD160 fc7b2bdf148ac4e3789b5c7af2be8b68e0c3404a SHA1 7544fdba8ccc0813fe0235f4042854d22bd39673 SHA256 26528579347f848606349b66fe9f60ad09e1fd5e70d51cc3c7c1f5caf1c674e7
+MISC ChangeLog 3373 RMD160 0dfc6b524abc7ccbd92c12c91ad3c9522d4244d1 SHA1 918c65008ba429b997d7321a840a71407c862293 SHA256 5a917b436c739f519497cb7c400b444212c753565cf445ad87c5596263bc8b44
 MISC metadata.xml 158 RMD160 d8bdadbe6c7fb5159975fea69e423d182156bb03 SHA1 f0a40efe339b8cc6b8f503a7d3b66cc2b9c31670 SHA256 ffac3130a9f8a11faf7d20a52ec5ef00e96d2f05e2fc98cceefdfbb9f280b8c7
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iEUEARECAAYFAkoOzZAACgkQOeoy/oIi7uwYoQCYhqyJWQcSwxC5dKLsWIdh9NHQ
+IwCgwMWyoJ1EcS/2dg6VYEy7K1rrtCk=
+=cqGV
+-----END PGP SIGNATURE-----
diff --git a/dev-tex/glossaries/glossaries-1.14.ebuild b/dev-tex/glossaries/glossaries-1.14.ebuild
index cef7649934aa..061e0bd11f11 100644
--- a/dev-tex/glossaries/glossaries-1.14.ebuild
+++ b/dev-tex/glossaries/glossaries-1.14.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tex/glossaries/glossaries-1.14.ebuild,v 1.2 2008/09/02 12:35:20 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tex/glossaries/glossaries-1.14.ebuild,v 1.3 2009/05/16 14:27:03 ulm Exp $
 
 inherit latex-package
 
@@ -17,11 +17,10 @@ KEYWORDS="~amd64 ~x86 ~x86-fbsd"
 IUSE="doc examples"
 
 RDEPEND="dev-lang/perl
-	|| ( dev-texlive/texlive-latexrecommended >=dev-tex/xkeyval-2.5f )
-	|| ( dev-texlive/texlive-latexextra app-text/tetex app-text/ptex )
-	"
+	dev-texlive/texlive-latexrecommended
+	dev-texlive/texlive-latexextra"
 DEPEND="${RDEPEND}
-	 app-arch/unzip"
+	app-arch/unzip"
 
 TEXMF="/usr/share/texmf-site"
 S=${WORKDIR}/${PN}
diff --git a/dev-tex/glossaries/glossaries-1.16.ebuild b/dev-tex/glossaries/glossaries-1.16.ebuild
index d5d0203d75d0..63dadc39643e 100644
--- a/dev-tex/glossaries/glossaries-1.16.ebuild
+++ b/dev-tex/glossaries/glossaries-1.16.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tex/glossaries/glossaries-1.16.ebuild,v 1.15 2009/03/18 20:49:42 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tex/glossaries/glossaries-1.16.ebuild,v 1.16 2009/05/16 14:27:03 ulm Exp $
 
 inherit latex-package
 
@@ -17,11 +17,10 @@ KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
 IUSE="doc examples"
 
 RDEPEND="dev-lang/perl
-	|| ( dev-texlive/texlive-latexrecommended >=dev-tex/xkeyval-2.5f )
-	>=dev-texlive/texlive-latexextra-2008
-	"
+	dev-texlive/texlive-latexrecommended
+	>=dev-texlive/texlive-latexextra-2008"
 DEPEND="${RDEPEND}
-	 app-arch/unzip"
+	app-arch/unzip"
 
 TEXMF="/usr/share/texmf-site"
 S=${WORKDIR}/${PN}