gentoo resync : 20.06.2021

4 files changed, 2 insertions, 64 deletions

diff --git a/sci-misc/Manifest.gz b/sci-misc/Manifest.gz
index aaf17e8a2f69..15aaf56e9121 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 e8c01c9f97a8..4f821e55ae56 100644
--- a/sci-misc/netlogo-bin/Manifest
+++ b/sci-misc/netlogo-bin/Manifest
@@ -9,10 +9,8 @@ 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
-EBUILD netlogo-bin-5.0.3-r1.ebuild 1674 BLAKE2B fb2df33fc38ead6af1c54ec9145c5a001e99ec4d1331fa47c22e7f5315aafbec5043996f589fbfacbeec8f8e5886586fe8fc62f1f7cfab6e780d9783c406cc72 SHA512 9af2e3c338a0d009cebae687799015bb95f3aeffb7ed11fa4eb7742843eef76a2314a88832de1ea90882d446acf6544fcc8509fb126bd2e697e2b8c30f2c61f7
-EBUILD netlogo-bin-6.0.2-r1.ebuild 2661 BLAKE2B d16778af72bceb789c7cef842a0cb994e3cc03dd6adafdb38622d658af7078758188850b089d702f8090faffa9231b4e401280b5dbaba8d3903653b865ec2fef SHA512 2ca742a229a008980c29ca7d0efe1dee86e2a872c4090341ffa11ce2d6634bcabddcffb58cf19d36aefee47d31e4d415327d99e82d79f9b4dae96344869a6b24
+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 673 BLAKE2B d3bf352936babb7e5f8ae9e47f88899720920a23c5f421b63fd4f6e0235b58cef0e6a42fd04770aa92989b766bd986786a8c5ac264e316951fee2a0ce664e472 SHA512 2020dc83306d1152386c444ffaa488c0ec4529677b4a6239e2d23693018525d7bd63bcae18a3010f9cd71d3edd68f3fea15e95a264485160fc584b38f0c0a789
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 ac244f82507b..000000000000
--- 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-*
-}
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 54749182d038..7ce2d58f58b6 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