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

(Portage version: 2.1.3.19)

7 files changed, 6 insertions, 167 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/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"
-}