gentoo resync : 02.09.2020

3 files changed, 4 insertions, 93 deletions

diff --git a/app-office/texstudio/Manifest b/app-office/texstudio/Manifest
index 0bf1b00316b9..266de1e8ba38 100644
--- a/app-office/texstudio/Manifest
+++ b/app-office/texstudio/Manifest
@@ -1,9 +1,7 @@
 AUX texmakerx_my.pri 439 BLAKE2B a520129f6a0630ea5032f619b425847bc58956553840dbe1c9a97d1587f9eebc4958450b264a124a8342fb839276314854af3bf41d18084deee0a49b45320904 SHA512 859bd280c5d5c319fe0c4c5af04a2ec8118babeef3b22d14a03384ab25e8d0721145b453179e1f16b989068bfe79d5831efcab545069a9cb5018382e2e8c6d8b
-DIST texstudio-2.12.16.tar.gz 34528802 BLAKE2B acf13d8bcd9a2017f19ab4484f6eab3f41868bcbbe364d869466d971b10f602652145be4082f1cef6a6d3be91c51d7bfa35e992b00cca0748f2178ddf36a263c SHA512 0c17fda78e0cd491d2869ccb1a164ae2348281a39f9883d813ceb2ed6a0287c4cf9e784cafb9c0a12b8839d7afc8897f8f74acffd87a5dfcb50d3b344f33ad28
-DIST texstudio-2.12.22.tar.gz 35965795 BLAKE2B 28d78e4c429d306e86abf54701395bcc6457c51f3264094f9d5737082161bf157d248f7913bda4eec8319632c4b2c38e8a3d4916c902cc3b86cd91b64c0238d9 SHA512 c589285d1fba00812583a3d58602a99e044eb4bcf6a84b939d00ad7fe4ba8f15788031361fc9b4cb8df19f8098911c437d1de5459c1736fa40888b88d13b10d1
 DIST texstudio-3.0.0_pre20200601.tar.gz 35982392 BLAKE2B 1eed56fe21aac141df41f251621a902a20153b0eaafc995b56fa8c3fbcc213685710e45202fbb90a071a0efac591c86588d4c5fe3727e603e0a58e149ed6864e SHA512 d922f576055fc345e7e0125074c6dbb473c6fb95aa06ae1ffc15f3b89fbdc7c5a44a13d4a32b770bef10c7bae7211a4bf3a269996eda1b3a0c8fd1ed8f3c4bb1
-EBUILD texstudio-2.12.16.ebuild 1846 BLAKE2B fbdd57c5d8193cd0ca80acd88e44fa1b2ec98b0d31fb10e049f81b3b13fc9a14ad5cad140f6a15e7a3c8abb729592433fb47dd9f0410cfad10ce1b53ef41b7f6 SHA512 58dafa200d68e6253c368f28db95c2ec4b1caedd2e8830a8e3c12e4c2c71619365671732c33fdce1d7c2c24cbd16a8fa7958222b4d5c7438a29b1d02c1a2e35d
-EBUILD texstudio-2.12.22.ebuild 1846 BLAKE2B fbdd57c5d8193cd0ca80acd88e44fa1b2ec98b0d31fb10e049f81b3b13fc9a14ad5cad140f6a15e7a3c8abb729592433fb47dd9f0410cfad10ce1b53ef41b7f6 SHA512 58dafa200d68e6253c368f28db95c2ec4b1caedd2e8830a8e3c12e4c2c71619365671732c33fdce1d7c2c24cbd16a8fa7958222b4d5c7438a29b1d02c1a2e35d
+DIST texstudio-3.0.1.tar.gz 35982392 BLAKE2B 1eed56fe21aac141df41f251621a902a20153b0eaafc995b56fa8c3fbcc213685710e45202fbb90a071a0efac591c86588d4c5fe3727e603e0a58e149ed6864e SHA512 d922f576055fc345e7e0125074c6dbb473c6fb95aa06ae1ffc15f3b89fbdc7c5a44a13d4a32b770bef10c7bae7211a4bf3a269996eda1b3a0c8fd1ed8f3c4bb1
 EBUILD texstudio-3.0.0_pre20200601.ebuild 1761 BLAKE2B 4806704703f464d461fa388870fb6ab6c9f81140edaacb323ddbf312d41422e9e64239b84d38ddc38b1ed1a24b5c288a0d905e484600dd24f217f65276418458 SHA512 d9ddc869ea4295259c907b2124e3685353c0939b6c1c65d494d9c201a39b0f31afb5d81f18220d768284c5ce5d4eca0eca0f99690636aa166d204ee9358385b4
+EBUILD texstudio-3.0.1.ebuild 1763 BLAKE2B 07467ce7354ec27afa459d9af5eb0a66dc5be2a5baedfe9c7c2d8ce08b0a6debc566bff74b5e08fc4ffd721d8be18f110b26b3e09947cf5ed0f6555b8115be7a SHA512 b1d4f77572331862f6edb6657ff17892769aa030e937727c13e9789c1087e87c3a0a483644bc5201b4a11aaba6e0a4b88d83214c75e3d40473c4f16fac5aff5b
 EBUILD texstudio-9999.ebuild 1884 BLAKE2B 381765c70b04066aa53d50c402ace018ec79adb50e9af9a198ad867167b5f2f131f4aaa4c836f6a4267da96fcc2d0b75dfa6a8f2707d74a896af25e20aea82e7 SHA512 90966c2bb60be15fab68db843edc48b89edb0db76e0fd7c3bac9fd853e3097c2938511472c4fb84f749d36fbddc5d91b3562ed7fcbe8459fbe11570a4b7679e9
 MISC metadata.xml 411 BLAKE2B e545d68a6bb26046f5e43df2bcc64371e5a4237ef20a83c8811675ddde9dfec1eee8f5dc6405e7005a3ea35e39e2f3bf019d92bbd4b68e5c74524c7e785a2214 SHA512 c82d3d1b0b50af84b34a1c6cc17e19ab50afd45206939abe3c96c2d8b93a69201eeef81c72e1eef56dc717ecdf1d0c67637b59bea94160188a673f233d57458b
diff --git a/app-office/texstudio/texstudio-2.12.22.ebuild b/app-office/texstudio/texstudio-2.12.22.ebuild
deleted file mode 100644
index 860d5319a1c3..000000000000
--- a/app-office/texstudio/texstudio-2.12.22.ebuild
+++ /dev/null
@@ -1,86 +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="${PV/_/}"
-
-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
-	# TODO: find hunspell quazip utilities/poppler-data qtsingleapplication -delete || die
-
-	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-2.12.16.ebuild b/app-office/texstudio/texstudio-3.0.1.ebuild
index 860d5319a1c3..549dc6356a4c 100644
--- a/app-office/texstudio/texstudio-2.12.16.ebuild
+++ b/app-office/texstudio/texstudio-3.0.1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 inherit prefix qmake-utils xdg-utils desktop
 
-MY_PV="${PV/_/}"
+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"
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/texstudio-org/texstudio/archive/${MY_PV}.tar.gz -> $
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="video"
 
 COMMON_DEPEND="
@@ -49,7 +49,6 @@ S=${WORKDIR}/${PN}-${MY_PV}
 
 src_prepare() {
 	default
-	# TODO: find hunspell quazip utilities/poppler-data qtsingleapplication -delete || die
 
 	if use video; then
 		sed "/^PHONON/s:$:true:g" -i ${PN}.pro || die