3 files changed, 16 insertions, 85 deletions
diff --git a/dev-java/jaxb/ChangeLog b/dev-java/jaxb/ChangeLog
index 029a5e760cd2..0deefed5e806 100644
--- a/dev-java/jaxb/ChangeLog
+++ b/dev-java/jaxb/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/jaxb
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jaxb/ChangeLog,v 1.9 2008/10/25 17:09:34 nixnut Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jaxb/ChangeLog,v 1.10 2009/06/23 15:49:30 betelgeuse Exp $
+
+  23 Jun 2009; Petteri Räty <betelgeuse@gentoo.org> -jaxb-2.1.2.ebuild:
+  Remove old revision.
 
   25 Oct 2008; nixnut <nixnut@gentoo.org> jaxb-2.1.2-r1.ebuild:
   Stable on ppc wrt bug 243130
diff --git a/dev-java/jaxb/Manifest b/dev-java/jaxb/Manifest
index 70422b3fdbd9..3a7f7e370384 100644
--- a/dev-java/jaxb/Manifest
+++ b/dev-java/jaxb/Manifest
@@ -1,6 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX build.xml-2.1.2 766 RMD160 307753161f07e7270e688d5871ee9e5811f53926 SHA1 75dd3188d64a3ffdf8ea2b34d6250402c0efc677 SHA256 0143f05f454e3267a4b721bb4f8bce02a2dd28c4c91bc33a74396269099020be
 DIST JAXB2_src_20070125.jar 3089194 RMD160 250d652434912ded3019ba645acfd9cdac21daa3 SHA1 084859789656bf65b9042cd6959bf694b55d65f0 SHA256 26bec14fa220b111b7153f9889926b86a9cdc8a73aa2541149dadd7d7151afa1
 EBUILD jaxb-2.1.2-r1.ebuild 1620 RMD160 4a8591db4658bd9ccd5cd97183a01de221c11d20 SHA1 f0c4f77f041ec35a23b948f44172990d0bd363c6 SHA256 08b2bc9deb5c4a8e840613afb606aa648955b419d56973f1c393e7383fd34a5f
-EBUILD jaxb-2.1.2.ebuild 1956 RMD160 69589430a24eb5ff0a1ee25b0943ca6c05905860 SHA1 bc0b6b3532799f29f5fe7bda41b437bbe2611a91 SHA256 9f891921378aa716f35ddf3db79f40edc3673c59ae3c09f7c9f5e52df5e1faf5
-MISC ChangeLog 1229 RMD160 25faf339bdc006a92300e3aa5a596df9272ce452 SHA1 ae387e722c9a7ceb4bccd499b03e4de5c4a0319a SHA256 4091c130d69ac07690ccbafbefe39b456befa7db301387ac6ca3cf1866f97d1e
+MISC ChangeLog 1331 RMD160 f56f26df4f885179f1e0088d29fa4417a2968eaa SHA1 e44a018ade083b7a251e84089ee83c0c3c950f1f SHA256 1a40d77bd3f586ec7e75f7492a943fd8ef7ed067f009685a8a3d736fe86b0bf5
 MISC metadata.xml 159 RMD160 7da5c733c224383ffe350605bc36721a3ff2536f SHA1 99c2655c7bbee2cbc8c79edb2d00d481d62faf95 SHA256 a4ced33e98b00e3a3f725c4c40ef8e76c338db53389465ef871105fbe6e8cbbb
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkpA+YYACgkQcxLzpIGCsLSUZACgkgRT+z5Ob8apGXTKywZV3YuM
+TywAoI1Gq5FtluxmmzXtO0qE8dkB20LG
+=8JpN
+-----END PGP SIGNATURE-----
diff --git a/dev-java/jaxb/jaxb-2.1.2.ebuild b/dev-java/jaxb/jaxb-2.1.2.ebuild
deleted file mode 100644
index 7ba95058253e..000000000000
--- a/dev-java/jaxb/jaxb-2.1.2.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jaxb/jaxb-2.1.2.ebuild,v 1.5 2008/03/28 18:10:49 nixnut Exp $
-
-JAVA_PKG_IUSE="source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Reference implementation of the JAXB specification."
-HOMEPAGE="http://jaxb.dev.java.net/"
-DATE="20070125"
-MY_P="JAXB2_src_${DATE}"
-SRC_URI="https://jaxb.dev.java.net/${PV}/${MY_P}.jar"
-
-LICENSE="CDDL"
-SLOT="2"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd"
-IUSE=""
-
-COMMON_DEP="dev-java/iso-relax
-	dev-java/istack-commons-runtime
-	dev-java/jsr173
-	dev-java/msv
-	dev-java/relaxng-datatype
-	dev-java/rngom
-	dev-java/sun-jaf
-	dev-java/txw2-runtime
-	dev-java/xml-commons-resolver
-	dev-java/xsdlib
-	dev-java/xsom"
-DEPEND=">=virtual/jdk-1.5
-	app-arch/unzip
-	${COMMON_DEP}"
-RDEPEND=">=virtual/jre-1.5
-	${COMMON_DEP}"
-
-S="${WORKDIR}/jaxb-ri-${DATE}"
-
-src_unpack() {
-	echo "A" | java -jar "${DISTDIR}/${A}" -console > /dev/null || die "unpack failed"
-
-	# Source is missing Messages.properties, copy it from binary version:
-	cd "${T}"
-	unzip -qq "${S}/lib/jaxb-api.jar"
-	for mp in $(find javax -name '*.properties'); do
-		mv "${mp}" "${S}/src/${mp}" || die
-	done
-
-	cd "${S}/lib"
-	rm -v *.jar || die
-
-	java-pkg_jarfrom --build-only ant-core
-	java-pkg_jarfrom iso-relax
-	java-pkg_jarfrom istack-commons-runtime
-	java-pkg_jarfrom jsr173
-	java-pkg_jarfrom msv
-	java-pkg_jarfrom relaxng-datatype
-	java-pkg_jarfrom rngom
-	java-pkg_jarfrom sun-jaf
-	java-pkg_jarfrom txw2-runtime
-	java-pkg_jarfrom xml-commons-resolver
-	java-pkg_jarfrom xsdlib
-	java-pkg_jarfrom xsom
-	ln -s $(java-config --tools) || die
-
-	cd "${S}/src/com/sun/"
-	rm -rf codemodel # in dev-java/codemodel
-	rm -rf tools # in dev-java/jaxb-tools
-
-	cp -v "${FILESDIR}/build.xml-${PV}" "${S}/build.xml" || die "cp failed"
-
-}
-
-src_install() {
-
-	java-pkg_dojar jaxb-api.jar
-	java-pkg_dojar jaxb-impl.jar
-
-	use source && java-pkg_dosrc src/*
-
-}