From: Petteri Räty <betelgeuse@gentoo.org>
Date: Sat, 17 Mar 2007 20:53:05 +0000 (+0000)
Subject: Ebuild cleanup.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=96efef6b682e42c7c6c5afc78553dbe7358cc75d;p=gentoo.git

Ebuild cleanup.
Package-Manager: portage-2.1.2.2
---

diff --git a/dev-java/ecs/ChangeLog b/dev-java/ecs/ChangeLog
index dbad9578727b..521c94ef819e 100644
--- a/dev-java/ecs/ChangeLog
+++ b/dev-java/ecs/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/ecs
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ecs/ChangeLog,v 1.16 2007/03/17 20:44:22 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ecs/ChangeLog,v 1.17 2007/03/17 20:53:05 betelgeuse Exp $
+
+  17 Mar 2007; Petteri Räty <betelgeuse@gentoo.org> ecs-1.4.2-r1.ebuild:
+  Ebuild cleanup.
 
 *ecs-1.4.2-r1 (17 Mar 2007)
 
diff --git a/dev-java/ecs/Manifest b/dev-java/ecs/Manifest
index 08d4158a901e..d98663997dbc 100644
--- a/dev-java/ecs/Manifest
+++ b/dev-java/ecs/Manifest
@@ -7,18 +7,18 @@ EBUILD ecs-1.4.1-r1.ebuild 1274 RMD160 3391155efa635dc50704aa2d0adf77e17196a6a9
 MD5 461564751fd8c2cf80c178154db0e371 ecs-1.4.1-r1.ebuild 1274
 RMD160 3391155efa635dc50704aa2d0adf77e17196a6a9 ecs-1.4.1-r1.ebuild 1274
 SHA256 5b6d14d967362b23b72f9273982330d9a16f82ce70ad8507b3878b69f1c1e814 ecs-1.4.1-r1.ebuild 1274
-EBUILD ecs-1.4.2-r1.ebuild 1247 RMD160 3f87201034ecd82665bec62e82aa1c329878aeaa SHA1 df81d2309b9530ea5538847ed33b557ff57fdc44 SHA256 d4fe5ff1bb3c67d2d6b5c8f1f5581fbe1249484b6038459c63b8b5e8b0e7bdd4
-MD5 d32a9db27b08f8a9a9f53fa08ddb8ad2 ecs-1.4.2-r1.ebuild 1247
-RMD160 3f87201034ecd82665bec62e82aa1c329878aeaa ecs-1.4.2-r1.ebuild 1247
-SHA256 d4fe5ff1bb3c67d2d6b5c8f1f5581fbe1249484b6038459c63b8b5e8b0e7bdd4 ecs-1.4.2-r1.ebuild 1247
+EBUILD ecs-1.4.2-r1.ebuild 1206 RMD160 da56319b3981479166af62677e065dd57067efb7 SHA1 803c1dc3f28ffbe1f41630eb17daec8111938809 SHA256 6b626f72dbe336d203472e2056804ea72d48ec422a85b6511054527b4dc35ce3
+MD5 ec51bbdbfc4782c0434caa8b6624d626 ecs-1.4.2-r1.ebuild 1206
+RMD160 da56319b3981479166af62677e065dd57067efb7 ecs-1.4.2-r1.ebuild 1206
+SHA256 6b626f72dbe336d203472e2056804ea72d48ec422a85b6511054527b4dc35ce3 ecs-1.4.2-r1.ebuild 1206
 EBUILD ecs-1.4.2.ebuild 1273 RMD160 9dc69543f072bf7559d42cfdeee0bdd67285b861 SHA1 6f382998b6c1dd8ef381c1cb4a561caf6451ef6f SHA256 b8e260bafaac987028639b8d5173c019e15deebd3a08a4da6ded8023501c46a3
 MD5 5b2e7456eab9921009db7c61c1b7eb99 ecs-1.4.2.ebuild 1273
 RMD160 9dc69543f072bf7559d42cfdeee0bdd67285b861 ecs-1.4.2.ebuild 1273
 SHA256 b8e260bafaac987028639b8d5173c019e15deebd3a08a4da6ded8023501c46a3 ecs-1.4.2.ebuild 1273
-MISC ChangeLog 1965 RMD160 ffc99520b1ec0554c989a54f3343467f49679337 SHA1 fbd96ba53461ad27590fb68af4fd1582b728bf7f SHA256 4f49a81d0c5598ba1b4149f40a7da0adb6265a077c12f18d00f3dee8e73fe481
-MD5 fc3511665325fac1d8da758e713f1068 ChangeLog 1965
-RMD160 ffc99520b1ec0554c989a54f3343467f49679337 ChangeLog 1965
-SHA256 4f49a81d0c5598ba1b4149f40a7da0adb6265a077c12f18d00f3dee8e73fe481 ChangeLog 1965
+MISC ChangeLog 2060 RMD160 1180bf7043976efa1d0ac45e18dde3955f784c7d SHA1 23da126f4cf27b807f598e8c51274ef02b847843 SHA256 ccdbe5d218ff08c9075d7fb6fb927d4b803a2f652268d0c8566502b41903989e
+MD5 769a25a3e5b83ac1c24cd9d28ead9ea2 ChangeLog 2060
+RMD160 1180bf7043976efa1d0ac45e18dde3955f784c7d ChangeLog 2060
+SHA256 ccdbe5d218ff08c9075d7fb6fb927d4b803a2f652268d0c8566502b41903989e ChangeLog 2060
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
@@ -35,7 +35,7 @@ SHA256 058908899d13126e5ef77489293c7ff059ae04a426a52aecd973b3b8a4c3385c files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFF/FPbgo/w9rxVVVERAnyVAJ9O/zL455u5m9+Ld9tQiRBmZA4BDACeMYsX
-6zRG78uEP4ACYcatTK6HQzU=
-=XNDS
+iD8DBQFF/FU4cxLzpIGCsLQRAs0JAJ0fLDiJtSdRaAH/y17/94vMyKt7hQCgjDsr
+/3LRi1FAr9EnBpFWlGqum+A=
+=L0bi
 -----END PGP SIGNATURE-----
diff --git a/dev-java/ecs/ecs-1.4.2-r1.ebuild b/dev-java/ecs/ecs-1.4.2-r1.ebuild
index 16b4e544e036..bbf1b26fe6f5 100644
--- a/dev-java/ecs/ecs-1.4.2-r1.ebuild
+++ b/dev-java/ecs/ecs-1.4.2-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/ecs/ecs-1.4.2-r1.ebuild,v 1.1 2007/03/17 20:44:22 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ecs/ecs-1.4.2-r1.ebuild,v 1.2 2007/03/17 20:53:05 betelgeuse Exp $
 
 inherit java-pkg-2 java-ant-2
 
@@ -26,9 +26,9 @@ src_unpack() {
 	unpack ${A}
 
 	cd "${S}"
-	rm -f lib/*.jar
-	rm -f build/*.jar
-	rm -f ecs*.jar
+	rm -v lib/*.jar || die
+	rm -v build/*.jar || die
+	rm -v ecs*.jar || die
 
 	java-ant_bsfix_one build/build-ecs.xml
 
@@ -37,16 +37,13 @@ src_unpack() {
 	java-pkg_jar-from jakarta-regexp-1.3 jakarta-regexp.jar regexp.jar
 }
 
-src_compile() {
-	local antflags="jar"
-	use doc && antflags="${antflags} javadocs"
-	eant -f build/build-ecs.xml ${antflags}
-}
+EANT_BUILD_XML="build/build-ecs.xml"
+EANT_DOC_TARGET="javadocs"
 
 src_install() {
-	java-pkg_newjar bin/${P}.jar ${PN}.jar
+	java-pkg_newjar bin/${P}.jar
 
-	dodoc AUTHORS ChangeLog README
+	dodoc AUTHORS ChangeLog README || die
 	use doc && java-pkg_dojavadoc docs/*
 	use source && java-pkg_dosrc src/java/*
 }