gentoo resync : 04.01.2022

8 files changed, 4 insertions, 114 deletions

diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index 37837672594a..b43dad67d1f6 100644
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
diff --git a/app-office/calligra/Manifest b/app-office/calligra/Manifest
index c66074d10546..d0bb85f155cd 100644
--- a/app-office/calligra/Manifest
+++ b/app-office/calligra/Manifest
@@ -4,5 +4,5 @@ AUX calligra-3.2.1-imath.patch 971 BLAKE2B 10686e8aa72d7a6953393863123ca42f3cfaa
 AUX calligra-3.2.1-openexr-3.patch 3188 BLAKE2B 221e8925f86418ef491a2e43c0e2981be4962b2afcb74465a93f3af22ad6cedfd36119006831d89af8b05dfd5b833f3a5ba0f4593559377b5e20d0479c981e22 SHA512 4ad40876e68317fab59dfc7f5672ef850e40edf636dd6ed996a8239850fd4705825e18db86f132d4d0f06540e804c66d86b1954702187f57b90fd811d2c59bf5
 DIST calligra-3.2.1.tar.xz 55207684 BLAKE2B 332629f18adbee649e8d25a1eedf4ee48af7d8cbb79382c70678bacfa89d9a10797eb0ff42cb5aad51ef2c28aa7071e687bd34053cadcc40ac1936bb9a40dc20 SHA512 e53a939aa1b277c2291cfd626868c77085fc9cc7774df160b5b1afceb33314b4381fa8ffe03636cbde6e35cc2abd170a51e7f9c1a99191339313b9c9c3b1526f
 EBUILD calligra-3.2.1-r3.ebuild 5252 BLAKE2B 4d281a3ef6890825a4cb19b15f6ba718d73c872084c793438709fc91fe8a50bf439906b2ddbfe42f0497bce6495765da7733452938aebfe11a26635cd76c79ed SHA512 9f7f0da34a639688d73a3a4a1175fce3fab321ea67917869c7009e50a0ad4025647497955006851e8ad555823f1984eef0be0c2267522427be14ebe2b0554327
-EBUILD calligra-3.2.1-r4.ebuild 5322 BLAKE2B 94bbb0e51fd12b140ca1657a4baeab5a88619b59222c8463cf52497161829edeb5234fe253957ff39b0a03d7d4a5509bdb47cca2a2ae00f17956a888e5efda59 SHA512 5a15cf0c27026a70fa797bbeaaaa826ce16999b45a7fa2b79b99836cec635dbf10903312253ee5ae8c7929a2d37fd4a43d0382ec87b6451428ffcdd9fc2cdead
+EBUILD calligra-3.2.1-r4.ebuild 5329 BLAKE2B dda0d8e463b21358a4e80ef5c6c2c0d21ccfa44b3440515c6fb94f35d8bbbe605aa96e3a9dc0d0f6be641d509b4b68d55a0754933764c2b8b54c6c607cf96163 SHA512 bd5670af49729649173ce814d5173bf5c2a32e855656ef9af72e731016372cb634c1dfb76009edebbe0ed5f8eb912569851b254d730818e18964defbf214f193
 MISC metadata.xml 1218 BLAKE2B 0989022a6025992ca04069a3f1e77e626df5a37c51bb1f6889e81360a6dd7a11311d319ba874e9dbadcb98ec53e6c1436563ecc6baf047218bd23adc726499b2 SHA512 b8b0e4cc426a2ff43211ef9f5b9d72db6ceefb26f22c49c32805bdfa7716920e54d09e19836e5da7293d9ac264364568119a64ee458f3f51f85dafe4e050f835
diff --git a/app-office/calligra/calligra-3.2.1-r4.ebuild b/app-office/calligra/calligra-3.2.1-r4.ebuild
index 6ef745321e5d..9590f26021f2 100644
--- a/app-office/calligra/calligra-3.2.1-r4.ebuild
+++ b/app-office/calligra/calligra-3.2.1-r4.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://calligra.org/"
 
 if [[ ${KDE_BUILD_TYPE} == release ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~ppc64 ~riscv ~x86"
 fi
 
 CAL_FTS=( karbon sheets stage words )
diff --git a/app-office/calligraplan/Manifest b/app-office/calligraplan/Manifest
index dcaa3799e6cc..20b801a002d7 100644
--- a/app-office/calligraplan/Manifest
+++ b/app-office/calligraplan/Manifest
@@ -1,3 +1,3 @@
 DIST calligraplan-3.3.0.tar.xz 4500032 BLAKE2B 48983bcaad5f8bc60a9e689ab9347731eda6c82eae248df50fa3cdf4a2d9c1882a5f44cda503dcb7ba65452da874256ce4ec3ff2348cf0acd65a9b8a83b63aed SHA512 165bb1d846e8ac96789b5123bd8e352ad77a4ae607d7e06008916f7729a457351c35779b43774f73a6a35bf9401626852cb4dd2ccf16cbcfb38d2abce56bd936
-EBUILD calligraplan-3.3.0.ebuild 2516 BLAKE2B 80d3a1a278985c84bb8efa7674dc1c55da082791aab5c3a5b746e79ebb73626aaf493272363de8de5c6ac1952ac8489fafbf799a056e4d63a95974c08e0cbc12 SHA512 28d97566d095476bdd53322e8e3809e4792075c715b080dd15f77cee6e61cb7c99f7cd0522d036ffc99e53c87c8b40eb7f317ab9c001a1c68d7d08ac299fc9e9
+EBUILD calligraplan-3.3.0.ebuild 2523 BLAKE2B 7c0f5a00331f46bc7c8e05659a29fc60248916061a1215a684725ceed59a390ec8b494878061ce543bd07a70b5cbbe3bbb9c159b893ab27ae624f92131b424b8 SHA512 e54006cbce98724faada019648afbcaef8863f0cd7423ea778940279b7627e5a22e3a65c0a54ddb0817224f64e65177e2b778b3069d39102e4c3da0716115e7b
 MISC metadata.xml 718 BLAKE2B b887142a7dd2b1f43cdbf7e63df19ff71059e7af947f6e649e0432f06797bd8a33bcff80267fa66cce6de7bda65494ce730b07bcde9e539e38062d86c02b9793 SHA512 3eac2bd09f1e12c81f65b7b91bba0c4ad872d33220ae960477b3f03cc34b01150e9aa0c2746fc82035fc990beae083c440839abd1a07bf7f790f2b65d9e88e6f
diff --git a/app-office/calligraplan/calligraplan-3.3.0.ebuild b/app-office/calligraplan/calligraplan-3.3.0.ebuild
index 49233752dc85..1dc19b1f31ca 100644
--- a/app-office/calligraplan/calligraplan-3.3.0.ebuild
+++ b/app-office/calligraplan/calligraplan-3.3.0.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://calligra.org/plan/"
 
 if [[ ${KDE_BUILD_TYPE} == release ]]; then
 	SRC_URI="mirror://kde/stable/calligra/${PV}/${PN}-${PV}.tar.xz"
-	KEYWORDS="amd64 x86"
+	KEYWORDS="amd64 ~riscv x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/app-office/mdbtools/Manifest b/app-office/mdbtools/Manifest
index 4ea008cb9185..76fd0d1d394b 100644
--- a/app-office/mdbtools/Manifest
+++ b/app-office/mdbtools/Manifest
@@ -1,9 +1,6 @@
-AUX mdbtools-0.9.2-unixODBC-respect-libdir.patch 1439 BLAKE2B 9afc3b2951947593c029eeff66ebcc93da8ff34ef5d1cf25d08848fb950b2cafa533e08b682cf1a5f11eeec1dcc6e1d0df2f9712d576ac2f63bb207ab6c16b42 SHA512 08df20d8f60a8a1323685571649c7fa0127fa4a29a9fbbf431d51265e06194017f71eb6c7d186a3160679971ebd7cc64b5c1f2e428c939dd7dd79b98952816d7
-DIST mdbtools-0.9.2.tar.gz 214246 BLAKE2B f62ffae2b084e53f7222ab969aa7f57f65735281383f93aeb025cff38b32b9aa22ffffb819532f816cc45a9156f7136bd9de953b17b86817380123451d51170c SHA512 cb2bddca83eb9867b765f6fc57fb289f91ce4e2e09dd953e338c26f6c4bcfe9ddb53368c4eef6d02927e582c2e10312462b82916c2e956fa269f25a765371d8d
 DIST mdbtools-0.9.3.tar.gz 214697 BLAKE2B 59aca58d11b9c513c8d5b8401423b04484657543d742e20e058e7b29e8225a2c2c3b6e5a95a61a2214a1323b1c5d80b08a71c9f9bcdbf2f35b079a7b05919841 SHA512 3ceb9e374fd638a01d087a1f5e8fb357b24f0a85a8f9c65743a78ec1d6a981fed299744610382ae525f3781e73e268de5c4bb2e48eff78e48b197e2add23587e
 DIST mdbtools-0.9.4.tar.gz 215253 BLAKE2B 7538fe36ce63b01a395b39272da3c212d6743bb789b38123d1f951f5678177ba541d64e7a58c08ff5f537d5cda4309c814521a33df5402ad3bc3bacd3d872425 SHA512 4ec5ae66b572970f5d450d94457a5e12a0b376dfbdb10ca8566be2f9d35a8837c0b7381ac6e8b935192b892e7d7c71fef089bb07f4ae789596c1dac07a062e1a
 DIST mdbtools-1.0.0.tar.gz 220553 BLAKE2B 55cf3120f16ded1374c0b5535c45a0d15e4d2ec62d4029856bea570282e6099565698c00b27295b01b455eca10d9271e743e60086b427647dfe51c25d65c531d SHA512 3844bde9df3a5beafa40914fef3db25a9b3bc0e66cbd012fd6ad0fcf89e66f48afa922be61972b4d6a7a3d0ba0bf1881f7d8fdebce7f52f19254133dd1d3fc5f
-EBUILD mdbtools-0.9.2.ebuild 1147 BLAKE2B 3006a2d2b3c1dab0e14f9338ad4f21e66f1ab655a906db18ea746999560481ae3a8ec6c08d6059890b96004e2beae2b82d30e0268ad33f1212658761e939efac SHA512 b113e23c91258628a08d1fd257b510adf84523c0259538af69f791cdc0eb1ea2f2534d18d730c2007b5409b9321c532057079b627fad4535de2bbce3081026d3
 EBUILD mdbtools-0.9.3.ebuild 1112 BLAKE2B 5b56db9dfd00d08308c3bfe3793bb2581994d3aadb00d97f867f93a5f051eab9343724134ef4fdfd4af3998d586fa97dd2999e34b82a707772208a8a602a424c SHA512 4f01e7c596383250f13bae4ef36e71eb799e1153287ef4a514ddc96b50fece6bf865ab5a1e315f88f1f224d9b70ddaa2ac595a9236e8bb657c2f965aaa8b84d3
 EBUILD mdbtools-0.9.4.ebuild 1112 BLAKE2B 5b56db9dfd00d08308c3bfe3793bb2581994d3aadb00d97f867f93a5f051eab9343724134ef4fdfd4af3998d586fa97dd2999e34b82a707772208a8a602a424c SHA512 4f01e7c596383250f13bae4ef36e71eb799e1153287ef4a514ddc96b50fece6bf865ab5a1e315f88f1f224d9b70ddaa2ac595a9236e8bb657c2f965aaa8b84d3
 EBUILD mdbtools-1.0.0.ebuild 1121 BLAKE2B f6253632c14e8d3eca5ae2a8bceb03293c62b965ba125460605e023c1e058f0a3c8d2b6b3d216815df0d85bd4f523e4d399da9e555d6d20173c5c0d6448a2aee SHA512 cc384097206091aeedcdeec00e92a38aa762b0d673673e9a5a9fda8e44d4b53156bef8a9afbfdb31327a709274aa45e18a38f606ee85b5f772dc78eae5552598
diff --git a/app-office/mdbtools/files/mdbtools-0.9.2-unixODBC-respect-libdir.patch b/app-office/mdbtools/files/mdbtools-0.9.2-unixODBC-respect-libdir.patch
deleted file mode 100644
index 42c62f04bec5..000000000000
--- a/app-office/mdbtools/files/mdbtools-0.9.2-unixODBC-respect-libdir.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-https://github.com/mdbtools/mdbtools/commit/686110d2241f02b3242d02d7c4ded9509aacd0df
-https://bugs.gentoo.org/697568
-
-From 686110d2241f02b3242d02d7c4ded9509aacd0df Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Sat, 27 Feb 2021 14:33:23 +0000
-Subject: [PATCH] configure.ac: Respect --libdir for unixODBC
-
-When searching for unixODBC, we want to use
-the libdir passed in to autotools (--libdir)
-to ensure that we find the library
-for the correct ABI.
-
-It is possible that we pick up the wrong
-copy from e.g. /usr/lib/ where a 32-bit
-unixODBC copy of the library exists
-when we're in the middle of a 64-bit build.
-
-Use ${libdir} to ensure we respect
-any preferences/information given and
-search for ODBC in the right place.
-
-Note that this previously affected
-us with iODBC but that's since been
-resolved by using their
-iodbc-config binary.
-
-Bug: https://bugs.gentoo.org/697568
-Signed-off-by: Sam James <sam@gentoo.org>
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index c802843d..7a1f357b 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -157,7 +157,7 @@ AC_ARG_WITH(unixodbc,
- if test "$with_unixodbc"; then
- 	HAVE_ODBC=true
- 	ODBC_CFLAGS="-I$with_unixodbc/include"
--	ODBC_LIBS="-L$with_unixodbc/lib"
-+	ODBC_LIBS="-L$with_unixodbc/$libdir"
- 	CFLAGS="$CFLAGS -DUNIXODBC"
- 
- 	dnl SIZEOF_LONG_INT and HAVE_LONG_LONG are required by some versions of unixODBC
diff --git a/app-office/mdbtools/mdbtools-0.9.2.ebuild b/app-office/mdbtools/mdbtools-0.9.2.ebuild
deleted file mode 100644
index 4910a56d6104..000000000000
--- a/app-office/mdbtools/mdbtools-0.9.2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# 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/mdbtools/${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.md )
-
-PATCHES=(
-	# bug #697568
-	"${FILESDIR}/${P}-unixODBC-respect-libdir.patch"
-)
-
-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
-}