gentoo (valentine's day) resync : 14.02.2021

3 files changed, 2 insertions, 89 deletions

diff --git a/app-office/texstudio/Manifest b/app-office/texstudio/Manifest
index ad7fdb94834f..19636def53e1 100644
--- a/app-office/texstudio/Manifest
+++ b/app-office/texstudio/Manifest
@@ -1,7 +1,5 @@
 AUX texmakerx_my.pri 439 BLAKE2B a520129f6a0630ea5032f619b425847bc58956553840dbe1c9a97d1587f9eebc4958450b264a124a8342fb839276314854af3bf41d18084deee0a49b45320904 SHA512 859bd280c5d5c319fe0c4c5af04a2ec8118babeef3b22d14a03384ab25e8d0721145b453179e1f16b989068bfe79d5831efcab545069a9cb5018382e2e8c6d8b
-DIST texstudio-3.0.0_pre20200601.tar.gz 35982392 BLAKE2B 1eed56fe21aac141df41f251621a902a20153b0eaafc995b56fa8c3fbcc213685710e45202fbb90a071a0efac591c86588d4c5fe3727e603e0a58e149ed6864e SHA512 d922f576055fc345e7e0125074c6dbb473c6fb95aa06ae1ffc15f3b89fbdc7c5a44a13d4a32b770bef10c7bae7211a4bf3a269996eda1b3a0c8fd1ed8f3c4bb1
 DIST texstudio-3.0.4.tar.gz 83191627 BLAKE2B a800b369967051a7154a1ec5d00ae735477fdbb4237e6653bf5469c5fcfa1083fa28f56e3e6bda304821084281e1bf02dfdc4738e6762072d7fb43988e029641 SHA512 094fc53cab388d2e5f9ecfc1172a6ae853c04abe746ed03afe8819be3acdf4e7cb2bdf9ce1edda43fda9396c260f2063aa05ca9aae66871505555d7da6c49beb
-EBUILD texstudio-3.0.0_pre20200601.ebuild 1761 BLAKE2B 4806704703f464d461fa388870fb6ab6c9f81140edaacb323ddbf312d41422e9e64239b84d38ddc38b1ed1a24b5c288a0d905e484600dd24f217f65276418458 SHA512 d9ddc869ea4295259c907b2124e3685353c0939b6c1c65d494d9c201a39b0f31afb5d81f18220d768284c5ce5d4eca0eca0f99690636aa166d204ee9358385b4
-EBUILD texstudio-3.0.4.ebuild 1612 BLAKE2B 31811c80c6e70dd1cfeccb4059eb7007e3cce862dafa91276054d956177541b505a252f4e37aec6555fd0a0852c67721cd11de1aa34c6bafdfc7c469d78e10b9 SHA512 fd055149cbe95c4550213ccd3f51ce22641b86f467f3a35db50b09ee28eaddb8d0d0220942bdd421dc851428af7cf478a61daef45d3a8d5e08d6294c0cb50f60
+EBUILD texstudio-3.0.4.ebuild 1610 BLAKE2B 5756d61d34c6d1d69c82a6cd4bcbafc09b512fe2c40daebd9063d45384fb0c23ae410f71b71ef73addee87f450151e2a752e660c4a3fe3709beffec09bd8ebaa SHA512 da73b60841bbf88ba2086fdb740ab9cfcf2908ea59cf91b9466a265133810a71decd5184052395dd3ef48dcd9cf4f1e2a1195e37c585cfdd0de0642b235e9bf1
 EBUILD texstudio-9999.ebuild 1643 BLAKE2B b012ec3ad6fd6fa435f0df4adbfc08e1b18d371f3dce870a24540413dbe5ed05875bd0303aaa7b3a038cd9365a535881b5a16baae938bb375461a66f1ec9faf0 SHA512 6e226db629b12310543dfbf440078a6e574aea9e319e9bae2a7a6d0d39f4f07dcd662a609e4dabfcce55efb1e507cc527ed5b737bd058426dadfeffade1b1f1e
 MISC metadata.xml 411 BLAKE2B e545d68a6bb26046f5e43df2bcc64371e5a4237ef20a83c8811675ddde9dfec1eee8f5dc6405e7005a3ea35e39e2f3bf019d92bbd4b68e5c74524c7e785a2214 SHA512 c82d3d1b0b50af84b34a1c6cc17e19ab50afd45206939abe3c96c2d8b93a69201eeef81c72e1eef56dc717ecdf1d0c67637b59bea94160188a673f233d57458b
diff --git a/app-office/texstudio/texstudio-3.0.0_pre20200601.ebuild b/app-office/texstudio/texstudio-3.0.0_pre20200601.ebuild
deleted file mode 100644
index 99ffcd05c551..000000000000
--- a/app-office/texstudio/texstudio-3.0.0_pre20200601.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit prefix qmake-utils xdg-utils desktop
-
-MY_PV="3.0.0alpha6"
-
-DESCRIPTION="Free cross-platform LaTeX editor (fork from texmakerX)"
-HOMEPAGE="https://www.texstudio.org https://github.com/texstudio-org/texstudio"
-SRC_URI="https://github.com/texstudio-org/texstudio/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE="video"
-
-COMMON_DEPEND="
-	app-text/hunspell:=
-	app-text/poppler[qt5]
-	>=dev-libs/quazip-0.7.2[qt5(+)]
-	dev-qt/designer:5
-	dev-qt/qtcore:5
-	dev-qt/qtconcurrent:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtscript:5
-	dev-qt/qtsingleapplication[qt5(+),X]
-	dev-qt/qtsvg:5
-	dev-qt/qttest:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	sys-libs/zlib
-	x11-libs/libX11
-	x11-libs/libXext
-	video? ( media-libs/phonon[qt5(+)] )"
-RDEPEND="${COMMON_DEPEND}
-	app-text/ghostscript-gpl
-	app-text/psutils
-	media-libs/netpbm
-	virtual/latex-base"
-DEPEND="${COMMON_DEPEND}"
-
-BDEPEND="virtual/pkgconfig"
-
-S=${WORKDIR}/${PN}-${MY_PV}
-
-src_prepare() {
-	default
-
-	if use video; then
-		sed "/^PHONON/s:$:true:g" -i ${PN}.pro || die
-	fi
-
-	sed \
-		-e '/qtsingleapplication.pri/d' \
-		-i ${PN}.pro || die
-
-	cp "${FILESDIR}"/texmakerx_my.pri ${PN}.pri || die
-	eprefixify ${PN}.pri
-}
-
-src_configure() {
-	eqmake5 USE_SYSTEM_HUNSPELL=1 USE_SYSTEM_QUAZIP=1
-}
-
-src_install() {
-	local i
-	for i in 16x16 22x22 32x32 48x48 64x64 128x128; do
-		newicon -s ${i} utilities/${PN}${i}.png ${PN}.png
-	done
-	emake DESTDIR="${D}" INSTALL_ROOT="${ED}" install
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/app-office/texstudio/texstudio-3.0.4.ebuild b/app-office/texstudio/texstudio-3.0.4.ebuild
index fb40a058bc22..cf2f6704d36c 100644
--- a/app-office/texstudio/texstudio-3.0.4.ebuild
+++ b/app-office/texstudio/texstudio-3.0.4.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${PN}-${MY_PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE="video"
 
 COMMON_DEPEND="