Add doc and source use flags and cleanup ebuild.

Package-Manager: portage-2.1.3.7

3 files changed, 37 insertions, 25 deletions

diff --git a/dev-java/jicmp/ChangeLog b/dev-java/jicmp/ChangeLog
index 17fbfa796ee6..690936ee183a 100644
--- a/dev-java/jicmp/ChangeLog
+++ b/dev-java/jicmp/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/jicmp
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jicmp/ChangeLog,v 1.2 2007/09/12 05:20:22 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jicmp/ChangeLog,v 1.3 2007/09/12 20:19:29 betelgeuse Exp $
+
+  12 Sep 2007; Petteri Räty <betelgeuse@gentoo.org> jicmp-1.0.2.ebuild:
+  Add doc and source use flags and cleanup ebuild.
 
   12 Sep 2007; William L. Thomson Jr. <wltjr@gentoo.org> jicmp-1.0.2.ebuild:
   License correction, removed commented code.
diff --git a/dev-java/jicmp/Manifest b/dev-java/jicmp/Manifest
index a101a67687d3..711c6aae72db 100644
--- a/dev-java/jicmp/Manifest
+++ b/dev-java/jicmp/Manifest
@@ -1,12 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST jicmp-1.0.2.tar.gz 348805 RMD160 e93992651d81a1fb2c5cd3ff48fe044b0e1f0659 SHA1 13094a6321f019bb5c44a89413b46459e564bfc2 SHA256 3661c2dd59d8be3c72904fe2cd4e0d06054eef5f8e7f68023b6d241a594fe0db
-EBUILD jicmp-1.0.2.ebuild 839 RMD160 1c6d9f6792950d04dbecdc95ea1d5c5e186f2958 SHA1 68f8ece1e322044dcd2719364ae9f8c8e7777760 SHA256 a51fa9f6035f4739f5814f35b7041b0619b1b1dfa584f74e55bf414147593c0a
-MD5 fdf0c8ab7c2d7be0d8af1d638c765fb3 jicmp-1.0.2.ebuild 839
-RMD160 1c6d9f6792950d04dbecdc95ea1d5c5e186f2958 jicmp-1.0.2.ebuild 839
-SHA256 a51fa9f6035f4739f5814f35b7041b0619b1b1dfa584f74e55bf414147593c0a jicmp-1.0.2.ebuild 839
-MISC ChangeLog 508 RMD160 78908a2417f72d7477afd3642df3035abc097bcb SHA1 da679b4c265fafa2d255e8db7a82ffc158d8b59a SHA256 3607541610550cc661c9a098dfdfbb6d86c75bbdda3fa66077e9eaf888c74710
-MD5 a5b3d1071e43de98e4750d228c7febd8 ChangeLog 508
-RMD160 78908a2417f72d7477afd3642df3035abc097bcb ChangeLog 508
-SHA256 3607541610550cc661c9a098dfdfbb6d86c75bbdda3fa66077e9eaf888c74710 ChangeLog 508
+EBUILD jicmp-1.0.2.ebuild 801 RMD160 530cc835b8dfe7ebd439b4ec29d15a2ceaf79ece SHA1 2f8907acb1eade53190906aeb17673fb53fa2b1a SHA256 b5397442ffaec4b8d239037542fa62e21a5b44c182118067abd5718dda585f6e
+MD5 2a2f757369e0dc62721bc1972a88d958 jicmp-1.0.2.ebuild 801
+RMD160 530cc835b8dfe7ebd439b4ec29d15a2ceaf79ece jicmp-1.0.2.ebuild 801
+SHA256 b5397442ffaec4b8d239037542fa62e21a5b44c182118067abd5718dda585f6e jicmp-1.0.2.ebuild 801
+MISC ChangeLog 638 RMD160 95e02fa165f4e50133ee0a5121e556041c6c40ad SHA1 487d4f766fa65cf5d1642a39bfa54c93ae58c87f SHA256 777c0606777f0df27133493d37dee0b3c24cc7d06fa544d0200ed608c7e37b9d
+MD5 d5c72ec794e4a1e98eeb1a10c5ddbe89 ChangeLog 638
+RMD160 95e02fa165f4e50133ee0a5121e556041c6c40ad ChangeLog 638
+SHA256 777c0606777f0df27133493d37dee0b3c24cc7d06fa544d0200ed608c7e37b9d ChangeLog 638
 MISC metadata.xml 302 RMD160 3048839ad8af1f1fbfce25ee5a7836b0960f6b01 SHA1 96807a1dbae430015ab617612dc12438a7203db6 SHA256 5d7b02655b1642f43d7f18537a6ab850e787edaaa1d0a727b64b39aaa023bec4
 MD5 bfcefa3417611230ae1c46376d062666 metadata.xml 302
 RMD160 3048839ad8af1f1fbfce25ee5a7836b0960f6b01 metadata.xml 302
@@ -14,3 +17,10 @@ SHA256 5d7b02655b1642f43d7f18537a6ab850e787edaaa1d0a727b64b39aaa023bec4 metadata
 MD5 e36609c2142d91102bdd99ea42ed35cc files/digest-jicmp-1.0.2 235
 RMD160 a9a7c4000a308238fa1c02d1a00de066ceab029e files/digest-jicmp-1.0.2 235
 SHA256 14cf25e9f6b670807efc76992d1f218c5e782555a611b90a6217ea0e00fd53f8 files/digest-jicmp-1.0.2 235
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.4 (GNU/Linux)
+
+iD8DBQFG6EnVcxLzpIGCsLQRAr8qAJ0a4RlA41I3r3G7kgU7+/zi3X3Y4wCfScJT
+9ZDTWQ8u6upInFg4URsZBok=
+=9Tak
+-----END PGP SIGNATURE-----
diff --git a/dev-java/jicmp/jicmp-1.0.2.ebuild b/dev-java/jicmp/jicmp-1.0.2.ebuild
index c8e3804b905a..a6527749f1f8 100644
--- a/dev-java/jicmp/jicmp-1.0.2.ebuild
+++ b/dev-java/jicmp/jicmp-1.0.2.ebuild
@@ -1,34 +1,33 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jicmp/jicmp-1.0.2.ebuild,v 1.2 2007/09/12 05:20:22 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jicmp/jicmp-1.0.2.ebuild,v 1.3 2007/09/12 20:19:29 betelgeuse Exp $
 
-inherit eutils java-pkg-2
+JAVA_PKG_IUSE="doc source"
 
-DESCRIPTION="Java Interface to Tobias Oetiker's RRDtool"
+inherit eutils base java-pkg-2
 
-SLOT="0"
+DESCRIPTION="Java Interface to Tobias Oetiker's RRDtool"
 SRC_URI="mirror://sourceforge/opennms/${P}.tar.gz"
 HOMEPAGE="http://www.opennms.org/"
 KEYWORDS="~amd64 ~x86"
 LICENSE="GPL-2"
 
-RDEPEND=">=virtual/jre-1.5"
+SLOT="0"
 
+RDEPEND=">=virtual/jre-1.5"
 DEPEND=">=virtual/jdk-1.5"
 
-S="${WORKDIR}/${P}"
-
-src_compile(){
-	cd "${S}"
-	econf || die "Could not configure ${P}"
-	emake || die "Could not build ${P}"
+src_compile() {
+	base_src_compile
+	if use doc; then
+		javadoc -d javadoc $(find org -name "*.java") || die "Javadoc failed"
+	fi
 }
 
 src_install() {
-	cd "${S}"
-	java-pkg_newjar "${S}/${PN}.jar"
-	make DESTDIR="${D}" install || die "Could not install lib${PN}.so"
-# ugly but effective
-	rm -fR "${D}/usr/share/java" || die "Could not remove extra jar"
+	java-pkg_newjar *.jar
+	java-pkg_doso .libs/*.so
+	use source && java-pkg_dosrc org
+	use doc && java-pkg_dojavadoc javadoc
 }