gentoo resync : 25.09.2021

3 files changed, 2 insertions, 265 deletions

diff --git a/app-office/libreoffice-bin/Manifest b/app-office/libreoffice-bin/Manifest
index e7435187913c..362e8cb7916a 100644
--- a/app-office/libreoffice-bin/Manifest
+++ b/app-office/libreoffice-bin/Manifest
@@ -1,22 +1,12 @@
 AUX 50-libreoffice-bin 158 BLAKE2B 2091698f80fbe097785c60b20f636150a2ee65bf52639fa1bb4a92341d050146040ad8912c5f5e3ca22e48ac3d819053c9948e256fb1d0e0901f7645934bfb89 SHA512 2d1158f48ac80f9212578d020e5659e777ff494adc3abc94438cec6890b88741f92ea2ed3bb4585ffdabe531d55c6938ca9408e9ece5a438e67d480eb406ed50
-DIST amd64-bin-libreoffice-7.1.3.2.tar.xz 134793996 BLAKE2B 1fcc252038f4a3421456c2f8d3b5899aaf580bade6311a2cee15b117bd66ea9e0d25327af412ab00794ca8fbce6d9c19f722fd8e42f5a758fb77ef9a9197124c SHA512 2c5a4fa09ebadce9f756337f84670b6e0f35075a41ab94bee8d46a8c4fbab208c1eace1ddc0c85c117ee691f10bf89a49f9499f48d9179fd0d7b92fac75e4667
 DIST amd64-bin-libreoffice-7.1.5.2.tar.xz 135632188 BLAKE2B 0c7740d0687cd1585e31d58f6e65c9597ea3e29c1a185ffea92f356afdfb6f0d05a4fc5d8d563d100267591d7421ddc76a68a296b61abc9de32aa88defae723f SHA512 add324021d7aeba8bdd4991db690102d810d78e19d4e99132f1b2dd8ca5e8df6baacc302c3ffe16fca04fa47e4a03eb1b6e173665f8faaef3c1745654264160b
-DIST amd64-bin-libreoffice-gnome-7.1.3.2.xd3 1454680 BLAKE2B 0cc37af88f92e63611f9b5839abd5df17b691372cfe35647849a46d077fee602a9e666e2bac03e7b9947f366c66fe320f3210a3da20eff6892c8c2423ac90097 SHA512 0c60c2eb83850923943303eb20488d93bbf293c6537383d5c78d929db7293f7ea8646be1e5a4434cdbced7f76cbda848e8f8a0989d1a86d3e50bad77086b70c5
 DIST amd64-bin-libreoffice-gnome-7.1.5.2.xd3 1452639 BLAKE2B 346b6f36595b72bec1fd1cef254f9ba754eccdbc2125607bd0724d40f37d73e5ae4442e0c3d2d28f131d78da738e7ddfaa463e08e3ad20df1d0209367b36a397 SHA512 0669b6212d46dd9b255dfa5af4b668914b88e7fd5f3a0941a9a33c1823adacbb8788a159a5767269a53c57895bdc364d62fcc46aa48258dea8e98ea780f18200
-DIST amd64-bin-libreoffice-gnome-java-7.1.3.2.xd3 30402804 BLAKE2B 75dc39f40d891da3d75abda9ec9d7d00e8eb167af8df2967689610e7bb2a2744bf2628c9fbe165122b5899f2be3d604c385c904f4832d74c921a87cf97a476a2 SHA512 077948fadfe2e353550f41a42d6e1d8ca683553ec25e787831a082a005449d6f7adba732ec240df1237332561a702bf347e7e81e661b48174b433d65d444d303
 DIST amd64-bin-libreoffice-gnome-java-7.1.5.2.xd3 31245709 BLAKE2B 273ced503b234cbb1b263729c1ee371b3877e6317c7bd6627767623ab5402ccb62bc7bc0a7a436452d51800ee1af702f939d5fdd210819044ba27d4f4fa6237d SHA512 2d1b507d1976acc9012829c321171642a425879c9220e9222ab04296a6975ab1e309589c131436f0f81dd670fc43c57f61712a11ec0c01afff6328d8656027dc
-DIST amd64-bin-libreoffice-java-7.1.3.2.xd3 30266030 BLAKE2B 6386d2afeffadd2b917aa98895f46abb6a357660211f8e479aba3576f49d6c5d587061a2cc382ee8b64d922ccfad06ef14d94fe002494418c0d42d83fdf94305 SHA512 d8578955121e39aefa176a86b25f31f0aca2a7ad3d5463dda44c316be908d974abc1ea965807ae71d1290a1badfbb49d6067e9334e887d72b1e880493b0c81d2
 DIST amd64-bin-libreoffice-java-7.1.5.2.xd3 31129840 BLAKE2B 08340ae6b6d1398fca8a4b9f68e59e9636563daa5e2fc36e61ee9132762d607b38a6fe9aaedee164353d78027ea24372f929f509d26add72ac999f62597c9112 SHA512 7252a332b2aa632b6672ffe566edbf5795112823b6598877674c5a1c810f6f2cdcedfa8421e345dfd62e69af38c946a926c3990f17873747f3f78c4005317b05
-DIST amd64-bin-libreoffice-kde-7.1.3.2.xd3 21322010 BLAKE2B 9b9a90372114850470bad680b50af6d0c0e33f9d3918d8ce7b843bb54d839815b604797295b3fbcb04e7c7ca11c1c5713fa2ff9b83ab545b0a874badd2a32177 SHA512 d14c83d60ecc68e593f8526d09b0854d4a48524d5b81b1b548c5bd2d499be23ac3709ac1ba1b52f8967e1f095d3a479cd615d5137a64407ad90e928986d7e272
 DIST amd64-bin-libreoffice-kde-7.1.5.2.xd3 21940401 BLAKE2B b0b6ea5325f300eafb3265f6ebd08d72fceb73da9aed75d0caef01ead7ce6ecf08420023a2c69c43f6e76b32b65fd5fb1f0855445e2086e2856cd61e4dc108f9 SHA512 78b080d31d247b23cc4464ca1f8cfddde074f604a77b695d20d14c734a83116c7d8d77ef5ccac1e5048c7a54056b6efdfd03673d6c289fee2b2e303575fbd9fe
-DIST amd64-bin-libreoffice-kde-java-7.1.3.2.xd3 30613052 BLAKE2B 1bc769aff8965af40c3aeeef8390d44a9c57f920ae02e0ca4c9667071553c900c85268b4113493d6f3004edb9332b1719676077a30f4fa36575b483ccb1ecd79 SHA512 767b1d2c8be628fdb759440e5007c02d3110e288567cd67ffa18cb16da67cfefb8c2ada10c617f95900acccea41783fe6aa6834bbbc242d26a4929cedd09c4d9
 DIST amd64-bin-libreoffice-kde-java-7.1.5.2.xd3 31235891 BLAKE2B f069f037fc0cde082601db96ff70f13d6fdd65472793566bb29abbc03e46a3ae1c8539fdc054f9fb8302987946b7a1858e83705326d94847dba7d71f721d8539 SHA512 9040ed351c5ded0a0b50720edd1629f569b8bd455c8691340387ff77a99b2ef9f1d787696615a1255a235c3efc9adea62abd3d854f68997cc0b78dd1bb554d04
-DIST x86-bin-libreoffice-7.1.3.2.tar.xz 136535384 BLAKE2B b8a567cdadb36b6807a848f72549e781a6e44779464bbafbe1c228e4f1a17accb705336719b647990faea6df50a6949427babfaadeec6a3859b1d0776a6082f9 SHA512 d2b39f84bce4842c1edcc7e3c6a5a6dae0b9517bf73de5b62dcd475a93def8236d29633552fee088742de3458d284aaa782158862610f174740eb5b3b06238e0
 DIST x86-bin-libreoffice-7.1.5.2.tar.xz 137121580 BLAKE2B 2b45ff087a34f60af638baa0f1a603e50e06083ad8f4518213d3f6a603e410ae3778b02a0edd9de0554c5f21e4d7500cd98c4d58168417660275bb6027bf2a4d SHA512 9b20ffff147ccb0cd307faa6ed683b3f8f30b6129237ef0ec733f71132aa36266aec37b948dbdbe9e70c6a08c4f84f3ff9dd8f7bee84ed4f9d50c38dcc3aa0fb
-DIST x86-bin-libreoffice-gnome-7.1.3.2.xd3 1463008 BLAKE2B e8e40a4bdb9163722bd2eba295fb529d2ebcc025e9721ca9e30a5db0f4c5bef9f3e08b6efcc7b7e14b8cc6f59743ae412b1ec34ef5c1431cf0c61b5e87676cd4 SHA512 061b7a3d72e20d1f928dc8cc36f8d30f8830febe23cbfd66f4f973c7402fd05fa7b129e75ddbf9ed4073ff98162f90fc7e543672634e0b9efa05e9325fd9f4ff
 DIST x86-bin-libreoffice-gnome-7.1.5.2.xd3 1459130 BLAKE2B c53851d71ae61aa34c3b00e31e7a9218c4f8a7762febb798f2e3ab5c809c523afc978be8d6dedbdb79d9f67d60cfb28c709a477c103c2e2d1afbea8d70f798bc SHA512 b875d0b1b17ed34662eb5974d4696f0208bcca80d0a07301f2d67f6351330496e1cab472618e590459baf2f66bce24aac7247d803e0e5e3b09945f61e12d7895
-DIST x86-bin-libreoffice-kde-7.1.3.2.xd3 19177685 BLAKE2B 9598c49e65321a4faac6da16ae28127ddcd25bb5d056a1c0ee67b7442fbb25ab8df729ae3de7c7e1277c1364e07cdfb46b123651d03ea261621885915e944e47 SHA512 be53f662163b8eea5fc47d46942c48dea848c04f42278f90b3dfaf28ad4516e9c61ce0ea052bc845871bafb7a6a99d323e5ac3cbc60091d5e251c041653e339d
 DIST x86-bin-libreoffice-kde-7.1.5.2.xd3 18984437 BLAKE2B b5072ff8240a61cdcf593dcb3e3b04108f9fb7b309c38b9eb84d8f09a15e76c1a1f68d007b27220923be837f14c6bb1def6461336dc2693ceafd6852c8488704 SHA512 995dbb120d76ef31ce0fa8c3f7354799d9bab929aebe8120842e58c0e06eee21314059f6bdf3789b029d69f44df9a5c8fe5151f7e1cc9cd1101177af1e4ad7c0
-EBUILD libreoffice-bin-7.1.3.2.ebuild 6127 BLAKE2B fe27e27746819b2b81ab97717bec5c6141353b3301896815a5a918edcb6fa9db1eea9c87fd4326cc8934da82aa90fed497bbec781afe94a1232397017ef5a7e1 SHA512 658afc3ff525860afa143c99a60a46311d3e7809de73e240500a88290649813ae21f5efd0c624a220e44b2045382052a0b46d4e70ae0a6c2584f946b5e20f3d6
-EBUILD libreoffice-bin-7.1.5.2.ebuild 6132 BLAKE2B 070ab7fc42cf74b2c0110a062e2d38b163b4d99fac0736113eaef43191c0c89419fc09cd93ddc8a028d7cd2331460eeb3b844d2c156e656f4078d89c470aace5 SHA512 2ddc2c43c92b73d880da8704f25650006bf326115fc2e29e9b8b872d2f5c9faf0364cb9feaaead2456f5f398a25347838e2066257a2c47bb307dee968fe41e1b
+EBUILD libreoffice-bin-7.1.5.2.ebuild 6130 BLAKE2B 6b8e782bf3acbb3f7039214b8c0a4fb606ab35e8ba19cac450cdaa50591d10a2337dc653ec8737bb373e8f296fc80241f54d6466f3b09976ecfb23034a1fd596 SHA512 8f07c0f020c1be2daeac57323de6739f183fa52a31e9505b5043b0614ebfbc944cd6b6a2cd5702515bcccc2c8587f55a64a665df2d97b1f34c87da2291ea95fe
 MISC metadata.xml 511 BLAKE2B 3ebaebf19d7db6a7e64093e54ae4ce86f14f528dfbc0987c027bfd7dde5de6ce8e7bfdd815e437aff272b7201d298568fa032cfd3292523c00a1c2bef5bc984c SHA512 01ae7e196fa4b7fbca6190fda6ac2e2667b36a284e828f6b329593b517379f3f4575f96a2eecc4a1d74764fac19ba8d7a756a54c04190f2aa17c578705c9708d
diff --git a/app-office/libreoffice-bin/libreoffice-bin-7.1.3.2.ebuild b/app-office/libreoffice-bin/libreoffice-bin-7.1.3.2.ebuild
deleted file mode 100644
index b78b646376c5..000000000000
--- a/app-office/libreoffice-bin/libreoffice-bin-7.1.3.2.ebuild
+++ /dev/null
@@ -1,253 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-BASE_PACKAGENAME="bin"
-BASE_AMD64_URI="https://tamiko.43-1.org/distfiles/amd64-${BASE_PACKAGENAME}-"
-BASE_X86_URI="https://tamiko.43-1.org/distfiles/x86-${BASE_PACKAGENAME}-"
-
-PYTHON_COMPAT=( python3_9 )
-PYTHON_REQ_USE="xml"
-
-inherit java-pkg-opt-2 python-single-r1 prefix toolchain-funcs xdg-utils
-
-DESCRIPTION="A full office productivity suite. Binary package"
-HOMEPAGE="https://www.libreoffice.org"
-SRC_URI_AMD64="
-	${BASE_AMD64_URI}libreoffice-${PV}.tar.xz
-	kde? (
-		!java? ( ${BASE_AMD64_URI}libreoffice-kde-${PV}.xd3 )
-		java? ( ${BASE_AMD64_URI}libreoffice-kde-java-${PV}.xd3 )
-	)
-	gnome? (
-		!java? ( ${BASE_AMD64_URI}libreoffice-gnome-${PV}.xd3 )
-		java? ( ${BASE_AMD64_URI}libreoffice-gnome-java-${PV}.xd3 )
-	)
-	!kde? ( !gnome? (
-		java? ( ${BASE_AMD64_URI}libreoffice-java-${PV}.xd3 )
-	) )
-"
-SRC_URI_X86="
-	${BASE_X86_URI}libreoffice-${PV}.tar.xz
-	kde? (
-		${BASE_X86_URI}libreoffice-kde-${PV}.xd3
-	)
-	gnome? (
-		${BASE_X86_URI}libreoffice-gnome-${PV}.xd3
-	)
-"
-
-SRC_URI="
-	amd64? ( ${SRC_URI_AMD64} )
-	x86? ( ${SRC_URI_X86} )
-"
-
-IUSE="gnome java kde"
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-
-BIN_COMMON_DEPEND="
-	app-text/hunspell:0/1.7
-	=app-text/libexttextcat-3.4*
-	=app-text/libmwaw-0.3*
-	dev-libs/boost:0/1.76.0
-	dev-libs/icu:0/69.1
-	dev-libs/liborcus:0/0.16
-	>=media-gfx/graphite2-1.3.10
-	media-libs/harfbuzz:0/0.9.18[icu]
-	media-libs/libpng:0/16
-	>=sys-devel/gcc-10.2.0
-	>=sys-libs/glibc-2.32
-	virtual/jpeg-compat:62
-"
-
-# PLEASE place any restrictions that are specific to the binary builds
-# into the BIN_COMMON_DEPEND block above.
-# All dependencies below this point should remain identical to those in
-# the source ebuilds.
-
-COMMON_DEPEND="
-	${BIN_COMMON_DEPEND}
-	${PYTHON_DEPS}
-	app-arch/unzip
-	app-arch/zip
-	app-crypt/gpgme[cxx]
-	app-text/hunspell:=
-	>=app-text/libabw-0.1.0
-	>=app-text/libebook-0.1
-	app-text/libepubgen
-	>=app-text/libetonyek-0.1
-	app-text/libexttextcat
-	app-text/liblangtag
-	>=app-text/libmspub-0.1.0
-	>=app-text/libmwaw-0.3.1
-	>=app-text/libnumbertext-1.0.6
-	>=app-text/libodfgen-0.1.0
-	app-text/libqxp
-	app-text/libstaroffice
-	app-text/libwpd:0.10[tools]
-	app-text/libwpg:0.3
-	>=app-text/libwps-0.4
-	app-text/mythes
-	>=dev-cpp/clucene-2.3.3.4-r2
-	>=dev-cpp/libcmis-0.5.2
-	dev-db/unixODBC
-	>=games-engines/box2d-2.4.1:0
-	dev-lang/perl
-	>=dev-libs/boost-1.72.0:=[nls]
-	dev-libs/expat
-	dev-libs/hyphen
-	dev-libs/icu:=
-	dev-libs/libassuan
-	dev-libs/libgpg-error
-	dev-libs/liborcus:0/0.16
-	dev-libs/librevenge
-	dev-libs/libxml2
-	dev-libs/libxslt
-	dev-libs/nspr
-	dev-libs/nss
-	>=dev-libs/redland-1.0.16
-	>=dev-libs/xmlsec-1.2.28[nss]
-	media-gfx/fontforge
-	media-gfx/graphite2
-	media-libs/fontconfig
-	media-libs/freetype:2
-	>=media-libs/harfbuzz-0.9.42:=[graphite,icu]
-	media-libs/lcms:2
-	>=media-libs/libcdr-0.1.0
-	>=media-libs/libepoxy-1.3.1[X]
-	>=media-libs/libfreehand-0.1.0
-	media-libs/libpagemaker
-	>=media-libs/libpng-1.4:0=
-	>=media-libs/libvisio-0.1.0
-	media-libs/libzmf
-	>=net-libs/neon-0.31.1:=
-	net-misc/curl
-	sci-mathematics/lpsolve
-	sys-libs/zlib
-	virtual/glu
-	virtual/jpeg:0
-	virtual/opengl
-	x11-libs/cairo[X]
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	net-print/cups
-	sys-apps/dbus[X]
-	gnome? (
-		dev-libs/glib:2
-		gnome-base/dconf
-		gnome-extra/evolution-data-server
-	)
-	media-libs/gstreamer:1.0
-	media-libs/gst-plugins-base:1.0
-	!kde? (
-		dev-libs/glib:2
-		dev-libs/gobject-introspection
-		gnome-base/dconf
-		media-libs/mesa[egl]
-		x11-libs/gtk+:3[X]
-		x11-libs/pango
-	)
-	kde? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtx11extras:5
-		kde-frameworks/kconfig:5
-		kde-frameworks/kcoreaddons:5
-		kde-frameworks/ki18n:5
-		kde-frameworks/kio:5
-		kde-frameworks/kwindowsystem:5
-	)
-	dev-db/mariadb-connector-c
-"
-
-RDEPEND="${COMMON_DEPEND}
-	!app-office/libreoffice
-	!app-office/openoffice
-	media-fonts/liberation-fonts
-	|| ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
-	java? ( || (
-		dev-java/openjdk:11
-		dev-java/openjdk-jre-bin:11
-		>=virtual/jre-1.8
-	) )
-	kde? ( kde-frameworks/breeze-icons:* )
-"
-
-PDEPEND="
-	=app-office/libreoffice-l10n-$(ver_cut 1-4)*
-"
-
-DEPEND="dev-util/xdelta:3"
-
-# only one flavor at a time
-REQUIRED_USE="kde? ( !gnome ) gnome? ( !kde ) ${PYTHON_REQUIRED_USE}"
-
-RESTRICT="test strip"
-
-S="${WORKDIR}"
-
-PYTHON_UPDATER_IGNORE="1"
-
-QA_PREBUILT="/usr/*"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_unpack() {
-	einfo "Uncompressing distfile ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar.xz"
-	xz -cd "${DISTDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar.xz" > "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar" || die
-
-	use x86 && use java && die "There is no build for x86 with Java support."
-
-	local patchname
-	use kde && patchname="-kde"
-	use gnome && patchname="-gnome"
-	use java && patchname="${patchname}-java"
-
-	if [[ -n "${patchname}" ]]; then
-		einfo "Patching distfile ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar using ${ARCH}-${BASE_PACKAGENAME}-libreoffice${patchname}-${PV}.xd3"
-		xdelta3 -d -s "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar" "${DISTDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice${patchname}-${PV}.xd3" "${WORKDIR}/tmpdist.tar" || die
-		mv "${WORKDIR}/tmpdist.tar" "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar" || die
-	fi
-
-	einfo "Unpacking new ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar"
-	unpack "./${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar"
-}
-
-src_prepare() {
-	cp "${FILESDIR}"/50-${PN} "${T}"
-	eprefixify "${T}"/50-${PN}
-	default
-}
-
-src_configure() { :; }
-
-src_compile() { :; }
-
-src_install() {
-	dodir /usr
-	cp -aR "${S}"/usr/* "${ED}"/usr/
-
-	# prevent revdep-rebuild from attempting to rebuild all the time
-	insinto /etc/revdep-rebuild && doins "${T}/50-${PN}"
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-
-	ewarn 'If you plan to use the Base application you should use a source build and enable java and firebird.'
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/app-office/libreoffice-bin/libreoffice-bin-7.1.5.2.ebuild b/app-office/libreoffice-bin/libreoffice-bin-7.1.5.2.ebuild
index 7f86be3073bd..e567c14dd769 100644
--- a/app-office/libreoffice-bin/libreoffice-bin-7.1.5.2.ebuild
+++ b/app-office/libreoffice-bin/libreoffice-bin-7.1.5.2.ebuild
@@ -46,7 +46,7 @@ SRC_URI="
 IUSE="gnome java kde"
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 
 BIN_COMMON_DEPEND="
 	app-text/hunspell:0/1.7