Restore previous ebuild and create a revbump instead.

Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 93491BB8)

3 files changed, 52 insertions, 17 deletions

diff --git a/dev-java/jsr250/ChangeLog b/dev-java/jsr250/ChangeLog
index 70635a486f23..e53506abf426 100644
--- a/dev-java/jsr250/ChangeLog
+++ b/dev-java/jsr250/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/jsr250
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jsr250/ChangeLog,v 1.10 2015/06/11 23:35:09 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jsr250/ChangeLog,v 1.11 2015/06/12 13:24:10 monsieurp Exp $
+
+*jsr250-1.0-r1 (12 Jun 2015)
+
+  12 Jun 2015; Patrice Clement <monsieurp@gentoo.org> +jsr250-1.0-r1.ebuild,
+  jsr250-1.0.ebuild:
+  Restore previous ebuild and create a revbump instead.
 
   11 Jun 2015; Patrice Clement <monsieurp@gentoo.org> jsr250-1.0.ebuild:
   Rewrote package from scratch. Fix bug 428340.
diff --git a/dev-java/jsr250/jsr250-1.0-r1.ebuild b/dev-java/jsr250/jsr250-1.0-r1.ebuild
new file mode 100644
index 000000000000..37fd8c963538
--- /dev/null
+++ b/dev-java/jsr250/jsr250-1.0-r1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jsr250/jsr250-1.0-r1.ebuild,v 1.1 2015/06/12 13:24:10 monsieurp Exp $
+
+EAPI=5
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="JSR 250 Common Annotations"
+HOMEPAGE="https://jcp.org/en/jsr/detail?id=250"
+SRC_URI="http://download.java.net/maven/2/javax/annotation/${PN}-api/${PV}/${PN}-api-${PV}-sources.jar"
+
+LICENSE="CDDL"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.6"
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip"
diff --git a/dev-java/jsr250/jsr250-1.0.ebuild b/dev-java/jsr250/jsr250-1.0.ebuild
index e4957f334775..c0c8105a7941 100644
--- a/dev-java/jsr250/jsr250-1.0.ebuild
+++ b/dev-java/jsr250/jsr250-1.0.ebuild
@@ -1,30 +1,39 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jsr250/jsr250-1.0.ebuild,v 1.9 2015/06/11 23:35:09 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jsr250/jsr250-1.0.ebuild,v 1.10 2015/06/12 13:24:10 monsieurp Exp $
 
-EAPI=5
-
-inherit eutils java-pkg-2 java-pkg-simple
+inherit java-pkg-2 java-ant-2
 
 DESCRIPTION="JSR 250 Common Annotations"
-HOMEPAGE="https://jcp.org/en/jsr/detail?id=250"
-SRC_URI="http://download.java.net/maven/2/javax/annotation/${PN}-api/${PV}/${PN}-api-${PV}-sources.jar"
+HOMEPAGE="http://jax-ws.dev.java.net/"
+DATE="20060817"
+MY_P="JAXWS2.0.1m1_source_${DATE}.jar"
+SRC_URI="https://jax-ws.dev.java.net/jax-ws-201-m1/${MY_P}"
 
 LICENSE="CDDL"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="amd64 ppc x86 ~x86-fbsd"
 IUSE=""
 
-RDEPEND=">=virtual/jre-1.6"
-DEPEND=">=virtual/jdk-1.6
-	app-arch/unzip
+RDEPEND=">=virtual/jre-1.5"
+DEPEND="app-arch/unzip
 	${RDEPEND}"
 
-JAVA_PKG_WANT_SOURCE="1.7"
-JAVA_PKG_WANT_TARGET="1.7"
-JAVA_SRC_DIR="src"
+S="${WORKDIR}/jaxws-si"
+
+src_unpack() {
+	echo "A" | java -jar "${DISTDIR}/${A}" -console > /dev/null || die "unpack failed"
+
+	unpack ./jaxws-src.zip || die "unzip failed"
+
+}
+
+src_compile() {
+	:
+}
+
+src_install() {
+
+	java-pkg_newjar lib/jsr250-api.jar
 
-java_prepare() {
-	mkdir src || die
-	mv * src
 }