Mark stable according to ALLARCHES policy and drop vulnerable version

wrt bug #505602.

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x9C6D7DE4

8 files changed, 48 insertions, 186 deletions

diff --git a/dev-java/xalan-serializer/ChangeLog b/dev-java/xalan-serializer/ChangeLog
index 2d114e5acb95..ff89428cdb65 100644
--- a/dev-java/xalan-serializer/ChangeLog
+++ b/dev-java/xalan-serializer/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/xalan-serializer
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xalan-serializer/ChangeLog,v 1.20 2015/07/11 09:22:42 chewi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xalan-serializer/ChangeLog,v 1.21 2015/07/30 22:35:44 chewi Exp $
+
+  30 Jul 2015; James Le Cuirot <chewi@gentoo.org>
+  -xalan-serializer-2.7.1.ebuild, xalan-serializer-2.7.2.ebuild:
+  Mark stable according to ALLARCHES policy and drop vulnerable version wrt bug
+  #505602.
 
   11 Jul 2015; James Le Cuirot <chewi@gentoo.org> xalan-serializer-2.7.1.ebuild:
   Drop java on ia64.
diff --git a/dev-java/xalan-serializer/Manifest b/dev-java/xalan-serializer/Manifest
index 7141f36a18ce..4610895c84c6 100644
--- a/dev-java/xalan-serializer/Manifest
+++ b/dev-java/xalan-serializer/Manifest
@@ -1,28 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST xalan-j_2_7_1-src.tar.gz 6284437 SHA256 fa52aa629bb882335d45d67401d270c3f21b5131aaea005ac0d4590f2ce8b043 SHA512 f02f684cc5fa178d093286ac3a98156b8f293501d5e53240a79d47a9f3ec6ac895683f80f266c1baebca371cecd547957dcf71ce31ff71d31585b65c7f6ac2dd WHIRLPOOL 1574a03116773c664a45a3f2597b19ade54ba33f373d5f872d53565611100f8732255d9701bf789c8af32339c0935ea24106dd0b2662fa642deb5ca03d243234
 DIST xalan-j_2_7_2-src.tar.gz 8416261 SHA256 5c184ad2984973cc19783c7f9339c28a210cca724b25b0d706f1e310627adb98 SHA512 2f1fa105b3cb8082594e3121a245464e1b7c15464b1ead2d10e306e51ef61ded5d7fcd70c034fa46f41c4a8c14316e376cc14d8045c8aadfce80f2e4bd1b61d8 WHIRLPOOL 388545a97f230183c91896738bef3f9ae8bbf2beb24f02bece79a8e76351b8c2f16edf83fd6084896262cdfbc412a550695579c4b3b4a07d17714eb26a94fbb0
-EBUILD xalan-serializer-2.7.1.ebuild 1688 SHA256 4dcce422fd4640e2a8a4f1e92ea60b9007645f6d10b0bda78c8cac2d2da69caf SHA512 49a376c3874442e3fba03cc7636fa268afc7e1061a1613bce4935f39253311cf161a7a5ad301dc1aba252679f41ca42b3cf9b951da9df2fe76f78e749c3c528a WHIRLPOOL 4b4cb112e783907de7dcf10b71159c4ead4a9325c4b2f4f6bc00b163264acff8739d35895be205e26bded7b66a9c0d3218ada8a2fd02b5a96c9055fbcb1c3604
-EBUILD xalan-serializer-2.7.2.ebuild 1365 SHA256 5b420be43bb3b9cc24e036f9f99effdaacfda49f6280f430efeca83c7045f17a SHA512 071e4c248a46a08873963bf8e7e0163fe0e611f9c0dea9e791d87d1c40a5c4d69f44a77f0f876e8e30ad829e2d04770db99b228b8d75bb73a8615fd514163730 WHIRLPOOL c8bc9d66c5099499aaccad579a2c7a32c75bc8263b0586a73e3177881d0fb36b439a49b1b6a3218bd66dac404c19bb0dd305d0cacfe89c421452e8b5b7a7048d
-MISC ChangeLog 2769 SHA256 cfe953c9a98c1a15a0789eec3fe0036c95401ee2596b77fe579d777854d48e63 SHA512 cd5d2fdd2795d2f58e7fd8c34cb49be1593eee99f0919081d0192e4e9ebe26f35895952118f6cbc6fe922f8c44fa72d720506c0814b4a022623d0400f4de0edc WHIRLPOOL 2e545b69e41c10a676fe0276b077d6a7776a739c571b65ef9d2f6e00d6f493b9721d44de186862297c1a2e22002e0d766dfe36a2c4b543975d044391ab220c99
+EBUILD xalan-serializer-2.7.2.ebuild 1361 SHA256 d5ac8d2da56f6c1da5441528e519398b846560c0c7315e75045e2743a1dcc69f SHA512 803cb8ad114364a9e910aaacef026dc994b35d94d05be50416d2f6b6be5c4e3034536c35be88c50a3bf3d2be4a888128cad07776e64ea0ac638a4f423147178f WHIRLPOOL 022cd8e2198e9bbc100f0cce21862ddce460724a1f98db08fcd8360309a06a154573909b37d1a2db442381604441e8b63fb99e1482ae03dae4458de6503e9458
+MISC ChangeLog 2976 SHA256 de3f5a50b8618f6b3f71a46b522af222a790064d13bcf8c845d530f1f1e0b2be SHA512 b3373fe2c412ab636a9c7d627e8c602f34d76a0b97262327a6ba8949f3b06793d8dd6e4b7c8b2d458fb5ce61f9de2042a9e7535b0f276023103a3e3063651391 WHIRLPOOL 80d8e89c04321dd468e4ae857be263c41e77756fd1a3ef6f9f34dac63a70943856350371562764cc95829c393a1f40640ab09943beca60f492b723e547091545
 MISC metadata.xml 157 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 SHA512 bbae663e26f48fdc5e272adc2b06c14f77f34c53caf84acb53908ff036e7c12a3edbbc0929d2db56bee861a453381d979c7e0983a23716f629ed2135c22ffece WHIRLPOOL 887e153e2481e7d76f0f1b67a395f10f0328b93930185ecdb8fcb5fe3c50f839086a18831d61cf45b34657aaffca6c3b7900cf3c04b712846a05027a84602448
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.1
 
-iQJ8BAEBCABmBQJVoOBjXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJVuqbBXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1MjhERTZCRDg2OTFBNDM5MUZEQTJFRDQy
-MUM2MzIxMjlDNkQ3REU0AAoJECHGMhKcbX3kd0cP/ROdV69HHtR4StrB5vNlt1cg
-lJM1hRmasSMdehrqQ/XY8n1XWHC0Pc8EOhbqL5O8K2purjrwg2DgM4ZYSYda3ygh
-92UHd5USGdTe/Scy2FJwmC386E5rzXASFl9DPQBC4+B3QJ7wAN0trE90jIDdhABl
-xrJs6cM6OGzUJULmgJWyDqIDOH6Pi39EJ42VgkXSvsDJC4yPDYBZoCgB+e4pCHGj
-SUrSIa0J1SsjIazmvwDbgnre2gQexKnCkWffHxQZ6Pv2uxYODg+UC28aUGQgTMpm
-vngvybShqSK2H0MW+KSYRFdaPXp+6YmctASMsK9rIVrqrznRgGY+IrlGHH+tN+hD
-I2NKFISEa+Nd8smXKwDXoWvc3HWhEXyVlav0CMrEzveorj2zcl//UAtfU9lbL1c8
-uoz6QfbxWlCAOipJC2T0d3u3DvE2+2iy4uLJtSDRWT/NHMGXn68z8fY68xVd+KYk
-cKXf2fPt/kpoLHeAzn0wfyFzvrXFvYmwf3iBTqXiLiykaeAzDvixu18g2fRQbxpk
-47SFccgVGlIJ32Uk+7flPKpi5oV0MMKsCRaVrJ+9kwDxyIo2cC00Euz59h9Pzzc3
-z86+4N4+1qAbgm5bRoYpAQMo/AeYzBPmg0BKC9q57QvJy+Q8ROS66Olle2ANi6B3
-VRMAwql/v+QMb4WKu1rx
-=t5PH
+MUM2MzIxMjlDNkQ3REU0AAoJECHGMhKcbX3kRtkP/jbc6QM452Nbnv4NV8MhFNAu
+hGnv9njGsq4ZKFgNQsjz6kSF16b3PlOw44LYa6d6/fotMAfOU7uk8lbeJBhPu4oc
+LNcusWpmM//EHeZcbGEjGWZ6L+7FkfxV3tk/3YnceMpIMcCOgbjOA4tJCzmyJun9
++1SmjjU0rLqVjlQaiK36mZD8EXXmYlc6dSmYfhVdo9lFpNKsRqATV0S/5Y2aJYP3
+Zicyrv27WbaF2zXvuxIgPsYZbgX811Z/DoK9YOfXsO836u2x/m2BE55OCw2UJ+tr
+O6R/g5ry9O07Vp9TR1lgONEmfp6U8F2V8XtIH7T0SlJ25a+++Rwn4IJ45o6yTlWy
+76ayPJrGVRNYiDdN0DyVafuKLScJ3RXKy3qJLFP6R1WHl3qkN4xQQd+SnnPZZrG3
+wEJ2Kcfg70+GMGr+y1NpsHxTKiVPEEmrsfInhf5uW+dDxteBD1m58U8nbiC3dpey
+FzYjerARBnXep0RtT+0ed5TdZEoDKJ5mNukZ/jkjLfSwA4sHr8nJq5FQ7da+Uvdg
+/21C9qkeLR6M5J1QyZ6IqQhYCKrYlLDmDzXI3dge2WhgiAqfOjzJLTPOO0k4a/wn
+iJVUqtC7CdjHwr66M7UNxAu9OVNtsjPv8iHzm6ta93ZYBaqY8E8gOpslwfPopEo/
+Hyk5VfIgo74Tp3QeKFC4
+=y5yy
 -----END PGP SIGNATURE-----
diff --git a/dev-java/xalan-serializer/xalan-serializer-2.7.1.ebuild b/dev-java/xalan-serializer/xalan-serializer-2.7.1.ebuild
deleted file mode 100644
index 9a89d95bb6ca..000000000000
--- a/dev-java/xalan-serializer/xalan-serializer-2.7.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xalan-serializer/xalan-serializer-2.7.1.ebuild,v 1.12 2015/07/11 09:22:42 chewi Exp $
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2 eutils versionator
-
-MY_PN="xalan-j"
-MY_PV="$(replace_all_version_separators _)"
-MY_P="${MY_PN}_${MY_PV}"
-DESCRIPTION="DOM Level 3 serializer from Apache Xalan, shared by Xalan and Xerces"
-HOMEPAGE="http://xml.apache.org/xalan-j/index.html"
-SRC_URI="mirror://apache/xml/${MY_PN}/source/${MY_P}-src.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-COMMON_DEP="=dev-java/xml-commons-external-1.3*"
-RDEPEND=">=virtual/jre-1.4
-	${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.4
-	${COMMON_DEP}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# kill all non-serializer sources to ease javadocs and dosrc
-	cd src/org/apache || die
-	mv xml/serializer "${T}/" || die "failed to mv to temp"
-	rm -rf ./* || die
-	mkdir xml || die
-	mv "${T}/serializer" xml/ || die "failed to mv from temp"
-
-	# kill bundled jars and packed xml-commons-external sources
-	cd "${S}"
-	rm -v lib/*.jar tools/*.jar src/*.tar.gz || die
-
-	cd lib
-	java-pkg_jar-from xml-commons-external-1.3 xml-apis.jar
-}
-
-EANT_BUILD_TARGET="serializer.jar"
-EANT_DOC_TARGET="serializer.javadocs"
-
-src_install() {
-	java-pkg_dojar build/serializer.jar
-
-	use doc && java-pkg_dojavadoc build/docs/apidocs
-	use source && java-pkg_dosrc src/org
-}
diff --git a/dev-java/xalan-serializer/xalan-serializer-2.7.2.ebuild b/dev-java/xalan-serializer/xalan-serializer-2.7.2.ebuild
index a6f786016c44..d543d164ca15 100644
--- a/dev-java/xalan-serializer/xalan-serializer-2.7.2.ebuild
+++ b/dev-java/xalan-serializer/xalan-serializer-2.7.2.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/xalan-serializer/xalan-serializer-2.7.2.ebuild,v 1.2 2015/06/30 14:34:29 chewi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xalan-serializer/xalan-serializer-2.7.2.ebuild,v 1.3 2015/07/30 22:35:44 chewi Exp $
 
 EAPI=5
 
@@ -17,7 +17,7 @@ HOMEPAGE="http://xalan.apache.org/"
 SRC_URI="mirror://apache/xalan/${MY_PN}/source/${MY_P}-src.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND=">=virtual/jre-1.3"
 DEPEND=">=virtual/jdk-1.3"
diff --git a/dev-java/xalan/ChangeLog b/dev-java/xalan/ChangeLog
index e21748cecb45..e9f2a8ff0ec0 100644
--- a/dev-java/xalan/ChangeLog
+++ b/dev-java/xalan/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/xalan
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xalan/ChangeLog,v 1.99 2015/07/11 09:22:38 chewi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xalan/ChangeLog,v 1.100 2015/07/30 22:36:49 chewi Exp $
+
+  30 Jul 2015; James Le Cuirot <chewi@gentoo.org> -xalan-2.7.1.ebuild,
+  xalan-2.7.2.ebuild:
+  Mark stable according to ALLARCHES policy and drop vulnerable version wrt bug
+  #505602.
 
   11 Jul 2015; James Le Cuirot <chewi@gentoo.org> xalan-2.7.1.ebuild:
   Drop java on ia64.
diff --git a/dev-java/xalan/Manifest b/dev-java/xalan/Manifest
index dba8715bed3a..a6b376f222d7 100644
--- a/dev-java/xalan/Manifest
+++ b/dev-java/xalan/Manifest
@@ -1,30 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST xalan-j_2_7_1-bin.zip 17336979 SHA256 725620850d990f23009619471341c2beb2c97065b46321a3b08c0cebb8dffcb1 SHA512 3a29aea5b0444b33535ada7f3be3b468d22089d269689f9fd5ec4c1c80a3fcf831b5c9fb5aaa6830762309152aaf44b1b6e26efadb7d8b549d63fccfaa6240f4 WHIRLPOOL 9e37c2743cb63372db5580554b334ce39d9b7969c8118e5d44c1cf9eb46b133c7329c15514d6ee0c96152ffca39016386483d115beefcd7a4a20914109784561
-DIST xalan-j_2_7_1-src.tar.gz 6284437 SHA256 fa52aa629bb882335d45d67401d270c3f21b5131aaea005ac0d4590f2ce8b043 SHA512 f02f684cc5fa178d093286ac3a98156b8f293501d5e53240a79d47a9f3ec6ac895683f80f266c1baebca371cecd547957dcf71ce31ff71d31585b65c7f6ac2dd WHIRLPOOL 1574a03116773c664a45a3f2597b19ade54ba33f373d5f872d53565611100f8732255d9701bf789c8af32339c0935ea24106dd0b2662fa642deb5ca03d243234
 DIST xalan-j_2_7_2-bin.zip 17740075 SHA256 6d20d522c2a7f5ee8baa65d43934a47a4aaadd604b9020275c76030df171aae5 SHA512 ae2be0bfc5e794b159c2d16718275a6ce6e8f63d681e2d13875f233d334a37aba872206c6c1f70565698ceaf4c66261c7df6db6c524e6e8da5dafe2f17cefddf WHIRLPOOL 8a4265e305b49526eddb71e522f2b5d1a64580d44915f920bf8be29fa48fd436a518229c01339c2f34bb92f6e9076d9050809f04485ded16eafd69b8f7b93095
 DIST xalan-j_2_7_2-src.tar.gz 8416261 SHA256 5c184ad2984973cc19783c7f9339c28a210cca724b25b0d706f1e310627adb98 SHA512 2f1fa105b3cb8082594e3121a245464e1b7c15464b1ead2d10e306e51ef61ded5d7fcd70c034fa46f41c4a8c14316e376cc14d8045c8aadfce80f2e4bd1b61d8 WHIRLPOOL 388545a97f230183c91896738bef3f9ae8bbf2beb24f02bece79a8e76351b8c2f16edf83fd6084896262cdfbc412a550695579c4b3b4a07d17714eb26a94fbb0
-EBUILD xalan-2.7.1.ebuild 2745 SHA256 41d328e058fc531cf635a2c8e8cff295c92fc90f5095f22e9030365f9b1dadcb SHA512 c6791b2a4a08e84741c115a36edc6d208fefb18510e584e76f3293ee581a02277a6a4927833211b42584cd1546f989ebe718409b388db51c6da90d69a7f48278 WHIRLPOOL c83765eeea498376a75a4d5c0c5e803d2a33fd700610490142b690edda549b014a59b97acdc928e9e48a79b964fc584009b09b2351bb4e33b213df1552255709
-EBUILD xalan-2.7.2.ebuild 2017 SHA256 9185e15bbc824e853ffed79cfe0626b11df3d71128037c64ce95bffc71f28e15 SHA512 f2b88cc94c52597df93b0a110d1a34d49ca7e349861086a52752247549364b16ca9145cd091897fa277099642ecc4914de3612935104ae629701837cc4870656 WHIRLPOOL c0a3969d10f5fc7389f308c6c2b9beb3fed428f7f0d7bcf7737a9781d00a9e606a1a4646c9c5244ac0c711ea92eddcd86e5c11e24a987f7b424cfb8765bcb4b5
-MISC ChangeLog 13753 SHA256 067e86f52c3bc70ff946f0340a647b0d7c22365c4e17198a995fe178a3f84171 SHA512 4e0062b953230f88351b3de172a2b9fcdee484fcc333adb5220baa6fd192ef0469f3d8d1e0b6117e9074272b92fdb5ddc129a301dbfe8e08ba339132098e780d WHIRLPOOL b279bfce9e69f651c89fe348d01e2827854990e105db593d6e77b4434aec96b91c28b7899c08db51c563e35c196c1887d37393277f26fb31b7b658dbe6643930
+EBUILD xalan-2.7.2.ebuild 2013 SHA256 4c5f0ce8b4a137d6ad1fea532a06f8516676cddf2e95f941ca45d4853f6feafe SHA512 c755958bcd9a17f0216c5abb07c62aafbcd29a9d7d6907386d0c2b4cf83d41cca6654f0f92fad053d70bb17907b97dd70266ada87305c94e6205af2c10998317 WHIRLPOOL 125296b9fc9d98715f17ad1332d2253f17a8ee9dd86d62db829d08df456703765dc2f857e7b3cc798393954d438da1da422e0566aa3f1a70e001b9b3d252b3be
+MISC ChangeLog 13939 SHA256 ccd01de58d140853e157885d5c114227d815be64ac9b49d7e0a093ed26c5d9de SHA512 699576a4f08194ca8b8d352fe5904b35998348d0b2988589b83e20bf7e33bef27f6c89ffd375968c4b8dfc1254137fbdb829e3d6f922e15d1efba87d7e144d85 WHIRLPOOL 79cd90101da296a4a735b6009bf43e54c2e34653b7de48cc1d834eb4cf63e4ba5f89b126e297038cb39fad9a4fc932c358dfafdfda452936dd4d87a23d5f0c56
 MISC metadata.xml 157 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 SHA512 bbae663e26f48fdc5e272adc2b06c14f77f34c53caf84acb53908ff036e7c12a3edbbc0929d2db56bee861a453381d979c7e0983a23716f629ed2135c22ffece WHIRLPOOL 887e153e2481e7d76f0f1b67a395f10f0328b93930185ecdb8fcb5fe3c50f839086a18831d61cf45b34657aaffca6c3b7900cf3c04b712846a05027a84602448
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.1
 
-iQJ8BAEBCABmBQJVoOBfXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJVuqcCXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1MjhERTZCRDg2OTFBNDM5MUZEQTJFRDQy
-MUM2MzIxMjlDNkQ3REU0AAoJECHGMhKcbX3kuvMP/0BB8Ms0U1nIqd4T1mHwlZWE
-SHDczs62jmLLtpWEhISxGEfLmzz6vbSseZygf2yKBPmn2DgkyUkrTqRbiAFKkNPK
-V+hcfVqprjC3+Tm2/hv3a8trhUyAEEayb2v4pShLBIkgYKheF1Qixg6hB0oUIajq
-cPiWuQpFQVsDnR7VTOLpcLHEAR80zOiEffkx9hfi3uV5PF3LnWxO590CHt6pejUx
-vLbL0AMHaSVPh5WqLhIjp/x6d9ClOo9R7weZxbw9jshfszOlx4TEYyg0I1KT3TeH
-i6cL0ZbJOKbCflomGEIU2DT1VtsUGvbrD2+c0+OueLNtA0XIW4tSSvnnEQ7RdQLu
-Yp3c1gf5XFNcFRkaEOIfUExPw0raAuXDarj8pxtDdpf+y3N9zuxyWsgD24ukhZI+
-z2wkoRrNYlQjWuW8CPOi5EHEju+ZWc9RpLkNyrSMwVZzK8D784L3l8j3JAM4+U2t
-hrEJIbjCRDY04zq6L9+SCe0UuV6F+r2heNyxdbvVol1NAjwcAxX+7b74aSgvmhT8
-gbmthk4XKeSZaisS9xmJuj4rYYdX59gg4mcavgeqT7hQz8NxaM6cmcw+3EVw34tB
-xKGl9kj6CBCWv2SdwAaksJivcRRlCj9JnRAj4PSZEzov083buVcTbLU4QAHKdO3u
-JRnOTCxNFrv0nDd3IDQo
-=u61s
+MUM2MzIxMjlDNkQ3REU0AAoJECHGMhKcbX3kQVEQAITE6v1tJ/oFazSLPJKLFTZa
+E+CaNmQYEcDMFq9MbgZtIyHedgDhXjB0WBwDgt3TWQ2WcDwBRqdS1nluWIjr8GmX
+kBY4su6dP8AgFzBgxhgyXVEymCdkMKh7ORDMvlNuOWRp1O7pjV8G5fCoH9wtaJc5
+psMC2X4ud4eIxNjb8J8//KFe9WM+fZDVE7zBC770cOnFpAc4ouJ8dqGysM6Dy87Q
+S/PxkS68V2xiT7U0W4YFAd83TBJHR6Ytqomgs4xmwLWcFNFju8bC4T2cWTrq3yv3
+BlW+wlEMiRIGOqGJkMu2qjYBAQiO2TJA9c1MbTd25l6zfap65vHV6M866vIzA7Jo
+AqYAEUUVGxzKZI62DIoSoW9ICm9/vqgF0kgVfUHEYxe2cIfaIYDS51bGpvFr0/Kv
+bN86UuNZi2d4SojkC8QW6+qauG+peJj1K85xaB/1KjSsfMY/QiT+ncX0PK4Qq1lP
+wHfrKYSUrKNVIleqgFdeopa8wmDfWR9mTEHdoVmSAwmA72ytKF4VkJerYzil4cLK
+QsKoWTOzcA5CuO4YB6cZ/3wPksAZf/6ToHhEwjy4uu/CvfTAnwd1HbItHOUyxqg1
+z42SXxAswqJ8MhwMyzmphH+IxK3kUR+QM6ngMzSNJz4AQ60kK3xJx9mcoB6YVi0M
+1iETSW9RFcFoCgPtN0bs
+=oe0Q
 -----END PGP SIGNATURE-----
diff --git a/dev-java/xalan/xalan-2.7.1.ebuild b/dev-java/xalan/xalan-2.7.1.ebuild
deleted file mode 100644
index d9b4b6b33d8e..000000000000
--- a/dev-java/xalan/xalan-2.7.1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xalan/xalan-2.7.1.ebuild,v 1.13 2015/07/11 09:22:38 chewi Exp $
-
-EAPI=1
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2 eutils versionator
-
-MY_PN="${PN}-j"
-MY_PV="$(replace_all_version_separators _)"
-MY_P="${MY_PN}_${MY_PV}"
-SRC_DIST="${MY_P}-src.tar.gz"
-BIN_DIST="${MY_P}-bin.zip"
-DESCRIPTION="Apache's XSLT processor for transforming XML documents into HTML, text, or other XML document types"
-HOMEPAGE="http://xml.apache.org/xalan-j/index.html"
-SRC_URI="mirror://apache/xml/${MY_PN}/source/${SRC_DIST}
-	doc? ( mirror://apache/xml/${MY_PN}/binaries/${BIN_DIST} )"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc source"
-COMMON_DEP="
-	dev-java/javacup:0
-	dev-java/bcel:0
-	dev-java/xerces:2
-	dev-java/xml-commons-external:1.3
-	~dev-java/xalan-serializer-${PV}"
-RDEPEND=">=virtual/jre-1.4
-	${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.4
-	doc? ( app-arch/unzip )
-	${COMMON_DEP}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack "${SRC_DIST}"
-	if use doc; then
-		mkdir bin || die
-		cd bin
-		unpack ${BIN_DIST} || die
-		cd ..
-	fi
-	cd "${S}"
-
-	# disable building of serializer.jar
-	sed -i -e 's/depends="prepare,serializer.jar"/depends="prepare"/' \
-		build.xml || die "sed build.xml failed"
-
-	# remove bundled jars
-	rm -v lib/*.jar tools/*.jar || die
-	cd lib
-	java-pkg_jar-from xml-commons-external-1.3 xml-apis.jar
-	java-pkg_jar-from xerces-2 xercesImpl.jar
-	java-pkg_jar-from javacup javacup.jar java_cup.jar
-	java-pkg_jar-from javacup javacup.jar runtime.jar
-	java-pkg_jar-from bcel bcel.jar BCEL.jar
-
-	cd "${S}"
-	mkdir build && cd build
-	java-pkg_jar-from xalan-serializer serializer.jar
-}
-
-# When version bumping Xalan make sure that the installed jar
-# does not bundle .class files from dependencies
-src_compile() {
-	eant jar \
-		-Dxsltc.bcel_jar.not_needed=true \
-		-Dxsltc.runtime_jar.not_needed=true \
-		-Dxsltc.regexp_jar.not_needed=true
-}
-
-src_install() {
-	java-pkg_dojar build/${PN}.jar
-	# installs symlinks to the file in /usr/share/xalan-serializer
-	java-pkg_dojar build/serializer.jar
-	# and records it to package.env as if it belongs to this one's
-	# classpath, for maximum possible backward compatibility
-	java-pkg_regjar $(java-pkg_getjar xalan-serializer serializer.jar)
-
-	java-pkg_dolauncher ${PN} --main org.apache.xalan.xslt.Process
-	dohtml readme.html || die
-	if use doc; then
-		java-pkg_dohtml -r "${WORKDIR}"/bin/${MY_P}/docs/* || die
-	fi
-	use source && java-pkg_dosrc src/org
-}
diff --git a/dev-java/xalan/xalan-2.7.2.ebuild b/dev-java/xalan/xalan-2.7.2.ebuild
index 3f9be4d33865..6d5266f053d5 100644
--- a/dev-java/xalan/xalan-2.7.2.ebuild
+++ b/dev-java/xalan/xalan-2.7.2.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/xalan/xalan-2.7.2.ebuild,v 1.1 2015/06/30 11:04:04 chewi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xalan/xalan-2.7.2.ebuild,v 1.2 2015/07/30 22:36:49 chewi Exp $
 
 EAPI=5
 
@@ -24,7 +24,7 @@ SRC_URI="mirror://apache/${PN}/${MY_PN}/source/${SRC_DIST}
 	doc? ( mirror://apache/${PN}/${MY_PN}/binaries/${BIN_DIST} )"
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 CDEPEND="dev-java/javacup:0
 	dev-java/bcel:0"