Sync with portage [Wed Dec 9 11:59:48 MSK 2020].

app-crypt/argon2/argon2-20190702.ebuild

@@ -11,7 +11,7 @@ SRC_URI="https://github.com/P-H-C/phc-winner-argon2/archive/${PV}.tar.gz -> ${P}
 
 LICENSE="|| ( Apache-2.0 CC0-1.0 )"
 SLOT="0/1"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-macos"
 IUSE="static-libs"
 
 S="${WORKDIR}/phc-winner-${P}"

app-crypt/veracrypt/Manifest

@@ -1 +1,2 @@
 DIST veracrypt-1.24_p7.tar.gz 25113248 BLAKE2B 8ead3325ce6fadf4ca8211ea45daaa82a655f29006f224235f44200839289d42fabe84da2e731fc6a169a7d157535c719b2cd9294524e68532c0065e41ed733c SHA512 d149736d4d6740a89bfce892f44757600c6411776b471a208a75b4573bbc6125535ef1b68c2f55903ff82f4d0fff13b8b07d3cf15c7a301c39158aefffc29e17
+DIST veracrypt-1.24_p8.tar.gz 25116825 BLAKE2B fccab3e7de7637f6f3a7f448a9dcc6671198ea6155e8f6741844c5bd844819c639f968e4cc6e13c274c90f2ba8e540a020b98cb12617a109d5911ce8dd9cb991 SHA512 16139d055e2b2dda6c38ecf156cf5d15cd4788253fe0c85e42050eafd8afbd5c5908e590e53a7b5220767ebbb3b9e81d0049a910b322e42f1c29d2c131bd29d0

app-crypt/veracrypt/veracrypt-1.24_p8.ebuild

@@ -0,0 +1,101 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit desktop eapi7-ver linux-info pax-utils toolchain-funcs wxwidgets
+
+MY_PV="$(ver_cut 1-2)-Update$(ver_cut 4)_MacOSX"
+DESCRIPTION="Disk encryption with strong security based on TrueCrypt"
+HOMEPAGE="https://www.veracrypt.fr/en/Home.html"
+SRC_URI="https://github.com/${PN}/VeraCrypt/archive/VeraCrypt_${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+# The modules not linked against in Linux include (but not limited to):
+#   libzip, chacha-xmm, chacha256, chachaRng, rdrand, t1ha2
+# Tested by actually removing the source files and performing a build
+# For this reason, we don't have to worry about their licenses
+LICENSE="Apache-2.0 BSD truecrypt-3.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+asm cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_ssse3 doc X"
+RESTRICT="bindist mirror"
+
+WX_GTK_VER="3.0-gtk3"
+
+RDEPEND="
+	sys-fs/lvm2
+	sys-fs/fuse:0
+	x11-libs/wxGTK:${WX_GTK_VER}[X?]
+	app-admin/sudo
+	dev-libs/pkcs11-helper
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	asm? ( dev-lang/yasm )
+"
+
+S="${WORKDIR}/VeraCrypt-VeraCrypt_${MY_PV}/src"
+
+pkg_setup() {
+	local CONFIG_CHECK="~BLK_DEV_DM ~CRYPTO ~CRYPTO_XTS ~DM_CRYPT ~FUSE_FS"
+	linux-info_pkg_setup
+
+	setup-wxwidgets
+}
+
+src_compile() {
+	local myemakeargs=(
+		NOSTRIP=1
+		NOTEST=1
+		VERBOSE=1
+		CC="$(tc-getCC)"
+		CXX="$(tc-getCXX)"
+		AR="$(tc-getAR)"
+		RANLIB="$(tc-getRANLIB)"
+		TC_EXTRA_CFLAGS="${CFLAGS}"
+		TC_EXTRA_CXXFLAGS="${CXXFLAGS}"
+		TC_EXTRA_LFLAGS="${LDFLAGS}"
+		WX_CONFIG="${WX_CONFIG}"
+		$(usex X "" "NOGUI=1")
+		$(usex asm "" "NOASM=1")
+		$(usex cpu_flags_x86_sse2 "" "NOSSE2=1")
+		$(usex cpu_flags_x86_sse4_1 "SSE41=1" "")
+		$(usex cpu_flags_x86_ssse3 "SSSE3=1" "")
+	)
+
+	emake "${myemakeargs[@]}"
+}
+
+src_test() {
+	"${S}/Main/veracrypt" --text --test || die "tests failed"
+}
+
+src_install() {
+	local DOCS=( Readme.txt )
+	local HTML_DOCS=( )
+
+	dobin Main/veracrypt
+	if use doc; then
+		DOCS+=( "${S}"/../doc/EFI-DCS )
+		docompress -x "/usr/share/doc/${PF}/EFI-DCS"
+		HTML_DOCS+=( "${S}"/../doc/html/. )
+	fi
+	einstalldocs
+
+	newinitd "${FILESDIR}/${PN}.init" ${PN}
+
+	if use X; then
+		local s
+		for s in 16 48 128 256; do
+			newicon -s ${s} Resources/Icons/VeraCrypt-${s}x${s}.xpm veracrypt.xpm
+		done
+		make_desktop_entry ${PN} "VeraCrypt" ${PN} "Utility;Security"
+	fi
+
+	pax-mark -m "${D%/}/usr/bin/veracrypt"
+}
+
+pkg_postinst() {
+	ewarn "VeraCrypt has a very restrictive license. Please be explicitly aware"
+	ewarn "of the limitations on redistribution of binaries or modified source."
+}

app-emulation/libguestfs/libguestfs-1.38.6-r100.ebuild

@@ -0,0 +1,181 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-1 )
+PYTHON_COMPAT=( python3_6 )
+
+inherit autotools bash-completion-r1 linux-info lua-single perl-functions python-single-r1 xdg-utils
+
+MY_PV_1="$(ver_cut 1-2)"
+MY_PV_2="$(ver_cut 2)"
+[[ $(( ${MY_PV_2} % 2 )) -eq 0 ]] && SD="stable" || SD="development"
+
+DESCRIPTION="Tools for accessing, inspect  and modifying virtual machine (VM) disk images"
+HOMEPAGE="https://libguestfs.org/"
+SRC_URI="https://libguestfs.org/download/${MY_PV_1}-${SD}/${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0/"${MY_PV_1}""
+
+KEYWORDS="~amd64"
+IUSE="doc erlang +fuse gtk inspect-icons introspection libvirt lua ocaml +perl python ruby selinux static-libs systemtap test"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
+	python? ( ${PYTHON_REQUIRED_USE} )"
+
+# Failures - doc
+
+# FIXME: selinux support is automagic
+COMMON_DEPEND="
+	sys-libs/ncurses:0=
+	sys-devel/gettext
+	>=app-misc/hivex-1.3.1
+	dev-libs/libpcre:3
+	app-arch/cpio
+	dev-lang/perl:=
+	virtual/cdrtools
+	>=app-emulation/qemu-2.0[qemu_softmmu_targets_x86_64,systemtap?,selinux?,filecaps]
+	sys-apps/fakeroot
+	sys-apps/file
+	libvirt? ( app-emulation/libvirt )
+	dev-libs/libxml2:2
+	>=sys-apps/fakechroot-2.8
+	>=app-admin/augeas-1.8.0
+	sys-fs/squashfs-tools:*
+	dev-libs/libconfig
+	sys-libs/readline:0=
+	>=sys-libs/db-4.6:*
+	app-arch/xz-utils
+	app-arch/lzma
+	app-crypt/gnupg
+	app-arch/unzip[natspec]
+	perl? (
+		virtual/perl-ExtUtils-MakeMaker
+		>=dev-perl/Sys-Virt-0.2.4
+		virtual/perl-Getopt-Long
+		virtual/perl-Data-Dumper
+		dev-perl/libintl-perl
+		>=app-misc/hivex-1.3.1[perl?]
+		dev-perl/String-ShellQuote
+	)
+	python? ( ${PYTHON_DEPS} )
+	fuse? ( sys-fs/fuse:= )
+	introspection? (
+		>=dev-libs/glib-2.26:2
+		>=dev-libs/gobject-introspection-1.30.0:=
+	)
+	selinux? (
+		sys-libs/libselinux
+		sys-libs/libsemanage
+	)
+	systemtap? ( dev-util/systemtap )
+	ocaml? ( >=dev-lang/ocaml-4.03[ocamlopt] )
+	erlang? ( dev-lang/erlang )
+	inspect-icons? (
+		media-libs/netpbm
+		media-gfx/icoutils
+	)
+	virtual/acl
+	sys-libs/libcap
+	lua? ( ${LUA_DEPS} )
+	>=dev-libs/yajl-2.0.4
+	gtk? (
+		sys-apps/dbus
+		x11-libs/gtk+:3
+	)
+	net-libs/libtirpc
+	sys-libs/libxcrypt
+	"
+DEPEND="${COMMON_DEPEND}
+	dev-util/gperf
+	>=dev-lang/ocaml-4.03[ocamlopt]
+	dev-ml/findlib[ocamlopt]
+	dev-ml/ocaml-gettext
+	>=dev-ml/ounit-2
+	doc? ( app-text/po4a )
+	ruby? ( dev-lang/ruby virtual/rubygems dev-ruby/rake )
+	test? ( introspection? ( dev-libs/gjs ) )
+	"
+RDEPEND="${COMMON_DEPEND}
+	app-emulation/libguestfs-appliance
+	"
+# Upstream build scripts compile and install Lua bindings for the ABI version
+# obtained by running 'lua' on the build host
+BDEPEND="lua? ( ${LUA_DEPS} )"
+
+DOCS=( AUTHORS BUGS ChangeLog HACKING README TODO )
+
+PATCHES=(
+	"${FILESDIR}"/${MY_PV_1}/
+)
+
+pkg_setup() {
+		CONFIG_CHECK="~KVM ~VIRTIO"
+		[ -n "${CONFIG_CHECK}" ] && check_extra_config;
+
+		use lua && lua-single_pkg_setup
+		use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	xdg_environment_reset
+	eautoreconf
+}
+
+src_configure() {
+	# Disable feature test for kvm for more reason
+	# i.e: not loaded module in __build__ time,
+	# build server not supported kvm, etc. ...
+	#
+	# In fact, this feature is virtio support and requires
+	# configured kernel.
+	export vmchannel_test=no
+
+	econf \
+		--with-bashcompletiondir="$(get_bashcompdir)" \
+		$(use_with libvirt) \
+		--disable-appliance \
+		--disable-daemon \
+		--with-extra="-gentoo" \
+		--with-readline \
+		--disable-php \
+		$(use_enable python) \
+		--without-java \
+		$(use_enable perl) \
+		$(use_enable fuse) \
+		$(use_enable ocaml) \
+		$(use_enable ruby) \
+		--disable-haskell \
+		--disable-golang \
+		$(use_enable introspection gobject) \
+		$(use_enable introspection) \
+		$(use_enable erlang) \
+		$(use_enable static-libs static) \
+		$(use_enable systemtap probes) \
+		$(use_enable lua) \
+		--with-gtk=$(usex gtk 3 no) \
+		$(usex doc '' PO4A=no)
+}
+
+src_install() {
+	strip-linguas -i po
+	emake DESTDIR="${D}" install "LINGUAS=""${LINGUAS}"""
+	find "${ED}" -name '*.la' -delete || die
+	use perl && perl_delete_localpod
+}
+
+pkg_postinst() {
+	if ! use gtk ; then
+		einfo "virt-p2v NOT installed"
+	fi
+	if ! use ocaml ; then
+		einfo "Ocaml based tools and bindings (sysprep, ...) NOT installed"
+	fi
+	if ! use perl ; then
+		einfo "Perl based tools NOT build"
+	fi
+}

app-emulation/libvirt/files/libvirt-6.10.0-Fix-segfault-when-parsing-mdev-types.patch

@@ -0,0 +1,61 @@
+From 4c4d0e2da07b5a035b26a0ff13ec27070f7c7b1a Mon Sep 17 00:00:00 2001
+Message-Id: <4c4d0e2da07b5a035b26a0ff13ec27070f7c7b1a.1607416232.git.mprivozn@redhat.com>
+From: Jonathon Jongsma <jjongsma@redhat.com>
+Date: Wed, 2 Dec 2020 11:52:39 -0600
+Subject: [PATCH] conf: Fix segfault when parsing mdev types
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Commit f1b0890 introduced a potential crash due to incorrect operator
+precedence when accessing an element from a pointer to an array.
+
+Backtrace below:
+
+  #0  virNodeDeviceGetMdevTypesCaps (sysfspath=0x7fff801661e0 "/sys/devices/pci0000:00/0000:00:02.0", mdev_types=0x7fff801c9b40, nmdev_types=0x7fff801c9b48) at ../src/conf/node_device_conf.c:2676
+  #1  0x00007ffff7caf53d in virNodeDeviceGetPCIDynamicCaps (sysfsPath=0x7fff801661e0 "/sys/devices/pci0000:00/0000:00:02.0", pci_dev=0x7fff801c9ac8) at ../src/conf/node_device_conf.c:2705
+  #2  0x00007ffff7cae38f in virNodeDeviceUpdateCaps (def=0x7fff80168a10) at ../src/conf/node_device_conf.c:2342
+  #3  0x00007ffff7cb11c0 in virNodeDeviceObjMatch (obj=0x7fff84002e50, flags=0) at ../src/conf/virnodedeviceobj.c:850
+  #4  0x00007ffff7cb153d in virNodeDeviceObjListExportCallback (payload=0x7fff84002e50, name=0x7fff801cbc20 "pci_0000_00_02_0", opaque=0x7fffe2ffc6a0) at ../src/conf/virnodedeviceobj.c:909
+  #5  0x00007ffff7b69146 in virHashForEach (table=0x7fff9814b700 = {...}, iter=0x7ffff7cb149e <virNodeDeviceObjListExportCallback>, opaque=0x7fffe2ffc6a0) at ../src/util/virhash.c:394
+  #6  0x00007ffff7cb1694 in virNodeDeviceObjListExport (conn=0x7fff98013170, devs=0x7fff98154430, devices=0x7fffe2ffc798, filter=0x7ffff7cf47a1 <virConnectListAllNodeDevicesCheckACL>, flags=0)
+          at ../src/conf/virnodedeviceobj.c:943
+  #7  0x00007fffe00694b2 in nodeConnectListAllNodeDevices (conn=0x7fff98013170, devices=0x7fffe2ffc798, flags=0) at ../src/node_device/node_device_driver.c:228
+  #8  0x00007ffff7e703aa in virConnectListAllNodeDevices (conn=0x7fff98013170, devices=0x7fffe2ffc798, flags=0) at ../src/libvirt-nodedev.c:130
+  #9  0x000055555557f796 in remoteDispatchConnectListAllNodeDevices (server=0x555555627080, client=0x5555556bf050, msg=0x5555556c0000, rerr=0x7fffe2ffc8a0, args=0x7fffd4008470, ret=0x7fffd40084e0)
+          at src/remote/remote_daemon_dispatch_stubs.h:1613
+  #10 0x000055555557f6f9 in remoteDispatchConnectListAllNodeDevicesHelper (server=0x555555627080, client=0x5555556bf050, msg=0x5555556c0000, rerr=0x7fffe2ffc8a0, args=0x7fffd4008470, ret=0x7fffd40084e0)
+          at src/remote/remote_daemon_dispatch_stubs.h:1591
+  #11 0x00007ffff7ce9542 in virNetServerProgramDispatchCall (prog=0x555555690c10, server=0x555555627080, client=0x5555556bf050, msg=0x5555556c0000) at ../src/rpc/virnetserverprogram.c:428
+  #12 0x00007ffff7ce90bd in virNetServerProgramDispatch (prog=0x555555690c10, server=0x555555627080, client=0x5555556bf050, msg=0x5555556c0000) at ../src/rpc/virnetserverprogram.c:302
+  #13 0x00007ffff7cf042b in virNetServerProcessMsg (srv=0x555555627080, client=0x5555556bf050, prog=0x555555690c10, msg=0x5555556c0000) at ../src/rpc/virnetserver.c:137
+  #14 0x00007ffff7cf04eb in virNetServerHandleJob (jobOpaque=0x5555556b66b0, opaque=0x555555627080) at ../src/rpc/virnetserver.c:154
+  #15 0x00007ffff7bd912f in virThreadPoolWorker (opaque=0x55555562bc70) at ../src/util/virthreadpool.c:163
+  #16 0x00007ffff7bd8645 in virThreadHelper (data=0x55555562bc90) at ../src/util/virthread.c:233
+  #17 0x00007ffff6d90432 in start_thread () at /lib64/libpthread.so.0
+  #18 0x00007ffff75c5913 in clone () at /lib64/libc.so.6
+
+Signed-off-by: Jonathon Jongsma <jjongsma@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+Signed-off-by: Ján Tomko <jtomko@redhat.com>
+Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
+---
+ src/conf/node_device_conf.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c
+index 4e2837c1cd..cac4243b50 100644
+--- a/src/conf/node_device_conf.c
++++ b/src/conf/node_device_conf.c
+@@ -2673,7 +2673,7 @@ virNodeDeviceGetMdevTypesCaps(const char *sysfspath,
+ 
+     /* this could be a refresh, so clear out the old data */
+     for (i = 0; i < *nmdev_types; i++)
+-       virMediatedDeviceTypeFree(*mdev_types[i]);
++       virMediatedDeviceTypeFree((*mdev_types)[i]);
+     VIR_FREE(*mdev_types);
+     *nmdev_types = 0;
+ 
+-- 
+2.26.2
+

app-emulation/libvirt/libvirt-6.10.0-r2.ebuild

@@ -126,6 +126,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-6.7.0-do-not-use-sysconfig.patch
 	"${FILESDIR}"/${PN}-6.7.0-doc-path.patch
 	"${FILESDIR}"/${PN}-6.7.0-fix-paths-for-apparmor.patch
+	"${FILESDIR}"/${PN}-6.10.0-Fix-segfault-when-parsing-mdev-types.patch
 )
 
 pkg_setup() {

app-emulation/lxd/lxd-4.0.4-r1.ebuild

@@ -13,7 +13,7 @@ SRC_URI="https://linuxcontainers.org/downloads/lxd/${P}.tar.gz
 # Needs to include licenses for all bundled programs and libraries.
 LICENSE="Apache-2.0 BSD BSD-2 LGPL-3 MIT MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="apparmor ipv6 nls verify-sig"
 
 DEPEND="app-arch/xz-utils

app-office/libreoffice-bin-debug/Manifest

@@ -1,24 +1,36 @@
 DIST amd64-debug-libreoffice-6.4.6.2-r2.tar.xz 1533877704 BLAKE2B d0f95c497e94216c934c4c460b19dd8716e8722152586bfdf1a4231cdbc16028de84cfa73ca71e09e94978d45224cdc59b3fd4b9bcc4849abeff1b2886e4bf71 SHA512 46b3048f55f0e47b979572f48381aff9b97f0dcf8267d93533664ea91a45c749f402aeecc9eb2a9390972aa15ba22944e198895f4c5b121b23a1f473e2ad797f
 DIST amd64-debug-libreoffice-6.4.7.2.tar.xz 1110428328 BLAKE2B ec71c99201c6884ab8b5d94b62c43ec965c3d254768cf86d3028296f164918f4ce47529f45b54bbad0245726f0a6caa9ec3fb38b66d9ed6687a08f512cd8fa63 SHA512 48a41248076d8be24cd5356e5ba0f25ac2fa69e4c0fa822e15b59f0ff6b28f63d8eb2a5d27d47e3021cc701b562b07d5c86e81dc115b291babd6d0912c3f9891
+DIST amd64-debug-libreoffice-6.4.7.2_p1.tar.xz 1110421236 BLAKE2B b7aad45577e4a9604d3cef7a8a6d90f50772075ca041aff14bac3d0cd60ef9c42c0dc0fe4bc93dc8f6fe40c8105ff4ca3711eb5d4f54535717f224cf620f3d3a SHA512 c832575c7d32117ba22da36db3bfef17587275e99dfe58be489f97495ec9d3cbaeed0640ba1a8d9621d8d1c95f0aeabeb7a62e2fbd486e3f5ce2737390aacc6f
 DIST amd64-debug-libreoffice-gnome-6.4.6.2-r2.xd3 1567465 BLAKE2B 7239068e9c32d58685dff3456d1c74d11092b0a5176ba5dbeba59a9bec54eee5584ee4ffb22266bc1e2854baf10057d60f73755a5e41df530b5f4cae69ff0597 SHA512 5c983a03a154a2ef3e48b65bdcd478f7f83345e9c3d4248811c0b2b98f2f4ed2d6fcb840a1862ee33911fa954371516649144e8e8e2c718f7ec1f6659ccf6b21
 DIST amd64-debug-libreoffice-gnome-6.4.7.2.xd3 1137139 BLAKE2B a4a9d56c93eddd1f67a189de9b71ca5a1f8a7623af689e43406d20bea9ae87a251000b67c098c4e53728cc8b6ea613119bce1ee8048f8435c6883be7ac9ab82d SHA512 b078e8bc899e5931acee912ac8a47cbe38700bee87c177928c58a7ee422d6b884054973d107a467f01801e9a02ce77a5203d01a50b9e0a41cc8e7724cd85ab37
+DIST amd64-debug-libreoffice-gnome-6.4.7.2_p1.xd3 1137103 BLAKE2B 94bb01a6eb22de43778590729e96f4b60eccb2531a08df9c3cafcdf69222b0a29eb64e79f14306b265532f3d0fa5e7b24bd19b93e9104d3497f5fc381916221f SHA512 8a28e2250bb8f057fff56481e739e0ffd36c1c2cd2f0ed70c018e640b5b5f7e3512bbbeec2fb2d9123e7cee53d02125c36e2bc2de7964ed0a2d94c306306da26
 DIST amd64-debug-libreoffice-gnome-java-6.4.6.2-r2.xd3 747959737 BLAKE2B 0151ef5d689d95a3444b78f8123023508951ad106a051530b8d91efd3fa4afc3f541d97e2e50afa483725d100fe9e3efbe234990ef161f7d1821977e9491a646 SHA512 d6e4e70e00c36b473fae6718bc2687c5af3a529e21fb98de348379203d7a1c0eccee6b168e7165bc4db302a58945256c45c1fed7424f681ca524ae58683f4770
 DIST amd64-debug-libreoffice-gnome-java-6.4.7.2.xd3 505924670 BLAKE2B 078d04deccaffa28d813961c26fbe71c94f8fa1d55a91d29a3bfc55612832e67b4ecec1c83e68a053dba52ad83b28bc855e6aa1c7ed69933d5fa62e844da81af SHA512 af3f99943c9e5025bb455ffd33aa948966053f56e74358d7be797a7b800daac12e0a1acabae2aa42303e396ed00156deaa78fa125d1a5d026923733219dab48f
+DIST amd64-debug-libreoffice-gnome-java-6.4.7.2_p1.xd3 505924630 BLAKE2B 4b56f6d58a9d6a4f856f5c4b95c8d6036ac16b7c19f8f68ae6f6fa8003937bb37e01541180c0d6bbb8f50b89b943153bf18a99d86bfc4c8e9d37539cf27194b8 SHA512 2f9352b0a2e336992444f513fd1eed5be90ad46077a9e734a2b777d7415edf256eec04ebffd77a178c8ecb0dbbae27ee6a03b93e7e8aa1f05dbbbc6ff4c8e869
 DIST amd64-debug-libreoffice-java-6.4.6.2-r2.xd3 746377573 BLAKE2B a2ee1b1f6b25e3f183948e9afb4a7ef07c7bfac003f64408c8de5607ffc61b0e4518c9b029e5732a98ad1d6840eeff4623e901825cc5a18bb95bd83bb8cc7944 SHA512 bfd37700646bb26fb8b59620edcff8152b85a97c323225899ceec0937326276eeb568be13c5264243ca79c486ee039da1476bba501957aa5885a2a2eb3ea0e20
 DIST amd64-debug-libreoffice-java-6.4.7.2.xd3 504794182 BLAKE2B d322b9bdec1f3e4c8284e568f65176e95586e815065422c67990675f1d90a59bc7ed00f3aae994d6c1eccf78d4382b99796ebb75c794c211f701c2d9dcb5df1f SHA512 59c4416602622fc299a2aba7daee16b7ceb497bb30af156ff202ba93cbdda6765d0d2b00935804e66047e86f45968a9456ec134babf723813417b1089380aa77
+DIST amd64-debug-libreoffice-java-6.4.7.2_p1.xd3 504793922 BLAKE2B f5b138b430af48e9efb61f7d203c09ab20ab73e035a817d4d8b542fd3fa50dff493954818ae89f572c43312c1ca8bbbd1020d1543892e1253b8243cae9dc2397 SHA512 f2fca65534a03af999e47d6a5d2f79a69a0bad9f577d561fe4ab0638d221a19f5ba8b0370c3f05c410a69d474e709902ad8565aa72b6feed69f09d0f0c6b7016
 DIST amd64-debug-libreoffice-kde-6.4.6.2-r2.xd3 461475494 BLAKE2B c59addb14cc79422b91c0a051cf06df4fdd33279fdaeeee512db76cb8fd6224e80b485d20320b209404d8d14f679053665f23218ce7b620d8da3b20c74c72671 SHA512 dea493fae319faf8cde12c192084548bfbf55b4017d2d3d96938f5705156a5b19e8204629fe98f205488a2ff6cfd29927cbe2fbfbd27eb37adbd6b2a8a477b5c
 DIST amd64-debug-libreoffice-kde-6.4.7.2.xd3 294248970 BLAKE2B 80c8677d59f18dc5e1eb5c069e87672a84c08a10b6c0e1aca5a040a7b1f272bb3f6335023eb372747fcf8945bc331a0c84779067e056d8969fdd2797c8a3e492 SHA512 508c65afd92ec61300dd2d791dfeec4553b83ae8f07c6150a29d59f0e53b51ba6fcd430cdc82500073dc761bf9fdceb5a9d42d245f78226d2fcdacd335baea3d
+DIST amd64-debug-libreoffice-kde-6.4.7.2_p1.xd3 294249182 BLAKE2B 177ebea55369432c3e3b28763d8ab8bce5b9e88cf6c6eeebb4844e8e6f36a1fcef95fe12d8972c19a1f8ecba28ec3c24117fbe007980635b4b6e9caf4ab054f8 SHA512 689023e9b69291f27edd9d1ff3844d56124e519a0d04c843a1222ae0760868b34748dcf310865d004876b91b167c4a1adf0494f6ef6b6be49bec1f691a278f10
 DIST amd64-debug-libreoffice-kde-java-6.4.6.2-r2.xd3 755546076 BLAKE2B 4d0c2bc849793a8483d3a3a7156812f30f9b97e1add1d2d2676cf69974db88e27cf073e0844e1e05cf337d6e109d134dc1d4c6b84c7c12aa3e36cdc6184b87b4 SHA512 dfddae1f600780d088c429e6951047960036e6f31e908cdb18cc552645230b00ed0e2f6ed6be46fef815d8ff49fccf5450bc3f23b9025c8720ed30eeb78f3a57
 DIST amd64-debug-libreoffice-kde-java-6.4.7.2.xd3 513057173 BLAKE2B 8839b0a989f528d36ae2655b0f53a8f7cd977a89a38301b32d382ff26f9ea48e84552ae654294865927d9969edc23c930d9488546bc637596325de8ecb4b4e7f SHA512 30bad549f117bbd69d845e71b4acbeffa160e055bf815e7e8fdbb4cf38de7b6550591bed014b879d4fc79ff307d4979de0d8e321ee5a2fd0dcd12c18fd33ac78
+DIST amd64-debug-libreoffice-kde-java-6.4.7.2_p1.xd3 513057171 BLAKE2B a91c73bd6d4b4883a5ada8ea9198dee1e4c5d2693be36996b73b2c092ebc3b10805e320a14927e323709167392d6e5a0473b7081c6c799665b7939711c86f6ac SHA512 f90350bd5120e64ebf6c42e3aecb0006d302c35f2192cf0fa51a99a77abf7cf6a4f3d562d40598e9ca1839b9c181835640645963795b30a22fbf3071403afdeb
 DIST x86-debug-libreoffice-6.4.6.2-r2.tar.xz 1497855216 BLAKE2B 3c87f75f3f3c2201b20e08a8bae5162d5d4f7a5a3a315ccb185b4cc98d3f15b13a896757a01db56855b8f384a601bbe2b8802794d83fb964b6775e7164aad627 SHA512 645e9448f419a59e7d20d6450821d72e56005a94aabe51ff3407a7a910fc648d34ae6e790e77b1e236b4f00fc404707566a46825992e4985707d4b29616707d4
 DIST x86-debug-libreoffice-6.4.7.2.tar.xz 1499017160 BLAKE2B a8973d320bb7f84a7153b3f2fb8de9223a4f379a9f235b11932884413830c4a1e7102255330aff2dee4e9e86ee8f613558001e2d500f3a5202bd9152154358ce SHA512 9f6b4c7da5af45500ad32a8c034b207dc498b19fc043c97d090d097a511f1fccdf3ecda23c3aed8b62d656d62a3030c0384c60a304e5182dbe4a8f8f63bba798
+DIST x86-debug-libreoffice-6.4.7.2_p1.tar.xz 1108972372 BLAKE2B 509f6482e83bdd5539e9f1affab16489ce473168251e73b260bee5be72e12de1fef1f66ec4d2c6f7e72999cf25ec515a47e6050387d3ca474c62440d75630d75 SHA512 cf8aea2a8c8c52d1d42d2a4771ceaeb0641242aa21316b47a02f9c34d4d76f96a3602102bcd8a458e7a0591848a2059a3dd4fcefb34f6cc6fda411225938c535
 DIST x86-debug-libreoffice-gnome-6.4.6.2-r2.xd3 1521667 BLAKE2B de0026bb04bc48122cf7dd1a2bda45cf3a744a32a665e7f8a4659a16771ffdcd1e86103633c390c9ae03bec59db89b3b38cdec420d1a214b15948e3c06cfb416 SHA512 b9af148a94e9cc988667bc6015b6b11342dfcefde30a085cfae0269e4528c6714291ddadcd8373320784fb12698504247e5d3959690613d024e422c04709410b
 DIST x86-debug-libreoffice-gnome-6.4.7.2.xd3 1522241 BLAKE2B efdee90ec7dd8dd0f13855a05917c3bdcb39c27539fa967ac1f0ed4a498771386ddd74ea9d473bd66961277d410f5af055d37925ecb32d102bd7d242efddbad8 SHA512 77e8f5d07fa659ac0dfb99ba0eb8c5b3c103d517d7369ee451134a3d752998c63f7476583553eef0752de1eff352851916f2e6a3c0d9329c05faff18fb893605
+DIST x86-debug-libreoffice-gnome-6.4.7.2_p1.xd3 1133117 BLAKE2B b45195154069fb8216967f0093ea59f6ecf1f872d636f4afcac58f500e2281275b7262176666f88d6599dd9b41072cde083ed6f6b7f939b8c1f3d3167b233f79 SHA512 31eccf49c4ab11fd3ac6ef354802e72122042efdc683ddbd3b48f25fed1ee87c1be9f9d222c1da8ee3066c2ce9b090d91d27ef3af57a84a2f275d7e5d01922ae
 DIST x86-debug-libreoffice-gnome-java-6.4.6.2-r2.xd3 722465261 BLAKE2B 682e741bb10fb54fc50cf04530af5c3e3049f5bd1b4c5667bc9f24f85552aac47f5d6825d5d1412b8557cdf0a33612b45f5d3868b74f60586c593443253f02db SHA512 e4fe34f140aa6aea94cb7e7def6463d88f6c3ddded4af19627cee84645aa72a2f810d0474364faa3409b5e7f1a8a1394dbd3728d747b8b46e4e9d26dc902006e
 DIST x86-debug-libreoffice-gnome-java-6.4.7.2.xd3 716893739 BLAKE2B 737883b6dc02841467a9d9fb1ff3602652fbad0c78b5bb6910b969ca826649f08c86d557eb7389bdb3eb397a3b237b5ae54af07b4629a19b25b5847923c93f97 SHA512 137d32f4ce10790d8438bc31e689cf532c8077d2362dca402f09611454f8922773b8ee6745f01513575e36466ce13ddafafdd5699334d360fd6983c999c29f27
+DIST x86-debug-libreoffice-gnome-java-6.4.7.2_p1.xd3 505451908 BLAKE2B f313c0eabb4ff2fc812db2fc0ed08a85e34c081bf8616c52d231db5a35a30907ecd3d1facf4dfcbbcde84db850d7914476acb8bdadb5398fe6d1800823e21681 SHA512 47f73b23276b7a8f4a6d29cb415d60f9ccb1ac66cc403bec371dd89de659e62e8158665bed69365aa3c4471ff5e28f30db15e6b17f7331c20e929ef6c538480d
 DIST x86-debug-libreoffice-java-6.4.6.2-r2.xd3 720927677 BLAKE2B 2427221039c273774fbab8f2a697366163afb69c2699b80354cea559d82e9e28805da0c248e3e851e64792af47763700783deda6b8088e5a230e06a49038a60c SHA512 fb7e2ee5164d143ddfc7c1a45e0b61047810f4f20149705bc6a4e58babec35200803de970062ce8bebe9971a476f99a82cecc2a643cdc7dc2cc86b76905fb4c0
 DIST x86-debug-libreoffice-java-6.4.7.2.xd3 715384916 BLAKE2B fe72391632dfef10f23b01e57eb7e53c9cbefc0cfe3bc24a1e7ae2dbbcd43680ed23d8bf5da4d665463c040012bd2527b401f2041160d5377c021f7177dd1cf0 SHA512 1e698539379ec4da18daede4b964271de19f0910e7a7490be95fd8b0676f94bba949df05cc171d0d99dcf6225bfcb0d9781b61b90139cc3d5b016bc2285038ad
+DIST x86-debug-libreoffice-java-6.4.7.2_p1.xd3 504312380 BLAKE2B de2fb9ba9dca1b76cb4c92b5a24540598b0e01d6cc94cf2d483190e5acf6dd6024868fcb50085ec55bd4d03a552a07dad886505a0e63678066883c7fcdf852ca SHA512 dce66dd9c5f7f3cd601dc148e838887c90bfb48a599a7051701086a1f1794fb8a5dd4d0eab3ae7ebfe48b7c99c48732a0086e16496174688370afdcf27a49cfa
 DIST x86-debug-libreoffice-kde-6.4.6.2-r2.xd3 442030408 BLAKE2B 414eb20169ea42e4b4ff73a502987433911fe1332e9ce26e1618791d74dd31f2f0c9b2ae27cab427ed8f959aef546eb2e63041c7c890937e0ffdc0fee650f27f SHA512 8d857d3567b50a109f13b120f2ffd6089193d78cb63c480985a3d0cc8068ff08bc7bcdd8b9255a53a808715085cda1f19d8c0b32910556106967533e92f7a974
 DIST x86-debug-libreoffice-kde-6.4.7.2.xd3 439198379 BLAKE2B 0d7e40e97fe44fbb4ee4d55b9c2900e9a5bd04c128e602db6d47df7127b2f9aaa0c6745556688347138d6c56282971b190e2a711e78beebd42a1bf27c164cb9f SHA512 73f51c55d67111e1e9e70a12dfc44c864d00c62c03bf20276a9d4a5df6725ed93dc38f75f7fa9b40908aa438de5f9bf5e2ee6a50a7cf58f7b5d237f87f55d38f
+DIST x86-debug-libreoffice-kde-6.4.7.2_p1.xd3 285518032 BLAKE2B a213129359e4d5912dd514c4d00d879fdd5635f2a6237bba9771f064811a1f48bc3d0be706a3a2237ca7a48df6f1e1aae1cc0b790ac3e5c02310ace18b4fc141 SHA512 93a0475bb64849414fbf72199f6c2cffe2e67dbb64d89d8edec77af881cbdc6eb55d53362052296846619911be4f8d3e2f1d0a1b94e1eda0977d12b68e460d6e
 DIST x86-debug-libreoffice-kde-java-6.4.6.2-r2.xd3 720717402 BLAKE2B fd9c28894f274dc1be028085c3382040e4f36a49262e79d623f4c818e7c8b9dd2bf25b65f8d49914f02b93d3e61ea8758129a7f57850d559ce437d94f48dbfbc SHA512 a1e0622d6a4ff0dc05b835569c03626adee6114e8d0b25dc3739d90e0d951976df8527751c57ab65d2e79991086fc304266939f0d0d0f959a3ed5016166678f9
 DIST x86-debug-libreoffice-kde-java-6.4.7.2.xd3 715354739 BLAKE2B 063c8ac1805dc740b3d2fc58fa748ed2c70e6d41a11be81616831b9c9aa182828acdf2b6e2f6678b56e93fd797d72de352c07618c28431904b57d11316208fb4 SHA512 eff46bc156122134cc0e2e8bb14ae8170c54ba99213e9a0d950ed06a5345986803978e6dc01edd06ed08a21b5964754f66f73f3ec60ddd0804260c15504eb03e
+DIST x86-debug-libreoffice-kde-java-6.4.7.2_p1.xd3 504334898 BLAKE2B 20ef380020b1688b769f5d01f440cee328ba5b94e4ccd60ec6616e45d409d2e4d966ddf37d9ec1e5093cfde48874f4f866a728efa0c0015252739d4979082c2e SHA512 75498a9104e66b4acf95d765cf1c97ff61dac26c4b64e743b02cae94d4de87e3daa8971b1a069de1ba300af6bf51e2146ed0c2d118dc8cef17810b4cce031e93

app-office/libreoffice-bin-debug/libreoffice-bin-debug-6.4.7.2_p1.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.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? (
+		!java? ( ${BASE_X86_URI}libreoffice-kde-${PV}.xd3 )
+		java? ( ${BASE_X86_URI}libreoffice-kde-java-${PV}.xd3 )
+	)
+	gnome? (
+		!java? ( ${BASE_X86_URI}libreoffice-gnome-${PV}.xd3 )
+		java? ( ${BASE_X86_URI}libreoffice-gnome-java-${PV}.xd3 )
+	)
+	!kde? ( !gnome? (
+		java? ( ${BASE_X86_URI}libreoffice-java-${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
+
+	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
+}

app-office/libreoffice-bin/Manifest

@@ -1,24 +1,36 @@
 DIST amd64-bin-libreoffice-6.4.6.2-r2.tar.xz 131250704 BLAKE2B 3cb2126b88658cddbc42e982c2d25dc3592955c594aa60f731b8082f4173e9cd96f6663c64fbb345ad7b1b99a7981c2364c7382397ccf3ad9be25e176bf4fd1e SHA512 f40b66f6261a35a421817b4d686cedf3361823e0284bf3a40255c9cde85620ef20c5d8fae88ff60c16bfef0cb96b9e8a1bc55c510a132fdeee54b9587ca6b37c
 DIST amd64-bin-libreoffice-6.4.7.2.tar.xz 132948096 BLAKE2B fda656550b7ccfdd1fd82b2e67c677b781fa6c27a462af45c19431bd4133fd321980bdc80e3b42e3f5f901cb1b3cf079ac8963e688de5e2d35391351de0cd7f1 SHA512 0a79a04e0edb084e69d51e24dbd6be871a007897795696bec70c2f006f2e8c69ded05f630d4a5e67868d1b3d3a31701caf29a112e6bc350a036a35bef2fb8cec
+DIST amd64-bin-libreoffice-6.4.7.2_p1.tar.xz 132939056 BLAKE2B bf289afca20492f6fe099ad180d33a730e90ccba60c133fa9ddd034d6751b86ef5f68b630ac1e67738d67d94bb79d39946df52cdd49b38fce401d33521926db4 SHA512 5138d6caf05817f658377b938927053fde3b98a8496cca9555202e862dabef75f35cbcd91c6a570611e2b908e150f6f38b3b775b9af9048cbe0ac31d7b912182
 DIST amd64-bin-libreoffice-gnome-6.4.6.2-r2.xd3 1886188 BLAKE2B 4f0cf34b16b1a9c753deee20200670017395a092134683f43d67a5dad3896cc0be72e3ca7ac099af33a0d81fc82e723bd9139285cfe1a0019a872c54103f6b68 SHA512 510000f14073c21dba8a134f7ee5b3889e83aef19abd4443d2ff5ab624ea80f2e220950cd00b0b9b305e857fb875b81758b3d64fa94474392ad87ccac0cb5bf9
 DIST amd64-bin-libreoffice-gnome-6.4.7.2.xd3 1921581 BLAKE2B e54f374a7e595c084314c4123f64aade83da89ceccd7d00467d52de7b4a3e7fbdedfe6f9814c6077337dcc24cd2050fc56cda4ce1b0cb3d31f3534dbffd83b00 SHA512 be83e2511eff1fb5d508c3915fe07de8eb171b962cc22715748b1dcfe90c91deb0981856008f7aad84e1a7c11bf283b53ae57c703af98370e3aa120195e468be
+DIST amd64-bin-libreoffice-gnome-6.4.7.2_p1.xd3 1921163 BLAKE2B 15da9d0e63cc85026ab7a3a9a98dfef7a0971722d2a663d54e6c1f9af069f007b3cbdca8b4730007b70d2ce5b6594732f2672578a3739e5be8f1f37d41fa8d51 SHA512 b0e1039cb094eee47e7e146c60e17f1ae0e2c49400a66741c8f9a4f34c32129028b4387a03881a28fdce6c9e56ca71ce0c28d07972821a22a78901670112bca0
 DIST amd64-bin-libreoffice-gnome-java-6.4.6.2-r2.xd3 28380619 BLAKE2B d844e396cb4da470ab27c7c566cae91c559d2502f5bf4e0c5796806f6ab860b1e92757e39fe61922c43a34a26b01828fe4d8a59bb4f70d7bdbef0cbf4d0dc276 SHA512 5f7bdc21dbfe17afdeb0460fc7df1d38b411bcc46ea1dbb749c2255d65a9b94d0cd49b1cb3af14cb4b0f89d9ed58a36d857d15a0415e256b9320f0304a379920
 DIST amd64-bin-libreoffice-gnome-java-6.4.7.2.xd3 29310262 BLAKE2B 7522d4e5822118eea25dd0a576f9897067efd0f753b02714d83781865a5621a6b9afadec0486d5fc78ca7820fffaa5f97b48a9705394b60d844a74ebba1f54a9 SHA512 7afcf6e0028b270731d1fc7e7f43f78bfb4f335b3bf5c3e23c4e84999b8acc824787260bcf1e35d36a1e4ba9b53b7300e921594978ef2027697bf879455e8572
+DIST amd64-bin-libreoffice-gnome-java-6.4.7.2_p1.xd3 29288984 BLAKE2B c1379fd0ef1899244a513b1f53bba861d41bfd5eae26518fe6931bd805e9b2a8ac5be79710415b4f539d48e38fd964f198f3401f29c073c14d1af0f57ca8e51e SHA512 69bd379194cbf6c376738408a1979f4822b52d2012d1442c32b4320ce410768e69dcaf323527936aa3a9f183c4a846da95f00d8379dffaff055130d2ede4ba8b
 DIST amd64-bin-libreoffice-java-6.4.6.2-r2.xd3 28215336 BLAKE2B a6524b72e6d27620e939d1ec7bfd57edc0bf5ed63152e80f3eba4eea8bf18e95eeedbf850e615a8c5f365808b6b83fb538a6679e3950bbc382818d89e2b70c69 SHA512 022da7edea982c03dd9ac96d6fb8719bda51d750722146ce857e781e6e4fe3f7bdddbc8e14cd7cf22edad84a9e955ad903107eb097e7642025e42d6d9056974e
 DIST amd64-bin-libreoffice-java-6.4.7.2.xd3 29174864 BLAKE2B a285aa34206fd7bc419359a065d220904e8bb1c8e90960226909574ee6825d46198519156d0e864a06fd921a67d6ceebab57bf6da17c6df8c5277aac977d3a94 SHA512 0c71c4934b1f1405e506d29281dd5272cc1e4229c7766cbad4f88e0340ce585d81714e72acd53805b5cf84b21d79e51b96944b56b6793bb66b53db4372b7c8bf
+DIST amd64-bin-libreoffice-java-6.4.7.2_p1.xd3 29140522 BLAKE2B 957fe72caa6c1f8b156d217b8d66b45275bd44b08769ebbc4d1d2cc9e1d4b3918a4c720bc873b9ba181203496a5fa66defb596b3f1ab1d0a7cef07cfbc1f21f9 SHA512 6bc23b125754e0da7c27101e650adf3a0660088306c2dd70ffa6cb403873e1ae0cfdbe4384913575ee4698be9f52ad77d845c8c11bf7a040f09c409da944d28d
 DIST amd64-bin-libreoffice-kde-6.4.6.2-r2.xd3 18424710 BLAKE2B 6153f778a10cc51564a2718de27bd9cea4c55f22bed3f27564079cd8887ae99cec1ab3ca20c859a054ba2531464883a40602447daf348058570f2cff44595f1a SHA512 2b67b2b4a4f1eff704bf6e807b24b82ca8ef51c63a480395256c3bcd89667b860ca9b5d7261c3df5950f75cda67a5c3621947596e826882efb173ccac238a673
 DIST amd64-bin-libreoffice-kde-6.4.7.2.xd3 19698130 BLAKE2B a68cb8c988bb6dbfc29534718337553a9b006305387b49987252b9c3bca8acce0606d675f8d18becac3ae192779bc4bc06b84bcdd3cdb467ddc185e2a1ef4e2a SHA512 b6847ce9bbb62a706af825c6a6ee96222ae8cc01df7580f45bcf8e4d5acf004ce08c8b247f1c0dc67f8fe0c998f443a9dc8840a6937b9ff3aaa73fa96717eb14
+DIST amd64-bin-libreoffice-kde-6.4.7.2_p1.xd3 19705370 BLAKE2B 8548d25cda6812f20e2a7f8b9a7e0a87a92de4755f7883edd2291cc7b042f316ab43c0825cdcd6b2ad87cf86f715a5d12a63ca81de57feb383ee51410e71bd9b SHA512 1967b746f68e764e3f2499d4f8b23ecfc3c53cc07ab8b17c40b311dc5211b4624218db257058772bebe2455e9ac2dbc243764e9e142663a5fe6dff944a91aa6a
 DIST amd64-bin-libreoffice-kde-java-6.4.6.2-r2.xd3 28690924 BLAKE2B 2bf8712408e5c993a4c346dc86be3c4ebcf4a24c791ddcfdcf26fa526d4a58404bbd42d2476520fe809b61cafdacaf0591cc598d3730e21e0a4c4a001b3fd0a8 SHA512 db31c45d802664a83dc27fb73b207b38fc465cd563524f4f31be5bdf1cee213219243525d316ccf203b02afb4e7ed562cb5ab9d54ca7e2426f0554280814846f
 DIST amd64-bin-libreoffice-kde-java-6.4.7.2.xd3 29844043 BLAKE2B 7947f9e71cf5b54e558417b9ac7788e8185d79cd3b7ad3d4a7318e0c74e105b72fe634358b718c46baacdcf003a2308d11ef36cc800060651a158d7d8c22852f SHA512 18de2a7dee8db9138dfae2f19375a6b3566410711d9cbd7a90b06430efd5e98fe8bf94afc6adfc5a4e4740cdcab2ab0bf5fd357ef67e24ad5c6c432aea552021
+DIST amd64-bin-libreoffice-kde-java-6.4.7.2_p1.xd3 29774822 BLAKE2B ae1ee0dcd887eecd425a723827ee831e143369f4d0b4674d0c88ca8a00b1b976940b1d9d6fa56b11beae80955ffb9c6177a823f2aa187f86c7ecb96729500730 SHA512 c31abcdb7402f602e3b912831ebaa7ba41350399866b0955d5852e7c946efc676be8dcee1614478ff4217ce090a3947ea2cc1fe266bfb5c29f462bc5f264e98b
 DIST x86-bin-libreoffice-6.4.6.2-r2.tar.xz 133202572 BLAKE2B 235a1457025f70c16c2f71e80ae784df8d1d8555b8b47ff3028ad0841598199592e371e71d7f99504806ceba9d59387ec11fbcfdd871466f614d3257522dba8e SHA512 e82c10d2dff99b5572cf80ec53a36ead86b5d0291a734fac6523d3c9da5bba1f3c266f81405a5c205015ed54fc9e60520b05324526c8745fee1393ef7340698d
 DIST x86-bin-libreoffice-6.4.7.2.tar.xz 133266796 BLAKE2B 0d3ca2ce2616229dc0fb7f066c6f0fec731c65e105957624d6dd899c9fd99c7d6564864b94e0ec87190f65403d05bdda35adc7671867e7bb5bbe960d397e2c42 SHA512 c15af12f8884658d7f348fa38e7569a8fcf5a3dca3107214d2f65b44ae3206ad2d59fe3f5e5c9ec2874401acf5bf5a1b21175285abb845629151a86706861a10
+DIST x86-bin-libreoffice-6.4.7.2_p1.tar.xz 134606628 BLAKE2B b6bba84073dc16b473947b7bf2f103f2e66226e172e66f612a396d1b206253229eac4320766f0977e8f531290e8365d7c491a6a4ced066f57ada553549741bce SHA512 dbab1dcbb39909b88d77351314441d096ec59d69c383c9a8bcbb82801477e14f0674932e0215ea1945630f328da8de8875b8e240c7e5c8494e57de233a030f0b
 DIST x86-bin-libreoffice-gnome-6.4.6.2-r2.xd3 1905204 BLAKE2B 4976906069cbbd1a2f32269f9517afb627d59603301a99996bdea5a827bbfcaa602f14134f0d3b7f660b5778547322fb33e5183d410d4bb813220fcebca4f13c SHA512 ae21a2ac49ded6b583ad0854ae20ddddf5fde9ebb17fbd1bc687b44b2c764ddbf08ddd199812d1bcb06bed5b41aa928c8faa9549418549f439b30c6544072643
 DIST x86-bin-libreoffice-gnome-6.4.7.2.xd3 1899092 BLAKE2B 380eebb04c3f4369f7f89267f79c8bee2970c8b3089ceec7d684ccb2e1d790ec5fa59ed04654144a0c940fbec68931c536c133031fddd0ab57f503c954a27b99 SHA512 8b33ee8fdc6d5392bf696fb747db2669963b6894cf643ace0285dd2135fad2de3f67fef0948c654b43157f4e3d762aeba3c4af44e55b2714c20d569d6e239a1a
+DIST x86-bin-libreoffice-gnome-6.4.7.2_p1.xd3 1918270 BLAKE2B 3ac058041b731c79e45920a88c6258408acb6b3fdb664da0cd17d0747a1656b1df61c4ab7929c00755fb2b9f62e2f79789a1d915e5f93806435b96ecde072b26 SHA512 7a9ae3883f3abbdd80a63a52d12fe263540686c1a33203693c2ec1d729677017776f3cb9fc391d0796743bedd8315b203603eaeee4a35948d105f5c2265cd24f
 DIST x86-bin-libreoffice-gnome-java-6.4.6.2-r2.xd3 25844744 BLAKE2B 143403983b1c918f3ff82ad934aefb60a2deae830407659f0d72bbebe87a31f13002ebd8ab879ae5469dde5b966f91e9081c716fb82c838182174759e1368bac SHA512 ce8646f82049f38f044fd5c7a330501dddab07e48df9e82bf0114bffd27ca7d9d82c3e55863c57017e7c1aac2d33d8824179646d19fe6afdd3767e225775cb6d
 DIST x86-bin-libreoffice-gnome-java-6.4.7.2.xd3 25614604 BLAKE2B 8c928716bdd197247f1c1d6c683497db7a8137ee3d106207c61fdc1aeec537ecdcf1ff1e6f14f7ada5c7ab4664109a12e98402804e59a3099c1a980a365d628f SHA512 aa0557a66f8cea5e4b2bdef62d57838d91298a5250789973c0b4333d4c0d6757cae74b41673cc2531d188fda0183425fb1a9e5ba2f8b058b540e4e7404f3af97
+DIST x86-bin-libreoffice-gnome-java-6.4.7.2_p1.xd3 27287304 BLAKE2B 8631b35146ed208577dbb621ddd947e3bded055419c34fc20fde02d942bf5b09ab614849ef8ce3fb8374f2761eeda074af6504c122e7072ce93256b603acb57b SHA512 794ad30ce84e4fb2b57fe4de985cd5dbd035317eac1e3a3951b0012204feb581134e57cccf7d113f9129f0a4891cdd65a5c419c35bce866d29dcc37e84abc87e
 DIST x86-bin-libreoffice-java-6.4.6.2-r2.xd3 25972754 BLAKE2B ce1a7f4557972754f6ba3857bdc0244ab507d984486497a3c6715162db6aeadf58cbe3061a078d91fa8fcc19d8ee266d4650d01ee585c34eef1fb264132230a8 SHA512 52472ae87d0a9af4d9e68591188baf008eaa195ae73a7312b4ee4253a41bbae93aa14236a9042a6019d13d42de347e95a96170eb1f427c145e20f7e278894749
 DIST x86-bin-libreoffice-java-6.4.7.2.xd3 25662372 BLAKE2B cc0725db91009a123a56df9c855cda0c9076f0abcc7feffde64532e7760a57c628826f0aa241d61d4632a207fffceab96eb62c37809bc19da5a05ea60ec1882e SHA512 af0b3e67fb657894c64591be8cf31eddaea7e68540c638b0e6c266c35c550db57269c9618a2a86d1ac2d28520f09b24ddf345c8cfa41cff5bfdf9f7f7bed6283
+DIST x86-bin-libreoffice-java-6.4.7.2_p1.xd3 27166653 BLAKE2B 2773a3776d63c87a4fefabbee8336f759c86b08cce6c035da3da88f18a6a5ee3d64ed56e26fe1fc7321aaacce9f1f2df07005765fbf9a5eabdd33df000aff1f5 SHA512 2042f578bfc5610a7d07e754f6eec56a1fc654f254e4a75295171c8ea032b629994ca07b4fa9c4cb96f440677f3bf59a4816de38d1e3eca7dca81a4543cea84c
 DIST x86-bin-libreoffice-kde-6.4.6.2-r2.xd3 16601007 BLAKE2B 8006626e82d0423449b0407e32ecb6a345cae46cd4006d545bcb4727873c90a1984c3d811c2b3e83bde7d5b02ea5b81390e7b782473f12564efb536c57d40ba4 SHA512 e6cff3950450bd6d4a026321a69898c29eea4eeb66b34022dddc2447780712fc221e17b8fe2f267d506d4db7c63133bc2bbca78fb3e769a451337abd354d926d
 DIST x86-bin-libreoffice-kde-6.4.7.2.xd3 16373424 BLAKE2B 18a65bfdb75230eeaf543765b33f4a557af282e5c61bd8f1f3ba70fa7948985dfcd5dfec3c8855f287d8fd39f02760ef4489a7c1b7dca00adf50a7837acee3e0 SHA512 eb844e3b08671e2bfa4a326e612781702a0f83ce7b90427f9d60b5c2343267b6a62a78c5279bce0a31908ded9d531eaa1c2fce9e6ba593b36b175b0f687a2559
+DIST x86-bin-libreoffice-kde-6.4.7.2_p1.xd3 17414679 BLAKE2B acb084343f735bf0d0cce5eca48a0c66f36ee59d189ba76e664fb65cac76663a83baf7ec921b1a601e142f2a3f4cf90a7a53479c6459dd766a04dd749a95cda0 SHA512 30b6ad2b27ccd3c2e26e0da6a868fa48e5e5648e235cc056f5186718f688fc937158f01ebd8b3916819dab9339db812e470d1543a2254ef8b57b9a92b25b1a72
 DIST x86-bin-libreoffice-kde-java-6.4.6.2-r2.xd3 27515503 BLAKE2B 3044048d4f7ec8e984ff9e07a3916f5db8f49fd9e10949a31d063ac9daafe916c109a6367959ce5156d14b894ee6ca31be288850e6107c2b83078b59063d4b6c SHA512 98fe91afa0928f7dded76f0088a04cfecf05bf41c5d5b4bddfeac3a37af6fd8e763e21dafe6da234f28e18cd4e51d8b3582ba4c2c2c9d9c72048626e17cb3004
 DIST x86-bin-libreoffice-kde-java-6.4.7.2.xd3 27347786 BLAKE2B 8465ff9ef846358c1510608febebf53eab83478fdada01a2ffc8d9b0b26ae11d3d78996a6eafc87c475a79d3acc93e26b6367ab142be4c2991eb82b70876a861 SHA512 c8ed84cb3b9144fb0e7921b7990b941d4d8ee0932b4ec02108a0a279b78789da6a7ab4d8feaf7523e987e9a99fb65bafe1bc195b6cc98a2f744c3039c1c71940
+DIST x86-bin-libreoffice-kde-java-6.4.7.2_p1.xd3 27725217 BLAKE2B 30ef34c9234fda34194e11abac36522a97dde1b62ada1cc67fdd54d03f805ca1c65ad9a97c7484023801d15644a85a652c2f4c30c32c18a715bd3b9dddb263da SHA512 753ec089ed19f65fa2b371f02fb3183d34f9f280d6ecb3c93698f394f4376de89b7111d0a8248379f7ee96ae28cc770b66f3efbba5804403f390131fd29d476d

app-office/libreoffice-bin/libreoffice-bin-6.4.7.2_p1.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.43-1.org/distfiles/amd64-${BASE_PACKAGENAME}-"
+BASE_X86_URI="https://tamiko.43-1.org/distfiles/x86-${BASE_PACKAGENAME}-"
+
+PYTHON_COMPAT=( python3_8 )
+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? (
+		!java? ( ${BASE_X86_URI}libreoffice-kde-${PV}.xd3 )
+		java? ( ${BASE_X86_URI}libreoffice-kde-java-${PV}.xd3 )
+	)
+	gnome? (
+		!java? ( ${BASE_X86_URI}libreoffice-gnome-${PV}.xd3 )
+		java? ( ${BASE_X86_URI}libreoffice-gnome-java-${PV}.xd3 )
+	)
+	!kde? ( !gnome? (
+		java? ( ${BASE_X86_URI}libreoffice-java-${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.74.0
+	dev-libs/icu:0/67.1
+	dev-libs/liborcus:0/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.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
+	>=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/0.15
+	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-$(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
+
+	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
+}

app-office/libreoffice-voikko/libreoffice-voikko-5.0-r1.ebuild

@@ -14,7 +14,10 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="amd64 x86"
 
-DEPEND="app-office/libreoffice[odk]
+DEPEND="|| (
+		app-office/libreoffice[odk]
+		>=app-office/libreoffice-bin-6.4.7.2_p1
+	)
 	dev-libs/voikko-fi"
 RDEPEND="${DEPEND}
 	dev-libs/libvoikko"

app-text/po4a/Manifest

@@ -1,3 +1,3 @@
 DIST po4a-0.57.tar.gz 3079550 BLAKE2B 54b1d3263aa0ebd90eec61d735c3422efb5f67b2d88f91a87a6893bcdb7f06131aedadeb3577d221cf75ba07f8001f6e23409375756afec8357e26e8f0f0a1c2 SHA512 7ac2e614c126b049feeb8edbafb71a875cee78fb85d8cd74f3bf5b555cc8b2d19d5e4606b732e714e937c34e178729d73edfe559de594c5ffe811b5162b27d81
-DIST po4a-0.60.tar.gz 3799018 BLAKE2B cecc260af82318fa4dfeab7ef81a29256f6531d8d97afe379d0e3291197f5b9bd0a4379697f23186de0a70ff3476cedae98bedd19bf7cddf59e9503ffbc90202 SHA512 b1e32169221d6aaf49fa0e6a42e45a858c8608a62470e5d5b769da985e4d03e09a220384400fe36f740447770331f7b8b821f00dc9ce68d3c7b00178c146c6a9
 DIST po4a-0.61.tar.gz 3863796 BLAKE2B f10c7d8b42c32be1b100f724e6d0d1b419e5ed10e0762c45bda8d91bbec7d5de331265611edc8cfcb04e3afeb044258697a54bea996240c27eb113f2f6aa0df3 SHA512 51038a3d2b2056de9bb258bc0b83dba4dec4414d6a06dedc17067441fba6824cd93296308abaa418248e3583bfacd6c81621fa6eb42e5596a3c29968ce154e77
+DIST po4a-0.62.tar.gz 3980028 BLAKE2B 4336c09254728b6a8d9c1220628612735e10d1531e3473eb7606900b9f20db3cfec1bb1c1c57f5c40bf8fce84fe823d25c743e2d50b3c56558239526f12bf09a SHA512 a91a31d9d80bb48ee071f39148572a4ec2b65f472a26696aa517c9d52ad56accf9fbdf971dcf15dd1c492cca7efab328ebffe1f20e98f7fe2532d4bf490a9997

app-text/po4a/po4a-0.57.ebuild

@@ -12,7 +12,7 @@ SRC_URI="https://github.com/mquinson/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
@@ -24,7 +24,8 @@ RDEPEND="app-text/opensp
 	dev-perl/Text-WrapI18N
 	dev-perl/Unicode-LineBreak
 	dev-perl/YAML-Tiny
-	sys-devel/gettext"
+	sys-devel/gettext
+	virtual/perl-Pod-Parser"
 DEPEND="${RDEPEND}
 	app-text/docbook-xml-dtd:4.1.2
 	app-text/docbook-xsl-stylesheets

app-text/po4a/po4a-0.61-r1.ebuild

@@ -12,7 +12,7 @@ SRC_URI="https://github.com/mquinson/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
@@ -24,7 +24,8 @@ RDEPEND="app-text/opensp
 	dev-perl/Text-WrapI18N
 	dev-perl/Unicode-LineBreak
 	dev-perl/YAML-Tiny
-	sys-devel/gettext"
+	sys-devel/gettext
+	virtual/perl-Pod-Parser"
 DEPEND="${RDEPEND}
 	app-text/docbook-xml-dtd:4.1.2
 	app-text/docbook-xsl-stylesheets
@@ -35,7 +36,7 @@ DEPEND="${RDEPEND}
 		virtual/latex-base
 	)"
 
-PATCHES=( "${FILESDIR}"/${P}-man.patch )
+PATCHES=( "${FILESDIR}"/${PN}-0.60-man.patch )
 
 DIST_TEST="do"
 

app-text/po4a/po4a-0.62.ebuild

@@ -0,0 +1,52 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PLOCALES="af ar ca cs da de eo es et eu fr hr hu id it ja kn ko nb nl pl pt pt_BR ru sl sr_Cyrl sv uk vi zh_CN zh_HK"
+
+inherit l10n perl-module
+
+DESCRIPTION="Tools to ease the translation of documentation"
+HOMEPAGE="https://po4a.org/"
+SRC_URI="https://github.com/mquinson/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="app-text/opensp
+	dev-libs/libxslt
+	dev-perl/Locale-gettext
+	dev-perl/SGMLSpm
+	dev-perl/TermReadKey
+	dev-perl/Text-WrapI18N
+	dev-perl/Unicode-LineBreak
+	dev-perl/YAML-Tiny
+	sys-devel/gettext
+	virtual/perl-Pod-Parser"
+DEPEND="${RDEPEND}
+	app-text/docbook-xml-dtd:4.1.2
+	app-text/docbook-xsl-stylesheets
+	dev-perl/Module-Build
+	test? (
+		app-text/docbook-sgml-dtd:4.1
+		dev-perl/Test-Pod
+		virtual/latex-base
+	)"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.60-man.patch )
+
+DIST_TEST="do"
+
+src_prepare() {
+	l10n_find_plocales_changes "${S}/po/bin" '' '.po'
+
+	rm_locale() {
+		PERL_RM_FILES+=( po/{bin,pod}/${1}.po )
+	}
+	l10n_for_each_disabled_locale_do rm_locale
+
+	perl-module_src_prepare
+}

dev-db/pgtap/Manifest

@@ -1 +1,2 @@
 DIST pgtap-0.99.0.zip 275915 BLAKE2B 33499dacc0019ecbe85ff3dc4fcc243b6102e0b7e7018d70b17cda44b8d22d8260229ab732db9900296232e0801070722bf97a752734ea7d389dc8ae57198b6f SHA512 c1b39bf2c041d759006d692229a67af1520b6a3d23fdac43f0781cac9ce69e7714fc854d1e45f1cb3ee188a20dccfb7904bc4dd1513699189fae70f425c13b5f
+DIST pgtap-1.1.0.zip 306590 BLAKE2B efde91e26fafc8300fa39b80d90eef134ebf3a309fca3248f61e2b8beb76b94d83b035d76c789509297f0bec48f35b5947b49e2da211826cd9d828145783607d SHA512 1cade794d738fc6b78d53a0feceff4e6c0e988fbcfe8cd9e8dbf62e2bea25d2e714baac55575e99f6d74ae0b7e5277770a69c8af7dbb5714913ea7435cf493fc

dev-db/pgtap/pgtap-1.1.0.ebuild

@@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+POSTGRES_COMPAT=( 9.{5..6} {10..13} )
+
+inherit postgres-multi
+
+DESCRIPTION="Unit testing for PostgreSQL"
+HOMEPAGE="https://pgtap.org/"
+SRC_URI="https://api.pgxn.org/dist/${PN}/${PV}/${P}.zip"
+
+LICENSE="POSTGRESQL"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="${POSTGRES_DEP}
+		app-arch/unzip
+		dev-perl/TAP-Parser-SourceHandler-pgTAP
+"
+RDEPEND="${DEPEND}"
+
+# Tests requires a running database that match up with the current
+# testing slot. Won't run from ${ED}, want's to install too early.
+RESTRICT="test"
+
+src_configure() {
+	:
+}

dev-lang/erlang/Manifest

@@ -1,6 +1,7 @@
 DIST erlang-23.0.4.tar.gz 56394805 BLAKE2B 10a4e9e3084ad2d1bb10fa736d86eb03fa6b249f83b9d06bfef4c37f99ad86dd1415c2fbaa1524cddaf57dd228d25f388fa9fe9f5b4a03ba7477080e11020fb1 SHA512 53d4b7a5e76113bb3a9695a266e58dbebb57887b1eea4e8acb56bb85d194295231d739719d526dfc6d1f0bf745d7f059fdf5ec9dc79859f5b16a75c4d0a6b348
 DIST erlang-23.1.1.tar.gz 56498218 BLAKE2B cd513a2d45aecc12503df8765e0f4170001373c0e6b35b4c01d7471906408558a3b6bbf9c189858fce3cb8fd7020270813550e2099f04c8094afc49dcd070016 SHA512 572164e601796bc7b0df3818c859b23872f148dcc72f44f611d9d5684b0c9974b00496aa0fd521dc01d0d3481556b6641d3cbd859bd7bfadefd15115728d16d9
 DIST erlang-23.1.4.tar.gz 56503340 BLAKE2B f4b26aa5882bb3d2218897706734798a80cbb5113008be70b2a0c793a5cc1eb01eb1ace17ae525e19f176e47ffc85b108240b7fec71cf8eedb4d67860ecaa98b SHA512 864b69fc69f3843dfe839faf1c1e86ec505282ec4d86ed1add445998ba28bcc623522471d8d8636a9cf1e24e84f99d5cae3880a4b1171abab9651ef242a55367
+DIST erlang-23.1.5.tar.gz 56508089 BLAKE2B 7784cbed8df68d449cbace6d84b37208b739a3b12fbed1117f05c765883d348e877001f5eba15ffdec5acc47725bf69d06a7f02b48766efa5496a8326fb8eb8c SHA512 dccb863ace1f3c3fd17c848bf21c982338546e2be2a3b81ade35bcefeb4ff75afff28ebe2363ccf7f4680417f83bbeaa51c74274a23621139b5a4be6bb824955
 DIST erlang_doc_html_23.0.tar.gz 36238699 BLAKE2B bce5fb1d766d3a795728cf7c00529129690f52e5dbe7363095cb7e63d5331a4dfc05c2042d24f10c7f3facbd187284aa323a92c0ed7515c1750aee4cd890fbd4 SHA512 bd0b1adf8639674d31152024e1351105249c6e6f93f28362e9e4b66ce6daadbe5eef5917a5889c926130e81bd000cfc44895ebaa309bf9a0c1c125713b715927
 DIST erlang_doc_html_23.1.tar.gz 36285075 BLAKE2B e2e24ac4cecfc9c10853fd3718e8e332579a91bf25eaaf9e0fc2044d89bcd6d03fd251d6a8ab64a86439f1244e275ef398701b47933a741d4e64016838db48aa SHA512 c8fecb08344c9c7a4c7b911ac4f73e2d8c0c3778d665098c3377e055346a7ecfcc378bca28dff768c36dc7bf7447308f4fb58273875c22f2d6cd896fd6232656
 DIST erlang_doc_man_23.0.tar.gz 1383486 BLAKE2B 63a9989c26797fe07fbd0ccca0d8425d94bc60a86fa93b5332c8d1f3e12a0071d9e6d4759be73bf44bf35dd14723b9e6707a84ba834e1775bc28aeec1edbe168 SHA512 81575ce7b267f5bb48bd844808e8edd4e373640bbc481372b288602eb9d3c9917e6c7c040c035b63a2f6edf437c3d826d6afdf5801765b51d9edd4a3b2a5b16f

dev-lang/erlang/erlang-23.1.5.ebuild

@@ -0,0 +1,159 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+WX_GTK_VER="3.0-gtk3"
+
+inherit elisp-common java-pkg-opt-2 systemd wxwidgets
+
+# NOTE: If you need symlinks for binaries please tell maintainers or
+# open up a bug to let it be created.
+
+UPSTREAM_V="$(ver_cut 1-2)"
+
+DESCRIPTION="Erlang programming language, runtime environment and libraries (OTP)"
+HOMEPAGE="https://www.erlang.org/"
+SRC_URI="https://github.com/erlang/otp/archive/OTP-${PV}.tar.gz -> ${P}.tar.gz
+	http://erlang.org/download/otp_doc_man_${UPSTREAM_V}.tar.gz -> ${PN}_doc_man_${UPSTREAM_V}.tar.gz
+	doc? ( http://erlang.org/download/otp_doc_html_${UPSTREAM_V}.tar.gz -> ${PN}_doc_html_${UPSTREAM_V}.tar.gz )"
+
+LICENSE="Apache-2.0"
+# We use this subslot because Compiled HiPE Code can be loaded on the exact
+# same build of ERTS that was used when compiling the code.  See
+# http://erlang.org/doc/system_principles/misc.html for more information.
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+IUSE="doc emacs +hipe java +kpoll libressl odbc sctp ssl systemd tk wxwidgets"
+
+RDEPEND="
+	acct-group/epmd
+	acct-user/epmd
+	sys-libs/ncurses:0
+	sys-libs/zlib
+	emacs? ( >=app-editors/emacs-23.1:* )
+	java? ( >=virtual/jdk-1.8:* )
+	odbc? ( dev-db/unixODBC )
+	sctp? ( net-misc/lksctp-tools )
+	ssl? (
+		!libressl? ( >=dev-libs/openssl-0.9.7d:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	systemd? ( sys-apps/systemd )
+	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] )
+"
+DEPEND="${RDEPEND}
+	dev-lang/perl
+"
+
+S="${WORKDIR}/otp-OTP-${PV}"
+
+PATCHES=(
+	"${FILESDIR}"/18.2.1-wx3.0.patch
+	"${FILESDIR}"/${PN}-22.0-dont-ignore-LDFLAGS.patch
+	"${FILESDIR}"/${PN}-23.1.2-ac2.70.patch
+)
+
+SITEFILE=50"${PN}"-gentoo.el
+
+src_prepare() {
+	default
+
+	./otp_build autoconf || die
+}
+
+src_configure() {
+	use wxwidgets && setup-wxwidgets
+
+	local myconf=(
+		--disable-builtin-zlib
+		$(use_enable hipe)
+		$(use_enable kpoll kernel-poll)
+		$(use_with java javac)
+		$(use_enable sctp)
+		$(use_with ssl ssl "${EPREFIX}"/usr)
+		$(use_enable ssl dynamic-ssl-lib)
+		$(use_enable systemd)
+		$(usex wxwidgets "--with-wx-config=${WX_CONFIG}" "--with-wxdir=/dev/null")
+	)
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	emake
+
+	if use emacs ; then
+		pushd lib/tools/emacs &>/dev/null || die
+		elisp-compile *.el
+		popd &>/dev/null || die
+	fi
+}
+
+extract_version() {
+	local path="$1"
+	local var_name="$2"
+	sed -n -e "/^${var_name} = \(.*\)$/s::\1:p" "${S}/${path}/vsn.mk" || die "extract_version() failed"
+}
+
+src_install() {
+	local erl_libdir_rel="$(get_libdir)/erlang"
+	local erl_libdir="/usr/${erl_libdir_rel}"
+	local erl_interface_ver="$(extract_version lib/erl_interface EI_VSN)"
+	local erl_erts_ver="$(extract_version erts VSN)"
+	local my_manpath="/usr/share/${PN}/man"
+
+	[[ -z "${erl_erts_ver}" ]] && die "Couldn't determine erts version"
+	[[ -z "${erl_interface_ver}" ]] && die "Couldn't determine interface version"
+
+	emake INSTALL_PREFIX="${D}" install
+
+	if use doc ; then
+		# Note: we explicitly install docs into:
+		#     /usr/share/doc/${PF}/{doc,lib,erts-*}
+		# To maintain that layout we gather everything in 'html-docs'.
+		# See bug #684376.
+		mkdir html-docs || die
+		mv "${WORKDIR}"/doc "${WORKDIR}"/lib "${WORKDIR}"/erts-* html-docs/ || die
+		local DOCS=( "AUTHORS" "HOWTO"/* "README.md" "CONTRIBUTING.md" html-docs/. )
+		docompress -x /usr/share/doc/${PF}
+	else
+		local DOCS=("README.md")
+	fi
+
+	einstalldocs
+
+	dosym "../${erl_libdir_rel}/bin/erl" /usr/bin/erl
+	dosym "../${erl_libdir_rel}/bin/erlc" /usr/bin/erlc
+	dosym "../${erl_libdir_rel}/bin/escript" /usr/bin/escript
+	dosym "../${erl_libdir_rel}/lib/erl_interface-${erl_interface_ver}/bin/erl_call" /usr/bin/erl_call
+	dosym "../${erl_libdir_rel}/erts-${erl_erts_ver}/bin/beam.smp" /usr/bin/beam.smp
+
+	## Clean up the no longer needed files
+	rm "${ED}/${erl_libdir}/Install" || die
+
+	insinto "${my_manpath}"
+	doins -r "${WORKDIR}"/man/*
+	# extend MANPATH, so the normal man command can find it
+	# see bug 189639
+	newenvd - "90erlang" <<-_EOF_
+		MANPATH="${my_manpath}"
+	_EOF_
+
+	if use emacs ; then
+		elisp-install erlang lib/tools/emacs/*.{el,elc}
+		sed -e "s:/usr/share:${EPREFIX}/usr/share:g" \
+			"${FILESDIR}/${SITEFILE}" > "${T}/${SITEFILE}" || die
+		elisp-site-file-install "${T}/${SITEFILE}"
+	fi
+
+	newinitd "${FILESDIR}"/epmd.init-r2 epmd
+	newconfd "${FILESDIR}"/epmd.confd-r2 epmd
+	use systemd && systemd_newunit "${FILESDIR}"/epmd.service-r1 epmd.service
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}

dev-libs/dqlite/dqlite-1.6.0.ebuild

@@ -11,7 +11,7 @@ SRC_URI="https://github.com/canonical/dqlite/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="LGPL-3-with-linking-exception"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="test"
 RESTRICT="!test? ( test )"
 

dev-libs/glib/glib-2.66.3.ebuild

@@ -30,7 +30,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~
 # them or just put the (build) deps in that rare consumer instead of recursive
 # RDEPEND here (due to lack of recursive DEPEND).
 RDEPEND="
-	!<dev-util/gdbus-codegen-2.66.0
+	!<dev-util/gdbus-codegen-${PV}
 	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
 	>=dev-libs/libpcre-8.31:3[${MULTILIB_USEDEP},static-libs?]
 	>=dev-libs/libffi-3.0.13-r1:=[${MULTILIB_USEDEP}]

dev-libs/jsoncpp/jsoncpp-1.9.4.ebuild

@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="|| ( public-domain MIT )"
 SLOT="0/24"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-macos ~x64-solaris"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 

dev-libs/libressl/Manifest

@@ -2,6 +2,9 @@ DIST libressl-2.9.2.tar.gz 3607549 BLAKE2B 496e993e4f1c85167e0344afab61259d4e3f0
 DIST libressl-3.0.2.tar.gz 3669468 BLAKE2B 84ad2c1fea8d2119f191ec8ab3f999fb0354636d48aabb76fa1786139c669c9d8ca105d79cc8416dd20683818eccc84490cdadc9ca94cb2b0e411644e923a3d6 SHA512 19226da3bc9776e1da40b8e94dfa53564d5e6acc80edee539ba12d7a75c1bb8c0603e7633f26a6ef8b12adc56bb677ccda448575aa6be2ad3df5447465a4b080
 DIST libressl-3.1.3.tar.gz 3766345 BLAKE2B 4956fa0ae6030e9e9969d584db3bc0084c4b155207d1472ebfa40c8e68e925214b66ed1bc7e32d98a9a48de0b61909323a0380a973c724422c92bfe88b9fdfb2 SHA512 f9f497fe5d09b8b762175da038a8e67d9d2567462fefc49e434d306a3071ba3a4d369c89143d9d90e3bbcc7b9ba051c9c923a0dfc41d856edc08ae59fa727ee8
 DIST libressl-3.1.4.tar.gz 3767238 BLAKE2B e639349e50f985360f2cef01b16b5c8f3c725d4a9bbee1117787174e4de6eb9b14cc8ad5f1704971057dd0f5000eea01f3b172178c534c70d38921418034d94c SHA512 77a53c4294fc332006502dc3af069346e2c9efc9240de7f91eb48e89043525900b5b23652cfd159221c3a482cc01e263611adb752e23b707f965156e3a7cd895
+DIST libressl-3.1.5.tar.gz 3767605 BLAKE2B 9dc97caac831591c150ef0fc9b36970e5c18b1793294b074b5c42176cd7eafbdb713461757edab7072fc0a770480db5987252c9a960cfebeaa3ef5341de2a290 SHA512 b1e576a654d4f740ef466e5291344ee9a65276f2a1d4975bf93c407b8b51d78dd99f381f1d14162ed1f6b6e7f14a67ccdd377e7d9f71ef2875cc8cf17f580c51
 DIST libressl-3.2.0.tar.gz 3775925 BLAKE2B 99d74fad16e272be8e3b23b873c35970ce3693e088baf365670ad8e8cbb846e90f4232bbc6c65b70a35060da99b9b210b3debce1c78d531e810de26e3e2f05cb SHA512 e8bf95af4e4e855b0462eb12df8f802102a3bee5bb40fb1859e7c40d9e3ce89f0d2eb0acdd923e7c592b4aeb7ecc556f753c0a12d0dace05d2ef342bffdd9d07
 DIST libressl-3.2.1.tar.gz 3798341 BLAKE2B 25d4d0fa758d92fd781f39000e631d7cec0a5a8210b2b127b7d49ef0e96e1a20a45f60e6231dcbe379f57f19c1ca8a4dde6205b1cc52ee44d17a4a21da34c98a SHA512 0204177ad0291f3fce4c77ab21cce17785d0239f2ae4be8fbdce5575cc98775186caa0e1851b211c05be07e3cc603111eeaac4379c8977e7b140fedee2551f93
+DIST libressl-3.2.3.tar.gz 3839953 BLAKE2B 219c9c2e78952d56dd9eadb92c9732f426cbdd20a2dc905d827ca0547a347065f3347e960dee7456994d8d52d8cb19a028add3e9f343a20864dbb15f4e6654c8 SHA512 8c281f5a155a4cc9bfeb31767d8c29de6ceec602649ff98460c44c4b2c15999799d5549ce07a823a4f7f20f9b441f8718b3ef8eac19ddb6cf6d150e6fe8c9d13
 DIST libressl-3.3.0.tar.gz 3837684 BLAKE2B 0b2947fa00f86829b574beedc462ed7e602b417f057c8bcf966508952e10c17709a4ea484e4b8699eee2cee228e00518a25c9eedd96534273c56a467cdc0c39b SHA512 3ea1339719b85234e4db8753eb11b760b9969bf0917d2556126bb048fc41022def628995587e438781092dcc49233109641b174f156cc4ec451fe8a217372cec
+DIST libressl-3.3.1.tar.gz 3838592 BLAKE2B 67c5bd72c1d1085c13fd3bf2e3829a6b83d61c3c9af5f5e65dca7548abe967f0ec8ebe3c46c6af576c54304b432069aab9d940bded90925cb44fffa7a8f35c29 SHA512 a0a6c10af71c6932a63381f33b2d0fe38b28d1c3c62c0c2de770695152f6eb3c558fdedd2fb6cdf34bd9a2dd3887aec615b652cbc3c1eed6c3c973c787a0c294

dev-libs/libressl/libressl-3.1.5.ebuild

@@ -0,0 +1,63 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-minimal libtool
+
+DESCRIPTION="Free version of the SSL/TLS protocol forked from OpenSSL"
+HOMEPAGE="https://www.libressl.org/"
+SRC_URI="https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/${P}.tar.gz"
+
+LICENSE="ISC openssl"
+# Reflects ABI of libcrypto.so and libssl.so. Since these can differ,
+# we'll try to use the max of either. However, if either change between
+# versions, we have to change the subslot to trigger rebuild of consumers.
+SLOT="0/48"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+asm static-libs test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="test? ( static-libs )"
+
+RDEPEND="!dev-libs/openssl:0"
+DEPEND="${RDEPEND}"
+PDEPEND="app-misc/ca-certificates"
+
+src_prepare() {
+	touch crypto/Makefile.in
+
+	sed -i \
+		-e '/^[ \t]*CFLAGS=/s#-g ##' \
+		-e '/^[ \t]*CFLAGS=/s#-g"#"#' \
+		-e '/^[ \t]*CFLAGS=/s#-O2 ##' \
+		-e '/^[ \t]*CFLAGS=/s#-O2"#"#' \
+		-e '/^[ \t]*USER_CFLAGS=/s#-O2 ##' \
+		-e '/^[ \t]*USER_CFLAGS=/s#-O2"#"#' \
+		configure || die "fixing CFLAGS failed"
+
+	if ! use test ; then
+	sed -i \
+		-e '/^[ \t]*SUBDIRS =/s#tests##' \
+		Makefile.in || die "Removing tests failed"
+	fi
+
+	eapply "${FILESDIR}"/${PN}-2.8.3-solaris10.patch
+	eapply_user
+
+	elibtoolize  # for Solaris
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		$(use_enable asm) \
+		$(use_enable static-libs static)
+}
+
+multilib_src_test() {
+	emake check
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${D}" -name '*.la' -exec rm -f {} + || die
+}

dev-libs/libressl/libressl-3.2.3.ebuild

@@ -0,0 +1,63 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-minimal libtool
+
+DESCRIPTION="Free version of the SSL/TLS protocol forked from OpenSSL"
+HOMEPAGE="https://www.libressl.org/"
+SRC_URI="https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/${P}.tar.gz"
+
+LICENSE="ISC openssl"
+# Reflects ABI of libcrypto.so and libssl.so. Since these can differ,
+# we'll try to use the max of either. However, if either change between
+# versions, we have to change the subslot to trigger rebuild of consumers.
+SLOT="0/48"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+asm static-libs test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="test? ( static-libs )"
+
+RDEPEND="!dev-libs/openssl:0"
+DEPEND="${RDEPEND}"
+PDEPEND="app-misc/ca-certificates"
+
+src_prepare() {
+	touch crypto/Makefile.in
+
+	sed -i \
+		-e '/^[ \t]*CFLAGS=/s#-g ##' \
+		-e '/^[ \t]*CFLAGS=/s#-g"#"#' \
+		-e '/^[ \t]*CFLAGS=/s#-O2 ##' \
+		-e '/^[ \t]*CFLAGS=/s#-O2"#"#' \
+		-e '/^[ \t]*USER_CFLAGS=/s#-O2 ##' \
+		-e '/^[ \t]*USER_CFLAGS=/s#-O2"#"#' \
+		configure || die "fixing CFLAGS failed"
+
+	if ! use test ; then
+	sed -i \
+		-e '/^[ \t]*SUBDIRS =/s#tests##' \
+		Makefile.in || die "Removing tests failed"
+	fi
+
+	eapply "${FILESDIR}"/${PN}-2.8.3-solaris10.patch
+	eapply_user
+
+	elibtoolize  # for Solaris
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		$(use_enable asm) \
+		$(use_enable static-libs static)
+}
+
+multilib_src_test() {
+	emake check
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${D}" -name '*.la' -exec rm -f {} + || die
+}

dev-libs/libressl/libressl-3.3.1.ebuild

@@ -0,0 +1,64 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-minimal libtool
+
+DESCRIPTION="Free version of the SSL/TLS protocol forked from OpenSSL"
+HOMEPAGE="https://www.libressl.org/"
+SRC_URI="https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/${P}.tar.gz"
+
+LICENSE="ISC openssl"
+# Reflects ABI of libcrypto.so and libssl.so. Since these can differ,
+# we'll try to use the max of either. However, if either change between
+# versions, we have to change the subslot to trigger rebuild of consumers.
+SLOT="0/48"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+asm static-libs test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="test? ( static-libs )"
+
+RDEPEND="!dev-libs/openssl:0"
+DEPEND="${RDEPEND}"
+PDEPEND="app-misc/ca-certificates"
+
+src_prepare() {
+	touch crypto/Makefile.in
+
+	sed -i \
+		-e '/^[ \t]*CFLAGS=/s#-g ##' \
+		-e '/^[ \t]*CFLAGS=/s#-g"#"#' \
+		-e '/^[ \t]*CFLAGS=/s#-O2 ##' \
+		-e '/^[ \t]*CFLAGS=/s#-O2"#"#' \
+		-e '/^[ \t]*USER_CFLAGS=/s#-O2 ##' \
+		-e '/^[ \t]*USER_CFLAGS=/s#-O2"#"#' \
+		configure || die "fixing CFLAGS failed"
+
+	if ! use test ; then
+	sed -i \
+		-e '/^[ \t]*SUBDIRS =/s#tests##' \
+		Makefile.in || die "Removing tests failed"
+	fi
+
+	eapply "${FILESDIR}"/${PN}-2.8.3-solaris10.patch
+	#eapply "${FILESDIR}"/${PN}-3.2.2-build.patch
+	eapply_user
+
+	elibtoolize  # for Solaris
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		$(use_enable asm) \
+		$(use_enable static-libs static)
+}
+
+multilib_src_test() {
+	emake check
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${D}" -name '*.la' -exec rm -f {} + || die
+}

dev-libs/libucl/libucl-0.8.1-r100.ebuild

@@ -0,0 +1,71 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..3} )
+inherit lua-single autotools
+
+DESCRIPTION="Universal configuration library parser"
+HOMEPAGE="https://github.com/vstakhov/libucl"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/vstakhov/libucl.git"
+else
+	SRC_URI="https://github.com/vstakhov/libucl/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="lua +regex sign urls +utils static-libs test"
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
+RESTRICT="!test? ( test )"
+
+DEPEND="!!dev-libs/ucl
+	lua? ( ${LUA_DEPS} )
+	urls? ( net-misc/curl )
+	sign? ( dev-libs/openssl:0 )
+"
+BDEPEND="${DEPEND}
+	virtual/pkgconfig
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( README.md doc/api.md )
+
+src_prepare() {
+	default
+	rm tests/schema/{definitions,ref{,Remote}}.json || die
+	eautoreconf
+}
+
+src_configure() {
+	lua_setup
+
+	local myeconfargs=(
+		"$(use_enable lua)"
+		"$(use_enable regex)"
+		"$(use_enable sign signatures)"
+		"$(use_enable urls)"
+		"$(use_enable utils)"
+		LUA_INCLUDE="$(lua_get_CFLAGS)"
+		LIB_LIBS="$(lua_get_LIBS)"
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	emake check
+}
+
+src_install() {
+	default
+	use lua && DOCS+=( "doc/lua_api.md" )
+	einstalldocs
+	if ! use static-libs; then
+		find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || \
+			die "error while deleting static library"
+	fi
+}

dev-libs/libucl/libucl-9999.ebuild

@@ -3,7 +3,8 @@
 
 EAPI=7
 
-inherit autotools
+LUA_COMPAT=( lua5-{1..3} )
+inherit lua-single autotools
 
 DESCRIPTION="Universal configuration library parser"
 HOMEPAGE="https://github.com/vstakhov/libucl"
@@ -18,11 +19,12 @@ fi
 
 LICENSE="BSD-2"
 SLOT="0"
-
+IUSE="lua +regex sign urls +utils static-libs test"
-IUSE="lua +regex sign urls +utils static-libs"
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
+RESTRICT="!test? ( test )"
 
 DEPEND="!!dev-libs/ucl
-	lua? ( >=dev-lang/lua-5.1:= )
+	lua? ( ${LUA_DEPS} )
 	urls? ( net-misc/curl )
 	sign? ( dev-libs/openssl:0 )
 "
@@ -36,24 +38,31 @@ DOCS=( README.md doc/api.md )
 src_prepare() {
 	default
 	rm tests/schema/{definitions,ref{,Remote}}.json || die
-
 	eautoreconf
 }
 
 src_configure() {
+	lua_setup
+
 	local myeconfargs=(
 		"$(use_enable lua)"
 		"$(use_enable regex)"
 		"$(use_enable sign signatures)"
 		"$(use_enable urls)"
 		"$(use_enable utils)"
+		LUA_INCLUDE="$(lua_get_CFLAGS)"
+		LIB_LIBS="$(lua_get_LIBS)"
 	)
-	econf "${myeconfargs}"
+	econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	emake check
 }
 
 src_install() {
 	default
-	DOCS+=( $(usex lua "doc/lua_api.md" "") )
+	use lua && DOCS+=( "doc/lua_api.md" )
 	einstalldocs
 	if ! use static-libs; then
 		find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || \

dev-libs/openssl/Manifest

@@ -6,3 +6,5 @@ DIST openssl-1.1.0l.tar.gz 5294857 BLAKE2B 0e4f30f9e8a22414325bd780dc4e875e96248
 DIST openssl-1.1.1e-bindist-1.0.tar.xz 16948 BLAKE2B 78e034f1d263cbf5e57c92393f72acd07e86e39a5511a8852bad151371430954e07d787fd82cca55b373d1579bb22b9d29c9d677104ed68291a9d2dffe3ffbbb SHA512 0dbfb378b8f2724db82915e17fd4e43977e3e45030db25cdb9241c0ab842e41ef3d597ef71c4db5103635752dc2059ea6022597511a440f55fb56a5a52d3ccea
 DIST openssl-1.1.1g.tar.gz 9801502 BLAKE2B 5e3dd4725ff89b959a5436d64b521317c6ffeb377418cc24c6d1927fab923423cb5f5fce2f9c2cdee597041c7be156d09668a5fd13dc6ff06d235a83db94cf19 SHA512 01e3d0b1bceeed8fb066f542ef5480862001556e0f612e017442330bbd7e5faee228b2de3513d7fc347446b7f217e27de1003dc9d7214d5833b97593f3ec25ab
 DIST openssl-1.1.1h.tar.gz 9810045 BLAKE2B ac9ba6fb0c4da0a761e8655b6907634365ddb114216acfcfc981e13c211577b6bd23ea8d2ad0999c0960b039f5d3dead5733e6dc07c5231ab953307a9015cd36 SHA512 da50fd99325841ed7a4367d9251c771ce505a443a73b327d8a46b2c6a7d2ea99e43551a164efc86f8743b22c2bdb0020bf24a9cbd445e9d68868b2dc1d34033a
+DIST openssl-1.1.1i-bindist-1.0.tar.xz 18124 BLAKE2B bcbce700676d1d61498ac98281b7ad06f9970d91afa6bfb2c259ab7462b2554be79a1c06759bc7aaeca9948c2f5276bac2c4f42dbc6822669f863444b9913ccd SHA512 1dbb81bcb4cf7e634bb363c7e2bb2590a1fe3fcb6c3b5e377cac3c5241abd116c2a89c516be8e5fd1799ab64375a58052a4df944eeadc87b0b7785da710906d8
+DIST openssl-1.1.1i.tar.gz 9808346 BLAKE2B ca98bab08e1874134da113dd0bda0583c133c7dce5b739f9601641ed2cf97894e5e13d901f0db9367aa5d7b78c552ac598aa0a3c2a3f0a438daae044e29f58d6 SHA512 fe12e0ab9e1688f24dd862ac633d0ab703b499c0f34b53c3560aa0d3879d81d647aa0678ed517dda5efb2711f669fcb1a1e0e24f6eac2efc2cf4eae6b62014d8

dev-libs/openssl/openssl-1.1.1i.ebuild

@@ -0,0 +1,325 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit flag-o-matic toolchain-funcs multilib multilib-minimal
+
+MY_P=${P/_/-}
+
+# This patch set is based on the following files from Fedora 31,
+# see https://src.fedoraproject.org/rpms/openssl/blob/f31/f/openssl.spec
+# for more details:
+# - hobble-openssl (SOURCE1)
+# - ec_curve.c (SOURCE12) -- MODIFIED
+# - ectest.c (SOURCE13)
+# - openssl-1.1.1-ec-curves.patch (PATCH37) -- MODIFIED
+BINDIST_PATCH_SET="openssl-1.1.1i-bindist-1.0.tar.xz"
+
+DESCRIPTION="full-strength general purpose cryptography library (including SSL and TLS)"
+HOMEPAGE="https://www.openssl.org/"
+SRC_URI="mirror://openssl/source/${MY_P}.tar.gz
+	bindist? (
+		mirror://gentoo/${BINDIST_PATCH_SET}
+		https://dev.gentoo.org/~whissi/dist/openssl/${BINDIST_PATCH_SET}
+	)"
+
+LICENSE="openssl"
+SLOT="0/1.1" # .so version of libssl/libcrypto
+[[ "${PV}" = *_pre* ]] || \
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
+IUSE="+asm bindist elibc_musl rfc3779 sctp cpu_flags_x86_sse2 sslv3 static-libs test tls-heartbeat vanilla zlib"
+RESTRICT="!bindist? ( bindist )
+	!test? ( test )"
+
+RDEPEND=">=app-misc/c_rehash-1.7-r1
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=dev-lang/perl-5
+	sctp? ( >=net-misc/lksctp-tools-1.0.12 )
+	test? (
+		sys-apps/diffutils
+		sys-devel/bc
+		sys-process/procps
+	)"
+PDEPEND="app-misc/ca-certificates"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.1.0j-parallel_install_fix.patch #671602
+)
+
+S="${WORKDIR}/${MY_P}"
+
+# force upgrade to prevent broken login, bug 696950
+RDEPEND+=" !<net-misc/openssh-8.0_p1-r3"
+
+MULTILIB_WRAPPED_HEADERS=(
+	usr/include/openssl/opensslconf.h
+)
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} == binary ]] && return
+
+	# must check in pkg_setup; sysctl don't work with userpriv!
+	if has test ${FEATURES} && use sctp; then
+		# test_ssl_new will fail with "Ensure SCTP AUTH chunks are enabled in kernel"
+		# if sctp.auth_enable is not enabled.
+		local sctp_auth_status=$(sysctl -n net.sctp.auth_enable 2>/dev/null)
+		if [[ -z "${sctp_auth_status}" ]] || [[ ${sctp_auth_status} != 1 ]]; then
+			die "FEATURES=test with USE=sctp requires net.sctp.auth_enable=1!"
+		fi
+	fi
+}
+
+src_prepare() {
+	# allow openssl to be cross-compiled
+	cp "${FILESDIR}"/gentoo.config-1.0.2 gentoo.config || die
+	chmod a+rx gentoo.config || die
+
+	if use bindist; then
+		mv "${WORKDIR}"/bindist-patches/hobble-openssl "${WORKDIR}" || die
+		bash "${WORKDIR}"/hobble-openssl || die
+
+		cp -f "${WORKDIR}"/bindist-patches/ec_curve.c "${S}"/crypto/ec/ || die
+		cp -f "${WORKDIR}"/bindist-patches/ectest.c "${S}"/test/ || die
+
+		eapply "${WORKDIR}"/bindist-patches/ec-curves.patch
+
+		local known_failing_test
+		for known_failing_test in \
+			30-test_evp_extra.t \
+			80-test_ssl_new.t \
+		; do
+			ebegin "Disabling test '${known_failing_test}' which is known to fail with USE=bindist"
+			rm test/recipes/${known_failing_test} || die
+			eend $?
+		done
+
+		# Also see the configure parts below:
+		# enable-ec \
+		# $(use_ssl !bindist ec2m) \
+	fi
+
+	# keep this in sync with app-misc/c_rehash
+	SSL_CNF_DIR="/etc/ssl"
+
+	# Make sure we only ever touch Makefile.org and avoid patching a file
+	# that gets blown away anyways by the Configure script in src_configure
+	rm -f Makefile
+
+	if ! use vanilla ; then
+		if [[ $(declare -p PATCHES 2>/dev/null) == "declare -a"* ]] ; then
+			[[ ${#PATCHES[@]} -gt 0 ]] && eapply "${PATCHES[@]}"
+		fi
+	fi
+
+	eapply_user #332661
+
+	if has test ${FEATURES} && use sctp && has network-sandbox ${FEATURES}; then
+		ebegin "Disabling test '80-test_ssl_new.t' which is known to fail with FEATURES=network-sandbox"
+		rm test/recipes/80-test_ssl_new.t || die
+		eend $?
+	fi
+
+	# make sure the man pages are suffixed #302165
+	# don't bother building man pages if they're disabled
+	# Make DOCDIR Gentoo compliant
+	sed -i \
+		-e '/^MANSUFFIX/s:=.*:=ssl:' \
+		-e '/^MAKEDEPPROG/s:=.*:=$(CC):' \
+		-e $(has noman FEATURES \
+			&& echo '/^install:/s:install_docs::' \
+			|| echo '/^MANDIR=/s:=.*:='${EPREFIX}'/usr/share/man:') \
+		-e "/^DOCDIR/s@\$(BASENAME)@&-${PVR}@" \
+		Configurations/unix-Makefile.tmpl \
+		|| die
+
+	# quiet out unknown driver argument warnings since openssl
+	# doesn't have well-split CFLAGS and we're making it even worse
+	# and 'make depend' uses -Werror for added fun (#417795 again)
+	[[ ${CC} == *clang* ]] && append-flags -Qunused-arguments
+
+	append-flags -fno-strict-aliasing
+	append-flags $(test-flags-CC -Wa,--noexecstack)
+	append-cppflags -DOPENSSL_NO_BUF_FREELISTS
+
+	# Prefixify Configure shebang (#141906)
+	sed \
+		-e "1s,/usr/bin/env,${EPREFIX}&," \
+		-i Configure || die
+	# Remove test target when FEATURES=test isn't set
+	if ! use test ; then
+		sed \
+			-e '/^$config{dirs}/s@ "test",@@' \
+			-i Configure || die
+	fi
+	# The config script does stupid stuff to prompt the user.  Kill it.
+	sed -i '/stty -icanon min 0 time 50; read waste/d' config || die
+	./config --test-sanity || die "I AM NOT SANE"
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	unset APPS #197996
+	unset SCRIPTS #312551
+	unset CROSS_COMPILE #311473
+
+	tc-export CC AR RANLIB RC
+
+	# Clean out patent-or-otherwise-encumbered code
+	# Camellia: Royalty Free            https://en.wikipedia.org/wiki/Camellia_(cipher)
+	# IDEA:     Expired                 https://en.wikipedia.org/wiki/International_Data_Encryption_Algorithm
+	# EC:       ????????? ??/??/2015    https://en.wikipedia.org/wiki/Elliptic_Curve_Cryptography
+	# MDC2:     Expired                 https://en.wikipedia.org/wiki/MDC-2
+	# RC5:      Expired                 https://en.wikipedia.org/wiki/RC5
+
+	use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
+	echoit() { echo "$@" ; "$@" ; }
+
+	local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
+
+	# See if our toolchain supports __uint128_t.  If so, it's 64bit
+	# friendly and can use the nicely optimized code paths. #460790
+	local ec_nistp_64_gcc_128
+	# Disable it for now though #469976
+	#if ! use bindist ; then
+	#	echo "__uint128_t i;" > "${T}"/128.c
+	#	if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then
+	#		ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128"
+	#	fi
+	#fi
+
+	local sslout=$(./gentoo.config)
+	einfo "Use configuration ${sslout:-(openssl knows best)}"
+	local config="Configure"
+	[[ -z ${sslout} ]] && config="config"
+
+	# Fedora hobbled-EC needs 'no-ec2m'
+	# 'srp' was restricted until early 2017 as well.
+	# "disable-deprecated" option breaks too many consumers.
+	# Don't set it without thorough revdeps testing.
+	# Make sure user flags don't get added *yet* to avoid duplicated
+	# flags.
+	CFLAGS= LDFLAGS= echoit \
+	./${config} \
+		${sslout} \
+		$(use cpu_flags_x86_sse2 || echo "no-sse2") \
+		enable-camellia \
+		enable-ec \
+		$(use_ssl !bindist ec2m) \
+		$(use_ssl !bindist sm2) \
+		enable-srp \
+		$(use elibc_musl && echo "no-async") \
+		${ec_nistp_64_gcc_128} \
+		enable-idea \
+		enable-mdc2 \
+		enable-rc5 \
+		$(use_ssl sslv3 ssl3) \
+		$(use_ssl sslv3 ssl3-method) \
+		$(use_ssl asm) \
+		$(use_ssl rfc3779) \
+		$(use_ssl sctp) \
+		$(use_ssl tls-heartbeat heartbeats) \
+		$(use_ssl zlib) \
+		--prefix="${EPREFIX}"/usr \
+		--openssldir="${EPREFIX}"${SSL_CNF_DIR} \
+		--libdir=$(get_libdir) \
+		shared threads \
+		|| die
+
+	# Clean out hardcoded flags that openssl uses
+	local DEFAULT_CFLAGS=$(grep ^CFLAGS= Makefile | LC_ALL=C sed \
+		-e 's:^CFLAGS=::' \
+		-e 's:\(^\| \)-fomit-frame-pointer::g' \
+		-e 's:\(^\| \)-O[^ ]*::g' \
+		-e 's:\(^\| \)-march=[^ ]*::g' \
+		-e 's:\(^\| \)-mcpu=[^ ]*::g' \
+		-e 's:\(^\| \)-m[^ ]*::g' \
+		-e 's:^ *::' \
+		-e 's: *$::' \
+		-e 's: \+: :g' \
+		-e 's:\\:\\\\:g'
+	)
+
+	# Now insert clean default flags with user flags
+	sed -i \
+		-e "/^CFLAGS=/s|=.*|=${DEFAULT_CFLAGS} ${CFLAGS}|" \
+		-e "/^LDFLAGS=/s|=[[:space:]]*$|=${LDFLAGS}|" \
+		Makefile || die
+}
+
+multilib_src_compile() {
+	# depend is needed to use $confopts; it also doesn't matter
+	# that it's -j1 as the code itself serializes subdirs
+	emake -j1 depend
+	emake all
+}
+
+multilib_src_test() {
+	emake -j1 test
+}
+
+multilib_src_install() {
+	# We need to create $ED/usr on our own to avoid a race condition #665130
+	if [[ ! -d "${ED}/usr" ]]; then
+		# We can only create this directory once
+		mkdir "${ED}"/usr || die
+	fi
+
+	emake DESTDIR="${D}" install
+}
+
+multilib_src_install_all() {
+	# openssl installs perl version of c_rehash by default, but
+	# we provide a shell version via app-misc/c_rehash
+	rm "${ED}"/usr/bin/c_rehash || die
+
+	dodoc CHANGES* FAQ NEWS README doc/*.txt doc/${PN}-c-indent.el
+
+	# This is crappy in that the static archives are still built even
+	# when USE=static-libs.  But this is due to a failing in the openssl
+	# build system: the static archives are built as PIC all the time.
+	# Only way around this would be to manually configure+compile openssl
+	# twice; once with shared lib support enabled and once without.
+	use static-libs || rm -f "${ED}"/usr/lib*/lib*.a
+
+	# create the certs directory
+	keepdir ${SSL_CNF_DIR}/certs
+
+	# Namespace openssl programs to prevent conflicts with other man pages
+	cd "${ED}"/usr/share/man || die
+	local m d s
+	for m in $(find . -type f | xargs grep -L '#include') ; do
+		d=${m%/*} ; d=${d#./} ; m=${m##*/}
+		[[ ${m} == openssl.1* ]] && continue
+		[[ -n $(find -L ${d} -type l) ]] && die "erp, broken links already!"
+		mv ${d}/{,ssl-}${m}
+		# fix up references to renamed man pages
+		sed -i '/^[.]SH "SEE ALSO"/,/^[.]/s:\([^(, ]*(1)\):ssl-\1:g' ${d}/ssl-${m}
+		ln -s ssl-${m} ${d}/openssl-${m}
+		# locate any symlinks that point to this man page ... we assume
+		# that any broken links are due to the above renaming
+		for s in $(find -L ${d} -type l) ; do
+			s=${s##*/}
+			rm -f ${d}/${s}
+			# We don't want to "|| die" here
+			ln -s ssl-${m} ${d}/ssl-${s}
+			ln -s ssl-${s} ${d}/openssl-${s}
+		done
+	done
+	[[ -n $(find -L ${d} -type l) ]] && die "broken manpage links found :("
+
+	dodir /etc/sandbox.d #254521
+	echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl
+
+	diropts -m0700
+	keepdir ${SSL_CNF_DIR}/private
+}
+
+pkg_postinst() {
+	ebegin "Running 'c_rehash ${EROOT}${SSL_CNF_DIR}/certs/' to rebuild hashes #333069"
+	c_rehash "${EROOT}${SSL_CNF_DIR}/certs" >/dev/null
+	eend $?
+}

dev-libs/raft/raft-0.9.25.ebuild

@@ -11,7 +11,7 @@ SRC_URI="https://github.com/canonical/raft/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-3-with-linking-exception"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="test"
 RESTRICT="!test? ( test )"
 

dev-libs/re2/Manifest

@@ -1,3 +1 @@
-DIST re2-2020-08-01.tar.gz 404076 BLAKE2B 063c3e78cf4983d214309a93a234d864d5ad3acc63ca40befb0b78604ea1406676eb85c34489f3baf74afc0f05ea46482bd7400eb485cd1951feaf4c1429b21c SHA512 1ae261155a1eb96606788eb736faa4dc3240d85f47e3b4c412a4f85f7e4cc69f7c7cbab98397aaf725def1cbc9c5da2c679cfb5573a442d60897740766ae2967
-DIST re2-2020-10-01.tar.gz 403344 BLAKE2B 163d44991dc80dc04871bc53c64d4eec9f9e8db36b057a44eba3b1f033f0b130d7fccf4ba8aec33cc515ab5b11bd4f5b0343b4381758e8d9446c5017f1f04d14 SHA512 cd620878ffa6d4e47f1583f27a179f6520fc1226554bd7c0e104d3d45b2bee70873c0d661e87eb4a9d912b58f86f115766c35d08e124f5f67ddcc3b50535f726
 DIST re2-2020-11-01.tar.gz 402756 BLAKE2B 4c5bb5d4859f5b822408483a90a37b4f7e18d3ee81ecfe52563b091c0594dc32343257521c53267ff0c4b62a81a58b2231b628915afd94d368aebf13b965921e SHA512 167f21ec5a94640820cc1e2e9f4a4d3819a5e70011d0f8afb3fec3b2f66e21688196cedc66ce785158e49d1a0cb34b5f9ae68729e602e77d1077eadcbca7d7fe

dev-libs/re2/re2-0.2020.08.01.ebuild

@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib-minimal toolchain-funcs
-
-# Different date format used upstream.
-RE2_VER=${PV#0.}
-RE2_VER=${RE2_VER//./-}
-
-DESCRIPTION="An efficient, principled regular expression library"
-HOMEPAGE="https://github.com/google/re2"
-SRC_URI="https://github.com/google/re2/archive/${RE2_VER}.tar.gz -> re2-${RE2_VER}.tar.gz"
-
-LICENSE="BSD"
-# NOTE: Always run libre2 through abi-compliance-checker!
-# https://abi-laboratory.pro/tracker/timeline/re2/
-SONAME="8"
-SLOT="0/${SONAME}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86"
-IUSE="icu"
-
-BDEPEND="icu? ( virtual/pkgconfig )"
-DEPEND="icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/re2-${RE2_VER}"
-
-DOCS=( AUTHORS CONTRIBUTORS README doc/syntax.txt )
-HTML_DOCS=( doc/syntax.html )
-
-src_prepare() {
-	default
-	grep -q "^SONAME=${SONAME}\$" Makefile || die "SONAME mismatch"
-	if use icu; then
-		sed -i -e 's:^# \(\(CC\|LD\)ICU=.*\):\1:' Makefile || die
-	fi
-	multilib_copy_sources
-}
-
-src_configure() {
-	tc-export AR CXX
-}
-
-multilib_src_compile() {
-	emake SONAME="${SONAME}" shared
-}
-
-multilib_src_install() {
-	emake SONAME="${SONAME}" DESTDIR="${D}" prefix="${EPREFIX}/usr" libdir="\$(exec_prefix)/$(get_libdir)" shared-install
-}

dev-libs/re2/re2-0.2020.10.01.ebuild

@@ -1,52 +0,0 @@
-# Copyright 2012-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib-minimal toolchain-funcs
-
-# Different date format used upstream.
-RE2_VER=${PV#0.}
-RE2_VER=${RE2_VER//./-}
-
-DESCRIPTION="An efficient, principled regular expression library"
-HOMEPAGE="https://github.com/google/re2"
-SRC_URI="https://github.com/google/re2/archive/${RE2_VER}.tar.gz -> re2-${RE2_VER}.tar.gz"
-
-LICENSE="BSD"
-# NOTE: Always run libre2 through abi-compliance-checker!
-# https://abi-laboratory.pro/tracker/timeline/re2/
-SONAME="8"
-SLOT="0/${SONAME}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="icu"
-
-BDEPEND="icu? ( virtual/pkgconfig )"
-DEPEND="icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/re2-${RE2_VER}"
-
-DOCS=( AUTHORS CONTRIBUTORS README doc/syntax.txt )
-HTML_DOCS=( doc/syntax.html )
-
-src_prepare() {
-	default
-	grep -q "^SONAME=${SONAME}\$" Makefile || die "SONAME mismatch"
-	if use icu; then
-		sed -i -e 's:^# \(\(CC\|LD\)ICU=.*\):\1:' Makefile || die
-	fi
-	multilib_copy_sources
-}
-
-src_configure() {
-	tc-export AR CXX
-}
-
-multilib_src_compile() {
-	emake SONAME="${SONAME}" shared
-}
-
-multilib_src_install() {
-	emake SONAME="${SONAME}" DESTDIR="${D}" prefix="${EPREFIX}/usr" libdir="\$(exec_prefix)/$(get_libdir)" shared-install
-}

dev-php/pecl-apcu/pecl-apcu-5.1.19.ebuild

@@ -8,7 +8,7 @@ PHP_EXT_INI="yes"
 PHP_EXT_ZENDEXT="no"
 DOCS=( NOTICE README.md TECHNOTES.txt )
 
-USE_PHP="php7-1 php7-2 php7-3 php7-4"
+USE_PHP="php7-2 php7-3 php7-4 php8-0"
 
 inherit php-ext-pecl-r3
 

dev-php/pecl-mailparse/pecl-mailparse-3.1.1.ebuild

@@ -8,7 +8,7 @@ PHP_EXT_NAME="mailparse"
 PHP_EXT_INI="yes"
 PHP_EXT_ZENDEXT="no"
 PHP_EXT_ECONF_ARGS=""
-USE_PHP="php7-1 php7-2 php7-3 php7-4"
+USE_PHP="php7-2 php7-3 php7-4 php8-0"
 PHP_EXT_NEEDED_USE="unicode"
 DOCS=( README.md )
 
@@ -20,9 +20,3 @@ DESCRIPTION="PHP extension for parsing and working with RFC822 and MIME complian
 LICENSE="PHP-3.01"
 SLOT="7"
 IUSE=""
-
-src_prepare() {
-	# Missing test source files in archive.  Fixed upstream in next release.
-	rm tests/011.phpt tests/bug001.phpt || die
-	php-ext-source-r3_src_prepare
-}

dev-php/pecl-oauth/pecl-oauth-2.0.7.ebuild

@@ -6,7 +6,7 @@ PHP_EXT_NAME="oauth"
 PHP_EXT_INI="yes"
 PHP_EXT_ZENDEXT="no"
 
-USE_PHP="php7-2 php7-3 php7-4"
+USE_PHP="php7-2 php7-3 php7-4 php8-0"
 
 inherit php-ext-pecl-r3
 
@@ -17,12 +17,11 @@ LICENSE="BSD"
 SLOT="7"
 IUSE="+curl examples"
 
-DEPEND="php_targets_php7-2? ( dev-lang/php:7.2[hash(-)]
+DEPEND="
-		dev-libs/libpcre:3= curl? ( net-misc/curl:0= ) )
+	dev-libs/libpcre:3=
-	php_targets_php7-3? ( dev-lang/php:7.3[hash(-)]
+	curl? ( net-misc/curl:0= )
-		dev-libs/libpcre:3= curl? ( net-misc/curl:0= ) )
+	php_targets_php7-2? ( dev-lang/php:7.2[hash(-)] )
-	php_targets_php7-4? (
+	php_targets_php7-3? ( dev-lang/php:7.3[hash(-)] )
-		dev-libs/libpcre:3= curl? ( net-misc/curl:0= ) )
 "
 RDEPEND="${DEPEND}"
 

dev-php/pecl-timezonedb/Manifest

@@ -1,2 +1,3 @@
 DIST timezonedb-2019.3.tgz 413166 BLAKE2B 99542a2c0dc50d96316dc14b22c8a2404db07a88d3f46050a954f10bfb501cd81fb7161805a91336075d607ac106208285e6d2281a9ed68b344fd4837fabcb49 SHA512 8342a0ed83a52ade0415430751d4efeaa84fb72e7da3aec8921338e9dfbf37ff1f098f6b6e1ed9c8f1c9c62017a0fe9c14f86a53be72f8b9f1ec137fa45d057d
 DIST timezonedb-2020.1.tgz 413993 BLAKE2B 1f598269060c7f228d103549ac31429df3e31e68961fb41182101400c9f71ea8503cb11943732b49b749aa055e7eedfb4fd06e11cc11c1381bc69f294c3433b6 SHA512 31c38d5b25db921ec5be924ac85d9cf9dd2180c4e2d50e074a143dfdf9415a8c7579e96f7a768b305554bf1cb332b46f2c652fda7d2f1638502b995fc0679ca5
+DIST timezonedb-2020.4.tgz 414667 BLAKE2B 1a219a090ae33a9f3eef76ab52e2bafd453a1f1161bbeeb53ee995d090f3fdd03c7a658a93ade72e3e1ae61df9d646eaef85dd4cacb5cea45c00adcfac8d6651 SHA512 d5c41c76b4b0b033464a4f086072d061504fc439c910c47a7077a0586b308cc37a4202ff9f418a39cee63534d55136d15a173bb94923160c0fa16bb33ac89a09

dev-php/pecl-timezonedb/pecl-timezonedb-2020.4.ebuild

@@ -0,0 +1,19 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PHP_EXT_NAME="timezonedb"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+
+USE_PHP="php7-2 php7-3 php7-4 php8-0"
+
+inherit php-ext-pecl-r3
+
+DESCRIPTION="Timezone Database to be used with PHP's date and time functions"
+LICENSE="PHP-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE=""
+PHP_EXT_ECONF_ARGS=""

dev-php/pecl-translit/Manifest

@@ -1 +1,2 @@
 DIST pecl-translit-0.6.3.tar.gz 227419 BLAKE2B ebff291a00d61bb4f8e2c47e26baef4278f317be8acd7e5265d3056f8992e6b7e792718c86633277c4a0af5403e253b317241a71aba9b73079a8efb53389ab30 SHA512 5b5e3097a972e45424696abea4d4698fc6c7b6598f1a76754224a4b66776752a01b3bad52bc14afb8cc6e75d36c4558677e609a379898cdd91a5b0a652155cd1
+DIST pecl-translit-0.7.1.tar.gz 227287 BLAKE2B 4d9c9a74ec775d720bf4f2742460e7c96f52bac7b0ddec71622818d5e257bf468092b067ce33b335eee78ded8f2e74f0378acb22a18ef7a30db57a78d9215939 SHA512 62a2a26dbc01bd802c16ab0346d8c2a1960c1066b221bc05d609ca49fef26e9ffbbee9b685fbd82ca9b02be954fbd7f5eb2d9de307c746a792b8785f44e64d46

dev-php/pecl-translit/pecl-translit-0.7.1.ebuild

@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PHP_EXT_NAME="translit"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+
+USE_PHP="php7-2 php7-3 php7-4 php8-0"
+PHP_EXT_NAME="translit"
+
+inherit php-ext-source-r3
+
+SRC_URI="https://github.com/derickr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64 ~x86"
+HOMEPAGE="https://github.com/derickr/pecl-translit"
+
+DESCRIPTION="Transliterates non-latin character sets to latin"
+LICENSE="BSD-2"
+SLOT="0"
+IUSE=""
+PHP_EXT_ECONF_ARGS=()
+
+src_test() {
+	for slot in $(php_get_slots); do
+		php_init_slot_env ${slot}
+		NO_INTERACTION="yes" emake test
+	done
+}

dev-php/pecl-uuid/pecl-uuid-1.2.0.ebuild

@@ -8,7 +8,7 @@ PHP_EXT_INIT="yes"
 PHP_EXT_ZENDEXT="no"
 DOCS=( CREDITS )
 
-USE_PHP="php7-1 php7-2 php7-3 php7-4"
+USE_PHP="php7-2 php7-3 php7-4 php8-0"
 
 inherit php-ext-pecl-r3
 

dev-python/feedparser/feedparser-5.2.1-r1.ebuild

@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Parse RSS and Atom feeds in Python"
+HOMEPAGE="https://github.com/kurtmckee/feedparser https://pypi.org/project/feedparser/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+# sgmllib is licensed under PSF-2.
+LICENSE="BSD-2 PSF-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE=""
+
+# Tests have issues with chardet installed, and are just kind of buggy.
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}/${P}-sgmllib.patch"
+)
+
+python_prepare_all() {
+	mv feedparser/sgmllib3.py feedparser/_feedparser_sgmllib.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	cp feedparser/feedparsertest.py "${BUILD_DIR}" || die
+	ln -s "${S}/feedparser/tests" "${BUILD_DIR}/tests" || die
+	cd "${BUILD_DIR}" || die
+	if [[ ${EPYTHON} == python3* ]]; then
+		2to3 --no-diffs -w -n feedparsertest.py || die
+	fi
+	"${PYTHON}" feedparsertest.py || die "Testing failed with ${EPYTHON}"
+}

dev-python/mock/mock-4.0.2.ebuild

@@ -13,7 +13,7 @@ SRC_URI="https://github.com/testing-cabal/mock/archive/${PV}.tar.gz -> ${P}.gh.t
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	$(python_gen_cond_dep '
@@ -23,6 +23,11 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	>=dev-python/setuptools-17.1[${PYTHON_USEDEP}]"
 
+src_prepare() {
+	sed -i -e '/  pytest.*/d' setup.cfg || die
+	distutils-r1_src_prepare
+}
+
 python_test() {
 	# Upstream supports running tests only in their dream pristine
 	# environment.  pytest doesn't work at all if mock is already
@@ -40,6 +45,9 @@ python_test() {
 			mock/tests/testmock.py || die
 	fi
 
+	# Avoid pytest dependency
+	sed -i -e '/import pytest/d' mock/tests/testhelpers.py || die
+
 	"${EPYTHON}" -m unittest discover -v || die "Tests failed with ${EPYTHON}"
 }
 

dev-python/parameterized/parameterized-0.7.4.ebuild

@@ -15,4 +15,10 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ~arm64 x86"
 
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
 distutils_enable_tests nose

dev-ruby/cmdparse/Manifest

@@ -1 +1,2 @@
 DIST cmdparse-3.0.6.gem 54272 BLAKE2B 04d1ce8a10a716c913eb6def6e6abd72c4ca5aeb2f761c0fd84d95cce524d853f89d959d2babf078e313b4f7ca738ce7bb3da1027c77c0811cb7c81bf89cb6cf SHA512 c097d0d85c4da423d393bfef875d214221543db19f1fa8f66ea711090e468a67250480ecb8c113d29b77173cd48e809cd3afb5a810cd62986abf066a568515ca
+DIST cmdparse-3.0.7.gem 54784 BLAKE2B 2ce8b26b362ed78cd6e5ecc1d678c32a6065dc38c402e82f6715ee2bd834c49bcca2ec93d2dd11d2ae2ac809068efa4fe640f98f367c4278da6d0cccae094222 SHA512 5ee929c9aaf6254686a916fa11e4f4809693434f2cff7ad5e14aef2b1a95bfcd2e818afc0e4337616836971a85c980b76e89bbe61f6be250c372ec0587dc58b0

dev-ruby/cmdparse/cmdparse-3.0.7.ebuild

@@ -0,0 +1,22 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_TASK_TEST=""
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+IUSE=""
+
+DESCRIPTION="Advanced command line parser supporting commands"
+HOMEPAGE="https://cmdparse.gettalong.org/"
+
+KEYWORDS="~amd64 ~ppc64 ~x86"
+LICENSE="MIT"
+SLOT="3"

dev-ruby/tty-reader/Manifest

@@ -1,2 +1,3 @@
 DIST tty-reader-0.7.0.gem 25600 BLAKE2B 41af0db92c337cdebb428a93b924f466d72f67042267abd4b3cc97a319e01757c2f1f302ec0002de5b90fa1ebecca0d6bffcdc621be2e435d549263779ed3712 SHA512 29f41a15ff9d86300d9cb6067028a2bf540d258d8a8ca11892e26d40e423854ce32706a33a5cb75037d99d8d30d42998ecc6876a99f3c30bbddacffe61fbf70e
 DIST tty-reader-0.8.0.tar.gz 459623 BLAKE2B c787eebf03fa6169e710d7f838ee02f558577bbd806988e088a9f950c3cf5ef6d4f9e3569f2a29f4a81bcaa2222e029128dc48e439eae075741b077e42c70246 SHA512 8fbae094bbba287c2a2176e9838d0769ad33d6d464165f8b46484d47902ce4131842f196d3b7c0fa6f9be10bb37e2315b1dba517d46872b6f8e5a4fb3a6790da
+DIST tty-reader-0.9.0.tar.gz 461051 BLAKE2B f2a48a929fc7ec0f6f98e4508ed50638e041939ae2eadf96cb8d04e4a771304e63648d5c3a85581fef3ae4740a570114e8d427637c6b3a05ece400f7963a26cb SHA512 2480f480a6ab0fa0854386ba0c31b5e78ff53a2d65b23825b13e50929337f56f8e38d1277f61509139cb43eddd8a933fadcd9d3c916c9dbaacf4dac1ec38dbaf

dev-ruby/tty-reader/tty-reader-0.9.0.ebuild

@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+RUBY_FAKEGEM_GEMSPEC="tty-reader.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Methods for processing keyboard input in character, line and multiline modes"
+HOMEPAGE="https://github.com/piotrmurach/tty-reader"
+SRC_URI="https://github.com/piotrmurach/tty-reader/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend "
+	>=dev-ruby/tty-cursor-0.7:0
+	>=dev-ruby/tty-screen-0.8:0
+	=dev-ruby/wisper-2*
+"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/ s:^:#:' spec/spec_helper.rb || die
+	sed -i -e 's:_relative ": "./:' ${RUBY_FAKEGEM_GEMSPEC} || die
+}

dev-util/gnome-builder/Manifest

@@ -1 +1,2 @@
 DIST gnome-builder-3.36.1.tar.xz 12026976 BLAKE2B d833665bb71b1549fe789d05dbd89db588ae4cc7187e532f38f3bd9e779bccab644d9f9bfc4c84bd484ac678bcf8594e4aa4edff29ea8c87c5c557fc3e422a4f SHA512 284da6e5a9e766cb6f6122f1134c779cde8406b006728ae1fff3518020ef4b96239aa5037cd2d35cfe4728ea088d61c4eeabc39ea753a16208fdaba7b04e63c2
+DIST gnome-builder-3.38.1.tar.xz 12077860 BLAKE2B 68dfbf9aeda93c695035a51c020735a914a11a09d7106228c2b7fe603b3b1b7b292f6a110c77df2057d40ae7f0c7559cb48c6ecc888de2767984a03d34467a2f SHA512 50872a7285292f4e29acec153a7ba4616ab8e69529fbc7682fb74fa9d8b5c49ed52b939c7652bcf410444e2c2de969280b82ab4da44008f4b95863bfd52ac59a

dev-util/gnome-builder/gnome-builder-3.38.1.ebuild

@@ -0,0 +1,178 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+DISABLE_AUTOFORMATTING=1
+FORCE_PRINT_ELOG=1
+
+inherit gnome.org gnome2-utils llvm meson python-single-r1 readme.gentoo-r1 virtualx xdg
+
+DESCRIPTION="An IDE for writing GNOME-based software"
+HOMEPAGE="https://wiki.gnome.org/Apps/Builder"
+
+# FIXME: Review licenses at some point
+LICENSE="GPL-3+ GPL-2+ LGPL-3+ LGPL-2+ MIT CC-BY-SA-3.0 CC0-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="clang +devhelp doc +git +glade gtk-doc spell sysprof test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# When bumping, pay attention to all the included plugins/*/meson.build (and other) build files and the requirements within.
+# `grep -rI dependency * --include='meson.build'` can give a good initial idea for external deps and their double checking.
+# The listed RDEPEND order shold roughly match that output as well, with toplevel one first then sorted by file path.
+# Most plugins have no extra requirements and default to enabled; we need to handle the ones with extra requirements. Many of
+# them have optional runtime dependencies, for which we try to at least notify the user via DOC_CONTENTS (but not all small
+# things); `grep -rI -e 'command-pattern.*=' -e 'push_arg'` can give a (spammy) idea, plus python imports in try/except.
+
+# FIXME: plugin_flatpak needs flatpak.pc >=0.8.0, ostree-1, libsoup-2.4.pc >=2.52.0 and git plugin enabled
+# Editorconfig needs old pcre, with vte migrating away, might want it optional or ported to pcre2?
+# An introspection USE flag of a dep is required if any introspection based language plugin wants to use it (grep for gi.repository). Last full check at 3.28.4
+
+# TODO: Handle llvm slots via llvm.eclass; see plugins/clang/meson.build
+# TODO: automagic libportal dep
+# TODO: automagic sysprof dep for tracing paths from toplevel meson.build
+RDEPEND="
+	>=dev-libs/libdazzle-3.37.0[introspection]
+	>=dev-libs/glib-2.65.0:2
+	>=x11-libs/gtk+-3.22.26:3[introspection]
+	>=x11-libs/gtksourceview-4.0.0:4[introspection]
+	>=dev-libs/json-glib-1.2.0
+	>=dev-libs/jsonrpc-glib-3.19.91
+	>=x11-libs/pango-1.38.0
+	>=dev-libs/libpeas-1.22.0[python,${PYTHON_SINGLE_USEDEP}]
+	>=dev-libs/template-glib-3.28.0[introspection]
+	>=x11-libs/vte-0.40.2:2.91[introspection]
+	>=net-libs/webkit-gtk-2.26:4=[introspection]
+	>=dev-libs/libxml2-2.9.0
+	git? ( dev-libs/libgit2:=[ssh,threads]
+		>=dev-libs/libgit2-glib-0.28.0.1[ssh]
+	)
+	dev-libs/libpcre:3
+	dev-libs/libpcre2
+
+	>=dev-libs/gobject-introspection-1.54.0:=
+	$(python_gen_cond_dep '
+		>=dev-python/pygobject-3.22.0:3[${PYTHON_USEDEP}]
+	')
+	${PYTHON_DEPS}
+	clang? ( sys-devel/clang:= )
+	devhelp? ( >=dev-util/devhelp-3.25.1:= )
+	glade? ( >=dev-util/glade-3.22.0:3.10= )
+	spell? ( >=app-text/gspell-1.8:0=
+		app-text/enchant:2 )
+	sysprof? ( >=dev-util/sysprof-3.37.1:0/4[gtk] )
+"
+DEPEND="${RDEPEND}"
+# TODO: runtime ctags path finding..
+
+# desktop-file-utils required for tests, but we have it in deptree for xdg update-desktop-database anyway, so be explicit and unconditional
+# appstream-glib needed for validation with appstream-util with FEATURES=test
+BDEPEND="
+	doc? ( $(python_gen_cond_dep '
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+	') )
+	gtk-doc? ( dev-util/gtk-doc
+		app-text/docbook-xml-dtd:4.3 )
+	test? (
+		dev-libs/appstream-glib
+		sys-apps/dbus )
+	dev-util/desktop-file-utils
+	dev-util/glib-utils
+	>=dev-util/meson-0.49.2
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+DOC_CONTENTS='gnome-builder can use various other dependencies on runtime to provide
+extra capabilities beyond these expressed via USE flags. Some of these
+that are currently available with packages include:
+
+* dev-util/uncrustify and dev-python/autopep8 for various Code Beautifier
+  plugin out of the box functionality.
+* dev-util/ctags with exuberant-ctags selected via "eselect ctags" for
+  C, C++, Python, JavaScript, CSS, HTML and Ruby autocompletion, semantic
+  highlighting and symbol resolving support.
+* dev-python/jedi and dev-python/lxml for more accurate Python
+  autocompletion support.
+* dev-util/valgrind for integration with valgrind.
+* dev-util/meson for integration with the Meson build system.
+* dev-util/cargo for integration with the Rust Cargo build system.
+* dev-util/cmake for integration with the CMake build system.
+* net-libs/nodejs[npm] for integration with the NPM package system.
+'
+# FIXME: Package codespell and mention here
+# FIXME: Package gnome-code-assistance and mention here, or maybe USE flag and default enable because it's rather important
+# eslint for additional diagnostics in JavaScript files (what package has this? At least something via NPM..)
+# jhbuild support
+# rust support via rust-analyzer (rls plugin now disabled by default); Go via go-langserver
+# autotools stuff for autotools plugin; gtkmm/autoconf-archive for C++ template
+# gjs/gettext/mono/PHPize stuff, but most of these are probably installed for other reasons anyways, when needed inside IDE
+# stylelint for stylesheet (CSS and co) linting
+# gvls for vala language-server integration
+
+llvm_check_deps() {
+	has_version "sys-devel/clang:${LLVM_SLOT}"
+}
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	use clang && llvm_pkg_setup
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dtracing=false
+		-Dprofiling=false # not passing -pg to CFLAGS
+		-Dtcmalloc=false
+		-Dchannel=other
+
+		$(meson_use doc help)
+		$(meson_use gtk-doc docs)
+
+		-Dnetwork_tests=false
+		$(meson_use clang plugin_clang)
+		$(meson_use devhelp plugin_devhelp)
+		-Dplugin_deviced=false
+		-Dplugin_editorconfig=true # needs libpcre
+		-Dplugin_flatpak=false
+		$(meson_use git plugin_git)
+		$(meson_use glade plugin_glade)
+		-Dplugin_podman=false
+		$(meson_use spell plugin_spellcheck)
+		$(meson_use sysprof plugin_sysprof)
+		-Dplugin_update_manager=false
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	python_optimize
+	if use doc; then
+		rm "${ED}"/usr/share/doc/gnome-builder/en/.buildinfo || die
+		rm "${ED}"/usr/share/doc/gnome-builder/en/objects.inv || die
+		# custom docdir in build system, blocked by https://github.com/mesonbuild/meson/issues/825
+		mv "${ED}"/usr/share/doc/gnome-builder/en "${ED}"/usr/share/doc/${PF}/html || die
+		# _sources subdir left in on purpose, as HTML links to the rst files as "View page source". Additionally default docompress exclusion of /html/ already ensures they aren't compressed, thus linkable as-is.
+		rmdir "${ED}"/usr/share/doc/gnome-builder/ || die
+	fi
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
+
+src_test() {
+	# FIXME: can't run meson_src_test together with virtx or dbus-run-session
+	virtx dbus-run-session meson test -C "${BUILD_DIR}"
+}

dev-util/gprof2dot/gprof2dot-2019.11.30.ebuild

@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 PYTHON_REQ_USE='xml'
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
@@ -19,9 +19,5 @@ LICENSE="LGPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}"
-DEPEND="${RDEPEND}"
 
 S="${WORKDIR}"/${MY_P}

dev-util/gtk-doc/gtk-doc-1.33.1-r3.ebuild

@@ -81,8 +81,8 @@ src_install() {
 
 	# The meson build system configures the shebangs to the temporary python
 	# used during the build. We need to fix it.
-	sed -i -e 's:^#!.*:#!/usr/bin/env python3:' "${ED}"/usr/bin/* || die
+	sed -i -e 's:^#!.*python3:#!/usr/bin/env python3:' "${ED}"/usr/bin/* || die
-	python_fix_shebang "${ED}"/usr/bin/*
+	python_fix_shebang "${ED}"/usr/bin
 
 	# Don't install this file, it's in gtk-doc-am now
 	rm "${ED}"/usr/share/aclocal/gtk-doc.m4 || die "failed to remove gtk-doc.m4"

dev-util/hermes/Manifest

@@ -0,0 +1 @@
+DIST hermes-2.8.tar.gz 61010 BLAKE2B 520110318dd0c2f2bc150b050729f9fa36c14ea5dca9a8492e77bc67618e14adb36ca35cf67b1aeb7a1e8a2dfef84fb6662bbdad21e427bff8aea4d53c271be3 SHA512 ea3378e5311202333f6eb59e301c92d9db1937e540f00283b679bd50e54312b8a98c469cf106374e9dde78a37e8997d7022569a9f81703ba445577f8cdd7e6e3

dev-util/hermes/files/99hermes

@@ -0,0 +1 @@
+PATH="/opt/hermes/bin"

dev-util/hermes/files/hermes-2.8-lua-shebang.patch

@@ -0,0 +1,23 @@
+diff --git a/lib/tool.lua b/lib/tool.lua
+index a9124f3..8c39911 100755
+--- a/lib/tool.lua
++++ b/lib/tool.lua
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env lua
++#!@LUA@
+ 
+ require("strict")
+ function tool()
+diff --git a/bin/lua_cmd b/bin/lua_cmd
+index fabc5d5..32c8e13 100755
+--- a/bin/lua_cmd
++++ b/bin/lua_cmd
+@@ -37,7 +37,7 @@ extra=
+ if [ "x$LUA_PATH" != x ]; then
+   extra=";$LUA_PATH"
+ else
+-  extra=";`lua -e 'print(package.path)'`"
++  extra=";`@LUA@ -e 'print(package.path)'`"
+ fi
+ 
+ export LUA_PATH="$execLuaPath$extra"

dev-util/hermes/hermes-2.8.ebuild

@@ -0,0 +1,46 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..3} )
+inherit lua-single
+
+DESCRIPTION="Lua based testing manager"
+HOMEPAGE="https://github.com/TACC/Hermes"
+SRC_URI="https://github.com/TACC/Hermes/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/Hermes-${PV}
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="MIT"
+SLOT="0"
+IUSE="test"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+RDEPEND="${LUA_DEPS}
+	$(lua_gen_cond_dep '
+		dev-lua/luaposix[${LUA_USEDEP}]
+	')
+"
+
+PATCHES=( "${FILESDIR}"/${PN}-2.8-lua-shebang.patch )
+
+src_compile() {
+	sed -e "s|@LUA@|${LUA}|g" \
+	    -i lib/tool.lua \
+	    -i bin/lua_cmd || die
+}
+
+src_test() {
+	local -x PATH="bin:${PATH}"
+	tm -vvv || die
+	testcleanup || die
+}
+
+src_install() {
+	dodir /opt/hermes
+	cp -r "${S}"/. "${ED}"/opt/hermes/ || die
+
+	doenvd "${FILESDIR}"/99hermes
+}

dev-util/hermes/metadata.xml

@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>gentoo@aisha.cc</email>
+		<name>Aisha Tammy</name>
+	</maintainer>
 	<maintainer type="project">
-		<email>fonts@gentoo.org</email>
+		<email>sci@gentoo.org</email>
-		<name>Fonts</name>
+		<name>Gentoo Science Project</name>
 	</maintainer>
 </pkgmetadata>

dev-util/idea-community/Manifest

@@ -1,6 +1,2 @@
-DIST ideaIC-2.4.202.8194.7.tar.gz 529563361 BLAKE2B 1f792d1ff8b1246d5ccaf4324d6c85dbe2491f6585c126ef38594709358512766f7ed3cbb2128b6b8db71286ef1a5c6cf8ac21bc0293b0ac9b373e55e6cae3d9 SHA512 f603416c829f1f2b47e371c18dc8706bb6b9df9d87ee6056ac7e4786d7f9c029246195c2fb3b63bb7d0c1c7bfee99911b2c0d686232aa243087e4a17c0f559d7
 DIST ideaIC-3.0.203.5981.155.tar.gz 582023182 BLAKE2B 671fbba0c2173e3780a99d0d3b106af75c4ef6df4198ced3653c1b74a7bbb055a29b1fc31eb89823bfd56e6737c7788f78a90fe7ef46e52ab410c0dff18868e9 SHA512 35d569c5e13ec620d0a476cc52c005d29ea3c7c3c1ab0614a1a73255309635c84ee00820c50584ca19af634165138c77d8d712cfe0d367b9525956ad33aafe77
-DIST jbr-11_0_2-linux-x64-b164.tar.gz 131483925 BLAKE2B fb9c55094aeb4a9e6b89ef41699252355895fa4bf55eaa0d3c0a637b6485b5a91a0445b5f4af1872b62cd67b639f7354e05770970d41dcfa58ffeda7ae43c5b6 SHA512 4f32940166cc8ad5a138866e18d4cbfcd07f4326a85c051b7a622c9dcb8ee4b6d493331ef24d0c01999134fa2a9bad901f026982c16780fdc5e6b9308821db34
 DIST jbr-11_0_8-linux-x64-b1098.1.tar.gz 191689225 BLAKE2B 0da0f0e834709c89820f2e7e1c447dc33ea1c59c7dfb573aa47bc205f7920ccf485454f79931d42d4e6eb4de1017589bb908808d6a80cc586659757abc9958d3 SHA512 a455d8bd3332622592186cd7ae3995a9148a47717a81c274497f5408f1e89ef637c7478321b4ccd5dbe97c2e246a16ac8956c5ce475f8a4156232647f0ea7737
-DIST jbrx-8u202-linux-i586-b1483.37.tar.gz 80726147 BLAKE2B e4e5a076a541fd7153e861193ff4247c02ecbc144396ed28737afa7440f7771569b8d968b7c67b3dac333a89ff0b54cc9e5e76d1651b174cc7c0c21b1deb033c SHA512 53693f2ce994f4891807873ae3fe46ce60bee000b78be03c5d3df06b436328abe5b5d7e75d43e57f35f24187f49915187d034b39589e29806f55deeb14a029f2
-DIST jbrx-8u202-linux-x64-b1483.37.tar.gz 81812743 BLAKE2B 86ddf0c8dc992a27e680caa821f54fa4d647a8bff78b9fdbef82996bfbba828a2f68f1a00ed64bd92ce24a62bfc6c0240837c396644c6e91244cb0d980b6c704 SHA512 cd31a3c4da7b8c65e9ae89326c2c8b260b51890258d30f64b1e8a7c6c1442bb2cb68ea2aa80387ce0c1a8f50e3533e8231f72c5935b639e3cf82bc1ffedee8e9

dev-util/idea-community/idea-community-2020.2.4.202.8194.7.ebuild

@@ -1,142 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit eutils desktop
-
-SLOT="0"
-PV_STRING="$(ver_cut 2-6)"
-MY_PV="$(ver_cut 1-3)"
-MY_PN="idea"
-# Using the most recent Jetbrains Runtime binaries available at the time of writing
-# As the exact bundled versions ( jre 11 build 159.30 and jre 8 build 1483.39 ) aren't
-# available separately
-JRE11_BASE="11_0_2"
-JRE11_VER="164"
-JRE_BASE="8u202"
-JRE_VER="1483.37"
-
-# distinguish settings for official stable releases and EAP-version releases
-if [[ "$(ver_cut 7)"x = "prex" ]]
-then
-	# upstream EAP
-	KEYWORDS="~arm64"
-	SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IC-${PV_STRING}.tar.gz"
-else
-	# upstream stable
-	KEYWORDS="~amd64 ~arm64 ~x86"
-	SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IC-${MY_PV}-no-jbr.tar.gz -> ${MY_PN}IC-${PV_STRING}.tar.gz
-		jbr8? ( x86? ( https://bintray.com/jetbrains/intellij-jdk/download_file?file_path=jbrx-${JRE_BASE}-linux-i586-b${JRE_VER}.tar.gz -> jbrx-${JRE_BASE}-linux-i586-b${JRE_VER}.tar.gz )
-		amd64? ( https://bintray.com/jetbrains/intellij-jdk/download_file?file_path=jbrx-${JRE_BASE}-linux-x64-b${JRE_VER}.tar.gz -> jbrx-${JRE_BASE}-linux-x64-b${JRE_VER}.tar.gz ) )
-		jbr11? ( amd64? ( https://bintray.com/jetbrains/intellij-jdk/download_file?file_path=jbr-${JRE11_BASE}-linux-x64-b${JRE11_VER}.tar.gz -> jbr-${JRE11_BASE}-linux-x64-b${JRE11_VER}.tar.gz ) )"
-fi
-
-DESCRIPTION="A complete toolset for web, mobile and enterprise development"
-HOMEPAGE="https://www.jetbrains.com/idea"
-
-LICENSE="Apache-2.0 BSD BSD-2 CC0-1.0 CC-BY-2.5 CDDL-1.1
-	codehaus-classworlds CPL-1.0 EPL-1.0 EPL-2.0 jbr8? ( GPL-2 )
-	jbr11? ( GPL-2 ) GPL-2 GPL-2-with-classpath-exception ISC
-	JDOM LGPL-2.1 LGPL-2.1+ LGPL-3-with-linking-exception MIT
-	MPL-1.0 MPL-1.1 OFL ZLIB"
-
-#Splitting custom-jdk into jbr8 and jbr11 as upstream now offers downloads with
-#either (or neither) bundled
-#Defaulting to jbr8 to match upstream
-IUSE="+jbr8 -jbr11"
-REQUIRED_USE="jbr8? ( !jbr11 )"
-
-DEPEND="!dev-util/${PN}:14
-	!dev-util/${PN}:15"
-RDEPEND="${DEPEND}
-	>=virtual/jdk-1.7:*
-	dev-java/jansi-native
-	dev-libs/libdbusmenu
-	=dev-util/lldb-9*"
-BDEPEND="dev-util/patchelf"
-RESTRICT="splitdebug"
-S="${WORKDIR}/${MY_PN}-IC-$(ver_cut 4-6)"
-
-QA_PREBUILT="opt/${PN}-${MY_PV}/*"
-
-# jbr11 binary doesn't unpack nicely into a single folder
-src_unpack() {
-	default_src_unpack
-	if use jbr11 ; then
-		mkdir jre64 && cd jre64 && unpack jbr-${JRE11_BASE}-linux-x64-b${JRE11_VER}.tar.gz
-	fi
-}
-
-src_prepare() {
-	if use amd64; then
-		JRE_DIR=jre64
-	else
-		JRE_DIR=jre
-	fi
-
-	if use jbr8; then
-		mv "${WORKDIR}/jre" ./"${JRE_DIR}"
-		PLUGIN_DIR="${S}/${JRE_DIR}/lib/${ARCH}"
-	else
-		PLUGIN_DIR="${S}/${JRE_DIR}/lib/"
-	fi
-
-	rm -vf ${PLUGIN_DIR}/libavplugin*
-	rm -vf "${S}"/plugins/maven/lib/maven3/lib/jansi-native/*/libjansi*
-	rm -vrf "${S}"/lib/pty4j-native/linux/ppc64le
-	rm -vf "${S}"/bin/libdbm64*
-
-	if [[ -d "${S}"/"${JRE_DIR}" ]]; then
-		for file in "${PLUGIN_DIR}"/{libfxplugins.so,libjfxmedia.so}
-		do
-			if [[ -f "$file" ]]; then
-			  patchelf --set-rpath '$ORIGIN' $file || die
-			fi
-		done
-	fi
-
-	patchelf --replace-needed liblldb.so liblldb.so.9 "${S}"/plugins/Kotlin/bin/linux/LLDBFrontend || die "Unable to patch LLDBFrontend for lldb"
-
-	sed -i \
-		-e "\$a\\\\" \
-		-e "\$a#-----------------------------------------------------------------------" \
-		-e "\$a# Disable automatic updates as these are handled through Gentoo's" \
-		-e "\$a# package manager. See bug #704494" \
-		-e "\$a#-----------------------------------------------------------------------" \
-		-e "\$aide.no.platform.update=Gentoo"  bin/idea.properties
-
-	eapply_user
-}
-
-src_install() {
-	local dir="/opt/${PN}-${MY_PV}"
-
-	insinto "${dir}"
-	doins -r *
-	fperms 755 "${dir}"/bin/{format.sh,idea.sh,inspect.sh,printenv.py,restart.py,fsnotifier{,64}}
-	if use amd64; then
-		JRE_DIR=jre64
-	else
-		JRE_DIR=jre
-	fi
-	if use jbr8 || use jbr11 ; then
-	if use jbr8; then
-		JRE_BINARIES="java jjs keytool orbd pack200 policytool rmid rmiregistry servertool tnameserv unpack200"
-	else
-		JRE_BINARIES="jaotc java javapackager jjs jrunscript keytool pack200 rmid rmiregistry unpack200"
-	fi
-		if [[ -d ${JRE_DIR} ]]; then
-			for jrebin in $JRE_BINARIES; do
-				fperms 755 "${dir}"/"${JRE_DIR}"/bin/"${jrebin}"
-			done
-		fi
-	fi
-
-	make_wrapper "${PN}" "${dir}/bin/${MY_PN}.sh"
-	newicon "bin/${MY_PN}.png" "${PN}.png"
-	make_desktop_entry "${PN}" "IntelliJ Idea Community" "${PN}" "Development;IDE;"
-
-	# recommended by: https://confluence.jetbrains.com/display/IDEADEV/Inotify+Watches+Limit
-	mkdir -p "${D}/etc/sysctl.d/" || die
-	echo "fs.inotify.max_user_watches = 524288" > "${D}/etc/sysctl.d/30-idea-inotify-watches.conf" || die
-}

dev-util/idea-community/idea-community-2020.3.0.203.5981.155-r1.ebuild

@@ -45,7 +45,7 @@ RDEPEND="${DEPEND}
 	>=virtual/jdk-1.7:*
 	dev-java/jansi-native
 	dev-libs/libdbusmenu
-	=dev-util/lldb-9*"
+	=dev-util/lldb-10*"
 BDEPEND="dev-util/patchelf"
 RESTRICT="splitdebug"
 S="${WORKDIR}/${MY_PN}-IC-$(ver_cut 4-6)"
@@ -81,7 +81,7 @@ src_prepare() {
 		done
 	fi
 
-	patchelf --replace-needed liblldb.so liblldb.so.9 "${S}"/plugins/Kotlin/bin/linux/LLDBFrontend || die "Unable to patch LLDBFrontend for lldb"
+	patchelf --replace-needed liblldb.so liblldb.so.10 "${S}"/plugins/Kotlin/bin/linux/LLDBFrontend || die "Unable to patch LLDBFrontend for lldb"
 	if use arm64; then
 		patchelf --replace-needed libc.so libc.so.6 "${S}"/lib/pty4j-native/linux/aarch64/libpty.so || die "Unable to patch libpty for libc"
 	else

dev-util/idea-community/metadata.xml

@@ -12,8 +12,4 @@
 	<longdescription lang="en">
 	Excel at enterprise, mobile and web development with Java, Scala and Groovy, with all the latest modern technologies and frameworks available out of the box.
 	</longdescription>
-	<use>
-		<flag name="jbr8">Install and use the Java 8 based version of JetBrains Runtime.</flag>
-		<flag name="jbr11">Install and use the Java 11 based version of JetBrains Runtime.</flag>
-	</use>
 </pkgmetadata>

dev-util/kdevelop-php/Manifest

@@ -1 +1,2 @@
 DIST kdev-php-5.6.0.tar.xz 1063760 BLAKE2B 72b3a6e77d6f569877687490f654daf79c14e2f7b374aadabbf54d7cad129c15051e72d816073d961582efa33d8354c51b2d3efa77a930ed2c81db4c5cd6668c SHA512 b6838e8eb44df1a0b2d94503c28636ce36dd63e91a8476b1f523b7457f1f831987eb3d079cbb7ed629c5c8143cd6a6f5832579ab7dc38f38162198c2cc068cdc
+DIST kdev-php-5.6.1.tar.xz 1063372 BLAKE2B 4c7d3897c67629b6aafb8a2e04d080a3ab5fd3bbbd836fe09d41cbdc29a14367fc2b1dc790375e761917b81bce08b88737a1b4a03163743fad71eea1410a5d29 SHA512 45e84c7ecf293dfa48805c3a80804f468a5fb8019ea3ced6b8cc1cb9042d84774635bc58e2d61945c3e5a2e77d1bc139ecdf9ebc408157c640ccbcaa2c26f189

dev-util/kdevelop-php/kdevelop-php-5.6.1.ebuild

@@ -0,0 +1,57 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+ECM_HANDBOOK_DIR="docs"
+ECM_TEST="true"
+KDE_ORG_CATEGORY="kdevelop"
+KDE_ORG_NAME="kdev-php"
+KFMIN=5.74.0
+QTMIN=5.15.1
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="PHP plugin for KDevelop"
+HOMEPAGE="https://www.kdevelop.org/"
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="5"
+IUSE=""
+
+BDEPEND="
+	test? ( dev-util/kdevelop:5[test] )
+"
+DEPEND="
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	dev-util/kdevelop-pg-qt:5
+	dev-util/kdevelop:5=
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/ktexteditor-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/threadweaver-${KFMIN}:5
+"
+RDEPEND="${DEPEND}"
+
+# remaining tests fail for some, bug 668530
+RESTRICT+=" test"
+
+src_test() {
+	# tests hang, bug 667922
+	local myctestargs=(
+		-E "(completionbenchmark|duchain_multiplefiles)"
+	)
+	ecm_src_test
+}

dev-util/kdevelop-python/Manifest

@@ -1 +1,2 @@
 DIST kdev-python-5.6.0.tar.xz 1069480 BLAKE2B 0ceb8c1a4bd279b621844eb94eeecef4272b13e77764afeb6403d8a757d6873caf2cc5ad5a1a1eef901365c90dc11298bab21274b684c6b49c8e55388c9504bb SHA512 c6a866a563f3304aab860f66d752a617f8a0822c2e3b0f4131b8e8603f2ed86b5141ad308f967ffc5e9458693f389281a8918feea9fc584d7b4213fa265479be
+DIST kdev-python-5.6.1.tar.xz 1071080 BLAKE2B f9972f6460723bc4822b00e49ab35f74eecc86cfb642fe76d98f551519f8ab690d6c5b6bbd7db778a3a62a1d11e81f8a0ea39fda91120b951b0fb80667d52b64 SHA512 bdf05ed098cfbca395c8c82650c278f33bd5878a08527f43d555e905142b3b486267d37789cbe9bf4924162fb9c3024c13e445a2f1d408626861b96c96103e12

dev-util/kdevelop-python/kdevelop-python-5.6.1.ebuild

@@ -0,0 +1,55 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="forceoptional"
+KDE_ORG_CATEGORY="kdevelop"
+KDE_ORG_NAME="kdev-python"
+PYTHON_COMPAT=( python3_{7,8,9} )
+KFMIN=5.74.0
+QTMIN=5.15.1
+inherit ecm kde.org python-single-r1
+
+DESCRIPTION="Python plugin for KDevelop"
+HOMEPAGE="https://www.kdevelop.org/"
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+IUSE=""
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	dev-util/kdevelop:5=
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kitemmodels-${KFMIN}:5
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/kparts-${KFMIN}:5
+	>=kde-frameworks/ktexteditor-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/threadweaver-${KFMIN}:5
+"
+RDEPEND="${DEPEND}
+	$(python_gen_cond_dep '
+		dev-python/pycodestyle[${PYTHON_MULTI_USEDEP}]
+	')
+"
+
+RESTRICT+=" test"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	ecm_pkg_setup
+}

dev-util/kdevelop/Manifest

@@ -1 +1,2 @@
 DIST kdevelop-5.6.0.tar.xz 7116544 BLAKE2B c548c695dab41c93aef31549bd479f1ca832a3fac9cde044523bf590d536473f36a87521ac678d37008ff451c091b843f65ccce154d9b1ca59efac2b48a81515 SHA512 c96a79d92972d606778d76f74f9dfddb9a0da9f41b462ada1a52842aa14306ad3cb183cda8103a9a3cf56d0dd5c1f18d5fad6b65cd8ae42f2fc407aaa6dc88f7
+DIST kdevelop-5.6.1.tar.xz 7130284 BLAKE2B 989218ec07d437d641033b7895b533a4f92b8c557e73bac0e3671a34335aac02936eeb3b73b95d1a7bbab6ad8b32a21f15db1d5af0485999fa2f7eb24b9e8bb6 SHA512 a03e22d57b5d556489e3e140e4cad6939170087a36afa8c755318ff6b5101806b8df82bd402e32daa715f4a72352dada1c2ce3ff4455dcac0debe6456c0bc7cd

dev-util/kdevelop/kdevelop-5.6.1.ebuild

@@ -0,0 +1,133 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="true"
+KDE_ORG_CATEGORY="kdevelop"
+KFMIN=5.74.0
+QTMIN=5.15.1
+VIRTUALDBUS_TEST="true"
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org optfeature
+
+DESCRIPTION="Integrated Development Environment, supporting KF5/Qt, C/C++ and much more"
+HOMEPAGE="https://kdevelop.org/"
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="5/56" # look at KDEVELOP_SOVERSION inside CMakeLists.txt
+IUSE="+gdbui hex +plasma +qmake reviewboard subversion"
+
+COMMON_DEPEND="
+	dev-libs/grantlee:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qthelp-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qttest-${QTMIN}:5
+	>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=dev-util/astyle-3.1:=
+	kde-apps/libkomparediff2:5
+	>=kde-frameworks/karchive-${KFMIN}:5
+	>=kde-frameworks/kbookmarks-${KFMIN}:5
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kcodecs-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/kguiaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kitemmodels-${KFMIN}:5
+	>=kde-frameworks/kitemviews-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/knotifyconfig-${KFMIN}:5
+	>=kde-frameworks/kparts-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/ktexteditor-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/sonnet-${KFMIN}:5
+	>=kde-frameworks/threadweaver-${KFMIN}:5
+	>=sys-devel/clang-6.0:=
+	gdbui? ( kde-plasma/libksysguard:5= )
+	hex? ( app-editors/okteta:5 )
+	plasma? (
+		>=kde-frameworks/krunner-${KFMIN}:5
+		>=kde-frameworks/plasma-${KFMIN}:5
+	)
+	qmake? ( dev-util/kdevelop-pg-qt:5 )
+	reviewboard? ( >=kde-frameworks/purpose-${KFMIN}:5 )
+	subversion? (
+		dev-libs/apr:1
+		dev-libs/apr-util:1
+		dev-vcs/subversion
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/boost
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+"
+RDEPEND="${COMMON_DEPEND}
+	>=dev-qt/qdbus-${QTMIN}:5
+	>=dev-qt/qtquickcontrols-${QTMIN}:5
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	dev-util/ninja
+	kde-apps/kapptemplate:5
+	kde-apps/kio-extras:5
+	>=sys-devel/gdb-7.0[python]
+	reviewboard? ( kde-apps/ktp-accounts-kcm:5 )
+	!dev-util/kdevelop-clang-tidy
+"
+
+RESTRICT+=" test"
+# see bug 366471
+
+src_configure() {
+	local clang_version=$(best_version sys-devel/clang)
+	local llvm_root="/usr/lib/llvm/$(ver_cut 1 ${clang_version##sys-devel/clang-})"
+
+	local mycmakeargs=(
+		-DLLVM_ROOT=${llvm_root}
+		$(cmake_use_find_package gdbui KSysGuard)
+		-DBUILD_executeplasmoid=$(usex plasma)
+		$(cmake_use_find_package plasma KF5Plasma)
+		$(cmake_use_find_package hex OktetaKastenControllers)
+		$(cmake_use_find_package qmake KDevelop-PG-Qt)
+		$(cmake_use_find_package reviewboard KF5Purpose)
+		$(cmake_use_find_package subversion SubversionLibrary)
+	)
+
+	use gdbui || mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_KF5SysGuard=ON )
+	use reviewboard || mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_KDEExperimentalPurpose=ON )
+
+	ecm_src_configure
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		elog "Optional dependencies:"
+		optfeature "konsole view" kde-apps/konsole
+		optfeature "Static C++ Qt code analysis" dev-util/clazy
+		optfeature "Static C/C++ code analysis" dev-util/cppcheck
+		optfeature "Heap memory profiling" dev-util/heaptrack[qt5]
+		optfeature "Meson Project manager plugin" dev-util/meson
+	fi
+	ecm_pkg_postinst
+}

dev-util/ragel/ragel-7.0.0.12.ebuild

@@ -11,7 +11,7 @@ SRC_URI="https://www.colm.net/files/ragel/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="vim-syntax"
 
 DEPEND="~dev-util/colm-0.13.0.7"

dev-util/sysprof-capture/sysprof-capture-3.38.1-r1.ebuild

@@ -14,8 +14,7 @@ SLOT="4"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND=">=dev-libs/glib-2.61.3:2
+RDEPEND="!=dev-util/sysprof-3.34.1-r0"
-	!=dev-util/sysprof-3.34.1-r0"
 DEPEND="${RDEPEND}"
 BDEPEND="
 	dev-util/gdbus-codegen
@@ -32,6 +31,9 @@ multilib_src_configure() {
 		# -Ddebugdir
 		-Dhelp=false
 		-Dlibunwind=false
+		-Denable_tools=false
+		-Denable_tests=false
+		-Denable_examples=false
 	)
 	meson_src_configure
 }

dev-util/ydiff/ydiff-1.2.ebuild

@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 DISTUTILS_USE_SETUPTOOLS=no
 
 inherit distutils-r1
@@ -16,8 +16,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 
-DEPEND="sys-apps/less"
+RDEPEND="sys-apps/less"
-RDEPEND=""
 
 DOCS=( CHANGES.rst README.rst )
 

media-fonts/mathematica-fonts/Manifest

@@ -1 +0,0 @@
-DIST mathematica-fonts-10.0.zip 586368 BLAKE2B 2be8b7bdd0c663ca0b9e4c1642ed84811adb853c6887d3adcf420d49a386b0a562d75b6cbc09d47ca6bc118703675461087b1c5b6551c55565abd94a64821df2 SHA512 4429163c427bc762cdaf7d310985becff97f78e7b452b184e9cb64f5f787559d283b5438a16f4e6bfaeffe86429bd416d2772707350830f646c70f53b519f4c7

media-fonts/mathematica-fonts/mathematica-fonts-10.0.ebuild

@@ -1,21 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit font
-
-DESCRIPTION="Mathematica's Fonts for MathML"
-HOMEPAGE="http://www.wolfram.com/mathematica"
-SRC_URI="http://support.wolfram.com/kb/data/uploads/2014/08/TrueType.zip -> ${P}.zip"
-
-LICENSE="WRI-EULA"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RESTRICT="binchecks mirror strip"
-
-S="${WORKDIR}"
-FONT_S="${S}"/TrueType
-FONT_SUFFIX="ttf"

media-gfx/flameshot/flameshot-0.6.0.ebuild

@@ -11,7 +11,7 @@ SRC_URI="https://github.com/lupoDharkael/${PN}/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="FreeArt GPL-3 Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="

media-sound/playerctl/Manifest

@@ -1,3 +1,3 @@
-DIST playerctl-2.0.1.tar.gz 43700 BLAKE2B 9df01bdb5f71a589a40462ed807b0f150d8c90921d1e0ef96bf99f20d9e58345307af35b39cc95e8ab37fcf9e5686935d856e050b61210188008b65281e63557 SHA512 6a5807abc79358bab0ad30a11897a8109121d5eb7d9e17d2c695221ef83942c3c7235fc738ab27c9dd2d3364c04737355e9c88ec5d49f999565565fb4494f720
 DIST playerctl-2.0.2.tar.gz 44241 BLAKE2B 3a1d5f59fdb0067f1147f4ef95990ae0755a372469c0f03491b4f3aec8d0cf754bb4d3057063211ee810532967ace0d35fa6a7f3f8cee8d7a5c09031cb5b11c9 SHA512 ad588f81d42c8000ccd2d2dedacfcd82887a958189b354ad6285545f7ed59e885febe0c3f9e3da915ae0fd0af4bfb4cefda54f17f0560fc4c00b1be6e92f3ac0
 DIST playerctl-2.2.1.tar.gz 66255 BLAKE2B 76732d8074b17ca958b7efe08d7be8d4bce3ba1ec65346a219478b4807c600218e1b8fe971892e7df16ad49273721a5b423bced2bd3441e9f89497375d4e0d84 SHA512 9c08a3f1d5517d7f4270ed92f226453618fc9f0688688d1af9ff55f0c77efeb1b67daa4adc481546215491550f8528095d376ab099c8ddca05235bfb34b36eb7
+DIST playerctl-2.3.1.tar.gz 73595 BLAKE2B d6d60d82fb0a8951fba4a3de91ff1e3f4bdba7177563b65b2da53525af4ca40f42755c577f652aaa24d2de308f56a495c8f87840ad67d6cda840cba1411abdb0 SHA512 06a10d193c83f60a9a9c50dddfb0a74e00be8cde34ddaa9d75582b7ce487ac564d1ff0675f6cb0c27d968e7d435b6a427818ac14e0cdd94b86af8f5d89661a93

media-sound/playerctl/playerctl-2.3.1.ebuild

@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit meson xdg-utils
+inherit bash-completion-r1 xdg-utils meson
 
 DESCRIPTION="A CLI utility to control media players over MPRIS"
 HOMEPAGE="https://github.com/acrisci/playerctl"
@@ -12,23 +12,24 @@ LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="doc introspection"
+RESTRICT="test" # Requires dbus-next python package that's not in the tree
 
 RDEPEND="
 	dev-libs/glib:2
 	introspection? ( dev-libs/gobject-introspection:= )
 "
-# Override the meson dependency in MESON_DEPEND of meson.eclass
+DEPEND="${RDEPEND}"
-# The eclass depends on '>=dev-util/meson-0.40.0' as of writing this
+BDEPEND="
-DEPEND="${RDEPEND}
+	doc? ( dev-util/gtk-doc )
 	dev-util/gdbus-codegen
 	dev-util/glib-utils
-	>=dev-util/meson-0.46.0
-	doc? ( dev-util/gtk-doc )
 	virtual/pkgconfig
 "
 
 src_configure() {
 	local emesonargs=(
+		-Ddatadir=share
+		-Dbindir=bin
 		$(meson_use doc gtk-doc)
 		$(meson_use introspection)
 	)
@@ -39,7 +40,13 @@ src_configure() {
 
 src_install() {
 	meson_src_install
+	rm "${ED}"/usr/$(get_libdir)/libplayerctl.a || die
+
 	docinto examples
 	dodoc -r "${S}"/examples/.
 	docompress -x "/usr/share/doc/${PF}/examples"
+
+	newbashcomp data/playerctl.bash "${PN}"
+	insinto /usr/share/zsh/site-functions
+	newins data/playerctl.zsh _playerctl
 }

metadata/dtd/timestamp.chk

@@ -1 +1 @@
-Tue, 08 Dec 2020 13:08:31 +0000
+Wed, 09 Dec 2020 08:08:32 +0000

metadata/glsa/timestamp.chk

@@ -1 +1 @@
-Tue, 08 Dec 2020 13:08:31 +0000
+Wed, 09 Dec 2020 08:08:33 +0000

metadata/md5-cache/app-crypt/argon2-20190702

@@ -3,9 +3,9 @@ DESCRIPTION=Password hashing software that won the Password Hashing Competition
 EAPI=7
 HOMEPAGE=https://github.com/P-H-C/phc-winner-argon2
 IUSE=static-libs
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-macos
 LICENSE=|| ( Apache-2.0 CC0-1.0 )
 SLOT=0/1
 SRC_URI=https://github.com/P-H-C/phc-winner-argon2/archive/20190702.tar.gz -> argon2-20190702.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=a1e9566b97ebf349479759857c63d7fc
+_md5_=185786f9923a0913b6330f349cd35232

metadata/md5-cache/app-crypt/veracrypt-1.24_p8

@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst setup test
+DEPEND=sys-fs/lvm2 sys-fs/fuse:0 x11-libs/wxGTK:3.0-gtk3[X?] app-admin/sudo dev-libs/pkcs11-helper virtual/pkgconfig asm? ( dev-lang/yasm )
+DESCRIPTION=Disk encryption with strong security based on TrueCrypt
+EAPI=6
+HOMEPAGE=https://www.veracrypt.fr/en/Home.html
+IUSE=+asm cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_ssse3 doc X kernel_linux
+KEYWORDS=~amd64
+LICENSE=Apache-2.0 BSD truecrypt-3.0
+RDEPEND=sys-fs/lvm2 sys-fs/fuse:0 x11-libs/wxGTK:3.0-gtk3[X?] app-admin/sudo dev-libs/pkcs11-helper
+RESTRICT=bindist mirror
+SLOT=0
+SRC_URI=https://github.com/veracrypt/VeraCrypt/archive/VeraCrypt_1.24-Update8_MacOSX.tar.gz -> veracrypt-1.24_p8.tar.gz
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312
+_md5_=3441061b1c1454c8fb1b80c00e4c63e4