gentoo resync : 04.05.2021

7 files changed, 14 insertions, 18 deletions

diff --git a/sci-visualization/Manifest.gz b/sci-visualization/Manifest.gz
index f15894c6bf9a..98adc211c294 100644
--- a/sci-visualization/Manifest.gz
+++ b/sci-visualization/Manifest.gz
diff --git a/sci-visualization/gcalc/Manifest b/sci-visualization/gcalc/Manifest
index 74678c446e21..37a3959811a6 100644
--- a/sci-visualization/gcalc/Manifest
+++ b/sci-visualization/gcalc/Manifest
@@ -1,3 +1,3 @@
 DIST GCalc-3.1-rc1.tar.gz 543699 BLAKE2B d9d9c05ef8d0eca0f5c67ab250ca6df66e5061e458c6adaf53a612ead63e904a4d3c3d8dc381288eb06b626ae2eefff0a69b83583e77b38590a95093d5db4b39 SHA512 6cf66bb1a3867370c027c1c5b82f30b22d146483a8be4a997a6f917142bc83d732cc064eb3f2ff28ea4fcb1583695097d218c7fa092e78d8fb9ba2511261cbda
-EBUILD gcalc-3.1_rc1-r1.ebuild 819 BLAKE2B 44864efcdc3bbf8f64617b3cf4cd8d166a3b99ab7713d6a0457493f3b39f89d09558e4f5a9b82f0bbc4a4bf23a93136cde76bff1583e722762723d130e290203 SHA512 5ddcb6027e74cd09be687ba1d591114b03cf6aac53adb7b0da43d44aecdc0c78a3aac193d03de1c10e4248735db616e4e8a0be2d25071194156ddbf4108afce9
+EBUILD gcalc-3.1_rc1-r2.ebuild 788 BLAKE2B 5a6726e898b50134461c3fd4ef3a7d146493c03970be0c21dc7938ddb059c9d97bfc4ac8269c7b6487126aadb22710eeb7a351c8e4e71546a67fa9e583727c08 SHA512 c11ed2ad0ab37c27b909619ca23a8e6b48283af8929711ffcbf34ff78022c4143d6cde7ab9094c655370208e49133ad56360a8166f072508069f74ba257c4e87
 MISC metadata.xml 342 BLAKE2B a887b22d30a0d55e7bb317713a69e12ef57780708e3b8067d9efdef9e1d16d9c0019d04fd16c37b497315b5177a7ffc51249470d17aaff6e13022bba2ee8a0a1 SHA512 e09bce9848eeba3adbad9ab3f73402ca3b9b9b67b0b365764e83c4eba3e66ca7af77fe3cc195e469f7b88507f4ecfb145be8530abb57c22bb09dd78cb3001178
diff --git a/sci-visualization/gcalc/gcalc-3.1_rc1-r1.ebuild b/sci-visualization/gcalc/gcalc-3.1_rc1-r2.ebuild
index 285044c90585..f5a27970376f 100644
--- a/sci-visualization/gcalc/gcalc-3.1_rc1-r1.ebuild
+++ b/sci-visualization/gcalc/gcalc-3.1_rc1-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit eutils java-pkg-2 java-pkg-simple
+inherit desktop java-pkg-2 java-pkg-simple
 
 MY_P="GCalc-${PV/_/-}"
 DESCRIPTION="Java Mathematical Graphing System"
@@ -12,12 +12,10 @@ SRC_URI="http://gcalc.net/files/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 KEYWORDS="~amd64"
-IUSE=""
 SLOT="0"
 
-RDEPEND=">=virtual/jre-1.7
-	!!sci-mathematics/gcalc"
-DEPEND=">=virtual/jdk-1.7"
+RDEPEND=">=virtual/jre-1.8:*"
+DEPEND=">=virtual/jdk-1.8:*"
 
 S="${WORKDIR}/${MY_P}"
 
diff --git a/sci-visualization/opendx-samples/Manifest b/sci-visualization/opendx-samples/Manifest
index 56d768e63225..62f51e4d24fe 100644
--- a/sci-visualization/opendx-samples/Manifest
+++ b/sci-visualization/opendx-samples/Manifest
@@ -1,5 +1,5 @@
 AUX opendx-samples-4.4.0-nojava.patch 1744 BLAKE2B 56ac7ca38c06717250bb2fabb9d28d047c86e66df06d28a3c90eb16a5f8738ecf24fa6f98e9b30d559ed4af6c04f7c1f193138d12ab071c23edc2719cee0c65a SHA512 ae72bab2a2c130263d75e4b7254b6e210c55b80eed9621493f66b2221fd92451378bb86ae1c9e4a4997a18d5902576fde5cfa9ef84660f65a6310de595d5d29f
 DIST dxsamples-4.4.0.tar.gz 7791659 BLAKE2B f3fb5ac4990ed13718390229debd8f72f84f1b751dae6e6497388e31e0e8f3869d9c30cc7e2e2b5a58fc0e32aab3127751451c616c0081606f28dd41250d9924 SHA512 ae740be888728750de2cf21e94094a4aa01adec8ea0cfe937f03a67803ad7cb0d92968c8d4325e22022c698f871d4af45df02d3b8e8639434a1001dd46e0b311
 DIST opendx-samples-4.4.0-install.patch.bz2 4195 BLAKE2B eb520ac16311e4252f36b7911ebff11f21cf16fa3d3b31a8e1209c28d66e78ae66b57c3b3edd4db66f26e82a25f3675c9a5e0ad146bb1b4ed74d1196007cc836 SHA512 3c276355d0796b2713d42ea11ce34d02c72e5b679aff4feb9792ec58c8a3c6aed1d79981d09a93b842d6d47fdc6cacd5fca4fc96f88cc764a90a5adf10797fc6
-EBUILD opendx-samples-4.4.0-r2.ebuild 668 BLAKE2B eebe53d44b624665fdb8f5badaa4d46ebe7c1ba0223e242f4e1c629ae62e7b67a616e875d24768edd557c3fee4d4c1f46cb259b58c07fa3a0174e0cdbef1d976 SHA512 21a242d6f480e760452417bf4fc98abf8ab67d29d33d8a14d7aeb91ac56934830da37b333a9393743c115419aee267120297cbf71efd80f42d0bb06c42b974ca
+EBUILD opendx-samples-4.4.0-r2.ebuild 659 BLAKE2B 5530660f555b0fec7e2d1769bb8cc83f494aeb9cb282298aa8107291abf82358603cb4f1b2bc716bf5b9b534cf7e2e46aa090350f5069b179d013da14ea9255e SHA512 f76ffbe2b2f2423bc71d493208ef9262c856d8860eb6bfa608ec3ca0d0ac2939b1d0ca21c1e4ba0a5915a3a8f064706e57179af3fc4bc9ca1502c84687591c52
 MISC metadata.xml 497 BLAKE2B 374ef32a6b37150f7b6cd89225b23789ea0e04b70af9342ec5cb1f0fa31d55008bbe4ef8d8ac21601c02e848122b85665efab5bc244280b9821a3d2b7e0c1308 SHA512 6bcd3f858eb24e2b9e76c288588db7ac38d0d71821f3496295b049e89290a5536bf2a953b2df2b1aa87395b8fd1ef3bbf54e98e8e2cb074a6443ce642e3f2936
diff --git a/sci-visualization/opendx-samples/opendx-samples-4.4.0-r2.ebuild b/sci-visualization/opendx-samples/opendx-samples-4.4.0-r2.ebuild
index 2dbd69320cc6..8ee6e71d2949 100644
--- a/sci-visualization/opendx-samples/opendx-samples-4.4.0-r2.ebuild
+++ b/sci-visualization/opendx-samples/opendx-samples-4.4.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,16 +12,14 @@ DESCRIPTION="Samples for IBM Data Explorer"
 HOMEPAGE="http://www.opendx.org/"
 SRC_URI="http://opendx.sdsc.edu/source/${MY_P}.tar.gz
 	mirror://gentoo/${P}-install.patch.bz2"
-LICENSE="IBM"
-SLOT="0"
-
 S="${WORKDIR}/${MY_P}"
 
+LICENSE="IBM"
+SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
 
 RDEPEND=">=sci-visualization/opendx-4.4.4-r2"
-DEPEND="$RDEPEND"
+DEPEND="${RDEPEND}"
 
 PATCHES=(
 	"${FILESDIR}/${P}-nojava.patch"
@@ -29,7 +27,7 @@ PATCHES=(
 )
 
 src_prepare() {
-	#absolutely no javadx for now
+	# absolutely no javadx for now
 	default
 	eautoreconf
 }
diff --git a/sci-visualization/xgraph/Manifest b/sci-visualization/xgraph/Manifest
index ac2c6bb571b7..36ac7ba2660d 100644
--- a/sci-visualization/xgraph/Manifest
+++ b/sci-visualization/xgraph/Manifest
@@ -1,4 +1,4 @@
 DIST xgraph-12.1.tar.gz 145278 BLAKE2B c7c35b8e6b729c0ee977b86a00ff3e27bab3dc51cd75a514cd3efa37c8d625106498428146b7e274bf06a1bf8ce1fd2a50a5bf8608cf0459eb3e3bd51ea39aa3 SHA512 67c1faea0f423717cf97c4613e7c288ad17e952f7f0c7cc555d3d3cffaaef890b3b8d77f9421ab5842f8c65dea3393820e296b38d7a3eae2a0b80eb0b8fc948c
 DIST xgraph_12.1-16.debian.tar.gz 23154 BLAKE2B 02e88cca274c3af0c98873f742b82e9e9dbce6622a37115eb2020800c85473011cb24adbd3bc507a14eaaa4a79ad3664a9ffd0f7fb5ea419f1941ee6da44fdc0 SHA512 6942d85d453a63191b11f6f52bee592c765023068d022e62b94b6fc6b0ed46ce57c9cc00bfcb53cd5f943997cef23724513c1433cdfbf11c7debac5760de1d26
-EBUILD xgraph-12.1-r4.ebuild 992 BLAKE2B 1d24d7f7b9a23057275d64cc2e9488ffd8f48416faded6269e22cd17f0104687e2b660f0cfd3bf2bb9d0a6107ff43df34c2842565c5f5512ceead50e995b6968 SHA512 0369ad0f092168c29ae8f28923b31d60d237e012441f5c76f8d2ea276f069c646a833f82c7d02dabafee3bd59b584484212f38c25007a94951716491fd1f7bf7
+EBUILD xgraph-12.1-r4.ebuild 994 BLAKE2B 9be8ddfc750950169a714f3e0fdead8eef7b7986d012b1c962781b1106c71648f295b88eddbc0fb08e99c5f262ea22878e19c9fcf46c4ae07bb7d459f00b5996 SHA512 1142479dabc7d6a39e4fd421b95803af61a0a4da4d0edd759f7e2a3f36a7eccf42bb3ed6cd5ec64cc811528a58c8bb5c15e8fa053ad573ae4b800f4ed05280d6
 MISC metadata.xml 773 BLAKE2B fa1f9d1b5d08ba5e4967bcd25a45a0c3416da99f584b89a55af6681a671f2315818c8da793d3f0678adbeb84e02cdb045031db80cc943da6e28969cb69e328f0 SHA512 4ab2e3db785543deb8f2f541cb64055dab9caa058424e46987896b6100d03cd55a48bda31cfc261225f76374c618e16f19bbfa5526f195f4c0c9ca583830ab04
diff --git a/sci-visualization/xgraph/xgraph-12.1-r4.ebuild b/sci-visualization/xgraph/xgraph-12.1-r4.ebuild
index 71f4647a38e7..ecb3cd30908b 100644
--- a/sci-visualization/xgraph/xgraph-12.1-r4.ebuild
+++ b/sci-visualization/xgraph/xgraph-12.1-r4.ebuild
@@ -18,7 +18,7 @@ KEYWORDS="~amd64 ~arm64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="examples"
 RDEPEND="x11-libs/libSM
 	x11-libs/libX11"
-DEPEND="$RDEPEND"
+DEPEND="${RDEPEND}"
 
 PATCHES=( "${WORKDIR}"/debian/patches/debian-changes )