From: Petteri Räty <betelgeuse@gentoo.org>
Date: Thu, 8 Mar 2007 13:36:29 +0000 (+0000)
Subject: Ebuild cleanup.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=90aadf08849e2968221ca971ef661798408d479f;p=gentoo.git

Ebuild cleanup.
Package-Manager: portage-2.1.2.1-r1
---

diff --git a/dev-java/jvyaml/ChangeLog b/dev-java/jvyaml/ChangeLog
index 83a1745c4f8a..897b4c1d718c 100644
--- a/dev-java/jvyaml/ChangeLog
+++ b/dev-java/jvyaml/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/jvyaml
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jvyaml/ChangeLog,v 1.6 2007/03/08 05:54:25 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jvyaml/ChangeLog,v 1.7 2007/03/08 13:36:29 betelgeuse Exp $
+
+  08 Mar 2007; Petteri Räty <betelgeuse@gentoo.org> jvyaml-0.2.1-r1.ebuild:
+  Ebuild cleanup.
 
 *jvyaml-0.2.1-r1 (08 Mar 2007)
 
diff --git a/dev-java/jvyaml/Manifest b/dev-java/jvyaml/Manifest
index d6cb73b33bff..c88a07171f26 100644
--- a/dev-java/jvyaml/Manifest
+++ b/dev-java/jvyaml/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX jvyaml-0.2-tests.patch 747 RMD160 163a08abf8b7477bdbe13cb8c340fb964812e737 SHA1 8cc4120b4a4dd7b299de9bdb1bb5f642d261285a SHA256 62be871c80556271cfee3fa2e28cd39c0d0143a8fc99b97360c6af320ac91095
 MD5 db647417d6ed80598130573ac245a32c files/jvyaml-0.2-tests.patch 747
 RMD160 163a08abf8b7477bdbe13cb8c340fb964812e737 files/jvyaml-0.2-tests.patch 747
@@ -7,18 +10,18 @@ MD5 61a872812befaea58167cfaada8ddfad files/jvyaml-0.2.1-tests.patch 1731
 RMD160 39ba2bba31820a6077f5216f790f133d46811d0b files/jvyaml-0.2.1-tests.patch 1731
 SHA256 a519817ab3062298e2e6bc8b45124fa9beb8aa26abfbc150723c3fbc825ecdb2 files/jvyaml-0.2.1-tests.patch 1731
 DIST jvyaml-src-0.2.1.tar.gz 202550 RMD160 92b11e208f194365e669f0923294fa5a37e60723 SHA1 d42dcd43d47cb74edb19339ed22a4829c58a2223 SHA256 a21c47679bac174b6185265358c7c8e151ac1ee8c4f9fbceebe9b15a37a10382
-EBUILD jvyaml-0.2.1-r1.ebuild 1099 RMD160 7b2aa5f160ca103a07e276f09484650421b87870 SHA1 8ce44d5e7932263de953d0f0548cc883011d9ab0 SHA256 5b4f10d6fa3325961905d82002e4153f56407eb45c39808930658a2e50174633
-MD5 8ae2b2b6216f663682f033b76855cc38 jvyaml-0.2.1-r1.ebuild 1099
-RMD160 7b2aa5f160ca103a07e276f09484650421b87870 jvyaml-0.2.1-r1.ebuild 1099
-SHA256 5b4f10d6fa3325961905d82002e4153f56407eb45c39808930658a2e50174633 jvyaml-0.2.1-r1.ebuild 1099
+EBUILD jvyaml-0.2.1-r1.ebuild 1089 RMD160 e2e8e6923d51a55a4b77593b51d89013fa415851 SHA1 76efb8ab712e45cf5fd20b36baaa0e504708c3ca SHA256 76ea9da1c01c63ed9de64d9032f2f12d71c8805c8b8392c38ac9615c5d60cbd4
+MD5 76dc375c50d3d606601fda6f8b86ad39 jvyaml-0.2.1-r1.ebuild 1089
+RMD160 e2e8e6923d51a55a4b77593b51d89013fa415851 jvyaml-0.2.1-r1.ebuild 1089
+SHA256 76ea9da1c01c63ed9de64d9032f2f12d71c8805c8b8392c38ac9615c5d60cbd4 jvyaml-0.2.1-r1.ebuild 1089
 EBUILD jvyaml-0.2.1.ebuild 1051 RMD160 974dd58a48a5c0b1127f53ee1dae5f2cd34304bb SHA1 e636466a74a6d2c5c2f2beef64497504a80a5175 SHA256 68a1a6ceb76f39f41785f754dbbbbe1bd2f5923a1e854cb56b26772250b650db
 MD5 97fc8c2fb877bd268fd2061d61fd0a79 jvyaml-0.2.1.ebuild 1051
 RMD160 974dd58a48a5c0b1127f53ee1dae5f2cd34304bb jvyaml-0.2.1.ebuild 1051
 SHA256 68a1a6ceb76f39f41785f754dbbbbe1bd2f5923a1e854cb56b26772250b650db jvyaml-0.2.1.ebuild 1051
-MISC ChangeLog 1267 RMD160 23e33de16c3c15a429c6f1f517884beab7315f16 SHA1 09e9d8e4af9f07b2c2cc1b7df92275b44c839dce SHA256 97484b0931f80450f9f077de086caf621cd5b2ac7584c90994bb869b1654aeaf
-MD5 6481b1ac11e402f568ba369a82e042a3 ChangeLog 1267
-RMD160 23e33de16c3c15a429c6f1f517884beab7315f16 ChangeLog 1267
-SHA256 97484b0931f80450f9f077de086caf621cd5b2ac7584c90994bb869b1654aeaf ChangeLog 1267
+MISC ChangeLog 1367 RMD160 49528b223f1d50dad8f9621fd504259f230f4915 SHA1 6d163523db056cb7d3cdab9ead381ec795af811e SHA256 8e8a3b6b012c0c73e1a5979599348294102898c303a1e48afe8b16bf28faed74
+MD5 563b2c79c83aca72209c14f46d4a28dc ChangeLog 1367
+RMD160 49528b223f1d50dad8f9621fd504259f230f4915 ChangeLog 1367
+SHA256 8e8a3b6b012c0c73e1a5979599348294102898c303a1e48afe8b16bf28faed74 ChangeLog 1367
 MISC metadata.xml 252 RMD160 668af83772a7008b999bfe22da86e6d763c58d05 SHA1 7a38c8eea607b775e3b67757b0deda944aa27c65 SHA256 530d1e67c69f08b473ce1a5e7bbab5682e6deee068b27dbb57d459ca61c1290a
 MD5 04e248f270fb5cf8193c02ebd018d503 metadata.xml 252
 RMD160 668af83772a7008b999bfe22da86e6d763c58d05 metadata.xml 252
@@ -29,3 +32,10 @@ SHA256 a15e3363aec05e63f55ffa2ae037eb9e465db16c5b5d92f34e491ea34b42ff1a files/di
 MD5 06738cdf044183df3d88222d2b294dfe files/digest-jvyaml-0.2.1-r1 250
 RMD160 476830a0f3cbc20655b319387a1e6e4e0eb9617b files/digest-jvyaml-0.2.1-r1 250
 SHA256 a15e3363aec05e63f55ffa2ae037eb9e465db16c5b5d92f34e491ea34b42ff1a files/digest-jvyaml-0.2.1-r1 250
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.2 (GNU/Linux)
+
+iD8DBQFF8BFjcxLzpIGCsLQRAs7kAKCXa0oFLKSPQYr32OqB/BrDAj+qQgCePgrI
+FxgLcyvFmtEjP7niRirDrIg=
+=hEUA
+-----END PGP SIGNATURE-----
diff --git a/dev-java/jvyaml/jvyaml-0.2.1-r1.ebuild b/dev-java/jvyaml/jvyaml-0.2.1-r1.ebuild
index 09deaf74efdc..e48ef0d76c48 100644
--- a/dev-java/jvyaml/jvyaml-0.2.1-r1.ebuild
+++ b/dev-java/jvyaml/jvyaml-0.2.1-r1.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jvyaml/jvyaml-0.2.1-r1.ebuild,v 1.1 2007/03/08 05:54:25 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jvyaml/jvyaml-0.2.1-r1.ebuild,v 1.2 2007/03/08 13:36:29 betelgeuse Exp $
+
+JAVA_PKG_IUSE="doc source"
 
 inherit java-pkg-2 java-ant-2 eutils
 
@@ -10,36 +12,32 @@ SRC_URI="https://${PN}.dev.java.net/files/documents/5215/41455/${PN}-src-${PV}.t
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="source test"
+
 DEPEND=">=virtual/jdk-1.4
 	test? (
 		dev-java/ant
 		dev-java/junit
 	)
-	!test? (
-		dev-java/ant-core
-	)
-	source? ( app-arch/zip )"
+	dev-java/ant-core"
 RDEPEND=">=virtual/jre-1.4"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 	# https://jvyaml.dev.java.net/issues/show_bug.cgi?id=6
-	epatch ${FILESDIR}/${PN}-0.2-tests.patch
+	epatch "${FILESDIR}/${PN}-0.2-tests.patch"
 
 	# https://jvyaml.dev.java.net/issues/show_bug.cgi?id=5
-	epatch ${FILESDIR}/${P}-tests.patch
+	epatch "${FILESDIR}/${P}-tests.patch"
 
 	cd lib
-	rm *.jar
+	rm -v *.jar || die
 	use test && java-pkg_jar-from --build-only junit
 }
 
 src_install() {
 	java-pkg_dojar lib/${PN}.jar
-	dodoc README
-	dodoc CREDITS
+	dodoc README CREDITS || die
 	use source && java-pkg_dosrc src/*
 }