Move slot 2.6 to java overlay as nothing in the main tree is using it.

Package-Manager: portage-2.1.3.19

8 files changed, 13 insertions, 197 deletions

diff --git a/dev-java/xerces/ChangeLog b/dev-java/xerces/ChangeLog
index fe7dd147378e..3b1c59ad9463 100644
--- a/dev-java/xerces/ChangeLog
+++ b/dev-java/xerces/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/xerces
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xerces/ChangeLog,v 1.94 2007/11/01 00:36:11 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xerces/ChangeLog,v 1.95 2007/11/15 01:10:27 betelgeuse Exp $
+
+  15 Nov 2007; Petteri Räty <betelgeuse@gentoo.org>
+  -files/xerces-2.6.2-gentoo.patch, -files/xerces-2.6.2-javadoc.patch,
+  -xerces-2.6.2-r3.ebuild, -xerces-2.6.2-r4.ebuild:
+  Move slot 2.6 to java overlay as nothing in the main tree is using it.
 
   01 Nov 2007; Petteri Räty <betelgeuse@gentoo.org>
   -xerces-1.3.1-r1.ebuild:
diff --git a/dev-java/xerces/Manifest b/dev-java/xerces/Manifest
index 602eec94312c..8e957f7f92e5 100644
--- a/dev-java/xerces/Manifest
+++ b/dev-java/xerces/Manifest
@@ -9,14 +9,6 @@ AUX xerces-2.3.0-gentoo.patch 2684 RMD160 b74e5d28ecd76f6163728314dac2904cef0073
 MD5 4f14802b02f3ee092ebcf99c004af474 files/xerces-2.3.0-gentoo.patch 2684
 RMD160 b74e5d28ecd76f6163728314dac2904cef007372 files/xerces-2.3.0-gentoo.patch 2684
 SHA256 9aa646b5a07656af7a6d32d1549152cca4d9917c9ecc68f66c811568bcea2e28 files/xerces-2.3.0-gentoo.patch 2684
-AUX xerces-2.6.2-gentoo.patch 750 RMD160 350cdf7d88a9469b1311e1d270d799468b49cdea SHA1 0ae6dea1303e5815afc4f0c8d85cacfbe39a5201 SHA256 5807691bcc000360b6219c9797bffea824b3f056112dc81b2b0b08eb1e7e7dd7
-MD5 bff16142ead4e66a128d6fa79233c57f files/xerces-2.6.2-gentoo.patch 750
-RMD160 350cdf7d88a9469b1311e1d270d799468b49cdea files/xerces-2.6.2-gentoo.patch 750
-SHA256 5807691bcc000360b6219c9797bffea824b3f056112dc81b2b0b08eb1e7e7dd7 files/xerces-2.6.2-gentoo.patch 750
-AUX xerces-2.6.2-javadoc.patch 595 RMD160 6f610ac325283f68d53841cfa4b41de526e8f837 SHA1 52e40ca7eb0d811800e56c0c8dfe8cdd9700b4af SHA256 0f97fa163c7393db8a81cb72926afc1d5f97f17763fc1dd1eb52d550db20d25b
-MD5 70a862e66b1ea35b680b716d2c58a954 files/xerces-2.6.2-javadoc.patch 595
-RMD160 6f610ac325283f68d53841cfa4b41de526e8f837 files/xerces-2.6.2-javadoc.patch 595
-SHA256 0f97fa163c7393db8a81cb72926afc1d5f97f17763fc1dd1eb52d550db20d25b files/xerces-2.6.2-javadoc.patch 595
 AUX xerces-2.8.1-gentoo.patch 750 RMD160 350cdf7d88a9469b1311e1d270d799468b49cdea SHA1 0ae6dea1303e5815afc4f0c8d85cacfbe39a5201 SHA256 5807691bcc000360b6219c9797bffea824b3f056112dc81b2b0b08eb1e7e7dd7
 MD5 bff16142ead4e66a128d6fa79233c57f files/xerces-2.8.1-gentoo.patch 750
 RMD160 350cdf7d88a9469b1311e1d270d799468b49cdea files/xerces-2.8.1-gentoo.patch 750
@@ -35,7 +27,6 @@ RMD160 53f5838a0c0c28d9bdf247f5e36244ca40301ed1 files/xerces-2.9.0-no_dom3.patch
 SHA256 9ce16bd4bdb033fc0b7de52c3fb5d57fed3d4d033663e5d47e2f7d9512c4966a files/xerces-2.9.0-no_dom3.patch 848
 DIST Xerces-J-src.1.3.1.tar.gz 900263 RMD160 31512c5331f00599ae117c4f5e61767844e556fc SHA1 3a856e2b5ca45cf1fff32aaace6749030bb1e6b0 SHA256 d59f57ef4ec540f75b4b79aeef20e85ccb4f2c3b516dc995f1fc88f526f5f1e1
 DIST Xerces-J-src.2.3.0.tar.gz 1556920 RMD160 2340aa6f27c9f0616951d8ef0c2d96e168a359b7 SHA1 31bee93598ce12ae2f47a89062a18aa8cd919666 SHA256 a3b9a6939c0959ea29fe2df13dbb9dcdf679ae1125d2f8488bd4bd6fff6737fe
-DIST Xerces-J-src.2.6.2.tar.gz 1612086 RMD160 e5d9a7e933403413bd8e718e1342846548f2a29e SHA1 12c3dabda1d58c0fb78d0ab5949e37a0ce515931 SHA256 7e2167b9b7faf367aedacc1c6eddacb8c54dc506edc63844b6cbc661ce0f7e52
 DIST Xerces-J-src.2.8.1.tar.gz 1691101 RMD160 fc643f8cfee9116a6dfddb7e9123e64ea79cc25b SHA1 62dde967b9fa1ec56c11b8126cb5de4c72c147bc SHA256 8423b267f597f2a042ca8224770fb7ca31ae902df0f3e4b5f04df99e1b9ced33
 DIST Xerces-J-src.2.9.0.tar.gz 1700145 RMD160 e27577b35d04ea0f51277f306e9395d261c7b66d SHA1 0dddc1a59dfb75cc2264258df25cf6c23ae57f97 SHA256 76147a7d5f33d7d945964a732923f387628d4e744693c7e6beb9d22e7cc2375d
 EBUILD xerces-1.3.1-r2.ebuild 1132 RMD160 7015930f3b7b746798bf0981c3b8fd151a142be3 SHA1 3d84147fa91f6ee9d0e883a6a0e4a2ae9733dd47 SHA256 1f1f617c246bad6de8a9d5d36becd551710319a040d69059e1ef651d219d48ae
@@ -50,14 +41,6 @@ EBUILD xerces-2.3.0-r3.ebuild 1339 RMD160 ba56af40d456739996348e77e61f5af5e130de
 MD5 b8be1ea59f2ab9caf36dccbd7b5903ba xerces-2.3.0-r3.ebuild 1339
 RMD160 ba56af40d456739996348e77e61f5af5e130de0b xerces-2.3.0-r3.ebuild 1339
 SHA256 82f8ba6935422c33180745362ebaf1c4f64937b8ee50d0c55737fa32a6803b42 xerces-2.3.0-r3.ebuild 1339
-EBUILD xerces-2.6.2-r3.ebuild 1769 RMD160 f6b84d591d43d2d0535c633fd2cddd6215f648a5 SHA1 9123824a45eef720671472ee71ba7e764aa298c9 SHA256 5518ca53eb67d548fa24aa31d108d4667ca0d9012012f51e1ea413b79b12d4a0
-MD5 ebdb8369844b49964c1ffbd6fc1b55f4 xerces-2.6.2-r3.ebuild 1769
-RMD160 f6b84d591d43d2d0535c633fd2cddd6215f648a5 xerces-2.6.2-r3.ebuild 1769
-SHA256 5518ca53eb67d548fa24aa31d108d4667ca0d9012012f51e1ea413b79b12d4a0 xerces-2.6.2-r3.ebuild 1769
-EBUILD xerces-2.6.2-r4.ebuild 1546 RMD160 14ba71b8c9571e2269196726a4a0ee52a145c78f SHA1 65e129b32534804ef07538449f131416238fb93c SHA256 c0a36addbce80fc587ea51ffbb7e65494dbf3256cc5439a4a245a208b1c630e0
-MD5 46bdf6642de82fef450d7c98bbe91feb xerces-2.6.2-r4.ebuild 1546
-RMD160 14ba71b8c9571e2269196726a4a0ee52a145c78f xerces-2.6.2-r4.ebuild 1546
-SHA256 c0a36addbce80fc587ea51ffbb7e65494dbf3256cc5439a4a245a208b1c630e0 xerces-2.6.2-r4.ebuild 1546
 EBUILD xerces-2.8.1.ebuild 2073 RMD160 49f2ed5baa4b1ae4a7cef9841b2c807463f86bab SHA1 4ac21edda46e55801e50602608992feaec2b1b13 SHA256 a5641b45d1a9a1d78237e6b65d7ab8635d68142c1537b7a9fd20fca29282ab0e
 MD5 ecaf0a5cb684f169dd1ada8d9b42d21e xerces-2.8.1.ebuild 2073
 RMD160 49f2ed5baa4b1ae4a7cef9841b2c807463f86bab xerces-2.8.1.ebuild 2073
@@ -66,10 +49,10 @@ EBUILD xerces-2.9.0.ebuild 2080 RMD160 efe12f3a0207343794def76dc27254d6dbc2647c
 MD5 37a0d2089af080393fe3898b8d96e9ab xerces-2.9.0.ebuild 2080
 RMD160 efe12f3a0207343794def76dc27254d6dbc2647c xerces-2.9.0.ebuild 2080
 SHA256 b37cf3afd3b87c2006ce353992f78f1ade4f98c10433bc680192c00ad2250ea4 xerces-2.9.0.ebuild 2080
-MISC ChangeLog 14306 RMD160 d1f4cb4ebd7e89b34f1c702acbb1e16117b2b1b7 SHA1 1aa99ac5de36c32e7699555463026835ed08e59a SHA256 5b90f72123feb2e3223c73bd3d153c254d848aa3318b0e9653f43dd7f10fca29
-MD5 ee99641f1118912005d27c765c14a20c ChangeLog 14306
-RMD160 d1f4cb4ebd7e89b34f1c702acbb1e16117b2b1b7 ChangeLog 14306
-SHA256 5b90f72123feb2e3223c73bd3d153c254d848aa3318b0e9653f43dd7f10fca29 ChangeLog 14306
+MISC ChangeLog 14556 RMD160 f62bd939859710943c92bcf73d17fcfa2b31054c SHA1 b55f13ca48721e642b3fb35de77b05748a6411bd SHA256 938f65b85ff8c73d6dfcd87d5baa62df9ecf06fb984bca8a73a86965034296d6
+MD5 38c7cfc42fc08137923ac50892ac0bbd ChangeLog 14556
+RMD160 f62bd939859710943c92bcf73d17fcfa2b31054c ChangeLog 14556
+SHA256 938f65b85ff8c73d6dfcd87d5baa62df9ecf06fb984bca8a73a86965034296d6 ChangeLog 14556
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
@@ -83,12 +66,6 @@ SHA256 4e472a21ded1f02fc0d0724ec9e951824278d8a5c1d8816079f76a464ff05206 files/di
 MD5 5960db59d47c31deea3c4a33c31a5941 files/digest-xerces-2.3.0-r3 259
 RMD160 3537fd09130fff8b9afb70d7bdc592888195c254 files/digest-xerces-2.3.0-r3 259
 SHA256 4e472a21ded1f02fc0d0724ec9e951824278d8a5c1d8816079f76a464ff05206 files/digest-xerces-2.3.0-r3 259
-MD5 b6444943de6c0f764410ff84da0284a8 files/digest-xerces-2.6.2-r3 259
-RMD160 184f4090abaf2a0e6b4399865dfa50bbd2b96b3f files/digest-xerces-2.6.2-r3 259
-SHA256 e76769e658262c8b45d4bc91feab072ff6570843ab66516cab7ca75d62431206 files/digest-xerces-2.6.2-r3 259
-MD5 b6444943de6c0f764410ff84da0284a8 files/digest-xerces-2.6.2-r4 259
-RMD160 184f4090abaf2a0e6b4399865dfa50bbd2b96b3f files/digest-xerces-2.6.2-r4 259
-SHA256 e76769e658262c8b45d4bc91feab072ff6570843ab66516cab7ca75d62431206 files/digest-xerces-2.6.2-r4 259
 MD5 4314ac356413293ff84decf6ae37947e files/digest-xerces-2.8.1 259
 RMD160 d3a1b41db1bc2892464bbef941e7ea458fac0cef files/digest-xerces-2.8.1 259
 SHA256 98fd7d713b06c5a3405d27b58595c40afdd17e609f7cb8b89d4d39a0646201f4 files/digest-xerces-2.8.1 259
@@ -98,7 +75,7 @@ SHA256 aa1fd6c8a9f5c199ad36ec347fc10294ef0590f78167958968ee07bafdf304a8 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHKR+EcxLzpIGCsLQRAsBPAJ4pzoDZjuU4hEUWF35se5wK79SrwwCfS/Yj
-kv6d/K4FfSAgljpbJOJ3km8=
-=/QUs
+iD8DBQFHO5x6cxLzpIGCsLQRAmgfAJ9LXiYuqrHlkMDhRlMW2/p3T0V+gACffOOf
+hDNEDHXjIgoMDmncn4SEVYE=
+=waOH
 -----END PGP SIGNATURE-----
diff --git a/dev-java/xerces/files/digest-xerces-2.6.2-r3 b/dev-java/xerces/files/digest-xerces-2.6.2-r3
deleted file mode 100644
index 28cc542a7a3e..000000000000
--- a/dev-java/xerces/files/digest-xerces-2.6.2-r3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 cfd536b8d72f8ebe3465ae35f5e3775d Xerces-J-src.2.6.2.tar.gz 1612086
-RMD160 e5d9a7e933403413bd8e718e1342846548f2a29e Xerces-J-src.2.6.2.tar.gz 1612086
-SHA256 7e2167b9b7faf367aedacc1c6eddacb8c54dc506edc63844b6cbc661ce0f7e52 Xerces-J-src.2.6.2.tar.gz 1612086
diff --git a/dev-java/xerces/files/digest-xerces-2.6.2-r4 b/dev-java/xerces/files/digest-xerces-2.6.2-r4
deleted file mode 100644
index 28cc542a7a3e..000000000000
--- a/dev-java/xerces/files/digest-xerces-2.6.2-r4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 cfd536b8d72f8ebe3465ae35f5e3775d Xerces-J-src.2.6.2.tar.gz 1612086
-RMD160 e5d9a7e933403413bd8e718e1342846548f2a29e Xerces-J-src.2.6.2.tar.gz 1612086
-SHA256 7e2167b9b7faf367aedacc1c6eddacb8c54dc506edc63844b6cbc661ce0f7e52 Xerces-J-src.2.6.2.tar.gz 1612086
diff --git a/dev-java/xerces/files/xerces-2.6.2-gentoo.patch b/dev-java/xerces/files/xerces-2.6.2-gentoo.patch
deleted file mode 100644
index 61445ea6fe88..000000000000
--- a/dev-java/xerces/files/xerces-2.6.2-gentoo.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -urpN xerces-2_6_2.old/build.xml xerces-2_6_2/build.xml
---- xerces-2_6_2.old/build.xml	2004-02-20 19:58:14.000000000 +0100
-+++ xerces-2_6_2/build.xml	2005-01-15 14:41:08.603978904 +0100
-@@ -190,7 +190,7 @@ Copyright:
-         </fileset>
-     </copy>
- 
--    <!-- now deal with API's:  -->
-+    <!-- now deal with API's:  
-     <unzip src="${src.apis.zip}" dest="${build.src}">
-         <patternset
-             includes="org/xml/sax/** 
-@@ -202,7 +202,7 @@ Copyright:
-                 org/w3c/dom/traversal/**"
-         />
-     </unzip>
--    
-+    -->
-     <!-- substitute tokens as needed -->
-     <replace file="${build.dir}/src/org/apache/xerces/impl/Version.java" 
-              token="@@VERSION@@" value="${parser.Name} ${parser.Version}"/>
diff --git a/dev-java/xerces/files/xerces-2.6.2-javadoc.patch b/dev-java/xerces/files/xerces-2.6.2-javadoc.patch
deleted file mode 100644
index d46d0cebd400..000000000000
--- a/dev-java/xerces/files/xerces-2.6.2-javadoc.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- build.xml.orig	2005-03-22 00:07:10.000000000 +0100
-+++ build.xml	2005-03-22 00:35:19.392906216 +0100
-@@ -422,6 +422,14 @@
-       windowtitle='Other Classes' doctitle='Other Classes'
-       bottom='${copyright}'
-       />
-+    
-+    <javadoc packagenames='org.*'
-+      locale='en_US'
-+      sourcepath='${src.dir}/dom3' destdir='${build.dir}/docs/javadocs/api'
-+      author='true' version='true'
-+      windowtitle='Other Classes' doctitle='Other Classes'
-+      bottom='${copyright}'
-+      />
-   </target>
- 
-   <!-- =================================================================== -->
diff --git a/dev-java/xerces/xerces-2.6.2-r3.ebuild b/dev-java/xerces/xerces-2.6.2-r3.ebuild
deleted file mode 100644
index c8a4b9701df8..000000000000
--- a/dev-java/xerces/xerces-2.6.2-r3.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xerces/xerces-2.6.2-r3.ebuild,v 1.1 2006/11/30 22:26:58 caster Exp $
-
-inherit java-pkg eutils
-
-DESCRIPTION="The next generation of high performance, fully compliant XML parsers in the Apache Xerces family"
-HOMEPAGE="http://xml.apache.org/xerces2-j/index.html"
-SRC_URI="http://archive.apache.org/dist/xml/xerces-j/Xerces-J-src.${PV}.tar.gz"
-
-LICENSE="Apache-1.1"
-SLOT="2.6"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="doc jikes examples source"
-
-CDEPEND=">=dev-java/xml-commons-1.0_beta2
-	>=dev-java/xml-commons-resolver-1.1
-	>=dev-java/xjavac-20041208"
-RDEPEND=">=virtual/jre-1.4
-	${CDEPEND}"
-DEPEND=">=virtual/jdk-1.4
-	>=dev-java/ant-core-1.5.2
-	jikes? ( >=dev-java/jikes-1.21 )
-	source? ( app-arch/zip )
-	${CDEPEND}"
-
-S=${WORKDIR}/xerces-${PV//./_}
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	epatch ${FILESDIR}/${P}-gentoo.patch
-	epatch ${FILESDIR}/${P}-javadoc.patch
-
-	mkdir tools && cd tools
-	rm -f *.jar
-	java-pkg_jar-from xml-commons xml-apis.jar
-	java-pkg_jar-from xml-commons-resolver xml-commons-resolver.jar resolver.jar
-
-	mkdir ${S}/tools/bin
-	cd ${S}/tools/bin
-	java-pkg_jar-from xjavac-1
-}
-
-src_compile() {
-	local antflags="jars sampjar"
-	use doc && antflags="${antflags} javadocs"
-	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
-	ant ${antflags} || die "Compile failed."
-}
-
-src_install() {
-	java-pkg_dojar build/xercesImpl.jar
-
-	dodoc TODO STATUS README ISSUES
-	java-pkg_dohtml Readme.html
-
-	use doc && java-pkg_dohtml -r build/docs/javadocs
-	if use examples; then
-		dodir /usr/share/doc/${PF}/examples
-		cp -r samples/* ${D}/usr/share/doc/${PF}/examples
-	fi
-	use source && java-pkg_dosrc ${S}/src/*
-}
diff --git a/dev-java/xerces/xerces-2.6.2-r4.ebuild b/dev-java/xerces/xerces-2.6.2-r4.ebuild
deleted file mode 100644
index 967f7d32f832..000000000000
--- a/dev-java/xerces/xerces-2.6.2-r4.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xerces/xerces-2.6.2-r4.ebuild,v 1.5 2007/07/30 00:44:05 tgall Exp $
-
-WANT_SPLIT_ANT=true
-JAVA_PKG_IUSE="doc examples source"
-inherit java-pkg-2 java-ant-2 eutils
-
-DESCRIPTION="The next generation of high performance, fully compliant XML parsers in the Apache Xerces family"
-HOMEPAGE="http://xml.apache.org/xerces2-j/index.html"
-SRC_URI="http://archive.apache.org/dist/xml/xerces-j/Xerces-J-src.${PV}.tar.gz"
-
-LICENSE="Apache-1.1"
-SLOT="2.6"
-KEYWORDS="amd64 ~ppc ppc64 x86"
-IUSE=""
-
-CDEPEND=">=dev-java/xml-commons-1.0_beta2
-	>=dev-java/xml-commons-resolver-1.1"
-RDEPEND=">=virtual/jre-1.4
-	${CDEPEND}"
-DEPEND=">=virtual/jdk-1.4
-	>=dev-java/xjavac-20041208
-	${CDEPEND}"
-
-S="${WORKDIR}/xerces-${PV//./_}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${P}-gentoo.patch"
-	epatch "${FILESDIR}/${P}-javadoc.patch"
-
-	mkdir tools && cd tools
-	rm -f *.jar
-	java-pkg_jar-from xml-commons xml-apis.jar
-	java-pkg_jar-from xml-commons-resolver xml-commons-resolver.jar resolver.jar
-}
-
-src_compile() {
-	ANT_TASKS="xjavac-1" eant jar $(use_doc javadocs)
-}
-
-src_install() {
-	java-pkg_dojar build/xercesImpl.jar
-
-	dodoc TODO STATUS README ISSUES
-	java-pkg_dohtml Readme.html
-
-	use doc && java-pkg_dojavadoc build/docs/javadocs
-	if use examples; then
-		dodir "/usr/share/doc/${PF}/examples"
-		cp -r samples/* "${D}/usr/share/doc/${PF}/examples"
-	fi
-	use source && java-pkg_dosrc "${S}/src/org"
-}