gentoo resync : 20.03.2022

3 files changed, 3 insertions, 270 deletions

diff --git a/app-office/libreoffice-bin/Manifest b/app-office/libreoffice-bin/Manifest
index 4ae63a822836..31fa26eadac4 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.7.2.tar.xz 136085032 BLAKE2B ef4493c580726d26d3bf05a289acc2f030ba77f7924bab265e9c74f22f79616b61f3f51380526d934f1e3c9d697765f427676ffb483a5547f0fa79b99de17d7d SHA512 b45503b8e8105ede3e02c32ea50c602bdf79238cdd8e1d7c8abb503538ecfe9d359f59c174666cab3d4621e740525d6e2f002fa28c9f77989cbc3c963cb10135
 DIST amd64-bin-libreoffice-7.2.5.2.tar.xz 141659504 BLAKE2B 3f8004e28c52ba2894d3ab4c643291b3ab307818599ad17af062a7cbd6d0ce096fae610aef955cda730344699ba6d025d532c95233b13c7d4083bfbbb227e517 SHA512 4083a0e6c0321478453eaa3a4fe5473325dc375900b3631876cb1695f4b6f6e81b2c79045eab92d76ddcea13ae7100f115a3f2b7da86afa20d4ff1ef67018dfd
-DIST amd64-bin-libreoffice-gnome-7.1.7.2.xd3 1468305 BLAKE2B 117776d451dd580af3448fc109475d09fd4f8cec2e3d7d8d2b628a4bc469aaa18b96c1217e69a43197553b373a1eeee314100ba90e6283c938cbaf9f8029f667 SHA512 6a989daac6215de1029136b5723bdead79afa3f420d4f4a1149c31ce1a6ec69a38443f7ff74f9d87cb594895810009a110a758323a3ccf1d1f8c7160377aacb4
 DIST amd64-bin-libreoffice-gnome-7.2.5.2.xd3 1454525 BLAKE2B 2037e87a38b2cd8d30583b6145c99d884692e053f3e0d7002a2e8e461af288c0a122786ecfcd9e82a6c5c4f4bb98b2c59474874eed23272fce66cff9d282e68b SHA512 dbb2c1f5ede93d3ade9932ba1c0f4709e54280f171cf7a6efe1ec67a716ff6370f994ccc3ac62432d3503b9cd840027cf4b865ad31ad095ff2614f4ea93583a6
-DIST amd64-bin-libreoffice-gnome-java-7.1.7.2.xd3 31065813 BLAKE2B c7a561fb69a79a5da02b52db989e36baa2e158cc81b4a03c77484b0191feb6a4b21aeefbc17a5242c0b8817483476ea089791d14682f342d30bc44e587aff004 SHA512 71b8b0ccc93bef2da88c481c6f832147f542af41d9858ad4c7763de6b35fa95d971db28609a6ef0d03bd98b5c27d23e0196889b94f9150ff337853ce2b4665c6
 DIST amd64-bin-libreoffice-gnome-java-7.2.5.2.xd3 30819131 BLAKE2B a6cd99dbff624338c33cd00fdda1b010acbc2a5aa3d0025a8481bd047d8f74235e5026421885244fbd800fd8af4d4218d4dafc32afea10a48e3171e60109cdf5 SHA512 c9c0266ffd557c6551fd663d7bda186d9a434fea4c7e6fc26bf3d2afa3eac74191d3837dd49d4447209c53baf18c6fe3394c2362c5d3e011de70ba75332d8237
-DIST amd64-bin-libreoffice-java-7.1.7.2.xd3 30876880 BLAKE2B ab1eebacd6f338a5d17a71f04fb04ee485fb68cac54bf008b58675013c77dd0be407fa053a48821d6fc98ebd2f22fd58a21f4c646c49d5c31431e073cd308ac1 SHA512 2ab214cb5f776d15b420adee25ae529acff785735e0f3af2af700769952c41b299d4aa2becd8804d11b48c96b7ff093884b62de758e69574ee829a89ce16c8ea
 DIST amd64-bin-libreoffice-java-7.2.5.2.xd3 30704441 BLAKE2B 7ce0ad8b709f6331f94c56b29e45047c320502797fe23175f9c517cad8e1b192e5f8f2d92d4ddaa0a551accf33b587ed6493369366ae4496473e9e666d6df134 SHA512 6522aa848195b602681d972902e485bfcb018e578f8b0a693aea35a0afa772d054b62f3eefb3e53d54c9791fbfaf275104dd2d95e8c7f8b08c5f55a29247e410
-DIST amd64-bin-libreoffice-kde-7.1.7.2.xd3 21776147 BLAKE2B aa3b38ee9254199f3e23241697340650608786db2789723a0ab306b260a27b12a2171d1218434b7cc9d79a39a4335881fc8f1607da46dac643e6ef4f50afa3b9 SHA512 35f016d5b7b06cbc85c754588e074e5eda5f3f0aa92a36659381bff18c493bcb3ee7c2b366364928b1a3716c0b4819b8b5b17013c84862a93331c9bed92287f2
 DIST amd64-bin-libreoffice-kde-7.2.5.2.xd3 20966714 BLAKE2B 9a9503a191259ad054d72582b88e5923738bdd7bf3008493e6064b4fb84973c5763d8c29bf88db438b5772f11b63ad029ee7a32d791a99c640a56a1e1ae94195 SHA512 2ea0bb46e19548e9c24f0f9713d1c9368619d4d83fb8332ee85a3bc72497d70110a2954b93c51411c83b691195a17861b17657884d73e87f5699fb7d8c40072a
-DIST amd64-bin-libreoffice-kde-java-7.1.7.2.xd3 31001312 BLAKE2B 7fa7e30a355cdda02fcbb138a8898fe4251643480e7b82290f50186e57837e6b9ea9f59c7b6314aa9b64ca8a80be3a337e90bb262fb986d93e530cf83ba04d79 SHA512 d680c553f899ca3af5b76bf33d40e548e435016a7b3d5c0ee24cfde57b0ec4ef0362a302123ce79d0cd6b686ea60523e0320e8041e37538e52f68b9c62ce9929
 DIST amd64-bin-libreoffice-kde-java-7.2.5.2.xd3 30833000 BLAKE2B 20b8c90984db7f61f92d4e27503231efd88f04fee92743e1e80f5d5ba760b08ca77984dc63411d10219b88be50b5140ca0bdf161077aeee3e921dcb2e4f2cfaf SHA512 60d065c777cc922b6ce04c7f5a7d5eb7caeb76356cd4cbd574a4a1e70df8eee387898ab98f6c669dbc19d5b615ee31d0a13d50b02cdf9ea0b3ae8d209c0bf8f6
-DIST x86-bin-libreoffice-7.1.7.2.tar.xz 137617724 BLAKE2B 919be7e29ac3f5c6eb11ac26a10b5005ab64e31a8873cdc5eae896afd3b6ca197c18f90d55c5ec2f6e02e1a03e8929076df9f55d78b356fc13f40fc8ac62c5d1 SHA512 ace271ded273c9b081193d7d31a82ee4474c9b070969d9e848415fa47caf0b314342335cf5dac7a14ae758641f9073ad56057dc5d7e3bc6683bf4e2285b6642f
 DIST x86-bin-libreoffice-7.2.5.2.tar.xz 143261716 BLAKE2B e9b147d79265d5e73c4af998808b12c0c07efd23ccc234f49f26db1827b94ef6fade8e692955e36cda8e3a067ce4ac03eb400f92526ef33082c347c2540ccf90 SHA512 b436c2cf330c2770b2bf7e80d8645ad55204b5920d41ca0c8506d3b0277ed967ade55bec1affbc42cb2b28f7723e42ce5207c4d2bdf293e0777eef31d9675202
-DIST x86-bin-libreoffice-gnome-7.1.7.2.xd3 1455549 BLAKE2B cfe2c9bb8ef2b237b8f672c54d2a4a062cf2d4385a3268d17610334eaf43f7fa1c669ae0e7562a4c551ef757a60fb533af14bcde425fd70a96bdf3bbc1090c4b SHA512 63262258b34cd10b0f2adf528a8d3368552c975b6f40cab2db1f86e768d721d4d78ff6559165928d2f6d920daaaee14234abc1588106a00634cc8b4f7b57315f
 DIST x86-bin-libreoffice-gnome-7.2.5.2.xd3 1459128 BLAKE2B 041da1b99e451933ffcf2f9d8652b080c41b3fa0ac31d38c0cd7b23d25e3e519c190feb114c430453107ea402867128497b36bae2467e3473aad68e134b530a9 SHA512 8c1821b788655a337e1dd19d4fb020729befb47f36f76bad0521f65ff96863ff5920e70e0f59c7964adf609603d64f521a61862e9434c85a9f6520aeb173be3f
-DIST x86-bin-libreoffice-kde-7.1.7.2.xd3 20180804 BLAKE2B 2db3f8240f3bcfa1c719f98dd8fcdf9f93bf0e755211d06ffdbb456743dcaba05a5062563c7b6fd0b92e29f9a73c2752e532e7479cc7dc33f608a81fc10025c6 SHA512 0383a87693a09ddea3466ef60e98df2838852cb32c136ffa7c68687f637d7a056f426bd3cf478d6552be511cd7dc3824d95ce070fc7e14bc56f0c46ed19a389b
 DIST x86-bin-libreoffice-kde-7.2.5.2.xd3 19655768 BLAKE2B 5dc888bc468bd4458752200ff437bca544e83b18c4f0de000228dbc1e8a738fb992ee97add1fd2f0f3bdb8896d72eee2d7d07aabec3c301c6e588f2e1a5ceed0 SHA512 544e3a3da7362621b4044a47180f1959080f42fd20c5b5361d09da239c3ec6f2cee2bacbf57dc1e4da6076fca58345a3a8ac1a9cf1f7001140b891242785822f
-EBUILD libreoffice-bin-7.1.7.2.ebuild 6129 BLAKE2B 6aaf4a472f0dd40d7204ee28ffab82b2b815d2ad1e30d754acd4b06e40617a807d22c4b49aaa9166394a435351fc13a6da0d44c30d2f95fedd27ea3913cf54ce SHA512 32d30371dce2e29b9e8eb9f2ec0761d227aefa64ffd2f13109325cbc47bc7e56aea06cca9863ff0c19a75cc460b8116379ee310499ea186c655d334a7093c830
-EBUILD libreoffice-bin-7.2.5.2.ebuild 6165 BLAKE2B 181d3b97562766fb6772160d7a06745f46ddb8dcdb5bfeeed93f6ecb5b67cc821d34ea9b877504fc01d79283f85c2cfb3d2fa18f813944a46bbd4287a1c11095 SHA512 6b636ea722198567d08c0680e0cf3c74281dfa666aa9ff5f9f23cb90e6d4ca63ef8e6895ec41165e78b6cf212e8cd6e75cdada6f162ee25cf9893bc2aa58d185
+EBUILD libreoffice-bin-7.2.5.2.ebuild 6098 BLAKE2B ab2aa90a36ab1695e11b2fa0b1411bd998cea702e19f54f861c7c221773b9cd672cdbebe17aa5266720b0563e41254d06f7efac848ef94a579dce8abb0fc6520 SHA512 85b1669200f79c817a3bb94c31fcf06141ff90936422a11ba53f7cf1feba2904649317c22f9c74dbe427c4d88193c51ddbe602f495c5b9c85d016b5760a72e45
 MISC metadata.xml 511 BLAKE2B 3ebaebf19d7db6a7e64093e54ae4ce86f14f528dfbc0987c027bfd7dde5de6ce8e7bfdd815e437aff272b7201d298568fa032cfd3292523c00a1c2bef5bc984c SHA512 01ae7e196fa4b7fbca6190fda6ac2e2667b36a284e828f6b329593b517379f3f4575f96a2eecc4a1d74764fac19ba8d7a756a54c04190f2aa17c578705c9708d
diff --git a/app-office/libreoffice-bin/libreoffice-bin-7.1.7.2.ebuild b/app-office/libreoffice-bin/libreoffice-bin-7.1.7.2.ebuild
deleted file mode 100644
index a4a3a201001f..000000000000
--- a/app-office/libreoffice-bin/libreoffice-bin-7.1.7.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.77.0
-	dev-libs/icu:0/69.1
-	dev-libs/liborcus:0/0.16
-	>=media-gfx/graphite2-1.3.10
-	media-libs/harfbuzz:0/3.0.0[icu]
-	media-libs/libpng:0/16
-	>=sys-devel/gcc-11.2.0
-	>=sys-libs/glibc-2.33
-	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.2.5.2.ebuild b/app-office/libreoffice-bin/libreoffice-bin-7.2.5.2.ebuild
index e44f1a54f016..c512839b203a 100644
--- a/app-office/libreoffice-bin/libreoffice-bin-7.2.5.2.ebuild
+++ b/app-office/libreoffice-bin/libreoffice-bin-7.2.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
@@ -171,11 +171,7 @@ RDEPEND="${COMMON_DEPEND}
 	!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
-	) )
+	java? ( virtual/jre:11 )
 	kde? ( kde-frameworks/breeze-icons:* )
 "