4 files changed, 100 insertions, 68 deletions
diff --git a/dev-db/pgmodeler/Manifest b/dev-db/pgmodeler/Manifest
index f0e34b8ad505..4ae9b4f00208 100644
--- a/dev-db/pgmodeler/Manifest
+++ b/dev-db/pgmodeler/Manifest
@@ -1,3 +1,3 @@
-DIST pgmodeler-0.9.4.tar.gz 4016619 BLAKE2B 27a621a9b810d4f90214fc4b0f39ba1673170bd3341af3f8298c9ecd1ad45f021c225864c9b2cf47d5775e3c1630d8f44273621bda2bb891ddefbab2eb0c525f SHA512 5162f4f23ec1c202309fe0837687e8d7c2a836ed36d52a3c5ee55b649067070ae878642493257c6466b9c18c422c9fe97f433b02826e8183ea286d400769bea2
-EBUILD pgmodeler-0.9.4.ebuild 1251 BLAKE2B 461c64450baf817a7bead6ec0200fe948d727879028beb59c751a74274951dcc95fcf061fa1d47b3862372661180b4f7b38fbae3b9205f01b062bc1ed0096709 SHA512 43cb0b72a39b9bffc1db3636b6195cd08bee305b9778a9cf3f777c1f3d9fc0bfcd8cfb7462484b6a376c49ce3e885c854d1d3b119f88880def90d14714e4425a
-MISC metadata.xml 267 BLAKE2B aad407580ae3a3a34c336eb43a736908dbe0f302241b38189742a39a31843d18c57f064dd8fd4d3f2cbdb44bb57dfda793e9920cc6262f7ef8e9c8eadc977ff5 SHA512 e99af2e8b97b6c9cf977da5facfff07259da78150f077d7c715a61f4dd0b0de5e904666a28c8a91b6b52bbb6105c947ef57c94571a3d271fc6cdd960a99b9a0c
+DIST pgmodeler-1.1.6.tar.gz 4203816 BLAKE2B 2939fcea5356094bbd83201794dccfc1073938d0686a00ef607ac8560534a117c5b4b1e78f2017c776d4a8f9d3858e9a991b77ed34d2827f61c6cf6d96fa09f3 SHA512 14133e42fb035a10edd98606bf86097b7f16ded51a44a2cea2321549c12a9713cf6ecfe0a54c584ed18c57e1a287e4c18d97ffd4f285d22ab145f2d42bbaf09c
+EBUILD pgmodeler-1.1.6.ebuild 2155 BLAKE2B 1d5a492c043f480d2e11af11dfb1eb833d029beacfae323dcafe6dcb87283b43475027132cc7b549ec5dff95ed962597851cb0ee103880103d0d3a8d2514d17d SHA512 c7b98fe8884c93281eaf33e58cb24a980f0418a89d5f9b2bb47dedfd7ee3fe6c4b66addaa875d3ac708cf924fb9a2c891b47da227658f57f8e016b127ae8b8be
+MISC metadata.xml 333 BLAKE2B 81516b3b8ec6d4b241fd17dba64894dcafde83d98096f839a21d621da955226575ad6ba2cdf46fbdc59e9f1ebed85b3a287b6eb54c2d7be6be23bc734f239f72 SHA512 444f2ec6a6db676415f936795d0d3c621780ece5df3961b0b927d15180bf279fc799f182fdd411286f718ebf8b595233ded6a517695c1f8905cacfd0e520812e
diff --git a/dev-db/pgmodeler/metadata.xml b/dev-db/pgmodeler/metadata.xml
index 028048e538df..2d85bf303cfc 100644
--- a/dev-db/pgmodeler/metadata.xml
+++ b/dev-db/pgmodeler/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <maintainer type="project">
-        <email>pgsql-bugs@gentoo.org</email>
-        <name>PostgreSQL</name>
-    </maintainer>
+	<maintainer type="project">
+		<email>pgsql-bugs@gentoo.org</email>
+		<name>PostgreSQL</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">pgmodeler/pgmodeler</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-db/pgmodeler/pgmodeler-0.9.4.ebuild b/dev-db/pgmodeler/pgmodeler-0.9.4.ebuild
deleted file mode 100644
index 16c9f10383dd..000000000000
--- a/dev-db/pgmodeler/pgmodeler-0.9.4.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-POSTGRES_COMPAT=( 10 11 12 13 14 )
-
-inherit desktop postgres qmake-utils
-
-MY_PV=${PV/_/-}
-
-DESCRIPTION="PostgreSQL Database Modeler"
-HOMEPAGE="https://pgmodeler.io"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND="${POSTGRES_DEP}
-	dev-libs/icu:=
-	dev-libs/libxml2:=
-	dev-qt/qtcore:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( CHANGELOG.md README.md RELEASENOTES.md )
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-src_configure() {
-	eqmake5 \
-		PREFIX="${EPREFIX}/usr" \
-		PLUGINSDIR="${EPREFIX}/usr/$(get_libdir)/${PN}/plugins" \
-		PRIVATEBINDIR="${EPREFIX}/usr/$(get_libdir)/${PN}/bin" \
-		PRIVATELIBDIR="${EPREFIX}/usr/$(get_libdir)/${PN}" \
-		NO_UPDATE_CHECK=1 \
-		-r ${PN}.pro
-}
-
-src_test() {
-	cd "${S}/tests" || die
-	eqmake5 tests.pro
-	emake
-	emake check
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-
-	rm "${D}"/usr/share/${PN}/{CHANGELOG.md,LICENSE,README.md,RELEASENOTES.md}
-
-	einstalldocs
-
-	doicon assets/conf/${PN}_logo.png
-	make_desktop_entry ${PN} ${PN} ${PN}_logo Development
-}
diff --git a/dev-db/pgmodeler/pgmodeler-1.1.6.ebuild b/dev-db/pgmodeler/pgmodeler-1.1.6.ebuild
new file mode 100644
index 000000000000..8cde27304163
--- /dev/null
+++ b/dev-db/pgmodeler/pgmodeler-1.1.6.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+POSTGRES_COMPAT=( {13..17} )
+inherit desktop postgres qmake-utils
+
+DESCRIPTION="PostgreSQL Database Modeler"
+HOMEPAGE="https://pgmodeler.io"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="${POSTGRES_DEP}
+	dev-libs/libxml2
+	dev-qt/qtbase:6[gui,network,opengl,widgets,X]
+	dev-qt/qtsvg:6
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+	sed -e "/^doc.files/s/LICENSE //" -i pgmodeler.pro || die
+}
+
+src_configure() {
+	local myqmakeargs=(
+		DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
+		PREFIX="${EPREFIX}/usr"
+		PLUGINSDIR="${EPREFIX}/usr/$(get_libdir)/${PN}/plugins"
+		PRIVATEBINDIR="${EPREFIX}/usr/$(get_libdir)/${PN}/bin"
+		PRIVATELIBDIR="${EPREFIX}/usr/$(get_libdir)/${PN}"
+		NO_UPDATE_CHECK="true"
+	)
+	eqmake6 "${myqmakeargs[@]}" -r ${PN}.pro
+}
+
+src_test() {
+	local myqmakeargs=(
+		BINDIR="${T}"
+		SAMPLESDIR="${S}/assets/samples"
+		SCHEMASDIR="${S}/assets"
+	)
+
+	pushd "${S}/tests" || die
+		# skip tests with graphical interaction
+		sed	-e '/^src\/fileselectortest/d' \
+			-e '/^src\/linenumberstest/d' \
+			-i tests.pro || die
+		# skip test with sandbox restriction (/proc/self/mem)
+		sed	-e '/^src\/syntaxhighlightertest/d' \
+			-i tests.pro || die
+		# skip xml tests
+		# see https://github.com/pgmodeler/pgmodeler/issues/1971
+		sed	-e '/^src\/foreigndatawrappertest/d' \
+			-e '/^src\/proceduretest/d' \
+			-e '/^src\/servertest/d' \
+			-e '/^src\/transformtest/d' \
+			-e '/^src\/xmlparsertest/d' \
+			-i tests.pro || die
+
+		eqmake6 "${myqmakeargs[@]}" tests.pro
+		emake
+
+		# append all shared-libs to LD_LIBRARY_PATH
+		local l
+		for l in "${S}"/libs/*; do
+			[[ -d ${l} ]] && LD_LIBRARY_PATH+=":${l}"
+		done
+		export LD_LIBRARY_PATH
+
+		local -x QT_QPA_PLATFORM=offscreen
+
+		# run each test individually
+		local t
+		for t in $(find src -type f -executable); do
+			${t} || die "${t} failed"
+		done
+	popd || die
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+
+	doicon assets/conf/${PN}_logo.png
+	make_desktop_entry ${PN} ${PN} ${PN}_logo Development
+}