Remove redundant metadata description, drop unnecessary hamcrest-core test dep, use correct jdk/jre dep, and set outputted jar filename.

Package-Manager: portage-2.2.0_alpha174/cvs/Linux x86_64
Manifest-Sign-Key: 0x4AB3E85B4F064CA3

4 files changed, 24 insertions, 22 deletions

diff --git a/dev-java/joda-convert/ChangeLog b/dev-java/joda-convert/ChangeLog
index 01f26209270f..7b72fce896a1 100644
--- a/dev-java/joda-convert/ChangeLog
+++ b/dev-java/joda-convert/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/joda-convert
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/joda-convert/ChangeLog,v 1.2 2013/05/09 15:39:54 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/joda-convert/ChangeLog,v 1.3 2013/05/09 18:23:34 radhermit Exp $
+
+  09 May 2013; Tim Harder <radhermit@gentoo.org> joda-convert-1.3.1.ebuild,
+  metadata.xml:
+  Remove redundant metadata description, drop unnecessary hamcrest-core test
+  dep, use correct jdk/jre dep, and set outputted jar filename.
 
   09 May 2013; Tom Wijsman <TomWij@gentoo.org> joda-convert-1.3.1.ebuild:
   Use test functionality from the eclass and proper slotted dependencies.
diff --git a/dev-java/joda-convert/Manifest b/dev-java/joda-convert/Manifest
index 4c1e6685b626..1a38ba0f3da2 100644
--- a/dev-java/joda-convert/Manifest
+++ b/dev-java/joda-convert/Manifest
@@ -3,17 +3,17 @@ Hash: SHA256
 
 AUX joda-convert-1.3.1-build.xml 10459 SHA256 f8d10e8045681e688424de6f2db9d703cba1cca7906cd7d263f3e6ed49e7cf6a SHA512 cfeec9e9ee537814eaa3277037e45878a71b80cd73705bce560cf24d1c0d20033dadd030dcc447b1be5ad742fa97637f57931cab96ca7e21d6b79c7897d7f0ce WHIRLPOOL 69b1790299d38202d3bdb790f40a0eac92453b58b223532c4cbd0e1878a51fa99b27b3e7bbe7734181b6c8e90e2e9f25ecd5ce98f239924215b9665c8858022e
 DIST joda-convert-1.3.1-dist.tar.gz 131288 SHA256 f73decd925a63ff23f010c2e0f894662ccce087eece4027dc0353574a7d2e537 SHA512 ee3f7264e9ee445dd8cf088c862809faceb012d317c4974d2312e1ce9b580193096259978a79cdefc2217818600ff38569348625986e19bdb753edb03ba58451 WHIRLPOOL 1ed3df81cd70bfa52bd82b74d5a4e412d46ca54ca250e2d24a0ba6d0711ee29cb82696b9d3e24dc1f43d563506d8334a76646a3902513c2ba221b91f6e79583b
-EBUILD joda-convert-1.3.1.ebuild 1029 SHA256 452e570b45fe63e2cf47e52aff52565bca27253a67ed4e02d2184595b2ac435a SHA512 4283e85f0b222ec8ccffb32190a82f11b45f58fccb1fe3c2857ae40d2c2134d9a8f5f23a1fc0329a3f206f36a15d517388d9e24b783779a02afcd1404d5d7f5e WHIRLPOOL 54f9f679332b81199e0523aa366bd3e9c899e68939898c1cabc99d862e8677ad2e600cba061c0576d0ec2452205527ef86f8ea4661e2235aac5533b43dd3b987
-MISC ChangeLog 633 SHA256 9ad52ed462344df95af5829fa29d7895d05b9225ba680ebe3cd3f15cb3d6d21a SHA512 798a469c840ec20fdcbc2a2d68b60689573db966a2e88d680bd418e017654e84eeb19bc64de3d9b078016cc925984ae29775e6de360884e6f0caba7d7207ee67 WHIRLPOOL 4a28cdcff38dfc79b5b69df5224d452a142c5c08eaa20bb6713300bdcc624f037ad8a86e9c71a090b8d3386fafa1f42d7acb68fca199c223e540245584e97a51
-MISC metadata.xml 259 SHA256 2666070fc817a8260eb5f2c2a6f8304b87a1beb1d870ebe0f9dda88b0397a83f SHA512 2962b3fe7866a7a368d7686c0680ce7714ad1b9aa4052f8fdabdaab62ecdcfac6dd01ee7d0184e199310771011546775278f6596f4dcde71f123b8a5709b9bf3 WHIRLPOOL 645ccdecfb46d668d0f1853b159306922234034ad92bde9feb948b9a8ce29ddd0565a701bf10142600fb84d3ef534c217149c50c3fa625367ea5fa9a4d28d0a1
+EBUILD joda-convert-1.3.1.ebuild 1076 SHA256 e1ee9f62c573669fa91540ea189ca28b25f0885fa72e55bbd464ffa196730c33 SHA512 bfd15b9edb96dedd4a01f61905a1ac5285ac1bf6fb9aff5fdfda28102e9b5611468dc180ab5b59d0a28e9693ecad6850d3f5c74cd40b77e7f7603269bebdf99f WHIRLPOOL 970f2db4bb1e83b7b77d9926a4cba5907aa055cfd0ec39b2e2cbc3e17e3a9a91185544e698337d80bf01a94a3f69720b8485e430fcc8394d98b582067b9e0248
+MISC ChangeLog 870 SHA256 b0e8ac01ebef983669174c40cbe367f90503b115a1ab83989ac78d852cbecae1 SHA512 13569d323bf4008734c0f011268399c41a500c225d0f2cc6ecd6d34060b076c718ecd9a2dffb4f591ead981fb66f557737d2a3e331e6599da125e39ed8dc1230 WHIRLPOOL af61756bf5fbe079015f7bc5eb1f9a7a35a34aca973a6264d705a4703856736097903fd74c2d0c3c3fee262e690e7897af1201f666046045d80df2d2f8bb3573
+MISC metadata.xml 159 SHA256 a4ced33e98b00e3a3f725c4c40ef8e76c338db53389465ef871105fbe6e8cbbb SHA512 74dc9ada199a90543b8e1c168c7054f2e973fbfa2551e2b959d67501f2538e269cfb4b2f0905a88a1afa04c20b33961336310ba876f80d47c8e7615b2d7c830a WHIRLPOOL a0ac49efeca233ec4d8f63eb69c8e46e1d4ecbd926693c25b1b8c7415e4c565680936aec46f0c4197116fd7a19a3bb571beee493c18bdae1e5e978e3db84f17a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRi8LwAAoJEJWyH81tNOV9b5AH/RsR1fboGlP7JnAyzbv+KXtd
-ikoljOTG3A1kUgMjWBePvJPEiemsnH5ZLhQJqAc0+WvVLsc8BXV7I8uKWaE+eGyi
-cdiHo/VMiRYG91nXp0kgpTeil6Y83NxaJ6pcwIb3JCW05vB/TW77JZOXRE8+iXlo
-m7oQ/JlAvoVCh+7y5WbNzZXMosG7xZgIT+IBoX4JVjUuRRlOit+NZAfefmf+h43E
-1oviyd5k28LFRZAJQtG4EdQfwr2aUP8kwi3Z57olFAQBLvHOvqiT3o6HATGVTYN4
-a+QbocENgH6sg9c/fJiJIWJC40UTWf51E49g3V1MbQYBlRPXs5j2CDtHnbnqdP4=
-=HAYk
+iQEcBAEBCAAGBQJRi+msAAoJEEqz6FtPBkyjblcIAIxpTklGEwdL1IsIJterZltb
+5vlqL9uOCTqF1RaveKWwfbokaA3RWAHfK4uiyUro94vjJI3t2QGT43bfqsIMo52b
+lUUHftGV0nou7r2FFR9Gmz04fJZF/S15kkF8GPK2p4ueuyvqXn0YK6fM3Lbni/bW
+TD8KwHaSlRLvCY4CuBrJ3q7tpd6aOK/xBa4QfgY4TLq8oxw+EZE0dQ3oHVvPC415
+Neb8rjwpUpQ0PgjjCwDze3duY7A+4W2YJ15Oibi5y8I+K+q0FosXfUfuB90iX+Zh
+8FVP74NoG1BshYsGS2zfHA3eFXcIkIybOBbO1ka6onCQ6hHU98KdFasnIFgr74Q=
+=GZ2E
 -----END PGP SIGNATURE-----
diff --git a/dev-java/joda-convert/joda-convert-1.3.1.ebuild b/dev-java/joda-convert/joda-convert-1.3.1.ebuild
index 1bc1858cda8b..ce9319329399 100644
--- a/dev-java/joda-convert/joda-convert-1.3.1.ebuild
+++ b/dev-java/joda-convert/joda-convert-1.3.1.ebuild
@@ -1,9 +1,8 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/joda-convert/joda-convert-1.3.1.ebuild,v 1.2 2013/05/09 15:39:54 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/joda-convert/joda-convert-1.3.1.ebuild,v 1.3 2013/05/09 18:23:34 radhermit Exp $
 
 EAPI="5"
-
 JAVA_PKG_IUSE="doc source test"
 JAVA_ANT_REWRITE_CLASSPATH="true"
 
@@ -17,26 +16,27 @@ LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-DEPEND=">=virtual/jdk-1.5
+DEPEND=">=virtual/jdk-1.6
 	test? (
 		dev-java/junit:4
 		dev-java/ant-junit:0
-		dev-java/hamcrest-core:0
 	)"
-RDEPEND=">=virtual/jre-1.5"
+RDEPEND=">=virtual/jre-1.6"
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_TEST_GENTOO_CLASSPATH="junit-4"
+EANT_EXTRA_ARGS="-Dmaven.build.finalName=${PN}"
 
 java_prepare() {
 	cp "${FILESDIR}"/${P}-build.xml build.xml || die
 }
 
-EANT_TEST_GENTOO_CLASSPATH="junit-4"
-
 src_test() {
 	java-pkg-2_src_test
 }
 
 src_install() {
-	java-pkg_newjar target/${P}.jar ${PN}.jar
+	java-pkg_dojar target/${PN}.jar
 	dodoc NOTICE.txt RELEASE-NOTES.txt
 
 	use doc && java-pkg_dojavadoc doc/api
diff --git a/dev-java/joda-convert/metadata.xml b/dev-java/joda-convert/metadata.xml
index c70e551e758a..250f2d1940ea 100644
--- a/dev-java/joda-convert/metadata.xml
+++ b/dev-java/joda-convert/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>java</herd>
-  <longdescription>
-    Java library for conversion between Object and String.
-  </longdescription>
 </pkgmetadata>