From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 1FA5E1381F3 for ; Mon, 21 Oct 2013 21:41:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A8AE7E0B7F; Mon, 21 Oct 2013 21:41:39 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 362D5E0B7F for ; Mon, 21 Oct 2013 21:41:39 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 281CC33EE7E for ; Mon, 21 Oct 2013 21:41:38 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id D2B6DE5308 for ; Mon, 21 Oct 2013 21:41:36 +0000 (UTC) From: "Christoph Junghans" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Christoph Junghans" Message-ID: <1382140354.75844044fbc53ab49a3626e381bdcae4315bc2f1.ottxor@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-mathematics/scilab/, sci-mathematics/scilab/files/ X-VCS-Repository: proj/sci X-VCS-Files: sci-mathematics/scilab/files/scilab-5.3.3-java-version-check.patch sci-mathematics/scilab/scilab-5.3.3-r1.ebuild sci-mathematics/scilab/scilab-5.3.3-r2.ebuild X-VCS-Directories: sci-mathematics/scilab/ sci-mathematics/scilab/files/ X-VCS-Committer: ottxor X-VCS-Committer-Name: Christoph Junghans X-VCS-Revision: 75844044fbc53ab49a3626e381bdcae4315bc2f1 X-VCS-Branch: master Date: Mon, 21 Oct 2013 21:41:36 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: dc358036-22f9-48cc-b028-6ffa72b56521 X-Archives-Hash: f115c29a18672597cfa6fbf3b3e9115b commit: 75844044fbc53ab49a3626e381bdcae4315bc2f1 Author: quentin gmail com> AuthorDate: Fri Oct 18 23:52:34 2013 +0000 Commit: Christoph Junghans gentoo org> CommitDate: Fri Oct 18 23:52:34 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=75844044 Fix broken minimum version check in scilab-5.3.3 Check compares version strings lexicographically, which does not work e.g. returns "4.2.8" > "4.2.10". Instead, all numbers composing the version number should be compared one by one. --- .../files/scilab-5.3.3-java-version-check.patch | 23 ++++++++++++++++++++++ ...ilab-5.3.3-r1.ebuild => scilab-5.3.3-r2.ebuild} | 3 ++- 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/sci-mathematics/scilab/files/scilab-5.3.3-java-version-check.patch b/sci-mathematics/scilab/files/scilab-5.3.3-java-version-check.patch new file mode 100644 index 0000000..c5eb611 --- /dev/null +++ b/sci-mathematics/scilab/files/scilab-5.3.3-java-version-check.patch @@ -0,0 +1,23 @@ +diff -Naurp scilab-5.3.3-r1-orig/m4/java-thirdparty.m4 scilab-5.3.3-r1/m4/java-thirdparty.m4 +--- scilab-5.3.3-r1-orig/m4/java-thirdparty.m4 2013-01-07 14:55:58.516374556 +0100 ++++ scilab-5.3.3-r1/m4/java-thirdparty.m4 2013-01-07 16:19:21.256370075 +0100 +@@ -38,9 +38,16 @@ AC_DEFUN([AC_JAVA_CHECK_VERSION_PACKAGE] + AC_JAVA_TRY_COMPILE($2, [String minVersion="$4"; + $6 + System.out.println($5); +- if (minVersion.compareTo($5) > 0) { +- System.exit(-1); +- } ] ++ String[] minV = minVersion.split("\\."); ++ String[] curV = $5.split("\\."); ++ for (int i=0; i cE) ++ System.exit(-1); ++ } ] + , "yes", echo "yes" , AC_MSG_ERROR([Wrong version of $1. Expected at least $4. Found $STDOUT])) + else + AC_JAVA_TRY_COMPILE($2, [String minVersion="$4"; diff --git a/sci-mathematics/scilab/scilab-5.3.3-r1.ebuild b/sci-mathematics/scilab/scilab-5.3.3-r2.ebuild similarity index 98% rename from sci-mathematics/scilab/scilab-5.3.3-r1.ebuild rename to sci-mathematics/scilab/scilab-5.3.3-r2.ebuild index 19fe80b..599a691 100644 --- a/sci-mathematics/scilab/scilab-5.3.3-r1.ebuild +++ b/sci-mathematics/scilab/scilab-5.3.3-r2.ebuild @@ -125,7 +125,8 @@ src_prepare() { "${FILESDIR}"/${P}-no-xcos-deps.patch \ "${FILESDIR}"/${P}-javadoc-utf8.patch \ "${FILESDIR}"/${P}-fix-random-runtime-failures.patch \ - "${FILESDIR}"/${P}-gui-no-xcos.patch + "${FILESDIR}"/${P}-gui-no-xcos.patch \ + "${FILESDIR}"/${P}-java-version-check.patch # need serious as-needed work (inter-dependencies among modules) # "${FILESDIR}"/${P}-as-needed.patch \