The build system needs ruby so we need to always DEPEND on it. I chose jruby over...

Package-Manager: portage-2.1.2-r4

diff --git a/dev-java/datavision/ChangeLog b/dev-java/datavision/ChangeLog
index aeee39b17c3deaaa0a9d0aa7cac9befc44431cb3..f150a14e47dd394d773c004b3ccb843a95e63a8a 100644 (file)
--- a/dev-java/datavision/ChangeLog
+++ b/dev-java/datavision/ChangeLog
@@ -1,6 +1,12 @@
 # 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.16 2007/01/28 16:57:22 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/datavision/ChangeLog,v 1.17 2007/01/29 19:14:19 betelgeuse Exp $
+
+  29 Jan 2007; Petteri Räty <betelgeuse@gentoo.org>
+  datavision-1.0.0-r2.ebuild:
+  The build system needs ruby so we need to always DEPEND on it. I chose jruby
+  over dev-lang/ruby because we might be needing jruby for the scripting
+  support with the ruby use flag during runtime too. Fixes bug #164402.
 
   28 Jan 2007; William L. Thomson Jr. <wltjr@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 6429ff2f312aadbdb713e9939ab13f1d418cf7d7..4e3740eddaa398734f2899b692abb1f8f03ff9d6 100644 (file)
--- 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
@@ -11,14 +14,14 @@ MD5 a282952fb231f9f35456cecb32fb45f9 files/datavision.sh 418
 RMD160 157e3afd12294de71e394036bda189053b95798f files/datavision.sh 418
 SHA256 3b325516501fc2ec4047710197f5b89cc65ba47f6b41a2f446280c661c5ab3a7 files/datavision.sh 418
 DIST datavision-1.0.0.tar.gz 3451018 RMD160 dd960a52252d7220fb2f0e61df33abdf9744de11 SHA1 6fdbf11140bf24ed12cd82c2b0bc8d1b4637f9db SHA256 f4caaaeebdeea0f11303976df626099d951e5602a5c0658c458488e9c617a051
-EBUILD datavision-1.0.0-r2.ebuild 2299 RMD160 d7161eb34686eb27db97fefe3898428765a8e2ce SHA1 9d7cbd0c916f0fd0f4ae125b8d21e8d80a31afbd SHA256 7459514f4bc595192f08321a1035fe4a4fccbd1610eae06730230cc5dd349d95
-MD5 30b18be02b7dda9e38568ba4ac23e69b datavision-1.0.0-r2.ebuild 2299
-RMD160 d7161eb34686eb27db97fefe3898428765a8e2ce datavision-1.0.0-r2.ebuild 2299
-SHA256 7459514f4bc595192f08321a1035fe4a4fccbd1610eae06730230cc5dd349d95 datavision-1.0.0-r2.ebuild 2299
-MISC ChangeLog 2060 RMD160 0f3e328a32e3e425c5841f2d9f6ab515ebe59af9 SHA1 25c0ed7dd21df377a8a8593ab4d97e691df3696f SHA256 5c114df524922d8ba3288f9998cc5b13d74fb4e90a9278a8cf7855438d0036ad
-MD5 8cb004a15723fe40c32e560283a30750 ChangeLog 2060
-RMD160 0f3e328a32e3e425c5841f2d9f6ab515ebe59af9 ChangeLog 2060
-SHA256 5c114df524922d8ba3288f9998cc5b13d74fb4e90a9278a8cf7855438d0036ad ChangeLog 2060
+EBUILD datavision-1.0.0-r2.ebuild 2694 RMD160 a420c74115b768dc9ad4ffe980cb4d56e9356b9b SHA1 01a60d5805e73e5aafb0a46106b2929bd15ed14f SHA256 22ac02b5c731608462f928be3bbd25186ac3f55945a4088d0066c782d70e3e75
+MD5 8493178421c5d61e620476415e8aa29b datavision-1.0.0-r2.ebuild 2694
+RMD160 a420c74115b768dc9ad4ffe980cb4d56e9356b9b datavision-1.0.0-r2.ebuild 2694
+SHA256 22ac02b5c731608462f928be3bbd25186ac3f55945a4088d0066c782d70e3e75 datavision-1.0.0-r2.ebuild 2694
+MISC ChangeLog 2373 RMD160 145badaa4ae81d8ebec08c266b561289d544dfc5 SHA1 34a81a46cdb94f94b932f3b4a9388717d3aaa8d7 SHA256 05d2731cf33d1ec3b47b9441c9c5edaf4678470a2b5c250adddf8918a304bea2
+MD5 670d735e624e5700029eab838d4448cc ChangeLog 2373
+RMD160 145badaa4ae81d8ebec08c266b561289d544dfc5 ChangeLog 2373
+SHA256 05d2731cf33d1ec3b47b9441c9c5edaf4678470a2b5c250adddf8918a304bea2 ChangeLog 2373
 MISC metadata.xml 1065 RMD160 bb75408dd07edbbfcb4cd6ce7efbb58d079cb626 SHA1 148a6bd4f591df3ffb8167fab0dfa057063b14ca SHA256 a301608936d8bfbc4c828d7fcbdfbb916fa275bf73e9270f95876334e876edbc
 MD5 871ce6a28d257f120f975eed32ef34e2 metadata.xml 1065
 RMD160 bb75408dd07edbbfcb4cd6ce7efbb58d079cb626 metadata.xml 1065
@@ -26,3 +29,10 @@ SHA256 a301608936d8bfbc4c828d7fcbdfbb916fa275bf73e9270f95876334e876edbc metadata
 MD5 80a733fca595b4ce36a4f3934947fbed files/digest-datavision-1.0.0-r2 253
 RMD160 22afa6aed1564d9a2542ed0fe9419df4e616a092 files/digest-datavision-1.0.0-r2 253
 SHA256 c88a28660ed015cd83df3fc3e46f8d2836fcb33e9ef30d1fce145e76535d0c02 files/digest-datavision-1.0.0-r2 253
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.1 (GNU/Linux)
+
+iD8DBQFFvkeXcxLzpIGCsLQRAhrRAJ0V/BtGN4AALY/QNBLgLUrIoxqYXwCdG7Q3
+z6ZEzjybcawd5siyWG3j5c8=
+=uEyc
+-----END PGP SIGNATURE-----

diff --git a/dev-java/datavision/datavision-1.0.0-r2.ebuild b/dev-java/datavision/datavision-1.0.0-r2.ebuild
index 2a9a9cd61ca6b92a7bf9b499ce47b7ed3d107689..f726aa44222db320dc8108c2ff1ae30432290fd3 100644 (file)
--- a/dev-java/datavision/datavision-1.0.0-r2.ebuild
+++ b/dev-java/datavision/datavision-1.0.0-r2.ebuild
@@ -1,6 +1,6 @@
 # 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-r2.ebuild,v 1.2 2007/01/28 16:57:22 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/datavision/datavision-1.0.0-r2.ebuild,v 1.3 2007/01/29 19:14:19 betelgeuse Exp $
 
 inherit java-pkg-2 java-ant-2
 
@@ -19,6 +19,8 @@ RDEPEND=">=virtual/jre-1.4
        mysql? ( >=dev-java/jdbc-mysql-3.0 )
        postgres? ( >=dev-java/jdbc2-postgresql-7.3 )"
 DEPEND=">=virtual/jdk-1.4
+       dev-java/jruby
+       dev-java/ant-core
        ${RDEPEND}"
 #      test? ( >=dev-java/junit-3.7 )"
 
@@ -35,6 +37,11 @@ src_unpack() {
        use ruby && java-pkg_jar-from jruby
 
        cd "${S}"
+       # Let's use jruby instead as this is java and we can RDEPEND on it
+       # during run time any way
+       # https://bugs.gentoo.org/show_bug.cgi?id=164402
+       sed -e 's/executable=\"ruby\"/executable=\"jruby\"/' -i build.xml \
+               || die "Failed to replace ruby with jruby"
        use mysql && java-pkg_jar-from jdbc-mysql
        use postgres && java-pkg_jar-from jdbc2-postgresql-6
 }
@@ -83,4 +90,7 @@ pkg_postinst() {
        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."
+       elog ""
+       elog "The build system needs ruby so the ruby use flag only affects"
+       elog "RDEPEND."
 }