gentoo resync : 08.01.2021

4 files changed, 7 insertions, 97 deletions

diff --git a/app-office/texstudio/Manifest b/app-office/texstudio/Manifest
index 74108907c62a..ad7fdb94834f 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-3.0.0_pre20200601.tar.gz 35982392 BLAKE2B 1eed56fe21aac141df41f251621a902a20153b0eaafc995b56fa8c3fbcc213685710e45202fbb90a071a0efac591c86588d4c5fe3727e603e0a58e149ed6864e SHA512 d922f576055fc345e7e0125074c6dbb473c6fb95aa06ae1ffc15f3b89fbdc7c5a44a13d4a32b770bef10c7bae7211a4bf3a269996eda1b3a0c8fd1ed8f3c4bb1
-DIST texstudio-3.0.1-r1.tar.gz 36144393 BLAKE2B 63dad681a56ce60a90c44ab71930e8a14a7f335eb7d40f906aab2f5ca10375f768bafc3ae9023574b04c2b5196bc495ef47fb5fc9d4f6438da0a747ebd857972 SHA512 aba57d9f45af259131d3ab47463a30bec24d8fa5b30a9c574308b8a7d6c1117acb1553df20ebe5855281510f82c4d55700a0db0dffeee1b69f2afec234e18b93
-DIST texstudio-3.0.2.tar.gz 83190497 BLAKE2B b04c035e969c27a9b527a7ab62c3384120c14f4d6178da977a5a3484e0709f63337fdebc23f0231d94376ee0222e7c5724fff74c118d311388af73e1470518f7 SHA512 68581f21487f3fb3d27b64650901396e4abdb0df9edbf8796efd5b8b31cc26b5fce123a09f704bafd7994f129c392f96e5a0af46fb637a64b5230251e1517f0d
+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.1-r1.ebuild 1664 BLAKE2B 83065785ff8ec7f81ed53ac411d36d8a281961a13daa2448598d0c84452097f0d5aea7506705a06d61cc5c76b5152b3f6f3aadb56cdf1ab27fb21545080b4dee SHA512 8376e6faf386a9031b90a83452dea1261593e6c6640464aa256c7effa47df5fe55bf90a6067d16575f712d7f50e6d9fc465a79c9db4530970400dd4bc2f693c2
-EBUILD texstudio-3.0.2.ebuild 1612 BLAKE2B 78a421505bcae67992d464364435507d024918d7b7b8e438bada252fab43302fbbdafa6192a965d8a244f17b21b360911051a3a254db9c5db59febea11f987a2 SHA512 82e71cd7fd415f6923d4b0b4bd9eaccb11868c3091fc0a9b0463e7089f4a99410df5a17c844fd9359793abbddf885e56a45215bc7f1dc73b15c11aaffbd57fe2
-EBUILD texstudio-9999.ebuild 1884 BLAKE2B 381765c70b04066aa53d50c402ace018ec79adb50e9af9a198ad867167b5f2f131f4aaa4c836f6a4267da96fcc2d0b75dfa6a8f2707d74a896af25e20aea82e7 SHA512 90966c2bb60be15fab68db843edc48b89edb0db76e0fd7c3bac9fd853e3097c2938511472c4fb84f749d36fbddc5d91b3562ed7fcbe8459fbe11570a4b7679e9
+EBUILD texstudio-3.0.4.ebuild 1612 BLAKE2B 31811c80c6e70dd1cfeccb4059eb7007e3cce862dafa91276054d956177541b505a252f4e37aec6555fd0a0852c67721cd11de1aa34c6bafdfc7c469d78e10b9 SHA512 fd055149cbe95c4550213ccd3f51ce22641b86f467f3a35db50b09ee28eaddb8d0d0220942bdd421dc851428af7cf478a61daef45d3a8d5e08d6294c0cb50f60
+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.1-r1.ebuild b/app-office/texstudio/texstudio-3.0.1-r1.ebuild
deleted file mode 100644
index 4b285ee4a888..000000000000
--- a/app-office/texstudio/texstudio-3.0.1-r1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop prefix qmake-utils xdg
-
-# NOTE: Drop -r1 from SRC_URI on bump!
-# #740220
-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}-r1.tar.gz"
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-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"
-
-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
-}
diff --git a/app-office/texstudio/texstudio-3.0.2.ebuild b/app-office/texstudio/texstudio-3.0.4.ebuild
index 2ad5ecb8a4df..fb40a058bc22 100644
--- a/app-office/texstudio/texstudio-3.0.2.ebuild
+++ b/app-office/texstudio/texstudio-3.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/app-office/texstudio/texstudio-9999.ebuild b/app-office/texstudio/texstudio-9999.ebuild
index 86d41dcfcdff..5088db2d1687 100644
--- a/app-office/texstudio/texstudio-9999.ebuild
+++ b/app-office/texstudio/texstudio-9999.ebuild
@@ -1,16 +1,15 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit prefix qmake-utils xdg-utils desktop git-r3
+inherit desktop git-r3 prefix qmake-utils xdg
 
 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"
 EGIT_REPO_URI="https://github.com/texstudio-org/texstudio.git"
+S="${WORKDIR}/${PN}-${MY_PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -45,8 +44,6 @@ DEPEND="${COMMON_DEPEND}"
 
 BDEPEND="virtual/pkgconfig"
 
-S=${WORKDIR}/${PN}-${MY_PV}
-
 src_prepare() {
 	default
 	# TODO: find hunspell quazip utilities/poppler-data qtsingleapplication -delete || die
@@ -74,13 +71,3 @@ src_install() {
 	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
-}