From: Petteri Räty <betelgeuse@gentoo.org>
Date: Thu, 11 Jan 2007 12:59:01 +0000 (+0000)
Subject: Ebuild cleanup.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f41feba6c4cf9edfbb94d35d5e81c3c174b9ff4f;p=gentoo.git

Ebuild cleanup.
Package-Manager: portage-2.1.2_rc4-r7
---

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/Manifest b/dev-java/oscache/Manifest
index e0775b53783b..b4afc1267e8b 100644
--- a/dev-java/oscache/Manifest
+++ b/dev-java/oscache/Manifest
@@ -1,16 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST oscache-2.0.2-full.zip 2533146 RMD160 cd30ef95ce493d3b4b9f3809292e39d108115891 SHA1 14fc0cf95f82780a8b61223a831bf5149c0960f3 SHA256 d909d10aec024d9f53475030843afbb3c3bd18ee1a77b3e9e486a6f0fb336d52
-EBUILD oscache-2.0.2-r1.ebuild 2061 RMD160 b57a0c6da5015f4a3032ae4af0b53ae422023341 SHA1 78f09f826caccedf5c7eb6a891578a1f545f7520 SHA256 a4f614c6f7ee54647aa3dee2bb43e16357812b32aea8abce31837ddb2e7d6921
-MD5 b29fa8df7c71b8f0baa8f0546195dec8 oscache-2.0.2-r1.ebuild 2061
-RMD160 b57a0c6da5015f4a3032ae4af0b53ae422023341 oscache-2.0.2-r1.ebuild 2061
-SHA256 a4f614c6f7ee54647aa3dee2bb43e16357812b32aea8abce31837ddb2e7d6921 oscache-2.0.2-r1.ebuild 2061
+EBUILD oscache-2.0.2-r1.ebuild 2096 RMD160 93520ad6d2c4bc0e7399c729dd04dd1a2cff9c08 SHA1 c1fc0e71fc9ad5cb7b17b7624193a5addedc4af8 SHA256 7e360821b3bde89647283ef9d3dcee6a4f73f92f3cc0f2165ff235977799d0a3
+MD5 b1e5470ea28cd848dfa453396f259ed6 oscache-2.0.2-r1.ebuild 2096
+RMD160 93520ad6d2c4bc0e7399c729dd04dd1a2cff9c08 oscache-2.0.2-r1.ebuild 2096
+SHA256 7e360821b3bde89647283ef9d3dcee6a4f73f92f3cc0f2165ff235977799d0a3 oscache-2.0.2-r1.ebuild 2096
 EBUILD oscache-2.0.2.ebuild 2174 RMD160 e22b361b129a1e171ab9e04999e887019a986fbc SHA1 b9f12d23f97e7e0a776ec0b7252f2671387beaf6 SHA256 d96b39aa33447a6e066ccf33fd1249b777018dff022d6296a785780fba64890d
 MD5 207225faa2ef22bed3acdfb131d523ce oscache-2.0.2.ebuild 2174
 RMD160 e22b361b129a1e171ab9e04999e887019a986fbc oscache-2.0.2.ebuild 2174
 SHA256 d96b39aa33447a6e066ccf33fd1249b777018dff022d6296a785780fba64890d oscache-2.0.2.ebuild 2174
-MISC ChangeLog 907 RMD160 98c90a32e161d7ef8db3d01ca3ddaa7949908146 SHA1 b7d75bfacfb5a76fe30c5353620ee1e743dad531 SHA256 874588cc6e95ffc2dfdf5ec979df00686aa2c3931cc847d820428124a236b67a
-MD5 a659b3bd6e92467db3484332d6467a09 ChangeLog 907
-RMD160 98c90a32e161d7ef8db3d01ca3ddaa7949908146 ChangeLog 907
-SHA256 874588cc6e95ffc2dfdf5ec979df00686aa2c3931cc847d820428124a236b67a ChangeLog 907
+MISC ChangeLog 1010 RMD160 5e3129293ae3e5d2c713dd14057d0633226ce67e SHA1 be36b36e5d967f9be7065db09ceab48b57291fd3 SHA256 ba9e12a5caa32c685fda64e0ca24188b4223c4fb452c024921d6d31cc4c9b97a
+MD5 78d31f58abcd1f9ed6d425dce01a5d03 ChangeLog 1010
+RMD160 5e3129293ae3e5d2c713dd14057d0633226ce67e ChangeLog 1010
+SHA256 ba9e12a5caa32c685fda64e0ca24188b4223c4fb452c024921d6d31cc4c9b97a ChangeLog 1010
 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
 MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158
 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 metadata.xml 158
@@ -21,3 +24,10 @@ SHA256 1e4166c9f4a7e8150a0998d0aad1558ee6a27ece94911d61f64a12127fdd7c18 files/di
 MD5 191bc7a511a59a41785630ec5ae4e02e files/digest-oscache-2.0.2-r1 250
 RMD160 c44feff1a4530b74a97b134d2bf3d98eb305cdc1 files/digest-oscache-2.0.2-r1 250
 SHA256 1e4166c9f4a7e8150a0998d0aad1558ee6a27ece94911d61f64a12127fdd7c18 files/digest-oscache-2.0.2-r1 250
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.6 (GNU/Linux)
+
+iD8DBQFFpokDcxLzpIGCsLQRAg3WAJ9daCDqzxe7VItGSs10/MMrAj1gPQCgjVuh
+hiRcBKHQ1T56CgQLUhXQZyI=
+=KgoU
+-----END PGP SIGNATURE-----
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
 }