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
+}

Reply via email to