gentoo (valentine's day) resync : 14.02.2021

23 files changed, 121 insertions, 441 deletions

diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index 19e95f092a09..68f1f9b2f28f 100644
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
diff --git a/app-office/gnumeric/Manifest b/app-office/gnumeric/Manifest
index 9437377b02d7..ae5fc60ad946 100644
--- a/app-office/gnumeric/Manifest
+++ b/app-office/gnumeric/Manifest
@@ -1,5 +1,3 @@
-DIST gnumeric-1.12.47.tar.xz 18309764 BLAKE2B 8b800a6749d208a445abfc7189618abb20907118f274b313cf81436ab3665d50edeab4c49b03adea505448138bd32b8d3efcd041eba54342d9fb293c574cac08 SHA512 f6298fee752b062672acc20e18388d7424719d69ce9586888f33be07ca92bbd7d99e46b98e9ab2a546d1954d3113b59a5105d46c4e8a13e65e1ae9acc38391ab
 DIST gnumeric-1.12.48.tar.xz 18329300 BLAKE2B f38fdc14dbe2b45fa3c2ebbfb94d89c85f6c04bdc95b493a760a23ba347fa99d2515f0e7fc0a2f45e31c3f2a3b0c8b425b0fb876f59215e2da76348c5dbe116a SHA512 6c17e95ecd88b43da0f4f23d9c99dad5d0016f9618570a36be5998fa84c144bb5d13749fd9c4fe0c295e3c80d70c717d09763cc9904dfc1df062b96749b73ebc
-EBUILD gnumeric-1.12.47.ebuild 2291 BLAKE2B ed25d561db052c0e3e564e0cdc67fa43eec7f75a867ba73d2f3f10ca442b4cd969c23080f16baeecbb58b20f10e82209f2f7dbf25725a2108aa71bd9c2b2ce9a SHA512 24db0c199bacbb8465afcc621dd3184c921ae8983ecf0825c137f57bb82822a1a49b7a4537858f3ae76cb5c150bce91eebe1f79187ea75479b70ca738f6cf155
-EBUILD gnumeric-1.12.48.ebuild 2292 BLAKE2B 8da0b4576774b4378510a8b23db46418aac3cbdb2811c6f79ac39240bc00f17c710fd1a527f5f76b54c81e99187fc918755fef048855197c2c3c4a2ab40b7f70 SHA512 ea5808269286907cd769b47cb69047a312fda27248b2ba21a61ad027b0d8db70cb5000fd8205a59e6971774a998a530299bcb1dcc802fb943099894794b53484
+EBUILD gnumeric-1.12.48.ebuild 2291 BLAKE2B 6ec480c124408a9e6c363fd7bd4c51788b9defdd9f3f2fe0300abb9b7c8d8d0dddb89ca9150d29fd3988932b2154346619b996c63fad667d1742b3f17daf6e2d SHA512 727e3d3eef41262f03c01b6241b9f0642f27dea13fed43ce563a908467ef110f999c2c39810395d352dddd28e10b300e3c6e6ee04eaa52d75851eef64259f0e9
 MISC metadata.xml 519 BLAKE2B 07b0ba6ff606de990d5fb97de46aa20f0581ab63f789f2238446e6f87dc93283a0873dfec3ee4a3fd38372aa3fa17e50349abffbd5eb5cc73d4cbdbffe1e5592 SHA512 a03730e0ccc7c2fb4df57f0d63da93e9254c8df99594a26215ff9919302919eb0bfdd21622b9d73f84011c5cd28397cc0b5b2add2fce0624d7a59fc1877601d3
diff --git a/app-office/gnumeric/gnumeric-1.12.47.ebuild b/app-office/gnumeric/gnumeric-1.12.47.ebuild
deleted file mode 100644
index 3be600af38b6..000000000000
--- a/app-office/gnumeric/gnumeric-1.12.47.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit gnome.org libtool python-r1 xdg
-
-DESCRIPTION="The GNOME Spreadsheet"
-HOMEPAGE="http://www.gnumeric.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="+introspection libgda perl"
-REQUIRED_USE="introspection? ( ${PYTHON_REQUIRED_USE} )"
-
-# Missing gnome-extra/libgnomedb required version in tree
-# but its upstream is dead and will be dropped soon.
-
-# lots of missing files, also fails tests due to 80-bit long story
-# upstream bug #721556
-RESTRICT="test"
-
-# Gnumeric has two python components
-# 1. The python loader for loading python-based plugins.
-#    This component is pure python 2 and a port "is not currently being worked on".
-# 2. The python gobject-based introspection API. This component is compatible
-#    with python 3.
-# Component 1. can only be re-enabled once someone has ported the upstream
-# codebase to python 3.
-# https://gitlab.gnome.org/GNOME/gnumeric/issues/419#note_618852
-RDEPEND="
-	app-arch/bzip2
-	sys-libs/zlib
-	>=dev-libs/glib-2.40.0:2
-	>=gnome-extra/libgsf-1.14.33:=
-	>=x11-libs/goffice-0.10.46:0.10
-	>=dev-libs/libxml2-2.4.12:2
-	>=x11-libs/pango-1.24.0:=
-
-	>=x11-libs/gtk+-3.8.7:3
-	x11-libs/cairo:=[svg]
-
-	introspection? (
-		${PYTHON_DEPS}
-		>=dev-libs/gobject-introspection-1:=
-	)
-	perl? ( dev-lang/perl:= )
-	libgda? ( gnome-extra/libgda:5[gtk] )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	app-text/docbook-xml-dtd:4.5
-	app-text/yelp-tools
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.35.0
-	virtual/pkgconfig"
-
-src_prepare() {
-	default
-
-	# Manage gi overrides ourselves
-	sed '/SUBDIRS/ s/introspection//' -i Makefile.{am,in} || die
-	elibtoolize
-}
-
-src_configure() {
-	econf \
-		--disable-gtk-doc \
-		--disable-maintainer-mode \
-		--disable-schemas-compile \
-		--disable-static \
-		--without-psiconv \
-		--without-python \
-		--with-zlib \
-		$(use_with libgda gda) \
-		$(use_enable introspection) \
-		$(use_with perl)
-}
-
-src_install() {
-	default
-	dodoc HACKING MAINTAINERS
-
-	if use introspection; then
-		python_moduleinto gi.overrides
-		python_foreach_impl python_domodule introspection/gi/overrides/Gnm.py
-	fi
-
-	# no static archives
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/app-office/gnumeric/gnumeric-1.12.48.ebuild b/app-office/gnumeric/gnumeric-1.12.48.ebuild
index a1ef3b1c5e5f..58fec4bc381c 100644
--- a/app-office/gnumeric/gnumeric-1.12.48.ebuild
+++ b/app-office/gnumeric/gnumeric-1.12.48.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.gnumeric.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="+introspection libgda perl"
 REQUIRED_USE="introspection? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/app-office/kmymoney/Manifest b/app-office/kmymoney/Manifest
index 3fed6a7e1331..756b6bb5cc9f 100644
--- a/app-office/kmymoney/Manifest
+++ b/app-office/kmymoney/Manifest
@@ -1,5 +1,3 @@
-DIST kmymoney-5.1.0.tar.xz 12005824 BLAKE2B 4eaeefba29d4df85c485d8d94db80b418c0086f6cac81295f1251e3d4883a78c71d0401286a918831ee2a39571a70583675ee303775bffdb3333e11d5624bbf6 SHA512 143161efd708ae05923d68510945c24f08d85cd6482b3e6015c6061bc28c80e095ca56b768e595bfae50ea3340855e021dde5c715546c0641f94adcd91639334
 DIST kmymoney-5.1.1.tar.xz 12059768 BLAKE2B 8b41bce8804d757ba9c801c7b1eeb214a8983c4686a9663a4b5255460139593b7f70e29f08294df810a02eab4190dc6de852be091760981fd84ff8191fda82a3 SHA512 2ed3e47b2e65c9d9e5a11b55f0d425192331b21d64f8a4a4f8921fdd67eac219bf3ae1418026071218d823acc9a36905dc5c499cb0ae2af4ced0e32d1720bf59
-EBUILD kmymoney-5.1.0.ebuild 3369 BLAKE2B 55e993aad336128b461273dcb5d991249f076ce13fac1a3cf76504e336ed0f1d2825016ac8be5aaef78df73252e6f956b507d812f298adc981d4754d19c7d211 SHA512 e2cf60cc5a928ca4d76bbf4869cb4a3f73deda2e6eed3859c9f0b1ce6ad9c0f8f8bc42237d7d5c58b06e16841d31ec00e505570fb5065b78c65a9e9e591da5bc
-EBUILD kmymoney-5.1.1.ebuild 3815 BLAKE2B 6751027f10750616e860cdfed0eaad7e9b663eb114218112d444371c9851d4dc9250bad0ae30d1bb825a898a1da4a466293a0a7be9850d091542d8e4cba734ca SHA512 cb40df3d13de5ad4b27eb1c11cc8e9cb4fcfecb7cd3806e04f43304cde32493671176531a3eff3aa97d744cc8f524ecf83c550d25c2233524ebecf218ba98de7
-MISC metadata.xml 677 BLAKE2B 64f8cdbad4f22f9203f04bbe4a93da432fb7689fc9bbdb072c9f0d16e71b2908ddd95bc452e2fd561981f60cca8638275ef740c00c9a5e1ad020077b0afae97f SHA512 5908450c3761f8bdbfbcc58c3aae5e80737a07ac43107f9c16ba06ee9acae07c60ccbc12f70db7562a807e38e597510cef790220c13204e6e39746528f3fd0c3
+EBUILD kmymoney-5.1.1.ebuild 3814 BLAKE2B cf331705493b537fc281885c58c81ce1f2a29f6d28f569c7c792218763560cbd2311d57511f018a5f671b1cfe29541f244b40130ad141036809faecaa04db3dd SHA512 993b80cae84258eecbb3db382bd821d04160ad7b1538418d93602003f032d4cd1eca658cc0d6712b660e48de301deb7bf62e561b5ba1c7310094c9dd4070fe51
+MISC metadata.xml 612 BLAKE2B 693f4ae569b54f8e2bc6c5a3844db95e3791accba94be3174e11eb9dce42f4766334880fff00b5a0a2515b78ec8a6c298cf03efefa8fb49ae95309ea3648f479 SHA512 a580d659890251263b82938adbf80ae3a072d4d00c1f87e5faf76d6f88a80e0bd210bc4e5a40ea9f6662580892b77510644b35c90385438c3ad77bd191a0a398
diff --git a/app-office/kmymoney/kmymoney-5.1.0.ebuild b/app-office/kmymoney/kmymoney-5.1.0.ebuild
deleted file mode 100644
index d953ee08b6b7..000000000000
--- a/app-office/kmymoney/kmymoney-5.1.0.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGIT_BRANCH="5.1"
-ECM_HANDBOOK="optional"
-ECM_TEST="forceoptional"
-KFMIN=5.60.0
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-VIRTUALDBUS_TEST="true"
-inherit ecm kde.org
-
-DESCRIPTION="Personal finance manager based on KDE Frameworks"
-HOMEPAGE="https://kmymoney.org"
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
-	KEYWORDS="amd64 x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="5"
-IUSE="activities addressbook calendar hbci holidays quotes"
-[[ ${KDE_BUILD_TYPE} = live ]] && IUSE+=" experimental"
-
-BDEPEND="virtual/pkgconfig"
-COMMON_DEPEND="
-	>=app-crypt/gpgme-1.7.1-r1[cxx]
-	>=app-office/libalkimia-7.0.0:=
-	dev-db/sqlcipher
-	dev-libs/gmp:0=[cxx]
-	dev-libs/kdiagram:5
-	dev-libs/libgpg-error
-	dev-libs/libofx:=
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knotifications-${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
-	>=kde-frameworks/sonnet-${KFMIN}:5
-	activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
-	addressbook? (
-		kde-apps/akonadi:5
-		kde-apps/kidentitymanagement:5
-		>=kde-frameworks/kcontacts-${KFMIN}:5
-	)
-	calendar? ( dev-libs/libical:= )
-	hbci? (
-		>=net-libs/aqbanking-6.0.1
-		>=sys-libs/gwenhywfar-5.1.2:=[qt5]
-	)
-	holidays? ( >=kde-frameworks/kholidays-${KFMIN}:5 )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-"
-RDEPEND="${COMMON_DEPEND}
-	!app-office/kmymoney:4
-	quotes? ( dev-perl/Finance-Quote )
-"
-
-pkg_setup() {
-	ecm_pkg_setup
-
-	if [[ ${KDE_BUILD_TYPE} = live ]] && use experimental; then
-		ewarn "USE experimental set: Building unfinished features."
-		ewarn "This *will* chew up your data. You have been warned."
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_OFXIMPORTER=ON
-		-DENABLE_WEBENGINE=ON
-		-DENABLE_WEBOOB=OFF
-		-DUSE_QT_DESIGNER=OFF
-		$(cmake_use_find_package activities KF5Activities)
-		$(cmake_use_find_package addressbook KF5Akonadi)
-		$(cmake_use_find_package addressbook KF5Contacts)
-		$(cmake_use_find_package addressbook KF5IdentityManagement)
-		-DENABLE_LIBICAL=$(usex calendar)
-		-DENABLE_KBANKING=$(usex hbci)
-		$(cmake_use_find_package holidays KF5Holidays)
-	)
-	[[ ${KDE_BUILD_TYPE} = live ]] &&
-		mycmakeargs+=( -DENABLE_UNFINISHEDFEATURES=$(usex experimental) )
-
-	ecm_src_configure
-}
-
-src_test() {
-	# bug 652636; bug 673052: needs kmymoney installed to succeed
-	local myctestargs=(
-		-E "(reports-chart-test|qsqlcipher-test)"
-	)
-
-	ecm_src_test
-}
diff --git a/app-office/kmymoney/kmymoney-5.1.1.ebuild b/app-office/kmymoney/kmymoney-5.1.1.ebuild
index ff7be37222e5..9c1afb827854 100644
--- a/app-office/kmymoney/kmymoney-5.1.1.ebuild
+++ b/app-office/kmymoney/kmymoney-5.1.1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://kmymoney.org/"
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
-	KEYWORDS="amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/app-office/kmymoney/metadata.xml b/app-office/kmymoney/metadata.xml
index d9c0e04abc20..d6894462bf49 100644
--- a/app-office/kmymoney/metadata.xml
+++ b/app-office/kmymoney/metadata.xml
@@ -10,6 +10,5 @@
 		<flag name="addressbook">Enable <pkg>kde-apps/akonadi</pkg> contact integration</flag>
 		<flag name="hbci">Enable HBCI support using <pkg>net-libs/aqbanking</pkg></flag>
 		<flag name="holidays">Enable <pkg>kde-frameworks/kholidays</pkg> integration</flag>
-		<flag name="quotes">Enable Online Stock Quote retrieval</flag>
 	</use>
 </pkgmetadata>
diff --git a/app-office/magicpoint/Manifest b/app-office/magicpoint/Manifest
index f0c7946ef444..67542b90a6a1 100644
--- a/app-office/magicpoint/Manifest
+++ b/app-office/magicpoint/Manifest
@@ -4,10 +4,11 @@ AUX magicpoint-1.13a-libpng15.patch 240 BLAKE2B 93ebf799b69a0f0133c9a6cae44d39ba
 AUX magicpoint-1.13a_p20121015-any-giflib.patch 3585 BLAKE2B 5cb2febf20cd1a3270cdc91e2e0bb72157d70be1e47bfeea4fc49594192332b1416d923b00ec3d9f305a3ac728c6efa791d00105032014dd883e44d20328b1bb SHA512 661e86eddc3c929651dd2d06b14638d4c92f03281447ee706203a99940bfca8783373ed8a175ddac73e2a6ccb2d8c25386aca39b977fbc3e631b5a16dcfc3536
 AUX magicpoint-1.13a_p20121015-draw-charset.patch 376 BLAKE2B 2162436ee734410c11461389ca430fcda0410031a649a00f96059e21a2a3575491b91fe35963c64fc692f0f761ea6623d6098ac364d844d094172385ff4fb773 SHA512 3aa3b7e4fa638a86e3a5241ad2768a44b0d3e1925dcbf23e4c5b9cd1fde9d3897b3785336be174d709c6172e47c34a5e1550cef05e868e0706cf2f91b73a160c
 AUX magicpoint-1.13a_p20121015-draw-stringtoolong.patch 310 BLAKE2B 13af238e0ceb7afd3fb6fbe27c9ea50435de74a9be24ed53cb021e8aa708d01abb23127ff54f26d20e59ff214e28ee6e22ac140918b2b7e3de57ad4a830dfb09 SHA512 65f77a096501ba27208bdc7e036ada66946e15c012b22e5dcae579141d399a7149bd647f9a5968f82ff34c344ce9c5ee4841be33a7fb911187b1def131bb7387
+AUX magicpoint-1.13a_p20121015-fno-common.patch 305 BLAKE2B 38096fe5ff8d28ed4def62492e716da01d4fbd2741e68640ab79247599812e7f1c9573ebaff1bb1b74f6f3956eeec435e1ab1592f0a2d4fca5b813508c08f408 SHA512 102ae9f4f00c542cfd0fbf16daec4e0a00a801d9557aea4eaeb792ac958d8d2388f949cf19872387f4ba9429c44bcaeeac09ff34e4c5537230387633739b081d
 AUX magicpoint-1.13a_p20121015-fontconfig.patch 1005 BLAKE2B eaf2ab5655b529fd8511b590cbd73638f6becc047c97ddd92a136ef998f284c96b471bf371085d799f964ea3f3961dfb70a0d51b16cc165fbd20ca15406ca2c0 SHA512 53fc5bbce474e4c60af75ad73f00108c40ab317b9b835f971e475f8f49a893a41614ec76345e220c8e7284032f7df1a7785e2ca91d5a66c4f99470d55b0f9603
 AUX magicpoint-1.13a_p20121015-gif-dimension.patch 493 BLAKE2B ae2e3f94f3b36b319d330504a31331e9c45429d750f2be6f8dffa299ef6541ad777d09520be72bb3ceb7c68b8fa6dc4f78a482dd1b8e0093faa2b2a5e4de0f0b SHA512 d8103374df7696ed6daf36c079c2e1f2efbfc8e774f77e06beec629b2064576325f311603ca7d1dfe3f65ed11dfaff1abd7ae70b4f78a5199e76e1d5030c5aa6
 AUX magicpoint-1.13a_p20121015-implicit-declaration.patch 3673 BLAKE2B 314f8b4022c53022f6e8e2a0612d480509916f3b857a6beaa840bbd08ea6f9e62be33dd295ce516c60162516b585fbd12884866ea184eff1bbbc6c55bec017b6 SHA512 be8da97dd37a59190cddc3f826094a343d2351d832d9bbb42a7a319149884e026fdd97018826162474bb2ffc0f88082cd4075a228487fd3d40e6b76c9ebdc029
 AUX magicpoint-1.13a_p20121015-parse-empty.patch 316 BLAKE2B 4d532b1e56bcc3d21035051b3a1e6421b02d83dd24a2e450b841f8f1c9740e19a266f5ca7619624d6046e6699507ef3a630ba605311977a466efd20b6c57fd19 SHA512 adb7a9e1585c907cd8f8b0f834391620cecf854702301715149ddc80af080115dbdd18c7f8622a5fc403df8f1205133909c98a2153461e4e8f4bf401b647f518
 DIST mgp-snap-20121015.tar.gz 886902 BLAKE2B c4f4730a805aee43f8fff7439cd18ab84f2dc73be6c249c3d8168da63fc0c32b4aff2d800345a35d3c22dd930c78f51e8cc64f4f74f0cf0aeb5f6cc4d145d4f0 SHA512 fa59b1ec04e2e191b74c25fd3ae9b4c855ad96d23e9e5b071c959f56b9d2064d7bdf9217b5c62c5733cc2d9ec17981947febd7afb2552f1145262225909cc711
-EBUILD magicpoint-1.13a_p20121015-r1.ebuild 3871 BLAKE2B 8684a1d2ace2c7d8ae6e6d302c33e9c90367a2aa2618f923300addb3d7a986a80905eee7f1b657d5988da83fdf1a05f3c3b139fb252955e3a46bea67893a9db6 SHA512 3e8ef5fe7ae842b883014bf3be4ce14ad81c4d3ccedf0bc50475470f011ec82cb43dfc7660b90d9d06577d029eba475d853b238eb046a4b98bdbb438e031dbaa
+EBUILD magicpoint-1.13a_p20121015-r1.ebuild 3928 BLAKE2B ac9b56bf426bc4529af7532fc3620c400e1f81e5a31cbb65834156c9878cbe1498b50841e93761166283b66a5455bcf9686e65b75be1db74f50101e075105f70 SHA512 adb2f7a90d01f07bc3c883e584ae03d35d06f4c0b8e7882325760ea59d82a91f51477efe3fa583fe361829372e315ab82effcc238f950b34ccb57838efc1234b
 MISC metadata.xml 619 BLAKE2B cf03f94d998aac24ad462ec4f13de8dfe022ff716c611f12e1a6e5e6964bf4d2ba1038d8d07b61924af5000057445816167c8899a9b784ecdc3ffed00acee8a8 SHA512 252061aa0a52e933b017498596b4b7b5f45fe660616212dd0718b8fe5e46ce90f4b92af96ef5ccd1db8ac05d0190743d6242208d248cc12fc9a523fd06b80c7b
diff --git a/app-office/magicpoint/files/magicpoint-1.13a_p20121015-fno-common.patch b/app-office/magicpoint/files/magicpoint-1.13a_p20121015-fno-common.patch
new file mode 100644
index 000000000000..1dcf1fb535cf
--- /dev/null
+++ b/app-office/magicpoint/files/magicpoint-1.13a_p20121015-fno-common.patch
@@ -0,0 +1,11 @@
+--- a/grammar.y
++++ b/grammar.y
+@@ -73,7 +73,7 @@ static struct qual qerr = { Q_UNDEF, Q_UNDEF, Q_UNDEF, Q_UNDEF };
+ int n_errors = 0;
+ struct ctrl *root;
+ char *yyfilename;
+-int yylineno;
++extern int yylineno;
+ 
+ #ifdef HAVE_STDARG_H
+ /* GCC complains if we declare this function in traditional style */
diff --git a/app-office/magicpoint/magicpoint-1.13a_p20121015-r1.ebuild b/app-office/magicpoint/magicpoint-1.13a_p20121015-r1.ebuild
index 5e341810c2f3..c72a1f5b5744 100644
--- a/app-office/magicpoint/magicpoint-1.13a_p20121015-r1.ebuild
+++ b/app-office/magicpoint/magicpoint-1.13a_p20121015-r1.ebuild
@@ -60,7 +60,8 @@ src_prepare() {
 		"${FILESDIR}"/${PN}-1.13a_p20121015-parse-empty.patch \
 		"${FILESDIR}"/${PN}-1.13a_p20121015-draw-charset.patch \
 		"${FILESDIR}"/${PN}-1.13a_p20121015-draw-stringtoolong.patch \
-		"${FILESDIR}"/${PN}-1.13a_p20121015-implicit-declaration.patch
+		"${FILESDIR}"/${PN}-1.13a_p20121015-implicit-declaration.patch \
+		"${FILESDIR}"/${PN}-1.13a_p20121015-fno-common.patch
 
 	if ! use imlib; then
 		epatch "${FILESDIR}"/${PN}-1.13a-libpng15.patch
diff --git a/app-office/mdbtools/Manifest b/app-office/mdbtools/Manifest
index 466774159117..2b8ce0e67350 100644
--- a/app-office/mdbtools/Manifest
+++ b/app-office/mdbtools/Manifest
@@ -1,4 +1,6 @@
 AUX mdbtools-0.7.1-parallel-make.patch 513 BLAKE2B 1f9e2ccebe4dbf4bbf4655eef237da00016fe060a43ef7a2479b6bd83f98f198959fb3101a97ad016c81ab7d09cf006cb8531c675a066bb6e185282cc8e16609 SHA512 946139271a757a8beeeb03a909104bc348cbc081a9ef6dde7f739865c775cce06717de57560a49b5055d5196b1f3985824b80b728f139cf7684c0ba847f4bd85
 DIST mdbtools-0.7.1.tar.gz 277257 BLAKE2B 3740c543b1ea2e898a96dc1a560fd83cf079d37f5d02805891c5902b75a417c9efbf421346902766017113d447b088656afbfd0297b26655aa07fce973adc216 SHA512 bbad415c59a3f54c11bcd04971220b1370046c5dfd7300d1f23e597615a1df6af850c6f767e78033676d486d87a11c72dfdb141abbee8378337c3fda9a450b75
-EBUILD mdbtools-0.7.1-r2.ebuild 1025 BLAKE2B 0a8a231f34410f313139c21fee54ba159299eafc19c19755250f8a647ab262ab6bb3e5f4ba97fec6192263af44f058f869e2cd88436dff162a72a9af0582dd82 SHA512 a2313f738dfbefbde3186324a4079c7bfbe4bdbb170b81e28146d3d7ef8da832c9247d79218d655dfebfe2ede0318f4dc0b6cb8624058b215fdf7860c2a229c9
-MISC metadata.xml 305 BLAKE2B dd17b4d37e6710ac92701b8d9f8302689686ac0489b047fa96344951a82942cb8e3bc33b8267e62dfae6c65990749ffeeb27bf353a6e4b9e8a07131d5ee79771 SHA512 c983d77cdf17f16a0abd47ba086e024f0e08c09a3d4e22ffea164d1af1b4e61d557675afae550beac7806ebec8e0dafb0257511cb3fed6d381489d67e56b1c71
+DIST mdbtools-0.9.1.tar.gz 158762 BLAKE2B a730c1ea4efceebb494fc69eac5b94ab23088e0c496684fe027b005492168b6639ec3ebc950e09f643e4a1b50017150caee639255e5e1deb5f9a46c0969077ff SHA512 d8383c20c062a759386e80927337f8ed526914fb53095480dfe791d80fe4cc3e19e83627ca9d34986968b282b16b4c43a6302f76c55d3c2545b6e7b625d47966
+EBUILD mdbtools-0.7.1-r2.ebuild 1058 BLAKE2B 5888b1284e69e61cdc5404aa4e7bb965d9e746358c334f3518e1c0bbe9103ead7b2522dd23f1244793cac4d9239622d0be9607eab7d513017be812e0372b1019 SHA512 8db409fa492f03359cc453c3cfe16c705d6d99098a27e863690eb08c5b3fd1227b4c5b58b295ed475b58f422a23774ac51a0e94861b0788001df64b39092808a
+EBUILD mdbtools-0.9.1.ebuild 1069 BLAKE2B 8b939bc4147b8c4c82f72380a05673cc17a1c9b28f739faba13d385d9ea560139a130ea83e9b45d64829ab44fa840e602df0fe72d31bd092d3ecbd2079d1ff10 SHA512 f8ffebe9d0c295d332ddcf6558bf884e3cd74a0181826667f9c235692e8998535c0f8824f8272c44889f729ac1b4b0987c0c6354e9ddd6bc3c28cc886d2b6ce2
+MISC metadata.xml 354 BLAKE2B fff9791af58b802e3ac40795a7d3c298d70a09cdf3e394ed265411bb98587802fc29e5b670f96b45ef0a03c001efd5bd6a246f46a9ad9f4e55690efb4f920cfb SHA512 dadf070ffc6e1ffc0b55ebc63147b88c74586b9d357ea60e931c676683607243ae1537e607167bebe84267b095637b0380034f617bd5562e5b5011db09f8a35a
diff --git a/app-office/mdbtools/mdbtools-0.7.1-r2.ebuild b/app-office/mdbtools/mdbtools-0.7.1-r2.ebuild
index 63be1d8704b7..ee4183e217e7 100644
--- a/app-office/mdbtools/mdbtools-0.7.1-r2.ebuild
+++ b/app-office/mdbtools/mdbtools-0.7.1-r2.ebuild
@@ -1,11 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 
-AUTOTOOLS_AUTORECONF=1
-AUTOTOOLS_IN_SOURCE_BUILD=1 # needed for proper man generation
-inherit autotools-utils
+inherit autotools
 
 DESCRIPTION="Set of libraries and utilities for reading Microsoft Access database (MDB) files"
 HOMEPAGE="http://mdbtools.sourceforge.net"
@@ -14,30 +12,44 @@ SRC_URI="https://github.com/brianb/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86"
+IUSE="odbc"
 
-IUSE="odbc static-libs"
-
-RDEPEND="
-	dev-libs/glib:2
-	sys-libs/ncurses:0=
-	sys-libs/readline:0=
-	odbc? ( >=dev-db/unixODBC-2.0 )"
-DEPEND="${RDEPEND}
+BDEPEND="
 	app-text/txt2man
 	sys-devel/flex
 	virtual/pkgconfig
 	virtual/yacc
 "
+RDEPEND="
+	dev-libs/glib:2
+	sys-libs/ncurses:0=
+	sys-libs/readline:0=
+	odbc? ( >=dev-db/unixODBC-2.0 )"
+DEPEND="${RDEPEND}"
 
 DOCS=( AUTHORS ChangeLog HACKING NEWS README TODO )
 
 PATCHES=( "${FILESDIR}/${P}-parallel-make.patch" )
 
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
 src_configure() {
 	local myeconfargs=(
 		--disable-gtk-doc
 		--disable-gmdb2
+		--disable-static
 		$(use odbc && echo "--with-unixodbc=${EPREFIX}/usr")
 	)
-	autotools-utils_src_configure
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/app-office/mdbtools/mdbtools-0.9.1.ebuild b/app-office/mdbtools/mdbtools-0.9.1.ebuild
new file mode 100644
index 000000000000..d88b6b3b98a7
--- /dev/null
+++ b/app-office/mdbtools/mdbtools-0.9.1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Set of libraries and utilities for reading Microsoft Access database (MDB) files"
+HOMEPAGE="https://github.com/mdbtools/mdbtools"
+SRC_URI="https://github.com/brianb/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0/3"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="glib odbc"
+
+BDEPEND="
+	app-text/txt2man
+	sys-devel/flex
+	virtual/pkgconfig
+	virtual/yacc
+"
+RDEPEND="
+	sys-libs/ncurses:0=
+	sys-libs/readline:0=
+	odbc? ( >=dev-db/unixODBC-2.0 )
+	glib? ( dev-libs/glib:2 )
+"
+DEPEND="${RDEPEND}"
+
+DOCS=( AUTHORS HACKING NEWS README TODO )
+
+src_prepare() {
+	default
+
+	# bug #770019
+	sed -i -e 's/-Werror//' configure.ac || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-static
+		$(use_enable glib)
+		$(use odbc && echo "--with-unixodbc=${EPREFIX}/usr")
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/app-office/mdbtools/metadata.xml b/app-office/mdbtools/metadata.xml
index bf1605ddd51e..7ed01d875ad7 100644
--- a/app-office/mdbtools/metadata.xml
+++ b/app-office/mdbtools/metadata.xml
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
-  <upstream>
-    <remote-id type="github">brianb/mdbtools</remote-id>
-    <remote-id type="sourceforge">mdbtools</remote-id>
-  </upstream>
+	<!-- maintainer-needed -->
+	<use>
+		<flag name="glib">Use functions provided by <pkg>dev-libs/glib</pkg>, not built-in</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">brianb/mdbtools</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-office/skrooge/Manifest b/app-office/skrooge/Manifest
index 01de90727d6f..233adb08001e 100644
--- a/app-office/skrooge/Manifest
+++ b/app-office/skrooge/Manifest
@@ -1,5 +1,3 @@
-DIST skrooge-2.23.0.tar.xz 22403128 BLAKE2B e8b4e33e80f307f2c7e6c984199c116aee1d7cabe0ac4ee9461ba10289adc0a15ba5e5d8efb93d49ec8f22104462d572a8ee52b08df84d0379fa77ce56a4ddc9 SHA512 4592deb159aa310f36f8950cf0a65d811624b40dc8b05cdefc271b95885bc6db5ac15f7b4c5299b1468ac92b7e560636bf95ddd6d31340993d9184ba0b150a76
 DIST skrooge-2.24.6.tar.xz 22187100 BLAKE2B 8657397c1faef949e4d2aa5a23b35433695329e9b00e62f11e4b60b78b3d0e92c32ff93219a4931b9baa08ae1bbdc18285728c97b0d49ca71bad37ee37b01a83 SHA512 a253bdcd966dbb3b0b2b078a88b8de7e9fbdf7700ce91850c0a174c3bb2f56aa04a00250e8164a5e9387699b4a6162052edb4a064293360a3b5ef62c350912df
-EBUILD skrooge-2.23.0-r1.ebuild 2556 BLAKE2B d1c89d00e4e0b8b870a9500fff0bb90a877fbddc8df3f397133d63c5f6d700051d7289bd662edd8921e30796fb978d43c9320ca8e1387025a68c0ae26f9ea685 SHA512 55046b4cffc5a83e7157f77021a8245fd0658ee837b5aee69e5b690ac4302e43a36e78fe3626320bef7ad89f13107e16f42464eec55ffa6a6a643e345ee3560c
-EBUILD skrooge-2.24.6.ebuild 2557 BLAKE2B 42a7c673cf83efbf4ed0471e85e6926097e45e2d876bcb5ad81c338b0fc9a41e89b6b5bbe8e7180a3ce4d7eab134b7edaeba42486e7a83ac6d481febf0c7c036 SHA512 faaf9946cc6eb56a38c0e9588cb4065105b5364525902af0d72c1ce16dbe1e55ae5231bad83af7160f41767dc8d0d1cb62ff525533554d9937c3095bb903e180
+EBUILD skrooge-2.24.6.ebuild 2556 BLAKE2B d1c89d00e4e0b8b870a9500fff0bb90a877fbddc8df3f397133d63c5f6d700051d7289bd662edd8921e30796fb978d43c9320ca8e1387025a68c0ae26f9ea685 SHA512 55046b4cffc5a83e7157f77021a8245fd0658ee837b5aee69e5b690ac4302e43a36e78fe3626320bef7ad89f13107e16f42464eec55ffa6a6a643e345ee3560c
 MISC metadata.xml 324 BLAKE2B ffd83d73c861eb5aa5281a859162ba693bd9ac642f7475b28419aa92c512e6caeef1fcecf56faade8b9c6573f9b09c9023dbc7f1a153f59aeea9e4c7dfa30571 SHA512 a5af84ff6c29117ec87f605e4d565a133656a05a9669a6fb2190f6c8706c4cee56c40df024c0160d391ca5e74be7a3d45244a86039cd403b0f60bc0334977a7c
diff --git a/app-office/skrooge/skrooge-2.23.0-r1.ebuild b/app-office/skrooge/skrooge-2.23.0-r1.ebuild
deleted file mode 100644
index 751142bacca0..000000000000
--- a/app-office/skrooge/skrooge-2.23.0-r1.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="optional"
-ECM_TEST="forceoptional"
-KFMIN=5.74.0
-QTMIN=5.15.1
-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 kde ofx"
-
-BDEPEND="
-	dev-libs/libxslt
-	virtual/pkgconfig
-"
-COMMON_DEPEND="
-	>=app-crypt/qca-2.3.0:2
-	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/qtwebengine-${QTMIN}:5[widgets]
-	>=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:= )
-"
-DEPEND="${COMMON_DEPEND}
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-"
-RDEPEND="${COMMON_DEPEND}
-	>=dev-qt/qtquickcontrols-${QTMIN}:5
-"
-
-# hangs + installs files (also requires KF5DesignerPlugin)
-RESTRICT+=" test"
-
-src_configure() {
-	local mycmakeargs=(
-		-DSKG_WEBENGINE=ON
-		-DSKG_DESIGNER=OFF
-		$(cmake_use_find_package activities KF5Activities)
-		$(cmake_use_find_package kde KF5Runner)
-		$(cmake_use_find_package ofx LibOfx)
-		-DSKG_BUILD_TEST=$(usex test)
-	)
-
-	ecm_src_configure
-}
-
-src_test() {
-	local mycmakeargs=(
-		-DSKG_BUILD_TEST=ON
-	)
-	ecm_src_test
-}
diff --git a/app-office/skrooge/skrooge-2.24.6.ebuild b/app-office/skrooge/skrooge-2.24.6.ebuild
index 34ba45dadeb9..751142bacca0 100644
--- a/app-office/skrooge/skrooge-2.24.6.ebuild
+++ b/app-office/skrooge/skrooge-2.24.6.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/texmacs/Manifest b/app-office/texmacs/Manifest
index 8fb37abed461..9be74cf17db9 100644
--- a/app-office/texmacs/Manifest
+++ b/app-office/texmacs/Manifest
@@ -5,4 +5,4 @@ AUX texmacs-1.99.6-math_util.patch 635 BLAKE2B 6846fbfc616937f09588520a0ea4a495e
 AUX texmacs-1.99.9-guile-remove-deprecated.patch 10877 BLAKE2B 7c33d89229e419958ebfd82a0b60680df04a12c84aa08d8e4a7e568f3dd2c70465244a295ef6457ef2ae21ffff7ee5be89be87ab2eefb7d7c79114054274e069 SHA512 0ce486bd51b382de80f12d08976d660d4b25d403488cc33534baee563e2641eaddd34009e13c514c5f36913ab31e3b05350f37ac470dce71052fc1d2399ed1d6
 DIST TeXmacs-1.99.11-src.tar.gz 32798336 BLAKE2B 352e333b51fbf27589377f638dda4f4fa09ca6aee6d0016a103ef3b4ba71b766930b7202f6fc3d060f72e4ccbbf311f438975317844587461880f99c7dff596d SHA512 3f3481834baeeee93afc2c2de1666297b8c02d7dc5223b00ee93120e175503c91bdcc3d9ff4d8df498033064b2e67b12ffd47af9e8b95ad5eee12b47ec076855
 EBUILD texmacs-1.99.11.ebuild 1696 BLAKE2B 0c256b8601bd9bf1e378fabc1264892b499f49cd188d9dcb5b4fa196ec2e45438cc8bc6e31e28b437767389071d670e68fee1cda679fa939cd06f697a9fb757b SHA512 116cd26a0a76b281073a86077a4630c51445d7f55bd2122cf75602849228866057f0129ff8e63593e67d74d37c1a0f1103e141f24d754f841cbcefe549cac37d
-MISC metadata.xml 465 BLAKE2B 83db49ca728b78d790abe6b985aa080aeeef8c053a11b3528ae5ffceaf9869412e54811869126783ab342b39664413ff8c456677234e6ee7b0e16284c4006a05 SHA512 265d5a99f3545c420a002d757a136dc4bfd320af5420d70b723b023274ee7a44ed47e26735cec36775130f4a0dcc984f29239514780e3a8e86cbae00c93e9610
+MISC metadata.xml 549 BLAKE2B fcf79150a49b13b5028b10439ea4c753fc3309dfe50a72d4a6953c47661ce5a27af0968bc186a1b412dabd2789fe108a12fadfad40b81c015f738765cfd1b45b SHA512 d3e0fb9a7a228d68910cf405d34eba1ffeff3f437a4d93dcea10a1871814140e1fc85508e9c7dfb06b8babbf3fef4ad70dc45ab5ec0a264b04898c73480df5b9
diff --git a/app-office/texmacs/metadata.xml b/app-office/texmacs/metadata.xml
index ba45e88b5f02..c4e023727be2 100644
--- a/app-office/texmacs/metadata.xml
+++ b/app-office/texmacs/metadata.xml
@@ -12,4 +12,7 @@
   <use>
     <flag name="netpbm">Add support for <pkg>media-libs/netpbm</pkg></flag>
   </use>
+  <upstream>
+    <remote-id type="github">texmacs/texmacs</remote-id>
+  </upstream>
 </pkgmetadata>
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="