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 8AE271382C5 for ; Sat, 10 Apr 2021 13:55:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D5E35E08FC; Sat, 10 Apr 2021 13:55:48 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BFCA3E08FC for ; Sat, 10 Apr 2021 13:55:48 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E6CCA335D50 for ; Sat, 10 Apr 2021 13:55:47 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9DAC2646 for ; Sat, 10 Apr 2021 13:55:46 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1618062933.bc774e857493f121de882c8e028d619574c92753.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-misc/netlogo-bin/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-misc/netlogo-bin/netlogo-bin-6.0.2-r1.ebuild sci-misc/netlogo-bin/netlogo-bin-6.0.2.ebuild X-VCS-Directories: sci-misc/netlogo-bin/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: bc774e857493f121de882c8e028d619574c92753 X-VCS-Branch: master Date: Sat, 10 Apr 2021 13:55:46 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 54e5f2ae-00ee-4df9-beca-8c71ddaaa1ad X-Archives-Hash: 478236a53f9851540e07be92ff52638b commit: bc774e857493f121de882c8e028d619574c92753 Author: Sam James gentoo org> AuthorDate: Sat Apr 10 13:52:50 2021 +0000 Commit: Sam James gentoo org> CommitDate: Sat Apr 10 13:55:33 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc774e85 sci-misc/netlogo-bin: EAPI 7, add missing deps Closes: https://bugs.gentoo.org/741576 Signed-off-by: Sam James gentoo.org> ...in-6.0.2.ebuild => netlogo-bin-6.0.2-r1.ebuild} | 32 ++++++++++++---------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/sci-misc/netlogo-bin/netlogo-bin-6.0.2.ebuild b/sci-misc/netlogo-bin/netlogo-bin-6.0.2-r1.ebuild similarity index 81% rename from sci-misc/netlogo-bin/netlogo-bin-6.0.2.ebuild rename to sci-misc/netlogo-bin/netlogo-bin-6.0.2-r1.ebuild index ae454d5e6ce..4aa943e61de 100644 --- a/sci-misc/netlogo-bin/netlogo-bin-6.0.2.ebuild +++ b/sci-misc/netlogo-bin/netlogo-bin-6.0.2-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit desktop @@ -15,15 +15,18 @@ SRC_URI=" amd64? ( http://ccl.northwestern.edu/netlogo/${PV}/${MY_P}-64.tgz ) x86? ( http://ccl.northwestern.edu/netlogo/${PV}/${MY_P}-32.tgz ) " +S="${WORKDIR}/${MY_PN} ${PV}" + LICENSE="netlogo GPL-2 LGPL-2.1 LGPL-3 BSD Apache-2.0" SLOT="0" KEYWORDS="-* ~amd64 ~x86" -IUSE="" - -DEPEND="" -RDEPEND=">=virtual/jre-1.8" -S="${WORKDIR}/${MY_PN} ${PV}" +RDEPEND=" + >=virtual/jre-1.8 + x11-libs/libX11 + x11-libs/libXrender + x11-libs/libXxf86vm +" DOCS=( "NetLogo User Manual.pdf" app/docs/shapes.nlogo readme.md ) HTML_DOCS=( app/docs app/behaviorsearch/documentation ) @@ -32,12 +35,13 @@ QA_PREBUILT="opt/netlogo/app/natives/linux-*/*.so" src_prepare() { default - cp "${FILESDIR}"/netlogo-${PV}.sh netlogo.sh - cp "${FILESDIR}"/netlogo3d-${PV}.sh netlogo3d.sh - cp "${FILESDIR}"/behaviorsearch-${PV}.sh behaviorsearch.sh - cp "${FILESDIR}"/hubnetclient-${PV}.sh hubnetclient.sh + cp "${FILESDIR}"/netlogo-${PV}.sh netlogo.sh || die + cp "${FILESDIR}"/netlogo3d-${PV}.sh netlogo3d.sh || die + cp "${FILESDIR}"/behaviorsearch-${PV}.sh behaviorsearch.sh || die + cp "${FILESDIR}"/hubnetclient-${PV}.sh hubnetclient.sh || die + if use x86; then - sed -i -e 's/linux-amd64/linux-i586/g' netlogo3d.sh + sed -i -e 's/linux-amd64/linux-i586/g' netlogo3d.sh || die fi } @@ -45,11 +49,11 @@ src_install() { einstalldocs # Override the config files so they don't use the bundled java path - sed -i -e 's/app.runtime=.*/app.runtime=$JAVA_HOME/g' app/*.cfg + sed -i -e 's/app.runtime=.*/app.runtime=$JAVA_HOME/g' app/*.cfg || die # Once docs are installed, remove them from the source so they don't get # installed below - rm -rf app/docs app/behaviorsearch/documentation + rm -rf app/docs app/behaviorsearch/documentation || die insinto /opt/netlogo doins -r app/ doins -r "Mathematica Link"