From 6fc0cab6e5f5785502a8f7b0ffb5182649161f57 Mon Sep 17 00:00:00 2001 From: Keri Harris Date: Sat, 3 Feb 2007 04:41:14 +0000 Subject: [PATCH] Ensure jdk VM is found for JPL package. Package-Manager: portage-2.1.2-r6 --- dev-lang/yap/ChangeLog | 6 +++- dev-lang/yap/Manifest | 20 ++++++----- dev-lang/yap/files/yap-5.1.1-jpl.patch | 47 ++++++++++++++++++++++++++ dev-lang/yap/yap-5.1.1.ebuild | 7 ++-- 4 files changed, 68 insertions(+), 12 deletions(-) create mode 100644 dev-lang/yap/files/yap-5.1.1-jpl.patch diff --git a/dev-lang/yap/ChangeLog b/dev-lang/yap/ChangeLog index 721f49553428..24a7199e6195 100644 --- a/dev-lang/yap/ChangeLog +++ b/dev-lang/yap/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-lang/yap # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/yap/ChangeLog,v 1.13 2007/01/23 18:19:00 nixnut Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/yap/ChangeLog,v 1.14 2007/02/03 04:41:14 keri Exp $ + + 03 Feb 2007; keri +files/yap-5.1.1-jpl.patch, + yap-5.1.1.ebuild: + Ensure jdk VM is found for JPL package. 23 Jan 2007; nixnut yap-5.1.1.ebuild: Stable on ppc wrt bug 163123 diff --git a/dev-lang/yap/Manifest b/dev-lang/yap/Manifest index cc24de04c89c..83067291eb99 100644 --- a/dev-lang/yap/Manifest +++ b/dev-lang/yap/Manifest @@ -38,6 +38,10 @@ AUX yap-5.1.1-configure.patch 4621 RMD160 4587c458687fcaaad72d6ed4a569c51d4a9730 MD5 753fa18383672462876f9a1549b14eff files/yap-5.1.1-configure.patch 4621 RMD160 4587c458687fcaaad72d6ed4a569c51d4a97300e files/yap-5.1.1-configure.patch 4621 SHA256 69eef18adeb21ea9b2de13f645e91e747d4a8492cbffe833a6353a516fd9e5be files/yap-5.1.1-configure.patch 4621 +AUX yap-5.1.1-jpl.patch 1269 RMD160 b9e3e3a2d4bd9c36096450b8e58e79ed3fd5e9c9 SHA1 cfa7d446d4f5fead94e39b9669da079bf7f52fed SHA256 6bcb30c8ace08839a1e3762945f9d6b5e079c695a8ace588cebee295798ba757 +MD5 e649fc61e69230c3261207918e7b2ede files/yap-5.1.1-jpl.patch 1269 +RMD160 b9e3e3a2d4bd9c36096450b8e58e79ed3fd5e9c9 files/yap-5.1.1-jpl.patch 1269 +SHA256 6bcb30c8ace08839a1e3762945f9d6b5e079c695a8ace588cebee295798ba757 files/yap-5.1.1-jpl.patch 1269 AUX yap-5.1.1-multilib.patch 5361 RMD160 5ee728c103bda5dc92ff1addeec031bbfed70114 SHA1 0ee61e1710d277c09fb4120163dc819e13c25f51 SHA256 500e2a6fac99760249b0457dc2845bd1a246b6ded47730db41d026e93cc30ee5 MD5 40c53ab6935d476d35e5535f7b317e75 files/yap-5.1.1-multilib.patch 5361 RMD160 5ee728c103bda5dc92ff1addeec031bbfed70114 files/yap-5.1.1-multilib.patch 5361 @@ -60,14 +64,14 @@ EBUILD yap-5.0.1.ebuild 1926 RMD160 369a3eb6368b1665a7c1106b774675ca7bf8b119 SHA MD5 c04d3096e7ea6c31a6755021653ec85a yap-5.0.1.ebuild 1926 RMD160 369a3eb6368b1665a7c1106b774675ca7bf8b119 yap-5.0.1.ebuild 1926 SHA256 7ed9d6d1b4ac094366d78a0b4969fd2ed9f133bd1dd47b6a93548d47c086d837 yap-5.0.1.ebuild 1926 -EBUILD yap-5.1.1.ebuild 2211 RMD160 79b3de05bbdaa5599f822bf1944a3cf23228e695 SHA1 02ff9fee6d84cc99949a263c9579fa78a6964069 SHA256 fd1106ffe9093937e119f7577fa1018fcdc5b6c0288de4749e17b30a367c6311 -MD5 93cbc0a2f317dcf1f41fd61ad5a646cd yap-5.1.1.ebuild 2211 -RMD160 79b3de05bbdaa5599f822bf1944a3cf23228e695 yap-5.1.1.ebuild 2211 -SHA256 fd1106ffe9093937e119f7577fa1018fcdc5b6c0288de4749e17b30a367c6311 yap-5.1.1.ebuild 2211 -MISC ChangeLog 2011 RMD160 29881c9de574e0132ff850efdf46a4e2a865f90a SHA1 e51035a54e68615bb18ae10a2a5d5c9e2f22af07 SHA256 9dd6117a3056aa3ee749f428a4d8f105fc6e63b58e95d81fb32ce346e7cb26c8 -MD5 f814d1fc572a12aa095fb76612e694eb ChangeLog 2011 -RMD160 29881c9de574e0132ff850efdf46a4e2a865f90a ChangeLog 2011 -SHA256 9dd6117a3056aa3ee749f428a4d8f105fc6e63b58e95d81fb32ce346e7cb26c8 ChangeLog 2011 +EBUILD yap-5.1.1.ebuild 2268 RMD160 a867afde266b4dea04f0d76ccfff4cf280e8783d SHA1 67a457baf17e7f4ead61f6d737be8f0b16e554c9 SHA256 f7646e14502ce1deba68a5cfeb024e18279150758aebc72d3a0b09cef10cc6ad +MD5 7368d61c9077d620fabd060f4ac9c410 yap-5.1.1.ebuild 2268 +RMD160 a867afde266b4dea04f0d76ccfff4cf280e8783d yap-5.1.1.ebuild 2268 +SHA256 f7646e14502ce1deba68a5cfeb024e18279150758aebc72d3a0b09cef10cc6ad yap-5.1.1.ebuild 2268 +MISC ChangeLog 2138 RMD160 398961f6d2f849b25d4944902400790f92cd3af8 SHA1 134c62689435970bb5dc2e0cb36e4e0464fbcb7b SHA256 6924fb0b9d62892206207c8a101aede39b45741a52dca31d382d8de3f4cbbb13 +MD5 30c8d892bea9ecfa6b2ddeca515e2cf1 ChangeLog 2138 +RMD160 398961f6d2f849b25d4944902400790f92cd3af8 ChangeLog 2138 +SHA256 6924fb0b9d62892206207c8a101aede39b45741a52dca31d382d8de3f4cbbb13 ChangeLog 2138 MISC metadata.xml 159 RMD160 38d27fd1c5faabedefa5507dfd83cb4c952fbc8c SHA1 52b92682cf41e53e71bf432537a16215bd9546b1 SHA256 851bf218a4283a1d8ea6ef98af0119a40eaa78bfaaec49c2f3440437f52889ba MD5 9187f53634e60ab7eb2ac7e98b0b19f7 metadata.xml 159 RMD160 38d27fd1c5faabedefa5507dfd83cb4c952fbc8c metadata.xml 159 diff --git a/dev-lang/yap/files/yap-5.1.1-jpl.patch b/dev-lang/yap/files/yap-5.1.1-jpl.patch new file mode 100644 index 000000000000..72b0e5f51602 --- /dev/null +++ b/dev-lang/yap/files/yap-5.1.1-jpl.patch @@ -0,0 +1,47 @@ +--- Yap-5.1.1.orig/LGPL/JPL/src/jpl.c 2006-02-02 02:28:56.000000000 +1300 ++++ Yap-5.1.1/LGPL/JPL/src/jpl.c 2007-02-03 17:16:56.000000000 +1300 +@@ -1827,7 +1827,7 @@ + + + //=== JVM initialisation, startup etc. ============================================================= +- ++/* + // this isn't much use; it can't discover JDK 1.2 support... + static int + jni_supported_jvm_version( +@@ -1848,7 +1848,7 @@ + && minor == mlo + ; + } +- ++*/ + + static int + jni_get_created_jvm_count(void) +@@ -1930,7 +1930,7 @@ + ); + } + +- ++/* + static foreign_t + jni_supported_jvm_version_plc( // not as useful as I'd hoped... + term_t t1, +@@ -1945,7 +1945,7 @@ + && jni_supported_jvm_version(major,minor) + ; + } +- ++*/ + + static foreign_t + jni_get_created_jvm_count_plc( +@@ -3879,7 +3879,7 @@ + static + PL_extension predspecs[] = + { { "jni_create_jvm", 2, jni_create_jvm_plc, 0 }, +- { "jni_supported_jvm_version", 2, jni_supported_jvm_version_plc, 0 }, ++/* { "jni_supported_jvm_version", 2, jni_supported_jvm_version_plc, 0 },*/ + { "jni_get_created_jvm_count", 1, jni_get_created_jvm_count_plc, 0 }, + { "jni_ensure_jvm", 0, jni_ensure_jvm_plc, 0 }, + { "jni_tag_to_iref", 2, jni_tag_to_iref_plc, 0 }, diff --git a/dev-lang/yap/yap-5.1.1.ebuild b/dev-lang/yap/yap-5.1.1.ebuild index 2d3357f53b2c..6871228a3f78 100644 --- a/dev-lang/yap/yap-5.1.1.ebuild +++ b/dev-lang/yap/yap-5.1.1.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/yap/yap-5.1.1.ebuild,v 1.9 2007/01/23 18:19:00 nixnut Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/yap/yap-5.1.1.ebuild,v 1.10 2007/02/03 04:41:14 keri Exp $ -inherit autotools eutils +inherit autotools eutils java-pkg-opt-2 MY_P="Yap-${PV}" @@ -16,7 +16,7 @@ KEYWORDS="~amd64 ppc x86" IUSE="debug doc examples gmp java mpi mysql odbc readline static tk threads" DEPEND="gmp? ( dev-libs/gmp ) - java? ( virtual/jdk ) + java? ( >=virtual/jdk-1.4 ) mpi? ( virtual/mpi ) mysql? ( virtual/mysql ) odbc? ( dev-db/unixODBC ) @@ -36,6 +36,7 @@ src_unpack() { epatch "${FILESDIR}"/${P}-analyst.patch epatch "${FILESDIR}"/${P}-myddas.patch epatch "${FILESDIR}"/${P}-tabling.patch + epatch "${FILESDIR}"/${P}-jpl.patch epatch "${FILESDIR}"/${P}-tkyap.patch } -- 2.26.2