summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Harder <radhermit@gentoo.org>2013-05-09 18:23:34 +0000
committerTim Harder <radhermit@gentoo.org>2013-05-09 18:23:34 +0000
commitf3cf21cec3f01957e6d8d322d68f9f881c1244c1 (patch)
treebc1c28f28abf46d2e7a3e317ae745da287b5bdd6 /dev-java
parentbug numb (diff)
downloadgentoo-2-f3cf21cec3f01957e6d8d322d68f9f881c1244c1.tar.gz
gentoo-2-f3cf21cec3f01957e6d8d322d68f9f881c1244c1.tar.bz2
gentoo-2-f3cf21cec3f01957e6d8d322d68f9f881c1244c1.zip
Remove redundant metadata description, drop unnecessary hamcrest-core test dep, use correct jdk/jre dep, and set outputted jar filename.
(Portage version: 2.2.0_alpha174/cvs/Linux x86_64, signed Manifest commit with key 4AB3E85B4F064CA3)
Diffstat (limited to 'dev-java')
-rw-r--r--dev-java/joda-convert/ChangeLog7
-rw-r--r--dev-java/joda-convert/joda-convert-1.3.1.ebuild16
-rw-r--r--dev-java/joda-convert/metadata.xml3
3 files changed, 14 insertions, 12 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/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>