gentoo resync : 02.09.2020

13 files changed, 33 insertions, 236 deletions

diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index f8e2e06d6acb..419f62be9a7f 100644
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
diff --git a/app-office/gnucash/Manifest b/app-office/gnucash/Manifest
index 9f04685a262c..510a6f42bcfd 100644
--- a/app-office/gnucash/Manifest
+++ b/app-office/gnucash/Manifest
@@ -7,5 +7,5 @@ DIST gnucash-4.1.tar.bz2 13994973 BLAKE2B 875ec0d9b2b6b8ec7144ad52f172f672707874
 EBUILD gnucash-3.8b-r1.ebuild 4990 BLAKE2B 7b7770b70f859016731a4e4f86ef50428b03a035d299c2fcde92fe14334725ac1d75025bc112c6878088311b4a8417552c07eb8603406fc1596738f1cc5a99eb SHA512 92d6a36a0a8bf6c498bb8e670c6bafcd24f1d18637310a6bce8afb0338073c320d28786eef703e1388c01139ea94af02f3d74f55cc1a87db4f3a6015644a1cab
 EBUILD gnucash-3.8b.ebuild 4885 BLAKE2B ccf9b8ce5d1a7bfacaf2100fec3ed8bfc866736860b05e66241758f8c9ead88ec89ba3ad5ed5227cd6ac81277bd7f9278f674faddf7dd74413ccb6995861e83c SHA512 ad13bf23ed4d1988c3eca3a10d1f7317f9fa92b0692a3e91185100f92dee9422091a0e9971626c7938c66730024fe2f4d9210c51b0442e48da4f736935f51a58
 EBUILD gnucash-4.0.ebuild 5548 BLAKE2B 6cd515f53187ac4520f152540db46e50f66010abfd58bfc60347140ab80b587abcf872a30537fd137e9bb63ab838c958f0beb7e55aced7b8be312a4a9c69bfab SHA512 a0ca0287d1a20516639856650c0cca416b8df953c8746012a529b996caaf45cc2cc771f0e5e145a68c35dcb0091951d17008bdbd62ed7c977de453261d863de5
-EBUILD gnucash-4.1.ebuild 5476 BLAKE2B d911f9b12f6aa79c4a5fc123a5f725d157b07190f76a34d9e4fa5b8c88fd24cf05c55b0aba255772326bfb678bb70b34d95304b1474c63ffb1022afed77a2021 SHA512 a3cff0bb0292ef6604560a09b844ed317928eb6d37ae21d4c0f0cbbea64062a1b4e6f3313b2e20a74afd2a99aa382e46bfc84e550c9faf4056554a506d884edf
+EBUILD gnucash-4.1.ebuild 5483 BLAKE2B 5679505056573c5fcf9e4ff0d708a5db15930a691f5fab9873b3b6bda4ccec8646230b617a60364b5d1c72837beafc154f17951ba72d311082bf508ff45b445f SHA512 e201528965806827c439330ef16c4d7f6765fe4858b708537f1875e1a0f8a9bafb2f52d88c9d83a612bc8341605a9c77c397ddc0e368b19091b7ef81671133b0
 MISC metadata.xml 562 BLAKE2B 07fb70bae76794f49e852dc2840b13b811e3e8b28cd1f504d693662e6530591d337f993248fd80868c08b2c1cb9a648c7fcf8f964e74eeef70c5815946edad64 SHA512 659ded7048ced517f06d94952df08694ae5d2775aec8bb9adaf658d5151048ec1b612d6bf54af664a44b5510406b4ed02809ee0c150159eb6c2652186589c4a2
diff --git a/app-office/gnucash/gnucash-4.1.ebuild b/app-office/gnucash/gnucash-4.1.ebuild
index 0b6edcc84098..f99092410b21 100644
--- a/app-office/gnucash/gnucash-4.1.ebuild
+++ b/app-office/gnucash/gnucash-4.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/Gnucash/${PN}/releases/download/${PV}/${P}.tar.bz2"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
 
 IUSE="aqbanking debug doc examples gnome-keyring +gui mysql nls ofx postgres
 	  python quotes -register2 smartcard sqlite test"
diff --git a/app-office/lyx/Manifest b/app-office/lyx/Manifest
index 352a8781e00f..6c6f5efef0e9 100644
--- a/app-office/lyx/Manifest
+++ b/app-office/lyx/Manifest
@@ -2,5 +2,5 @@ AUX lyx-2.3.0-python.patch 1049 BLAKE2B 94591099e6b0d52429fa1e066475283ae35ba89a
 DIST lyx-2.3.3.tar.xz 15998188 BLAKE2B 491732d1e567dfc8372a7dc7810cfc46cbe7e3b6a67637f772adddcff96225e174fe8c3db4c7f9e663cf3423da8b4bf08f67679874c9aaf556973ad46159a6cc SHA512 7b42df9da9f2906f626d568222e559bb921d003674d70c805657488180856a77143b2a3d073686116c95034e84fe8f58ee1ff8a74d47a40bd5fda7564335a0c3
 DIST lyx-2.3.5.2.tar.xz 16139804 BLAKE2B e6ea7b2fbec330bfe31b8f88e0a5cc25ff65991421f99b04e98d26945bba48a95f389e2a7e6023d4c9720d43f80136682eb40ac4be51799f01e038e4b0fad206 SHA512 90c5459ad0a77568d588e05a360482985988382927583b14914d6a23b788756e957d0237c18b9ab0681dfc2ad7aa34d21e97304e3a74d19ef047c38f692fba03
 EBUILD lyx-2.3.3.ebuild 4096 BLAKE2B 2854d008f01580d04ba6bfce00cd92eab9b69795e3d3627c8c763f545a04343525e3b37bf2f11fda31f7f0ff7a894e1edbdb1140c7abac0b9e98df0f02c177f4 SHA512 5749fdb27e9766fba637a88cc5ce6c2c7cf3207b809b2e9c336d4473ebd5fff7511714032bd6a84d985c10631ecca9d9186db0364a990a3966063da8ac5d160e
-EBUILD lyx-2.3.5.2.ebuild 4052 BLAKE2B 0925c05565172fe4c7fdce447529005dd4c5bb724af7556858f2333da2eccff75fc7a6ae0321d67b0c21b1c8ab5a89cee2607220e5339d7af8a59276fa74ff82 SHA512 bd3ae841210af4ba9352899042bb1b6bb14f419050d875ebb70733c6fa66fc40eac2a48fb65b3ef06ff8338e8ea0e8f29e1073c88cae55a4d9697997d82bddfa
+EBUILD lyx-2.3.5.2.ebuild 4051 BLAKE2B 05e87e24a0587419160612cc8e648b02281f1e2cad1dda372bc59f151ead1fd3b6344db2410dd536213088e8a8c528c0875ce79e4a33deceb27d7077aeec20e4 SHA512 a471442b92b5c7469ec0255a77bdd56f6383d2a1d92d4bd51712977ecb27f54df78730681b8debfd2facbdde6d39dd81318a0e15dd4a1f65c0cfd76a765ebf88
 MISC metadata.xml 1429 BLAKE2B a1bcde398c387c4d6f468a296144ca8d75a2dc78b170d0b94f6cd0c8896583d878bb423f039e509f40eefa634b1be96ea9211f1c4841fbd30684e32e172410f7 SHA512 79ed9557e4883159a71f9ed2a5ebdd5507924a6ed5a0f50dad3047a1d51638847f5facfe757548b6bf9fe781026ff8987cadf84498a6f6aa8e3d260e19e7284e
diff --git a/app-office/lyx/lyx-2.3.5.2.ebuild b/app-office/lyx/lyx-2.3.5.2.ebuild
index a128d6f301cc..210d1e7ccea5 100644
--- a/app-office/lyx/lyx-2.3.5.2.ebuild
+++ b/app-office/lyx/lyx-2.3.5.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="ftp://ftp.lyx.org/pub/lyx/stable/2.3.x/${MY_P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos ~x86-macos"
 IUSE="aspell cups debug docbook dia dot enchant gnumeric html +hunspell +latex monolithic-build nls rcs rtf subversion svg l10n_he"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/app-office/plan/Manifest b/app-office/plan/Manifest
index 0f459bc86584..4dac21d4f10e 100644
--- a/app-office/plan/Manifest
+++ b/app-office/plan/Manifest
@@ -1,4 +1,4 @@
-DIST plan-1.10-gentoo.tar.xz 5976 BLAKE2B 598c92a750fc0a305d7f51211f9e42eae36644de1a83175fcb86c8c30450b8fc1e7d2eabbaced62779d80b557f7f725c97395bc744171952970faa3543abba2f SHA512 60fcfe1fec1d7911a155d6737e6a808ea897ce7c4207bd2f4e95f57b1d154d8d594c6f5ecc8a959cc0d7f47f1415f86797e0c4053873775decfc048bc16048a3
+DIST plan-1.10-patches.txz 6132 BLAKE2B 617c68a012e4757f7ef039557cfe15e04706129501f044005e554a50aa9ebbe9e33e2e406ec5647060a7b67efb81b671c35eb6846d426a26c517c38b10e7eabb SHA512 c0802f12e935d7ab18d89b6c4e8ae8373ca620b8149520b8bc9d9fb8e871ad4c2b0bc0e7ca84c34e72d0a25cb406af51fac1fc1907844867f4fd7fdff8a06d54
 DIST plan-1.10.tar.gz 460150 BLAKE2B a44c79537ff6aae8fa5c65c8b6514f0f37d1417522f4e54823ad14cf6306bb88223377de13f22c365516e2861fa561902e31245c9729786f425140bed30b320d SHA512 fde17ef17f25412cbe69427364f4130564f46a940859066c25d837d14eca6920752b843211192a6c1cdc83be05de9ac57c88424ca555928b67eb219fa8564fe8
-EBUILD plan-1.10.ebuild 1455 BLAKE2B c3d42ed02f554e789067b71db881715e004a659379ef46dc3142cb4912c90dc551cc06f9597e4191050d9a3bcfc5743b2f3e3077dd960fcf44baecf84fc8d759 SHA512 8345d80d13ad376e83a72e4a54375cf2751659b31909dada23decec001e73bebd3cc144d3dab1d0c14891702ca5248205133a46f4b749fb54f39786f88e155e8
+EBUILD plan-1.10.ebuild 1495 BLAKE2B 370173539537d06515024aa34377a6d6e3bb762d020b33c55e4de5e70b5dba45ca0f19b77e0cefb2ae71ecb47660873c3c2dab6d38d04c3f3ca3b36a8bf98683 SHA512 087c4ebdecfcd9cfb469b0e4ab7d9a088564e450e5290c716d729a86166aa3187b94deb814574eb49abdd85a1f8ddb23473e41808ba6c2ec688c36ef2d2744bd
 MISC metadata.xml 258 BLAKE2B 18104e5bf54213c7d7302cc72c3ec47d0c322f2fd397dde15b5ee29db433961329fd2b22c379d19125d7f5ded7dcc376d3afb9ce77426d9615022bde50078649 SHA512 a4886b16e304b05a448e28681a38ec68fcdd7828029444fd9c01aab0fdda8d9540cd0d829da2e9f22b38b33d10e85bf111c8e45b49966c32b267c90704adec40
diff --git a/app-office/plan/plan-1.10.ebuild b/app-office/plan/plan-1.10.ebuild
index bb35e5181561..e16129ffdb18 100644
--- a/app-office/plan/plan-1.10.ebuild
+++ b/app-office/plan/plan-1.10.ebuild
@@ -1,65 +1,58 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="Motif based schedule planner"
 HOMEPAGE="https://www.bitrot.de/plan.html"
-SRC_URI="ftp://ftp.fu-berlin.de/unix/X11/apps/plan/${P}.tar.gz
-	mirror://gentoo/${P}-gentoo.tar.xz"
+SRC_URI="
+	ftp://ftp.fu-berlin.de/unix/X11/apps/plan/${P}.tar.gz
+	https://dev.gentoo.org/~soap/distfiles/${P}-patches.txz"
 
 LICENSE="GPL-2+" #448646
 SLOT="0"
 KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
-IUSE=""
 
-DEPEND="
-	x11-libs/libXpm
-	>=x11-libs/motif-2.3:0
-"
-RDEPEND="${DEPEND}"
+RDEPEND="
+	x11-libs/libX11
+	x11-libs/libXt
+	x11-libs/motif:0"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-devel/bison
+	sys-devel/flex"
 
-QA_PRESTRIPPED="
-/usr/bin/netplan
-/usr/bin/plan
-"
-src_prepare() {
-	epatch "${WORKDIR}"/${P}-patches/*.patch
-}
+PATCHES=( "${WORKDIR}"/patches )
 
 src_compile() {
-	pushd src
-	emake CC=$(tc-getCC) SHARE=/usr/share/plan linux
-	popd
+	emake -C src CC="$(tc-getCC)" SHARE=/usr/share/plan linux
 }
 
 src_install() {
-	pushd src
-	emake \
-		DESTDIR="${D}" \
+	emake -C src \
+		DESTDIR="${ED}" \
 		SHARE=/usr/share/plan \
 		install
 	keepdir /usr/share/plan/netplan.dir
-	popd
 
 	dodoc HISTORY README
 
-	pushd misc
+	pushd misc >/dev/null || die
 	doman netplan.1 plan.1 plan.4
 	insinto /usr/share/${PN}/misc
 	doins netplan.boot BlackWhite Monochrome plan.fti Plan.xpm plan.xpm
 	exeinto /usr/share/${PN}/misc
 	doexe Killpland cvs vsc msschedule2plan plan2vcs
-	popd
+	popd >/dev/null || die
 
-	pushd web
+	pushd web >/dev/null || die
 	insinto /usr/share/${PN}/web
 	doins help.html bottom.html cgi-lib.pl common.pl holiday_webplan rtsban.jpg
 	exeinto /usr/share/${PN}/web
 	doexe *.cgi
-	popd
+	popd >/dev/null || die
 }
 
 pkg_postinst() {
diff --git a/app-office/skrooge/Manifest b/app-office/skrooge/Manifest
index 37a59e7775cf..de64c8ab2be1 100644
--- a/app-office/skrooge/Manifest
+++ b/app-office/skrooge/Manifest
@@ -1,5 +1,3 @@
-DIST skrooge-2.22.1.tar.xz 21559588 BLAKE2B 1f08a5357af4b792ba3d3eb4d460604fa23914aa5924ac9405019fbcce50efa96441b84bcd1142469f00eab89daa7c8175c5c33821190b7a09b7c565880f55b4 SHA512 0bbc4e98293f73a3ffe1243246fbd88c5d4d45fec8d67e8daebbe8ed08365c897b734cc5dd2a2104e608a13546f383b618d12c3523425d1a513511301c510f43
 DIST skrooge-2.23.0.tar.xz 22403128 BLAKE2B e8b4e33e80f307f2c7e6c984199c116aee1d7cabe0ac4ee9461ba10289adc0a15ba5e5d8efb93d49ec8f22104462d572a8ee52b08df84d0379fa77ce56a4ddc9 SHA512 4592deb159aa310f36f8950cf0a65d811624b40dc8b05cdefc271b95885bc6db5ac15f7b4c5299b1468ac92b7e560636bf95ddd6d31340993d9184ba0b150a76
-EBUILD skrooge-2.22.1.ebuild 2756 BLAKE2B 8635c6811904b0fa990e4751b1c45cca81f6840c8a5c6b9633d2b232faec20e796cdccef508aefa88d7bf1a5fe48ad30fd190e4bcce39769c4a0ee45e5662f7e SHA512 b278fca5a79b40daccfeeaea726a73bacbe5d8a88b6d12d42001cc70e2b2dcd5c7cc1c73b9c5ad786881ab610314db819129e04dbfa7018ea5bb31bcdaf8ea33
-EBUILD skrooge-2.23.0.ebuild 2757 BLAKE2B 98d05402add21c9614078f6b5cdcc21c0fe98ceca79b8516a1497c01cc2731ebe4f64b4245ee2ffd9fc82663fa34a5f585a902cbf91f90f314456b58d7db0c86 SHA512 8df6891916d7bb8430e350a15be393cc2403413ce3493233d4175f08e30dac2714ac007c301b5e518373795995fce4f18004d8647a9c4fcc7207d0e9e9689506
+EBUILD skrooge-2.23.0.ebuild 2756 BLAKE2B 8635c6811904b0fa990e4751b1c45cca81f6840c8a5c6b9633d2b232faec20e796cdccef508aefa88d7bf1a5fe48ad30fd190e4bcce39769c4a0ee45e5662f7e SHA512 b278fca5a79b40daccfeeaea726a73bacbe5d8a88b6d12d42001cc70e2b2dcd5c7cc1c73b9c5ad786881ab610314db819129e04dbfa7018ea5bb31bcdaf8ea33
 MISC metadata.xml 508 BLAKE2B b55c79406982c895e2c0a3f680944fb561823a3713408f67b4f8de74d03246cd9b52a654d4ec97935d4f7740b9d9f4ebf27d81a9c226dc67d9922500c6e6bde0 SHA512 0b38f9d35783e7fbf2b86b9ead3772416b7080d3df07b801ecd9ef4e5329f7690e6e1b9f817d2fd8947d6735f89cfa57fb516fbcc2b383d5278f27fd89390e97
diff --git a/app-office/skrooge/skrooge-2.22.1.ebuild b/app-office/skrooge/skrooge-2.22.1.ebuild
deleted file mode 100644
index 49a210b9ac01..000000000000
--- a/app-office/skrooge/skrooge-2.22.1.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="optional"
-ECM_TEST="forceoptional"
-KFMIN=5.60.0
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Personal finances manager, aiming at being simple and intuitive"
-HOMEPAGE="https://skrooge.org/"
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
-	KEYWORDS="amd64 x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="5"
-IUSE="activities designer kde ofx webkit"
-
-REQUIRED_USE="test? ( designer )"
-
-BDEPEND="
-	dev-libs/libxslt
-	virtual/pkgconfig
-"
-COMMON_DEPEND="
-	app-crypt/qca:2[qt5(+)]
-	dev-db/sqlcipher
-	dev-libs/grantlee:5
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtscript-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5=
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/knotifyconfig-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
-	kde? ( >=kde-frameworks/krunner-${KFMIN}:5 )
-	ofx? ( dev-libs/libofx )
-	webkit? ( >=dev-qt/qtwebkit-5.212.0_pre20180120:5 )
-	!webkit? ( >=dev-qt/qtwebengine-${QTMIN}:5[widgets] )
-"
-DEPEND="${COMMON_DEPEND}
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	designer? (
-		>=kde-frameworks/kdesignerplugin-${KFMIN}:5
-		>=dev-qt/designer-${QTMIN}:5
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	>=dev-qt/qtquickcontrols-${QTMIN}:5
-"
-
-# hangs + installs files
-RESTRICT+=" test"
-
-src_configure() {
-	local mycmakeargs=(
-		-DSKG_BUILD_TEST=$(usex test)
-		-DSKG_DESIGNER=$(usex designer)
-		$(cmake_use_find_package activities KF5Activities)
-		$(cmake_use_find_package kde KF5Runner)
-		$(cmake_use_find_package ofx LibOfx)
-		-DSKG_WEBENGINE=$(usex !webkit)
-	)
-
-	ecm_src_configure
-}
-
-src_test() {
-	local mycmakeargs=(
-		-DSKG_BUILD_TEST=ON
-	)
-	ecm_src_test
-}
diff --git a/app-office/skrooge/skrooge-2.23.0.ebuild b/app-office/skrooge/skrooge-2.23.0.ebuild
index e78009944068..49a210b9ac01 100644
--- a/app-office/skrooge/skrooge-2.23.0.ebuild
+++ b/app-office/skrooge/skrooge-2.23.0.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://skrooge.org/"
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
-	KEYWORDS="amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 LICENSE="GPL-2"
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