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

Package-Manager: portage-2.1.10.65/cvs/Linux x86_64

4 files changed, 17 insertions, 71 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/Manifest b/dev-java/xerces/Manifest
index 9c7659f5835c..d7bc1b329c54 100644
--- a/dev-java/xerces/Manifest
+++ b/dev-java/xerces/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX xerces-1.3.1-build.xml 1680 RMD160 6249a86790607a2ad86f30f5d2ab56135d64b5df SHA1 ece88a158dce9c0d3ae5402c6eb3cb85dc0e20c0 SHA256 1b4fbf0fc170e94edd8cae86df89f5945192e0733a833c954b9681c9eada5f2d
 AUX xerces-2.11.0-build.xml.patch 1685 RMD160 4c95ffa17d3622088de56ddf81fcf0e13bc86d84 SHA1 27bf39178591ed09a152da0dcd4639ca14e32171 SHA256 2e9232cb69a47c2f5cdf3220f0a04e554d22312c1eeab875e0467a63fa4ec45e
@@ -10,16 +10,18 @@ AUX xerces-2.9.1-gentoo.patch 750 RMD160 350cdf7d88a9469b1311e1d270d799468b49cde
 AUX xerces-2.9.1-no_dom3.patch 848 RMD160 53f5838a0c0c28d9bdf247f5e36244ca40301ed1 SHA1 332d888d08b1c094d443433af4dd829497167bb6 SHA256 9ce16bd4bdb033fc0b7de52c3fb5d57fed3d4d033663e5d47e2f7d9512c4966a
 DIST Xerces-J-src.1.3.1.tar.gz 900263 RMD160 31512c5331f00599ae117c4f5e61767844e556fc SHA1 3a856e2b5ca45cf1fff32aaace6749030bb1e6b0 SHA256 d59f57ef4ec540f75b4b79aeef20e85ccb4f2c3b516dc995f1fc88f526f5f1e1
 DIST Xerces-J-src.2.11.0.tar.gz 1792762 RMD160 5ae4b52c2907e560aed36cdb146140fd4db05875 SHA1 c57f0251ce9246c6026aa9f92241f37108f7141f SHA256 f59a5ef7b51bd883f2e9bda37a9360692e6c5e439b98d9b6ac1953e1f98b0680
-DIST Xerces-J-src.2.9.1.tar.gz 1711507 RMD160 20bc600ce07fdcf82483e1992dada5ba40c80ff8 SHA1 78786a120c10b3d7079384cecbd2860260e47445 SHA256 13af0062a72a4a0d541ca5336391eafa4d580258cacf4a5e062ea584ca950592
 EBUILD xerces-1.3.1-r2.ebuild 1018 RMD160 8ca2903bf48df515556c2b27a628e42df1042f03 SHA1 3e1269976eb3b2e2401040cf41df474c091efdfc SHA256 de3518276619772aff1ee2474968d7d96e37314c4226189d3dc58643e150610e
-EBUILD xerces-2.11.0.ebuild 1803 RMD160 0ce9adfcaa389a8d48a1831a1378d0ff1dc5f0f1 SHA1 f6b5dab0effda8d37b03e39f8e46d9951e5b46fa SHA256 be79758741fcc9014b5be9668ccbddb144614b7fc906721e9fd86b5753852393
-EBUILD xerces-2.9.1.ebuild 2009 RMD160 65f923798453f80ec5b7dc5a76a577b4b8d7bfe3 SHA1 89d21b8179027ab356ce250908978d64df2fb780 SHA256 b980bc39f081b95d1410081e7c72c9f8200330de86688de4848b1bf665a26a1c
-MISC ChangeLog 18288 RMD160 f55dc2705d708151508d6a1b237f716414f469df SHA1 2a197b950c92eb9ecd4c0d56f85c3faa2654398d SHA256 9baed7f6c4e1a984b6403d3c6558a36a258b98e2f08f817f4c022660e9132d7c
+EBUILD xerces-2.11.0.ebuild 1815 RMD160 2815578f1dcc5a13f1df66fc5c0a59fae647e3bd SHA1 8e08f96bba7b24f6ac90a5bf8affe23a14c5d60a SHA256 57d11632856fe66ff76633f130287e6f96c8dfb157b08bc3115bbf6185db645f
+MISC ChangeLog 18458 RMD160 c00c1b5790d5963270872c5c7f28b54864d86b6c SHA1 afdaeeec2db5ae18865f597dfb5d6bf6861769ab SHA256 da639e784abd41ecfe5878eb7fcf63598d55211a4eb5fecd8bc52f91f90c2e01
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk/ZPqcACgkQknrdDGLu8JCnpgEAjG0XoUrBOM+6HV9Y1UZEKHgI
-6fYWopkryTmIV72MDTcA/12M++22xEu4DVREgHSr70lnvpLq7pzpCkwgJ0Qc/mrJ
-=L1ER
+iQEcBAEBAgAGBQJP7Mj4AAoJEIUJ+svaV163gvkH/1t3JSNX7xO353ulbrhzEDw5
+D6jje6MxxkXc2jrbrKEyZkHjy+/ecmdxaCmNTZfm5o1amJPMzygPvUa0+d3uYABw
+txzhuzxI/2hnQUsSUkHSQdatI/UwQghZbpWU5lEyNBV6Low7X3PUKLMU3v/NMJzT
+4lWIw/gglMmhbln4GVm1QZm+t+VPthwFTJIvhO8Qfsg7GH1DjUNRZFGMB3PeiZhj
+mufHqF2iVcFRL3mLWMryVH5e9sW4z/3Q/y7LaTtqclV1c7RzYN2jo9f0aCQCw/OG
+tB5ZHsZ0JC3XLeMLf7KO5na1vQutXLZ4Z+MGNayNb9aPXJpNILbRKdoj8jRb4uU=
+=bGGw
 -----END PGP SIGNATURE-----
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"
-}