dev-dotnet/ant-dotnet: added java herd to metadata.xml, moved dev-java/ant-core to runtime dependencies, removed redundant parameters from java-specific function calls, added some "|| die"s

Package-Manager: portage-2.1.2.9

4 files changed, 34 insertions, 26 deletions

diff --git a/dev-dotnet/ant-dotnet/ChangeLog b/dev-dotnet/ant-dotnet/ChangeLog
index 3b3b0d9d9542..a52975f8bdda 100644
--- a/dev-dotnet/ant-dotnet/ChangeLog
+++ b/dev-dotnet/ant-dotnet/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-dotnet/ant-dotnet
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/ant-dotnet/ChangeLog,v 1.1 2007/06/30 22:30:12 jurek Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/ant-dotnet/ChangeLog,v 1.2 2007/07/01 12:40:44 jurek Exp $
+
+  01 Jul 2007; Jurek Bartuszek <jurek@gentoo.org> metadata.xml,
+  ant-dotnet-1.0.ebuild:
+  - Added java herd to metadata.xml
+  - Moved dev-java/ant-core to runtime dependencies
+  - Removed redundant parameters from java-specific function calls
+  - Added some "|| die"s
 
 *ant-dotnet-1.0 (30 Jun 2007)
 
diff --git a/dev-dotnet/ant-dotnet/Manifest b/dev-dotnet/ant-dotnet/Manifest
index 48e84f3fc4eb..d4fcd9ae61a1 100644
--- a/dev-dotnet/ant-dotnet/Manifest
+++ b/dev-dotnet/ant-dotnet/Manifest
@@ -2,25 +2,25 @@
 Hash: SHA1
 
 DIST apache-ant-dotnet-1.0-src.tar.bz2 85651 RMD160 27966f9f8b78ded80b2536ec6ae0b877921d0f9f SHA1 025234e33cec7548d689daed6b1e753e5ad7aef7 SHA256 55a8cd8330790c941efcdf1bb136c5b5b75c2c6fb20344c43b2eb786eaffbe8a
-EBUILD ant-dotnet-1.0.ebuild 959 RMD160 24bfdd1d31166de67590551cb70f9f59bb4b6357 SHA1 4d645e697d088f1f8cfb675b700f5d906c274b00 SHA256 45e2cc7ea04b6545fc4286df39e34d130387e72c14bfa4366d9cc2ba5c7b1f79
-MD5 6ced2c2f205e1f48171ca267483f44c7 ant-dotnet-1.0.ebuild 959
-RMD160 24bfdd1d31166de67590551cb70f9f59bb4b6357 ant-dotnet-1.0.ebuild 959
-SHA256 45e2cc7ea04b6545fc4286df39e34d130387e72c14bfa4366d9cc2ba5c7b1f79 ant-dotnet-1.0.ebuild 959
-MISC ChangeLog 485 RMD160 fdffdefa46d4b4660bbf1625c3e62572f8513134 SHA1 3b81170a7622914ea3b609a4591c199ce1ab8d61 SHA256 96119c8e3ec6789cb922779c82bed0aca764231bedbd38cd2ee864c375f22352
-MD5 35acb04676d114f8536b5f4501258533 ChangeLog 485
-RMD160 fdffdefa46d4b4660bbf1625c3e62572f8513134 ChangeLog 485
-SHA256 96119c8e3ec6789cb922779c82bed0aca764231bedbd38cd2ee864c375f22352 ChangeLog 485
-MISC metadata.xml 251 RMD160 c87695e01cf7a981ddd9f659d3e333da42b45f23 SHA1 df82d1167aa2452fd70985ce0affaf8cfeb21536 SHA256 62b26767094e94c9c285bce5f820209e2edfb9d4a9dac78e194ea485fa84b64f
-MD5 f20da4f3b954c7118639e75d493c35b9 metadata.xml 251
-RMD160 c87695e01cf7a981ddd9f659d3e333da42b45f23 metadata.xml 251
-SHA256 62b26767094e94c9c285bce5f820209e2edfb9d4a9dac78e194ea485fa84b64f metadata.xml 251
+EBUILD ant-dotnet-1.0.ebuild 1034 RMD160 2156fe8185d7aa21b56834b8e7eeb13e29dd275c SHA1 15d81b7350327da50da590fc4d5b61edccd4d6a7 SHA256 9e7ec6a88bde5e107173497fc0c7c4cc739345d15ef1eb34313258e7dda59f28
+MD5 1aac85bbab90d995bb8ddeabc4709cc9 ant-dotnet-1.0.ebuild 1034
+RMD160 2156fe8185d7aa21b56834b8e7eeb13e29dd275c ant-dotnet-1.0.ebuild 1034
+SHA256 9e7ec6a88bde5e107173497fc0c7c4cc739345d15ef1eb34313258e7dda59f28 ant-dotnet-1.0.ebuild 1034
+MISC ChangeLog 755 RMD160 0e94e738e59fbc67ba2aa314bc638e2037065c0d SHA1 0fdacbf6c0b379c5dea5be7e69fb948cf3923613 SHA256 78977a11e5170ba22756e93f7357cc32116b34da04468e0df9db49b6741d9353
+MD5 1c440d40a914fc00b1185c9fa20b45f7 ChangeLog 755
+RMD160 0e94e738e59fbc67ba2aa314bc638e2037065c0d ChangeLog 755
+SHA256 78977a11e5170ba22756e93f7357cc32116b34da04468e0df9db49b6741d9353 ChangeLog 755
+MISC metadata.xml 269 RMD160 9314352f4a3a70e811257fe518adf1eaa9899db8 SHA1 5f9f2eef45952b90cb6a0015343b6e22214caed6 SHA256 2408bcdb73ddd22e09cb5cee41b61cbe3cf6989ebad64a2469f3a854a47d0803
+MD5 8e6c4a5977e3a1fa25893c6dcc1a1e7c metadata.xml 269
+RMD160 9314352f4a3a70e811257fe518adf1eaa9899db8 metadata.xml 269
+SHA256 2408bcdb73ddd22e09cb5cee41b61cbe3cf6989ebad64a2469f3a854a47d0803 metadata.xml 269
 MD5 b4b05feb83a23583062a6e079a852f6a files/digest-ant-dotnet-1.0 277
 RMD160 88747220e1faf3c5d893a612a11329e2d6afa67e files/digest-ant-dotnet-1.0 277
 SHA256 222bafdfee62d24123018b7d4d21c052b1b348e939ddcc734cdc32b65c8f4700 files/digest-ant-dotnet-1.0 277
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFGhtl5yvXkcyXx2ogRAk6pAJ44Wsx5emcajk5qSfwblZsXsIFy+gCfUoIM
-v05mGfTJVjyCF4fN25bBvq0=
-=czo3
+iD8DBQFGh6DQyvXkcyXx2ogRAp2tAJ90sV72oXASYy2uiA/wtwW+XGC55QCeIJbI
+yGe6UcPiB/EFvFmIB9BY/BI=
+=Lv60
 -----END PGP SIGNATURE-----
diff --git a/dev-dotnet/ant-dotnet/ant-dotnet-1.0.ebuild b/dev-dotnet/ant-dotnet/ant-dotnet-1.0.ebuild
index d91955437768..35eb220c5f62 100644
--- a/dev-dotnet/ant-dotnet/ant-dotnet-1.0.ebuild
+++ b/dev-dotnet/ant-dotnet/ant-dotnet-1.0.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-dotnet/ant-dotnet/ant-dotnet-1.0.ebuild,v 1.1 2007/06/30 22:30:12 jurek Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/ant-dotnet/ant-dotnet-1.0.ebuild,v 1.2 2007/07/01 12:40:44 jurek Exp $
 
 inherit java-pkg-2 java-ant-2
 
@@ -12,12 +12,12 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc"
 
-RDEPEND=">=virtual/jre-1.2
+RDEPEND=">=virtual/jre-1.4
+		>=dev-java/ant-core-1.7.0
 		>=dev-lang/mono-1.1"
 
 DEPEND="${RDEPEND}
-		>=virtual/jdk-1.2
-		>=dev-java/ant-core-1.7.0"
+		>=virtual/jdk-1.4"
 
 S="${WORKDIR}/apache-${P}"
 
@@ -25,14 +25,14 @@ EANT_BUILD_TARGET="antlib"
 EANT_DOC_TARGET=""
 
 src_install() {
-	java-pkg_newjar build/lib/${P}.jar ${PN}.jar
-	java-pkg_register-ant-task ${PN}
+	java-pkg_newjar build/lib/${P}.jar
+	java-pkg_register-ant-task
 
 	if use doc; then
-		insinto /usr/share/doc/${PF}
-		doins -r docs/*
+		insinto /usr/share/doc/${PF} || die "insinto failed"
+		doins -r docs/* || die "doins failed"
 	fi
 
-	dodoc NOTICE TODO WHATSNEW CONTRIBUTORS README
-	dohtml README.html
+	dodoc NOTICE TODO WHATSNEW CONTRIBUTORS README || die "dodoc failed"
+	dohtml README.html || die "dohtml failed"
 }
diff --git a/dev-dotnet/ant-dotnet/metadata.xml b/dev-dotnet/ant-dotnet/metadata.xml
index 7fbfe4a26cc7..08dbccac9a5c 100644
--- a/dev-dotnet/ant-dotnet/metadata.xml
+++ b/dev-dotnet/ant-dotnet/metadata.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+<herd>java</herd>
 <herd>dotnet</herd>
 <maintainer>
   <email>jurek@gentoo.org</email>