Ebuild cleanup.

(Portage version: 2.1.3.15)

3 files changed, 19 insertions, 23 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/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>