gentoo resync : 21.06.2020

4 files changed, 30 insertions, 73 deletions

diff --git a/app-editors/texworks/Manifest b/app-editors/texworks/Manifest
index dd3e3ca2fbcc..56e05d6df902 100644
--- a/app-editors/texworks/Manifest
+++ b/app-editors/texworks/Manifest
@@ -1,5 +1,4 @@
-DIST texworks-0.6.3.tar.gz 12082640 BLAKE2B db5b98f9226e0e7e109dc06d8e0a88b0e8f0dd237676ebec3be55308c720eb6dada25be061d8d5dc27949b9673e93fd65c8ddddfbe03aee4f8170471c52b37fd SHA512 389cf54441e74164fc842f2f293cdee45c6ff9fe202f262d32f3fb076de9a29813a62cd75052969293f2f784e0722215bbbf2206e75bc836a13d495bf5aed653
+AUX qt5.15-support.patch 632 BLAKE2B c2e4f3801231a08ecccde92d84b1836c62d44f2ae631f709b651519298af624d6a9a28d13ebbe03f707351c9d51bebee2a198d35b8a8e709d574a99f751521dd SHA512 8cdc834a2d0d8d843e326a825a13418c765079ec41c15f1fe5b7a3eb2c158928db594ba7d7e946dd72a936af4bf86a302dd5b042fad64d20fe033f2b64dea3e8
 DIST texworks-0.6.5.tar.gz 12140935 BLAKE2B 660606fe2e53d5f2a53e80792efbee368f5f2f402ab974761efc6e11a6f2233fd04672dcc3bf0155a070162616c1d5a9c7313825890e6fb0c6c4dc7af2c62d29 SHA512 d97bb7c3ad7bbb402be80556027ef19076dae91bb9449df2b45d54e89b492e32b8d6f109d1bda9388424af6218866d84a8c296c9bc2ef644cf2fac0d4b24939e
-EBUILD texworks-0.6.3.ebuild 1387 BLAKE2B fc8cadb7a3cc17ff450705d0925946891b75f0d574d9bed6ce50e5ccd3a739353e522035683d70d877a54511fcf16d43fc4b1c688b4860869b135b2abb3455a8 SHA512 8991744543c3f456733e10e264ef6311312309408162c5daff459c6c5f7067b1abd49b20d5f116d4718b77d10bfa04414a5098a1c6ee6a0933865a9ab88fbc91
-EBUILD texworks-0.6.5.ebuild 1387 BLAKE2B fc8cadb7a3cc17ff450705d0925946891b75f0d574d9bed6ce50e5ccd3a739353e522035683d70d877a54511fcf16d43fc4b1c688b4860869b135b2abb3455a8 SHA512 8991744543c3f456733e10e264ef6311312309408162c5daff459c6c5f7067b1abd49b20d5f116d4718b77d10bfa04414a5098a1c6ee6a0933865a9ab88fbc91
+EBUILD texworks-0.6.5.ebuild 1456 BLAKE2B 54f5dc85c7178439ec0e8f200659e48cbfdd2c254cc023fc58b8efc46698c2cfab4ba48d6c31e4814ebf1f00a7fa330578b008b04f3bf39e42020a59562ee799 SHA512 aebe4a7c79dd8bcb06ed3d7f5adb238b7bd716a95aa17c1d76cc59c83937e1e53a5103d1963cef9058c892abae0abda5201c72811d45f0c5fde545298615e982
 MISC metadata.xml 243 BLAKE2B f7576f14be2c0aa21ca2c7147133e4a4132d6559cca1519745dd2f4ea912b3856950c7645e13d2317f38c80ba93b13d47370260920241a5ab60a4eae59f2cf33 SHA512 0dc1f228861badffd9c4175af734b72435dc7c60d369a3d9ff946c5b98b3f2f49af7d433f7ec5fc2afee7015b8f75259e8debe150b1bcffa0cb66425bed10d8d
diff --git a/app-editors/texworks/files/qt5.15-support.patch b/app-editors/texworks/files/qt5.15-support.patch
new file mode 100644
index 000000000000..9c77c157e463
--- /dev/null
+++ b/app-editors/texworks/files/qt5.15-support.patch
@@ -0,0 +1,21 @@
+From a5352a3a94e3685125650b65e6197de060326cc2 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Stefan=20L=C3=B6ffler?= <st.loeffler@gmail.com>
+Date: Fri, 1 May 2020 08:05:46 +0200
+Subject: [PATCH] <QtPDF> Fix compilation with Qt 5.15
+
+---
+ modules/QtPDF/src/PDFBackend.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/modules/QtPDF/src/PDFBackend.cpp b/modules/QtPDF/src/PDFBackend.cpp
+index 0305d87a..500d20aa 100644
+--- a/modules/QtPDF/src/PDFBackend.cpp
++++ b/modules/QtPDF/src/PDFBackend.cpp
+@@ -14,6 +14,7 @@
+ 
+ #include <PDFBackend.h>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QApplication>
+ 
+ namespace QtPDF {
diff --git a/app-editors/texworks/texworks-0.6.3.ebuild b/app-editors/texworks/texworks-0.6.3.ebuild
deleted file mode 100644
index d9fa4f242770..000000000000
--- a/app-editors/texworks/texworks-0.6.3.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{3_6,3_7} )
-
-inherit python-single-r1 cmake-utils virtualx xdg-utils
-
-DESCRIPTION="A simple interface for working with TeX documents"
-HOMEPAGE="http://tug.org/texworks/"
-SRC_URI="https://github.com/TeXworks/texworks/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="lua python"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="app-text/hunspell:=
-	app-text/poppler[qt5]
-	dev-qt/designer:5
-	dev-qt/qtcore:5
-	dev-qt/qtconcurrent:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtscript:5[scripttools]
-	lua? ( dev-lang/lua:0 )
-	python? ( ${PYTHON_DEPS} ) "
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="virtual/pkgconfig"
-
-S=${WORKDIR}/${PN}-release-${PV}
-
-RESTRICT="!test? ( test )"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-Wno-dev
-		-DPREFER_BUNDLED_SYNCTEX=ON
-		-DWITH_LUA=$(usex lua ON OFF)
-		-DWITH_PYTHON=$(usex python ON OFF)
-		-DTeXworks_PLUGIN_DIR="/usr/$(get_libdir)/texworks"
-		-DTeXworks_DOCS_DIR="/share/doc/${PF}"
-		-DQTPDF_VIEWER=ON
-		-DBUILD_SHARED_LIBS=ON
-		-DBUILD_SHARED_PLUGINS=ON
-	)
-	cmake-utils_src_configure
-}
-
-src_test() {
-	virtx default_src_test
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/app-editors/texworks/texworks-0.6.5.ebuild b/app-editors/texworks/texworks-0.6.5.ebuild
index d9fa4f242770..f9228f2ac586 100644
--- a/app-editors/texworks/texworks-0.6.5.ebuild
+++ b/app-editors/texworks/texworks-0.6.5.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python{3_6,3_7} )
 
-inherit python-single-r1 cmake-utils virtualx xdg-utils
+inherit python-single-r1 cmake virtualx xdg-utils
 
 DESCRIPTION="A simple interface for working with TeX documents"
 HOMEPAGE="http://tug.org/texworks/"
@@ -40,6 +40,11 @@ pkg_setup() {
 	python-single-r1_pkg_setup
 }
 
+src_prepare() {
+	cmake_src_prepare
+	eapply "${FILESDIR}"/qt5.15-support.patch
+}
+
 src_configure() {
 	local mycmakeargs=(
 		-Wno-dev
@@ -52,7 +57,7 @@ src_configure() {
 		-DBUILD_SHARED_LIBS=ON
 		-DBUILD_SHARED_PLUGINS=ON
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_test() {