7 files changed, 32 insertions, 119 deletions
diff --git a/app-text/qpdfview/Manifest b/app-text/qpdfview/Manifest
index 1facfc1a1d2b..c9267bfaca12 100644
--- a/app-text/qpdfview/Manifest
+++ b/app-text/qpdfview/Manifest
@@ -1,3 +1,2 @@
-DIST qpdfview-0.4.18.tar.gz 786577 BLAKE2B 07ef444ba39435578481e549fcbbd2d97362c6bda3092a17f1daa8b8437febf50cd2f145cd5e80cc1be565c5a658e85a428314a1bcd2a5a38efce0830f1cffba SHA512 38741520b20e3ed7100e52982930abac26e994a69df68c54dfa7180be8b2a4f377b91ba03993bab67b0a505ad79d62164f0f168a6715f4306b635ceba6840d66
-DIST qpdfview-0.4.18_p1.tar.bz2 448818 BLAKE2B 690f93c7f0af376e2b60d69a9802cdb159a97eb66b572a913badcd7ce3b9303d69bf8fbb359b5aa09ad1c63b1b6865e3602c8dc9cdad2506a43273d410a64d89 SHA512 41152596e39e6084e4e46c1aca28dfa4c619bf31068ee3272c6119793da5d99c58868ecf682ed0dc81e740f20193372e2780cf7d7fb917545662c93e6a2a1b4a
-DIST qpdfview-0.4.18_p20211227.tar.bz2 485165 BLAKE2B 1efdebf84ffbcedf464615e6ef2ef4092ef3210177e5faf17bb01c39243fdd5b11434459dad897a04acff0cf037129d2a524d37c670ae57556219421c363d1c5 SHA512 ea2206d9f2cbd5bf53ab75c8e78a5b3e30136febcf82630c375d664645d6b5e72c6128fb7b63cb65ec511c2c23014ceddd93495c520e9cddd1c52f01377bea17
+DIST qpdfview-0.5.tar.gz 925408 BLAKE2B 8ce8ff82893c90012ea1b35a582e87783da87e6eba3d4a10e78fe7810c269908ed1541cf40b1eb17fc474254131cebbc4832a3f46a2016262c485d48e222791b SHA512 1b6b479bb42f4568c21b5f6cb0c552c4323739ba9fe46cea80cc199f48b0b49a278e0a2fb0d21f83bafb467e43dd37352b99ef41795d140220bb82d704e03926
+DIST qpdfview-0.5_p1.tar.gz 922833 BLAKE2B 99d5e818b7c5dd5e583072043be6a282da64277f695cf4c0d38ad339dbdbcb100dcbbf161657f3622a324f691275beb6338c07fe2bbd62e1db896ec759ef162c SHA512 65720f6642b23a23b2d05b38334ce95424e69985b69223d978d4fd59b565d59a37eb43138c2f17fd37d8139b4cc223d5ab32dd18c62f2524792f42b44ba52189
diff --git a/app-text/qpdfview/files/qpdfview-0.4.18-qt-5.15.patch b/app-text/qpdfview/files/qpdfview-0.4.18-qt-5.15.patch
deleted file mode 100644
index b19f247a7c38..000000000000
--- a/app-text/qpdfview/files/qpdfview-0.4.18-qt-5.15.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ur qpdfview-0.4.18.orig/sources/model.h qpdfview-0.4.18/sources/model.h
---- a/sources/model.h	2019-07-24 21:18:33.000000000 +0200
-+++ b/sources/model.h	2020-05-29 11:44:33.012891583 +0200
-@@ -27,6 +27,7 @@
- #include <QtPlugin>
- #include <QWidget>
- #include <QVector>
-+#include <QPainterPath>
- 
- class QAbstractItemModel;
- class QColor;
diff --git a/app-text/qpdfview/files/qpdfview-0.5-poppler-23.08.0-cxx17.patch b/app-text/qpdfview/files/qpdfview-0.5-poppler-23.08.0-cxx17.patch
new file mode 100644
index 000000000000..07acf1a02bd3
--- /dev/null
+++ b/app-text/qpdfview/files/qpdfview-0.5-poppler-23.08.0-cxx17.patch
@@ -0,0 +1,9 @@
+https://bugs.gentoo.org/909037
+--- a/qpdfview.pri
++++ b/qpdfview.pri
+@@ -12,4 +12,4 @@ isEmpty(APP_DIR_DATA_PATH):APP_DIR_DATA_PATH = data
+ win32:include(qpdfview_win32.pri)
+ os2:include(qpdfview_os2.pri)
+ 
+-CONFIG += c++11
++CONFIG += c++17
diff --git a/app-text/qpdfview/metadata.xml b/app-text/qpdfview/metadata.xml
index 9e9a7f9e3fdc..8397ee4bec66 100644
--- a/app-text/qpdfview/metadata.xml
+++ b/app-text/qpdfview/metadata.xml
@@ -5,10 +5,6 @@
 		<email>grozin@gentoo.org</email>
 		<name>Andrey Grozin</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>qt@gentoo.org</email>
-		<name>Gentoo Qt Project</name>
-	</maintainer>
 	<use>
 		<flag name="fitz">
 			Use experimental fitz rendering, provided by <pkg>app-text/mupdf</pkg>,
diff --git a/app-text/qpdfview/qpdfview-0.4.18.ebuild b/app-text/qpdfview/qpdfview-0.4.18.ebuild
deleted file mode 100644
index d180343f34a8..000000000000
--- a/app-text/qpdfview/qpdfview-0.4.18.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PLOCALES="ast az be bg bs ca cs da de el en_AU en_GB eo es eu fa fi fr gl he hr hu id it ja kk ko ku ky lt lv ms my nb nds oc pl pt pt_BR ro ru sk sr sv th tr ug uk uz vi zh_CN zh_TW"
-inherit plocale qmake-utils xdg
-
-DESCRIPTION="A tabbed document viewer"
-HOMEPAGE="https://launchpad.net/qpdfview"
-SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="cups +dbus djvu fitz +pdf postscript +sqlite +svg synctex"
-
-REQUIRED_USE="?? ( fitz pdf )"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-RDEPEND="
-	cups? ( net-print/cups )
-	djvu? ( app-text/djvu )
-	fitz? ( >=app-text/mupdf-1.7:= )
-	postscript? ( app-text/libspectre )
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtprintsupport:5[cups?]
-	dev-qt/qtwidgets:5
-	dbus? ( dev-qt/qtdbus:5 )
-	pdf? ( >=app-text/poppler-0.35[qt5]
-		dev-qt/qtxml:5 )
-	sqlite? ( dev-qt/qtsql:5[sqlite] )
-	svg? ( dev-qt/qtsvg:5 )
-	!svg? ( virtual/freedesktop-icon-theme )
-	synctex? ( app-text/texlive-core )"
-DEPEND="${RDEPEND}"
-
-DOCS=( CHANGES CONTRIBUTORS README TODO )
-
-PATCHES=( "${FILESDIR}/${P}-qt-5.15.patch" ) # bug 726064
-
-src_prepare() {
-	default
-
-	local mylrelease="$(qt5_get_bindir)"/lrelease
-	prepare_locale() {
-		"${mylrelease}" "translations/${PN}_${1}.ts" || die "preparing ${1} locale failed"
-	}
-
-	rm_help() {
-		rm -f "help/help_${1}.html" || die "removing ${1} help file failed"
-	}
-
-	plocale_find_changes translations ${PN}_ .ts
-	plocale_for_each_locale prepare_locale
-	plocale_for_each_disabled_locale rm_help
-
-	# adapt for prefix
-	sed -i -e "s:/usr:${EPREFIX}/usr:g" qpdfview.pri || die
-}
-
-src_configure() {
-	local myconfig=() i=
-	for i in cups dbus djvu pdf svg synctex; do
-		use ${i} || myconfig+=(without_${i})
-	done
-	use fitz && myconfig+=(with_fitz)
-	use postscript || myconfig+=(without_ps)
-	use sqlite || myconfig+=(without_sql)
-
-	local myqmakeargs=(
-		qpdfview.pro
-		CONFIG+="${myconfig[*]}"
-		PLUGIN_INSTALL_PATH="${EPREFIX}/usr/$(get_libdir)/${PN}"
-	)
-	eqmake5 "${myqmakeargs[@]}"
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-	einstalldocs
-}
diff --git a/app-text/qpdfview/qpdfview-0.4.18_p1.ebuild b/app-text/qpdfview/qpdfview-0.5.ebuild
index f0eb22d4b6a3..23bf1eb4974d 100644
--- a/app-text/qpdfview/qpdfview-0.4.18_p1.ebuild
+++ b/app-text/qpdfview/qpdfview-0.5.ebuild
@@ -1,15 +1,14 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PLOCALES="ast az be bg bs ca cs da de el en_AU en_GB eo es eu fa fi fr gl he hr hu id it ja kk ko ku ky lt lv ms my nb nds oc pl pt pt_BR ro ru sk sr sv th tr ug uk uz vi zh_CN zh_TW"
+PLOCALES="af ast az be ber bg bs ca cs da de el en_AU en_GB eo es eu fa fi fr gl he hi hr hu id it ja kk ko ku ky lt lv ms my nb nds oc pl pt pt_BR ro ru rue sk sr sv th tr ug uk uz vi zgh zh_CN zh_TW"
 inherit plocale qmake-utils xdg
 
 DESCRIPTION="A tabbed document viewer"
 HOMEPAGE="https://launchpad.net/qpdfview"
-# bzr revision 2107
-SRC_URI="https://dev.gentoo.org/~grozin/${P}.tar.bz2"
+SRC_URI="https://launchpad.net/${PN}/trunk/${PV}.0/+download/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
@@ -43,11 +42,15 @@ DEPEND="${RDEPEND}"
 
 DOCS=( CHANGES CONTRIBUTORS README TODO )
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.5-poppler-23.08.0-cxx17.patch
+)
+
 src_prepare() {
 	default
 
 	local mylrelease="$(qt5_get_bindir)"/lrelease
-	prepare_locale() {
+	p_locale() {
 		"${mylrelease}" "translations/${PN}_${1}.ts" || die "preparing ${1} locale failed"
 	}
 
@@ -56,7 +59,7 @@ src_prepare() {
 	}
 
 	plocale_find_changes translations ${PN}_ .ts
-	plocale_for_each_locale prepare_locale
+	plocale_for_each_locale p_locale
 	plocale_for_each_disabled_locale rm_help
 
 	# adapt for prefix
diff --git a/app-text/qpdfview/qpdfview-0.4.18_p20211227.ebuild b/app-text/qpdfview/qpdfview-0.5_p1.ebuild
index e555d9864d04..caf4f6353347 100644
--- a/app-text/qpdfview/qpdfview-0.4.18_p20211227.ebuild
+++ b/app-text/qpdfview/qpdfview-0.5_p1.ebuild
@@ -1,15 +1,15 @@
-# 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
 
-PLOCALES="ast az be ber bg bs ca cs da de el en_AU en_GB eo es eu fa fi fr gl he hi hr hu id it ja kk ko ku ky lt lv ms my nb nds oc pl pt pt_BR ro ru sk sr sv th tr ug uk uz vi zgh zh_CN zh_TW"
+PLOCALES="af ast az be ber bg bs ca cs da de el en_AU en_GB eo es eu fa fi fr gl he hi hr hu id it ja kk ko ku ky lt lv ms my nb nds oc pl pt pt_BR ro ru rue sk sr sv th tr ug uk uz vi zgh zh_CN zh_TW"
 inherit plocale qmake-utils xdg
 
 DESCRIPTION="A tabbed document viewer"
 HOMEPAGE="https://launchpad.net/qpdfview"
-# bzr revision 2137
-SRC_URI="https://dev.gentoo.org/~grozin/${P}.tar.bz2"
+# revision 2161
+SRC_URI="https://dev.gentoo.org/~grozin/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
@@ -43,11 +43,15 @@ DEPEND="${RDEPEND}"
 
 DOCS=( CHANGES CONTRIBUTORS README TODO )
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.5-poppler-23.08.0-cxx17.patch
+)
+
 src_prepare() {
 	default
 
 	local mylrelease="$(qt5_get_bindir)"/lrelease
-	prepare_locale() {
+	p_locale() {
 		"${mylrelease}" "translations/${PN}_${1}.ts" || die "preparing ${1} locale failed"
 	}
 
@@ -56,7 +60,7 @@ src_prepare() {
 	}
 
 	plocale_find_changes translations ${PN}_ .ts
-	plocale_for_each_locale prepare_locale
+	plocale_for_each_locale p_locale
 	plocale_for_each_disabled_locale rm_help
 
 	# adapt for prefix