Restore previous ebuild and create a revbump instead.

Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x93491BB8

4 files changed, 63 insertions, 26 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/Manifest b/dev-java/jsr250/Manifest
index ee28bcc33c6e..9ea1071ac980 100644
--- a/dev-java/jsr250/Manifest
+++ b/dev-java/jsr250/Manifest
@@ -1,18 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+DIST JAXWS2.0.1m1_source_20060817.jar 8993405 SHA256 9725cfb91cecff833055d7af45c3413ca9d1a818a4cfdb86211ed82f383f3865 SHA512 55454a8270310b9778c69aad8b8ace45dc4ba3059b33ac48dcfd5d771fade2d6e4c46a5a65a522ae5cca0438f159ba84c90d8e74d54731a9c6c0caa9d84a0314 WHIRLPOOL fe0727935c592b538b7042808fffa987ea5ae47554367ea0cfc91f65d765bd234713aaa142b2297988d74eec01fce9cd4bedceb0fb7b0068eb38084a1d5f5ba7
 DIST jsr250-api-1.0-sources.jar 7680 SHA256 d1c22846dcbb8e69d64e074d2017819e129afa6c4c7e6221d8c078fb7c22fb08 SHA512 3a652db6f78fd74e6256a602ea75d1b3e50fd68aee658e2b8569196710427e00b61c85786a79c094f3820856dd05dbd37cd6afd28b666a7bb1b0805812fa4d63 WHIRLPOOL f8e99af6e6893050480be067a56a0860a092d8894e4f73dddd34ab518b0b9d919267abdb989cbd19b160e2e50237759207e1793615e6919b9aee2042c6b86f7f
-EBUILD jsr250-1.0.ebuild 733 SHA256 a68c8d1e55a979c77adb8e49b9c4cda4c783689fc12cc5a1666fcbd035aa6788 SHA512 213b14e0a74a566a452d5ef87fb1e5480ab3ce047fc9b2b8ca19bc373b2d19e834710bb10b1343edc571c47b3c0c3a56a2e5fae6d5b4793ffae324e06599d242 WHIRLPOOL 2aa13e0b7db0d30bc5302373f4cf15c8034d09af69dcc7d1f8c78d32541c677baaa8f5c61c3ec9719c31ebf555b0eea0e451404b36aef3b4726c16280f135299
-MISC ChangeLog 1344 SHA256 fede2c2b6e2d273a99fea8370c422687897958138f96f10488634af647bf6d92 SHA512 360e6da7a125df4bfb7e3560c556feb90a3a228662b1691dc7638b9afdebf3d256c94f969e098fc0a3c26b81baa6760cb00b3068eb9741ec0ddf5f60c2e4bf0b WHIRLPOOL f1e046e65c16e59596c191c4b1e25de3dd6fb115ce863521e0503ce90dc92af1eb5910c08cc6a37f9aa76e4db59daf5bbe6ae6029e8f1a3bc1cbe29fd6898be4
+EBUILD jsr250-1.0-r1.ebuild 599 SHA256 78db4a84669aab51e405a89e5b85e45957873832513de2f3beec01b5e9a35aed SHA512 1f06588dc58693f8050cf1cd9c2145b6313ce916f9dfbc01aaf889933db401483723c0a604b7f2079a3e7cce9519f3fb4842ec5403177727be2de99dfcd8086c WHIRLPOOL da52d36c35400e81b635fad5e006688dbfe02a536ef293dfbe00afdb29febbd358b6c1e41efa52803ff79509ea965867fdb0bbc2d0f23656016137d98f396513
+EBUILD jsr250-1.0.ebuild 833 SHA256 f3b611086f96401401f24797f42810ec37d8553d7591b4b79595946db3dcca7e SHA512 a554476a56071377a7cff730cdcc7029271a5dd3191d7bfdae21032a29e57e2d83339563bb56848579de13b4275ce6c55e0ce723869e9394a1b3c7739eaaf945 WHIRLPOOL c97fbfa26bc30849a057a90f79ddc014e326e6073b94e845542fe0d008e241cf5f47b98b9f2dd45565c8d08a7a9f15c909b2373705f77a1171f29900174f630d
+MISC ChangeLog 1529 SHA256 ea232b52ce55d0a9be10fe4c97b50add61eb70ccb9ca8ffcbad8a334a52edc24 SHA512 2107aefe48562cf19da8a8356619d2f54b1748b7a5d02e0442672d8d82875a6ea08c441105f6fdb81ad44cc07b4fda380b6d5d271d7f8b422fabddd8601f04d5 WHIRLPOOL 8c85b341010c3bd035bf00bc9b7a586c5f34bb32f11ab4eb1e9d82fdd84400622218b75f2e13f1bb3d014e85ba6073945c321f4bae4faf2cafd6e5e417a5439b
 MISC metadata.xml 159 SHA256 a4ced33e98b00e3a3f725c4c40ef8e76c338db53389465ef871105fbe6e8cbbb SHA512 74dc9ada199a90543b8e1c168c7054f2e973fbfa2551e2b959d67501f2538e269cfb4b2f0905a88a1afa04c20b33961336310ba876f80d47c8e7615b2d7c830a WHIRLPOOL a0ac49efeca233ec4d8f63eb69c8e46e1d4ecbd926693c25b1b8c7415e4c565680936aec46f0c4197116fd7a19a3bb571beee493c18bdae1e5e978e3db84f17a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJVehqmAAoJEJGRpfGTSRu4pjQH/3mIoutYaW61g67hafI4CF9l
-FJ3g59Ylu021G5B7F/0TC8jZyvg24EM0LtLhzD2SJDRfA5yUHsqfsLKpnF0vpaVh
-bYltRqM1uG3tw145avGyJQ/3lGVq3CT7Gu4AcSnxi0KupTpOeLjJLvFlZ0BmUD6b
-RvaXA7FjfQswuMWBt+trrAjxy54aAP3k6etvYShlQCrJq5jUjHTu460nc1tAydIU
-NoHcJGJD8n8eR6vDRgys3KkXAbeaiRsPN3WjiOpwyNiv0roz/qPzenW57j7WKeEa
-xaaita0TiXwljzRXuUGWT/hMpxlKfFBx2LE5hV7X/WtbmWQSSWuUNUC0FcTi/Us=
-=jTab
+iQEcBAEBCAAGBQJVetzyAAoJEJGRpfGTSRu46EUIALkT4QPnzEu7/2VResdrDZ5y
+ZYH8eviIawd0QWXHIrHeM9Cn2VvSiaRMHgTxW7KHPk1dL4uz3WM9ozMNqYy6m5RY
+xNyQ++sbcNoZx0ngk4oC3KQ3HdzDTCok8EKsofhAxUSx+fcNBD8LNJ7kcRR/3nQb
+X3Z+3Jm6fR06x1pCAoK8ltUDYAAKSLOvyDnq/uStfAMe2VtvBKv2VDPXGN1qowIA
+dSQjQoCVtZL3GtdP7ylO+McKOwGguayi5WXkMYz1bcTQWhRxOuiCcxPU/zVshHRa
+EqlBH1/6FfGgFeMO+4vdZjp9wBHmV5y+3ii1HWlLtHkOsiH+6/2ILudOVJwOj/E=
+=2qQo
 -----END PGP SIGNATURE-----
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
 }