gentoo auto-resync : 03:01:2025 - 06:31:16

4 files changed, 22 insertions, 140 deletions

diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index c785bd874d05..fe8ee38de170 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/qpdfview/Manifest b/app-text/qpdfview/Manifest
index 9174b691959d..915656797cf5 100644
--- a/app-text/qpdfview/Manifest
+++ b/app-text/qpdfview/Manifest
@@ -1,8 +1,6 @@
 AUX qpdfview-0.5-poppler-23.08.0-cxx17.patch 241 BLAKE2B 7b9d0bc4de0df643698b7599b9200a1ee531ccc8b6bba7190143ba876aa38f46f5c168ea3ca57bd2fda96d4e806e81ba0ca308215509cb2f03304627ded01204 SHA512 25bffb3478d0b1399359ba3ce2047640132a4a9d8e5311178087ca083a8db20a9c81bd12e8ba62dc8b3d9a018ba165c22cd12534f80680b633788f11dfd2f5ac
 DIST qpdfview-0.5.tar.gz 925408 BLAKE2B 8ce8ff82893c90012ea1b35a582e87783da87e6eba3d4a10e78fe7810c269908ed1541cf40b1eb17fc474254131cebbc4832a3f46a2016262c485d48e222791b SHA512 1b6b479bb42f4568c21b5f6cb0c552c4323739ba9fe46cea80cc199f48b0b49a278e0a2fb0d21f83bafb467e43dd37352b99ef41795d140220bb82d704e03926
-DIST qpdfview-0.5_p1.tar.gz 922833 BLAKE2B 99d5e818b7c5dd5e583072043be6a282da64277f695cf4c0d38ad339dbdbcb100dcbbf161657f3622a324f691275beb6338c07fe2bbd62e1db896ec759ef162c SHA512 65720f6642b23a23b2d05b38334ce95424e69985b69223d978d4fd59b565d59a37eb43138c2f17fd37d8139b4cc223d5ab32dd18c62f2524792f42b44ba52189
 DIST qpdfview-0.5_p2.tar.gz 928017 BLAKE2B adffb6b0007787231bbe89f9c96fdf089141b135838f81895807dd8208e3046f8eee751a7a6668a26ea9f54f8a2192d50b0afabd6fa76155f916d8ea1f10cbc0 SHA512 19bab7d39c454c3c49db18c5161b73956c055c07de7a44448f9f8bbf966c26a339343e12e99ed6af9b91bba15fbb26074a745c318abbc63ef85f5ab177e7140f
 EBUILD qpdfview-0.5.ebuild 2285 BLAKE2B 65ccbdefd0a552a39ad0c02c316448891811e88a0a273bfc050eec88ca33d8bcb6ee642f275ef127be0cbcb4c45d8d7d4589393939aec349af6486e2526d694a SHA512 b1501975ab013b3e81dde73616bf24c0146306a28c07397ddb114eb58ef8af1eebfa0a65da8440e68711ae4537665a8688da6ba2f76b37c67dd437eacfefd4f3
-EBUILD qpdfview-0.5_p1.ebuild 2282 BLAKE2B 7524f2951aea694631f447089104a49fe2ccbea635ffa5af0dfe5bddb2ead36b6f70c80ba47f7b1f5f13aabf9230d7c8db2d062b260bcca00b6419071ef47f4e SHA512 1afa0227392e703575d2dad9da1eb9641956b8ec05110b9b6410f6b344fb24eb808fec04724dca8fed1d217cfa950b639d8fc4bbe99183c18def2412134b99ea
-EBUILD qpdfview-0.5_p2.ebuild 2869 BLAKE2B b7a9eb2f986c9549cde0da2971e324a8bf938d76807197a8830079b58ca98f810b421cdd9e138b7f71388ecc07299c218107a63bd61abc285da1756c9dc51b65 SHA512 fa01f00c32f9b582ceaee59e94e63f4314f28ef6e0c9b214c2aa56f4c8f63a5fdea194bd7e9af59181e16a53ba09bbe024434b6c5f57098660241149669b5d4d
+EBUILD qpdfview-0.5_p2-r1.ebuild 2387 BLAKE2B 97245270ec7b53ab0cab06e9a81571d6481f724350ebf4b0cc8b7aa41c207a4607f27eef3fc8a455098d3c078e56fbb0611b05e516c2711510b74f1f45199d18 SHA512 c1808c99a376561ca3485ff0c82bbeae978987cce0a7a96f0a6a97a19dcdbbc411bf52a53086f50ae99b04ea2c195a1e48c72d40dd3a500bc281edf14555adf8
 MISC metadata.xml 534 BLAKE2B b4bf95f57c23a2784439269f4409a8d86d31744014195969d3a6d714af8cd2c1342e628756de638116aa31181a469d845ef41faa4aaa9588e11a70ee59d642e6 SHA512 b2e39acac6fb9e7c2922ba7701d37549395120a34899a18dcc47f7d59ace8eda4dac5e5b6522f4c1913a5116ecc027fcc8980b59c6294316d7155dd7c3ec59a9
diff --git a/app-text/qpdfview/qpdfview-0.5_p1.ebuild b/app-text/qpdfview/qpdfview-0.5_p2-r1.ebuild
index caf4f6353347..15fb7ab96e20 100644
--- a/app-text/qpdfview/qpdfview-0.5_p1.ebuild
+++ b/app-text/qpdfview/qpdfview-0.5_p2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -8,8 +8,8 @@ inherit plocale qmake-utils xdg
 
 DESCRIPTION="A tabbed document viewer"
 HOMEPAGE="https://launchpad.net/qpdfview"
-# revision 2161
-SRC_URI="https://dev.gentoo.org/~grozin/${P}.tar.gz"
+REVISION=2162
+SRC_URI="https://bazaar.launchpad.net/~adamreichold/${PN}/trunk/tarball/${REVISION} -> ${PN}-${PV}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
@@ -19,7 +19,7 @@ IUSE="cups +dbus djvu fitz +pdf postscript +sqlite +svg synctex"
 REQUIRED_USE="?? ( fitz pdf )"
 
 BDEPEND="
-	dev-qt/linguist-tools:5
+	dev-qt/qttools:6[linguist]
 	virtual/pkgconfig
 "
 RDEPEND="
@@ -27,16 +27,14 @@ RDEPEND="
 	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 )
+	dev-qt/qtbase:6[gui,widgets,concurrent]
+	dbus? ( dev-qt/qttools:6[qdbus] )
+	pdf? (
+		app-text/poppler[qt6]
+		dev-qt/qtbase:6[xml]
+	)
+	sqlite? ( dev-qt/qtbase:6[sql,sqlite] )
+	svg? ( dev-qt/qtsvg:6 )
 	!svg? ( virtual/freedesktop-icon-theme )
 	synctex? ( app-text/texlive-core )"
 DEPEND="${RDEPEND}"
@@ -47,10 +45,16 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-0.5-poppler-23.08.0-cxx17.patch
 )
 
+src_unpack() {
+	unpack ${A}
+	mv '~adamreichold'/${PN}/trunk ${PN}-${PV} || die "mv trunk failed"
+}
+
 src_prepare() {
 	default
 
-	local mylrelease="$(qt5_get_bindir)"/lrelease
+	local mylrelease="$(qt6_get_bindir)"/lrelease
+
 	p_locale() {
 		"${mylrelease}" "translations/${PN}_${1}.ts" || die "preparing ${1} locale failed"
 	}
@@ -81,7 +85,8 @@ src_configure() {
 		CONFIG+="${myconfig[*]}"
 		PLUGIN_INSTALL_PATH="${EPREFIX}/usr/$(get_libdir)/${PN}"
 	)
-	eqmake5 "${myqmakeargs[@]}"
+
+	eqmake6 "${myqmakeargs[@]}"
 }
 
 src_install() {
diff --git a/app-text/qpdfview/qpdfview-0.5_p2.ebuild b/app-text/qpdfview/qpdfview-0.5_p2.ebuild
deleted file mode 100644
index f94ce1e814e5..000000000000
--- a/app-text/qpdfview/qpdfview-0.5_p2.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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"
-REVISION=2162
-SRC_URI="https://bazaar.launchpad.net/~adamreichold/${PN}/trunk/tarball/${REVISION} -> ${PN}-${PV}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
-IUSE="cups +dbus djvu fitz +pdf postscript +qt6 +sqlite +svg synctex"
-
-REQUIRED_USE="?? ( fitz pdf )"
-
-BDEPEND="
-	qt6? ( dev-qt/qttools:6[linguist] )
-	!qt6? ( 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 )
-	qt6? (
-		dev-qt/qtbase:6[gui,widgets,concurrent]
-		dbus? ( dev-qt/qttools:6[qdbus] )
-		pdf? (
-			app-text/poppler[qt6]
-			dev-qt/qtbase:6[xml]
-		)
-		sqlite? ( dev-qt/qtbase:6[sql,sqlite] )
-		svg? ( dev-qt/qtsvg:6 )
-	)
-	!qt6? (
-		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[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}"/${PN}-0.5-poppler-23.08.0-cxx17.patch
-)
-
-src_unpack() {
-	unpack ${A}
-	mv '~adamreichold'/${PN}/trunk ${PN}-${PV} || die "mv trunk failed"
-}
-
-src_prepare() {
-	default
-
-	local mylrelease
-	if use qt6; then
-		mylrelease="$(qt6_get_bindir)"/lrelease
-	else
-		mylrelease="$(qt5_get_bindir)"/lrelease
-	fi
-
-	p_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 p_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}"
-	)
-
-	if use qt6; then
-		eqmake6 "${myqmakeargs[@]}"
-	else
-		eqmake5 "${myqmakeargs[@]}"
-	fi
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-	einstalldocs
-}