7 files changed, 52 insertions, 21 deletions
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 1e3dbd37f544..283a0bdd0a33 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/conserver/Manifest b/app-admin/conserver/Manifest
index a33f6eab2a74..6af0a8544276 100644
--- a/app-admin/conserver/Manifest
+++ b/app-admin/conserver/Manifest
@@ -3,5 +3,5 @@ AUX conserver.confd-r1 133 BLAKE2B 6f3029a06b34458f70ef8370c35c09ea69a4d005aad17
 AUX conserver.initd-r1 428 BLAKE2B 574fa8611e928b17e70b1da522060c230b3f51ef0daf8babeeb9635f9652d01f06de1fa4309a213b6b2bca77099a17910aa5d6790bccc4e4e8f7f8fc0ba42458 SHA512 f0dcea7fddec5165fb00c452aa0b56c3eaa0919e96e5bf1ff4e80000b01fe80134bc4ee8a584114fcad56c6d5caa467d229b8b54bc8b4145dd2fa76871336c7d
 AUX conserver.pam-pambase 194 BLAKE2B ad284008c94f4c19b911a93279b12893a1c686806b22f7f19500e7216c19768ab161f9ba5cf2405d9d46f412a08c0cb04de0bc05ead15fb75da931575c2c3be2 SHA512 5368394be5b9d97e0ae751d84fbb4848aa27fd57b1a2eea8c7919e56246e390985deca80f0019c2104034103f73ac382a5ab2129113a0ff0b63b0b8bd83648c9
 DIST conserver-8.2.6.tar.gz 437315 BLAKE2B 9f62bb8ac91b57759c6b08d5a6ff31727a547c1991d322d75350a879a247925bbb1bbcab25b8a3d99a2ce6a997ba9f2e6c35338588e913055b29f3574e00e434 SHA512 3b7769675fd0edfd3727e5e84785f33c037b9e7a17c8c69c0ce48a447ea3b7de916e217c0f3b808b8350818b7bc702c917ea7a122ed96ae6b73f81ff0b5ae283
-EBUILD conserver-8.2.6-r3.ebuild 2347 BLAKE2B 4f1f02c1f10af4fbed439a2adfbaabaef25492dbb0f8868a89af43351e0a7b8211227246a877d5873b418635a31863da52d318836c4bad02535a83d720129dc4 SHA512 86333520bec24144c18241360502b0c0177e317bc7d7ff5dc6772e572fcdff4bed77b45c3f6f92ca496893ee52cbf8f8b5c354e02e0db4d38818ddf96700a3b1
-MISC metadata.xml 1308 BLAKE2B 050d59b8dc1e5f15f0b6be6ee4f7a14d1d434edd6f8cb86cd8806f4183aa4aba11d504f6a73cd90e539da16ecf7794322dab5c57a6f6eaa3adbfa171c07b4437 SHA512 2d7ef18f58f140e81ed49a6a4cee431028033ca1d9ac0b2fdacc5123bc25fb3ad1cc007421f06138bcb6fafb27661c28a36e976f59298e0dff5d1fb8e4cc6cf6
+EBUILD conserver-8.2.6-r3.ebuild 2302 BLAKE2B 15c933b385caf51e8fa5bb4ec21f49a83de4a590c145387e26a0a3fe4bb396e5cdecbefacc1d158660e1162a1c19816e83695f93746dfa8c4ccc50e955dbe9a1 SHA512 e8ccc9de836abb1d93db878a921f9ecd66ce4d74702407c08ca9ac28a062d4b4865592f6c290bbdf9bcdea31f89d9d528004b2961d1fa839ab63566a42872d1f
+MISC metadata.xml 1392 BLAKE2B fb2c3cd7e62a1c498b35f80a7043f73966b4dd2bb66a5945612a2eaaf7b01aa389822df9d813bd452452d1f6455ac854c64694c5b89aa4f9fd91a12a7d11ee18 SHA512 28d720f94983c2f2b64f1a6ff2e37103af8e57eb96205123b75e0d1de4525bb5056aaf5ae832a3b7874ec485e87801fca60294607bcf52ab399e4796e7d1da15
diff --git a/app-admin/conserver/conserver-8.2.6-r3.ebuild b/app-admin/conserver/conserver-8.2.6-r3.ebuild
index 37e5cb8d6e93..cc5c9df307a4 100644
--- a/app-admin/conserver/conserver-8.2.6-r3.ebuild
+++ b/app-admin/conserver/conserver-8.2.6-r3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit autotools pam ssl-cert
 
@@ -12,12 +12,11 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
 LICENSE="BSD BSD-with-attribution"
 SLOT="0"
 KEYWORDS="~alpha amd64 ppc ppc64 ~sparc x86"
-IUSE="debug ipv6 freeipmi kerberos pam ssl test tcpd"
+IUSE="ipv6 freeipmi kerberos pam ssl test tcpd"
 RESTRICT="!test? ( test )"
 
 DEPEND="net-libs/libnsl:=
 	virtual/libcrypt:=
-	debug? ( dev-libs/dmalloc:= )
 	freeipmi? ( sys-libs/freeipmi:= )
 	kerberos? (
 		virtual/krb5
@@ -45,13 +44,13 @@ src_prepare() {
 
 src_configure() {
 	local myconf=(
-		$(use_with debug dmalloc)
 		$(use_with ipv6)
 		$(use_with freeipmi)
 		$(use_with kerberos gssapi)
 		$(use_with ssl openssl)
 		$(use_with pam)
 		$(use_with tcpd libwrap)
+		--without-dmalloc
 		--with-cffile=conserver/conserver.cf
 		--with-logfile=/var/log/conserver.log
 		--with-master=localhost
diff --git a/app-admin/conserver/metadata.xml b/app-admin/conserver/metadata.xml
index f239675c0bab..262fe72f8465 100644
--- a/app-admin/conserver/metadata.xml
+++ b/app-admin/conserver/metadata.xml
@@ -25,4 +25,7 @@
 	<use>
 		<flag name="freeipmi">Compile in FreeIPMI support via <pkg>sys-libs/freeipmi</pkg></flag>
 	</use>
+	<upstream>
+		<remote-id type="github">conserver/conserver</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-admin/qtpass/Manifest b/app-admin/qtpass/Manifest
index bc235b43a269..82b768e4a904 100644
--- a/app-admin/qtpass/Manifest
+++ b/app-admin/qtpass/Manifest
@@ -1,3 +1,4 @@
+AUX qtpass-1.4.0-qt-6.8-buildfix.patch 691 BLAKE2B 8336eb26131e134389d3db751a5dcbf2375cd9569cbf3f7582fe9cb6ef6f08c1e2993c8d4a006e71cae55e5f8c13d8c58edaf1b2b1cdc9592c2c764514066630 SHA512 e80bc14d987e95c9a7160d5ad12579a5f43fa3671f879d5779482ce932a522bb4390792a00f03c9d234a19d43e6953ac1838a5db59347d881ec7762c0bb04870
 DIST qtpass-1.4.0.tar.gz 581368 BLAKE2B 12bf414ea781bad34d97fe28ae39f44e17812039f0d798162b6d875918f20a1583f7a53a1e98ed917edf41c15709c7693c7651205c5e4ec85860ee773350f075 SHA512 47c1284c10e0d8a3bf63c049fc29d785d1a53bef6f183bbe22efebf466371dd454a6e43c944739f487d609f3cde188701ba538e9cb8e2c7e5530f8fa6f992625
-EBUILD qtpass-1.4.0.ebuild 1286 BLAKE2B 09bb22e6563011d514c6714c567c2480e5c5e4ab797c449ea3931e614a498c206f5263804a7f926d49d672fcda5ef255c90ef7f379273d9e1902b1d7384fa5b5 SHA512 3dda3b75abc10177855ba6a80da3a8557e95bdd20398ad2b7caf696ab5f7a271a781e47944ff9f1db9e3ff22db7ad122fba8f8d2d7659896ba103a14bfcabcad
+EBUILD qtpass-1.4.0-r1.ebuild 1311 BLAKE2B ee3421016ccc0d4f94b105952c10df98c60f32d8974ed66c61213a0eb907f55e35305b009c9dc1add0fc135de832037dfec17388ff6bbf80992f1cce027881b5 SHA512 54b8d643f51fc62593cc70aa678bfb9685735ce48544f703b435bff1e6d2b117ca790b7dc9296461bcc00f4653f9f72debb747b030e0e746332477c4863719d3
 MISC metadata.xml 485 BLAKE2B 526a8203c5a8601f6bdae7fcc71fb26a6def402406493ebf95869624f8cea44a09fe2c23a041adebcd1bc5bc4ac9c64b2c33725b7d6d24bbf4f415926468a0ce SHA512 bc1c8273227625672ebfce619956a342dc3c74d412a16383c035e88b289a8dad9383ab00c9c5bd4f368dd8fefdad025b0d4f7c209b84251b0e26e16ef4149eef
diff --git a/app-admin/qtpass/files/qtpass-1.4.0-qt-6.8-buildfix.patch b/app-admin/qtpass/files/qtpass-1.4.0-qt-6.8-buildfix.patch
new file mode 100644
index 000000000000..c996cb9bf8e7
--- /dev/null
+++ b/app-admin/qtpass/files/qtpass-1.4.0-qt-6.8-buildfix.patch
@@ -0,0 +1,23 @@
+From c3d04090260edd77e56c0602f264d923b236c42f Mon Sep 17 00:00:00 2001
+From: Arthur Bols <arthur@bols.dev>
+Date: Tue, 5 Nov 2024 17:20:56 +0100
+Subject: [PATCH] fix: add missing QDirIterator include
+
+Added missing include for QDirIterator in mainwindow.cpp to resolve compilation
+errors introduced with Qt 6.8.
+---
+ src/mainwindow.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
+index 66b87dc2..691b8593 100644
+--- a/src/mainwindow.cpp
++++ b/src/mainwindow.cpp
+@@ -19,6 +19,7 @@
+ #include <QCloseEvent>
+ #include <QDesktopServices>
+ #include <QDialog>
++#include <QDirIterator>
+ #include <QFileInfo>
+ #include <QInputDialog>
+ #include <QLabel>
diff --git a/app-admin/qtpass/qtpass-1.4.0.ebuild b/app-admin/qtpass/qtpass-1.4.0-r1.ebuild
index d942091a7152..e6a4bd5f91d9 100644
--- a/app-admin/qtpass/qtpass-1.4.0.ebuild
+++ b/app-admin/qtpass/qtpass-1.4.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit desktop qmake-utils virtualx
+inherit desktop qmake-utils
 
 DESCRIPTION="Multi-platform GUI for pass, the standard unix password manager"
 HOMEPAGE="https://qtpass.org https://github.com/IJHack/qtpass"
@@ -16,19 +16,23 @@ KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-RDEPEND="|| ( app-admin/pass app-admin/gopass )
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	net-misc/x11-ssh-askpass"
+RDEPEND="
+	|| (
+		app-admin/pass
+		app-admin/gopass
+	)
+	dev-qt/qtbase:6[gui,network,widgets]
+	net-misc/x11-ssh-askpass
+"
 DEPEND="${RDEPEND}
-	dev-qt/qtsvg:5
-	test? ( dev-qt/qttest:5 )"
-BDEPEND="dev-qt/linguist-tools:5"
+	dev-qt/qtsvg:6
+"
+BDEPEND="dev-qt/qttools:6[linguist]"
 
 DOCS=( {CHANGELOG,CONTRIBUTING,FAQ,README}.md )
 
+PATCHES=( "${FILESDIR}"/${P}-qt-6.8-buildfix.patch )
+
 src_prepare() {
 	default
 
@@ -39,11 +43,12 @@ src_prepare() {
 }
 
 src_configure() {
-	eqmake5 PREFIX="${EPREFIX}"/usr
+	eqmake6 PREFIX="${EPREFIX}"/usr
 }
 
 src_test() {
-	virtx default
+	local -x QT_QPA_PLATFORM=offscreen
+	default
 }
 
 src_install() {