Cleanup. Update metadata. Drop editors/XML-XSH mask

(Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key 0x5772769F4E046AEC)

8 files changed, 34 insertions, 149 deletions

diff --git a/app-editors/XML-XSH2/ChangeLog b/app-editors/XML-XSH2/ChangeLog
index dddc595f9e2a..debcf0fdc761 100644
--- a/app-editors/XML-XSH2/ChangeLog
+++ b/app-editors/XML-XSH2/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-editors/XML-XSH2
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/XML-XSH2/ChangeLog,v 1.12 2012/11/22 10:05:19 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/XML-XSH2/ChangeLog,v 1.13 2012/11/26 04:22:30 tove Exp $
+
+  26 Nov 2012; Torsten Veller <tove@gentoo.org> -XML-XSH2-2.0.2.ebuild,
+  -XML-XSH2-2.1.1.ebuild, -XML-XSH2-2.1.2.ebuild, -XML-XSH2-2.1.3.ebuild,
+  -XML-XSH2-2.1.5.ebuild, XML-XSH2-2.1.6.ebuild, metadata.xml:
+  Cleanup. Update metadata. Drop editors/XML-XSH mask
 
   22 Nov 2012; Agostino Sarubbo <ago@gentoo.org> XML-XSH2-2.1.6.ebuild:
   Stable for x86, tested by Vincent Olivert Riera <peratu@carrosses.com>, wrt
diff --git a/app-editors/XML-XSH2/XML-XSH2-2.0.2.ebuild b/app-editors/XML-XSH2/XML-XSH2-2.0.2.ebuild
deleted file mode 100644
index be3c8e1a609e..000000000000
--- a/app-editors/XML-XSH2/XML-XSH2-2.0.2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/XML-XSH2/XML-XSH2-2.0.2.ebuild,v 1.5 2007/03/09 23:54:59 mcummings Exp $
-
-inherit perl-module
-
-DESCRIPTION="XML Editing Shell"
-HOMEPAGE="http://xsh.sourceforge.net/"
-SRC_URI="mirror://sourceforge/xsh/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="amd64 ~x86"
-IUSE=""
-
-DEPEND=">=dev-perl/XML-LibXML-1.61
-	>=dev-perl/Parse-RecDescent-1.94
-	>=dev-perl/XML-LibXSLT-1.53
-	dev-perl/Term-ReadLine-Perl
-	>=dev-perl/XML-XUpdate-LibXML-0.4.0
-	!app-editors/XML-XSH"
diff --git a/app-editors/XML-XSH2/XML-XSH2-2.1.1.ebuild b/app-editors/XML-XSH2/XML-XSH2-2.1.1.ebuild
deleted file mode 100644
index fafbd5615dcf..000000000000
--- a/app-editors/XML-XSH2/XML-XSH2-2.1.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/XML-XSH2/XML-XSH2-2.1.1.ebuild,v 1.2 2010/10/30 10:07:24 ssuominen Exp $
-
-MODULE_AUTHOR=PAJAS
-inherit perl-module
-
-DESCRIPTION="XML Editing Shell"
-HOMEPAGE="http://xsh.sourceforge.net/"
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=dev-perl/XML-LibXML-1.61
-	>=dev-perl/Parse-RecDescent-1.94
-	>=dev-perl/XML-LibXSLT-1.53
-	dev-perl/IO-stringy
-	dev-perl/XML-SAX-Writer
-	dev-perl/Term-ReadLine-Perl
-	dev-perl/XML-Filter-DOMFilter-LibXML
-	>=dev-perl/XML-XUpdate-LibXML-0.4.0
-	!app-editors/XML-XSH"
-
-SRC_TEST=do
diff --git a/app-editors/XML-XSH2/XML-XSH2-2.1.2.ebuild b/app-editors/XML-XSH2/XML-XSH2-2.1.2.ebuild
deleted file mode 100644
index 723e089be275..000000000000
--- a/app-editors/XML-XSH2/XML-XSH2-2.1.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/XML-XSH2/XML-XSH2-2.1.2.ebuild,v 1.1 2011/06/23 08:20:15 tove Exp $
-
-EAPI=4
-
-MODULE_AUTHOR=PAJAS
-MODULE_VERSION=2.1.2
-inherit perl-module
-
-DESCRIPTION="XML Editing Shell"
-HOMEPAGE="http://xsh.sourceforge.net/"
-
-LICENSE="|| ( Artistic GPL-2 )" # Artistic or GPL-2
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-perl/XML-LibXML-1.61
-	>=dev-perl/Parse-RecDescent-1.94
-	>=dev-perl/XML-LibXSLT-1.53
-	dev-perl/IO-stringy
-	dev-perl/XML-SAX-Writer
-	dev-perl/Term-ReadLine-Perl
-	dev-perl/URI
-	dev-perl/XML-Filter-DOMFilter-LibXML
-	>=dev-perl/XML-XUpdate-LibXML-0.4.0
-	!app-editors/XML-XSH
-"
-DEPEND="${RDEPEND}"
-
-SRC_TEST=do
diff --git a/app-editors/XML-XSH2/XML-XSH2-2.1.3.ebuild b/app-editors/XML-XSH2/XML-XSH2-2.1.3.ebuild
deleted file mode 100644
index 6030cb66ddf2..000000000000
--- a/app-editors/XML-XSH2/XML-XSH2-2.1.3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/XML-XSH2/XML-XSH2-2.1.3.ebuild,v 1.1 2011/07/06 12:37:32 tove Exp $
-
-EAPI=4
-
-MODULE_AUTHOR=PAJAS
-MODULE_VERSION=2.1.3
-inherit perl-module
-
-DESCRIPTION="XML Editing Shell"
-HOMEPAGE="http://xsh.sourceforge.net/"
-
-LICENSE="|| ( Artistic GPL-2 )" # Artistic or GPL-2
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-perl/XML-LibXML-1.61
-	>=dev-perl/Parse-RecDescent-1.94
-	>=dev-perl/XML-LibXSLT-1.53
-	dev-perl/IO-stringy
-	dev-perl/XML-SAX-Writer
-	dev-perl/Term-ReadLine-Perl
-	dev-perl/URI
-	dev-perl/XML-Filter-DOMFilter-LibXML
-	>=dev-perl/XML-XUpdate-LibXML-0.4.0
-	!app-editors/XML-XSH
-"
-DEPEND="${RDEPEND}"
-
-SRC_TEST=do
diff --git a/app-editors/XML-XSH2/XML-XSH2-2.1.5.ebuild b/app-editors/XML-XSH2/XML-XSH2-2.1.5.ebuild
deleted file mode 100644
index 29e217b7b916..000000000000
--- a/app-editors/XML-XSH2/XML-XSH2-2.1.5.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/XML-XSH2/XML-XSH2-2.1.5.ebuild,v 1.1 2011/11/19 19:53:32 tove Exp $
-
-EAPI=4
-
-MODULE_AUTHOR=PAJAS
-MODULE_VERSION=2.1.5
-inherit perl-module
-
-DESCRIPTION="XML Editing Shell"
-HOMEPAGE="http://xsh.sourceforge.net/"
-
-LICENSE="|| ( Artistic GPL-2 )" # Artistic or GPL-2
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-perl/XML-LibXML-1.61
-	>=dev-perl/Parse-RecDescent-1.94
-	>=dev-perl/XML-LibXSLT-1.53
-	dev-perl/IO-stringy
-	dev-perl/XML-SAX-Writer
-	dev-perl/Term-ReadLine-Perl
-	dev-perl/URI
-	dev-perl/XML-Filter-DOMFilter-LibXML
-	>=dev-perl/XML-XUpdate-LibXML-0.4.0
-	!app-editors/XML-XSH
-"
-DEPEND="${RDEPEND}"
-
-SRC_TEST=do
diff --git a/app-editors/XML-XSH2/XML-XSH2-2.1.6.ebuild b/app-editors/XML-XSH2/XML-XSH2-2.1.6.ebuild
index a33903404fca..3dae15e14430 100644
--- a/app-editors/XML-XSH2/XML-XSH2-2.1.6.ebuild
+++ b/app-editors/XML-XSH2/XML-XSH2-2.1.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/XML-XSH2/XML-XSH2-2.1.6.ebuild,v 1.3 2012/11/22 10:05:19 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/XML-XSH2/XML-XSH2-2.1.6.ebuild,v 1.4 2012/11/26 04:22:30 tove Exp $
 
 EAPI=4
 
@@ -26,7 +26,6 @@ RDEPEND="
 	dev-perl/URI
 	dev-perl/XML-Filter-DOMFilter-LibXML
 	>=dev-perl/XML-XUpdate-LibXML-0.4.0
-	!app-editors/XML-XSH
 "
 DEPEND="${RDEPEND}"
 
diff --git a/app-editors/XML-XSH2/metadata.xml b/app-editors/XML-XSH2/metadata.xml
index 1b85a4b2fbef..1fb2164b63be 100644
--- a/app-editors/XML-XSH2/metadata.xml
+++ b/app-editors/XML-XSH2/metadata.xml
@@ -4,5 +4,32 @@
 	<herd>perl</herd>
 	<upstream>
 		<remote-id type="cpan">XML-XSH2</remote-id>
+		<remote-id type="cpan-module">Parse::RecDescent::XML::XSH2::Parser</remote-id>
+		<remote-id type="cpan-module">XML::LibXML::Literal</remote-id>
+		<remote-id type="cpan-module">XML::LibXML::Namespace</remote-id>
+		<remote-id type="cpan-module">XML::LibXML::NodeList</remote-id>
+		<remote-id type="cpan-module">XML::LibXML::Number</remote-id>
+		<remote-id type="cpan-module">XML::LibXML::SubTreeIterator</remote-id>
+		<remote-id type="cpan-module">XML::SAX::Writer::XMLEnc</remote-id>
+		<remote-id type="cpan-module">XML::XSH2</remote-id>
+		<remote-id type="cpan-module">XML::XSH2::Compile</remote-id>
+		<remote-id type="cpan-module">XML::XSH2::Completion</remote-id>
+		<remote-id type="cpan-module">XML::XSH2::CompletionList</remote-id>
+		<remote-id type="cpan-module">XML::XSH2::DummyXPathContext</remote-id>
+		<remote-id type="cpan-module">XML::XSH2::FilteredIterator</remote-id>
+		<remote-id type="cpan-module">XML::XSH2::Functions</remote-id>
+		<remote-id type="cpan-module">XML::XSH2::Grammar</remote-id>
+		<remote-id type="cpan-module">XML::XSH2::Help</remote-id>
+		<remote-id type="cpan-module">XML::XSH2::Inline</remote-id>
+		<remote-id type="cpan-module">XML::XSH2::Internal::Exception</remote-id>
+		<remote-id type="cpan-module">XML::XSH2::Internal::LoopTerminatingException</remote-id>
+		<remote-id type="cpan-module">XML::XSH2::Internal::SubTerminatingException</remote-id>
+		<remote-id type="cpan-module">XML::XSH2::Internal::UncatchableException</remote-id>
+		<remote-id type="cpan-module">XML::XSH2::Iterators</remote-id>
+		<remote-id type="cpan-module">XML::XSH2::LibXMLCompat</remote-id>
+		<remote-id type="cpan-module">XML::XSH2::Map</remote-id>
+		<remote-id type="cpan-module">XML::XSH2::Parser</remote-id>
+		<remote-id type="cpan-module">XML::XSH2::VarAlias</remote-id>
+		<remote-id type="cpan-module">XML::XSH2::XPathToXML</remote-id>
 	</upstream>
 </pkgmetadata>