gentoo resync : 29.01.2021

3 files changed, 4 insertions, 79 deletions

diff --git a/app-editors/texworks/Manifest b/app-editors/texworks/Manifest
index d73f7fe3ffbc..0b990025f418 100644
--- a/app-editors/texworks/Manifest
+++ b/app-editors/texworks/Manifest
@@ -1,6 +1,5 @@
 AUX qt5.15-support.patch 632 BLAKE2B c2e4f3801231a08ecccde92d84b1836c62d44f2ae631f709b651519298af624d6a9a28d13ebbe03f707351c9d51bebee2a198d35b8a8e709d574a99f751521dd SHA512 8cdc834a2d0d8d843e326a825a13418c765079ec41c15f1fe5b7a3eb2c158928db594ba7d7e946dd72a936af4bf86a302dd5b042fad64d20fe033f2b64dea3e8
 AUX texworks-0.6.5-cmake_lua_version.patch 219 BLAKE2B c09494099363fa26e4110c23b0e1c06caf44cb0040578bfa33457741fdc8fe4698a2f4000a6dc6da4cd19dca6039c251cd1b875a27dc41abfea03b5cb79c341a SHA512 66ccbbcf313596c674833b36f222c8aa8bde541dfd58a706814aef3eaeec50247bec954a4f7137dfda31df9cd7b15163200592acb8433ed252d961ebf2b9ea32
 DIST texworks-0.6.5.tar.gz 12140935 BLAKE2B 660606fe2e53d5f2a53e80792efbee368f5f2f402ab974761efc6e11a6f2233fd04672dcc3bf0155a070162616c1d5a9c7313825890e6fb0c6c4dc7af2c62d29 SHA512 d97bb7c3ad7bbb402be80556027ef19076dae91bb9449df2b45d54e89b492e32b8d6f109d1bda9388424af6218866d84a8c296c9bc2ef644cf2fac0d4b24939e
-EBUILD texworks-0.6.5-r100.ebuild 1701 BLAKE2B 4c3305ea00765573b36bf9cf9a57274aae4512e495eb2ad97c7c4c6afeac2f7fbb24d81e93a624307b8e336e5bac236a761e5920211bbbd8eda6bfd5650c56f3 SHA512 34054fbfa2020d29983f6c0ff05ebf190e428ca41df3391f726802a0e6fb04f50d59301beead51ec219abac90867eced3e17d5b9e5c78361d048830e88a0ddce
-EBUILD texworks-0.6.5.ebuild 1481 BLAKE2B 50e5b2f73baf61f5e65fcfc12a2358d288d71884c0e5341a0bd95a3bd0159b506bb47be1654f5bd47fbee02e10cfd50f1ad65b272f32eadb87e7c5bb20e33ec3 SHA512 2beea7a02dd41c53e4a592dc9aac000abc1f6a0bc3cceeaf1ebe088dfcda26b8ee26719ff5290372329a3e5c168ebf27156ba7dfb8298e27c41001fd3b1faf3c
+EBUILD texworks-0.6.5-r100.ebuild 1703 BLAKE2B a63771ce6a21cbed33a625e12518ac732eec3799835724bfe817d68ce9e8774bf7764c98f13660571a86a9ca5380bcfdec285ff855eef9da0f73632c9426eef3 SHA512 ec249821dd61fea92fb386dd28510361adebadcb526685ed42ff27d8dd1897f5f6e402ef3265572a709a2657a7638996455695ebf8bb46601a0600cba0808b69
 MISC metadata.xml 243 BLAKE2B f7576f14be2c0aa21ca2c7147133e4a4132d6559cca1519745dd2f4ea912b3856950c7645e13d2317f38c80ba93b13d47370260920241a5ab60a4eae59f2cf33 SHA512 0dc1f228861badffd9c4175af734b72435dc7c60d369a3d9ff946c5b98b3f2f49af7d433f7ec5fc2afee7015b8f75259e8debe150b1bcffa0cb66425bed10d8d
diff --git a/app-editors/texworks/texworks-0.6.5-r100.ebuild b/app-editors/texworks/texworks-0.6.5-r100.ebuild
index f5e982753633..dc9044f0eba6 100644
--- a/app-editors/texworks/texworks-0.6.5-r100.ebuild
+++ b/app-editors/texworks/texworks-0.6.5-r100.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 LUA_COMPAT=( lua5-{1..3} )
-PYTHON_COMPAT=( python{3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
 
 inherit lua-single python-single-r1 cmake virtualx xdg-utils
 
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/TeXworks/texworks/archive/release-${PV}.tar.gz -> ${
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="lua python"
 REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
 	python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/app-editors/texworks/texworks-0.6.5.ebuild b/app-editors/texworks/texworks-0.6.5.ebuild
deleted file mode 100644
index 49609fec4e86..000000000000
--- a/app-editors/texworks/texworks-0.6.5.ebuild
+++ /dev/null
@@ -1,74 +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 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="dev-qt/linguist-tools:5
-	${RDEPEND}"
-
-BDEPEND="virtual/pkgconfig"
-
-S=${WORKDIR}/${PN}-release-${PV}
-
-RESTRICT="!test? ( test )"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-	eapply "${FILESDIR}"/qt5.15-support.patch
-}
-
-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_src_configure
-}
-
-src_test() {
-	virtx default_src_test
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}