amd64/x86 stable wrt bug #551536; Drop old.

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xC42EB5D6

4 files changed, 14 insertions, 56 deletions

diff --git a/dev-java/jsr101/ChangeLog b/dev-java/jsr101/ChangeLog
index 25258cd7ce80..c54644f007a6 100644
--- a/dev-java/jsr101/ChangeLog
+++ b/dev-java/jsr101/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/jsr101
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jsr101/ChangeLog,v 1.12 2015/06/09 08:59:41 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jsr101/ChangeLog,v 1.13 2015/06/13 09:44:33 zlogene Exp $
+
+  13 Jun 2015; Mikle Kolyada <zlogene@gentoo.org> -jsr101-1.4-r1.ebuild,
+  jsr101-1.4-r2.ebuild:
+  amd64/x86 stable wrt bug #551536; Drop old.
 
 *jsr101-1.4-r2 (09 Jun 2015)
 
diff --git a/dev-java/jsr101/Manifest b/dev-java/jsr101/Manifest
index 23d266c4f517..dd128f0fa08d 100644
--- a/dev-java/jsr101/Manifest
+++ b/dev-java/jsr101/Manifest
@@ -2,18 +2,15 @@
 Hash: SHA256
 
 DIST axis-src-1_4.tar.gz 17041546 SHA256 911b4467f3d6cfe2e50fb7baea7a754e6aa717902d6ed91cef78f8f52bef8572 SHA512 7d08212b04702e76c960ad772a475f5765fef7f9ebe0aea3d4b949c6ba28a62500e8a76a43c7364b7caf36b7f27aee8592744256154670c7a24d29c5c1518258 WHIRLPOOL cf359caa9e645bdefb7c2ff012673dc64af9d4cc4bbe2a082cb64bcb0211d3a844ef797738ae1a3e9f978d0bbd8dc42bac9ecbdf4c734dd30ff52da18bdd7a91
-EBUILD jsr101-1.4-r1.ebuild 1085 SHA256 7d9e1d810d491939e2e3e0c6232088927914f4149d33fc32e5edbd34c8545f3d SHA512 4f9f776992b0c6415aacc05cf10cc062bbcdc3ffee92ee1d4b1b196bff9bdbb328627f874b2365a796ac5cafef410da55f03aa0e3762d243855f75fea2a26ccc WHIRLPOOL 1bc01b46e67e71985ed174313ad6839e88051716a84938bfee80aa7333ca0be5ef8514b20d61d1a7dc5164a3dc155809f808ae71af74b7f07a343811281603a9
-EBUILD jsr101-1.4-r2.ebuild 1082 SHA256 cd5b83ebca0a0a41c0d581292bb66f0741d40abd1b3de217a41f1d5e718cec29 SHA512 7b9087dee6edf090ed1e7ddcf03f2962fb7de19f44b07eb2bdb175db17af9f8d244e138d98487c5da6fe658006606670e0e808e8e7eeddd87ddbb2728455d004 WHIRLPOOL d27d392e86cb035f6c5c05d7b4cec6eadd717b88416b085b8a8ed3f5d05a69e41427cb8d1dbe6b45b6f1b7cde8673ff33785ae970a4c503896a084e7fb5a2021
-MISC ChangeLog 1690 SHA256 95b7f5094a5c55969b6c3645d91ad71df3490ed764c94158c30e132638775c99 SHA512 88fa6e03aca37627579a1851b07cf5894267249003ec8baae63373118d38abc8da11fcc06d3afcb952abaf147f02c425fe30ff4533e1abe8d8ee76e78d651926 WHIRLPOOL 01d829817b710f7c29c902fe7d2c3fc6b57d5c9e65c56506aed1d818e09abb7bff5191e6a3c1c42ecd5c797e5ef30ce9bc842d4ac91c1fc1fe64302c923dd10e
+EBUILD jsr101-1.4-r2.ebuild 1078 SHA256 6ecd618449c3a91dea4749e652ffa2ccb42d93da4a19bfda51e709ad40f10f54 SHA512 bcd1131a4f2865b762c84c9eb7c3788c3234ac5adb753985797db59a01a35dc84adcaf894b5d2578d2eedd924cbd00c432d02f505b13cead3c1b42e21a0430db WHIRLPOOL dc0ae3e70dbdf3f0e8a491240986a7553b9b63d5b7068ee5c9531f4e1ce4389003f807b6c54a9787e248b5ddf6b26b71a898faa9b9dd1d216ce60f4d9f7e27a4
+MISC ChangeLog 1832 SHA256 d796eae101706f5589cd572350867ac8dc05c7ea5f86611abba14b46fe95583f SHA512 0a9e676c50b63252c0ea1f35f4bacf3f2a1f3afb581c0e1a9ed4d0d53268b4b52c6886b0d176e8cad4f82c6584b8c5cef24bd02ab6e8c66a624d97a13dcfa13f WHIRLPOOL 089bdd33cdb53c923284bc5e39459d42f28dc4111f44810e7c725b490b4c9035fd574badc066a56a3947b0c997625acc39f3f5ca315a4906560c652db6bea0e1
 MISC metadata.xml 159 SHA256 a4ced33e98b00e3a3f725c4c40ef8e76c338db53389465ef871105fbe6e8cbbb SHA512 74dc9ada199a90543b8e1c168c7054f2e973fbfa2551e2b959d67501f2538e269cfb4b2f0905a88a1afa04c20b33961336310ba876f80d47c8e7615b2d7c830a WHIRLPOOL a0ac49efeca233ec4d8f63eb69c8e46e1d4ecbd926693c25b1b8c7415e4c565680936aec46f0c4197116fd7a19a3bb571beee493c18bdae1e5e978e3db84f17a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJVdqp9AAoJEJGRpfGTSRu4GfcIAKJ/i/ZQCGmyEUl7bN6VYX+9
-tULHKs2NSoGsElcAo7Hw1Eg3cXRWrXgEUcNl8IT17Ht5wIGU/+gBd4LCjI/1RIkw
-7OMGGtfBWby2XQlCHI9+Z00Y2IihDY7v6jqD0cEptpVxpSL6C8xZ8a68bTpA6c7Z
-/XGEplpri8CQcpgtRYuUmf4hgkSTBb2jmr+XoBtgXxea5d5ul5F2DpX+L7CTTYos
-niSSynUSGb5J9nSKot1aPoUnhqrGp2R5zcPbG/0uJtyFkUnMWivYPK0bUx3KUL7F
-4kwK2tnBXQ89ajdCpoSU7rVzE+jfeL9j2qdXWs1IVlAYblpAqVvqzUUDrggPhiU=
-=A1TX
+iJwEAQEIAAYFAlV7+wAACgkQG9wOWsQutdYkZgQAl8PRtTTgAQOcV8a32GekqoC/
+HAx+DIeFVpGpzyMlsjcctTt4cpDdfxqoDMdrwBF+mnR1dPN33dT2UC6Lz4qwLefP
+0SRbUXgPqyW82VlzoUAu5KgFzLqqrxCn/cA7DChHrYXdrVFJmrTi4q2kmwhl76zT
+wJnzCHIs7GL3FLvipq8=
+=IOfU
 -----END PGP SIGNATURE-----
diff --git a/dev-java/jsr101/jsr101-1.4-r1.ebuild b/dev-java/jsr101/jsr101-1.4-r1.ebuild
deleted file mode 100644
index 81f6bef4a5af..000000000000
--- a/dev-java/jsr101/jsr101-1.4-r1.ebuild
+++ /dev/null
@@ -1,43 +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/jsr101/jsr101-1.4-r1.ebuild,v 1.3 2008/05/04 11:54:49 opfer Exp $
-
-EAPI=1
-JAVA_PKG_IUSE=""
-
-inherit versionator java-pkg-2
-
-DESCRIPTION="Java(TM) API for XML-Based RPC Specification Interface Classes"
-HOMEPAGE="http://jcp.org/aboutJava/communityprocess/first/jsr101/"
-MY_PN=axis
-MY_PV=$(replace_all_version_separators _)
-SRC_URI="mirror://apache/ws/${MY_PN}/${MY_PV}/${MY_PN}-src-${MY_PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~x86-fbsd"
-
-IUSE=""
-
-COMMON_DEP="
-	java-virtuals/servlet-api:2.5
-	java-virtuals/saaj-api"
-RDEPEND=">=virtual/jre-1.5
-	${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.5
-	${COMMON_DEP}"
-
-S="${WORKDIR}/${MY_PN}-${MY_PV}"
-
-src_compile() {
-	mkdir build
-	ejavac \
-		-classpath $(java-pkg_getjars servlet-api-2.5,saaj-api) \
-		$(find src/javax/xml/rpc -name "*.java") -d build
-	cd build
-	jar cf jaxrpc-api.jar $(find . -type f) || die "jar failed"
-}
-
-src_install() {
-	java-pkg_dojar build/*.jar
-}
diff --git a/dev-java/jsr101/jsr101-1.4-r2.ebuild b/dev-java/jsr101/jsr101-1.4-r2.ebuild
index 56d2349090e9..4362c42cc178 100644
--- a/dev-java/jsr101/jsr101-1.4-r2.ebuild
+++ b/dev-java/jsr101/jsr101-1.4-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jsr101/jsr101-1.4-r2.ebuild,v 1.1 2015/06/09 08:59:41 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jsr101/jsr101-1.4-r2.ebuild,v 1.2 2015/06/13 09:44:33 zlogene Exp $
 
 EAPI=5
 JAVA_PKG_IUSE=""
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/ws/${MY_PN}/${MY_PV}/${MY_PN}-src-${MY_PV}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ppc x86 ~x86-fbsd"
 
 IUSE=""