gentoo resync : 16.01.2021

10 files changed, 124 insertions, 256 deletions

diff --git a/sci-misc/Manifest.gz b/sci-misc/Manifest.gz
index bc7789acd5af..e5f976d95cfb 100644
--- a/sci-misc/Manifest.gz
+++ b/sci-misc/Manifest.gz
diff --git a/sci-misc/netlogo-bin/Manifest b/sci-misc/netlogo-bin/Manifest
index 7d3d0af0581f..a44e2d4477cf 100644
--- a/sci-misc/netlogo-bin/Manifest
+++ b/sci-misc/netlogo-bin/Manifest
@@ -1,13 +1,8 @@
-AUX behaviorsearch-6.0.2.sh 1588 BLAKE2B 7dd66ab3e2210e6932101301942287c76f7526ca68dd9901657330f6baeae93ac834022d001fdc885b0bf2b77c278fc30f0d024bee8f866bd37e0a971c2e6036 SHA512 9f5538dcd6b6d9f7c94b147876a3ca826017814b3bd2db8689782ef1df239d052e3784107f533e265b896f541812f42310fd6597e1c047173841faf248fa592c
-AUX hubnetclient-6.0.2.sh 2007 BLAKE2B 11d3da62d0c51941e7655250c0864a42cdc11509b8bb04162f2e3b649aa181c964d667c3c9955221d16acc1f7fb0d9f56f9015c0e2df7065903165094aa584a4 SHA512 2d365440ed1b5236515a9d7ac09a4f8c3af623855bc23f52918a7295023ccac2d90ca58611519ba7a85ad10eefcd18773a8649fbe2c84b97cc15f9b7d1b297e9
-AUX netlogo-6.0.2.sh 1975 BLAKE2B 63424bfc1a547593382d45747b5c20d6260488e161347fc5a5e6b85cdc27166f9bc49e223b223fb5f62247a9e9100df01f87c90b725c732291386d026a8c9a5c SHA512 94b9341d9d6999eca24f634566d707f90756aa19efab5767ab7e68bd6bb49bfea0e1769dc95895a0b4157443a5ed500470f8d7a28992b742d4f454512a53b117
-AUX netlogo3d-6.0.2.sh 2072 BLAKE2B b1e50dde00ab399ac3cd8ec4b29257c071ceb83f3e28684510e3bd12ee49bd478f96bacaab04de51799162e9ff368810c65df4c8c83459115cd49554e0988278 SHA512 2199d968bfbbec8c3346961faf3069564fe7017df3bc2426ccc60248ef9340376b378007083ee1bba6bc162dcfbc9ffe40c30331f771ae5faf9e7e9282c20c2e
-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.gif.tar 10240 BLAKE2B 5199290ca492dc4be03dac04a672b4a187daa6caa12a5a487137259071dad156e553ca7eea02f6cd7d66187e4956324fc2d3f2818f10f1557f276f003986be69 SHA512 9a9bc81660599d2b35875f301d5b9824bfa2dafa21dc96b1e6e281d4682ab7b4052844a961b46f5300131c91a4562c58e4b1a4d753cb2b24a18e64b42d333e32
+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.png 23702 BLAKE2B 60816d1bf1ee265b6d4dfa7f4d4b3df22d03996b551d7056b51ea8fc2703a6037fb7d0fb1fc5d0557255eac569aeb17dc0f32bfc91db2b13411588e5f821bdba SHA512 37945b2739f7f25f5b443c03914c4f6e28ed81efe2a0eca5dd83c7c5961fdeeb681b80b162dc45e1de3f65e013a38999b91b9b0ad1cfd5bf664d5e11029b62dd
-EBUILD netlogo-bin-6.0.2-r1.ebuild 2659 BLAKE2B ee59ffacec164cea3f8b46d4f1b854da5703aacc95b57129f701a1785d42f9abb34404518de62a312dd588ce40f2f9baa7935313ec1ba652be2dc8293d14e3a9 SHA512 29b27f30ab4b65ecb4f25611ebddaf1a34daf1b9098378c18064772fcf9c2924e61e48407529fd237ea3e28b682516784f5874f5279380e235c39b6f6774b780
-EBUILD netlogo-bin-6.2.0.ebuild 4026 BLAKE2B 7c167eef3b500ea1cb3e981cdadc78d81031657d9af592326d7aeabb47f203a4d36c94263d2e0e61afd7321a8fa84b1524446f13609d87453bd5d9e8d847eb30 SHA512 c951eb961730bda3fec10a364470b4f10fad9630c00bd80206038b6697526172c4c1b807cddb8fb1a4b16685c8c15ca1768a8de57c1b0783e0f196daebc1eb37
-MISC metadata.xml 674 BLAKE2B 929aa07cd98edc69f2314d3d9f83aab6c74965bd3f626e09ffa4dfc9bcdcc51358fc2892250cbeb427f6b97daa4757b5af9a4f8897dc1bc2b6311e0f030839ff SHA512 a56138add1af737dc61ff50e5f4420f958f6f35c99e661d42dde84dac19ee62a3b6ea7ace785c0c3591a0acef30f246e49673d77c5905b05669ecc0d80c79b88
+EBUILD netlogo-bin-6.2.0.ebuild 4024 BLAKE2B 9e76ac890cfdb2a86d88a5c176a4a682683a27bfcbaa84a2f8c22d0929aa3b26b0872d097405cc31a6343a6515b11361bf7cca577ea4775b234e771da09bba85 SHA512 b8956f67746e39ba3c8977ea357eef8fae4e494357b7d891a85bc2cfe0c5dc2da483c4bcd827262d8f96418a0b348d923e87da33bf6a0ee8568cfceffbfc96f1
+EBUILD netlogo-bin-6.2.2.ebuild 4026 BLAKE2B 1c00f86bafa1f51a9c8acdf6d79ac464fbd772ab6a757b1c0e5f912494f2c0eac18a41bccc1b6dcf309c00c42b89353ff4817226c563331393e32a4cb052ee64 SHA512 851e5f826d3d3e1bb04c9bea205cc6582b55cb809023854e73866421719ff9766ca1da05d3c587808a9cff7c06b40dfc0ede2d94370a8371060dd11bb6cd7560
+MISC metadata.xml 761 BLAKE2B af52b31417b1f58f94e33524acea094b043e211ad176598a39e5a47bece3f706969137bc65f01a3bd30c71f0eaa32087a85a4a058d91cdff4cdaa2953059066e SHA512 455c2f05d6e4d8602a55a3f672e4a9403a4630d56a8d34ae454cb7a15b9fd942a47e23621ade6f51e8d0416394dcf0d2af003f1f1d93d211b3979fbff13e509e
diff --git a/sci-misc/netlogo-bin/files/behaviorsearch-6.0.2.sh b/sci-misc/netlogo-bin/files/behaviorsearch-6.0.2.sh
deleted file mode 100644
index 225f4a332cff..000000000000
--- a/sci-misc/netlogo-bin/files/behaviorsearch-6.0.2.sh
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash
-
-WD="`pwd`"  #store the current working directory, where this script was called from.
-
-#BehaviorSearch needs to start in the NetLogo base folder,
-# and "behaviorsearch" must be installed in a subfolder of the NetLogo folder.
-NETLOGO_DIR="$( dirname $( readlink -f "$0" ))" # the copious quoting is for handling paths with spaces
-cd "$NETLOGO_DIR"
-NETLOGO_DIR="`pwd`"  #in case it's a relative path, like "."
-LIBRARY_DIR="${NETLOGO_DIR}/app"
-BSEARCH_DIR="${LIBRARY_DIR}/behaviorsearch"
-
-JARS=""
-for f in `ls -1 "$LIBRARY_DIR" | grep "jar"`; do
-  JARS="$LIBRARY_DIR/$f:$JARS"
-done
-
-# If you want to use a different version of java, or if "java" is not in your PATH, 
-# you can run this script with the BSEARCH_JAVA environment variable pointing 
-# to the java executable you want to use. e.g. "/opt/java6/bin/java"
-if [ -z "$BSEARCH_JAVA" ]; then 
-	BSEARCH_JAVA="java"
-fi
-
-JAVA_VERSION=`"$BSEARCH_JAVA" -version 2>&1 | head -n1 | awk '{ print substr($3,2,3) }' | sed -e 's;\.;0;g'`
-if [ $JAVA_VERSION -lt 108 ]; then  #108 = java 1.8
-	echo "Sorry, this program requires Java Runtime Environment 1.8 or higher"
-	exit 1
-fi
-
-# If you have enough RAM, up the '1536m' below to '2048m' or more.
-# Or you can set the BSEARCH_MAXMEM environment variable when running the script
-# More RAM is especially helpful for multiple threads/parallel execution.
-if [ -z "$BSEARCH_MAXMEM" ]; then
-    BSEARCH_MAXMEM=1536m
-fi
-
-"$BSEARCH_JAVA" -Dbsearch.startupfolder="$WD" -Dbsearch.appfolder="$BSEARCH_DIR" -server -Xms256m "-Xmx$BSEARCH_MAXMEM" -classpath "$JARS" bsearch.app.BehaviorSearch "$@"
diff --git a/sci-misc/netlogo-bin/files/hubnetclient-6.0.2.sh b/sci-misc/netlogo-bin/files/hubnetclient-6.0.2.sh
deleted file mode 100644
index 3fb98d0909f1..000000000000
--- a/sci-misc/netlogo-bin/files/hubnetclient-6.0.2.sh
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/bash
-
-BASE_DIR="$( cd "$( dirname $( readlink -f "${BASH_SOURCE[0]}" ) )" && pwd -P )"
-
-if [[ ${JAVA_HOME+1} ]]; then
-  JAVA="${JAVA_HOME}/bin/java"
-else
-  echo "JAVA_HOME undefined, using java from path. For control over exact java version, set JAVA_HOME"
-  JAVA="java"
-fi;
-
-# -Xmx1024m             use up to 1GB RAM (edit to increase)
-# -Dfile.encoding=UTF-8 ensure Unicode characters in model files are compatible cross-platform
-JVM_OPTS=(-Xmx1024m -Dfile.encoding=UTF-8)
-OPTS_INDEX=2
-
-ARGS=()
-INDEX=0
-
-for arg in "$@"; do
-  if [[ "$arg" == -D* ]]; then
-    JVM_OPTS[OPTS_INDEX++]="$arg"
-  else
-    ARGS[INDEX++]="$arg"
-  fi
-done
-
-RAW_CLASSPATH="args4j-2.0.12.jar:asm-all-5.0.4.jar:asm-all-5.0.4.jar:autolink-0.6.0.jar:behaviorsearch.jar:commons-codec-1.10.jar:commons-logging-1.1.1.jar:config-1.3.1.jar:flexmark-0.20.0.jar:flexmark-ext-autolink-0.20.0.jar:flexmark-ext-escaped-character-0.20.0.jar:flexmark-ext-typographic-0.20.0.jar:flexmark-formatter-0.20.0.jar:flexmark-util-0.20.0.jar:gluegen-rt-2.3.2.jar:httpclient-4.2.jar:httpcore-4.2.jar:httpmime-4.2.jar:jcommon-1.0.16.jar:jfreechart-1.0.13.jar:jhotdraw-6.0b1.jar:jmf-2.1.1e.jar:jogl-all-2.3.2.jar:json-simple-1.1.1.jar:log4j-1.2.16.jar:macro-compat_2.12-1.1.1.jar:macro-compat_2.12-1.1.1.jar:netlogo-6.0.2.jar:parboiled_2.12-2.1.3.jar:parboiled_2.12-2.1.3.jar:picocontainer-2.13.6.jar:picocontainer-2.13.6.jar:rsyntaxtextarea-2.6.0.jar:scala-library-2.12.2.jar:scala-parser-combinators_2.12-1.0.5.jar:shapeless_2.12-2.3.2.jar:shapeless_2.12-2.3.2.jar"
-CLASSPATH=''
-
-for jar in `echo $RAW_CLASSPATH | sed 's/:/ /g'`; do
-  CLASSPATH="$CLASSPATH:$BASE_DIR/app/$jar"
-done
-
-CLASSPATH=`echo $CLASSPATH | sed 's/://'`
-
-# -classpath ....         specify jars
-# org.nlogo.headless.Main specify we want headless, not GUI
-# "${ARGS[0]}"            pass along any additional arguments
-java "${JVM_OPTS[@]}" -Dnetlogo.extensions.dir="${BASE_DIR}/app/extensions" -classpath "$CLASSPATH" -Dorg.nlogo.is3d=true org.nlogo.hubnet.client.App "${ARGS[@]}"
diff --git a/sci-misc/netlogo-bin/files/netlogo-6.0.2.sh b/sci-misc/netlogo-bin/files/netlogo-6.0.2.sh
deleted file mode 100644
index 5ad35832ba28..000000000000
--- a/sci-misc/netlogo-bin/files/netlogo-6.0.2.sh
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/bash
-
-BASE_DIR="$( cd "$( dirname $( readlink -f "${BASH_SOURCE[0]}" ) )" && pwd -P )"
-
-if [[ ${JAVA_HOME+1} ]]; then
-  JAVA="${JAVA_HOME}/bin/java"
-else
-  echo "JAVA_HOME undefined, using java from path. For control over exact java version, set JAVA_HOME"
-  JAVA="java"
-fi;
-
-# -Xmx1024m             use up to 1GB RAM (edit to increase)
-# -Dfile.encoding=UTF-8 ensure Unicode characters in model files are compatible cross-platform
-JVM_OPTS=(-Xmx1024m -Dfile.encoding=UTF-8)
-OPTS_INDEX=2
-
-ARGS=()
-INDEX=0
-
-for arg in "$@"; do
-  if [[ "$arg" == -D* ]]; then
-    JVM_OPTS[OPTS_INDEX++]="$arg"
-  else
-    ARGS[INDEX++]="$arg"
-  fi
-done
-
-RAW_CLASSPATH="args4j-2.0.12.jar:asm-all-5.0.4.jar:asm-all-5.0.4.jar:autolink-0.6.0.jar:behaviorsearch.jar:commons-codec-1.10.jar:commons-logging-1.1.1.jar:config-1.3.1.jar:flexmark-0.20.0.jar:flexmark-ext-autolink-0.20.0.jar:flexmark-ext-escaped-character-0.20.0.jar:flexmark-ext-typographic-0.20.0.jar:flexmark-formatter-0.20.0.jar:flexmark-util-0.20.0.jar:gluegen-rt-2.3.2.jar:httpclient-4.2.jar:httpcore-4.2.jar:httpmime-4.2.jar:jcommon-1.0.16.jar:jfreechart-1.0.13.jar:jhotdraw-6.0b1.jar:jmf-2.1.1e.jar:jogl-all-2.3.2.jar:json-simple-1.1.1.jar:log4j-1.2.16.jar:macro-compat_2.12-1.1.1.jar:macro-compat_2.12-1.1.1.jar:netlogo-6.0.2.jar:parboiled_2.12-2.1.3.jar:parboiled_2.12-2.1.3.jar:picocontainer-2.13.6.jar:picocontainer-2.13.6.jar:rsyntaxtextarea-2.6.0.jar:scala-library-2.12.2.jar:scala-parser-combinators_2.12-1.0.5.jar:shapeless_2.12-2.3.2.jar:shapeless_2.12-2.3.2.jar"
-CLASSPATH=''
-
-for jar in `echo $RAW_CLASSPATH | sed 's/:/ /g'`; do
-  CLASSPATH="$CLASSPATH:$BASE_DIR/app/$jar"
-done
-
-CLASSPATH=`echo $CLASSPATH | sed 's/://'`
-
-# -classpath ....         specify jars
-# org.nlogo.headless.Main specify we want headless, not GUI
-# "${ARGS[0]}"            pass along any additional arguments
-java "${JVM_OPTS[@]}" -Dnetlogo.extensions.dir="${BASE_DIR}/app/extensions" -classpath "$CLASSPATH" org.nlogo.app.App "${ARGS[@]}"
diff --git a/sci-misc/netlogo-bin/files/netlogo3d-6.0.2.sh b/sci-misc/netlogo-bin/files/netlogo3d-6.0.2.sh
deleted file mode 100644
index 5db1d3a2847b..000000000000
--- a/sci-misc/netlogo-bin/files/netlogo3d-6.0.2.sh
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/bash
-
-BASE_DIR="$( cd "$( dirname $( readlink -f "${BASH_SOURCE[0]}" ) )" && pwd -P )"
-
-if [[ ${JAVA_HOME+1} ]]; then
-  JAVA="${JAVA_HOME}/bin/java"
-else
-  echo "JAVA_HOME undefined, using java from path. For control over exact java version, set JAVA_HOME"
-  JAVA="java"
-fi;
-
-# -Xmx1024m             use up to 1GB RAM (edit to increase)
-# -Dfile.encoding=UTF-8 ensure Unicode characters in model files are compatible cross-platform
-JVM_OPTS=(-Xmx1024m -Dfile.encoding=UTF-8)
-OPTS_INDEX=2
-
-ARGS=()
-INDEX=0
-
-for arg in "$@"; do
-  if [[ "$arg" == -D* ]]; then
-    JVM_OPTS[OPTS_INDEX++]="$arg"
-  else
-    ARGS[INDEX++]="$arg"
-  fi
-done
-
-RAW_CLASSPATH="args4j-2.0.12.jar:asm-all-5.0.4.jar:asm-all-5.0.4.jar:autolink-0.6.0.jar:behaviorsearch.jar:commons-codec-1.10.jar:commons-logging-1.1.1.jar:config-1.3.1.jar:flexmark-0.20.0.jar:flexmark-ext-autolink-0.20.0.jar:flexmark-ext-escaped-character-0.20.0.jar:flexmark-ext-typographic-0.20.0.jar:flexmark-formatter-0.20.0.jar:flexmark-util-0.20.0.jar:gluegen-rt-2.3.2.jar:httpclient-4.2.jar:httpcore-4.2.jar:httpmime-4.2.jar:jcommon-1.0.16.jar:jfreechart-1.0.13.jar:jhotdraw-6.0b1.jar:jmf-2.1.1e.jar:jogl-all-2.3.2.jar:json-simple-1.1.1.jar:log4j-1.2.16.jar:macro-compat_2.12-1.1.1.jar:macro-compat_2.12-1.1.1.jar:netlogo-6.0.2.jar:parboiled_2.12-2.1.3.jar:parboiled_2.12-2.1.3.jar:picocontainer-2.13.6.jar:picocontainer-2.13.6.jar:rsyntaxtextarea-2.6.0.jar:scala-library-2.12.2.jar:scala-parser-combinators_2.12-1.0.5.jar:shapeless_2.12-2.3.2.jar:shapeless_2.12-2.3.2.jar"
-CLASSPATH=''
-
-for jar in `echo $RAW_CLASSPATH | sed 's/:/ /g'`; do
-  CLASSPATH="$CLASSPATH:$BASE_DIR/app/$jar"
-done
-
-CLASSPATH=`echo $CLASSPATH | sed 's/://'`
-
-# -classpath ....         specify jars
-# org.nlogo.headless.Main specify we want headless, not GUI
-# "${ARGS[0]}"            pass along any additional arguments
-java "${JVM_OPTS[@]}" -Dnetlogo.extensions.dir="${BASE_DIR}/app/extensions" -classpath "$CLASSPATH" -Dorg.nlogo.is3d=true -Djava.library.path="${BASE_DIR}/app/natives/linux-amd64/:${env_var:PATH}" org.nlogo.app.App "${ARGS[@]}"
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.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
-}
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..4414194e01bd 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:*
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
+}