summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetteri Räty <betelgeuse@gentoo.org>2007-01-11 12:59:01 +0000
committerPetteri Räty <betelgeuse@gentoo.org>2007-01-11 12:59:01 +0000
commited31b3ee00a70e267a563e8c17d2fd3301db895e (patch)
treec448b8bf6336a1b3ba3ef6261abee61d38b2bf50 /dev-java/oscache
parentReplace find with find . for *BSD compatibility. (diff)
downloadgentoo-2-ed31b3ee00a70e267a563e8c17d2fd3301db895e.tar.gz
gentoo-2-ed31b3ee00a70e267a563e8c17d2fd3301db895e.tar.bz2
gentoo-2-ed31b3ee00a70e267a563e8c17d2fd3301db895e.zip
Ebuild cleanup.
(Portage version: 2.1.2_rc4-r7)
Diffstat (limited to 'dev-java/oscache')
-rw-r--r--dev-java/oscache/ChangeLog8
-rw-r--r--dev-java/oscache/oscache-2.0.2-r1.ebuild18
2 files changed, 15 insertions, 11 deletions
diff --git a/dev-java/oscache/ChangeLog b/dev-java/oscache/ChangeLog
index e42cd1491f31..001cb243fcb6 100644
--- a/dev-java/oscache/ChangeLog
+++ b/dev-java/oscache/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-java/oscache
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/oscache/ChangeLog,v 1.5 2006/08/10 04:18:52 nichoj Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/oscache/ChangeLog,v 1.6 2007/01/11 12:59:01 betelgeuse Exp $
+
+ 11 Jan 2007; Petteri Räty <betelgeuse@gentoo.org>
+ oscache-2.0.2-r1.ebuild:
+ Ebuild cleanup.
*oscache-2.0.2-r1 (10 Aug 2006)
diff --git a/dev-java/oscache/oscache-2.0.2-r1.ebuild b/dev-java/oscache/oscache-2.0.2-r1.ebuild
index 02df78350ad5..53541ac35829 100644
--- a/dev-java/oscache/oscache-2.0.2-r1.ebuild
+++ b/dev-java/oscache/oscache-2.0.2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/oscache/oscache-2.0.2-r1.ebuild,v 1.1 2006/08/10 04:18:52 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/oscache/oscache-2.0.2-r1.ebuild,v 1.2 2007/01/11 12:59:01 betelgeuse Exp $
inherit java-pkg-2
@@ -27,7 +27,7 @@ S=${WORKDIR}
src_unpack() {
unpack ${A}
- rm *.jar
+ rm -v *.jar
}
src_compile() {
@@ -37,16 +37,16 @@ src_compile() {
echo "Building core..."
cd ${S}/src/core/java
- ejavac ${classpath} -nowarn -d ${build_dir} $(find -name "*.java") || die
+ ejavac ${classpath} -nowarn -d ${build_dir} $(find . -name "*.java") || die
echo "Building cluster support plugin..."
cd ${S}/src/plugins/clustersupport/java
- find -name "*.java" -exec sed -i -e "s/org.javagroups/org.jgroups/g" {} \;
- ejavac ${classpath} -nowarn -d ${build_dir} $(find -name "*.java") || die
+ find . -name "*.java" -exec sed -i -e "s/org.javagroups/org.jgroups/g" {} \;
+ ejavac ${classpath} -nowarn -d ${build_dir} $(find . -name "*.java") || die
echo "Building disk persistence plugin..."
cd ${S}/src/plugins/diskpersistence/java
- ejavac ${classpath} -nowarn -d ${build_dir} `find -name "*.java"` || die "compile failed"
+ ejavac ${classpath} -nowarn -d ${build_dir} `find . -name "*.java"` || die "compile failed"
if use doc ; then
echo "Building documentation..."
@@ -59,11 +59,11 @@ src_compile() {
fi
cd ${S}
- jar cf ${PN}.jar -C build .
+ jar cf ${PN}.jar -C build . || die "jar failed"
}
src_install() {
java-pkg_dojar *.jar
dodoc readme.txt
- use doc && java-pkg_dohtml -r javadoc
+ use doc && java-pkg_dojavadoc javadoc
}