Ebuild cleanup.

Package-Manager: portage-2.1.3.15

4 files changed, 41 insertions, 35 deletions

diff --git a/app-misc/bfm/ChangeLog b/app-misc/bfm/ChangeLog
index 8c72a5c48f26..4437a58cc7b6 100644
--- a/app-misc/bfm/ChangeLog
+++ b/app-misc/bfm/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-misc/bfm
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/bfm/ChangeLog,v 1.6 2007/01/09 15:31:49 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/bfm/ChangeLog,v 1.7 2007/10/23 20:39:46 betelgeuse Exp $
+
+  23 Oct 2007; Petteri Räty <betelgeuse@gentoo.org> bfm-1.2-r1.ebuild:
+  Ebuild cleanup.
 
   09 Jan 2007; Vlastimil Babka <caster@gentoo.org> bfm-1.2.ebuild,
   bfm-1.2-r1.ebuild:
diff --git a/app-misc/bfm/Manifest b/app-misc/bfm/Manifest
index 34deaab7304d..53f5a31a6f9a 100644
--- a/app-misc/bfm/Manifest
+++ b/app-misc/bfm/Manifest
@@ -1,27 +1,37 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 1.2-build.xml 2000 RMD160 bf3e0500a5d53392c6c0339cc983cf0774f009b4 SHA1 07a753bf1a1f75a014bf3f00a595ae08a92a8252 SHA256 535e9706e9c0cd4689122f5e9be812ab3b0c5d10ee5c7ef4490c443447a786d2
 MD5 6dea2b3bc0db53c3153cb946dfb0a19c files/1.2-build.xml 2000
 RMD160 bf3e0500a5d53392c6c0339cc983cf0774f009b4 files/1.2-build.xml 2000
 SHA256 535e9706e9c0cd4689122f5e9be812ab3b0c5d10ee5c7ef4490c443447a786d2 files/1.2-build.xml 2000
 DIST bfm-1.2.tar.gz 193924 RMD160 6945c55d1bd974eb99aaf935b152f7466c9c3d4e SHA1 79dddea4ad1b65f0d0ac50ec3f7b062d0b2c573b SHA256 09294fb40e515198095b1df0744bb4eb0cd0aebe36df81827871e73d9df7bd6b
-EBUILD bfm-1.2-r1.ebuild 1814 RMD160 171edc68524d954797c389e2bc889fcf1cdbb7f2 SHA1 92e6d0816cff61821e483feccf47e7baaa19f88a SHA256 159d2759b1058570d914b6dafe4defd3e23af95e2e886ae593eb09c3af8dc57c
-MD5 9fd5f1c0eb0530a759da0631050e6dec bfm-1.2-r1.ebuild 1814
-RMD160 171edc68524d954797c389e2bc889fcf1cdbb7f2 bfm-1.2-r1.ebuild 1814
-SHA256 159d2759b1058570d914b6dafe4defd3e23af95e2e886ae593eb09c3af8dc57c bfm-1.2-r1.ebuild 1814
+EBUILD bfm-1.2-r1.ebuild 1683 RMD160 cb2d3696199cfd5db438bcbd035eb0cfd58dfe67 SHA1 7bad461e0d8a6990b0fdd85872ee02a14460f289 SHA256 a2b8a5a98382f1ce871ae36118dcf8d48b6984ec3b11120032530cdc2c610c32
+MD5 d541faaf5ed16e0c70e57700ba34e2de bfm-1.2-r1.ebuild 1683
+RMD160 cb2d3696199cfd5db438bcbd035eb0cfd58dfe67 bfm-1.2-r1.ebuild 1683
+SHA256 a2b8a5a98382f1ce871ae36118dcf8d48b6984ec3b11120032530cdc2c610c32 bfm-1.2-r1.ebuild 1683
 EBUILD bfm-1.2.ebuild 2123 RMD160 a2a2204bdbc1f9f092863ddc31d1bd4a14b3f94b SHA1 8d404be0ce682986715c4c3ffd1dfda112949364 SHA256 bbfc9e403e943905e80fae42137744c9fb5c57ff1cb0438424929f02d5e66c50
 MD5 d5534059592ca3a30b85c26abc3a3b63 bfm-1.2.ebuild 2123
 RMD160 a2a2204bdbc1f9f092863ddc31d1bd4a14b3f94b bfm-1.2.ebuild 2123
 SHA256 bbfc9e403e943905e80fae42137744c9fb5c57ff1cb0438424929f02d5e66c50 bfm-1.2.ebuild 2123
-MISC ChangeLog 1111 RMD160 fb32390b5a772150bca8da34014acc56d74ddd43 SHA1 fbde54ee31c2ec14f7bfa3b624920ca0a696b21c SHA256 d5b430f68ee691080eceb7ff39224853af4cd0a127955b669b67d7ea9c96f29c
-MD5 43b587494ed97f66a5b7983bb32d5836 ChangeLog 1111
-RMD160 fb32390b5a772150bca8da34014acc56d74ddd43 ChangeLog 1111
-SHA256 d5b430f68ee691080eceb7ff39224853af4cd0a127955b669b67d7ea9c96f29c ChangeLog 1111
-MISC metadata.xml 478 RMD160 14c08bf5158b44d0c7820d04d9ed4c3e18b8dc9d SHA1 485e2d76a8bf5cf31349b9f2667ae1f7327ff942 SHA256 f1806b6c40eadb72a7c93fe78788fd6e5110c4442a7743e81886b9f7ec1c12ec
-MD5 e9053dbd45cd43ac21e3198707006389 metadata.xml 478
-RMD160 14c08bf5158b44d0c7820d04d9ed4c3e18b8dc9d metadata.xml 478
-SHA256 f1806b6c40eadb72a7c93fe78788fd6e5110c4442a7743e81886b9f7ec1c12ec metadata.xml 478
+MISC ChangeLog 1206 RMD160 866866a93c865cb2f7499c87cf52a42504a31582 SHA1 239918b17fdcd54d48a9035b9c1979f71d73fe05 SHA256 2f5b56868eeee501356a9130986a05584866e6da97ce45cda1097ce890fa9ce4
+MD5 1ac7c51ef05ba3e956548dcbfa930246 ChangeLog 1206
+RMD160 866866a93c865cb2f7499c87cf52a42504a31582 ChangeLog 1206
+SHA256 2f5b56868eeee501356a9130986a05584866e6da97ce45cda1097ce890fa9ce4 ChangeLog 1206
+MISC metadata.xml 475 RMD160 4c56778a0c396aab42e5b0addd65b238c0057ba3 SHA1 9840a5a61dd919b5f22c8dc2bd0df27d2d62c913 SHA256 c40ea2182d825326c38783690363017f021504be7620f6475b5d477430f2bbd7
+MD5 ef9f369c7ca3fa889d59bb4bd7c930b3 metadata.xml 475
+RMD160 4c56778a0c396aab42e5b0addd65b238c0057ba3 metadata.xml 475
+SHA256 c40ea2182d825326c38783690363017f021504be7620f6475b5d477430f2bbd7 metadata.xml 475
 MD5 8e7a79361796584a0339a1e9c1b99136 files/digest-bfm-1.2 223
 RMD160 f6b175f9a86bbe4f82de0472659c915099109fcb files/digest-bfm-1.2 223
 SHA256 8dd215d04fd2a6381c33c0413e5007f2764fe2d7e60e7d5e8d1dbe84e26802e5 files/digest-bfm-1.2 223
 MD5 8e7a79361796584a0339a1e9c1b99136 files/digest-bfm-1.2-r1 223
 RMD160 f6b175f9a86bbe4f82de0472659c915099109fcb files/digest-bfm-1.2-r1 223
 SHA256 8dd215d04fd2a6381c33c0413e5007f2764fe2d7e60e7d5e8d1dbe84e26802e5 files/digest-bfm-1.2-r1 223
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.4 (GNU/Linux)
+
+iD8DBQFHHlwUcxLzpIGCsLQRAo1lAKCdfiAtkgpfRw6W+vFxyRD+ptU5JwCfT87h
+omr3IsjUPX37XFXIfhFHe3I=
+=wGH6
+-----END PGP SIGNATURE-----
diff --git a/app-misc/bfm/bfm-1.2-r1.ebuild b/app-misc/bfm/bfm-1.2-r1.ebuild
index ca8083c6ba08..f9acfb81ab8b 100644
--- a/app-misc/bfm/bfm-1.2-r1.ebuild
+++ b/app-misc/bfm/bfm-1.2-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/app-misc/bfm/bfm-1.2-r1.ebuild,v 1.3 2007/01/09 15:31:49 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/bfm/bfm-1.2-r1.ebuild,v 1.4 2007/10/23 20:39:46 betelgeuse Exp $
+
+JAVA_PKG_IUSE="doc source"
 
 inherit java-pkg-2 java-ant-2
 
@@ -11,23 +13,21 @@ SRC_URI="http://bfm.webhop.net/releases/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="doc source"
+IUSE=""
 
 RDEPEND=">=virtual/jre-1.4
 	|| ( >=dev-java/blackdown-java3d-bin-1.3.1-r1
 		>=dev-java/sun-java3d-bin-1.3 )"
 DEPEND=">=virtual/jdk-1.4
-	${RDEPEND}
-	dev-java/ant-core
-	source? ( app-arch/zip )"
+	${RDEPEND}"
 
 src_unpack() {
 	unpack ${A}
 
-	cd ${S}
-	cp ${FILESDIR}/${PV}-build.xml ./build.xml
+	cd "${S}"
+	cp "${FILESDIR}/${PV}-build.xml" ./build.xml
 
-	mkdir ${S}/lib && cd ${S}/lib
+	mkdir "${S}/lib" && cd "${S}/lib"
 	if has_version dev-java/sun-java3d-bin; then
 		java-pkg_jar-from sun-java3d-bin
 	elif has_version dev-java/blackdown-java3d-bin; then
@@ -35,9 +35,7 @@ src_unpack() {
 	fi
 }
 
-src_compile() {
-	eant jar
-}
+EANT_DOC_TARGET=""
 
 src_install() {
 	java-pkg_dojar dist/${PN}.jar
@@ -52,23 +50,18 @@ src_install() {
 	java-pkg_dolauncher ${PN} --main Bfm
 
 	insinto /etc/bfm
-	doins ${S}/bfm.conf
+	doins "${S}/bfm.conf"
 
 	if use doc; then
-		dodoc README ChangeLog bindings NEWS
+		dodoc README ChangeLog bindings NEWS || die
 		java-pkg_dohtml -r docs/*
 	fi
 	use source && java-pkg_dosrc src/*
 }
 
 pkg_postinst() {
-	einfo ""
-	einfo "Bfm - The Brutal File Manager has been successfully installed!"
-	einfo ""
 	elog "A system wide config file has been installed to /etc/bfm/bfm.conf"
 	elog "Copy the file to ~/.bfm/bfm.conf to set local settings"
-	einfo ""
-	ewarn ""
+	echo
 	ewarn "Be sure to run bfm in safe mode if you don't want to delete files"
-	ewarn ""
 }
diff --git a/app-misc/bfm/metadata.xml b/app-misc/bfm/metadata.xml
index 95c55947f21e..05f7df690ca1 100644
--- a/app-misc/bfm/metadata.xml
+++ b/app-misc/bfm/metadata.xml
@@ -4,9 +4,9 @@
 <herd>java</herd>
 
 <longdescription>
-	BFM, the Brutal File Manager is a combined file manager and first 
-	person shooter game. The basic idea is to represent different folders 
-	on your computer as rooms in a 3D environment. Then, armed to your 
+	BFM, the Brutal File Manager is a combined file manager and first
+	person shooter game. The basic idea is to represent different folders
+	on your computer as rooms in a 3D environment. Then, armed to your
 	teeths you go through these rooms and delete files by shooting at them.
 </longdescription>