Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRepository mirror & CI <repomirrorci@gentoo.org>2020-09-13 00:11:26 +0000
committerRepository mirror & CI <repomirrorci@gentoo.org>2020-09-13 00:11:26 +0000
commitbe4d6fe098e1bd8b9a6d27bc4508e6b74167063e (patch)
tree0a74a4dcc1c7776802ea8cb4efb7979acba3fbf8
parent2020-09-12 23:05:36 UTC (diff)
parentnet-libs/mbedtls: amd64 stable (bug #740108) (diff)
downloadgentoo-be4d6fe098e1bd8b9a6d27bc4508e6b74167063e.tar.gz
gentoo-be4d6fe098e1bd8b9a6d27bc4508e6b74167063e.tar.bz2
gentoo-be4d6fe098e1bd8b9a6d27bc4508e6b74167063e.zip
Merge updates from master
Diffstat
-rw-r--r--app-office/libreoffice-bin-debug/Manifest12
-rw-r--r--app-office/libreoffice-bin-debug/libreoffice-bin-debug-6.4.6.2-r1.ebuild87
-rw-r--r--app-office/libreoffice-bin/Manifest12
-rw-r--r--app-office/libreoffice-bin/libreoffice-bin-6.4.6.2-r1.ebuild251
-rw-r--r--app-office/lyx/Manifest1
-rw-r--r--app-office/lyx/lyx-2.3.3.ebuild175
-rw-r--r--app-office/lyx/lyx-2.3.5.2-r1.ebuild (renamed from app-office/lyx/lyx-2.3.5.2.ebuild)1
-rw-r--r--app-text/texlive-core/texlive-core-2020-r12.ebuild (renamed from app-text/texlive-core/texlive-core-2020-r11.ebuild)3
-rw-r--r--app-text/texlive/texlive-2020-r9.ebuild (renamed from app-text/texlive/texlive-2020-r8.ebuild)1
-rw-r--r--dev-haskell/monad-control/Manifest3
-rw-r--r--dev-haskell/monad-control/monad-control-0.3.2.2.ebuild32
-rw-r--r--dev-haskell/monad-control/monad-control-1.0.0.4.ebuild28
-rw-r--r--dev-haskell/monad-control/monad-control-1.0.1.0.ebuild28
-rw-r--r--dev-perl/Dist-Zilla-Plugin-Git/Dist-Zilla-Plugin-Git-2.47.0.ebuild57
-rw-r--r--dev-perl/Dist-Zilla-Plugin-Git/Manifest1
-rw-r--r--eclass/multilib-build.eclass10
-rw-r--r--net-libs/mbedtls/mbedtls-2.16.8.ebuild2
-rw-r--r--net-libs/mbedtls/mbedtls-2.24.0.ebuild2
-rw-r--r--profiles/package.mask5
19 files changed, 434 insertions, 277 deletions
diff --git a/app-office/libreoffice-bin-debug/Manifest b/app-office/libreoffice-bin-debug/Manifest
index 3169f38bed5c..e261d6d74aea 100644
--- a/app-office/libreoffice-bin-debug/Manifest
+++ b/app-office/libreoffice-bin-debug/Manifest
@@ -1,12 +1,24 @@
DIST amd64-debug-libreoffice-6.4.3.2.tar.xz 1575837176 BLAKE2B ee243e729bbe5747a5bbdade14c95324f127db92f426a5814b2b4d3a93c373c13b75b6a229b643cb05225ff8a44425516c4450650afaae556e053ee8217a563d SHA512 429c7d0c6a8205daa2025f9ff0b40d8c40748586d8f2099327ca17f45fc3ed797716cc9c3ec6d1568ff8b36721c5ca30fe7b4f8d8df4d5fadb046162d3befc16
+DIST amd64-debug-libreoffice-6.4.6.2-r1.tar.xz 1533904268 BLAKE2B d5b4c718111a7771f1787d6151e22b3e82f4a08c8c2dd4f244a514f4d3a7204bf0cf7a415d42f8f88e806a6eec478e09328a89c91452163a32766dd40907ae6e SHA512 aedbdf669f7c390c8c1e3c675d486b87d463404cdc718ea2d3a1667348a6ee693814ac2f543246310fc10e41c7a490b7da23b3e71208768b7b7a65f06431e853
DIST amd64-debug-libreoffice-gnome-6.4.3.2.xd3 1650286 BLAKE2B 8db44dc00dee6d592109b2701168ace2433e1eae391a25ba991af247f2786000436144b554a924d2a0e65763dec90938e872c04f982a5e98ee8cdfd1aa4c7152 SHA512 b5ee4c747f083365c62f1cc606739e8d5c6724f7094c873f4cd7ce2e28ab0c72b4518d4fc19c1b2b54bba78dad85fc35be4c004bbba6d76084ea33ad5c4bb782
+DIST amd64-debug-libreoffice-gnome-6.4.6.2-r1.xd3 1567104 BLAKE2B 0d36f2d95586ad73f56bf456fb306e79964f3d1f3b6a06782e56b43af64e521855a988573862f0bdaf337fc846e30d351ae7704930356b78b0e3a2ec5fe934f7 SHA512 d02eb67080a86a35d248485deda98c10cc6c15c67a819773a8bbc934be584d706c463c9d856ee50a601f954fd68efff9e67b74f546a7a15a33afe7642d217906
DIST amd64-debug-libreoffice-gnome-java-6.4.3.2.xd3 776124041 BLAKE2B ee631608b5fa67d45320ee715b0209e1fb1aef9329a56c0258013fb5159fc8334eaddf81e8c41dce9af406f15ea2fbd806d2c7acf0b29839b713394c309804ac SHA512 81eebbe43ce848637deff115f7367e1da2136435393d98bc6583e2eba998c7e2894b555ef7db8e420aa2fb353f1dfeba54fddcac55c81de216a3721c4b524559
+DIST amd64-debug-libreoffice-gnome-java-6.4.6.2-r1.xd3 747096532 BLAKE2B 2a995d680e31169f6e56f0544210aa5320b63b845c8c718c998fa638c7b08c968ee3f67e78aa9f1775b30bd7a7d297865ebbeb6bdc42683b31e621a5b97e0726 SHA512 da65f9aea4f9d58c993a8dd734641a48af5abdf925fdfd7882986cdb31348fa511ff9c3c01c82ccf1b6a6eed7a816eb9e1bc15cfa8baff4378da1a91c9791664
DIST amd64-debug-libreoffice-java-6.4.3.2.xd3 774470299 BLAKE2B 5d2db389270288ad469539b8ce2ec76af2cfb2da13211b7a2a42eea49fd8eaa9aa0627a517c81a78a017ee8b0bdaa41a05cf90ab26ab4b9d4dad93cc2ad90013 SHA512 4c97eba50625489453e92c96e5efe347cb15d396fe97981bf25d97e75d6dfba6943c31663e239484f0291b65bc5c7da195de1c8620488195f0246cf69a40591a
+DIST amd64-debug-libreoffice-java-6.4.6.2-r1.xd3 745510589 BLAKE2B eca91df7afffefdac91c7222ed5b6ea2d4b5eeff0a0d35da43b34986035180267812a3ec893ff67db74d97e8708079eb33f2694f20945f2dfbbe7a94818ef646 SHA512 02eea31554031d3c50261371fb7847b5975191acdfe7fd36189a29e83675407bd465dc57dee5400a5970bb5470bddfb439a996ee17e4bb22746e009fdefc2462
DIST amd64-debug-libreoffice-kde-6.4.3.2.xd3 480378879 BLAKE2B c17f97544fedd20b1e29405c592681acbd800c144ae7b2939be70b505811267981a31ad2bdb9faea0958229a6e757e7537b48757c58ec405265b8151fb6bb2d1 SHA512 16c7e0093ae26e6d7a8a1da7bd907ad12e591943c1f3fb3297057ae224b05ffc982884c29366e700e68cd84a802cf3e242d2919bde673c49b361f0df4104ffbb
+DIST amd64-debug-libreoffice-kde-6.4.6.2-r1.xd3 461579472 BLAKE2B c6d8ee75135a78f450ea5c18092313eb1e29a011eb31556c83ffb9dd162b8b08d26486ec5b259af144503a0762436ff551848731a70b4e4ae05686f5a766c081 SHA512 c9264596607d882a850375f53000549d9ea69715a729f9a842bb3a38590d0c71226c0e80a547931e25befc9c661c46bda19dcdfa713a354fee56bd6db6c9c5a8
DIST amd64-debug-libreoffice-kde-java-6.4.3.2.xd3 783683127 BLAKE2B c0c87c05ad781507fd740e37f6f685c37daa453519d8bfe969807ff50f277eb7b5d8720ee6bb8638264313de58dc072adbbaa715549a56812d6d758203c7251c SHA512 7117a0e536a2303595d652ea41e1f5ec5d92e4ea70fadc5dd5116e2b320e156d0ac467bbf3e44e71fe89a329b6094f4776170e7cb2ebc17b9131dd6b6eac917e
+DIST amd64-debug-libreoffice-kde-java-6.4.6.2-r1.xd3 754606886 BLAKE2B 780f8844da4fbcafc32154aadf639941b8f90b7b4e7a3cacae9ff9390e818de64ff1b4f224c9ab6613ae961d033a067a3c495af53f63ae78ff26d535d7b7ee8d SHA512 71256405bb437eca0cf97d1059b5f38e4d97cc4249cc78076ea5a52429c689daeecbd1dfeb5dd64faf3458b6b9277cca6ba0c37af8f8a3048aece8bc045693cc
DIST x86-debug-libreoffice-6.4.3.2.tar.xz 1540005828 BLAKE2B 0a688eea8362ebe95adaa0d8581676fa3867e27f928e55b435046c1b498dc0c62e6d11ec82ce5cb537ac9f1154632d610d021e44c0a1ba34de67a7e4f64b2033 SHA512 e781bf4815392f11bfa0375733d285d1276e9819813e9653c2eb2610fc423b4e75af9d7887d22d029452b1146dcbed615d0767ac6bb57c26af8d0d8c5291e26e
+DIST x86-debug-libreoffice-6.4.6.2-r1.tar.xz 1497798064 BLAKE2B 3a83283ce7c1e83f99704ee07cb3489ecf03813cd6edb79fecb214da0f2e89260f018684f0397fd712d9fdca01afb46204c0171d3c928f3075ea2982796c3914 SHA512 28771a55b2f909ea1b9278b4ad48b4ee994a50eac96f9ed2227bfd77f3abc9dbbd6b993a4d01e92fb6c68b6f109f79e03d0863bb5487d7def526d7ccb8c78a36
DIST x86-debug-libreoffice-gnome-6.4.3.2.xd3 1604587 BLAKE2B b08806ff2131b3fdca314d9cf994f4728a73acc92fa3e0bf36f85030907a65b9fe19ef4d4418a13ad1d97f6b07b1782bf7f104856d0f51b938f27d0e694ada44 SHA512 6e51203533eacffaf43192d69059840c00ddaa1aaa9388ed72aa233ddfb1c0898f44105a09bcc7dbf4be484c294eb8dc076f1700dddf4effcd1ac0ec7ba32f00
+DIST x86-debug-libreoffice-gnome-6.4.6.2-r1.xd3 1521155 BLAKE2B 5c00d405401d0ac5a3e2fc2e773dd46aa230fbaf43cb4037d9698681eb89bb28b712cf61963dedb5479bc1f76b520c8a7de952affb061b4bf7b8d4aec3c8109c SHA512 1a321ba047a211b66636a28fe94e6ee9adce2a4a252cb1d474095df25cb70ccdaa493a815d139d606d313a1f9d4249cbf89bc44adc0360579ff9e159079260f7
DIST x86-debug-libreoffice-gnome-java-6.4.3.2.xd3 739065723 BLAKE2B f954ff41ae88631201e9a840fb503c6ea6cb0295bc6220e795b631361b3e528639a576fb5a43202a32189dd537f62877cf24a4e35fd52a30fb9579be824e8cba SHA512 50294507c95ee8d9b5887cb60b4ff32db7764cd2d858af5f4dd35bbcf38a7943a1eb8f10fe8fd6edd370a128013fb3a1ebddbd2d64d3a418b1325cf133506e2a
+DIST x86-debug-libreoffice-gnome-java-6.4.6.2-r1.xd3 722959412 BLAKE2B 7b8d1040aede095212a8bec0e4ec852cc56615f81a25cd281f343c1f294c88ef53e54fecc0f5c27421cd9ff5a791db8a563b046743b2f86454ec360308bed87b SHA512 bf59aa4d50e11f02f24fe316d77e394a2b3a9292a045c4da0eb64d22f37a44cb92e88c51de4f21ff0d81da22bbeaeecde0b0a0ffaf07ef5b25ad9d5053409fa5
DIST x86-debug-libreoffice-java-6.4.3.2.xd3 737453940 BLAKE2B dc658db476b80d268f97307009939a3663e52038ff262dfd23805532f4b1f7c5e370e31b246a33c86269a2f121ea052f5847fa3debc7f861acf652225b14a250 SHA512 90c33969bbc078d654b8775d0048647f32091ad27afa68a3ce41777b98051c86df382758554c94f0dcee5dd024ceb177da214b0c238629a28c88ccff0bbb0a82
+DIST x86-debug-libreoffice-java-6.4.6.2-r1.xd3 721420736 BLAKE2B 5de46b0944228f98b142335ddaabcce1f2fcb67da576748382ae7b8524c0259eb026fe60b405819211ec05f9feb9b936985bb3992fe5b7c0779491e0105c72b2 SHA512 8e25d2c0b948ed09544e9e5bedbeafa0de8155423871e67eab7d01f5dc71ea85c2fa1ea684142142c2fa97b2aa37a62a8f9066cd5ffbdcc83522cc7f40ef2949
DIST x86-debug-libreoffice-kde-6.4.3.2.xd3 457748753 BLAKE2B 1d0c3a4ad240a80a997db83d90ae20d70f9a4439c5a962db656fc72005a7c8e20bc129626ff040af5542cf36f22f872a6672796b9a7c7d493457b976005ac7eb SHA512 31880b33b8e056cc20eec5aa81a18b08223183a0d59590f2914eb371984e19d660df8502d3ae88b03ba11bb65e91015eabd1d6e008cc35c83e7a7124e742c211
+DIST x86-debug-libreoffice-kde-6.4.6.2-r1.xd3 441958002 BLAKE2B 38c6b052d2b71fb013217b723dde83722a3af499f2df09a959a52db4009fc111298e733c891fd015dac2f046b46ec405b6347d80eea0120a52957a84660eb8a4 SHA512 bb7ed3179763605e07f953dfaf1fddad4215f9f95d28d7492d37450a892473cb0250389eac4142f2ce5dfc778679a26aefff01cbf0f2aa0dc83095e29fa18eb7
DIST x86-debug-libreoffice-kde-java-6.4.3.2.xd3 737345990 BLAKE2B 00c365c8e8c8b0444198bb30a5ac12e9381471ae7e90a0a9f1a26aa3fc4d34074243a69a64da94ba0cc89dd4238ce54e6b8bfb6334d2983db24fc44c26722ac1 SHA512 c787d6d6c9872dfc0b409226240270a9687205f5892a820621d019c13109048c2d01c4afb23bbbc3b4aa9c5c47fcd07a4f50f1e995f6b1536fbe0540fc2f5c5a
+DIST x86-debug-libreoffice-kde-java-6.4.6.2-r1.xd3 721203512 BLAKE2B 0c1694c4d2d2ba9bb82ba279585efcb1a4fc47c99f3d070c15b3b314e3759beba788acb4c410c5ea528f3fa4a5c5ea4beea22fb7b8b68f5a1c082088e3fa0beb SHA512 1a10f4bbb05d8f35fb78c470eac32df9c3eb5bdfb324d6f7b1a17554ab073955724371d2a14fae582ba98a562ed92b8ae4f0f68bf49638a32abafcc3b2593a91
diff --git a/app-office/libreoffice-bin-debug/libreoffice-bin-debug-6.4.6.2-r1.ebuild b/app-office/libreoffice-bin-debug/libreoffice-bin-debug-6.4.6.2-r1.ebuild
new file mode 100644
index 000000000000..24cb2437d07d
--- /dev/null
+++ b/app-office/libreoffice-bin-debug/libreoffice-bin-debug-6.4.6.2-r1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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/Manifest b/app-office/libreoffice-bin/Manifest
index f2998883d0a4..4e88738c71db 100644
--- a/app-office/libreoffice-bin/Manifest
+++ b/app-office/libreoffice-bin/Manifest
@@ -1,12 +1,24 @@
DIST amd64-bin-libreoffice-6.4.3.2.tar.xz 113273468 BLAKE2B b32633570226dcc79afef682bc9cd99e7e6fc7c29361d2ed42b177444318a3a1ef53e6f001515e9602304569e6d164644f74e69095e4050281eedb7106e02576 SHA512 94c597f096053dd5340e63e21778a36892c10545779f63cd9123e2d8b50ef27979b6cfe68c0954de17c706b8adade834b7361a370b6b0df367b2971b9d604770
+DIST amd64-bin-libreoffice-6.4.6.2-r1.tar.xz 131243800 BLAKE2B 3f516c4897fd52405a4a74ff7f70b6ecf0a81ba9cb275155ea5f7db2e7c4905c00b5688bf21a7390f8f8f38090515e83d3f7b1d7e3e9bfebf5804de6a60dce81 SHA512 67f1ea0b815b85d9dc524f35dc4de1f9e4354e6258eb4d8de8e7419c4870052edf64cfd7e2f27c9edd1e325e5ebca384bd0de18235ef87232522b9154e62ec9c
DIST amd64-bin-libreoffice-gnome-6.4.3.2.xd3 1223025 BLAKE2B 60a826223df7190e23dad0cad2a5f46acc80590dc53ddbbb44725e8b2011ecd687c3d05db112c5e769f0f7962f68c8281cc25822f3b806e593cc640670101e85 SHA512 9a087dea29278eb14c6d121370b9803b9232b6ed6ce10d236fa7c5d6a326a0ac3eacf52f1dd488198449fd7ba7728e7e92627cfb67924406d3ec557ac0268522
+DIST amd64-bin-libreoffice-gnome-6.4.6.2-r1.xd3 1886401 BLAKE2B 01462ba52489cbcb4e8f265ab4d8f07e413a06014aaa5e46e8a1df9d8c4b77bf46a6917e090a938adc5031997ff7c04f1c1435591c3932e1e96fb482667a927f SHA512 66e921d4288801d53cd215fc1334389fb23358c922c59e3fbd3602680415ce94454427838d16eea9af1e7f1e027da252455bb6a0d80264eeac51cb549eee6ae4
DIST amd64-bin-libreoffice-gnome-java-6.4.3.2.xd3 27598984 BLAKE2B e6f20918bb3e7355df26d4f212d1e1e90f73fd79e5aad1308403bdd11a9ef3318d244c2a78216a22eba619ed2f4c6b42273bfe064b14045d5ba6cbd0fecf44ba SHA512 377e27ee97ed15ad7963d3f4ae6c22bad24dca52f3552e8a557d30bb81099e9487b0a803fedf41a5254a998d17f401f723774f3e5a0d3fe0b386f76296d582e8
+DIST amd64-bin-libreoffice-gnome-java-6.4.6.2-r1.xd3 28378971 BLAKE2B 7cc0fa5f71441a0c8a3fe197fed0c9c2699e1f1c572f1d6754fb7596125e938771e4b407f078f8f65596346ad6609cbde15e2507114df7d3805628512a054a9e SHA512 6449765c5000314b4eb676faca46ece42e642d44ec58b9e425e483a71641b0bcfca46b77b12b847afb91dda6dc3fcd83f49b6ced37f1b6e0afe0576327fa1797
DIST amd64-bin-libreoffice-java-6.4.3.2.xd3 27479788 BLAKE2B 2d4c33e39eb99a43c1aee46d1e78739918228833d3868457c5e64211fb4cba21fe3c2432fb9cf6f164bf060141f68c8cb986dfe1f1093de6a6b429a63e5425b0 SHA512 f991e5125efe64500dfeb30cf145f85e61460cfb133990f7b7662d5bb281e9b152b7a62a04a2671240b015cd61064f7c537260ad69cd386bc832e02235890098
+DIST amd64-bin-libreoffice-java-6.4.6.2-r1.xd3 28248132 BLAKE2B 0915b7abc7bc0faa1d9421be6a65a25eae0a5eed77780076befbae15e5fd9538458c1b75e3f4f10a6bd459a30bce643c9611bab9069cd53bad8eab38304b6d67 SHA512 0e57a0a0987ce3087bbbd9b9197a0ce829da63e7f66ec8a063aada0c5fca2f710a31f0a3bebafc8e8f8e1b7f633d7283a2e5fe106dff152d1cd7cc97c6973bb2
DIST amd64-bin-libreoffice-kde-6.4.3.2.xd3 17773121 BLAKE2B b606a90277eacfc8a7683edad75027142ae9348292cb72e82836ce0686c4ddabb78752e3e93eb994d1967fde77d7f7dc0c73a6b6199b8abc230d7ca39fd5a4d9 SHA512 ae29d2975d88fe14e0518989218c3e05ca722073ed3de8f8d2ee18d30c6a49ea8f9aaf58d2f5ffdb52a175361108b62ad543e4e1a283bfc968b518cdd191c628
+DIST amd64-bin-libreoffice-kde-6.4.6.2-r1.xd3 18443074 BLAKE2B 4ad1951e418080ed0663aab620f6a0b180d1c9db228f23b276f2fa54828f9b0ba66aeb7f0823ee5678cfda286b459fe96719f76135c5329027732393e66e0b3f SHA512 b869664e74337994dcf54506c0c548618fb9f1da1d0cbec367e2b87df8acfdd5b743f7d9697415d408ceeea743450b1c561527b311124479b2b352bb5c60e686
DIST amd64-bin-libreoffice-kde-java-6.4.3.2.xd3 27844140 BLAKE2B 4ecb445fab0600a56927001d5994584c230ff3c4c467301e235e1905ed29661b0467459af70384e063873c8a824565d902fb07282a53894be115d90d68c68bdf SHA512 9e459cee94554aad8898042c0f14465889aee83a11e100e7b3f233c2d6d9d5a201f52e825d8fe1ecbadbd0c8f0155c28870aa6e517d543d3ba3d3c4185c95704
+DIST amd64-bin-libreoffice-kde-java-6.4.6.2-r1.xd3 28697445 BLAKE2B c57782cd234bfe22a296e92ebfd4ef9609d109b0c1739e090dfc6f6a38113c3ad348272bbeab1f25594122a22edb88476d35559b00a43649fdacb63732a5da97 SHA512 090b3c60f26d4689548b8f745b95606c678925bde217b2618b5c45292e2ac2768ed9aed5f119c0956e8cdbe46fe22a9c42e40334d692a284e0328b5614dba7d2
DIST x86-bin-libreoffice-6.4.3.2.tar.xz 115234220 BLAKE2B 88eba1138e1cbc6fbf4ec63d5b47215aad89ffa72318633c770e5adbf4c2c2d6e36d4868bec0789795dfc23eb2ee140dbc7224f2c1bd22bd82e22be89c44375a SHA512 1526c94a8d9c49639b6d888f283624c87a43d9c66add0d7971eebfa92e9c922dc4c752a49af7c0c3a7ec7e6b96bc38eadd7a29a4eda24fd3c7b617b27dcb609b
+DIST x86-bin-libreoffice-6.4.6.2-r1.tar.xz 133216996 BLAKE2B 1d3bc3b4ad941616108519c900ceb6f55c2ec0f92dfef423d83e6b89caa41310e8d99a746fad0b1d780bde208fdd7f11df67387459d099b530c1e400065f944d SHA512 e47bc506ebe5792e0b2eaee6dee8a7bac86b44a04d05ca858fe5a07b478ec239cf4abbd3cfa980ca93b479d96abae10fec0ee0387dd81c853666ee565d881346
DIST x86-bin-libreoffice-gnome-6.4.3.2.xd3 1225517 BLAKE2B b61fa6a5b51eba1f260d16c9bf2cf0d08d3734dc20a11e44e2730dfb8d62b42d59ba4d8708ffdaea8005fd94a852b3c2e7391d859e2c706275e5a7a067f982b9 SHA512 b94ca1f1038285bb8604f685433904f3c186dd6e1c707be9b806153c68fd29aa87601cda0a5d0e77911f67a344815a7e7d255091466620ca9a21a1d606d8c0eb
+DIST x86-bin-libreoffice-gnome-6.4.6.2-r1.xd3 1891271 BLAKE2B 7e0039481d13e4f9229b9f459b7786ec5a278233f569c3a2405fc2cf29402c2f734c1bde675de23f3989c1828eaabbcfcd0edb4d5854b52d024f2437cd1084d2 SHA512 e97c0d7638bdfab6c857c309ee2964d9b88e7772095dfd8ab9f1473ce770ebf0fc7e9df404f5a14d0edfef0deca7fe598dfa26c6e3ec4f6d8eca0e938f7946a5
DIST x86-bin-libreoffice-gnome-java-6.4.3.2.xd3 25224776 BLAKE2B 5fa64d26595a69ec514517f4f9429d697319f99a5b3765908a5ef53969023b70fa76c42401e3abfb0229e233f81a111751bdf774629a2eb43054c89b071d29e8 SHA512 9cd1fb2a0b433ff98b515989bfa9fc0f5d8d502c2f3ddab8bf3e9e22ae7833bed37497302cf8f27269e7eafd78bb26bf34dd8a2ff458a4a876bfd90804d6952e
+DIST x86-bin-libreoffice-gnome-java-6.4.6.2-r1.xd3 25843714 BLAKE2B 2b08e1bab43d0c4bb8dbe1ec9897f9ec4c58711f0b803b567a363814aa68bf70bde534df488bc3b9633e3c23417261f81fc505f4b552575d6cb7f3b53a64d161 SHA512 1c6dee450208115f0ecab9437b244cc0a90ffb41c2001001ed6bffe53e7e2b6391bf18c1a13c7256a5070adff0b6cc4e0e8a12a743aeba620854403c9a0bbceb
DIST x86-bin-libreoffice-java-6.4.3.2.xd3 24828153 BLAKE2B da19912f611914e4de44526cdf81cc3cd029554ebfe1ea1d850c79f95877e686fc1d372804ea9e0f20355c898f00b66e471b8a8f06ad69451686f2f04242d899 SHA512 86ad918ad2a5352d771fff149a80f0d01fb877c91b1dcaee8a4429eade5bee3f64ac389146831b26091fff3a0670e885b675e56b21f9e4beb48af91b895ddb11
+DIST x86-bin-libreoffice-java-6.4.6.2-r1.xd3 25715907 BLAKE2B 067d649a2e5c3feba22cfe0e1ec12451f766ab5d81ba94617e15bae6c42179b1f9f8410a217e2fbdf2425c335dcd42d70a9a2b2f7552fd627a5f2c3d4349b739 SHA512 75c756780b10c8bac1858cca72a240280b37134e169ed91457f4d5bbe3306d27594dd4abd283d8427773c353f17c453de4ddb48070c97cef095ed9e59024acf5
DIST x86-bin-libreoffice-kde-6.4.3.2.xd3 16007423 BLAKE2B 6fd735641dfa0a3340a27c7f5ec76495559905f0dda02d4d71a40fd2619e4331b47cf4c34329927d97f29ad96450f9ef91456563384c7f375e1bba3855892012 SHA512 e448d6cb693a92a26690f8c8604f2bb9a43883d862678e0c071b8a3289e06397ddacf45adecea2ac456f924693787879828dc0d9d210e5700edc73b1bafde6c3
+DIST x86-bin-libreoffice-kde-6.4.6.2-r1.xd3 17307815 BLAKE2B 13c55f284516c3c1628808798d9e9ea7eddaa6d933fcdcfc589dfbcb5d5a99356d0458ce9299078c31cd58656c42c7c3fa543fcc8335dc2903dee2ec6a0ac741 SHA512 9979ce0eef8c7f80a0739826fce37849e313118525c87fe9210083810195c01411d1ea4afb61eb15b4f36d5d75a1308ae16e0f2a810cc7ce184cc0c4c2e0228e
DIST x86-bin-libreoffice-kde-java-6.4.3.2.xd3 25368218 BLAKE2B 9070e9428a52699fdae67ce85502c69171a7e09d45b3cd51c1d783d677de971d3db5aeabf056a4f6b774c0988d7f3f405279f4ae24352c3e9904a385ff93c25a SHA512 e705d70a7a6841309cc0c0f6e1ecef9d2280299a3650558d8d3fe11a07f01d0a10e61046629989b8c7a949f639fa288a79c0116c1edaec4b5a5e6e1b9bf45f0b
+DIST x86-bin-libreoffice-kde-java-6.4.6.2-r1.xd3 27489312 BLAKE2B 9a43709bc46b84d2d6383bc1720a3d2b80512974a29a9880ecc87c71ed1c0c33cc135b38e3af3c160ab462bcac035f598d3e4b876c0d4e0dfb2efa83265190da SHA512 dde89f6eea3d186777e1900dca941529b813128d7e776b7e8e820e0a4f6ca97760fcb3c759cec7b994603dfa1f78abe934291433669b1dbf1bab09634f7480c8
diff --git a/app-office/libreoffice-bin/libreoffice-bin-6.4.6.2-r1.ebuild b/app-office/libreoffice-bin/libreoffice-bin-6.4.6.2-r1.ebuild
new file mode 100644
index 000000000000..87795ad6429c
--- /dev/null
+++ b/app-office/libreoffice-bin/libreoffice-bin-6.4.6.2-r1.ebuild
@@ -0,0 +1,251 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+BASE_PACKAGENAME="bin"
+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}-"
+
+PYTHON_COMPAT=( python3_7 )
+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-${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"
+
+BIN_COMMON_DEPEND="
+ app-text/hunspell:0/1.7
+ =app-text/libexttextcat-3.4*
+ =app-text/libmwaw-0.3*
+ dev-libs/boost:0/1.72.0
+ dev-libs/icu:0/67.1
+ =dev-libs/liborcus-0.15*
+ >=media-gfx/graphite2-1.3.10
+ media-libs/harfbuzz:0/0.9.18[icu]
+ media-libs/libpng:0/16
+ >=sys-devel/gcc-9.3.0
+ >=sys-libs/glibc-2.31
+ 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
+ >=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
+ 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.15.0
+ 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
+ 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
+ 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? ( >=virtual/jre-1.8 )
+ kde? ( kde-frameworks/breeze-icons:* )
+"
+
+PDEPEND="
+ =app-office/libreoffice-l10n-${PV}*
+"
+
+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-${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_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/lyx/Manifest b/app-office/lyx/Manifest
index ccf54e3aac6d..442dc33d9447 100644
--- a/app-office/lyx/Manifest
+++ b/app-office/lyx/Manifest
@@ -1,2 +1 @@
-DIST lyx-2.3.3.tar.xz 15998188 BLAKE2B 491732d1e567dfc8372a7dc7810cfc46cbe7e3b6a67637f772adddcff96225e174fe8c3db4c7f9e663cf3423da8b4bf08f67679874c9aaf556973ad46159a6cc SHA512 7b42df9da9f2906f626d568222e559bb921d003674d70c805657488180856a77143b2a3d073686116c95034e84fe8f58ee1ff8a74d47a40bd5fda7564335a0c3
DIST lyx-2.3.5.2.tar.xz 16139804 BLAKE2B e6ea7b2fbec330bfe31b8f88e0a5cc25ff65991421f99b04e98d26945bba48a95f389e2a7e6023d4c9720d43f80136682eb40ac4be51799f01e038e4b0fad206 SHA512 90c5459ad0a77568d588e05a360482985988382927583b14914d6a23b788756e957d0237c18b9ab0681dfc2ad7aa34d21e97304e3a74d19ef047c38f692fba03
diff --git a/app-office/lyx/lyx-2.3.3.ebuild b/app-office/lyx/lyx-2.3.3.ebuild
deleted file mode 100644
index 2874b1624996..000000000000
--- a/app-office/lyx/lyx-2.3.3.ebuild
+++ /dev/null
@@ -1,175 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-MY_P="${P/_}"
-inherit desktop flag-o-matic font python-single-r1 qmake-utils toolchain-funcs xdg-utils
-
-DESCRIPTION="WYSIWYM frontend for LaTeX, DocBook, etc."
-HOMEPAGE="https://www.lyx.org/"
-SRC_URI="ftp://ftp.lyx.org/pub/lyx/stable/2.3.x/${MY_P}.tar.xz
- ftp://ftp.lyx.org/pub/lyx/devel/lyx-2.3/${MY_P}/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~sparc x86 ~x64-macos ~x86-macos"
-IUSE="aspell cups debug docbook dia dot enchant gnumeric html +hunspell +latex monolithic-build nls rcs rtf subversion svg l10n_he"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
- app-text/mythes
- dev-libs/boost:=
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtsvg:5
- dev-qt/qtwidgets:5
- dev-qt/qtx11extras:5
- dev-texlive/texlive-fontsextra
- sys-apps/file
- sys-libs/zlib
- virtual/imagemagick-tools[png,svg?]
- aspell? ( app-text/aspell )
- cups? ( net-print/cups )
- dia? ( app-office/dia )
- docbook? ( app-text/sgmltools-lite )
- dot? ( media-gfx/graphviz )
- enchant? ( app-text/enchant:0 )
- gnumeric? ( app-office/gnumeric )
- html? ( dev-tex/html2latex )
- hunspell? ( app-text/hunspell )
- l10n_he? ( dev-tex/culmus-latex )
- latex? (
- app-text/dvipng
- app-text/ghostscript-gpl
- app-text/ps2eps
- app-text/texlive
- dev-tex/chktex
- dev-texlive/texlive-fontsrecommended
- dev-texlive/texlive-latexextra
- dev-texlive/texlive-mathscience
- dev-texlive/texlive-pictures
- dev-texlive/texlive-plaingeneric
- || (
- dev-tex/hevea
- dev-tex/latex2html
- dev-tex/tex4ht[java]
- dev-tex/tth
- )
- )
- rcs? ( dev-vcs/rcs )
- rtf? (
- app-text/unrtf
- dev-tex/html2latex
- dev-tex/latex2rtf
- )
- subversion? ( dev-vcs/subversion )
- svg? ( || ( gnome-base/librsvg media-gfx/inkscape ) )
-"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- dev-qt/qtconcurrent:5
- nls? ( sys-devel/gettext )
-"
-
-DOCS=( ANNOUNCE NEWS README RELEASE-NOTES UPGRADING )
-
-PATCHES=( "${FILESDIR}"/${PN}-2.3.0-python.patch )
-
-S="${WORKDIR}/${MY_P}"
-
-FONT_S="${S}/lib/fonts"
-FONT_SUFFIX="ttf"
-
-pkg_setup() {
- python-single-r1_pkg_setup
- font_pkg_setup
-}
-
-src_prepare() {
- default
- sed "s:python -tt:${EPYTHON} -tt:g" -i lib/configure.py || die
-}
-
-src_configure() {
- tc-export CXX
- #bug 221921
- export VARTEXFONTS="${T}"/fonts
-
- econf \
- $(use_with aspell) \
- $(use_enable debug) \
- $(use_with enchant) \
- $(use_with hunspell) \
- $(use_enable monolithic-build) \
- $(use_enable nls) \
- --enable-qt5 \
- --with-qt-dir=$(qt5_get_libdir)/qt5 \
- --disable-stdlib-debug \
- --without-included-boost \
- --with-packaging=posix
-}
-
-src_install() {
- default
-
- if use l10n_he ; then
- echo "\bind_file cua" > "${T}"/hebrew.bind || die
- echo "\bind \"F12\" \"language hebrew\"" >> "${T}"/hebrew.bind || die
-
- insinto /usr/share/lyx/bind
- doins "${T}"/hebrew.bind
- fi
-
- newicon -s 32 "development/Win32/packaging/icons/lyx_32x32.png" ${PN}.png
- doicon -s 48 "lib/images/lyx.png"
- doicon -s scalable "lib/images/lyx.svg"
-
- # fix for bug 91108
- if use latex ; then
- dosym ../../../lyx/tex /usr/share/texmf-site/tex/latex/lyx
- fi
-
- # fonts needed for proper math display, see also bug #15629
- font_src_install
-
- python_fix_shebang "${ED}"/usr/share/${PN}
-
- if use hunspell ; then
- dosym ../myspell /usr/share/lyx/dicts
- dosym ../myspell /usr/share/lyx/thes
- fi
-}
-
-pkg_postinst() {
- font_pkg_postinst
- xdg_icon_cache_update
- xdg_desktop_database_update
-
- # fix for bug 91108
- if use latex ; then
- texhash
- fi
-
- # instructions for RTL support. See also bug 168331.
- if use l10n_he || has he ${LINGUAS} || has ar ${LINGUAS} ; then
- elog
- elog "Enabling RTL support in LyX:"
- elog "If you intend to use a RTL language (such as Hebrew or Arabic)"
- elog "You must enable RTL support in LyX. To do so start LyX and go to"
- elog "Tools->Preferences->Language settings->Language"
- elog "and make sure the \"Right-to-left language support\" is checked"
- elog
- fi
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
- xdg_desktop_database_update
-
- if use latex ; then
- texhash
- fi
-}
diff --git a/app-office/lyx/lyx-2.3.5.2.ebuild b/app-office/lyx/lyx-2.3.5.2-r1.ebuild
index cfb1f9bc72d2..4db12ad1a2ef 100644
--- a/app-office/lyx/lyx-2.3.5.2.ebuild
+++ b/app-office/lyx/lyx-2.3.5.2-r1.ebuild
@@ -46,7 +46,6 @@ RDEPEND="${PYTHON_DEPS}
app-text/ghostscript-gpl
app-text/ps2eps
app-text/texlive
- dev-tex/chktex
dev-texlive/texlive-fontsrecommended
dev-texlive/texlive-latexextra
dev-texlive/texlive-mathscience
diff --git a/app-text/texlive-core/texlive-core-2020-r11.ebuild b/app-text/texlive-core/texlive-core-2020-r12.ebuild
index 9d9af1de3faf..acbfb66e3fb1 100644
--- a/app-text/texlive-core/texlive-core-2020-r11.ebuild
+++ b/app-text/texlive-core/texlive-core-2020-r12.ebuild
@@ -92,6 +92,7 @@ COMMON_DEPEND="${MODULAR_X_DEPEND}
!app-eselect/eselect-mpost
!app-eselect/eselect-pdftex
!app-text/xindy
+ !dev-tex/chktex
!~dev-texlive/texlive-basic-2019
!~dev-texlive/texlive-fontutils-2019
sys-libs/zlib
@@ -215,6 +216,7 @@ src_configure() {
--without-texinfo \
--disable-dialog \
--disable-multiplatform \
+ --enable-chktex \
--enable-epsfwin \
--enable-detex \
--enable-dvi2tty \
@@ -231,7 +233,6 @@ src_configure() {
--disable-bibtex-x \
--disable-dvipng \
--disable-dvipsk \
- --disable-chktex \
--disable-lcdf-typetools \
--disable-pdfopen \
--disable-ps2eps \
diff --git a/app-text/texlive/texlive-2020-r8.ebuild b/app-text/texlive/texlive-2020-r9.ebuild
index 7c64c6e13b2f..4db4500bce9e 100644
--- a/app-text/texlive/texlive-2020-r8.ebuild
+++ b/app-text/texlive/texlive-2020-r9.ebuild
@@ -46,7 +46,6 @@ RDEPEND="${DEPEND}
>=${TEXLIVE_CAT}/texlive-plaingeneric-${PV}
pdfannotextractor? ( dev-tex/pdfannotextractor )
extra? (
- dev-tex/chktex
app-text/dvisvgm
dev-tex/latexdiff
>=dev-tex/latexmk-418
diff --git a/dev-haskell/monad-control/Manifest b/dev-haskell/monad-control/Manifest
index a9ce7add42a8..d069f5bf8bd7 100644
--- a/dev-haskell/monad-control/Manifest
+++ b/dev-haskell/monad-control/Manifest
@@ -1,5 +1,2 @@
-DIST monad-control-0.3.2.2.tar.gz 10684 BLAKE2B 4bb1e101a24f3d1209698dc99d53beaef40109f442d6c2690428cfb96f34a9b19138565974870fb0c24a2deeb4168cb127a9a426879dd829a78269a1071e2e9c SHA512 4ae7959347a83a781bef6275f4880b53d1c67a9ef5d1bc32c3337797bb991df71c4df71206073a12e46a1512e3290d474a03b0c4ae6496316f41f4248c0c8de9
DIST monad-control-0.3.3.0.tar.gz 10518 BLAKE2B 8ef230a6cf1999c5549cf8a4889933a0f05cc07972ee6e40877435e42fcdfb7487942cf71775dfdf49b00e4461f1a26d52afedc840a8d2c1a3acc3e84b7fa96e SHA512 734ca14baea74f9bd6f3603dc84426bd6d79ae23998ffcce5c8b994dfa8d58b8a573e7b0f68f7eaab07163c8806d8d5f95160f0439cc5fbd07b9509c84e4ef8a
-DIST monad-control-1.0.0.4.tar.gz 10709 BLAKE2B c8c017ddcae0b7e6cc7647fcf0153fa28d525e1262798e2aebdef8ef027090f934636f633788e43d3b66ce822917278c1940e4093612110e2d7944c76c973606 SHA512 98a5448cf01a0310d2c16b648d02ea6643e30271046324d0f1bbea132e9f81a54fe6bb1700877b1ea4c8e291cefac81394bfaec089ea661fcbf4c04c9596bded
-DIST monad-control-1.0.1.0.tar.gz 11115 BLAKE2B f11ebe4f3dd1060ac9a852646c52ecbf15a4c022483ad030a43b4a78f00330545ca89c75f8d2d05652a6f662ed783f53a880c40d19c7740637344c3c3baf1f76 SHA512 f1dde1d46dac0a1aff8525729cc499f6aa7f5b0ddda37d120599b8b1925e653adfb2694aa24cfecd0da8b5dde95ec22fced0ecbb5dd600bc5b0c2b8da656224a
DIST monad-control-1.0.2.3.tar.gz 13864 BLAKE2B c150338e8a585dc045fd23404719fe61a2367f7308e15344f81549fd7f0808ef8fa2238a35b0a7c7984d26885352186bd6bf43359dec68b2df93581b021dd794 SHA512 59837326ec9f25220cb6c7329c91a5806b0ec7412d6af24c0f0d52c4fd93b084e92edd4f5f61a4f9c4248034fa540c23b65d2aacdfca737ece98bb132b8f08d4
diff --git a/dev-haskell/monad-control/monad-control-0.3.2.2.ebuild b/dev-haskell/monad-control/monad-control-0.3.2.2.ebuild
deleted file mode 100644
index aa45de968c64..000000000000
--- a/dev-haskell/monad-control/monad-control-0.3.2.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Lift control operations, like exception catching, through monad transformers"
-HOMEPAGE="https://github.com/basvandijk/monad-control"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE="+instancest"
-
-RDEPEND=">=dev-haskell/base-unicode-symbols-0.1.1:=[profile?] <dev-haskell/base-unicode-symbols-0.3:=[profile?]
- >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?]
- >=dev-haskell/transformers-base-0.4.1:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?]
- >=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.6.0.3
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag instancest instancest)
-}
diff --git a/dev-haskell/monad-control/monad-control-1.0.0.4.ebuild b/dev-haskell/monad-control/monad-control-1.0.0.4.ebuild
deleted file mode 100644
index ca4758a4fab7..000000000000
--- a/dev-haskell/monad-control/monad-control-1.0.0.4.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Lift control operations, like exception catching, through monad transformers"
-HOMEPAGE="https://github.com/basvandijk/monad-control"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE=""
-
-RDEPEND=">=dev-haskell/stm-2.3:=[profile?] <dev-haskell/stm-3:=[profile?]
- >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
- >=dev-haskell/transformers-base-0.4.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?]
- >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.5:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/monad-control/monad-control-1.0.1.0.ebuild b/dev-haskell/monad-control/monad-control-1.0.1.0.ebuild
deleted file mode 100644
index e0e77ad6bfdc..000000000000
--- a/dev-haskell/monad-control/monad-control-1.0.1.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Lift control operations, like exception catching, through monad transformers"
-HOMEPAGE="https://github.com/basvandijk/monad-control"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=">=dev-haskell/stm-2.3:=[profile?] <dev-haskell/stm-3:=[profile?]
- >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?]
- >=dev-haskell/transformers-base-0.4.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?]
- >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.6:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.6
-"
diff --git a/dev-perl/Dist-Zilla-Plugin-Git/Dist-Zilla-Plugin-Git-2.47.0.ebuild b/dev-perl/Dist-Zilla-Plugin-Git/Dist-Zilla-Plugin-Git-2.47.0.ebuild
new file mode 100644
index 000000000000..8bdcac9d12a4
--- /dev/null
+++ b/dev-perl/Dist-Zilla-Plugin-Git/Dist-Zilla-Plugin-Git-2.47.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=ETHER
+DIST_VERSION=2.047
+inherit perl-module
+
+DESCRIPTION="Update your git repository after release"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ dev-perl/DateTime
+ >=dev-perl/Dist-Zilla-4.200.16
+ dev-perl/Dist-Zilla-Plugin-Config-Git
+ virtual/perl-File-Spec
+ virtual/perl-File-Temp
+ dev-perl/File-chdir
+ >=dev-perl/Git-Wrapper-0.21.0
+ dev-perl/IPC-System-Simple
+ >=virtual/perl-Scalar-List-Utils-1.450.0
+ dev-perl/Module-Runtime
+ dev-perl/Moose
+ dev-perl/MooseX-Has-Sugar
+ >=dev-perl/Path-Tiny-0.48.0
+ >=virtual/perl-Scalar-List-Utils-1.450.0
+ dev-perl/String-Formatter
+ dev-perl/Try-Tiny
+ dev-perl/Type-Tiny
+ dev-perl/Types-Path-Tiny
+ dev-perl/Version-Next
+ >=dev-perl/namespace-autoclean-0.90.0
+ >=virtual/perl-version-0.80.0
+"
+BDEPEND="${RDEPEND}
+ virtual/perl-ExtUtils-MakeMaker
+ virtual/perl-Text-ParseWords
+ test? (
+ >=dev-perl/CPAN-Meta-Check-0.11.0
+ virtual/perl-CPAN-Meta-Requirements
+ virtual/perl-Encode
+ virtual/perl-Exporter
+ dev-perl/File-Copy-Recursive
+ >=virtual/perl-File-Path-2.70.0
+ virtual/perl-File-Spec
+ dev-perl/File-Which
+ dev-perl/File-pushd
+ dev-perl/Log-Dispatchouli
+ dev-perl/Test-Fatal
+ >=virtual/perl-Test-Simple-0.880.0
+ )
+"
diff --git a/dev-perl/Dist-Zilla-Plugin-Git/Manifest b/dev-perl/Dist-Zilla-Plugin-Git/Manifest
index c27299d5be31..685ec77f5ae5 100644
--- a/dev-perl/Dist-Zilla-Plugin-Git/Manifest
+++ b/dev-perl/Dist-Zilla-Plugin-Git/Manifest
@@ -1 +1,2 @@
DIST Dist-Zilla-Plugin-Git-2.046.tar.gz 72313 BLAKE2B 93d315cc5c3f58590fbeb3af9c217c5f6710ad632e0f16ecee3de9f92dd3ff0f33dfdadc74d9083a525eed5cbd0a50d9c2e13c660d194452d5e05e2f5ee2f1d1 SHA512 ac94d73c19f4f4ef9736a58cca439cc5fa64ee0c91869b2fc8be205134258c49e8164e8b67eb1d2e9e34fe6ad1f377ecacd5721d79f6d22f258ab1b275cbe92e
+DIST Dist-Zilla-Plugin-Git-2.047.tar.gz 75517 BLAKE2B 9c50634d86938906034d75396e984e4de4d1ec7552064af81493c78c2f509e453d639dbc9fdecda3be177975f39143d88f78bb37189821328c3898a9df5bf494 SHA512 7f1f037652df2fd7b965097ac8d2be5ba5e61c9a2c0594c92a0b403cdbf95a1c1daaa1d0215f91fe7e0970b403c8bcc2a2cdd664b0ce8242a3c5bb84cfef11c2
diff --git a/eclass/multilib-build.eclass b/eclass/multilib-build.eclass
index dc4f8a2bd159..21ca275c3c77 100644
--- a/eclass/multilib-build.eclass
+++ b/eclass/multilib-build.eclass
@@ -494,15 +494,15 @@ multilib_prepare_wrappers() {
# error "abi_mips_o32 not supported by the package."
# endif
#elif defined(__riscv)
-# if (__WORDSIZE == 64) && defined(__riscv_float_abi_double)
+# if (__riscv_xlen == 64) && defined(__riscv_float_abi_double)
# error "abi_riscv_lp64d not supported by the package."
-# elif (__WORDSIZE == 64) && defined(__riscv_float_abi_single)
+# elif (__riscv_xlen == 64) && defined(__riscv_float_abi_single)
# error "abi_riscv_lp64f not supported by the package."
-# elif (__WORDSIZE == 64)
+# elif (__riscv_xlen == 64)
# error "abi_riscv_lp64 not supported by the package."
-# elif (__WORDSIZE == 32) && defined(__riscv_float_abi_double)
+# elif (__riscv_xlen == 32) && defined(__riscv_float_abi_double)
# error "abi_riscv_ilp32d not supported by the package."
-# elif (__WORDSIZE == 32) && defined(__riscv_float_abi_single)
+# elif (__riscv_xlen == 32) && defined(__riscv_float_abi_single)
# error "abi_riscv_ilp32f not supported by the package."
# else
# error "abi_riscv_ilp32 not supported by the package."
diff --git a/net-libs/mbedtls/mbedtls-2.16.8.ebuild b/net-libs/mbedtls/mbedtls-2.16.8.ebuild
index 94370cb08fc6..6114da3d948f 100644
--- a/net-libs/mbedtls/mbedtls-2.16.8.ebuild
+++ b/net-libs/mbedtls/mbedtls-2.16.8.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}/${PN}-${P}
LICENSE="Apache-2.0"
SLOT="0/3.12.0" # ffmpeg subslot naming: SONAME tuple of {libmbedcrypto.so,libmbedtls.so,libmbedx509.so}
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sparc x86"
IUSE="cpu_flags_x86_sse2 doc havege libressl programs -static-libs test threads zlib"
RESTRICT="!test? ( test )"
diff --git a/net-libs/mbedtls/mbedtls-2.24.0.ebuild b/net-libs/mbedtls/mbedtls-2.24.0.ebuild
index 46446e29f829..d8a0317d15fe 100644
--- a/net-libs/mbedtls/mbedtls-2.24.0.ebuild
+++ b/net-libs/mbedtls/mbedtls-2.24.0.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}/${PN}-${P}
LICENSE="Apache-2.0"
SLOT="0/5.13.1" # ffmpeg subslot naming: SONAME tuple of {libmbedcrypto.so,libmbedtls.so,libmbedx509.so}
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sparc x86"
IUSE="cpu_flags_x86_sse2 doc havege libressl programs -static-libs test threads zlib"
RESTRICT="!test? ( test )"
diff --git a/profiles/package.mask b/profiles/package.mask
index c56b64a4edf3..9f8d27648e99 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -33,6 +33,11 @@
#--- END OF EXAMPLES ---
# Sam James <sam@gentoo.org> (2020-09-12)
+# Merged into app-text/texlive-core
+# Removal in 30 days
+dev-tex/chktex
+
+# Sam James <sam@gentoo.org> (2020-09-12)
# Merged into dev-texlive/texlive-bibtexextra
# Removal in 30 days
dev-tex/biblatex-apa