summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetteri Räty <betelgeuse@gentoo.org>2007-01-10 18:27:58 +0000
committerPetteri Räty <betelgeuse@gentoo.org>2007-01-10 18:27:58 +0000
commit95b6f2cd560c26ecc0e949d09c11708505810561 (patch)
treea260a10d5382734b8351047289f1ab5aa7002c3d /dev-java/jline
parentant_src_unpack is deprecated (diff)
downloadgentoo-2-95b6f2cd560c26ecc0e949d09c11708505810561.tar.gz
gentoo-2-95b6f2cd560c26ecc0e949d09c11708505810561.tar.bz2
gentoo-2-95b6f2cd560c26ecc0e949d09c11708505810561.zip
Fixed to compile with JAVA_PKG_STRICT.
(Portage version: 2.1.2_rc4-r7)
Diffstat (limited to 'dev-java/jline')
-rw-r--r--dev-java/jline/ChangeLog5
-rw-r--r--dev-java/jline/jline-0.9.9-r1.ebuild13
2 files changed, 14 insertions, 4 deletions
diff --git a/dev-java/jline/ChangeLog b/dev-java/jline/ChangeLog
index 480d97eccb44..33e6ec5537c1 100644
--- a/dev-java/jline/ChangeLog
+++ b/dev-java/jline/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-java/jline
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jline/ChangeLog,v 1.3 2007/01/05 04:22:49 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jline/ChangeLog,v 1.4 2007/01/10 18:27:58 betelgeuse Exp $
+
+ 10 Jan 2007; Petteri Räty <betelgeuse@gentoo.org> jline-0.9.9-r1.ebuild:
+ Fixed to compile with JAVA_PKG_STRICT.
05 Jan 2007; Joshua Nichols <nichoj@gentoo.org> jline-0.9.9-r1.ebuild:
Added ~ppc.
diff --git a/dev-java/jline/jline-0.9.9-r1.ebuild b/dev-java/jline/jline-0.9.9-r1.ebuild
index c9fdc050a6d5..0f643aac5afe 100644
--- a/dev-java/jline/jline-0.9.9-r1.ebuild
+++ b/dev-java/jline/jline-0.9.9-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jline/jline-0.9.9-r1.ebuild,v 1.2 2007/01/05 04:22:49 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jline/jline-0.9.9-r1.ebuild,v 1.3 2007/01/10 18:27:58 betelgeuse Exp $
inherit java-pkg-2 java-ant-2
@@ -13,9 +13,12 @@ SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86"
IUSE="source"
+# TODO: use maven to create a build.xml that does not always
+# run tests
DEPEND=">=virtual/jdk-1.4
dev-java/ant-core
app-arch/unzip
+ dev-java/junit
source? ( app-arch/zip )"
RDEPEND=">=virtual/jre-1.4"
@@ -23,13 +26,17 @@ S="${WORKDIR}/${P}/src"
src_unpack() {
unpack ${A}
- cd ${S}
- mkdir lib
+ rm -v "${P}"/*.jar
+ cd "${S}"
# we don't support maven for building yet. this build.xml was generated by:
# - mvn ant:ant
# - tweak build.xml to use <fileset dir="lib" includes="**/*.jar" for
# build.classpath
cp ${FILESDIR}/build-${PV}.xml build.xml || die "failed to copy build.xml"
+
+ mkdir lib
+ cd lib
+ java-pkg_jar-from --build-only junit
}
src_install() {