From 7befcc82b22f6873101348f990bf6671382c7bf1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A8=D0=B0=D1=88=D0=BA=D0=B8=D0=BD=20=D0=9D=D0=B8=D0=BA?=
 =?UTF-8?q?=D0=BE=D0=BB=D0=B0=D0=B9?= <n.shashkin@dssl.ru>
Date: Thu, 30 Nov 2023 20:19:05 +0300
Subject: [PATCH] dbeaver 22.3.5 -> 23.2.5

---
 dev-db/dbeaver-bin/Manifest                  |  4 +-
 dev-db/dbeaver-bin/dbeaver-bin-22.3.5.ebuild | 41 -------------------
 dev-db/dbeaver-bin/dbeaver-bin-23.2.5.ebuild | 43 ++++++++++++++++++++
 dev-db/dbeaver-bin/metadata.xml              | 10 ++---
 4 files changed, 49 insertions(+), 49 deletions(-)
 delete mode 100644 dev-db/dbeaver-bin/dbeaver-bin-22.3.5.ebuild
 create mode 100644 dev-db/dbeaver-bin/dbeaver-bin-23.2.5.ebuild

diff --git a/dev-db/dbeaver-bin/Manifest b/dev-db/dbeaver-bin/Manifest
index 77c9c459..de50fe1e 100644
--- a/dev-db/dbeaver-bin/Manifest
+++ b/dev-db/dbeaver-bin/Manifest
@@ -1,3 +1 @@
-DIST dbeaver-ce-22.3.5-linux.gtk.x86_64.tar.gz 125900469 BLAKE2B 1fee2be8eca552f635d7ae7ba07db780b85ee3faf9bce0ba099e31809f3342b29595441a950eae257fde3e7f36243ebcc7fb512ede59c92ef33e2d3b1ae14751 SHA512 be165b34d66973c133d20aa75b86cea061e9b220730cf3569601d3b1295539d6c146c2169153b43afb92565705d791b97638d666e485cfb00de47c570a0e42c5
-EBUILD dbeaver-bin-22.3.5.ebuild 965 BLAKE2B d8aab6c1ff0650c5c70628b1bcec134e0b9b3281d1847a7dc9d5e066960a003382d0ff36168615636fbcb5d17e9820aeb5ded2db29295718b0d306ef0ba97a87 SHA512 ac0be65a99fe4d2e6385edd518600fd37a65e3716280dcd15232d2d0c15758fcca13f8325f615d2cd3eadd5ed49017ec4a0b58769caa8034ba95d68620a425dd
-MISC metadata.xml 284 BLAKE2B 677261fb2276a1f02bd89250a0bf881123c7863c380692d15fc4766b71fb8a1c1f810b66264731f8eff0d5ac9c8a81de46354d2085975f77fc7b0407872c6cba SHA512 fa56cefb9fbd9714aa39ea335af92f04a78ff49fc01cb6911051790311999f08e284be5758760fe154f56affaf400846ad3b2084bb5d12833433c939a98bff3b
+DIST dbeaver-bin-23.2.5-amd64.tar.gz 87317961 BLAKE2B 63b4d7c57333f1df1db4ada5159728db59c274fda75961a7c1dd0252ec2dabe9a146ed21d5b1cf92843b6407c59ff4b2bc411dddf897c6ffdb46e2a08bcb8102 SHA512 7c5f52a175028bbd5fe2a967e87f4a9598641c18f0195389011ada2776dba42ebebbb8aad6a05f397507aaa124de459f172eedec0c07ed9b6ac318bf65b8effc
diff --git a/dev-db/dbeaver-bin/dbeaver-bin-22.3.5.ebuild b/dev-db/dbeaver-bin/dbeaver-bin-22.3.5.ebuild
deleted file mode 100644
index a8c429fc..00000000
--- a/dev-db/dbeaver-bin/dbeaver-bin-22.3.5.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 2020-2022 Gianni Bombelli <bombo82@giannibombelli.it>
-# Distributed under the terms of the GNU General Public License  as published by the Free Software Foundation;
-# either version 2 of the License, or (at your option) any later version.
-
-EAPI=8
-
-inherit desktop wrapper
-
-DESCRIPTION="Free universal database tool and SQL client"
-HOMEPAGE="https://dbeaver.io/"
-
-SRC_URI="https://dbeaver.io/files/${PV}/dbeaver-ce-${PV}-linux.gtk.x86_64.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-RESTRICT="bindist mirror"
-
-IUSE=""
-DEPEND=">=x11-libs/gtk+-2:2"
-RDEPEND="${DEPEND}
-	media-libs/alsa-lib
-	x11-libs/libXtst
-"
-
-QA_FLAGS_IGNORED="CFLAGS LDFLAGS"
-
-S="${WORKDIR}/dbeaver"
-
-src_install() {
-	local dir="/opt/${PN}"
-
-	insinto "${dir}"
-	doins -r *
-	fperms 755 "${dir}/dbeaver"
-	fperms 755 "${dir}/jre/bin/java"
-
-	make_wrapper "${PN}" "${dir}/dbeaver"
-	newicon "dbeaver.png" "${PN}.png"
-	make_desktop_entry "${PN}" "DBeaver" "${PN}" "Development;IDE"
-}
diff --git a/dev-db/dbeaver-bin/dbeaver-bin-23.2.5.ebuild b/dev-db/dbeaver-bin/dbeaver-bin-23.2.5.ebuild
new file mode 100644
index 00000000..457c8688
--- /dev/null
+++ b/dev-db/dbeaver-bin/dbeaver-bin-23.2.5.ebuild
@@ -0,0 +1,43 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit desktop wrapper xdg
+
+DESCRIPTION="Free universal database tool (community edition)."
+HOMEPAGE="https://dbeaver.io/"
+MY_PN="${PN%-bin*}-ce"
+SRC_URI="https://dbeaver.io/files/${PV}/${MY_PN}-${PV}-linux.gtk.x86_64-nojdk.tar.gz -> ${P}-amd64.tar.gz"
+
+LICENSE="Apache-2.0 EPL-1.0 BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="dev-java/openjdk-bin:17"
+DEPEND="${RDEPEND}"
+
+MY_PN="${PN%-bin*}"
+S="${WORKDIR}/${MY_PN}"
+
+src_prepare() {
+	sed -e "s/^Icon=.*/Icon=${MY_PN}/" \
+		-e 's:/usr/share/dbeaver:/opt/dbeaver:g' \
+		-e '/^WMCLASS.*/d' \
+		-e "s:^Exec=.*:Exec=${EPREFIX}/usr/bin/${MY_PN}:" \
+		-i "${MY_PN}-ce.desktop" || die
+	default
+}
+
+src_install() {
+	doicon -s 128 "${MY_PN}.png"
+	newicon icon.xpm "${MY_PN}.xpm"
+	domenu "${MY_PN}-ce.desktop"
+	einstalldocs
+	rm "${MY_PN}-ce.desktop" "${MY_PN}.png" icon.xpm readme.txt || die
+	insinto "/opt/${MY_PN}-ce"
+	doins -r *
+	fperms 0755 "/opt/${MY_PN}-ce/${MY_PN}"
+	make_wrapper "${MY_PN}" "/opt/${MY_PN}-ce/${MY_PN}" "/opt/${MY_PN}-ce"
+	sed -e "s:^exec /opt/${MY_PN}-ce/${MY_PN}:exec /opt/${MY_PN}-ce/${MY_PN} -vm ${EPREFIX}/opt/openjdk-bin-17/bin:" \
+		-i "${D}/usr/bin/${MY_PN}" || die
+}
diff --git a/dev-db/dbeaver-bin/metadata.xml b/dev-db/dbeaver-bin/metadata.xml
index 6ed1d0a9..a88cd925 100644
--- a/dev-db/dbeaver-bin/metadata.xml
+++ b/dev-db/dbeaver-bin/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <maintainer type="person">
-        <email>bombo82@giannibombelli.it</email>
-        <name>Gianni Bombelli (bombo82)</name>
-    </maintainer>
+	<maintainer type="person">
+		<email>gouwazi@protonmail.com</email>
+		<name>gouwazi</name>
+	</maintainer>
 </pkgmetadata>