Stable for amd64. Stable for ppc+x86 with ALLARCHES.

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

4 files changed, 16 insertions, 64 deletions

diff --git a/dev-java/jibx-tools/ChangeLog b/dev-java/jibx-tools/ChangeLog
index 069d1c992204..6425cfa85e25 100644
--- a/dev-java/jibx-tools/ChangeLog
+++ b/dev-java/jibx-tools/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/jibx-tools
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jibx-tools/ChangeLog,v 1.11 2015/07/06 14:22:08 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jibx-tools/ChangeLog,v 1.12 2015/07/06 14:24:44 monsieurp Exp $
+
+  06 Jul 2015; Patrice Clement <monsieurp@gentoo.org>
+  -jibx-tools-1.1.5-r1.ebuild, jibx-tools-1.1.5-r2.ebuild:
+  Stable for amd64. Stable for ppc+x86 with ALLARCHES.
 
 *jibx-tools-1.1.5-r2 (06 Jul 2015)
 
diff --git a/dev-java/jibx-tools/Manifest b/dev-java/jibx-tools/Manifest
index 6aa035a06407..df615375830c 100644
--- a/dev-java/jibx-tools/Manifest
+++ b/dev-java/jibx-tools/Manifest
@@ -3,18 +3,17 @@ Hash: SHA256
 
 AUX 1.1.5-build.patch 1082 SHA256 c0474fdb4f350dc5732c2044ca6a9575e243d7f52cab498c2e54eb6cf6aca0c7 SHA512 5e9b2814cfcdf2624c3e8c813d74cecf6a5c2fb1ed8fa493dbb8af039cb1b13b526018dffc512cda9abb48c3b6a481f7a3fe3095c71218f7231cc0785529d064 WHIRLPOOL 30dbc7678518799357350da44bbb6ecebb82e866d116e96837668422eed798b529024b1b2d932627d7c6b8b6cbe18a282baad96225e0dc562ca3581312afe954
 DIST jibx_1_1_5.zip 6788994 SHA256 121dbe5b7338081ffbf09cd1175afe5e1862a63673f467d560e0ab4c27fb3f17 SHA512 13c3a43a53746e9146d1240d73d1948b3c03ead55aa0e79158c2700a385b0dfba0e31122efd11446c1a46c2b3f85235035dc198c6b3acf2fcefa88b2a0683cc7 WHIRLPOOL 427b9970850f5497796e65e43200262e567965bd5ae07f59893f00eba4cf6942a70cf15fb0985d99e26c649e56f175b8dd0b1451b77c27a9859b196bc5cd9d91
-EBUILD jibx-tools-1.1.5-r1.ebuild 1245 SHA256 766e5d7e3c0bfdbded0137162af287100073710ff7408ddd4adb67b57ffc076d SHA512 049a231cf34f178f79a41d6a5905556e42df5720a7ac3cc302cad44cd3e9b1cdb6958d07c49bbcf4a727b77f6a76875fe85e3cbf3faff15997f1ff3cc22e5de4 WHIRLPOOL 6eb3d65f268efd3f526d0c54e174998b9f2f8c09f46af56bee1a63e56caf8acc3b2cce6a2107ce7a362117e103d62a566803a6e28101bb7eba079ed75def35c2
-EBUILD jibx-tools-1.1.5-r2.ebuild 1243 SHA256 b7cc9c88ec98bd904f67603061115ec74f693217314f1d2ec7bdd2ab4020ae67 SHA512 3288bc0505a85f374252fbe8019cc24597b087b6d78f4e20854a7c8dbf266b02f245ab770c6d445e55227b0e00cb3dd12741c07f25774cda30e506c47569c67c WHIRLPOOL 95f7f2314fb1417ba4e50ea5c851c58409903a758b5af8a5d629fbf728e521581da24aa9c266173444a6844df39d63748ff8db597e18bbaf9b2ef78261e73013
-MISC ChangeLog 1710 SHA256 0a27052f880d91964cd636357c2843da5ce759b64eaa147963c73de304476efd SHA512 8ebdd57c1ea265e91e2ed3cb8be241d5931aa13428de82bd1cbf515f549e5a8a590d2256f162bea6664c2b5d4f291560ce344be1712f0bcef11d37bac27d5dc6 WHIRLPOOL 67338339e7be912849e9fce4276c23e1339ec1a3f8edd1815b37d44a55d4b15cfc1ca9a362f0d8116579c9a2ef13c7f09f10c5a421decd030d615282a306a8df
+EBUILD jibx-tools-1.1.5-r2.ebuild 1240 SHA256 51f0bc7d04b5c612b14e48b1740aad465fdc9c0b50e471322dc21da9ba6eebdc SHA512 d0d7890db7dad7495fefcf4077053bf9a211ba04e71d844515d3a8b54d6e05c8ca0a0bc80241dbdeaefb0cbed028dda11916777e09fd6960e041baec4f755db7 WHIRLPOOL 0e5a0de7b1bb7ed97af4716da7c874a090c8d21dd3ddbcdb57dedb3d94f470fd2a98875b02b603cbdb145f6157e4d5a67225ff7c6e5022146e7d783165a066c2
+MISC ChangeLog 1879 SHA256 35e96720e05f7b402ee6533c8d8fae6cbbde1a390dbbf3f2495985fc3807b2e5 SHA512 d8414991dd43437f9e9ee3596ebd3bef449dd5b6675a499fe470cd30041380151a1d5555f7c965792e00b5dffd56126a9bc58ad312dd242126276fcbd727c811 WHIRLPOOL 2f2ce961e660f081579342af9ebbb97e5b1720ff07dba929cdce5154db4378e5a188285c238e3cf5fbfcce367ee702064b1dc46af88424901315e019375dcad4
 MISC metadata.xml 232 SHA256 ce0c5d70dfa19270f73cd656f67560ee23fafbd8b1c94fd6e0ba47ce0c0a5877 SHA512 ef65da280c5d4b52920b61cd7ae20f67131dc0c9437fbdfb4229976ee0fad35c53a9da839d03f4b08ebfc4e4ca149eb9e649eeb8ea11154021f2b60d662512ef WHIRLPOOL 7e6cb96e7d3d992f5cf5af7b83c8e963e67b835d27af5f7762baad7c3ec90035da18ea28fb5fc35b42745481cd7c3342bbbb61cfe8a9bdf3113c5eaf0c6d7d92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJVmp10AAoJEJGRpfGTSRu4stEH/09zBzk4rbpy8RIR7U0q0hgg
-fClsaI3d5CgG7Vv/Dczbt3jQm1PrAHVwAIwJF6HUUqG1tJSzkR+DCqGiWrDY6nbu
-YdHS8/x5qNMTdiJ7AQAyrqLVouQSRL61z2CrKN/NY0JqbGck40tI/cAo5TQFfEA0
-jcR4+U4Imd/A5a6+0v7gz3We6xvRtGCwjDNG3BgkdEX2qGLvpaAb4V01c3YRiLLM
-hzIdt+39JK79qCfhIgvkXCx/dyMw8cpY76gVzFWmjDtX+MduGid7woY6sZyXMetI
-VTIeo/vCpd9xSTkzppxbXGfYd9R/ezBjCMCYr/C2OdyoQfEFsfTnRXFrjk88kXU=
-=3spe
+iQEcBAEBCAAGBQJVmp4nAAoJEJGRpfGTSRu4tvQH/RwLhsxxF3YGauvsZWdgogZz
+UGcLeksoMAbYTMDUaH/FPEsJdlvkxZmXGwB3wnKoupgH3sLdlXlZ7xMACl1QWTwf
+XFZjXozXKfwcJx6fGJYEr/lw6hwtEipO7oLf+8A/cgOYcdVCf4ywuIat4nFJjKHV
+idiSP18hYJ79vUck74/PT8j+RnFkYO5fH0mHvMRsrDYa2Gk4NfJVEPJEVZmovzcP
+aJZLfisCt8jUMUl7wAxJJp94XWcdN5uaDhx/0a8Q9BWiUEDPKR7r1F94IEyndY6D
+4+TYssqdxPu12t6qO0UhZI35DOnXGgfyIDceQOylE5syzVY3taLOyiYkktS5R3o=
+=SQh2
 -----END PGP SIGNATURE-----
diff --git a/dev-java/jibx-tools/jibx-tools-1.1.5-r1.ebuild b/dev-java/jibx-tools/jibx-tools-1.1.5-r1.ebuild
deleted file mode 100644
index d3d443c27ed1..000000000000
--- a/dev-java/jibx-tools/jibx-tools-1.1.5-r1.ebuild
+++ /dev/null
@@ -1,51 +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/jibx-tools/jibx-tools-1.1.5-r1.ebuild,v 1.4 2012/11/01 21:29:07 ago Exp $
-
-EAPI="2"
-JAVA_PKG_IUSE="source"
-
-inherit java-pkg-2 java-ant-2 versionator
-
-MY_PV=$(replace_all_version_separators '_')
-
-DESCRIPTION="JiBX: Binding XML to Java Code - Generators"
-HOMEPAGE="http://jibx.sourceforge.net/"
-SRC_URI="mirror://sourceforge/jibx/jibx_${MY_PV}.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ppc x86"
-IUSE=""
-
-COMMON_DEP="
-	dev-java/bcel:0
-	java-virtuals/stax-api
-	~dev-java/jibx-${PV}"
-
-DEPEND=">=virtual/jdk-1.4
-	app-arch/unzip
-	${COMMON_DEP}"
-RDEPEND=">=virtual/jre-1.4
-	${COMMON_DEP}"
-
-S="${WORKDIR}/jibx"
-
-java_prepare() {
-	#http://jira.codehaus.org/browse/JIBX-207
-	epatch "${FILESDIR}/1.1.5-build.patch"
-	java-ant_rewrite-classpath "${S}/build/build.xml"
-	rm -v "${S}"/lib/*.jar || die
-}
-
-EANT_FILTER_COMPILER="ecj-3.3"
-EANT_BUILD_XML="build/build.xml"
-EANT_BUILD_TARGET="jar-tools"
-EANT_GENTOO_CLASSPATH="bcel,stax-api,jibx"
-
-src_install() {
-	java-pkg_register-dependency jibx
-
-	java-pkg_dojar "${S}/lib"/jibx-*.jar
-	use source && java-pkg_dosrc "${S}"/build/src/* "${S}"/build/extras/*
-}
diff --git a/dev-java/jibx-tools/jibx-tools-1.1.5-r2.ebuild b/dev-java/jibx-tools/jibx-tools-1.1.5-r2.ebuild
index 1a56f6787a07..c3abc75cc7bc 100644
--- a/dev-java/jibx-tools/jibx-tools-1.1.5-r2.ebuild
+++ b/dev-java/jibx-tools/jibx-tools-1.1.5-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/jibx-tools/jibx-tools-1.1.5-r2.ebuild,v 1.1 2015/07/06 14:22:08 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jibx-tools/jibx-tools-1.1.5-r2.ebuild,v 1.2 2015/07/06 14:24:44 monsieurp Exp $
 
 EAPI="5"
 JAVA_PKG_IUSE="source"
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/jibx/jibx_${MY_PV}.zip"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE=""
 
 CDEPEND="dev-java/bcel:0