Set minimum version for xjavac to build with jdk7, remove vulnarable.

(Portage version: 2.1.10.65/cvs/Linux x86_64)

3 files changed, 7 insertions, 63 deletions

diff --git a/dev-java/xerces/ChangeLog b/dev-java/xerces/ChangeLog
index fd253819b029..8a5e6d04b3d7 100644
--- a/dev-java/xerces/ChangeLog
+++ b/dev-java/xerces/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/xerces
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xerces/ChangeLog,v 1.122 2012/06/14 01:30:47 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xerces/ChangeLog,v 1.123 2012/06/28 21:13:10 sera Exp $
+
+  28 Jun 2012; Ralph Sennhauser <sera@gentoo.org> -xerces-2.9.1.ebuild,
+  xerces-2.11.0.ebuild:
+  Set minimum version for xjavac to build with jdk7, remove vulnarable.
 
   14 Jun 2012; Michael Weber <xmw@gentoo.org> xerces-2.11.0.ebuild:
   ppc stable (bug 280611)
diff --git a/dev-java/xerces/xerces-2.11.0.ebuild b/dev-java/xerces/xerces-2.11.0.ebuild
index d93bba5e94d1..ac996fdf5c65 100644
--- a/dev-java/xerces/xerces-2.11.0.ebuild
+++ b/dev-java/xerces/xerces-2.11.0.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/dev-java/xerces/xerces-2.11.0.ebuild,v 1.5 2012/06/14 01:30:47 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xerces/xerces-2.11.0.ebuild,v 1.6 2012/06/28 21:13:10 sera Exp $
 
 EAPI=4
 
@@ -29,7 +29,7 @@ RDEPEND="${COMMON_DEP}
 	>=virtual/jre-1.4"
 DEPEND="${COMMON_DEP}
 	>=virtual/jdk-1.4
-	dev-java/xjavac:1"
+	>=dev-java/xjavac-20110814:1"
 
 S="${WORKDIR}/${PN}-${SRC_PV}"
 
diff --git a/dev-java/xerces/xerces-2.9.1.ebuild b/dev-java/xerces/xerces-2.9.1.ebuild
deleted file mode 100644
index 61f2d3d5b961..000000000000
--- a/dev-java/xerces/xerces-2.9.1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xerces/xerces-2.9.1.ebuild,v 1.12 2012/04/15 18:14:03 vapier Exp $
-
-EAPI=1
-JAVA_PKG_IUSE="doc examples source"
-
-inherit eutils versionator java-pkg-2 java-ant-2
-
-DIST_PN="Xerces-J"
-SRC_PV="$(replace_all_version_separators _ )"
-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="mirror://apache/${PN}/j/${DIST_PN}-src.${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="amd64 ~ia64 ppc ppc64 x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-COMMON_DEP="dev-java/xml-commons-external:1.3
-	>=dev-java/xml-commons-resolver-1.2
-	dev-java/xalan-serializer"
-RDEPEND=">=virtual/jre-1.4
-	${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.4
-	>=dev-java/xjavac-20041208-r4
-	${COMMON_DEP}"
-
-S="${WORKDIR}/${PN}-${SRC_PV}"
-
-# they are missing from the upstream tarball"
-RESTRICT="test"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${P}-gentoo.patch"
-	epatch "${FILESDIR}/${P}-no_dom3.patch"
-	java-ant_rewrite-classpath
-}
-
-# known small bug - javadocs use custom taglets, which come as bundled jar in xerces-J-tools.2.8.0.tar.gz
-# ommiting them causes non-fatal errors in javadocs generation
-# need to either find the taglets source, use the bundled jars as it's only compile-time or remove the taglet defs from build.xml
-EANT_ANT_TASKS="xjavac-1"
-EANT_GENTOO_CLASSPATH="xml-commons-resolver,xml-commons-external-1.3,xalan-serializer"
-EANT_DOC_TARGET="javadocs"
-
-src_install() {
-	java-pkg_dojar build/xercesImpl.jar
-
-	dodoc README NOTICE || die
-	dohtml Readme.html || die
-
-	use doc && java-pkg_dojavadoc build/docs/javadocs/xerces2
-	use examples && java-pkg_doexamples samples
-	use source && java-pkg_dosrc "${S}/src/org"
-}