gentoo resync : 19.07.2019

3 files changed, 2 insertions, 102 deletions

diff --git a/app-office/libreoffice-bin-debug/Manifest b/app-office/libreoffice-bin-debug/Manifest
index 619c1cea5133..ff107d08e2a8 100644
--- a/app-office/libreoffice-bin-debug/Manifest
+++ b/app-office/libreoffice-bin-debug/Manifest
@@ -1,27 +1,14 @@
-DIST amd64-debug-libreoffice-6.2.4.2.tar.xz 1637546044 BLAKE2B 45e7b5e032c992906ec85b16a9bf4621637b5f9475df319c9d3a6d0630ef6ea97e7de2fe1e923727da8af2d3ebe1a6d28010d560ea2a877a7baf51a43794b2df SHA512 b7cbcf49143d6f5296469f27266a6329b8d9c54f9efb662a6a69891c6a3f1e707169813ae6a5468d5d84545336836e9b3d1ed06b51a9d574e9701ddc94b5e95f
 DIST amd64-debug-libreoffice-6.2.5.2.tar.xz 1641072480 BLAKE2B fb084df67bbcf7af16050c7e72478b16b69c7cbe4cccf18ace02907e98e5e5d49ea516d6aa9a1c232984aafcbbcbcb009ca9df3f074642ac1c3ab9860f16757d SHA512 7f7bfb9dd90bb6e5a7b45987b46cdd0da29c633e93511d4a275a073a8fe15b165770f7536af5f2d351be636c904318d71a07d91da15da08dea4ba84b0046fc4d
-DIST amd64-debug-libreoffice-gnome-6.2.4.2.xd3 468745410 BLAKE2B e7b41740d4446d791c39851f1fe631c1166c722f5504c67b27a1da60fb5e02ece406c64ef27f1ef228e1df53b3d3603518dbdf5643a1aaff0f507aaf0b2a1d78 SHA512 65f79beb4e60713aa0b22d382ed3b3da5a905a1806ed11c86cc0c72cb1d07b16ea26c3228d91dae422ea720666863ee53a954d3e819b6ba5576375093f629cd1
 DIST amd64-debug-libreoffice-gnome-6.2.5.2.xd3 1609525 BLAKE2B 24df754b5a03bb06e08a3defff41d9cc135c787f7427c6e2948713c4f1f27cbf2ac20d8d9df25ee648221d36c355fdd70a39ea9498cc88a52a8c1fbb0ea396eb SHA512 8c34bccfd1ada25e5f3076631a1c61bf359d2e26a0ea97de3b073622e801e57c24cf1675f3b3baccce12b9d803d3c5ad432cb724074119766c60d416535330f4
-DIST amd64-debug-libreoffice-gnome-java-6.2.4.2.xd3 874137627 BLAKE2B 85738277be979d9af96c0c33005dca8abc0c42bb940f2b86ad8d3ad731efa38328103aa6069e0e3835c57761ce9703a16c2b7665975f1888a7132ee9a030ff90 SHA512 e598f3766c9febee1b3661f331cec88b4cf73f375614600a5b833a725b1eda9536dfd73cc761f0667328bb7ba3d203f22a63e5767f3d1e65fd3808ddc66bf61d
 DIST amd64-debug-libreoffice-gnome-java-6.2.5.2.xd3 866015327 BLAKE2B 014989b5f558590dc55f4f82d1a502804c6cb03baef35674fcaefb858925422b0ad21c821fe8e215c6cb6a01e12642d217a28bce42591034d808e5bc172869f1 SHA512 318e1fdf09bd06333e81f557ebb3ef26e745920022d8a1ff25f481737faade03be6613b39539f6e0ce4c58404c1baad3f1217c4b17673bf740b1c421d4f42933
-DIST amd64-debug-libreoffice-java-6.2.4.2.xd3 857444149 BLAKE2B d003dbed9e776d907264e4b5bb58a216c17833b5face6b42cfabbb5055a9c560a37e14babf880903710d029ddd5759596daccfadbf0fc0f81032d6175f4bff64 SHA512 d2206a50062bf48d1be7cbaf2cd74a2a0b76c410c7550c2db00dd3ff3784d41b3f3634fc6647e2221dee866465a6c060a8686e23e5c45d36b05a7362887fe91e
 DIST amd64-debug-libreoffice-java-6.2.5.2.xd3 864389819 BLAKE2B 14ea27a4c869c6cc3241d20d55f30f9bc471c4bf0816e9b4e7b1e18c47286734c752ccf1f438bb116ba3f56b10827a537a9dbef80f9b370d2ee6bafc2be45162 SHA512 ee04800538235f58256784989acfb8bc1a3c842016ee6a52ee875067f4614903b3de8367706f53e2a65d053793f50f536518fd409465af49bdcc20683014bc85
-DIST amd64-debug-libreoffice-kde-6.2.4.2.xd3 482383176 BLAKE2B c3a08965bac7a52828bc5403cc3f08366d239886f49f65709e86a54d859812ba275c3e0ad1d8b5fe7d10b7a229207273daf341af0f014c9cfc9c9d1a04269d8a SHA512 151111f047b57194a5d1be1cd092dd1e8e28444fbaa9a1516941b7cac93c69187be21698a26fb8442c399f234b60c9c8b99ec0ffc1855c968d9eb0c687422705
 DIST amd64-debug-libreoffice-kde-6.2.5.2.xd3 462116544 BLAKE2B 27cba58f6329a9318ea2c33959fa7bb942449d033bfc6cc3c0b730d2c1e29195119810205a49951639487cfcbb2b433539be191439b10f60b875a18429be8741 SHA512 50e1533397ab7d94004462ad042de09653fa75a87492acbc1650f3808c6187fb79e66fbfcf1b3088ed67711747a4601b0fea2c6c8a34b5ef8a167ee6bf535959
-DIST amd64-debug-libreoffice-kde-java-6.2.4.2.xd3 887769486 BLAKE2B 8914e9f23e6eae056df8afb00ffdd4990a982573b1fe5041fa37b3a40deb4c4edf1d56eb1a6f8134455e769f5a91f7da41b9105740a51c1ec3c104fc5f06b19d SHA512 021255fe383ea9470a233905daa48b2fcb1f13e1e05de625a370236a8003882d1030bbb417695e91257490e51943a6d04fbbce0d9b140468073c8ace5226e786
 DIST amd64-debug-libreoffice-kde-java-6.2.5.2.xd3 869114510 BLAKE2B d158629b437118e5bf00c637b33deb651034323a5931bb75d878fe4e1d38c1e10bf4dd6426f75cc3d7be6070e657f89587507649abc8929f03c9b19a1f6f9b95 SHA512 2849c1fbf12272d8206a3f37df5278d0cec3387de65d07f17b466a040ccb74b4fa33654dd6b54eecefcf986855a9ccb840545dcf4a926b7e0e6ce6ca07ad1185
-DIST x86-debug-libreoffice-6.2.4.2.tar.xz 1598638312 BLAKE2B 100d32663759aa0b2d3f0540179b267c80fbff43bb997775d2ec47a3b22fecf20c058aba91016469026a0a6aaa2df8348eb130694f1ca49fa31ede16a297eac1 SHA512 85173fc999d56acf1ad6dc7857b97f6c1a915e02bec6e603b79cda896f0d3b72d0c83e12e9d7ad1f13e5ffd7030f159cbe649590005fc8761566400401e7b003
 DIST x86-debug-libreoffice-6.2.5.2.tar.xz 1601980988 BLAKE2B bdd311cfc56b0458a10365d4cfe02588e533b84adbf6e7fc9aa23eaacaf152f2192e4ac4d6efcee5499fd83611993c3926fea24700d0f38755d9f1ad885397e5 SHA512 5ff75c07bbb39034550a61ee006711b45cd5ee8a51168f95557279f3edd0cfc689114af511933c140e8fd8023da1d5a0b2138692ee741ccfb923ed2a2decfc29
-DIST x86-debug-libreoffice-gnome-6.2.4.2.xd3 454784520 BLAKE2B 729059c75ec90f563148d7d10eb3bb0770ec2ad2ace2126fa3cbddb4e1043313015c62d6069de1750a8f8cc1bcec0dc754251bd6fb294b74299ebee69dc4028f SHA512 8d2dac20a46e56fb5fb6fc9973b7863346d79ea115caa7d9f502ba607573bf78fa07ae0948497c9c586d9c5c60f32a23b91c6955e98fc3be3e0eb3d2a8fc35a1
 DIST x86-debug-libreoffice-gnome-6.2.5.2.xd3 1551594 BLAKE2B 1b55521ac15d999dbf741edcd308907bf5581c1147c82508f53bcb85eebeceef34ac3d94cc7cf87c570a0df74092b1f003c22c75e70972f403f1803d83ba932d SHA512 681d0e2c094abe4038f295ea096e704bb92384aedfe45161c4d4bb0dbbfe2e2ed12a7aa6fa57b5f898d4738b3f0355ab1601a03c719c10382523b8c71da290da
-DIST x86-debug-libreoffice-gnome-java-6.2.4.2.xd3 797762116 BLAKE2B 3c62a50990b82cfc6f5e75ac823f02555736308b00889d52b61b0cb50005828d82b4c1a353dfaf7c3d848fdcf22f5871173fe8d6ef05f7983a65b2c7d79fca17 SHA512 ea43c19bef4d0ecff7be9ec956765135ea7545b37ca7c3b7403ba85959d4385e5960dcfd8299fae4f7a8b7e75ec07f51505ec82a1089b51174ce0cd0eac6dfec
 DIST x86-debug-libreoffice-gnome-java-6.2.5.2.xd3 787032334 BLAKE2B 36844f9fe34427002b6c609814c7c6424634d77ff8685e4370ac96fd7e34bd79c82312e2dbb7a0f6660c0150ab2f5eba2fe7b96359196c6f233eb51ae9c461d2 SHA512 43af63bd77db51aa64200723559ced63c13aaf39b59ece886b9b40ddf6ba7dd19e5bbc65f9aa01fde085605aff36c17401b9ef498877628ede3092fb1795c464
-DIST x86-debug-libreoffice-java-6.2.4.2.xd3 781613145 BLAKE2B 54c62d53e39ec447d5bd7c365377c7b2471d117878bf80c605d699423eb5ba4c80a43d2cfae3041dcb4f26192ad3c8d22792bdd951923827fe4edbe46c5b8651 SHA512 1978d8421c44e261824d4550ca4f83b89148ac0e6667726d981e63d9464dd4919dfc9d5e031fcf53275e05d57c11c35e17ce0b0198c36c4e2bc3d42b3e5ac6ac
 DIST x86-debug-libreoffice-java-6.2.5.2.xd3 785457596 BLAKE2B 5561c4273c8a7f86d7450bcfb21abd41d4e960f534a0faffcc55997310aef404b2eb30ba6d94672a729ecdf73cba91ea1ff868f019c0f9737303bf807250a60b SHA512 3bd5cad22eb5fc8df42ec30c067d7fd77e73ef5baabbfadf71ec6e7cb97224c9741b109e3ece48e3711c7dd16b7b7a413b373d252405f8925e80f0dcf7a8d0ae
-DIST x86-debug-libreoffice-kde-6.2.4.2.xd3 453229351 BLAKE2B 57af69830ef5ce52e565aac8b2f6f4b2c5fa4a272be31dc72a66c9a0cfcb781eae71984f88a0e9e1b7a410b26b3ff3ff1840d76311db3ac12fa44a7c439b37ac SHA512 98b6fd49c4818be914219d2c64aabba7b51719315608e721a6c4a44bf7e988fe4b6330448d001eef5cce1cf98804bef5bd004c906197f1983af4dd30bfdc1937
 DIST x86-debug-libreoffice-kde-6.2.5.2.xd3 439845649 BLAKE2B 1c05eea34715f9306282c642bbf42908e7949f2b7d054b3d41d8eb6839c51a8db264bbd402a4dc996716ec334adb343daccc9c10b1da2b1e3d75bacd8faedd52 SHA512 3af4fc023b102eb094c746414c8d985773af78132d715320b46e26ba1846767f558b85d35c624cf96ce6430e88aa387e128082ee672f8abd546a3582a8507bd9
-DIST x86-debug-libreoffice-kde-java-6.2.4.2.xd3 796187237 BLAKE2B ab7a0dca2ec127f14b05237a5779b9a9c6fee355d73ba0e61ebc90a7d528ba8d32e1abc86589c04f697ce476e2814557c4d2d73596c6f01cae9563333b7c1e81 SHA512 9e5ab3d39f8d0457ad2440731c8afb3b0c4668c5985c5acba1c8f6fe76ffb9230a4df9babbef71b0a639a8a96111560cb8b79ac576887642a7343238617640be
 DIST x86-debug-libreoffice-kde-java-6.2.5.2.xd3 786182822 BLAKE2B c27b353a2855126d593d5de38a4e5605d4f2afd66b156cb721158f658fcdc4129c95e419eaf0d182017461b7d544c320cecbaac70898188593718b2f5c5924c2 SHA512 4ce9814f4033fa4ca11a1bc6d14b1bffc14eead79610a944e3c5092df4ed285e6400a1669cff4db1fca0fcff526b64d38baeff166788820497619026ce6ff3c8
-EBUILD libreoffice-bin-debug-6.2.4.2.ebuild 2626 BLAKE2B 62ef593013fec0d24717823b361c0d0948aedc1e5bc2c99795d9b1f44f38f6e6de0598beb13342ceac5a7a8f247a981c9e9fefffbb4edd3ffc227aad57d8c632 SHA512 de472a71d20ae953b2a1f7da843c0cf24b25192e49d6f39862ec301734f5169e890c4717da8a280061b98936e7352662b0eb822e6587c18b7405c7a6f26aeb28
-EBUILD libreoffice-bin-debug-6.2.5.2.ebuild 2630 BLAKE2B 63feeb23fa9b3caffa0f0c786b500727f462df3dc5afdbad70fbd94dca5ba97e12766803bc11664837b4cecd96f13f01399540f1b471e6991cb824b4ecf5a4a8 SHA512 0e46b9945d3983b8fc97c60f74d9b9cfbafbcd4bdef0a8d57c2709b797779e4342345b305b40bfc8bdbaf72a018f85569a9f2a8fccae96da6a3f8ee27bee8fb8
+EBUILD libreoffice-bin-debug-6.2.5.2.ebuild 2628 BLAKE2B b9b4fba30c12523a0fb8565ed8bc4eda9be36572a9ff31683a3a5dc41c4206885a396b17df0d2dba68307272b8b74bf53eca2e3bf14e9a33af357fd2669b933f SHA512 33cf4fce837a4baeba22ec951ade6227542e6ede4fd08623656378e9ba35f36cf9666d367e1c11775fc67d59768f71b35cfa9865e297d520609026858e705f2a
 MISC metadata.xml 481 BLAKE2B 2b7085b47722f20719ca5e219b52e4334c4819db8c61dcee1446ac28e70cd90a3ac7e1713a4e95a0d3952d931ebcc34b137294b1e17f79cea9f41ec31fb3cd55 SHA512 6c5698440da103c49a6a26c99d3af9ef88f79a74542bca66cc8adad77dd5412760630e5753f163e92cbe58b53c0fd899b9115ca3ae85627bbacdc01c6dd7bb63
diff --git a/app-office/libreoffice-bin-debug/libreoffice-bin-debug-6.2.4.2.ebuild b/app-office/libreoffice-bin-debug/libreoffice-bin-debug-6.2.4.2.ebuild
deleted file mode 100644
index dd563997b9b9..000000000000
--- a/app-office/libreoffice-bin-debug/libreoffice-bin-debug-6.2.4.2.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-BASE_PACKAGENAME="debug"
-BASE_AMD64_URI="https://tamiko.kyomu.43-1.org/distfiles/amd64-${BASE_PACKAGENAME}-"
-BASE_X86_URI="https://tamiko.kyomu.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-${PVR}.tar.xz
-	kde? (
-		!java? ( ${BASE_AMD64_URI}libreoffice-kde-${PVR}.xd3 )
-		java? ( ${BASE_AMD64_URI}libreoffice-kde-java-${PVR}.xd3 )
-	)
-	gnome? (
-		!java? ( ${BASE_AMD64_URI}libreoffice-gnome-${PVR}.xd3 )
-		java? ( ${BASE_AMD64_URI}libreoffice-gnome-java-${PVR}.xd3 )
-	)
-	!kde? ( !gnome? (
-		java? ( ${BASE_AMD64_URI}libreoffice-java-${PVR}.xd3 )
-	) )
-"
-SRC_URI_X86="
-	${BASE_X86_URI}libreoffice-${PVR}.tar.xz
-	kde? (
-		!java? ( ${BASE_X86_URI}libreoffice-kde-${PVR}.xd3 )
-		java? ( ${BASE_X86_URI}libreoffice-kde-java-${PVR}.xd3 )
-	)
-	gnome? (
-		!java? ( ${BASE_X86_URI}libreoffice-gnome-${PVR}.xd3 )
-		java? ( ${BASE_X86_URI}libreoffice-gnome-java-${PVR}.xd3 )
-	)
-	!kde? ( !gnome? (
-		java? ( ${BASE_X86_URI}libreoffice-java-${PVR}.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}-${PVR}[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-${PVR}.tar.xz"
-	xz -cd "${DISTDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar.xz" > "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" || die
-
-	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-${PVR}.tar using ${ARCH}-${BASE_PACKAGENAME}-libreoffice${patchname}-${PVR}.xd3"
-		xdelta3 -d -s "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" "${DISTDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice${patchname}-${PVR}.xd3" "${WORKDIR}/tmpdist.tar" || die
-		mv "${WORKDIR}/tmpdist.tar" "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" || die
-	fi
-
-	einfo "Unpacking new ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar"
-	unpack "./${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.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-6.2.5.2.ebuild b/app-office/libreoffice-bin-debug/libreoffice-bin-debug-6.2.5.2.ebuild
index 82776e8e316a..481a1678f464 100644
--- a/app-office/libreoffice-bin-debug/libreoffice-bin-debug-6.2.5.2.ebuild
+++ b/app-office/libreoffice-bin-debug/libreoffice-bin-debug-6.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"
 
 RDEPEND="=app-office/${PN/-debug}-${PVR}[gnome=,java=,kde=]"