gentoo resync : 03.09.2021

7 files changed, 13 insertions, 66 deletions

diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index e9e23208518d..73df109c9079 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
diff --git a/dev-db/mysql-workbench/Manifest b/dev-db/mysql-workbench/Manifest
index f5b623f852ea..d036e15fce23 100644
--- a/dev-db/mysql-workbench/Manifest
+++ b/dev-db/mysql-workbench/Manifest
@@ -1,7 +1,6 @@
 AUX mysql-workbench-6.2.5-wbcopytables.patch 496 BLAKE2B 4666f32098ec43ad36f1c726903472e829873002521262d6781a2febfc1394dac6f9708fbb99a3fa52a032a5b8f695c9b98579b28a63e74727eac21a8ef3fbe6 SHA512 c0766315cd345893af57880eccdc2c1dd9ffa456a27d0c736af1382ca24c507de865188588753f212f35d8781305dcbd8d555f128edd6454dc2299bd0357fd5b
 AUX mysql-workbench-8.0.19-mysql-connector-8.patch 624 BLAKE2B 0cb899a8b0127664471877bb9cdcda946c35ed7a159646b94891a791a618c77201cc7696d6f2893e95fd78dbc13325cef752740f76e69974e10c0f88084594fb SHA512 09c2349cb42393f6d32f24804e2c3438a5d846fc9611e0684ccf2139fd30b0abcb0f2aa7b205c60a081259e073fb345cd72837dab1a216e6a8aaaba5ec3decf7
 AUX mysql-workbench-8.0.23-findlibssh.patch 633 BLAKE2B 12deef5c346773931fb0f6d37a24cc67d4d0d6079b05cacbcaefc7a8c453f2811a4ea018a5e71390739500d2801cc12889ac2b61346830eff9d348925fdbb88d SHA512 d1d2d7091fad56fb62f29a323df00ae29a7ce5e921a49eb9199363e1113da207872f8f636cba479bc15697b574e54b4cf312aa354f6c050bd1934a523175b79d
-AUX mysql-workbench-8.0.24-gcc11-fix.patch 1945 BLAKE2B 15c11ac1926bea61d81e58076a36751bda19eadfa189802d8e8b40cc243fce964bbfd3f7516f3f9b041846f791bc0b6caf38ac9de0bb2e75978fbf9b03c1cdd3 SHA512 11672c0160586a5a098158a645373dd6254dea748757a8c963705a65e1dd59472f1bb76eee0df57d078de1645b780b4b4ea250dc306eb9d7713cf86fd3cd1ebd
 DIST antlr-4.7.1-complete.jar 2240116 BLAKE2B 3acf99b3701b2092cad2fb6e91f27791cbedd82f26888d7329e481be29fce4ec644eb57f663e515b92dea46c24222d4fb090aae5cae30c57c412a38932ea72ed SHA512 de1c230d7294e05ac7b451cbc639bab9d416a674b281e21092fb4a9329ca8b6d4b92b9ad78a9771cff475a1610f1d0419819c4619bdff36c683019da67ef13b1
 DIST antlr-4.9.1-complete.jar 2100605 BLAKE2B 6fcdc184900cd30e42b3e1b6f56bcccbf1d3c975edc8475b92b9c0779568148f711e9bcbb77859d8fbff2d31f362a9b562847b9b9ece03c8c4b7792341fab57e SHA512 a01815324c15fbff9cb917fa2cdef85aabf34c77730913026257e92c195d11f059c73a1579ffa74616b76b5aba34fd6074b19e1de8f2f3bec1c55cd950f4947b
 DIST mysql-workbench-community-8.0.23-src.tar.gz 20719770 BLAKE2B 4e1e44428a9e8a00c23f8f9f6e1519f8d13c205fac110168da67fb462d2a13204d41f1d0e109a3dde8ad2dbd3de31fee09ae4ccea97f9de04d0bc4fb2fad180e SHA512 f50d71bd196d5e5446cd14a228e52c4e74506cc2dd95d1601cc5e99b00db0d82dbcb28fd2ed404ee77ca63c6854d47c46773938e09ab601c10009c0ca99e4d54
diff --git a/dev-db/mysql-workbench/files/mysql-workbench-8.0.24-gcc11-fix.patch b/dev-db/mysql-workbench/files/mysql-workbench-8.0.24-gcc11-fix.patch
deleted file mode 100644
index 1ad5b1dafae3..000000000000
--- a/dev-db/mysql-workbench/files/mysql-workbench-8.0.24-gcc11-fix.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-https://bugs.gentoo.org/788199
-
-'volatile gsize' is not accepted by with gcc11 / clang12
-
-"While location has a volatile qualifier, this is a historical
- artifact and the pointer passed to it should not be volatile"
-https://developer.gnome.org/glib/stable/glib-Threads.html#g-once-init-enter
-
-For Scintilla GTK, see also:
-https://sourceforge.net/p/scintilla/code/ci/790bfd4c0747eb5e0bc4d627a101298207a8421e/
-
-Also adds missing <memory> includes.
-
-Signed-off-by: Ionen Wolkens <sudinave@gmail.com>
---- a/ext/scintilla/gtk/ScintillaGTKAccessible.cxx
-+++ b/ext/scintilla/gtk/ScintillaGTKAccessible.cxx
-@@ -1011,5 +1011,5 @@
- // @p parent_type is only required on GTK 3.2 to 3.6, and only on the first call

- static GType scintilla_object_accessible_get_type(GType parent_type G_GNUC_UNUSED) {

--	static volatile gsize type_id_result = 0;

-+	static gsize type_id_result = 0;

- 

- 	if (g_once_init_enter(&type_id_result)) {

-@@ -1102,5 +1102,5 @@
- 	*cache = scintilla_object_accessible_new(0, G_OBJECT(widget));

- #elif HAVE_GTK_FACTORY // register in the factory and let GTK instantiate

--	static volatile gsize registered = 0;

-+	static gsize registered = 0;

- 

- 	if (g_once_init_enter(&registered)) {

---- a/library/forms/gtk/src/mforms_acc.cpp
-+++ b/library/forms/gtk/src/mforms_acc.cpp
-@@ -177,5 +177,5 @@
-     // @p parent_type is only required on GTK 3.2 to 3.6, and only on the first call
-     GType mforms_object_accessible_get_type(GType parent_type G_GNUC_UNUSED) {
--      static volatile gsize typeIdResult = 0;
-+      static gsize typeIdResult = 0;
- 
-       if (g_once_init_enter(&typeIdResult)) {
---- a/library/ssh/SSHCommon.h
-+++ b/library/ssh/SSHCommon.h
-@@ -42,4 +42,5 @@
- #include <thread>
- #include <atomic>
-+#include <memory>
- #include <mutex>
- 
---- a/library/ssh/SSHTunnelHandler.h
-+++ b/library/ssh/SSHTunnelHandler.h
-@@ -31,4 +31,5 @@
- #include <thread>
- #include <map>
-+#include <memory>
- #include <mutex>
- #include <vector>
diff --git a/dev-db/sqlcl-bin/Manifest b/dev-db/sqlcl-bin/Manifest
index 491f27aea187..f1088e49b2c5 100644
--- a/dev-db/sqlcl-bin/Manifest
+++ b/dev-db/sqlcl-bin/Manifest
@@ -1,3 +1,3 @@
-DIST sqlcl-21.2.0.174.2245.zip 37572475 BLAKE2B 331319acfdba2e09b31ba5f7e01549a37bb4226487487afcb5afe2bf8f933481c1131d8f4821f668cb5b13ff7f14866097565562ad383e09b23c7b2302670abf SHA512 410614af0acde54bc9fbacb0c2168fe049baccca0d3dbf7e9940176abd90250705aac92a69e09dd9c8854b124dab399bb36bbb381156724528e830ce897f022e
-EBUILD sqlcl-bin-21.2.0.174.2245.ebuild 772 BLAKE2B 1188b21b2856747bfbcf79357f3461447d6146c6fd720599e0004a8194d918c3a5acbf07c97581fd6d1f0d410a67022a35f44ebb6687b79f0ea53fcd34617aaf SHA512 34b76b878fb1e8a9562bee29df3d9aef6ee33fc0dd2f7471b8ad7632001c5625831f943d7a2faecf40dbaa96d4839dd22a849c0941c8b7a37031b557e81bfa62
+DIST sqlcl-21.2.2.223.0914.zip 37581478 BLAKE2B 098988e17b9f347e4ce6142626174565543e701ad22f8dccb2260b4b1b8f74cd12a0c3824790e403a7dc359e329026eb83a656fde8b49e5317b70813b3fc4b07 SHA512 c5fc99095b731f2f4dc52e01a2a6974fb01d655a4d862a0b89594921183c4019bf9c07562d9f7307af5686770b19c1277e47562c6ae6786530561e13b9fd27b3
+EBUILD sqlcl-bin-21.2.2.223.0914.ebuild 764 BLAKE2B 2fafbf449da275d796c8b537feb7875f7349c174487a7fdd164fc7600858159f95e1b893364e4237a01f2e2a705fb03472c407856a15b9cb122c59f4234c4ca3 SHA512 a9c9771fde95303eb20ee06185dfeae75d751e6876550e9157a5301460377f571a9d2e969f2f95e8a1f7817cdf31ed6824a27d947d5dea845ef40a3781dbfca8
 MISC metadata.xml 401 BLAKE2B 931e25a3d3febffc304151165b7573a1d3d6d1977ffb842dc25142083106f21e025ab8006757e97382e0287ee1240842e66ebbd44e6543382d08497559a6dd05 SHA512 4d7350199a900f6658f00ab900ba282cca1369248b03099ce0bce113bd33028893e7894605e035446d4c0d62f7231f05734fe19b6ebcf120d9e8ec6245053148
diff --git a/dev-db/sqlcl-bin/sqlcl-bin-21.2.0.174.2245.ebuild b/dev-db/sqlcl-bin/sqlcl-bin-21.2.2.223.0914.ebuild
index ec65b7343fd3..4abb49d13644 100644
--- a/dev-db/sqlcl-bin/sqlcl-bin-21.2.0.174.2245.ebuild
+++ b/dev-db/sqlcl-bin/sqlcl-bin-21.2.2.223.0914.ebuild
@@ -11,7 +11,7 @@ inherit java-pkg-2
 DESCRIPTION="Oracle SQLcl is the new SQL*Plus"
 HOMEPAGE="https://www.oracle.com/database/technologies/appdev/sqlcl.html"
 SRC_URI="https://download.oracle.com/otn_software/java/sqldeveloper/${MY_P}.zip"
-RESTRICT="bindist mirror"
+RESTRICT="mirror"
 
 LICENSE="OTN"
 SLOT="0"
diff --git a/dev-db/sqldeveloper/Manifest b/dev-db/sqldeveloper/Manifest
index 1ba98c1d9840..59b5a843d2c5 100644
--- a/dev-db/sqldeveloper/Manifest
+++ b/dev-db/sqldeveloper/Manifest
@@ -1,7 +1,7 @@
 AUX sqldeveloper 325 BLAKE2B e89acd5441362bc693296e2fef189e637944413094169c09be73bb1f514393f0239c7f4c5b186dd0e34bd1bda9730f4bb2e029b166f1db740ac34eff25097c84 SHA512 ab1d70c5b693efe5e6270d7fcd0ba7ef30852ed98fe88a1853c5b415178c51bbb754a4da6964b5e57e87c38015cc90ac2fc04b7aa121b660300434523457bad2
 AUX sqldeveloper-r1 407 BLAKE2B 26bf826e6ccf1cd45b52e7cdf6e694d88570118c0e98cab83f66f078ed79fea36fb3fa6df67dc271a74faad4307996c4968f6d316d9fc71d1a5360804f39782e SHA512 cf089f58c9de3677dbaa7b0c4bdd81e234bffac4c25f5a433c7854068ca33b5a4165d8a5d24188890d5d8c60c209adee5267a255505b978a5a7f73646fd1dfbe
-DIST sqldeveloper-21.2.0.187.1842-no-jre.zip 458192293 BLAKE2B 7aed56d9bddb8c75f2bbe7bd7fdb6c7be470903ea462c44bd650caeb818ad90d87c9415d5a2c9fc5a4622e8184ea12622979a99dda04d47171e9565061da463c SHA512 7f292cd55c460da61841d85ea2269a9c051370503aea621394ff97d6ef2a9adf12403cc88626b6fb446a493a6024dacbf4fa0667a4cbf7c831a6932b7e6dfb61
+DIST sqldeveloper-21.2.1.204.1703-no-jre.zip 458220863 BLAKE2B 0f5bfb3a97667a728db6b8d61178cdfc90db0958ea7e08460de8d854037f775aa5b97e7e334048c5a717acb35db64334358918b45046395b0170f3ff733d3c65 SHA512 4cdff031ea008bb7b31a202487bb98c1748599b7190ba5b82c9c3fbcc86d453e75751585c243ca9f52d255a43e24a720a0929630b3c3742cf8e91cfa980cf3bb
 DIST sqldeveloper-4.2.0.17.089.1709-no-jre.zip 348604841 BLAKE2B 0c3adff04f148102e6460c7550f787329c7e5a69aca0b81c2de4725b9c9ea27c03bb2f588671a95371aa3612839805f2042855b443bb5635c70d0e0b2140295b SHA512 4d1e270376ae125a60146228e35fcb2cb615d593c0e9f2ca98e4deef4d8fd1ddff59cf15064d63e33e77125f49e8da9fe317ed1fd96a9b00a699bf6c5e739874
-EBUILD sqldeveloper-21.2.0.187.1842.ebuild 2828 BLAKE2B 74ca7e5d67d481c1dcd9dc24f56b551daa6767669519c8f5a6d9548eee02f978d4096be215f2e58fba0eaedfc296abade57acd2f2039208afb910dd33e2b97a1 SHA512 ddcae0c1f19f7a7d1cdc38a9ff1a5949c2979dc344eb51fa5125bfc78c03b5185a3ee69a1388e69d01513b53e834cf0619dc8f28370d15a35bea296a69323073
+EBUILD sqldeveloper-21.2.1.204.1703.ebuild 2955 BLAKE2B 0f33dc602a74414868e7c393d1411447c9ee1c6f816c3a4633d1ad217a0d41803c528d56615ea3d271d103936d8bc855707383ab94f656a829ece56b82cf9ca0 SHA512 01f0408b16e7f42bc86c4be51b413d7f5c6673a4721eebf423b6eaa1e1a4f2422147f8c10ac2fd492bda8c0d23b5f152d390021dfedd2347b9eddd039b358420
 EBUILD sqldeveloper-4.2.0.17.089.1709.ebuild 3218 BLAKE2B 3640beb6c918d9e2110eb409b4d51de29d1d74a2e1b37cce43b1dd14a74c712b6edf6842e005c697f9da13cc1e7327f0576d722c030c19ff99f9a8fa8b54a1a1 SHA512 27700ffcb3b832074bdd962133b4ca4fe8c6e5be26783a9999aa1b8e9809f82cfca4713265e493d31691d292760fba1e1a8388800aec19fdcc224b5be9ef54b0
 MISC metadata.xml 495 BLAKE2B b8622f4768a8dcd21e32030ec63b74281c7dbdc77fbddd6f2017035b7829a80eac3086d88c78bba3a0b4d6ab614f3bbb80019eae69240fe98d21f72d5f08c857 SHA512 d605e837de9cba7955733ee0043340be3efddeb0969166a3483a2f3e68c6a74dc4bed7f5f0fc19fe8af8c8d9dbaf3beb23797125a27a053fdc9a7e0f273d6368
diff --git a/dev-db/sqldeveloper/sqldeveloper-21.2.0.187.1842.ebuild b/dev-db/sqldeveloper/sqldeveloper-21.2.1.204.1703.ebuild
index 47c5cd1e77d3..3707f45ec26d 100644
--- a/dev-db/sqldeveloper/sqldeveloper-21.2.0.187.1842.ebuild
+++ b/dev-db/sqldeveloper/sqldeveloper-21.2.1.204.1703.ebuild
@@ -28,16 +28,18 @@ RDEPEND="
 "
 BDEPEND="app-arch/unzip"
 
+S="${WORKDIR}/${PN}"
+
 QA_PREBUILT="
 	opt/${PN}/netbeans/platform/modules/lib/amd64/linux/libjnidispatch-422.so
 "
 
 pkg_nofetch() {
 	einfo "Please go to"
-	einfo "	${HOMEPAGE}"
+	einfo " ${HOMEPAGE}"
 	einfo "and download"
-	einfo "	Oracle SQL Developer for other platforms"
-	einfo "		${SRC_URI}"
+	einfo " Oracle SQL Developer for other platforms"
+	einfo "         ${SRC_URI}"
 	einfo "and move it to /var/cache/distfiles"
 }
 
@@ -47,7 +49,6 @@ src_prepare() {
 	sed -i 's|"`dirname $0`"|/opt/sqldeveloper|' sqldeveloper.sh || die
 
 	rm -r netbeans/platform/modules/lib/i386 || die
-	#rm -r modules/javafx/{osx-x64,windows-x64} || die
 	rm -r modules/javafx || die
 
 	# they both use jtds, enabling one of them also enables the other one
@@ -74,9 +75,11 @@ src_prepare() {
 src_install() {
 	insinto /opt/${PN}
 	doins -r {configuration,d{ataminer,ropins},e{quinox,xternal},ide,j{avavm,d{bc,ev},lib,views},modules,netbeans,orakafka,rdbms,s{leepycat,ql{developer,j},vnkit}}
-
 	fperms +x /opt/${PN}/netbeans/platform/modules/lib/amd64/linux/libjnidispatch-422.so
 
+	dodir /opt/sqldeveloper/sqldeveloper/extensions/oracle.datamodeler/log
+	fperms 1777 /opt/sqldeveloper/sqldeveloper/extensions/oracle.datamodeler/log
+
 	newbin "${FILESDIR}"/${PN}-r1 ${PN}
 
 	newicon icon.png ${PN}-32x32.png