Version bump to 1.9.1.

Package-Manager: portage-2.1.12.11/cvs/Linux x86_64
Manifest-Sign-Key: 0x6D34E57D

3 files changed, 132 insertions, 17 deletions

diff --git a/dev-java/ant-core/ChangeLog b/dev-java/ant-core/ChangeLog
index f3183da36822..895118bc2c77 100644
--- a/dev-java/ant-core/ChangeLog
+++ b/dev-java/ant-core/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/ant-core
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ChangeLog,v 1.125 2013/02/05 05:29:05 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ChangeLog,v 1.126 2013/07/05 11:02:05 tomwij Exp $
+
+*ant-core-1.9.1 (05 Jul 2013)
+
+  05 Jul 2013; Tom Wijsman <TomWij@gentoo.org> +ant-core-1.9.1.ebuild:
+  Version bump to 1.9.1.
 
   05 Feb 2013; Rick Farina <zerochaos@gentoo.org> ant-core-1.8.4-r1.ebuild,
   ant-core-1.8.4.ebuild:
diff --git a/dev-java/ant-core/Manifest b/dev-java/ant-core/Manifest
index ea6ab3a52a4f..461198a713b1 100644
--- a/dev-java/ant-core/Manifest
+++ b/dev-java/ant-core/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 DIST ant-1.7.1-gentoo-r1.tar.bz2 17259 SHA256 f0a395c56445a794e1715ea91429596b785310f0ad8c055d21438c78338fd13c SHA512 d7ee77ec5f1a0f6ca0a6dffebb5a556a8731f025cbb1d81ce11da5d99ec513bb8f2570cef78f07fbfcfaaa73172e5a5c379d6db07f85f5c12e7472a665919d12 WHIRLPOOL a3b9d8008fe1d7781bfd057601c46fcfcc99001abb284312c21f2ef4deb0bfeb722e900090544ad9a91c30bf747090d08de17c80a4c4a233e71cddec751fb858
 DIST ant-1.7.1-gentoo-r2.tar.bz2 19360 SHA256 21f5b949ca2f177f8dbbe72419a70ddc017c4abbfea67af4a829e37c0e93f03c SHA512 3e9e42b6ee4155f46ca865a772b3f4de30882b2a8966a1e54f5d5be1beff517a9ec95d08da9454d232968261095288ef93e3ee55a8bc1421b920e0cfca2aa5ae WHIRLPOOL e3e0df0369c4aa94726ab1a32147f3abc2cc64250bf543c3f70231457a2b20e4475fda446906ac54d7dea239063ba5b48da515a47e6c0f6cfde20e422091a7ea
@@ -9,11 +9,13 @@ DIST ant-1.8.1-gentoo.tar.bz2 14979 SHA256 1a2230ba44b1eadc4ca3367b56bb287271d76
 DIST ant-1.8.2-gentoo.tar.bz2 14626 SHA256 48478e9a93402bebe92f5612ab61e2c694ad17b47da9e45e382717fd9a7f140b SHA512 8024d5716861b33ec6d6dd95f95c5e2f0e7e23d223a6089833f1546a84b84b40edbe806ecca9a53b51c0dd98f647823ac859d7b297782d3be5a24cb3f5d144e7 WHIRLPOOL ad9728920298feb79ef7d6ad303bd4d2266adb5ffbc450b3e51364b9a2df8747de867f6f2ebeca79c58eb55e0f5ceb2f3b415f76f067564d2da45f77320f55a6
 DIST ant-1.8.4-gentoo.tar.bz2 14894 SHA256 1b40d038ad17be9493384af68f1c18ea326742297cb93b8ddfb585722f36e1eb SHA512 5870d5a08be26d254c79a5e2ad2ab920cf16d1ea8937ae33b4189801ac02c5da0bd4559643e1aaba17a3b89420555cd0bd6875a50aa16c1ac2cf74320c70aa01 WHIRLPOOL a79ddf6e1aecd20e9b343a0fa9a68c2f3b774589ab53fca7304cc950ba03249922fd8f6a5b6f4d41ee124a1a4845ef2be2963adefdc623e65db7a8b830e2f206
 DIST ant-1.8.4-r1-gentoo.tar.bz2 14921 SHA256 a0a20763da2ebae5619c57c2e87a7d904b431c64a1e6d37ec0a59efe2ab042c7 SHA512 878564c7193767a84519a2a60d9f690157deedcc0a47d83e8640dc805aa0b45bf0bbdf34d9bbc74b06c6f39ba382a2fa62bd5f483c6235dce21dc447aaed6176 WHIRLPOOL d0d80d40542ae3d7e43d5e006205f055acfc973ee155726b29a4df27fee8badc7c8f9d9c151058ba045e3b74f2b8a70ce487d8ea50756bd2dcb3d8425bb13aac
+DIST ant-1.9.1-gentoo.tar.bz2 14884 SHA256 0e2b1888b1f5d840db6d13da833b5289df96076c1d2d6b5497840e74b6cb4bdc SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f WHIRLPOOL d91b2c3bbc30a2b395a182a8248785edea8ce9e6734fcaedd715e3a64e967de494ed78370c70d549f8de96e70e61c67fe1f22b56842cfdbfd66a723d2c8f62f8
 DIST apache-ant-1.7.1-src.tar.bz2 6979386 SHA256 4dc49a7260ef90a6dc6611b7e96b9f047d507589736d4a2ad6efbe3edfc6fba6 SHA512 bb627d0c5d491d5505a71c5ef1cc6b748c6eab6b94b44fd582557585bd0472d0b110d3709a8a355c2480b0c000e57327925a467afbe50cd786f1898ad4b67cfc WHIRLPOOL e463dfe8e9893a487e29f58f366f2a531dd3b8c1bde1416566235b59845539e4023be21a55e7043770ce789c12e4a37d57f1cc4d119059515ea69fceae04a962
 DIST apache-ant-1.8.0-src.tar.bz2 7122981 SHA256 b1da647175784c9e0113b8e76643c89123396b5f1d0ad54417390a92e02e6786 SHA512 063cc180f02042670dec344376164620f9cf3b47411dd7f710ddf0df8c6c00901bef0a6a30dda6a6931d1e650a6dd1faf810efae6029b46dfb9fa7af13f7b6bf WHIRLPOOL 741a22d5294d3780b9c06d2760fe8dde7e011d38b0051abf9903f35339a79cfb337174bb1b921188445f6bce75e280f5448a8150831fb3ba103b5763284bddb4
 DIST apache-ant-1.8.1-src.tar.bz2 5861907 SHA256 02b24c7354f19879e136c8258d75672ec9a7379622aeaea9f7a485210b193700 SHA512 4afd0d24929fc840659b2f7860dbb61976dd5d6b9c4627e68aa34182012366ab2726d20d77b0f0b793cb1b7cbfb6fc8b3511cd412ab7cf5d2c2c69839b44ac93 WHIRLPOOL a7f1836000e1892793a4fbf2fc7dc8ed89ea6790ccfe39cfabb00d727470d8f5a89a84590466d22f6e327f10d7b25cceae0880c5fc8e04b5ecc21cc4813b343f
 DIST apache-ant-1.8.2-src.tar.bz2 5894278 SHA256 30ac9766d0e2c125d39c9871178f35084d4b75b08f628a4eb1dbae15ed89ce53 SHA512 d3ac33842746aea5a9768d2f771ad622da1fd0c65cfb4f70111a119c0ceb4d5fe10bb9766df879179a16fb3d38c67b41934d5b5428ccfe4c4d57b669a1bbf47c WHIRLPOOL 108ffc2c1dc91d3c711fbd28ff0c7763ac81edfe8e943b43467eafa424c0457d823bb61981cd37a77e509f159a02ffacbf99cac70ef2f9fc227bae8594a336b2
 DIST apache-ant-1.8.4-src.tar.bz2 3385365 SHA256 5de65f7ba3f67e436ffffcdc0a73f591d1006e9fb41af8632c1f1f84d4a3e0b1 SHA512 7dbbdcd31f5fd498cbbe7f125451899320e5e9c2396b80f1f90d18943f8ef066a75198edfdba0edf96b1e0b5b84cb049b5281403180a7a6924ebfb077930e307 WHIRLPOOL 8e38dae80ceba637c65fe32fc9fd04590df44d7ed141de026d0d38eec047b6f49027020b1b80ce803e33d4d794e7c7c536e1bc5b7dca51d3038a7d4a05b46e08
+DIST apache-ant-1.9.1-src.tar.bz2 3401450 SHA256 550473e1a64b99e6cfa9ba6b9c142318bd1ea0d902e7ba7b33389528a0c1d113 SHA512 82862fbc503f09e92f3936a410536385c101ca00315d4468fa90584d2d8fbd70b26845e64ee5220f38bcd71ba72a3f455a73279d0316452382f489706cdead72 WHIRLPOOL 94dea1ffc68ca5cc743648413112763a52a51829fa76e6a80e9cc7e3df0460ade586430f55b75508578f4dd56667945ab8daef110ee03edacc6b5cdc34155152
 EBUILD ant-core-1.7.1-r4.ebuild 2908 SHA256 417f9902d1dfb594998e4513472eddcf3d50dc847926178c2bd832e2fbab7765 SHA512 1310fc831b3efee83a020b2c2a9f46636f9b4ae935d92495a7a0e2f36bc9e0d87dfc5778c5993f76b8966546a43069c2e05a8eb23d9cf0f1b0ffe1ea40092d69 WHIRLPOOL b0d13743835ababc35d0a5d90582f2e2c457fe8992a4865149b7befd403e67e94c1305d3e362d3c07ca7cf664d74774a4f012dfa221a2f6a0673058151c3e43b
 EBUILD ant-core-1.7.1-r5.ebuild 3049 SHA256 c7f13479cf13a64a9bf5afc7a4b4e7f9eadd939e5d462a670a3cab4f8a2ed2eb SHA512 a0639adf4b1b15e3e0f6fc14789df5f9410eca6b20499eb3de689715f1ed0730a964224c21851c1f597b90a264b5cd82391fb628273ede73e5399de1dabe84da WHIRLPOOL afdf83ede55a46cb95c830d427b5f130f8dda1e45134b210e9f5110b83b1c4f64b154abab520f34888edc3327035fa98ba5eb833fdafc526b60a55389b56e555
 EBUILD ant-core-1.8.0-r1.ebuild 3051 SHA256 56109c7782e4778465edd5c44709c90217f7ffd608de14e6ccdaec90a10abf67 SHA512 fc6927924ab01e8fd6fbff1e81ffc95a78f211f7292b37c78fd242ab8d23d0c3571dac2a8d5bb0ce75edc20fa5e212e0960f6afca563c5468d9ac61a997f8fea WHIRLPOOL 9cc679231674cff16b0a6bce02dd94f8557dbfad6b79bbe14ab7e0df24bccbd087ee4c03b736e553a163f23e28f99a49228174920ef6474b814ba5a3c63d36d1
@@ -22,22 +24,17 @@ EBUILD ant-core-1.8.1.ebuild 3015 SHA256 0c9e21fa0e2d06a0f41d4ca3adf26ee3b850f43
 EBUILD ant-core-1.8.2.ebuild 3252 SHA256 550c54e5795c39da7f2d31bab5c413b7540804d84b2b858e629ebdf2b4146c7e SHA512 1dbbce5375b04d5aeec3b0d6f1dcb8df2dc7aa102ec972f8c712f65240aff821f41a95bb3744760497e27b87152126cc2dd13abf06cd8228c36aa68340f99581 WHIRLPOOL 1ceea737fd8e045661fa1d0999c234443c13899d58627195f611e003213537728c9d6badca5599a1913e84f5b119c31516bc534dc4ba2e790d453a5bdff53607
 EBUILD ant-core-1.8.4-r1.ebuild 3269 SHA256 7bc28f4bc238865965faffe0f7720d8c88aad6c09abe69d769ccafd5305ba33b SHA512 c82c6357bf39be4fdda1dd5da7d2d56a4f769bd1f6134dea58835ba578f12033923fb5082ffed6e55810d58837cc7a61480878764104327a94f2a6d9863dc7ce WHIRLPOOL 168a0e57dbf185a7a87edaa47b7b95ae73564718254a9d1b2ae99e795f587cd62c11d9518930852dc41c8f4ed2898c66a837c54e872ebc2eddc6242672f791f9
 EBUILD ant-core-1.8.4.ebuild 3261 SHA256 9f86144257f232f17e8612192a0d17177304e6d6005b12702155cf7b81a8b62d SHA512 fa864a011a1a91b7d8647a120da973e01956687c4b0f582254f3b761d77e6d7f518de9426bacece30b0c86645b9f96549097f988fe53543c5ee30a1c4812a868 WHIRLPOOL e4e29040f1d82b9449369e1721c6f98a41a02244c4f590ed6f13aa95c055414fb08b31d9bbf9ecd286ff4a454e0fb2b59e7edba068ed143a810beae5cbd44de5
-MISC ChangeLog 31941 SHA256 1072ac6d28d0e6ddb8594d1a40677cf4f818f6a2eac19db1c0870aad0ae17931 SHA512 7eac617d4efab7b1ade3a4e188b28a01422c9206fd3b12337f5741aa86786c57170ddeee3dc6cd81ea03b31d7cd8839cf97141963fc7219fff47bf74126459db WHIRLPOOL 951f2f9423dd6dd95a4f28e66a4a1317a66425081eb94fd416179dd7aaa64e5941cfb981866b0f6e70e9a8bd40a1b059d7667a035153f51cf64deba815941619
+EBUILD ant-core-1.9.1.ebuild 3232 SHA256 abab49153fd3e17a7fb1d65e43c6f504c3c0d72d20e2a5d8cba020b43d91cb42 SHA512 aebc82a1c7e6392cadbef32f19ade85653d91745f68a3bfda509fd4e1a730e15aefe688f70b9af037ed04733bb903302bf44fbb547709e55e68d710832679131 WHIRLPOOL 66e43779f39e4c566c1d4158d1dce40b9a3684cc9488e6382567f412d0c2f0f6a1b0330bcc8ea8c1681e720a594edbd1d669869119231e960783a35e2c2af7e6
+MISC ChangeLog 32066 SHA256 daccd8d38a8c06114450e87f09acc6106a4b9c2be7d24dc36c4e6ba601dc04ea SHA512 e0334fcc469963de28011d31d251ffc52266745a00faef683d8a6775205edd2c8b2aeb39210d79e06cf19eccce6b5247c9d5657fea9fbd28c2fe3a68cd7d731d WHIRLPOOL da9d64ed8038778a848c73cbfa878fc8635d19d7431004f911965ce1a93dd076014fa61924de507e63e89486f8333493907c07c4f10c0e163e04e021a730f4f1
 MISC metadata.xml 158 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb SHA512 54f88fc3270968439ba87295b04365a89101c55d33a8c209a56036dc60244e5c73f78ec09484b3e5af28de9dee2159b1dab670cbd5d80a9e0c4543145c0390a3 WHIRLPOOL fcffc4fb6751b5a6eec33aa833f9d7dea0168d3ab67f7e34565370f92fd917ed882bcc57585481bf4d31e601f83a592d99d1c3f50fc793f1c38cd174cc8b2f26
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCgAGBQJREJijAAoJEKXdFCfdEflK7pIP/0iR8MLnBxsgS8xCpS3y9J41
-6lT90C23+W7Q6OEEzg9K5I9saqpokTLOkI4XjV6ohe3hkj80d4nuaD2wXFVy9P43
-11MGyV1v7NdTDkmyIcqQ8ekAmfC+8CLLCPEw8h3XmISUoShdMSMMEX2F3mLmJ+zA
-oZdLN/K/b4wZJEoc1d/pwMkbV5t48NoU1iEQZDOXwsGCxxi2z2vu25A+d6LF9r0z
-V0sc478HI2LTu5vAdszf7pU78Yp+L0imkwsAAigVQq3E61ehlb+Zv/6eMbVBv7CR
-A236hdQlVmycPc73W23aY4vSb8yrzNGu3nQPLmjSLy6JZktCKle/BISUEX/eOHev
-W/dAmKfD2xjGhWSDqAk4ViSBTonYr8I7zOIzcQ52uUN1PUvOi5xB05HoG5MJkQZD
-m0RRpnfqaDDXqbL6OGE1syATRUGEiLiCGTeFALDR5wCf5/qy7/0dsxo4v9bR013t
-Jod3G+soYqEobL21HVQlgK0+sakJ0wkjbWzSZ2AhNndX2c2DvfPDWnw345PMi3P5
-GZHiCV8MkxPev8MNuD8hWs4x5Zgp7qA1/4dH0vdmsTJniUnVMJkHkr0z4+M1DKv4
-aTkSiG6SQSzNqDNtDEcc8BTBqP5v/bZyy7W9AkzaGOfA3l2abTAit58q5of1kqGJ
-ZuqSrDWZMd72nSHuMsEO
-=JSwv
+iQEcBAEBCAAGBQJR1qb5AAoJEJWyH81tNOV9+G8H+QFhdUNixJstx1oAS/VvWWPE
+jb2/SHWpY6eYBkauTtp4sIfqMiOIrkQq2w9TJKI80BK4O+mdS1dCRjaQXhpB+gku
+Ip/9QC1B7m/iD8cU1ARQOZTl4L0fyEK9aeVTEtvZSUh9FNeQq4tSaQkHN8oMqDXR
+EZaaoalfDsidWzAKWRW5G3x84A69ik8HjH04+ZrXM/xaVq71W1lv2oafB7MxhCjo
+Id0RrCn5QRU9kWSoaiEZH/c6o5WYHw1ZHQID0hP+5kiX/IH9OnHvfwfvFAsleJBX
+sKFFqmvXrXMz9Y2EOl7J1SdvCHnEua+PjraI4ZhOQ3085AFwe+S0UAi37j5bwK0=
+=3WLq
 -----END PGP SIGNATURE-----
diff --git a/dev-java/ant-core/ant-core-1.9.1.ebuild b/dev-java/ant-core/ant-core-1.9.1.ebuild
new file mode 100644
index 000000000000..f9ba1d18c319
--- /dev/null
+++ b/dev-java/ant-core/ant-core-1.9.1.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ant-core-1.9.1.ebuild,v 1.1 2013/07/05 11:02:05 tomwij Exp $
+
+EAPI="5"
+
+# Don't depend on itself.
+JAVA_ANT_DISABLE_ANT_CORE_DEP="true"
+
+# Rewriting build.xml files for the testcases has no use at the moment.
+JAVA_PKG_BSFIX_ALL="no"
+JAVA_PKG_IUSE="doc source"
+
+inherit eutils java-pkg-2 java-ant-2 prefix versionator
+
+MY_P="apache-ant-${PV}"
+
+DESCRIPTION="Java-based build tool similar to 'make' that uses XML configuration files."
+HOMEPAGE="http://ant.apache.org/"
+SRC_URI="mirror://apache/ant/source/${MY_P}-src.tar.bz2
+	http://dev.gentoo.org/~tomwij/files/dist/ant-${PV}-gentoo.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~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"
+
+DEPEND=">=virtual/jdk-1.5
+	!dev-java/ant-tasks
+	!dev-java/ant-optional"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+RESTRICT="test"
+
+src_prepare() {
+	EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches/"
+	eprefixify "${WORKDIR}/ant"
+
+	# use our split-ant build.xml.
+	mv -f "${WORKDIR}/build.xml" . || die
+
+	# See bug #196080 for more details.
+	java-ant_bsfix_one build.xml
+	java-pkg-2_src_prepare
+}
+
+src_compile() {
+	export ANT_HOME=""
+
+	local bsyscp
+
+	# This ensures that when building ant with bootstrapped ant,
+	# only the source is used for resolving references, and not
+	# the classes in bootstrapped ant but jikes in kaffe has issues with this...
+	if ! java-pkg_current-vm-matches kaffe; then
+		bsyscp="-Dbuild.sysclasspath=ignore"
+	fi
+
+	CLASSPATH="$(java-config -t)" ./build.sh ${bsyscp} jars internal_dist \
+		$(use_doc javadocs) || die "build failed"
+}
+
+src_install() {
+	dodir /usr/share/ant/lib
+
+	for jar in ant.jar ant-bootstrap.jar ant-launcher.jar ; do
+		java-pkg_dojar build/lib/${jar}
+		dosym /usr/share/${PN}/lib/${jar} /usr/share/ant/lib/${jar}
+	done
+
+	dobin "${WORKDIR}/ant"
+
+	dodir /usr/share/${PN}/bin
+	for each in antRun antRun.pl runant.pl runant.py complete-ant-cmd.pl ; do
+		dobin "${S}/src/script/${each}"
+		dosym /usr/bin/${each} /usr/share/${PN}/bin/${each}
+	done
+	dosym /usr/share/${PN}/bin /usr/share/ant/bin
+
+	insinto /usr/share/${PN}
+	doins -r dist/etc
+	dosym /usr/share/${PN}/etc /usr/share/ant/etc
+
+	echo "ANT_HOME=\"${EPREFIX}/usr/share/ant\"" > "${T}/20ant"
+	doenvd "${T}/20ant"
+
+	dodoc NOTICE README WHATSNEW KEYS
+
+	if use doc; then
+		dohtml -r manual/*
+		java-pkg_dojavadoc --symlink manual/api build/javadocs
+	fi
+
+	use source && java-pkg_dosrc src/main/*
+}
+
+pkg_postinst() {
+	if [[ -n ${REPLACING_VERSIONS} ]]; then
+		if ! version_is_at_least 1.7.0 ${REPLACING_VERSIONS}; then
+			elog "The way of packaging ant in Gentoo has changed significantly since"
+			elog "the 1.7.0 version, For more information, please see:"
+			elog "http://www.gentoo.org/proj/en/java/ant-guide.xml"
+		fi
+
+		if ! version_is_at_least 1.7.1 ${REPLACING_VERSIONS}; then
+			elog "Since 1.7.1, the ant-tasks meta-ebuild has been removed and its USE"
+			elog "flags have been moved to dev-java/ant."
+		fi
+	fi
+}