Cleanup ebuild. Help works now and launcher is created using java-pkg_dolauncher. doc now installs javadocs.

Package-Manager: portage-2.1.2_rc4-r7

5 files changed, 131 insertions, 18 deletions

diff --git a/dev-java/datavision/ChangeLog b/dev-java/datavision/ChangeLog
index 9947f40cff9d..45714fa0e0d0 100644
--- a/dev-java/datavision/ChangeLog
+++ b/dev-java/datavision/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/datavision
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/datavision/ChangeLog,v 1.13 2007/01/05 20:43:24 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/datavision/ChangeLog,v 1.14 2007/01/10 20:16:57 betelgeuse Exp $
+
+*datavision-1.0.0-r1 (10 Jan 2007)
+
+  10 Jan 2007; Petteri Räty <betelgeuse@gentoo.org>
+  +datavision-1.0.0-r1.ebuild:
+  Cleanup ebuild. Help works now and launcher is created using
+  java-pkg_dolauncher. doc now installs javadocs.
 
   05 Jan 2007; Vlastimil Babka <caster@gentoo.org> datavision-0.8.2.ebuild,
   datavision-1.0.0.ebuild:
diff --git a/dev-java/datavision/Manifest b/dev-java/datavision/Manifest
index 8f4bea1af766..aba876ad7cf4 100644
--- a/dev-java/datavision/Manifest
+++ b/dev-java/datavision/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX build.xml 3172 RMD160 33a3a44dc03195f5eefaacc9d96a03f2bd4b2ad8 SHA1 9b9bd78bd91c1a2d713b74ae929e043eb0c62cb1 SHA256 ada3f45f7d65bf575ebccafe046c966b5f1f5e9ce92c22d213da53119dc6f734
 MD5 0c349e98a6dce2623ff69e1be9efcc79 files/build.xml 3172
 RMD160 33a3a44dc03195f5eefaacc9d96a03f2bd4b2ad8 files/build.xml 3172
@@ -16,21 +19,35 @@ EBUILD datavision-0.8.2.ebuild 2605 RMD160 9c670839973486de4fbf1f0a00a359f41a539
 MD5 9015fc544e1aae63f5c398bbc69afe32 datavision-0.8.2.ebuild 2605
 RMD160 9c670839973486de4fbf1f0a00a359f41a5398f6 datavision-0.8.2.ebuild 2605
 SHA256 1d7b43dbc81d36094bfde898db5e082095d679c6e5fa0f944778b1a356e14f70 datavision-0.8.2.ebuild 2605
+EBUILD datavision-1.0.0-r1.ebuild 2299 RMD160 6acc27efd893eb0f45025f5529d8c2a421535759 SHA1 ceded78c6abc98b1cbdc972cea5a2eb9138628b5 SHA256 5a63762ca4044998e71aaeb6d0c5606832f38c625d8c6c0200efc3c6eca57856
+MD5 99a52320cd4059384ba6775873e5a2f4 datavision-1.0.0-r1.ebuild 2299
+RMD160 6acc27efd893eb0f45025f5529d8c2a421535759 datavision-1.0.0-r1.ebuild 2299
+SHA256 5a63762ca4044998e71aaeb6d0c5606832f38c625d8c6c0200efc3c6eca57856 datavision-1.0.0-r1.ebuild 2299
 EBUILD datavision-1.0.0.ebuild 2536 RMD160 5070ce5a50d437e6e39cd1b6d95f2d9a87db66ce SHA1 dd79f56c368ef43d252cc3cabaafe34af4f29897 SHA256 a93ee1e7ded3cc8c60fb90b185bccd64b291635f8b08df3555d212a1b132f5a6
 MD5 afa1dd660c22136aa9d8c291fa79544b datavision-1.0.0.ebuild 2536
 RMD160 5070ce5a50d437e6e39cd1b6d95f2d9a87db66ce datavision-1.0.0.ebuild 2536
 SHA256 a93ee1e7ded3cc8c60fb90b185bccd64b291635f8b08df3555d212a1b132f5a6 datavision-1.0.0.ebuild 2536
-MISC ChangeLog 1383 RMD160 0f6098e13185dbd890c4204d6fed1afc1f20a41b SHA1 44bd28ea0c696b294aa63f9bb19ceddbeaf00169 SHA256 f3e8f71791711780cbd69bd9131b2e7ce3412f61f7746ceceee449329cf19369
-MD5 9d892646f81aa7fb521f921524db933e ChangeLog 1383
-RMD160 0f6098e13185dbd890c4204d6fed1afc1f20a41b ChangeLog 1383
-SHA256 f3e8f71791711780cbd69bd9131b2e7ce3412f61f7746ceceee449329cf19369 ChangeLog 1383
-MISC metadata.xml 1074 RMD160 764557d45d43661f82222b43c94e386e3510f664 SHA1 4acc0296d8f16494b0511449870e62910f1475cb SHA256 ce1149adae30e49e31a025f04b85000ab6376a912e1f3f206194d8c6b33dcf55
-MD5 5840092606eb4cc78c7f2ab5a1ea6c0b metadata.xml 1074
-RMD160 764557d45d43661f82222b43c94e386e3510f664 metadata.xml 1074
-SHA256 ce1149adae30e49e31a025f04b85000ab6376a912e1f3f206194d8c6b33dcf55 metadata.xml 1074
+MISC ChangeLog 1621 RMD160 39ec8fc07db6ca7f126ec4abe22e100a8bd38b87 SHA1 ebfe91c1513266fc576f76635f376583cbf37d46 SHA256 ba299dd7bdee253124177aeb2283d9a6ecf9ebce03d48b1dd9613407497107ba
+MD5 44f697c41d57e5dd16a8e4af91c08fbd ChangeLog 1621
+RMD160 39ec8fc07db6ca7f126ec4abe22e100a8bd38b87 ChangeLog 1621
+SHA256 ba299dd7bdee253124177aeb2283d9a6ecf9ebce03d48b1dd9613407497107ba ChangeLog 1621
+MISC metadata.xml 1065 RMD160 bb75408dd07edbbfcb4cd6ce7efbb58d079cb626 SHA1 148a6bd4f591df3ffb8167fab0dfa057063b14ca SHA256 a301608936d8bfbc4c828d7fcbdfbb916fa275bf73e9270f95876334e876edbc
+MD5 871ce6a28d257f120f975eed32ef34e2 metadata.xml 1065
+RMD160 bb75408dd07edbbfcb4cd6ce7efbb58d079cb626 metadata.xml 1065
+SHA256 a301608936d8bfbc4c828d7fcbdfbb916fa275bf73e9270f95876334e876edbc metadata.xml 1065
 MD5 daa3c205b8f879109d078a1d79476868 files/digest-datavision-0.8.2 253
 RMD160 aeea87fef89d3af6ae712e9473a1dd4949071acf files/digest-datavision-0.8.2 253
 SHA256 f0d580b5366ab1b7ac06d736c4d836f9e994b3f1873f18988b5b3011914c3183 files/digest-datavision-0.8.2 253
 MD5 80a733fca595b4ce36a4f3934947fbed files/digest-datavision-1.0.0 253
 RMD160 22afa6aed1564d9a2542ed0fe9419df4e616a092 files/digest-datavision-1.0.0 253
 SHA256 c88a28660ed015cd83df3fc3e46f8d2836fcb33e9ef30d1fce145e76535d0c02 files/digest-datavision-1.0.0 253
+MD5 80a733fca595b4ce36a4f3934947fbed files/digest-datavision-1.0.0-r1 253
+RMD160 22afa6aed1564d9a2542ed0fe9419df4e616a092 files/digest-datavision-1.0.0-r1 253
+SHA256 c88a28660ed015cd83df3fc3e46f8d2836fcb33e9ef30d1fce145e76535d0c02 files/digest-datavision-1.0.0-r1 253
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.6 (GNU/Linux)
+
+iD8DBQFFpUnEcxLzpIGCsLQRAtquAJ9pvYclfCyUV52h7udZVs8TYBVhhwCfYLur
+Hdt/VAFk74Xu0wLYFI9BEwE=
+=HljE
+-----END PGP SIGNATURE-----
diff --git a/dev-java/datavision/datavision-1.0.0-r1.ebuild b/dev-java/datavision/datavision-1.0.0-r1.ebuild
new file mode 100644
index 000000000000..511d386f09c5
--- /dev/null
+++ b/dev-java/datavision/datavision-1.0.0-r1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/datavision/datavision-1.0.0-r1.ebuild,v 1.1 2007/01/10 20:16:57 betelgeuse Exp $
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Open Source reporting tool similar to Crystal Reports"
+SRC_URI="mirror://sourceforge/datavision/${P}.tar.gz"
+HOMEPAGE="http://datavision.sourceforge.net/"
+IUSE="doc mysql postgres ruby"
+SLOT="1.0"
+LICENSE="Apache-1.1"
+KEYWORDS="~x86 ~amd64"
+RDEPEND=">=virtual/jre-1.4
+	>=dev-java/itext-1.02b
+	=dev-java/jcalendar-1.2*
+	=dev-java/bsf-2.3*
+	ruby? ( >=dev-java/jruby-0.7.0 )
+	mysql? ( >=dev-java/jdbc-mysql-3.0 )
+	postgres? ( >=dev-java/jdbc2-postgresql-7.3 )"
+DEPEND=">=virtual/jdk-1.4
+	${RDEPEND}"
+#	test? ( >=dev-java/junit-3.7 )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}/lib"
+
+	# lets avoid a new packed jar issue :)
+	rm -v *.jar
+
+	java-pkg_jar-from itext
+	java-pkg_jar-from bsf-2.3
+	java-pkg_jar-from jcalendar-1.2
+	use ruby && java-pkg_jar-from jruby
+
+	cd "${S}"
+	use mysql && java-pkg_jar-from jdbc-mysql
+	use postgres && java-pkg_jar-from jdbc2-postgresql-6
+}
+
+#Seems only useful in CVS when there are actually changes to doc sources
+#EANT_DOC_TARGET="docs.release"
+
+RESTRICT="test"
+#src_test() {
+	# Tests need X
+	#eant test -Djunit.jar="$(java-pkg_getjars --build-only junit)" \
+	#		-Djava.awt.headless=true
+#}
+
+src_install() {
+	java-pkg_dojar lib/DataVision.jar
+
+	local docdir="/usr/share/doc/${PF}/"
+	java-pkg_dolauncher ${PN} \
+		--main jimm.datavision.DataVision \
+		--pwd ${docdir}
+
+	# Needed for help
+	dohtml docs/DataVision/*
+	dodir ${docdir}/docs
+	dosym ${docdir}/html ${docdir}/docs/DataVision
+
+	dodoc ChangeLog Credits README TODO
+	use doc &&	java-pkg_dojavadoc javadoc
+}
+
+pkg_postinst() {
+	if use mysql; then
+		elog
+		elog "MySQL example:"
+		elog "Driver class name: com.mysql.jdbc.Driver"
+		elog "Connection: jdbc:mysql://localhost/database"
+	fi
+
+	if use postgres; then
+		elog
+		elog "PostgreSQL example:"
+		elog "Driver class name:org.postgresql.Driver"
+		elog "Connection: jdbc:postgresql://localhost/database"
+	fi
+	elog "Because we need to change the current working directory"
+	elog "in the launcher for the help to work, the launcher can't be"
+	elog "used with relative paths. Patches are welcome."
+}
diff --git a/dev-java/datavision/files/digest-datavision-1.0.0-r1 b/dev-java/datavision/files/digest-datavision-1.0.0-r1
new file mode 100644
index 000000000000..f97d06a92710
--- /dev/null
+++ b/dev-java/datavision/files/digest-datavision-1.0.0-r1
@@ -0,0 +1,3 @@
+MD5 82017d881828b2342cd4f1552a25a77a datavision-1.0.0.tar.gz 3451018
+RMD160 dd960a52252d7220fb2f0e61df33abdf9744de11 datavision-1.0.0.tar.gz 3451018
+SHA256 f4caaaeebdeea0f11303976df626099d951e5602a5c0658c458488e9c617a051 datavision-1.0.0.tar.gz 3451018
diff --git a/dev-java/datavision/metadata.xml b/dev-java/datavision/metadata.xml
index e6dcf7ffbcc8..a84286d45ea7 100644
--- a/dev-java/datavision/metadata.xml
+++ b/dev-java/datavision/metadata.xml
@@ -6,19 +6,19 @@
 
 <longdescription>
 
-DataVision is an Open Source reporting tool similar to Crystal Reports. Reports 
-can be designed using a drag-and-drop GUI. They may be run, viewed, and printed 
-from the application or exported as HTML, XML, PDF, LaTeX2e, DocBook, or tab- or 
-comma-delimited text files. The output files produced by LaTeX2e and DocBook can 
+DataVision is an Open Source reporting tool similar to Crystal Reports. Reports
+can be designed using a drag-and-drop GUI. They may be run, viewed, and printed
+from the application or exported as HTML, XML, PDF, LaTeX2e, DocBook, or tab- or
+comma-delimited text files. The output files produced by LaTeX2e and DocBook can
 in turn be used to produce PDF, text, HTML, PostScript, and more.
 
-DataVision is written in Java and runs almost anywhere. It can generate reports 
-from databases or text data files. Any database with an available JDBC driver 
-should work: Oracle, PostgreSQL, MySQL, Informix, hsqldb, Microsoft Access, 
-Progress, and more. Columns read from text files can be separated by any 
+DataVision is written in Java and runs almost anywhere. It can generate reports
+from databases or text data files. Any database with an available JDBC driver
+should work: Oracle, PostgreSQL, MySQL, Informix, hsqldb, Microsoft Access,
+Progress, and more. Columns read from text files can be separated by any
 character.
 
-Report descriptions are stored as XML files. This means you can not only use the 
+Report descriptions are stored as XML files. This means you can not only use the
 DataVision GUI but you may also edit reports using your favorite text editor.
 
 </longdescription>