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

Package-Manager: portage-2.1.2-r9

6 files changed, 60 insertions, 72 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/Manifest b/sys-fs/jdiskreport-bin/Manifest
index d9ac247d4334..b990b186f6ab 100644
--- a/sys-fs/jdiskreport-bin/Manifest
+++ b/sys-fs/jdiskreport-bin/Manifest
@@ -2,25 +2,25 @@
 Hash: SHA1
 
 DIST jdiskreport-1_2_5.zip 613585 RMD160 4e9c12898ab78bcc94a8e63fa40fc9233d10314b SHA1 3e9b393739f461828d31f621299446c42f0cce40 SHA256 30efef5f5e75ed6f51a9a3973711960c5eccae503edcf00f728948d6b19b12d2
-EBUILD jdiskreport-bin-1.2.5.ebuild 1050 RMD160 eda15ba787ce36a091c0dad713f70b22fc58f06f SHA1 83361968932f0a03f4295ab10594b7b0d4e712da SHA256 104165e39ed4bce6cb1e57a9850abdc0f27a9dd4a73bf4b2e31767a44ed97fc1
-MD5 20b9d703fb6aa950501a814b4ecaf444 jdiskreport-bin-1.2.5.ebuild 1050
-RMD160 eda15ba787ce36a091c0dad713f70b22fc58f06f jdiskreport-bin-1.2.5.ebuild 1050
-SHA256 104165e39ed4bce6cb1e57a9850abdc0f27a9dd4a73bf4b2e31767a44ed97fc1 jdiskreport-bin-1.2.5.ebuild 1050
-MISC ChangeLog 1077 RMD160 ccbb41ac05e288d2a703d10061c0e2df19dbe56c SHA1 e3a5ebb5face8159883d28e6721e66ca40c5b6c9 SHA256 4da76b4ece3fdad62ae00c83d6f96e4ac62ebaf3b92e174f334e9e228dd2ac4a
-MD5 3d4c7e61448ea94088691e0413fc5c30 ChangeLog 1077
-RMD160 ccbb41ac05e288d2a703d10061c0e2df19dbe56c ChangeLog 1077
-SHA256 4da76b4ece3fdad62ae00c83d6f96e4ac62ebaf3b92e174f334e9e228dd2ac4a ChangeLog 1077
-MISC metadata.xml 475 RMD160 80d47e2199fab1b06133f744f0def282f6580afa SHA1 ce1f88930bde73bd0ec12da9c9add1b65ab1f364 SHA256 a2581d9a47e4e25ef38886c55eb3fca80728d95c5f3fbae1205a8cb6fc459f05
-MD5 90300d8d04018ab3210c0b816eae4b04 metadata.xml 475
-RMD160 80d47e2199fab1b06133f744f0def282f6580afa metadata.xml 475
-SHA256 a2581d9a47e4e25ef38886c55eb3fca80728d95c5f3fbae1205a8cb6fc459f05 metadata.xml 475
-MD5 8fac8741e642b2caa4342094b58fb16a files/digest-jdiskreport-bin-1.2.5 244
-RMD160 b432b4a5321e178ffc6ea251a5a393c7f82f44af files/digest-jdiskreport-bin-1.2.5 244
-SHA256 2be8481da55d128d506bb7bc9b5fbba92e02c0ce070013129e395805e0c9f88d files/digest-jdiskreport-bin-1.2.5 244
+EBUILD jdiskreport-bin-1.2.5-r1.ebuild 789 RMD160 989b9ff29ac3f6064bb5bd963682a6654c86730c SHA1 ae0e8e3736620505f67b49f683f948373ef2874a SHA256 1a6ce78c033116f55f574db65460f5f6a4d996e208d2743f534240d27c3395e1
+MD5 d65e738426104507a7f400b788074db9 jdiskreport-bin-1.2.5-r1.ebuild 789
+RMD160 989b9ff29ac3f6064bb5bd963682a6654c86730c jdiskreport-bin-1.2.5-r1.ebuild 789
+SHA256 1a6ce78c033116f55f574db65460f5f6a4d996e208d2743f534240d27c3395e1 jdiskreport-bin-1.2.5-r1.ebuild 789
+MISC ChangeLog 1350 RMD160 bc06ca86bc21732ada9c0e5932eee0e65c382121 SHA1 be2e6a37d4368124f1bf6ae1e2161fd4fa1cf16b SHA256 acc77e15732845eab053243e029a580941f83b05805df077b9a5e0c0c980d743
+MD5 d6ec0434a7d9b2eb5b1ad4ef38317265 ChangeLog 1350
+RMD160 bc06ca86bc21732ada9c0e5932eee0e65c382121 ChangeLog 1350
+SHA256 acc77e15732845eab053243e029a580941f83b05805df077b9a5e0c0c980d743 ChangeLog 1350
+MISC metadata.xml 372 RMD160 dd2868957e510a7e92e2d1ee0cf6eb393805c28d SHA1 4b3def10758404c04d960d218f5ad27c18753cf5 SHA256 e12be39ac538f6f034184b2601d9dc0016bee1efa3ecfd93c4731add6dbb7577
+MD5 081cfd50430aedef91515bbba6e158e0 metadata.xml 372
+RMD160 dd2868957e510a7e92e2d1ee0cf6eb393805c28d metadata.xml 372
+SHA256 e12be39ac538f6f034184b2601d9dc0016bee1efa3ecfd93c4731add6dbb7577 metadata.xml 372
+MD5 8fac8741e642b2caa4342094b58fb16a files/digest-jdiskreport-bin-1.2.5-r1 244
+RMD160 b432b4a5321e178ffc6ea251a5a393c7f82f44af files/digest-jdiskreport-bin-1.2.5-r1 244
+SHA256 2be8481da55d128d506bb7bc9b5fbba92e02c0ce070013129e395805e0c9f88d files/digest-jdiskreport-bin-1.2.5-r1 244
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.2 (GNU/Linux)
 
-iD8DBQFF5FeDcxLzpIGCsLQRArhTAJ92hGVhXEMYm+ePCsvTBU4ik8aBowCdFNpf
-tqrqhZ832jUPNpFt2lPxkDw=
-=jnwW
+iD8DBQFF5JCkcxLzpIGCsLQRAqD7AJ9ZfJnCgrpihogIYkxjFPKEi9JwlACeKYBV
+q9QYGqo0molCP5XhJLfaWPI=
+=+0uv
 -----END PGP SIGNATURE-----
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>