summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetteri Räty <betelgeuse@gentoo.org>2005-08-02 20:55:58 +0000
committerPetteri Räty <betelgeuse@gentoo.org>2005-08-02 20:55:58 +0000
commit3b8d5d9ec6c71b45bb7d69588106d905c63c4905 (patch)
treef7ed458bb01e54a2ff6bac7d4985d791e19d2e3c
parentUpdate version. (diff)
downloadgentoo-2-3b8d5d9ec6c71b45bb7d69588106d905c63c4905.tar.gz
gentoo-2-3b8d5d9ec6c71b45bb7d69588106d905c63c4905.tar.bz2
gentoo-2-3b8d5d9ec6c71b45bb7d69588106d905c63c4905.zip
Removed putting class files to the installed src zip file.
(Portage version: 2.0.51.22-r2)
-rw-r--r--dev-java/junit/ChangeLog5
-rw-r--r--dev-java/junit/Manifest12
-rw-r--r--dev-java/junit/junit-3.8.1-r1.ebuild21
3 files changed, 19 insertions, 19 deletions
diff --git a/dev-java/junit/ChangeLog b/dev-java/junit/ChangeLog
index b5ab6de9626e..0237c52fd528 100644
--- a/dev-java/junit/ChangeLog
+++ b/dev-java/junit/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-java/junit
# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/junit/ChangeLog,v 1.20 2005/07/09 16:05:44 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/junit/ChangeLog,v 1.21 2005/08/02 20:55:58 betelgeuse Exp $
+
+ 02 Aug 2005; Petteri Räty <betelgeuse@gentoo.org> junit-3.8.1-r1.ebuild:
+ The installed source package doesn't include class files any more.
09 Jul 2005; Thomas Matthijs <axxo@gentoo.org> junit-3.8.1-r1.ebuild:
fix deps, and source useflag support
diff --git a/dev-java/junit/Manifest b/dev-java/junit/Manifest
index 217f91f11d04..fc3138489d83 100644
--- a/dev-java/junit/Manifest
+++ b/dev-java/junit/Manifest
@@ -1,14 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 b60a51cab4033a7d018fa827f6ab3b41 junit-3.8.1-r1.ebuild 1145
MD5 be3ad39dbdaaf1f70fe4eb172890ce1f ChangeLog 3148
+MD5 28d4323b150df8e925793b105e264206 junit-3.8.1-r1.ebuild 1351
MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
MD5 bab94fdc8a6c2abf20e0f2cee4849a4e files/digest-junit-3.8.1-r1 59
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCz/Xy/rLF9B432nYRAkTeAKCdG/x1evI6zMj1KgKA7h+iwTh++QCfQeRz
-EBAqDWP6B3uq4IYyvqZ3hP4=
-=TH2d
------END PGP SIGNATURE-----
diff --git a/dev-java/junit/junit-3.8.1-r1.ebuild b/dev-java/junit/junit-3.8.1-r1.ebuild
index 91e1cc8437dd..e92623f4e7c4 100644
--- a/dev-java/junit/junit-3.8.1-r1.ebuild
+++ b/dev-java/junit/junit-3.8.1-r1.ebuild
@@ -1,13 +1,13 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/junit/junit-3.8.1-r1.ebuild,v 1.7 2005/07/09 16:05:44 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/junit/junit-3.8.1-r1.ebuild,v 1.8 2005/08/02 20:55:58 betelgeuse Exp $
inherit java-pkg
-NP=${P/-/}
-S=${WORKDIR}/${NP}
+MY_P=${P/-/}
+S=${WORKDIR}/${MY_P}
DESCRIPTION="Simple framework to write repeatable tests"
-SRC_URI="mirror://sourceforge/${PN}/${NP}.zip"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip"
HOMEPAGE="http://www.junit.org/"
LICENSE="CPL-1.0"
SLOT="0"
@@ -34,11 +34,18 @@ src_compile() {
}
src_install() {
- use source && java-pkg_dosrc junit
- cd ${NP}
+ cd ${MY_P}
java-pkg_dojar junit.jar
dodir /usr/share/ant-core/lib
dosym /usr/share/junit/lib/junit.jar /usr/share/ant-core/lib/
- java-pkg_dohtml -r README.html cpl-v10.html
+ java-pkg_dohtml -r README.html cpl-v10.html || die "failed to install docs"
use doc && java-pkg_dohtml -r doc javadoc
+
+ if use source; then
+ #we need to clean so that we don't install useless class files to the
+ #src zip file.
+ cd ${S}
+ ant clean || die "failed to clean the source tree"
+ java-pkg_dosrc junit
+ fi
}