gentoo resync : 12.05.2022

3 files changed, 2 insertions, 96 deletions

diff --git a/app-office/libreoffice-bin-debug/Manifest b/app-office/libreoffice-bin-debug/Manifest
index 0796698d6baa..858086444f21 100644
--- a/app-office/libreoffice-bin-debug/Manifest
+++ b/app-office/libreoffice-bin-debug/Manifest
@@ -1,21 +1,11 @@
-DIST amd64-debug-libreoffice-7.2.5.2.tar.xz 1468341700 BLAKE2B 6838ec1d4b2e43aaa171b800c72848d9ca8e2a57b4686269c1c6890f87febb2504e591f5eaa4c15a88be4f899eebf836f0146713fdb2e24598cd8ecbab7991ca SHA512 a70c6402b8a4743f0cd0bdd06d4b6974669a7b6853b0269e9872d5c82d767bc251602f963413f96efa6c353c3b6639b9e17da6513ef4d1f04c4f3e900c2cc430
 DIST amd64-debug-libreoffice-7.2.6.2.tar.xz 1468971352 BLAKE2B b94770acb7c96f59f047b9ee468b29a621da2a379dfad4f295ed77bc8ac4c910884df9a5eaf38da03c8f58d4f62d3767f4c6cb791f96695357107a29bf4c9a5c SHA512 fe9eb2f3dffbb8f003ff05b2c98f30dcd69cb388eb9e045501caf6145ecb623b648abb91b9cca2873d17e1065738a2e7df9ee47150ea00e9891b719b4267a416
-DIST amd64-debug-libreoffice-gnome-7.2.5.2.xd3 1374344 BLAKE2B 563d88c5eac92d0c0402a0f46e406cde412b32b790a40b8a8aefd73a31ad5f9a8fb5180e4a518b296dbacfa10e88dd998fa662965fa20ea26b4c1ead83b583d8 SHA512 5e33b1a35f40f62f43d4f10256d3c54ab7d917a08d7e6a18837c26355b3688aea9996b6eece6e7f82827efd99885b242c7749d762568e10fec56fe910d9b35b7
 DIST amd64-debug-libreoffice-gnome-7.2.6.2.xd3 1382303 BLAKE2B 71291a92cd245c2e9ed68fb01ff1543a26a81d345d13fe1e5c57527c6fb716e7bd6ee393bd500fcee526605784b20db9aa6e891897158e6767b3aecfee5e9ed4 SHA512 6a9b4df2bb53abe79cf4d268b2f4da5e2a1c93444b37dcc2cfd4e0fd37a53db59ab69b9ecd2152f5fbd48d073dd579fd1fa21080b84c6b61b59cbe05df556c73
-DIST amd64-debug-libreoffice-gnome-java-7.2.5.2.xd3 753187527 BLAKE2B ad0367bb2a4a0aba4d999724f6386cd469474f9a998748c0eda2f6e1109fa2fb06f7d71a0ea9b1bf3bcb383249b546197ca05bf0a2a63057d81f01ee35b682bd SHA512 7159ae06cb294f4323905f9aaf2c495e735e749acee8960eca9bcf72ca25718cf66c6de2811bfe538b0fa948b427873a42f0ea39af27d19bc306e68d4419ce27
 DIST amd64-debug-libreoffice-gnome-java-7.2.6.2.xd3 755642290 BLAKE2B b1a355f4fa92996990c481133bea367a3ed019796159be4c9f3e877dc50fb1d0e460aaba369f2b065073e6f2005e15030ef0812b6bea8a3ab4e069aefd7cd351 SHA512 5524b1215dbe0839d6a17d022a2c06f4df30dfe4cc623c61e0e122a4613eca459fa8d71e78b3868a587ea8bc23bbcfd72cecb6ede1c09f397efd98683efdc7bd
-DIST amd64-debug-libreoffice-java-7.2.5.2.xd3 751807644 BLAKE2B 103f01604bd2606566482b6be9b58acae1d82ecbfe035b73bbec87e7f7ddd9649007ea3911ce395987d34bdfb252397c98617ff3c6da4792ae7df9e726ed59d6 SHA512 47e9725f46465680535520383b27e64d29f84df1b6152a312f070f84157e88ca32767a2c2e352623df5c29ed978b624696b217fda943dea07879d2f05e1c5360
 DIST amd64-debug-libreoffice-java-7.2.6.2.xd3 754236655 BLAKE2B 324345c211da2b8773e81db97821324be77a9dfb712ae5c377e09d9d7fe9c0c2f9d352cc241a23ccbf091aba721c738fe56b65e7db500d7041fa1c893b0be73f SHA512 0249814b8b5d07a99bb35c154ddc31cb228c066a9af4d87730b81caac628f189ac0717d883a116f3c99d3a2cf058015036aadb47241122c34495d94a0e595ec4
-DIST amd64-debug-libreoffice-kde-7.2.5.2.xd3 460040481 BLAKE2B b2eabce2b53944997367c5158c8c1ca7bfb2e82e17b58e9142ca3bfa53fb3c848eb719f0e8b11cf3967ff034ead48548f5624a449bbb358eae247df5d1da9639 SHA512 734856278ef502f638e85a2da731e39e464ee7fce13f598f8e01fd8ff3ad7deb4266c1c9249c072bf5b28814ebf98dd57afc9c2f808471a77232769aa4649527
 DIST amd64-debug-libreoffice-kde-7.2.6.2.xd3 460398978 BLAKE2B 30d95ed2b40fae34259d7922ad963fc330c2f9311320af4796e09c96b713234037c1c4d0a7e38e870d2ebd87dd6a8d0da48ba1d0e42f1c46da1f1cc63a40d8fa SHA512 c66330553a0bf09a1027d45e229065c71d6585cc3c1f6598b4ef393ae0aed14c223cfb8fe6f711c74caa0c3bfedbf02d45fb07c8560af465edcb77b08fc2bc3f
-DIST amd64-debug-libreoffice-kde-java-7.2.5.2.xd3 756364946 BLAKE2B 62606d4852549494f1907490453c7c2d51b45f8c237a875aca0cbe68873bad5dee4a8660d7477477eb5695c3dfd9363d0c19ef4cffd238eb2e8b4725199b4783 SHA512 8cf360bf8614da8e88dcba711218b6352df6b90fafe6a3e0e4c5bdd8365fe484161391a6b73ecf8ca2b15694b483754d244972f7069a5fe18acfc58eccb28088
 DIST amd64-debug-libreoffice-kde-java-7.2.6.2.xd3 758655199 BLAKE2B 26382ff16e3155e5786ac7d7a1c0eabc815c8a45d8a129a5f07c39fa39fb678c212feb8699ebc9f120b223d0462af15c01bafb74c81f08d5213fa38e0b6d951c SHA512 7cc9292420941fecf9e9527a35b8a56238574793b64fc54b5fd8cb0754b62128c2193a9933664b46162f2aafe1afbb18a30b09f134ed39a81bbec3cf79f8f5d6
-DIST x86-debug-libreoffice-7.2.5.2.tar.xz 1437665708 BLAKE2B 693afa40cf054bd0a6b84e3f610dcc22147925cc635b671b79812a224384895d15acb8529c5f42ba5ce77891b4383d5f519e74584b0fbd5ee8253f4089a811e1 SHA512 f9e7fc0fc90193aa1d969943986c118af12eee284748dfec689833deaaceaa4c2d716ff54862a901c38a744ee4386ff09bcd78ef3453f40e9ddc609d61185d11
 DIST x86-debug-libreoffice-7.2.6.2.tar.xz 1437742176 BLAKE2B 762e7eb6c7566983306920978b5e689fc7a75016c6861c4fc878c17e19a1b948e14d7ec6749dcaabd9d918d2583db1c9cf51f5d9e111530ef7550f3bcd92b8b7 SHA512 446122ffa154111062b7178acfe116e53c6335fd29963838f7e215fd91ee09c4aa51cd5bd058652a42cabe61b93672b7437067846d6020fb5be2dc93933e2fed
-DIST x86-debug-libreoffice-gnome-7.2.5.2.xd3 1332559 BLAKE2B f87725b3bdae2a60f071d44479c1b9f8734661761a91dc328210855b583011a603b66c1eb9842bb3ea55a445028b328950d4de4d4cac91ca0c7cff787ce8ff26 SHA512 d1490cfc5a0d29165393ed36564b2228f84a37cb031410dc533f843743eafcce67b8fc6fc43bac12a010fe6a4afacf65fc2f9327057c30069169a16916fdc1bf
 DIST x86-debug-libreoffice-gnome-7.2.6.2.xd3 1340712 BLAKE2B 8004167ce6f32f97720399fa67de5a6f3c2b2df6ec815fa5c3764755aeefdddf5c67c34b8d2058dfcae420481b1cccf67d9cfbb2c416ba0d18bf24416bfe2bf1 SHA512 1ba6d86ab8396992a326144b3225af4f8d41a97bb97af2892ae9393d292c751598325f73ed5010f7de61099bb1861abe105a5fcb02579c63733957fac533aad2
-DIST x86-debug-libreoffice-kde-7.2.5.2.xd3 437928491 BLAKE2B fbf1ba96d82cdfb68670b2e1be55b4c9f26b4b0dad77e2b524433bdef06e8693761918db0547182e9bde59d2474511ebf0f5dda11c23e7cee03a98198d6aade5 SHA512 79c7c31c83b582f736ce2c520041354dc11bd7274701eb26fad93d76090d9d10b443183402b4253621fae35f87b33da3ccd645f5a5cfc27e9e7c001291d07668
 DIST x86-debug-libreoffice-kde-7.2.6.2.xd3 438069622 BLAKE2B e5602a31725801540300a78ec359d67c6df1c29c4663c61e5e72c7bc4bc119eda6cb005e4aae763c3c43df7fa6491419dfc8d7f7dfd3ccd61de2e53cf69c7fb2 SHA512 dd0cb3c92a415dae00f476c31d3185cb65acbc03edc1c303c8dd21ca282c783293aedfdc21412b6a5a73d92da99b6c32b478c269852152977e099297cbb7713a
-EBUILD libreoffice-bin-debug-7.2.5.2.ebuild 2451 BLAKE2B 5e3dfa9db695203636656a3cc16440f43d740adea37309f062f6290209885c71b5dfebe9e04edfbe2788b8972f37ccf2a550dd0e440dc16e20f7d5379f8a29cf SHA512 cbad6fb433a434742b2534798dcc9c6ade97f514defe1d58f6b7dd34a319f4dd19551825e31a92dca3c1b682e3de9cdf60881afff0f60b35626e042b8ce12ced
-EBUILD libreoffice-bin-debug-7.2.6.2.ebuild 2453 BLAKE2B 99c1c3f98aeffe7d8c1d4a61153d45c3ca0ed216d1f9033eee5acddd91fc997633847000b798ddc6147d9e4df37343fd5be50a53ef93d4ff27d75fb410509b9f SHA512 7e09f2f4ab869d58298724d2fe00d62863bca6175742766bc6cace310784647e9fec45305c7ef862546dcb72025633f4bfbaed54d4693a1649f6ab0678cb7297
+EBUILD libreoffice-bin-debug-7.2.6.2.ebuild 2451 BLAKE2B 5e3dfa9db695203636656a3cc16440f43d740adea37309f062f6290209885c71b5dfebe9e04edfbe2788b8972f37ccf2a550dd0e440dc16e20f7d5379f8a29cf SHA512 cbad6fb433a434742b2534798dcc9c6ade97f514defe1d58f6b7dd34a319f4dd19551825e31a92dca3c1b682e3de9cdf60881afff0f60b35626e042b8ce12ced
 MISC metadata.xml 482 BLAKE2B 94bf0468867227f0b085d6ca86359e9ae852fb874ed95ffa6d9926cfcdc7173d5db4dfe1a0ed86daec746a4f867d42534465bb03402c5bd4d9ac6bb8101932d7 SHA512 d4f6a8f90659676fa509690059e462c1755e22792efeff0a571d8f04f9f167cbed22d5ce34928a4afbf2fc01bf7ea2b5e8f1a70d4a652a3df9153ed0ccbe1905
diff --git a/app-office/libreoffice-bin-debug/libreoffice-bin-debug-7.2.5.2.ebuild b/app-office/libreoffice-bin-debug/libreoffice-bin-debug-7.2.5.2.ebuild
deleted file mode 100644
index 3bf7989da80b..000000000000
--- a/app-office/libreoffice-bin-debug/libreoffice-bin-debug-7.2.5.2.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-BASE_PACKAGENAME="debug"
-BASE_AMD64_URI="https://tamiko.43-1.org/distfiles/amd64-${BASE_PACKAGENAME}-"
-BASE_X86_URI="https://tamiko.43-1.org/distfiles/x86-${BASE_PACKAGENAME}-"
-
-DESCRIPTION="LibreOffice, a full office productivity suite. Binary package, debug info"
-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"
-
-RDEPEND="~app-office/${PN/-debug}-${PV}[gnome=,java=,kde=]"
-
-DEPEND="dev-util/xdelta:3"
-
-RESTRICT="test strip"
-
-S="${WORKDIR}"
-
-QA_PREBUILT="/usr/*"
-
-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_configure() { :; }
-
-src_compile() { :; }
-
-src_install() {
-	dodir /usr
-	cp -aR "${S}"/usr/* "${ED}"/usr/ || die
-}
diff --git a/app-office/libreoffice-bin-debug/libreoffice-bin-debug-7.2.6.2.ebuild b/app-office/libreoffice-bin-debug/libreoffice-bin-debug-7.2.6.2.ebuild
index 242e5e7214bc..3bf7989da80b 100644
--- a/app-office/libreoffice-bin-debug/libreoffice-bin-debug-7.2.6.2.ebuild
+++ b/app-office/libreoffice-bin-debug/libreoffice-bin-debug-7.2.6.2.ebuild
@@ -41,7 +41,7 @@ SRC_URI="
 IUSE="gnome java kde"
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 
 RDEPEND="~app-office/${PN/-debug}-${PV}[gnome=,java=,kde=]"