Version bump to 1.9.2. Fixes security bug #476958.

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

3 files changed, 82 insertions, 10 deletions

diff --git a/dev-java/ant/ChangeLog b/dev-java/ant/ChangeLog
index 4a0a7bc8d3d6..750a5f893a7f 100644
--- a/dev-java/ant/ChangeLog
+++ b/dev-java/ant/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/ant
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant/ChangeLog,v 1.139 2013/07/05 14:38:33 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant/ChangeLog,v 1.140 2013/08/28 22:23:01 tomwij Exp $
+
+*ant-1.9.2 (28 Aug 2013)
+
+  28 Aug 2013; Tom Wijsman <TomWij@gentoo.org> +ant-1.9.2.ebuild:
+  Version bump to 1.9.2. Fixes security bug #476958.
 
 *ant-1.9.1 (05 Jul 2013)
 
diff --git a/dev-java/ant/Manifest b/dev-java/ant/Manifest
index b7b0985e9cd6..8f678f15f090 100644
--- a/dev-java/ant/Manifest
+++ b/dev-java/ant/Manifest
@@ -7,16 +7,17 @@ EBUILD ant-1.8.1.ebuild 2092 SHA256 581bea02278871eb3aef0616c2fdbf8cc144c6cb4b4f
 EBUILD ant-1.8.2.ebuild 2254 SHA256 555ba1d6ee0098e3d6243841907c5c425c3497279e659e281f3200e9573577c2 SHA512 c7a4c24e990ecfc0bb3a72e8cb228ffbcec8f5ab5904d5715aeed40864a3998d50953003b354b8140ec7188676dfca1c4d1d3d75bb40d771ee2fed9dce2045ca WHIRLPOOL 534a95be96d57ba4f0cc8f3177c29aaeac4bb86bdb630e77bccec0446c196a7f840beaf7a076e3d40743e97fb45df49592584cf7c77271888992246cc8fa2d04
 EBUILD ant-1.8.4.ebuild 2252 SHA256 7d29b7e3a8c90062a1094dbe6d69519db6af4f6baec21de3a9d5d4e45102e88b SHA512 ebace348ae1ede4587f489e6bea0aa135afefdff794d68d6bb250edb7f0db01da7b226c97fedb9e0480644ef25a260ab83045e5bd90561ee8dfaef335fa82f8c WHIRLPOOL 0f43f91c27283d92c7ab58a4c420f9aa73f964fb19840af602951ef8a1111bd658f79e3b296a0b49627f7d895080457309cc73799b5ec649567a93727c4abcc5
 EBUILD ant-1.9.1.ebuild 2250 SHA256 e8660ae42832ecd18a2080a164985ce2301b1062506168da4ad6833f49e4603d SHA512 c7359da235ba3855ba7184df294a9af78ec6967386f7df05e9f9d7f5de6dbb9b02e78202b2677614e77ad576c69222422136aa9e95aea831f08589985073a52b WHIRLPOOL 1a93b65969e0c4fd15eb9d89eab39a78d8d673294a9582f039e2a13d22a9b1c61505dabb778684a4405caf0414e7f9adfc13cdacb73999639e5754d76e273d90
-MISC ChangeLog 6578 SHA256 ab5320bb3d7567c22495c59057c66c620f2fc8c8e53dce69e5c650506519378e SHA512 520aefd0b6eb5a3bfec9229083c495380e8b397e844ec64d8af0511b3c59963d7d2a36b1afe3cd7a0ae2ebb7002dccfbb6e72508c00f8252fd4442ff9cfcb534 WHIRLPOOL c8304c4c6b0a79e8339ace53aa0c2d5c4271b2e72c5bdeeb3f34792657f6cf6de63a1a79b91e2e3ea7ac7e5af6fe7a5b043b07efa6688127e3d8d56ba302aeeb
+EBUILD ant-1.9.2.ebuild 2250 SHA256 a0d443897268279247e8273d90e9cad223943c4dedbd9b63f19edbddfa520c8a SHA512 dd014f5d697dc23952da0edec01d06504a1a5d80ca19d70b850c5de48db1ee9a27ac52552b826c060102dad19be10428cbc9d3d54232bba91ff88ebbc7443e19 WHIRLPOOL 3c32813958231018462a944ec58271d88dd4bf10bbe8f3ea136ca4c9a28554a7d5ec386d6295580065538e34c9dba562b83965f1c01536781b7688c10c8f6491
+MISC ChangeLog 6724 SHA256 436dc1f51818eeb636ff27ba93ab1eb4f99c35f36c0467b4df4c5fede763d7e0 SHA512 f89387f4983908be6aab69a328f4fc45aa4f341d9e22b5e1e489902c59395405e666a8f0c7016b8327a38a90ec568a49986c9c4071e0f0ca01973f83ac8caf8f WHIRLPOOL ea3512e14868af43b59b9cb6b8307ced5d596958272e779960e4e2fbe22c0685c2115ba767755b38179f8cd541f0ebb491cd30de1f151be126850d856cd1185a
 MISC metadata.xml 1076 SHA256 013d89ddc64f92df85732549c4d2e3333faf84b0951cb2db91ae2a7dce8db4a5 SHA512 ab6f4abbc32a37db4eb2dd8f98bbe7d7591d0fe70dac1c9eee045a1b90144f80836c960a84265fe78f72cec55914a58d39ba07c46c11f59493203e17a38113cc WHIRLPOOL 032735e6a6ca3e1671ddaed58ee1f756c9131a9f53aac51eaa432494d366fbd20a42f6e29dd6693a4cf0c0f77bb253e9570c44a90a1c246dfb0afda0f68cf565
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.21 (GNU/Linux)
 
-iQEcBAEBCAAGBQJR1tmzAAoJEJWyH81tNOV9yW4H/3BOe9uIYKP44MQw/Uz3bPpq
-4cxyorrpod8xGC4UF99tquolfBAWR4evuJRwVMNQ1x48rjMQIyhVNX3ttOsvgdn0
-mUWK4/lPaThOh7xnaNK31+3uZb1eejozWoTICO2qXB+hfNSFc5Alp1q9G9aRwjzc
-WZtfOsg+8z8Z5JM7vNdf6D971EfLg58v1OYBl4Rs+5bvf9YcB+Twsf1Ke7ZkKmw1
-q2W+jru6kptcKSGAOaCMO3564CiQ8/YMk7/3EiDD9Q2Glkb43ay/EVXxqyYXu37k
-lgSxetbwf+Q7ZnhrztmRnXIGY0g4rypazyY07u0mOliXFf4Js1bSYA73Fc3+Bf4=
-=ZKMT
+iQEcBAEBCAAGBQJSHnhMAAoJEJWyH81tNOV9YXcIAMi6WO7tavTiS0Rtv32XLpYd
+tS0Bu8+j9TovHc9Gc/a/Jd68Z+uBX+go9uAyHqkEQiTd4jRs+zsL1/rOLC9EUiF6
++Y8Iud8i3IiJdNrHg8PSHJdUhkNdD1YvnD+ZNOf/JFRs6ZlFWg2mESbD0psEsB6B
+acce7/X8rIGg/L1WLX6Tn6riS48AIPMyGJVgSsQwyVNi68Pj2M9+EU53MqvQ0sgt
+CRvwnhVX5jZYac5IR35xVRFZstdlo/TtVhThstzx3HOOlhx+oQ5Koen4SqRgQs+c
++SEOUkNBwJJVCTK41Halcq1gL0kqrGFMwU4YrMYFeHY30xFv0vFAipXGeFEh+i4=
+=g6i3
 -----END PGP SIGNATURE-----
diff --git a/dev-java/ant/ant-1.9.2.ebuild b/dev-java/ant/ant-1.9.2.ebuild
new file mode 100644
index 000000000000..661e8bd866b3
--- /dev/null
+++ b/dev-java/ant/ant-1.9.2.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant/ant-1.9.2.ebuild,v 1.1 2013/08/28 22:23:01 tomwij Exp $
+
+EAPI="5"
+
+inherit versionator
+
+DESCRIPTION="Java-based build tool similar to 'make' that uses XML configuration files."
+HOMEPAGE="http://ant.apache.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~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="~dev-java/ant-core-${PV}"
+RDEPEND="${DEPEND}"
+
+IUSE="X +antlr +bcel +bsf +commonslogging +commonsnet jai +javamail +jdepend jmf
+	+jsch +log4j +oro +regexp +resolver testutil"
+
+RDEPEND="~dev-java/ant-core-${PV}
+	~dev-java/ant-nodeps-${PV}
+	~dev-java/ant-junit-${PV}
+	!dev-java/ant-optional
+	!dev-java/ant-tasks
+	~dev-java/ant-trax-${PV}
+	~dev-java/ant-apache-xalan2-${PV}
+	antlr? ( ~dev-java/ant-antlr-${PV} )
+	bcel? ( ~dev-java/ant-apache-bcel-${PV} )
+	bsf? ( ~dev-java/ant-apache-bsf-${PV} )
+	log4j? ( ~dev-java/ant-apache-log4j-${PV} )
+	oro? ( ~dev-java/ant-apache-oro-${PV} )
+	regexp? ( ~dev-java/ant-apache-regexp-${PV} )
+	resolver? ( ~dev-java/ant-apache-resolver-${PV} )
+	commonslogging? ( ~dev-java/ant-commons-logging-${PV} )
+	commonsnet? ( ~dev-java/ant-commons-net-${PV} )
+	jai? ( ~dev-java/ant-jai-${PV} )
+	javamail? ( ~dev-java/ant-javamail-${PV} )
+	jdepend? ( ~dev-java/ant-jdepend-${PV} )
+	jmf? ( ~dev-java/ant-jmf-${PV} )
+	jsch? ( ~dev-java/ant-jsch-${PV} )
+	testutil? ( ~dev-java/ant-testutil-${PV} )
+	X? ( ~dev-java/ant-swing-${PV} )"
+
+DEPEND=""
+
+S="${WORKDIR}"
+
+src_compile() { :; }
+
+pkg_postinst() {
+	if [[ -n ${REPLACING_VERSIONS} ]]; then
+		# if we update from a version below 1.7.1
+		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."
+			elog
+			elog "You may now freely set the USE flags of this package without breaking"
+			elog "building of Java packages, which depend on the exact ant tasks they need."
+			elog "The USE flags default to enabled (except X, jai and jmf) for convenience."
+		fi
+	fi
+}