Use generation 2 eclasses and remove compnerd from metadata.xml. Part of fixing bug #168046.

(Portage version: 2.1.2-r9)

5 files changed, 42 insertions, 54 deletions

diff --git a/sys-fs/jdiskreport-bin/ChangeLog b/sys-fs/jdiskreport-bin/ChangeLog
index b16157bd9aa0..c13d11f3583e 100644
--- a/sys-fs/jdiskreport-bin/ChangeLog
+++ b/sys-fs/jdiskreport-bin/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-fs/jdiskreport-bin
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/jdiskreport-bin/ChangeLog,v 1.6 2007/02/27 16:22:06 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/jdiskreport-bin/ChangeLog,v 1.7 2007/02/27 20:25:53 betelgeuse Exp $
+
+*jdiskreport-bin-1.2.5-r1 (27 Feb 2007)
+
+  27 Feb 2007; Petteri Räty <betelgeuse@gentoo.org> metadata.xml,
+  -jdiskreport-bin-1.2.5.ebuild, +jdiskreport-bin-1.2.5-r1.ebuild:
+  Use generation 2 eclasses and remove compnerd from metadata.xml. Part of
+  fixing bug #168046.
 
   27 Feb 2007; Petteri Räty <betelgeuse@gentoo.org>
   -jdiskreport-bin-1.2.2.ebuild, -jdiskreport-bin-1.2.3.ebuild:
diff --git a/sys-fs/jdiskreport-bin/files/digest-jdiskreport-bin-1.2.5 b/sys-fs/jdiskreport-bin/files/digest-jdiskreport-bin-1.2.5-r1
index f130985e1da5..f130985e1da5 100644
--- a/sys-fs/jdiskreport-bin/files/digest-jdiskreport-bin-1.2.5
+++ b/sys-fs/jdiskreport-bin/files/digest-jdiskreport-bin-1.2.5-r1
diff --git a/sys-fs/jdiskreport-bin/jdiskreport-bin-1.2.5-r1.ebuild b/sys-fs/jdiskreport-bin/jdiskreport-bin-1.2.5-r1.ebuild
new file mode 100644
index 000000000000..06f44d08bb2d
--- /dev/null
+++ b/sys-fs/jdiskreport-bin/jdiskreport-bin-1.2.5-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/jdiskreport-bin/jdiskreport-bin-1.2.5-r1.ebuild,v 1.1 2007/02/27 20:25:53 betelgeuse Exp $
+
+inherit java-pkg-2
+
+MY_PN=${PN/-bin/}
+MY_PV=${PV//\./_}
+MY_P="${MY_PN}-${MY_PV}"
+
+DESCRIPTION="JDiskReport helps you to understand disk drive usage"
+HOMEPAGE="http://www.jgoodies.com/freeware/jdiskreport/index.html"
+SRC_URI="http://www.jgoodies.com/download/${MY_PN}/${MY_P}.zip"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="app-arch/unzip"
+RDEPEND=">=virtual/jre-1.4"
+
+S=${WORKDIR}/${MY_PN}-${PV}
+
+src_install() {
+	java-pkg_newjar ${MY_PN}-${PV}.jar
+	java-pkg_dolauncher ${MY_PN}
+
+	dodoc README.txt RELEASE-NOTES.txt || die
+}
diff --git a/sys-fs/jdiskreport-bin/jdiskreport-bin-1.2.5.ebuild b/sys-fs/jdiskreport-bin/jdiskreport-bin-1.2.5.ebuild
deleted file mode 100644
index 77f9b78b041a..000000000000
--- a/sys-fs/jdiskreport-bin/jdiskreport-bin-1.2.5.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/jdiskreport-bin/jdiskreport-bin-1.2.5.ebuild,v 1.1 2006/08/18 17:08:57 compnerd Exp $
-
-MY_PN=${PN/-bin/}
-MY_PV=${PV//\./_}
-
-DESCRIPTION="JDiskReport helps you to understand disk drive usage"
-HOMEPAGE="http://www.jgoodies.com/freeware/jdiskreport/index.html"
-SRC_URI="http://www.jgoodies.com/download/${MY_PN}/${MY_PN}-${MY_PV}.zip"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="app-arch/unzip"
-RDEPEND=">=virtual/jre-1.4"
-
-S=${WORKDIR}/${MY_PN}-${PV}
-
-src_compile() {
-	einfo "Binary only package"
-
-	# We hate, we hate, versioned JARs
-	mv ${MY_PN}-${PV}.jar ${MY_PN}.jar
-}
-
-src_install() {
-	local INSTROOT=${ROOT}opt/${MY_PN}
-
-	# Create a Launcher Script
-	cat > ${MY_PN} <<- EOF
-		#!/bin/sh
-		\$(java-config -J) -jar $INSTROOT/bin/${MY_PN}.jar
-	EOF
-
-	# Install the launcher script
-	dobin ${MY_PN}
-
-	insinto ${INSTROOT}/bin
-	doins ${MY_PN}.jar
-
-	dodoc README.txt RELEASE-NOTES.txt
-}
diff --git a/sys-fs/jdiskreport-bin/metadata.xml b/sys-fs/jdiskreport-bin/metadata.xml
index f0f10b6c1006..da3a594a0008 100644
--- a/sys-fs/jdiskreport-bin/metadata.xml
+++ b/sys-fs/jdiskreport-bin/metadata.xml
@@ -1,15 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>Java</herd>
-	<maintainer>
-		<email>compnerd@gentoo.org</email>
-		<name>Saleem Abdulrasool</name>
-	</maintainer>
+	<herd>java</herd>
 	<longdescription lang="en">
-		 JDiskReport enables you to understand how much space the files and
-		 directories consume on your disk drives, and it helps you find obsolete
-		 files and folders.
+		JDiskReport enables you to understand how much space the files and
+		directories consume on your disk drives, and it helps you find obsolete
+		files and folders.
 	</longdescription>
 </pkgmetadata>