From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 708A2139694 for ; Thu, 16 Mar 2017 10:35:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AB82521C07B; Thu, 16 Mar 2017 10:35:25 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8610D21C07B for ; Thu, 16 Mar 2017 10:35:24 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C02CA340FDA for ; Thu, 16 Mar 2017 10:35:23 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 824896A12 for ; Thu, 16 Mar 2017 10:35:22 +0000 (UTC) From: "Martin Mokrejs" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Martin Mokrejs" Message-ID: <1489660506.11a62943a13d8d1837f530fa234480991589a501.mmokrejs@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-biology/imagej/ X-VCS-Repository: proj/sci X-VCS-Files: sci-biology/imagej/imagej-1.51k.ebuild X-VCS-Directories: sci-biology/imagej/ X-VCS-Committer: mmokrejs X-VCS-Committer-Name: Martin Mokrejs X-VCS-Revision: 11a62943a13d8d1837f530fa234480991589a501 X-VCS-Branch: master Date: Thu, 16 Mar 2017 10:35:22 +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: ec13c6fb-17db-41d0-95ac-32923bcfa17b X-Archives-Hash: daa7d89f4be5a27749060c5424111e0f commit: 11a62943a13d8d1837f530fa234480991589a501 Author: Martin Mokrejš fold natur cuni cz> AuthorDate: Thu Mar 16 10:35:06 2017 +0000 Commit: Martin Mokrejs fold natur cuni cz> CommitDate: Thu Mar 16 10:35:06 2017 +0000 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=11a62943 sci-biology/imagej: there is no separate /proc/meminfo in EPREFIXed hosts Add link to github issue. Remove CVS header line. Package-Manager: Portage-2.3.3, Repoman-2.3.1 sci-biology/imagej/imagej-1.51k.ebuild | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sci-biology/imagej/imagej-1.51k.ebuild b/sci-biology/imagej/imagej-1.51k.ebuild index 0467973e4..26a5ab0b7 100644 --- a/sci-biology/imagej/imagej-1.51k.ebuild +++ b/sci-biology/imagej/imagej-1.51k.ebuild @@ -1,6 +1,5 @@ # Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: $ EAPI=6 @@ -14,6 +13,7 @@ MY_PV=$(delete_all_version_separators) # version instead. Change to present version locally if you are sure proper # version has been released. # see https://bugs.gentoo.org/show_bug.cgi?id=112275 +# https://github.com/imagej/imagej1/issues/28 IJ_PV=$(expr ${MY_PV::3} - 1) DESCRIPTION="Image Processing and Analysis in Java" @@ -26,7 +26,7 @@ SRC_URI="http://imagej.nih.gov/ij/download/src/${MY_PN}${MY_PV}-src.zip # plugins? ( http://rsb.info.nih.gov/ij/download/zips/${MY_PN}${IJ_PV}.zip )" RESTRICT="" -LICENSE="public-domain" +LICENSE="public-domain" # http://imagej.net/disclaimer.html SLOT="0" KEYWORDS="" @@ -66,7 +66,7 @@ src_compile() { ant ${antflags} || die "ant build failed" # Max memory usage depends on available memory and CPU type - MEM=$(grep MemTotal ${EPREFIX}/proc/meminfo | cut -d':' -f2 | grep -o [0-9]*) + MEM=$(grep MemTotal /proc/meminfo | cut -d':' -f2 | grep -o [0-9]*) IJ_MAX_MEM=$(expr ${MEM} / 1024) if use x86 && $IJ_MAX_MEM -gt 2048 ; then IJ_MAX_MEM=2048