[gentoo-commits] repo/gentoo:master commit in: sci-misc/netlogo-bin/

[gentoo-commits] repo/gentoo:master commit in: sci-misc/netlogo-bin/

[David Seifert]

commit:     fa53848f991344713f38317aa6cf0cd0aa3efe58
Author:     Gerhard Bräunlich <wippbox <AT> gmx <DOT> net>
AuthorDate: Sun Jan 29 09:51:28 2017 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Jan 29 22:51:20 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa53848f

sci-misc/netlogo-bin: Removing EAPI 4 euilds

Package-Manager: portage-2.3.3
Closes: https://github.com/gentoo/gentoo/pull/3710

 sci-misc/netlogo-bin/Manifest                 |  2 -
 sci-misc/netlogo-bin/netlogo-bin-3.0.2.ebuild | 44 ---------------------
 sci-misc/netlogo-bin/netlogo-bin-4.0.4.ebuild | 55 ---------------------------
 3 files changed, 101 deletions(-)

diff --git a/sci-misc/netlogo-bin/Manifest b/sci-misc/netlogo-bin/Manifest
index 2c7913a..0ee6c8c 100644
--- a/sci-misc/netlogo-bin/Manifest
+++ b/sci-misc/netlogo-bin/Manifest
@@ -1,4 +1,2 @@
-DIST netlogo-3.0.2.tar.gz 21541643 SHA256 4644a232da98f7784e0bc78a6d0c7c5f9f614f11902926786c98de76ac1c7958 SHA512 ae876323eca09b0a55759d6006a4b0cf626db9ec8e3bc86d6876fb2712202a81cfa801da0498fbb2277c76a2b249de1c8ca3b32775c37068bec616e096865821 WHIRLPOOL c82a0ef3f51ec625aea17776cafe302c4f739a8eba847684a7cb3c91e2924827b3206610de9eaa685920f58a16cc6152c254ce5f377c155672a09fad358788da
-DIST netlogo-4.0.4.tar.gz 36488145 SHA256 678b66951cdd1b4768c464d9a37278251708da8d4c0049bacdc573df4d7dd537 SHA512 9f6e8d1a9abd61f6e2d60b78a8bf9c5cf02646ae437078c5332f538137f61ad94ba6d6490f0ea4b35f66de71e4e5fceb8bef7cee2578dd334f5efec9d9b6f64a WHIRLPOOL 6ad98f980b2341213b99e77452a10da8c06ff598fab6dce5e28dfefa321d7ceca05869a81d729487fd3e4fbe5703965546321ee6a8b95b0955f988e9b58f9345
 DIST netlogo-5.0.3.tar.gz 66725456 SHA256 cfc39c81c5bce4d2713338886484787ec3d9e417971d29dd21e115c74a5ecdac SHA512 39d660d5dbd7e74f072621a74bfc18648ed208b833b3d442f2a9dbefc673065c4a7bf0e4a8ebb670b4d4220ee7bec452cc97f32731a28ca2eb56656bea795b81 WHIRLPOOL 54fb9d78b8d4ed60295dec58fb39db4a89fb4ee9b8c428c268aae13b4cdbbaca19094f875b7d6450ffb2da3c2c193e9ed16d827d1c7dc872eba7d2bda1269e0f
 DIST netlogo.gif.tar 10240 SHA256 4c5412875d0b24a9b62e723ff0ae02f82211f7ce9827c47eb1dc75055217d726 SHA512 9a9bc81660599d2b35875f301d5b9824bfa2dafa21dc96b1e6e281d4682ab7b4052844a961b46f5300131c91a4562c58e4b1a4d753cb2b24a18e64b42d333e32 WHIRLPOOL 73bccd302fc18161cd1b9fecff3c60937904148948ba31705b06f60321a261f0ae44cc38c3d56a94669a0bd10ab7c71584345e4f6898b83f73f077be37fd4e63

diff --git a/sci-misc/netlogo-bin/netlogo-bin-3.0.2.ebuild b/sci-misc/netlogo-bin/netlogo-bin-3.0.2.ebuild
deleted file mode 100644
index f512f3b..00000000
--- a/sci-misc/netlogo-bin/netlogo-bin-3.0.2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit eutils java-pkg-2
-
-MY_PN="netlogo"
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Cross-platform multi-agent programmable modeling environment"
-HOMEPAGE="http://ccl.northwestern.edu/netlogo/"
-SRC_URI="
-	https://dev.gentoo.org/~jlec/distfiles/${PN/-bin}.gif.tar
-	http://ccl.northwestern.edu/netlogo/${PV}/${MY_P}.tar.gz"
-
-LICENSE="netlogo"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	app-arch/unzip
-	>=virtual/jdk-1.4"
-RDEPEND=">=virtual/jre-1.4"
-
-S="${WORKDIR}"/${MY_P}
-
-src_install() {
-	java-pkg_dojar *.jar
-	java-pkg_dojar extensions/*.jar
-	java-pkg_dojar lib/*.jar
-
-	dohtml -r docs/*
-	insinto /usr/share/${PN}/models
-	doins -r models/*
-
-	insinto /usr/share/pixmaps
-	doins  "${WORKDIR}"/netlogo.gif
-
-	exeinto /opt/bin
-	newexe "${FILESDIR}"/netlogo.sh netlogo
-
-	make_desktop_entry netlogo "NetLogo" /usr/share/pixmaps/netlogo.gif
-}

diff --git a/sci-misc/netlogo-bin/netlogo-bin-4.0.4.ebuild b/sci-misc/netlogo-bin/netlogo-bin-4.0.4.ebuild
deleted file mode 100644
index 5429339..00000000
--- a/sci-misc/netlogo-bin/netlogo-bin-4.0.4.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit eutils java-pkg-2
-
-MY_PN="netlogo"
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Cross-platform multi-agent programmable modeling environment"
-HOMEPAGE="http://ccl.northwestern.edu/netlogo/"
-SRC_URI="
-	https://dev.gentoo.org/~jlec/distfiles/${PN/-bin}.gif.tar
-	http://ccl.northwestern.edu/netlogo/${PV}/${MY_P}.tar.gz"
-LICENSE="netlogo"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=">=virtual/jre-1.5"
-
-S="${WORKDIR}"/${MY_P}
-
-QA_PREBUILT="/usr/share/"${PN}"/lib/*.so"
-
-src_install() {
-	java-pkg_dojar *.jar
-	java-pkg_dojar extensions/sound/*.jar
-	java-pkg_dojar extensions/profiler/*.jar
-	java-pkg_dojar extensions/array/*.jar
-	java-pkg_dojar extensions/gogo/*.jar
-	java-pkg_dojar extensions/sample/*.jar
-	java-pkg_dojar extensions/table/*.jar
-	java-pkg_dojar extensions/gis/*.jar
-	java-pkg_dojar lib/*.jar
-
-	dohtml -r docs/*
-	insinto /usr/share/"${PN}"/models
-	doins -r models/*
-
-	insinto /usr/share/pixmaps
-	doins  "${WORKDIR}"/netlogo.gif
-
-	exeinto /opt/bin
-	newexe "${FILESDIR}"/netlogo.sh netlogo
-
-	make_desktop_entry netlogo "NetLogo" /usr/share/pixmaps/netlogo.gif
-
-	#3D Libs right now only for x86
-	insinto /usr/share/"${PN}"/lib
-	doins lib/*.so
-}

[gentoo-commits] repo/gentoo:master commit in: sci-misc/netlogo-bin/

[Sergei Trofimovich]

commit:     82cc759b4e14e8ced48263283c353a8b35bc00ce
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sun May 12 16:21:10 2019 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sun May 12 16:21:44 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82cc759b

sci-misc/netlogo-bin: regenerate Manifest, bug #652872

Reported-by: Toralf Förster
Closes: https://bugs.gentoo.org/652872
Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 sci-misc/netlogo-bin/Manifest | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-misc/netlogo-bin/Manifest b/sci-misc/netlogo-bin/Manifest
index f416c7aabfb..963955e1ec0 100644
--- a/sci-misc/netlogo-bin/Manifest
+++ b/sci-misc/netlogo-bin/Manifest
@@ -1,4 +1,4 @@
 DIST NetLogo-6.0.2-32.tgz 192943415 BLAKE2B c7d20154ade89ae54f98fa08ae4832d9c81a97d1a7a93aaf0de75bd2914bae340ddd71dc3862957bf7e22863d5df9c5464a2bcd517ff0e9b087105237a8d5ac9 SHA512 ac8652a2487b01d02af0c8510ce4c80b2bf84cf2afc3d1bfbda198c1b7aeb0c5cbd85664e9841bc7704aec048482bc78306035673d2d59be67fb2ae50b63106b
 DIST NetLogo-6.0.2-64.tgz 190213078 BLAKE2B 6b0a077538f3e3f3e7769c605a67f6bb6b791319877910eac74e065091d3f6b8cd328d8b354415234b2dd9d4b96b3ca7d18074f54263f460f38b77b8dbe4b9bb SHA512 091200b66305e3ff84e9d1b9a293eaa5f6000a103de86d942c5d0f749aee52cf5519954d05807609f7c0cbeceeab15930ef48612b4f6c1445e529e876aaa9d8e
-DIST netlogo-5.0.3.tar.gz 29500644 BLAKE2B 8c71ba6b138cdf6bc999d3244ccf283720150a949526426249984ae87e50bd8bf2dab7141f9d4402c99e34463db772487347ee05c0125b996ce5424e165c19f9 SHA512 fc8d2d5a2a19ddeddec4643a06639e696cd403f605337b1b8072eb842b0f81fab1b264d386c4c0a09f7c2a44f9667b16a89f024d2fcf020ebd679b525ae9772e
+DIST netlogo-5.0.3.tar.gz 66725456 BLAKE2B 85df19cd0ef501c903e9b2f2ee2a6ca39430a5f64e1086365b9a29baa3962a7e1d018001652db7da54f1d6623b477d644f7b745b30e2c3be3462f5cb4e5cb891 SHA512 39d660d5dbd7e74f072621a74bfc18648ed208b833b3d442f2a9dbefc673065c4a7bf0e4a8ebb670b4d4220ee7bec452cc97f32731a28ca2eb56656bea795b81
 DIST netlogo.gif.tar 10240 BLAKE2B 5199290ca492dc4be03dac04a672b4a187daa6caa12a5a487137259071dad156e553ca7eea02f6cd7d66187e4956324fc2d3f2818f10f1557f276f003986be69 SHA512 9a9bc81660599d2b35875f301d5b9824bfa2dafa21dc96b1e6e281d4682ab7b4052844a961b46f5300131c91a4562c58e4b1a4d753cb2b24a18e64b42d333e32

[gentoo-commits] repo/gentoo:master commit in: sci-misc/netlogo-bin/

[Sam James]

commit:     bc774e857493f121de882c8e028d619574c92753
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 10 13:52:50 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> 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 <sam <AT> 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"

[gentoo-commits] repo/gentoo:master commit in: sci-misc/netlogo-bin/

[Andrew Ammerlaan]

commit:     29ad79ec8e656121bb85a52e6f5ba2a65fcc11f4
Author:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
AuthorDate: Tue Apr 27 13:50:27 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Wed May 19 18:30:20 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29ad79ec

sci-misc/netlogo-bin: add 6.2.0

- Fixed the icons (no longer available for download due to
	retirement of the maintainging dev)
- Fixed desktop files to adhere to feedesktop guidelines
- netlogo-headless now works (calls the system java version now)
- behaviorsearch now starts the gui instead of headless mode
	headless mode moved to behavioursearch_headless
- Install more docs
- Fixed double installation of docs
- Fixed QA Notice unresolved SONAME deps due to the pack installing
	both libs for x86 *and* amd64 which triggered this warning
	since icedtea does not install x86 libs on amd64 and viceversa
- Added missing deps on mesa and libdrm
- Fixed typo in DESCRIPTION
- Made HOMEPAGE https instead of http

Closes: https://bugs.gentoo.org/300503
Closes: https://bugs.gentoo.org/782001
Closes: https://bugs.gentoo.org/693890
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 sci-misc/netlogo-bin/Manifest                 |   3 +
 sci-misc/netlogo-bin/netlogo-bin-6.2.0.ebuild | 112 ++++++++++++++++++++++++++
 2 files changed, 115 insertions(+)

diff --git a/sci-misc/netlogo-bin/Manifest b/sci-misc/netlogo-bin/Manifest
index 963955e1ec0..076b9509d52 100644
--- a/sci-misc/netlogo-bin/Manifest
+++ b/sci-misc/netlogo-bin/Manifest
@@ -1,4 +1,7 @@
 DIST NetLogo-6.0.2-32.tgz 192943415 BLAKE2B c7d20154ade89ae54f98fa08ae4832d9c81a97d1a7a93aaf0de75bd2914bae340ddd71dc3862957bf7e22863d5df9c5464a2bcd517ff0e9b087105237a8d5ac9 SHA512 ac8652a2487b01d02af0c8510ce4c80b2bf84cf2afc3d1bfbda198c1b7aeb0c5cbd85664e9841bc7704aec048482bc78306035673d2d59be67fb2ae50b63106b
 DIST NetLogo-6.0.2-64.tgz 190213078 BLAKE2B 6b0a077538f3e3f3e7769c605a67f6bb6b791319877910eac74e065091d3f6b8cd328d8b354415234b2dd9d4b96b3ca7d18074f54263f460f38b77b8dbe4b9bb SHA512 091200b66305e3ff84e9d1b9a293eaa5f6000a103de86d942c5d0f749aee52cf5519954d05807609f7c0cbeceeab15930ef48612b4f6c1445e529e876aaa9d8e
+DIST NetLogo-6.2.0-32.tgz 225021142 BLAKE2B e7570ae8d865a650ebc90fe66d57aefaa1f413dea54f778ee3f0d5621fad40c16e2a7d3e26f6d51b08f02c25a1adc7ed30e22e01b43abc68b933f414ff57461f SHA512 9c399a00a49ccc0d40e1ddb3c61e41b3aa4e5aff50cf7d872f954ea47956f60faec8f5c0f0082e5b35070d32129c5b8eecceeb93d39b878ad58f13850ccd358f
+DIST NetLogo-6.2.0-64.tgz 224714930 BLAKE2B 5149f9b3ad9e49f50b907223ca554ec9bb01fc679a94f2dfe38d4c2535f6f9d3529d2189362a910ae0cc802e9e0de11f46e6dd0453b91caa87410990a7c80b52 SHA512 e6323ef608db55a187ba26604336a927ddcb6de3c51d8d6d5c701f1d1d2041752efe856f564aff50133446f9d51b663258e29bc18e1a42ffa3f6107023538f36
 DIST netlogo-5.0.3.tar.gz 66725456 BLAKE2B 85df19cd0ef501c903e9b2f2ee2a6ca39430a5f64e1086365b9a29baa3962a7e1d018001652db7da54f1d6623b477d644f7b745b30e2c3be3462f5cb4e5cb891 SHA512 39d660d5dbd7e74f072621a74bfc18648ed208b833b3d442f2a9dbefc673065c4a7bf0e4a8ebb670b4d4220ee7bec452cc97f32731a28ca2eb56656bea795b81
 DIST netlogo.gif.tar 10240 BLAKE2B 5199290ca492dc4be03dac04a672b4a187daa6caa12a5a487137259071dad156e553ca7eea02f6cd7d66187e4956324fc2d3f2818f10f1557f276f003986be69 SHA512 9a9bc81660599d2b35875f301d5b9824bfa2dafa21dc96b1e6e281d4682ab7b4052844a961b46f5300131c91a4562c58e4b1a4d753cb2b24a18e64b42d333e32
+DIST netlogo.png 23702 BLAKE2B 60816d1bf1ee265b6d4dfa7f4d4b3df22d03996b551d7056b51ea8fc2703a6037fb7d0fb1fc5d0557255eac569aeb17dc0f32bfc91db2b13411588e5f821bdba SHA512 37945b2739f7f25f5b443c03914c4f6e28ed81efe2a0eca5dd83c7c5961fdeeb681b80b162dc45e1de3f65e013a38999b91b9b0ad1cfd5bf664d5e11029b62dd

diff --git a/sci-misc/netlogo-bin/netlogo-bin-6.2.0.ebuild b/sci-misc/netlogo-bin/netlogo-bin-6.2.0.ebuild
new file mode 100644
index 00000000000..9973c0903d7
--- /dev/null
+++ b/sci-misc/netlogo-bin/netlogo-bin-6.2.0.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop java-pkg-2 xdg
+
+MY_PN="NetLogo"
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Programming language and IDE for agent-based modelling"
+HOMEPAGE="https://ccl.northwestern.edu/netlogo/"
+SRC_URI="
+	https://netlogoweb.org/assets/images/desktopicon.png -> ${PN//-bin}.png
+	amd64? ( https://ccl.northwestern.edu/netlogo/${PV}/${MY_P}-64.tgz )
+	x86? ( https://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"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+	media-libs/mesa
+	x11-libs/libdrm
+	x11-libs/libX11
+	x11-libs/libXrender
+	x11-libs/libXxf86vm
+"
+
+DOCS=(
+	"readme.md"
+	"NetLogo User Manual.pdf"
+	"Mathematica Link/NetLogo-Mathematica Tutorial.pdf"
+	"app/behaviorsearch/README.TXT"
+)
+HTML_DOCS=(
+	"app/docs"
+	"app/behaviorsearch/documentation"
+)
+
+QA_PREBUILT="opt/netlogo/app/natives/linux-*/*.so"
+
+src_install() {
+	einstalldocs
+
+	# Remove the bundled libs if we are not installing on this arch
+	# This avoids: "QA Notice: Unresolved SONAME dependencies:"
+	if ! use amd64; then
+		rm -r app/natives/linux-amd64 || die
+	fi
+	if ! use x86; then
+		rm -r app/natives/linux-i586 || die
+	fi
+
+	# 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 || die
+
+	local basedir="/opt/${PN//-bin}"
+	insinto "${basedir}"
+	doins -r app/
+	# The whitespace causes issues when we try to java-pkg_regjar, because
+	# classpath can't contain paths with whitespaces
+	mv "Mathematica Link/" "MathematicaLink/" || die
+	doins -r "MathematicaLink/"
+
+	doicon -s 256x256 "${DISTDIR}/${PN//-bin}.png"
+	doicon -s scalable app/behaviorsearch/resources/icon_behaviorsearch.svg
+	doicon -s 256x256 app/behaviorsearch/resources/icon_behaviorsearch.png
+
+	# Register all these jars so they are available in the classpath
+	for jar in "${ED}/${basedir}/app/"*.jar ; do
+		java-pkg_regjar "${jar}"
+	done
+	java-pkg_regjar "${ED}/${basedir}/MathematicaLink/mathematica-link.jar"
+
+	use amd64 && java-pkg_dolauncher netlogo3d \
+		--main org.nlogo.app.App \
+		--pwd "${EPREFIX}/${basedir}" \
+		--java_args "-Dnetlogo.extensions.dir=${EPREFIX}/${basedir}/app/extensions -Dorg.nlogo.is3d=true -Djava.library.path=${EPREFIX}/${basedir}/app/natives/linux-amd64/:\${env_var:PATH}"
+	use x86 && java-pkg_dolauncher netlogo3d \
+		--main org.nlogo.app.App \
+		--pwd "${EPREFIX}/${basedir}" \
+		--java_args "-Dnetlogo.extensions.dir=${EPREFIX}/${basedir}/app/extensions -Dorg.nlogo.is3d=true -Djava.library.path=${EPREFIX}/${basedir}/app/natives/linux-i586/:\${env_var:PATH}"
+	java-pkg_dolauncher netlogo \
+		--main org.nlogo.app.App \
+		--pwd "${EPREFIX}/${basedir}" \
+		--java_args "-Dnetlogo.extensions.dir=${EPREFIX}/${basedir}/app/extensions"
+	java-pkg_dolauncher netlogo-headless \
+		--main org.nlogo.headless.Main \
+		--pwd "${EPREFIX}/${basedir}" \
+		--java_args "-Dnetlogo.extensions.dir=${EPREFIX}/${basedir}/app/extensions"
+	java-pkg_dolauncher hubnetclient \
+		--main org.nlogo.hubnet.client.App \
+		--pwd "${EPREFIX}/${basedir}" \
+		--java_args "-Dnetlogo.extensions.dir=${EPREFIX}/${basedir}/app/extensions -Dorg.nlogo.is3d=true"
+	java-pkg_dolauncher behaviorsearch \
+		--main bsearch.app.BehaviorSearchGUI \
+		--pwd "${EPREFIX}/${basedir}" \
+		--java_args "-Dbsearch.startupfolder=${EPREFIX}/${basedir} -Dbsearch.appfolder=${EPREFIX}/${basedir}/app/behaviorsearch -server"
+	java-pkg_dolauncher behaviorsearch-headless \
+		--main bsearch.app.BehaviorSearch \
+		--pwd "${EPREFIX}/${basedir}" \
+		--java_args "-Dbsearch.startupfolder=${EPREFIX}/${basedir} -Dbsearch.appfolder=${EPREFIX}/${basedir}/app/behaviorsearch -server"
+
+	make_desktop_entry netlogo "NetLogo" netlogo
+	make_desktop_entry netlogo3d "NetLogo 3D" netlogo
+	make_desktop_entry hubnetclient "NetLogo Hubnet Client" netlogo
+	make_desktop_entry behaviorsearch "NetLogo Behavior Search" icon_behaviorsearch
+}

[gentoo-commits] repo/gentoo:master commit in: sci-misc/netlogo-bin/

[Andrew Ammerlaan]

commit:     1a6d8dc09c00ea4b78504e87ac13dcedbf2daa6c
Author:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
AuthorDate: Mon May  3 08:58:10 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Wed May 19 18:30:20 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a6d8dc0

sci-misc/netlogo-bin: update DESCRIPTION and HOMEPAGE

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Closes: https://github.com/gentoo/gentoo/pull/20558
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 sci-misc/netlogo-bin/netlogo-bin-5.0.3-r1.ebuild | 8 ++++----
 sci-misc/netlogo-bin/netlogo-bin-6.0.2-r1.ebuild | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/sci-misc/netlogo-bin/netlogo-bin-5.0.3-r1.ebuild b/sci-misc/netlogo-bin/netlogo-bin-5.0.3-r1.ebuild
index 074522a10ca..ac244f82507 100644
--- a/sci-misc/netlogo-bin/netlogo-bin-5.0.3-r1.ebuild
+++ b/sci-misc/netlogo-bin/netlogo-bin-5.0.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,11 +8,11 @@ inherit eutils java-pkg-2
 MY_PN="netlogo"
 MY_P=${MY_PN}-${PV}
 
-DESCRIPTION="Cross-platform multi-agent programmable modeling environment"
-HOMEPAGE="http://ccl.northwestern.edu/netlogo/"
+DESCRIPTION="Programming language and IDE for agent-based modelling"
+HOMEPAGE="https://ccl.northwestern.edu/netlogo/"
 SRC_URI="
 	https://dev.gentoo.org/~jlec/distfiles/${PN/-bin}.gif.tar
-	http://ccl.northwestern.edu/netlogo/${PV}/${MY_P}.tar.gz"
+	https://ccl.northwestern.edu/netlogo/${PV}/${MY_P}.tar.gz"
 LICENSE="netlogo GPL-2 LGPL-2.1 LGPL-3 BSD Apache-2.0"
 SLOT="0"
 KEYWORDS="-* amd64 x86"

diff --git a/sci-misc/netlogo-bin/netlogo-bin-6.0.2-r1.ebuild b/sci-misc/netlogo-bin/netlogo-bin-6.0.2-r1.ebuild
index 4aa943e61de..54749182d03 100644
--- a/sci-misc/netlogo-bin/netlogo-bin-6.0.2-r1.ebuild
+++ b/sci-misc/netlogo-bin/netlogo-bin-6.0.2-r1.ebuild
@@ -8,12 +8,12 @@ inherit desktop
 MY_PN="NetLogo"
 MY_P=${MY_PN}-${PV}
 
-DESCRIPTION="Cross-platform multi-agent programmable modeling environment"
-HOMEPAGE="http://ccl.northwestern.edu/netlogo/"
+DESCRIPTION="Programming language and IDE for agent-based modelling"
+HOMEPAGE="https://ccl.northwestern.edu/netlogo/"
 SRC_URI="
 	https://dev.gentoo.org/~jlec/distfiles/${PN/-bin}.gif.tar
-	amd64? ( http://ccl.northwestern.edu/netlogo/${PV}/${MY_P}-64.tgz )
-	x86? ( http://ccl.northwestern.edu/netlogo/${PV}/${MY_P}-32.tgz )
+	amd64? ( https://ccl.northwestern.edu/netlogo/${PV}/${MY_P}-64.tgz )
+	x86? ( https://ccl.northwestern.edu/netlogo/${PV}/${MY_P}-32.tgz )
 "
 S="${WORKDIR}/${MY_PN} ${PV}"
 

[gentoo-commits] repo/gentoo:master commit in: sci-misc/netlogo-bin/

[Agostino Sarubbo]

commit:     cf3972590ac52ef585f20932a00fa620aa8cf6d5
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 18 06:26:34 2021 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Fri Jun 18 06:26:34 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf397259

sci-misc/netlogo-bin: amd64 stable wrt bug #791274

Package-Manager: Portage-3.0.18, Repoman-3.0.2
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 sci-misc/netlogo-bin/netlogo-bin-6.0.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-misc/netlogo-bin/netlogo-bin-6.0.2-r1.ebuild b/sci-misc/netlogo-bin/netlogo-bin-6.0.2-r1.ebuild
index 54749182d03..0a5cef3acd4 100644
--- a/sci-misc/netlogo-bin/netlogo-bin-6.0.2-r1.ebuild
+++ b/sci-misc/netlogo-bin/netlogo-bin-6.0.2-r1.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/${MY_PN} ${PV}"
 
 LICENSE="netlogo GPL-2 LGPL-2.1 LGPL-3 BSD Apache-2.0"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 ~x86"
 
 RDEPEND="
 	>=virtual/jre-1.8

[gentoo-commits] repo/gentoo:master commit in: sci-misc/netlogo-bin/

[Agostino Sarubbo]

commit:     729741777f48fb7407042ca92df15f27b9236750
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 18 06:29:56 2021 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Fri Jun 18 06:29:56 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72974177

sci-misc/netlogo-bin: x86 stable wrt bug #791274

Package-Manager: Portage-3.0.18, Repoman-3.0.2
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 sci-misc/netlogo-bin/netlogo-bin-6.0.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-misc/netlogo-bin/netlogo-bin-6.0.2-r1.ebuild b/sci-misc/netlogo-bin/netlogo-bin-6.0.2-r1.ebuild
index 0a5cef3acd4..7ce2d58f58b 100644
--- a/sci-misc/netlogo-bin/netlogo-bin-6.0.2-r1.ebuild
+++ b/sci-misc/netlogo-bin/netlogo-bin-6.0.2-r1.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/${MY_PN} ${PV}"
 
 LICENSE="netlogo GPL-2 LGPL-2.1 LGPL-3 BSD Apache-2.0"
 SLOT="0"
-KEYWORDS="-* amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 
 RDEPEND="
 	>=virtual/jre-1.8

[gentoo-commits] repo/gentoo:master commit in: sci-misc/netlogo-bin/

[Andrew Ammerlaan]

commit:     0e44e78131e7ea52c2e77f5dcbf75f4802a340c4
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Fri Jun 18 07:26:42 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Fri Jun 18 08:48:16 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e44e781

sci-misc/netlogo-bin: remove version with min java 1.5

Closes: https://bugs.gentoo.org/787653
Package-Manager: Portage-3.0.20, Repoman-3.0.2
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/21300
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 sci-misc/netlogo-bin/Manifest                    |  1 -
 sci-misc/netlogo-bin/netlogo-bin-5.0.3-r1.ebuild | 60 ------------------------
 2 files changed, 61 deletions(-)

diff --git a/sci-misc/netlogo-bin/Manifest b/sci-misc/netlogo-bin/Manifest
index 076b9509d52..81dc3c0a0f6 100644
--- a/sci-misc/netlogo-bin/Manifest
+++ b/sci-misc/netlogo-bin/Manifest
@@ -2,6 +2,5 @@ DIST NetLogo-6.0.2-32.tgz 192943415 BLAKE2B c7d20154ade89ae54f98fa08ae4832d9c81a
 DIST NetLogo-6.0.2-64.tgz 190213078 BLAKE2B 6b0a077538f3e3f3e7769c605a67f6bb6b791319877910eac74e065091d3f6b8cd328d8b354415234b2dd9d4b96b3ca7d18074f54263f460f38b77b8dbe4b9bb SHA512 091200b66305e3ff84e9d1b9a293eaa5f6000a103de86d942c5d0f749aee52cf5519954d05807609f7c0cbeceeab15930ef48612b4f6c1445e529e876aaa9d8e
 DIST NetLogo-6.2.0-32.tgz 225021142 BLAKE2B e7570ae8d865a650ebc90fe66d57aefaa1f413dea54f778ee3f0d5621fad40c16e2a7d3e26f6d51b08f02c25a1adc7ed30e22e01b43abc68b933f414ff57461f SHA512 9c399a00a49ccc0d40e1ddb3c61e41b3aa4e5aff50cf7d872f954ea47956f60faec8f5c0f0082e5b35070d32129c5b8eecceeb93d39b878ad58f13850ccd358f
 DIST NetLogo-6.2.0-64.tgz 224714930 BLAKE2B 5149f9b3ad9e49f50b907223ca554ec9bb01fc679a94f2dfe38d4c2535f6f9d3529d2189362a910ae0cc802e9e0de11f46e6dd0453b91caa87410990a7c80b52 SHA512 e6323ef608db55a187ba26604336a927ddcb6de3c51d8d6d5c701f1d1d2041752efe856f564aff50133446f9d51b663258e29bc18e1a42ffa3f6107023538f36
-DIST netlogo-5.0.3.tar.gz 66725456 BLAKE2B 85df19cd0ef501c903e9b2f2ee2a6ca39430a5f64e1086365b9a29baa3962a7e1d018001652db7da54f1d6623b477d644f7b745b30e2c3be3462f5cb4e5cb891 SHA512 39d660d5dbd7e74f072621a74bfc18648ed208b833b3d442f2a9dbefc673065c4a7bf0e4a8ebb670b4d4220ee7bec452cc97f32731a28ca2eb56656bea795b81
 DIST netlogo.gif.tar 10240 BLAKE2B 5199290ca492dc4be03dac04a672b4a187daa6caa12a5a487137259071dad156e553ca7eea02f6cd7d66187e4956324fc2d3f2818f10f1557f276f003986be69 SHA512 9a9bc81660599d2b35875f301d5b9824bfa2dafa21dc96b1e6e281d4682ab7b4052844a961b46f5300131c91a4562c58e4b1a4d753cb2b24a18e64b42d333e32
 DIST netlogo.png 23702 BLAKE2B 60816d1bf1ee265b6d4dfa7f4d4b3df22d03996b551d7056b51ea8fc2703a6037fb7d0fb1fc5d0557255eac569aeb17dc0f32bfc91db2b13411588e5f821bdba SHA512 37945b2739f7f25f5b443c03914c4f6e28ed81efe2a0eca5dd83c7c5961fdeeb681b80b162dc45e1de3f65e013a38999b91b9b0ad1cfd5bf664d5e11029b62dd

diff --git a/sci-misc/netlogo-bin/netlogo-bin-5.0.3-r1.ebuild b/sci-misc/netlogo-bin/netlogo-bin-5.0.3-r1.ebuild
deleted file mode 100644
index ac244f82507..00000000000
--- a/sci-misc/netlogo-bin/netlogo-bin-5.0.3-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils java-pkg-2
-
-MY_PN="netlogo"
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Programming language and IDE for agent-based modelling"
-HOMEPAGE="https://ccl.northwestern.edu/netlogo/"
-SRC_URI="
-	https://dev.gentoo.org/~jlec/distfiles/${PN/-bin}.gif.tar
-	https://ccl.northwestern.edu/netlogo/${PV}/${MY_P}.tar.gz"
-LICENSE="netlogo GPL-2 LGPL-2.1 LGPL-3 BSD Apache-2.0"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=">=virtual/jre-1.5"
-
-S="${WORKDIR}"/${MY_P}
-
-QA_PREBUILT="/usr/share/"${PN}"/lib/Linux-*/*.so"
-
-src_install() {
-	insinto /usr/share/"${PN}"/
-	doins *.jar
-	rm lib/quaqua-7.3.4.jar
-	java-pkg_dojar extensions/sound/*.jar
-	java-pkg_dojar extensions/profiler/*.jar
-	java-pkg_dojar extensions/array/*.jar
-	java-pkg_dojar extensions/gogo/*.jar
-	java-pkg_dojar extensions/bitmap/*.jar
-	java-pkg_dojar extensions/table/*.jar
-	java-pkg_dojar extensions/gis/*.jar
-	java-pkg_dojar lib/*.jar
-
-	dohtml -r docs/*
-	dodoc "docs/NetLogo User Manual.pdf" docs/shapes.nlogo
-	insinto /usr/share/"${PN}"/models
-	doins -r models/*
-
-	insinto /usr/share/pixmaps
-	newins  "${S}"/icon.ico netlogo.ico
-
-	exeinto /opt/bin
-	newexe "${FILESDIR}"/netlogo-5.0.3.sh netlogo
-	newexe "${FILESDIR}"/netlogo-3d.sh netlogo-3d
-	newexe "${FILESDIR}"/hubnet.sh hubnet
-	make_desktop_entry netlogo "NetLogo" /usr/share/pixmaps/netlogo.ico
-	make_desktop_entry netlogo-3d "NetLogo 2D" /usr/share/pixmaps/netlogo.ico
-	make_desktop_entry hubnet "NetLogo Hubnet" /usr/share/pixmaps/netlogo.ico
-
-	#3D Libs right now only for x86
-	insinto /usr/share/"${PN}"/lib
-	doins -r lib/Linux-*
-}

[gentoo-commits] repo/gentoo:master commit in: sci-misc/netlogo-bin/

[Andrew Ammerlaan]

commit:     4be2cc112e82f1d1641a570b6a17959785e28a50
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 11 15:19:44 2022 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Tue Jan 11 15:19:51 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4be2cc11

sci-misc/netlogo-bin: add version 6.2.2

add sci as maintainer

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 sci-misc/netlogo-bin/Manifest                 |   2 +
 sci-misc/netlogo-bin/metadata.xml             |   7 +-
 sci-misc/netlogo-bin/netlogo-bin-6.2.2.ebuild | 112 ++++++++++++++++++++++++++
 3 files changed, 119 insertions(+), 2 deletions(-)

diff --git a/sci-misc/netlogo-bin/Manifest b/sci-misc/netlogo-bin/Manifest
index 81dc3c0a0f63..4989dd783877 100644
--- a/sci-misc/netlogo-bin/Manifest
+++ b/sci-misc/netlogo-bin/Manifest
@@ -2,5 +2,7 @@ DIST NetLogo-6.0.2-32.tgz 192943415 BLAKE2B c7d20154ade89ae54f98fa08ae4832d9c81a
 DIST NetLogo-6.0.2-64.tgz 190213078 BLAKE2B 6b0a077538f3e3f3e7769c605a67f6bb6b791319877910eac74e065091d3f6b8cd328d8b354415234b2dd9d4b96b3ca7d18074f54263f460f38b77b8dbe4b9bb SHA512 091200b66305e3ff84e9d1b9a293eaa5f6000a103de86d942c5d0f749aee52cf5519954d05807609f7c0cbeceeab15930ef48612b4f6c1445e529e876aaa9d8e
 DIST NetLogo-6.2.0-32.tgz 225021142 BLAKE2B e7570ae8d865a650ebc90fe66d57aefaa1f413dea54f778ee3f0d5621fad40c16e2a7d3e26f6d51b08f02c25a1adc7ed30e22e01b43abc68b933f414ff57461f SHA512 9c399a00a49ccc0d40e1ddb3c61e41b3aa4e5aff50cf7d872f954ea47956f60faec8f5c0f0082e5b35070d32129c5b8eecceeb93d39b878ad58f13850ccd358f
 DIST NetLogo-6.2.0-64.tgz 224714930 BLAKE2B 5149f9b3ad9e49f50b907223ca554ec9bb01fc679a94f2dfe38d4c2535f6f9d3529d2189362a910ae0cc802e9e0de11f46e6dd0453b91caa87410990a7c80b52 SHA512 e6323ef608db55a187ba26604336a927ddcb6de3c51d8d6d5c701f1d1d2041752efe856f564aff50133446f9d51b663258e29bc18e1a42ffa3f6107023538f36
+DIST NetLogo-6.2.2-32.tgz 232876084 BLAKE2B c32b74d57b9671c6de380b77d78d305582b2dd594b9c6dc4640c6978630c1def5ccf24dd21a25fd9bec868908f3b41c93d40d090b540d1a6dd1840620a0ea5be SHA512 c27c7a73f51dc919e9acebc32b3fcd399d8597b2e0141d0cdf0ffc06e932afbdeb759a5b298aa337af5b846ed6c9f31ca8a0c6441f8f31f29151ea8a96433840
+DIST NetLogo-6.2.2-64.tgz 232588273 BLAKE2B 65d0f5ed9ba4616ac4a9f6df2f0a3f3fec280343233f4d715c7eb96002860b0a2377dc354913bd78527df45c7f93bb97e0979d18f49e3dc987847a73d879ee51 SHA512 0f38e34507897dd36a3053415bf191b8e71a7ef601ac6fe407bff0faa50c2e915e283e3e043379e19fcc4449934e1b7ceaffb68eadab1e529a5494b3a2d0f11f
 DIST netlogo.gif.tar 10240 BLAKE2B 5199290ca492dc4be03dac04a672b4a187daa6caa12a5a487137259071dad156e553ca7eea02f6cd7d66187e4956324fc2d3f2818f10f1557f276f003986be69 SHA512 9a9bc81660599d2b35875f301d5b9824bfa2dafa21dc96b1e6e281d4682ab7b4052844a961b46f5300131c91a4562c58e4b1a4d753cb2b24a18e64b42d333e32
 DIST netlogo.png 23702 BLAKE2B 60816d1bf1ee265b6d4dfa7f4d4b3df22d03996b551d7056b51ea8fc2703a6037fb7d0fb1fc5d0557255eac569aeb17dc0f32bfc91db2b13411588e5f821bdba SHA512 37945b2739f7f25f5b443c03914c4f6e28ed81efe2a0eca5dd83c7c5961fdeeb681b80b162dc45e1de3f65e013a38999b91b9b0ad1cfd5bf664d5e11029b62dd

diff --git a/sci-misc/netlogo-bin/metadata.xml b/sci-misc/netlogo-bin/metadata.xml
index 8d72190c0107..4a51e37f3518 100644
--- a/sci-misc/netlogo-bin/metadata.xml
+++ b/sci-misc/netlogo-bin/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="project">
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
 	<longdescription>
 NetLogo is a programmable modeling environment for simulating natural and 
 social phenomena. It is particularly well suited for modeling complex 
@@ -10,5 +13,5 @@ or thousands of independent "agents" all operating concurrently. This makes
 it possible to explore the connection between the micro-level behavior of 
 individuals and the macro-level patterns that emerge from the interaction 
 of many individuals.
-</longdescription>
+	</longdescription>
 </pkgmetadata>

diff --git a/sci-misc/netlogo-bin/netlogo-bin-6.2.2.ebuild b/sci-misc/netlogo-bin/netlogo-bin-6.2.2.ebuild
new file mode 100644
index 000000000000..587353e581fc
--- /dev/null
+++ b/sci-misc/netlogo-bin/netlogo-bin-6.2.2.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop java-pkg-2 xdg
+
+MY_PN="NetLogo"
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Programming language and IDE for agent-based modelling"
+HOMEPAGE="https://ccl.northwestern.edu/netlogo/"
+SRC_URI="
+	https://netlogoweb.org/assets/images/desktopicon.png -> ${PN//-bin}.png
+	amd64? ( https://ccl.northwestern.edu/netlogo/${PV}/${MY_P}-64.tgz )
+	x86? ( https://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"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+	media-libs/mesa
+	x11-libs/libdrm
+	x11-libs/libX11
+	x11-libs/libXrender
+	x11-libs/libXxf86vm
+"
+
+DOCS=(
+	"readme.md"
+	"NetLogo User Manual.pdf"
+	"Mathematica Link/NetLogo-Mathematica Tutorial.pdf"
+	"app/behaviorsearch/README.TXT"
+)
+HTML_DOCS=(
+	"app/docs"
+	"app/behaviorsearch/documentation"
+)
+
+QA_PREBUILT="opt/netlogo/app/natives/linux-*/*.so"
+
+src_install() {
+	einstalldocs
+
+	# Remove the bundled libs if we are not installing on this arch
+	# This avoids: "QA Notice: Unresolved SONAME dependencies:"
+	if ! use amd64; then
+		rm -r app/natives/linux-amd64 || die
+	fi
+	if ! use x86; then
+		rm -r app/natives/linux-i586 || die
+	fi
+
+	# 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 || die
+
+	local basedir="/opt/${PN//-bin}"
+	insinto "${basedir}"
+	doins -r app/
+	# The whitespace causes issues when we try to java-pkg_regjar, because
+	# classpath can't contain paths with whitespaces
+	mv "Mathematica Link/" "MathematicaLink/" || die
+	doins -r "MathematicaLink/"
+
+	doicon -s 256x256 "${DISTDIR}/${PN//-bin}.png"
+	doicon -s scalable app/behaviorsearch/resources/icon_behaviorsearch.svg
+	doicon -s 256x256 app/behaviorsearch/resources/icon_behaviorsearch.png
+
+	# Register all these jars so they are available in the classpath
+	for jar in "${ED}/${basedir}/app/"*.jar ; do
+		java-pkg_regjar "${jar}"
+	done
+	java-pkg_regjar "${ED}/${basedir}/MathematicaLink/mathematica-link.jar"
+
+	use amd64 && java-pkg_dolauncher netlogo3d \
+		--main org.nlogo.app.App \
+		--pwd "${EPREFIX}/${basedir}" \
+		--java_args "-Dnetlogo.extensions.dir=${EPREFIX}/${basedir}/app/extensions -Dorg.nlogo.is3d=true -Djava.library.path=${EPREFIX}/${basedir}/app/natives/linux-amd64/:\${env_var:PATH}"
+	use x86 && java-pkg_dolauncher netlogo3d \
+		--main org.nlogo.app.App \
+		--pwd "${EPREFIX}/${basedir}" \
+		--java_args "-Dnetlogo.extensions.dir=${EPREFIX}/${basedir}/app/extensions -Dorg.nlogo.is3d=true -Djava.library.path=${EPREFIX}/${basedir}/app/natives/linux-i586/:\${env_var:PATH}"
+	java-pkg_dolauncher netlogo \
+		--main org.nlogo.app.App \
+		--pwd "${EPREFIX}/${basedir}" \
+		--java_args "-Dnetlogo.extensions.dir=${EPREFIX}/${basedir}/app/extensions"
+	java-pkg_dolauncher netlogo-headless \
+		--main org.nlogo.headless.Main \
+		--pwd "${EPREFIX}/${basedir}" \
+		--java_args "-Dnetlogo.extensions.dir=${EPREFIX}/${basedir}/app/extensions"
+	java-pkg_dolauncher hubnetclient \
+		--main org.nlogo.hubnet.client.App \
+		--pwd "${EPREFIX}/${basedir}" \
+		--java_args "-Dnetlogo.extensions.dir=${EPREFIX}/${basedir}/app/extensions -Dorg.nlogo.is3d=true"
+	java-pkg_dolauncher behaviorsearch \
+		--main bsearch.app.BehaviorSearchGUI \
+		--pwd "${EPREFIX}/${basedir}" \
+		--java_args "-Dbsearch.startupfolder=${EPREFIX}/${basedir} -Dbsearch.appfolder=${EPREFIX}/${basedir}/app/behaviorsearch -server"
+	java-pkg_dolauncher behaviorsearch-headless \
+		--main bsearch.app.BehaviorSearch \
+		--pwd "${EPREFIX}/${basedir}" \
+		--java_args "-Dbsearch.startupfolder=${EPREFIX}/${basedir} -Dbsearch.appfolder=${EPREFIX}/${basedir}/app/behaviorsearch -server"
+
+	make_desktop_entry netlogo "NetLogo" netlogo
+	make_desktop_entry netlogo3d "NetLogo 3D" netlogo
+	make_desktop_entry hubnetclient "NetLogo Hubnet Client" netlogo
+	make_desktop_entry behaviorsearch "NetLogo Behavior Search" icon_behaviorsearch
+}

[gentoo-commits] repo/gentoo:master commit in: sci-misc/netlogo-bin/

[Jakov Smolić]

commit:     829eee3546f45987b9bf68658054a0ae4e775e9b
Author:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 11 16:37:10 2022 +0000
Commit:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Tue Jan 11 16:37:10 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=829eee35

sci-misc/netlogo-bin: Stabilize 6.2.0 amd64, #831020

Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>

 sci-misc/netlogo-bin/netlogo-bin-6.2.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-misc/netlogo-bin/netlogo-bin-6.2.0.ebuild b/sci-misc/netlogo-bin/netlogo-bin-6.2.0.ebuild
index 1db5c5b8c02b..4414194e01bd 100644
--- a/sci-misc/netlogo-bin/netlogo-bin-6.2.0.ebuild
+++ b/sci-misc/netlogo-bin/netlogo-bin-6.2.0.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/${MY_PN} ${PV}"
 
 LICENSE="netlogo GPL-2 LGPL-2.1 LGPL-3 BSD Apache-2.0"
 SLOT="0"
-KEYWORDS="-* ~amd64 x86"
+KEYWORDS="-* amd64 x86"
 
 RDEPEND="
 	>=virtual/jre-1.8:*

[gentoo-commits] repo/gentoo:master commit in: sci-misc/netlogo-bin/

[Jakov Smolić]

commit:     4ed9ef15515ef01157ba9dd17369560ca139e509
Author:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 11 16:37:07 2022 +0000
Commit:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Tue Jan 11 16:37:07 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ed9ef15

sci-misc/netlogo-bin: Stabilize 6.2.0 x86, #831020

Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>

 sci-misc/netlogo-bin/netlogo-bin-6.2.0.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-misc/netlogo-bin/netlogo-bin-6.2.0.ebuild b/sci-misc/netlogo-bin/netlogo-bin-6.2.0.ebuild
index 9973c0903d7d..1db5c5b8c02b 100644
--- a/sci-misc/netlogo-bin/netlogo-bin-6.2.0.ebuild
+++ b/sci-misc/netlogo-bin/netlogo-bin-6.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,7 +19,7 @@ S="${WORKDIR}/${MY_PN} ${PV}"
 
 LICENSE="netlogo GPL-2 LGPL-2.1 LGPL-3 BSD Apache-2.0"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* ~amd64 x86"
 
 RDEPEND="
 	>=virtual/jre-1.8:*

[gentoo-commits] repo/gentoo:master commit in: sci-misc/netlogo-bin/

[Andrew Ammerlaan]

commit:     c092ca6638f0b0badf4f1a3f23c11c45682b304d
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 11 17:56:07 2022 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Tue Jan 11 17:56:36 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c092ca66

sci-misc/netlogo-bin: drop version 6.0.2

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 sci-misc/netlogo-bin/Manifest                    |  3 -
 sci-misc/netlogo-bin/netlogo-bin-6.0.2-r1.ebuild | 84 ------------------------
 2 files changed, 87 deletions(-)

diff --git a/sci-misc/netlogo-bin/Manifest b/sci-misc/netlogo-bin/Manifest
index 4989dd783877..f35d4ae2e7ea 100644
--- a/sci-misc/netlogo-bin/Manifest
+++ b/sci-misc/netlogo-bin/Manifest
@@ -1,8 +1,5 @@
-DIST NetLogo-6.0.2-32.tgz 192943415 BLAKE2B c7d20154ade89ae54f98fa08ae4832d9c81a97d1a7a93aaf0de75bd2914bae340ddd71dc3862957bf7e22863d5df9c5464a2bcd517ff0e9b087105237a8d5ac9 SHA512 ac8652a2487b01d02af0c8510ce4c80b2bf84cf2afc3d1bfbda198c1b7aeb0c5cbd85664e9841bc7704aec048482bc78306035673d2d59be67fb2ae50b63106b
-DIST NetLogo-6.0.2-64.tgz 190213078 BLAKE2B 6b0a077538f3e3f3e7769c605a67f6bb6b791319877910eac74e065091d3f6b8cd328d8b354415234b2dd9d4b96b3ca7d18074f54263f460f38b77b8dbe4b9bb SHA512 091200b66305e3ff84e9d1b9a293eaa5f6000a103de86d942c5d0f749aee52cf5519954d05807609f7c0cbeceeab15930ef48612b4f6c1445e529e876aaa9d8e
 DIST NetLogo-6.2.0-32.tgz 225021142 BLAKE2B e7570ae8d865a650ebc90fe66d57aefaa1f413dea54f778ee3f0d5621fad40c16e2a7d3e26f6d51b08f02c25a1adc7ed30e22e01b43abc68b933f414ff57461f SHA512 9c399a00a49ccc0d40e1ddb3c61e41b3aa4e5aff50cf7d872f954ea47956f60faec8f5c0f0082e5b35070d32129c5b8eecceeb93d39b878ad58f13850ccd358f
 DIST NetLogo-6.2.0-64.tgz 224714930 BLAKE2B 5149f9b3ad9e49f50b907223ca554ec9bb01fc679a94f2dfe38d4c2535f6f9d3529d2189362a910ae0cc802e9e0de11f46e6dd0453b91caa87410990a7c80b52 SHA512 e6323ef608db55a187ba26604336a927ddcb6de3c51d8d6d5c701f1d1d2041752efe856f564aff50133446f9d51b663258e29bc18e1a42ffa3f6107023538f36
 DIST NetLogo-6.2.2-32.tgz 232876084 BLAKE2B c32b74d57b9671c6de380b77d78d305582b2dd594b9c6dc4640c6978630c1def5ccf24dd21a25fd9bec868908f3b41c93d40d090b540d1a6dd1840620a0ea5be SHA512 c27c7a73f51dc919e9acebc32b3fcd399d8597b2e0141d0cdf0ffc06e932afbdeb759a5b298aa337af5b846ed6c9f31ca8a0c6441f8f31f29151ea8a96433840
 DIST NetLogo-6.2.2-64.tgz 232588273 BLAKE2B 65d0f5ed9ba4616ac4a9f6df2f0a3f3fec280343233f4d715c7eb96002860b0a2377dc354913bd78527df45c7f93bb97e0979d18f49e3dc987847a73d879ee51 SHA512 0f38e34507897dd36a3053415bf191b8e71a7ef601ac6fe407bff0faa50c2e915e283e3e043379e19fcc4449934e1b7ceaffb68eadab1e529a5494b3a2d0f11f
-DIST netlogo.gif.tar 10240 BLAKE2B 5199290ca492dc4be03dac04a672b4a187daa6caa12a5a487137259071dad156e553ca7eea02f6cd7d66187e4956324fc2d3f2818f10f1557f276f003986be69 SHA512 9a9bc81660599d2b35875f301d5b9824bfa2dafa21dc96b1e6e281d4682ab7b4052844a961b46f5300131c91a4562c58e4b1a4d753cb2b24a18e64b42d333e32
 DIST netlogo.png 23702 BLAKE2B 60816d1bf1ee265b6d4dfa7f4d4b3df22d03996b551d7056b51ea8fc2703a6037fb7d0fb1fc5d0557255eac569aeb17dc0f32bfc91db2b13411588e5f821bdba SHA512 37945b2739f7f25f5b443c03914c4f6e28ed81efe2a0eca5dd83c7c5961fdeeb681b80b162dc45e1de3f65e013a38999b91b9b0ad1cfd5bf664d5e11029b62dd

diff --git a/sci-misc/netlogo-bin/netlogo-bin-6.0.2-r1.ebuild b/sci-misc/netlogo-bin/netlogo-bin-6.0.2-r1.ebuild
deleted file mode 100644
index 7ce2d58f58b6..000000000000
--- a/sci-misc/netlogo-bin/netlogo-bin-6.0.2-r1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop
-
-MY_PN="NetLogo"
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Programming language and IDE for agent-based modelling"
-HOMEPAGE="https://ccl.northwestern.edu/netlogo/"
-SRC_URI="
-	https://dev.gentoo.org/~jlec/distfiles/${PN/-bin}.gif.tar
-	amd64? ( https://ccl.northwestern.edu/netlogo/${PV}/${MY_P}-64.tgz )
-	x86? ( https://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"
-
-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 )
-
-QA_PREBUILT="opt/netlogo/app/natives/linux-*/*.so"
-
-src_prepare() {
-	default
-	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 || die
-	fi
-}
-
-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 || die
-
-	# Once docs are installed, remove them from the source so they don't get
-	# installed below
-	rm -rf app/docs app/behaviorsearch/documentation || die
-	insinto /opt/netlogo
-	doins -r app/
-	doins -r "Mathematica Link"
-
-	doicon "${WORKDIR}"/netlogo.gif
-
-	exeinto /opt/netlogo/
-	# We don't copy the NetLogo binaries since they are hardcoded to use embedded java
-	doexe netlogo.sh
-	doexe netlogo3d.sh
-	doexe behaviorsearch.sh
-	doexe hubnetclient.sh
-	doexe netlogo-headless.sh
-	doexe app/behaviorsearch/behaviorsearch_headless.sh
-
-	insinto /opt/bin
-	dosym ../netlogo/netlogo.sh /opt/bin/netlogo.sh
-	dosym ../netlogo/netlogo3d.sh /opt/bin/netlogo3d.sh
-	dosym ../netlogo/behaviorsearch.sh /opt/bin/behaviorsearch.sh
-	dosym ../netlogo/hubnetclient.sh /opt/bin/hubnetclient.sh
-	dosym ../netlogo/netlogo-headless.sh /opt/bin/netlogo-headless.sh
-	dosym ../netlogo/behaviorsearch_headless.sh /opt/bin/behaviorsearch_headless.sh
-
-	make_desktop_entry behaviorsearch.sh "NetLogo Behavior Search" /usr/share/pixmaps/netlogo.gif
-	make_desktop_entry netlogo.sh "NetLogo" /usr/share/pixmaps/netlogo.gif
-	make_desktop_entry netlogo3d.sh "NetLogo 3D" /usr/share/pixmaps/netlogo.gif
-	make_desktop_entry hubnetclient.sh "NetLogo Hubnet Client" /usr/share/pixmaps/netlogo.gif
-}

[gentoo-commits] repo/gentoo:master commit in: sci-misc/netlogo-bin/

[Arthur Zamarin]

commit:     a68500bb7b13000d7104ddeb75a7461bdce359fa
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Jun  3 14:55:59 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Jun  9 14:50:02 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a68500bb

sci-misc/netlogo-bin: destabilize for ~x86

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 sci-misc/netlogo-bin/netlogo-bin-6.2.0.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-misc/netlogo-bin/netlogo-bin-6.2.0.ebuild b/sci-misc/netlogo-bin/netlogo-bin-6.2.0.ebuild
index df6e8fb735dd..e4db57bd5879 100644
--- a/sci-misc/netlogo-bin/netlogo-bin-6.2.0.ebuild
+++ b/sci-misc/netlogo-bin/netlogo-bin-6.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,7 +19,7 @@ S="${WORKDIR}/${MY_PN} ${PV}"
 
 LICENSE="netlogo GPL-2 LGPL-2.1 LGPL-3 BSD Apache-2.0"
 SLOT="0"
-KEYWORDS="-* amd64 x86"
+KEYWORDS="-* amd64 ~x86"
 
 RDEPEND="
 	>=virtual/jre-1.8:*

[gentoo-commits] repo/gentoo:master commit in: sci-misc/netlogo-bin/

[Arthur Zamarin]

commit:     52c3ddea832386db99f59db930a0a8a94dfd38fb
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Jun  9 17:26:23 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Jun  9 17:26:23 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52c3ddea

sci-misc/netlogo-bin: Stabilize 6.2.2 amd64, #908159

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 sci-misc/netlogo-bin/netlogo-bin-6.2.2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-misc/netlogo-bin/netlogo-bin-6.2.2.ebuild b/sci-misc/netlogo-bin/netlogo-bin-6.2.2.ebuild
index 308285791dcb..f3a2be39b675 100644
--- a/sci-misc/netlogo-bin/netlogo-bin-6.2.2.ebuild
+++ b/sci-misc/netlogo-bin/netlogo-bin-6.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -19,7 +19,7 @@ S="${WORKDIR}/${MY_PN} ${PV}"
 
 LICENSE="netlogo GPL-2 LGPL-2.1 LGPL-3 BSD Apache-2.0"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 ~x86"
 
 RDEPEND="
 	>=virtual/jre-1.8:*