Sync with portage [Wed Sep 9 09:34:20 MSK 2020].

4 years ago · 3aa81484c2
parent 9d86fadef5
commit 3aa81484c2
264 changed files with 2558 additions and 1456 deletions
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
--- a/app-crypt/acme/Manifest
+++ b/app-crypt/acme/Manifest
@ -1,2 +1 @@
-DIST certbot-1.6.0.tar.gz 3797817 BLAKE2B fe01c450e89f490c1b8d32401fe72d8eeedd2bf80ad29b59c9836eb44550b4753e0ec4da6f378aba12383fa7e2a38e5b7405634e695c8f9b150ab4899afc57d6 SHA512 490b9155e90f02aaf987840c7dd041c81913daa88df4a96528e3fe1c5342b64fcc19c02a76c0e94e705f7c68d0d63c25582fa474a270d2f98d454e036fcaa320
 DIST certbot-1.7.0.tar.gz 1416764 BLAKE2B de678a222e8c8e3e7834470f87763763671bfae37a5c8320a4c1a2552ec979b5391094713e7e13526f73fdf8cd32f70f8c4350f422505892c4fdd0ae77742c80 SHA512 f81242e68b7e261bbb6294ffe92e47bc1687128344816d71a495a94a2646e209e46c147bc76eedce0c477cc140dc6ae0fba76d2d5d01b828fce78875f5a2886a
--- a/app-crypt/acme/acme-1.6.0.ebuild
+++ b/app-crypt/acme/acme-1.6.0.ebuild
@ -1,69 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=(python{3_6,3_7,3_8})
-
-if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
-	inherit git-r3
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/certbot/certbot/archive/v${PV}.tar.gz -> certbot-${PV}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-	S=${WORKDIR}/certbot-${PV}/acme
-fi
-
-inherit distutils-r1
-
-DESCRIPTION="An implementation of the ACME protocol"
-HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/cryptography-1.3.4[${PYTHON_USEDEP}]
-	>=dev-python/idna-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/josepy-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.15.1[${PYTHON_USEDEP}]
-	dev-python/pyrfc3339[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.10[${PYTHON_USEDEP}]
-	>=dev-python/requests-toolbelt-0.3.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-"
-DEPEND="
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
-	)
-	test? (
-		${RDEPEND}
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-	>=dev-python/setuptools-1.0[${PYTHON_USEDEP}]
-"
-
-src_compile() {
-	python_foreach_impl run_in_build_dir default
-	distutils-r1_src_compile
-	if use doc ; then
-		cd docs || die
-		sphinx-build -b html -d _build/doctrees   . _build/html
-	fi
-}
-
-python_test() {
-	nosetests -w ${PN} || die
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-
-	distutils-r1_python_install_all
-}
--- a/app-crypt/certbot-apache/Manifest
+++ b/app-crypt/certbot-apache/Manifest
@ -1,2 +1 @@
-DIST certbot-1.6.0.tar.gz 3797817 BLAKE2B fe01c450e89f490c1b8d32401fe72d8eeedd2bf80ad29b59c9836eb44550b4753e0ec4da6f378aba12383fa7e2a38e5b7405634e695c8f9b150ab4899afc57d6 SHA512 490b9155e90f02aaf987840c7dd041c81913daa88df4a96528e3fe1c5342b64fcc19c02a76c0e94e705f7c68d0d63c25582fa474a270d2f98d454e036fcaa320
 DIST certbot-1.7.0.tar.gz 1416764 BLAKE2B de678a222e8c8e3e7834470f87763763671bfae37a5c8320a4c1a2552ec979b5391094713e7e13526f73fdf8cd32f70f8c4350f422505892c4fdd0ae77742c80 SHA512 f81242e68b7e261bbb6294ffe92e47bc1687128344816d71a495a94a2646e209e46c147bc76eedce0c477cc140dc6ae0fba76d2d5d01b828fce78875f5a2886a
--- a/app-crypt/certbot-apache/certbot-apache-1.6.0.ebuild
+++ b/app-crypt/certbot-apache/certbot-apache-1.6.0.ebuild
@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=(python{3_6,3_7,3_8})
-
-if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
-	inherit git-r3
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/${PN%-apache}/${PN%-apache}/archive/v${PV}.tar.gz -> ${PN%-apache}-${PV}.tar.gz"
-	KEYWORDS="amd64 ~arm64 x86"
-	S=${WORKDIR}/${PN%-apache}-${PV}/${PN}
-fi
-
-inherit distutils-r1
-
-DESCRIPTION="Apache plugin for certbot (Let's Encrypt Client)"
-HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=app-crypt/acme-0.29.0[${PYTHON_USEDEP}]
-	>=app-crypt/certbot-1.6.0[${PYTHON_USEDEP}]
-	dev-python/python-augeas[${PYTHON_USEDEP}]
-	dev-python/zope-component[${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]"
-DEPEND="test? ( ${RDEPEND}
-	dev-python/pytest[${PYTHON_USEDEP}] )
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	esetup.py test || die
-}
--- a/app-crypt/certbot-nginx/Manifest
+++ b/app-crypt/certbot-nginx/Manifest
@ -1,2 +1 @@
-DIST certbot-1.6.0.tar.gz 3797817 BLAKE2B fe01c450e89f490c1b8d32401fe72d8eeedd2bf80ad29b59c9836eb44550b4753e0ec4da6f378aba12383fa7e2a38e5b7405634e695c8f9b150ab4899afc57d6 SHA512 490b9155e90f02aaf987840c7dd041c81913daa88df4a96528e3fe1c5342b64fcc19c02a76c0e94e705f7c68d0d63c25582fa474a270d2f98d454e036fcaa320
 DIST certbot-1.7.0.tar.gz 1416764 BLAKE2B de678a222e8c8e3e7834470f87763763671bfae37a5c8320a4c1a2552ec979b5391094713e7e13526f73fdf8cd32f70f8c4350f422505892c4fdd0ae77742c80 SHA512 f81242e68b7e261bbb6294ffe92e47bc1687128344816d71a495a94a2646e209e46c147bc76eedce0c477cc140dc6ae0fba76d2d5d01b828fce78875f5a2886a
--- a/app-crypt/certbot-nginx/certbot-nginx-1.6.0.ebuild
+++ b/app-crypt/certbot-nginx/certbot-nginx-1.6.0.ebuild
@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=(python{3_6,3_7,3_8})
-
-if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
-	inherit git-r3
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/${PN%-nginx}/${PN%-nginx}/archive/v${PV}.tar.gz -> ${PN%-nginx}-${PV}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-	S=${WORKDIR}/${PN%-nginx}-${PV}/${PN}
-fi
-
-inherit distutils-r1
-
-DESCRIPTION="Nginx plugin for certbot (Let's Encrypt Client)"
-HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${CDEPEND}
-	>=app-crypt/acme-1.4.0[${PYTHON_USEDEP}]
-	>=app-crypt/certbot-1.6.0[${PYTHON_USEDEP}]
-	dev-python/pyopenssl[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-1.5.5[${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]"
-DEPEND="${CDEPEND}"
--- a/app-crypt/certbot/Manifest
+++ b/app-crypt/certbot/Manifest
@ -1,2 +1 @@
-DIST certbot-1.6.0.tar.gz 3797817 BLAKE2B fe01c450e89f490c1b8d32401fe72d8eeedd2bf80ad29b59c9836eb44550b4753e0ec4da6f378aba12383fa7e2a38e5b7405634e695c8f9b150ab4899afc57d6 SHA512 490b9155e90f02aaf987840c7dd041c81913daa88df4a96528e3fe1c5342b64fcc19c02a76c0e94e705f7c68d0d63c25582fa474a270d2f98d454e036fcaa320
 DIST certbot-1.7.0.tar.gz 1416764 BLAKE2B de678a222e8c8e3e7834470f87763763671bfae37a5c8320a4c1a2552ec979b5391094713e7e13526f73fdf8cd32f70f8c4350f422505892c4fdd0ae77742c80 SHA512 f81242e68b7e261bbb6294ffe92e47bc1687128344816d71a495a94a2646e209e46c147bc76eedce0c477cc140dc6ae0fba76d2d5d01b828fce78875f5a2886a
--- a/app-crypt/certbot/certbot-1.6.0.ebuild
+++ b/app-crypt/certbot/certbot-1.6.0.ebuild
@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=(python{3_6,3_7,3_8})
-
-if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-fi
-S=${WORKDIR}/${P}/${PN}
-
-inherit distutils-r1
-
-DESCRIPTION="Let's encrypt client to automate deployment of X.509 certificates"
-HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="
-	${CDEPEND}
-	>=app-crypt/acme-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/configargparse-0.9.3[${PYTHON_USEDEP}]
-	dev-python/configobj[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-2.8[${PYTHON_USEDEP}]
-	>=dev-python/distro-1.0.1[${PYTHON_USEDEP}]
-	>=dev-python/josepy-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/parsedatetime-1.3[${PYTHON_USEDEP}]
-	dev-python/pyrfc3339[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/zope-component[${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]"
-DEPEND="${CDEPEND}"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# required as deps of deps can trigger this too...
-	echo '    ignore:.*collections\.abc:DeprecationWarning' >> ../pytest.ini
-	distutils-r1_python_prepare_all
-}
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
--- a/app-editors/hteditor/files/hteditor-2.1.0-AR.patch
+++ b/app-editors/hteditor/files/hteditor-2.1.0-AR.patch
@ -1,14 +0,0 @@
-https://bugs.gentoo.org/722040
--- a/configure.ac
-+++ b/configure.ac
-@@ -104,8 +104,8 @@ AC_PROG_CPP
- AC_PROG_CXX
- AC_PROG_YACC
- AM_PROG_LEX
-AC_PATH_PROG(AR, ar)
-AC_PATH_PROG(AR, gar)
-+AC_CHECK_TOOL(AR, ar)
-+AC_CHECK_TOOL(AR, gar)
- 
- if test "x$AR" = "x"; then
- 	   AC_MSG_ERROR([*** 'ar' and 'gar' missing, please install one of them or fix your \$PATH ***])
--- a/app-editors/hteditor/files/hteditor-2.1.0-format-security.patch
+++ b/app-editors/hteditor/files/hteditor-2.1.0-format-security.patch
@ -1,57 +0,0 @@
-https://bugs.gentoo.org/521018
-
-From 5839355d67ff822593190473a41512ca19e4280a Mon Sep 17 00:00:00 2001
-From: Anton Gladky <gladk@debian.org>
-Date: Wed, 18 Feb 2015 21:20:39 +0100
-Subject: [PATCH] Fix "format not a string" compilation failure
-
-Compilation with the flag -Werror=format-security fails with
-the message:
-
-error: format not a string literal and no format arguments
-
-This patch solves the issue.
---
- asm/x86dis.cc | 6 +++---
- htpal.cc      | 2 +-
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/asm/x86dis.cc b/asm/x86dis.cc
-index 0830d9c..bb9028f 100644
--- a/asm/x86dis.cc
-+++ b/asm/x86dis.cc
-@@ -1218,15 +1218,15 @@ void x86dis::str_op(char *opstr, int *opstrlen, x86dis_insn *insn, x86_insn_op *
- 		default: {assert(0);}
- 		}
- 		if (!insn->rexprefix) {
-			sprintf(opstr, x86_regs[j][op->reg]);
-+			sprintf(opstr, "%s", x86_regs[j][op->reg]);
- 		} else {
-			sprintf(opstr, x86_64regs[j][op->reg]);
-+			sprintf(opstr, "%s", x86_64regs[j][op->reg]);
- 		}
- 		break;
- 	}
- 	case X86_OPTYPE_SEG:
- 		if (x86_segs[op->seg]) {
-			sprintf(opstr, x86_segs[op->seg]);
-+			sprintf(opstr, "%s", x86_segs[op->seg]);
- 		}
- 		break;
- 	case X86_OPTYPE_CRX:
-diff --git a/htpal.cc b/htpal.cc
-index 03dea18..3d5f51e 100644
--- a/htpal.cc
-+++ b/htpal.cc
-@@ -307,7 +307,7 @@ void palette_entry::strvalue(char *buf32bytes)
- 		text = "normal";
- 	}
- 	p = tag_make_color(p, 32, VCP(fg, bg));
-	p += sprintf(p, text);
-+	p += sprintf(p, "%s", text);
- 	p = tag_make_default_color(p, 32);
- 	*p = 0;
- }
-- 
-2.16.2
-
--- a/app-editors/hteditor/files/hteditor-2.1.0-gcc-10.patch
+++ b/app-editors/hteditor/files/hteditor-2.1.0-gcc-10.patch
@ -1,36 +0,0 @@
-Backport a subset of upstream c++11 fixes.
--- a/htmacho.cc
-+++ b/htmacho.cc
-@@ -146,7 +146,7 @@ void ht_macho::init(Bounds *b, File *f, format_viewer_if **ifs, ht_format_group
- 				break;
- 			case MACHO_CPU_TYPE_I386:
- 				switch (c->flavor) {
-				case -1:
-+				default:
- 					createHostStruct(&c->state, MACHO_I386_THREAD_STATE_struct, image_endianess);
- 					break;
- 				}
--- a/htmachohd.cc
-+++ b/htmachohd.cc
-@@ -313,7 +313,7 @@ static ht_view *htmachoheader_init(Bounds *b, File *file, ht_format_group *group
- 				switch (macho_shared->header.cputype) {
- 				case MACHO_CPU_TYPE_I386:
- 					switch (c->flavor) {
-					case -1:
-+					default:
- 						m->add_staticmask_ptable(macho_i386_thread_state, ofs+4*4/*4 32bit words in thread_header*/, isbigendian);
- 						break;
- 					}
--- a/io/types.h
-+++ b/io/types.h
-@@ -87,8 +87,8 @@ union htmsg_param {
- };
- 
- struct htmsg {
-	int msg;
-	int type;
-+	unsigned int msg;
-+	unsigned int type;
- 	htmsg_param data1;
- 	htmsg_param data2;
- };
--- a/app-editors/hteditor/files/hteditor-2.1.0-gcc-7.patch
+++ b/app-editors/hteditor/files/hteditor-2.1.0-gcc-7.patch
@ -1,32 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=620732
-
-Fixes build failure on gcc-7:
-
-  htapp.cc: In function 'uint isqr(uint)':
-  htapp.cc:3026:18: error: call of overloaded 'abs(uint)' is ambiguous
-    while (abs(a - b) > 1) {
-                    ^
-
-Picked upstream patch that fixes it:
-
-commit 3b62f2f7e49e024ec9d3c5ffc8ff9cd87a107af6
-Author: Sebastian Biallas <sb@biallas.net>
-Date:   Sun Nov 13 15:25:26 2016 +0100
-
-    use unsigned variables
-
-diff --git a/htapp.cc b/htapp.cc
-index 53d8725..03236e2 100644
--- a/htapp.cc
-+++ b/htapp.cc
-@@ -3021,8 +3021,8 @@ void do_modal_resize()
- 
- static uint isqr(uint u)
- {
-	uint a = 2;
-	uint b = u/a;
-+	int a = 2;
-+	int b = u/a;
- 	while (abs(a - b) > 1) {
- 		a = (a+b)/2;
- 		b = u/a;
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
--- a/app-misc/ddate/ddate-0.2.2_p20160627.ebuild
+++ b/app-misc/ddate/ddate-0.2.2_p20160627.ebuild
@ -11,7 +11,7 @@ DESCRIPTION="Perpetual date converter from gregorian to poee calendar"
 HOMEPAGE="https://github.com/bo0ts/ddate"
 SRC_URI="https://github.com/bo0ts/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"

-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 arm arm64 ~x86"
 LICENSE="public-domain"
 SLOT="0"

--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
--- a/app-portage/eix/Manifest
+++ b/app-portage/eix/Manifest
@ -1,3 +1,4 @@
 DIST eix-0.34.4.tar.xz 628516 BLAKE2B 0c7cb4d7cd13d7715ba35cc0edd38e549fd1d1618bfdcacb272ee8325a844276a6df59a701ab2b4ecc693e5dad2d95c96c000e96eb8bce72709baf22f3fa490f SHA512 a96714fba8324529bf63de63f9eb11cc76da05e3d43c5eedad49079b6e3a1960376bd5d3bc116dba49bc7f694c7588741e518438936abd4b37edfe0a097ecd3d
 DIST eix-0.34.5.tar.xz 629276 BLAKE2B fe686512e5061bdbc8e499542972f2a3e65e672b111c8d4d8c22b093c65fcf02e4de8ad41805b69fe52c0d962f660c787a7a2639341cd8fd59d03c94c2601b79 SHA512 b11744ea36c0771e4959de4925b3d74df8c270633a21c82ff27f4c91cc5a9281a85a594f0d20d5eb5c3c15a6c08e74232030687cc85f588545216438dc4ff7d7
 DIST eix-0.34.6.tar.xz 629424 BLAKE2B bad7bc0e9d0bb3752c1e4df4e267e3782b43b15445d0a6cb9554bff6811556edcb244deeacef5189477bb4bbf37a200e687dfa15677117766378cdb5ec40d9f1 SHA512 b9cae0c3be4ede9563da4d4eda61e26c83de449c27d5048e6611164ee2513d0ad729cfa3622ef74c5b1a77d12ac2ea8f7e7ae029d7cf04efae31ef054375eb78
+DIST eix-0.34.7.tar.xz 629380 BLAKE2B 307a97550540a4d9edf25a825cba816b275f07d2df665286fd475aba008d6938cc67725b1067ce9b1cb7af19aabe6f057ad5bd8a0cfe1c75c5d831b1638870ef SHA512 14ceae8658d53524f8ffa8bfc54284da6c39b731d04f1fe4ae33fcb23899a9e3ed93211a3e9546857c7ee1cf0d1baaaf52ebd2f0a5183753fe77671abcffdc79
--- a/app-portage/eix/eix-0.34.7.ebuild
+++ b/app-portage/eix/eix-0.34.7.ebuild
@ -0,0 +1,102 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools bash-completion-r1 flag-o-matic tmpfiles
+
+DESCRIPTION="Search and query ebuilds"
+HOMEPAGE="https://github.com/vaeth/eix/"
+SRC_URI="https://github.com/vaeth/eix/releases/download/v${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="debug doc nls sqlite"
+
+BOTHDEPEND="nls? ( virtual/libintl )
+	sqlite? ( >=dev-db/sqlite-3:= )"
+RDEPEND="${BOTHDEPEND}
+	>=app-shells/push-2.0-r1
+	>=app-shells/quoter-3.0_p2-r1"
+DEPEND="${BOTHDEPEND}
+	app-arch/xz-utils
+	nls? ( sys-devel/gettext )"
+
+pkg_setup() {
+	# remove stale cache file to prevent collisions
+	local old_cache=${EROOT}/var/cache/${PN}
+	if [[ -f ${old_cache} ]]; then
+		rm "${old_cache}" || die
+	fi
+}
+
+src_prepare() {
+	default
+	sed -i -e "s:/:${EPREFIX}/:" tmpfiles.d/eix.conf || die
+
+	sed -e "/eixf_source=/s:push.sh:cat \"${EPREFIX}/usr/share/push/push.sh\":" \
+		-e "/eixf_source=/s:quoter_pipe.sh:cat \"${EPREFIX}/usr/share/quoter/quoter_pipe.sh\":" \
+		-i src/eix-functions.sh.in || die
+	sed -e "s:'\$(bindir)/eix-functions.sh':cat \\\\\"${EPREFIX}/usr/share/eix/eix-functions\\\\\":" \
+		-i src/Makefile.am || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		$(use_enable debug paranoic-asserts)
+		$(use_enable nls)
+		$(use_with doc extra-doc)
+		$(use_with sqlite)
+		--without-protobuf
+
+		# default configuration
+		$(use_with prefix always-accept-keywords)
+		--with-dep-default
+		--with-required-use-default
+
+		# paths
+		--with-portage-rootpath="${ROOTPATH}"
+		--with-eprefix-default="${EPREFIX}"
+
+		# build a single executable with symlinks
+		--disable-separate-binaries
+		--disable-separate-tools
+
+		# used purely to control/disrespect *FLAGS
+		--disable-debugging
+		--disable-new_dialect
+		--disable-optimization
+		--disable-strong-optimization
+		--disable-security
+		--disable-nopie-security
+		--disable-strong-security
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	dobashcomp bash/eix
+	dotmpfiles tmpfiles.d/eix.conf
+
+	rm -r "${ED}"/usr/bin/eix-functions.sh || die
+}
+
+pkg_postinst() {
+	tmpfiles_process eix.conf
+
+	local obs=${EROOT}/var/cache/eix.previous
+	if [[ -f ${obs} ]]; then
+		ewarn "Found obsolete ${obs}, please remove it"
+	fi
+}
+
+pkg_postrm() {
+	if [[ ! -n ${REPLACED_BY_VERSION} ]]; then
+		rm -rf "${EROOT}/var/cache/${PN}" || die
+	fi
+}
--- a/dev-haskell/Manifest.gz
+++ b/dev-haskell/Manifest.gz
--- a/dev-haskell/hashtables/Manifest
+++ b/dev-haskell/hashtables/Manifest
@ -1,3 +1 @@
-DIST hashtables-1.1.2.1.tar.gz 48553 BLAKE2B eff3d256a6e0bbf3ac31e6d26c43efce9bc06ba09d14b22a6a5bd1d0ea17b81912590739376a6912990501d33598e39e4f92818dceb8c89a8e57853dffbc4373 SHA512 87739d4021b705e40982e66925400eea38efd2f2a11dc46626f33d2a9c9287a5a323d93c82d6e8415aef0434350256fda80819a4bbb58ff2afee74ed755c266a
-DIST hashtables-1.2.1.0.tar.gz 53706 BLAKE2B 5bc1d17fdf80f561fa7d6e9a9010025098579694356484bdaf41ebf6e5e2a03dd6983cb653eef553fb41be99aaa3ce11b2004efe62a585b0ec34f7c4fa12cefe SHA512 2c6cd17434402ff963a1b3357e58dfab3d4b60f5a2848b5433dcbbc1705d24707eacfc36af5dfb461ab03ce678c0736f3277292677e8ab297b306bd14e797e64
-DIST hashtables-1.2.3.4.tar.gz 58458 BLAKE2B ea57de50f1bc02107b06ea57f215aa8b7bc97ae658a43e2e57481c097452ee5b9bf2b8d67e0656c7b94830cb7bd4ed7d2e8f3f5b1c3b2070fcc3f1ed1d5f7acc SHA512 4723540f930edd1d5fd5cf58eadf7ed24fcd7761b90f303d559bc617737ec30cee2e9571ecced61fd369a933ae95b4386e48b122b876e73d0ad4bb65df16b76e
+DIST hashtables-1.2.4.1.tar.gz 58425 BLAKE2B 1e7d0e0f80e2e8ef17370f7019f802989c12eb7a7e340cfac44fa4138baa105985846262b0d5eeb1f59ee21d27a5036dce9c45623fecf6ecdf319ed8d4e36bc8 SHA512 e88fb8f9c8a51be31e5d07ca1fef3d1a05a347942878f84a500d8c224b1118a2be97f9a947f17834a8331f296f302eafeef34d1f151360361675ecf5204b38f6
--- a/dev-haskell/hashtables/hashtables-1.1.2.1.ebuild
+++ b/dev-haskell/hashtables/hashtables-1.1.2.1.ebuild
@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Mutable hash tables in the ST monad"
-HOMEPAGE="https://github.com/gregorycollins/hashtables"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="bounds-checking portable cpu_flags_x86_sse4_1 +unsafe-tricks"
-
-RDEPEND="dev-haskell/primitive:=[profile?]
-	>=dev-haskell/vector-0.7:=[profile?] <dev-haskell/vector-0.12:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-	>=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag bounds-checking bounds-checking) \
-		$(cabal_flag portable portable) \
-		$(cabal_flag cpu_flags_x86_sse4_1 sse41) \
-		$(cabal_flag unsafe-tricks unsafe-tricks)
-}
--- a/dev-haskell/hashtables/hashtables-1.2.1.0.ebuild
+++ b/dev-haskell/hashtables/hashtables-1.2.1.0.ebuild
@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-#hackport: flags: sse42:cpu_flags_x86_sse4_2
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Mutable hash tables in the ST monad"
-HOMEPAGE="https://github.com/gregorycollins/hashtables"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="bounds-checking cpu_flags_x86_sse4_2 portable +unsafe-tricks"
-
-RDEPEND="dev-haskell/primitive:=[profile?]
-	>=dev-haskell/vector-0.7:=[profile?] <dev-haskell/vector-0.12:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	>=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag bounds-checking bounds-checking) \
-		$(cabal_flag portable portable) \
-		$(cabal_flag cpu_flags_x86_sse4_2 sse42) \
-		$(cabal_flag unsafe-tricks unsafe-tricks)
-}
--- a/dev-haskell/hashtables/hashtables-1.2.4.1.ebuild
+++ b/dev-haskell/hashtables/hashtables-1.2.4.1.ebuild
@ -3,10 +3,10 @@

 EAPI=7

-# ebuild generated by hackport 0.6.1.9999
+# ebuild generated by hackport 0.6.6
 #hackport: flags: sse42:cpu_flags_x86_sse4_2

-CABAL_FEATURES="lib profile haddock hoogle hscolour"
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal

 DESCRIPTION="Mutable hash tables in the ST monad"
@ -18,13 +18,19 @@ SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
 IUSE="bounds-checking cpu_flags_x86_sse4_2 debug detailed-profiling portable +unsafe-tricks"

-RDEPEND=">=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.4:=[profile?]
-	dev-haskell/primitive:=[profile?]
+RDEPEND="dev-haskell/primitive:=[profile?]
 	>=dev-haskell/vector-0.7:=[profile?] <dev-haskell/vector-0.13:=[profile?]
 	>=dev-lang/ghc-7.8.2:=
+	>=dev-haskell/hashable-1.2.1:=[profile?] <dev-haskell/hashable-1.4:=[profile?]
 "
 DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-2.2
+	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-2
+		>=dev-haskell/mwc-random-0.8 <dev-haskell/mwc-random-0.16
+		>=dev-haskell/quickcheck-2.3.0.2
+		>=dev-haskell/test-framework-0.3.1 <dev-haskell/test-framework-0.9
+		>=dev-haskell/test-framework-hunit-0.2.6 <dev-haskell/test-framework-hunit-3
+		>=dev-haskell/test-framework-quickcheck2-0.2.6 <dev-haskell/test-framework-quickcheck2-0.4 )
 "

 src_configure() {
--- a/dev-haskell/io-streams/Manifest
+++ b/dev-haskell/io-streams/Manifest
@ -1,2 +1,2 @@
 DIST io-streams-1.3.6.0.tar.gz 61651 BLAKE2B d71a5ba3d264b98d3284470021fc1d9622700b37ef1a67142d12d4d6321233eb28ad5274925e08f9d0c251ee77e25e2187c811d197a9f7b68e33479d8ea602ab SHA512 9ef5a2daa43600796b48104771c71d698f40e29def536e785421b53a310683e7db202b254310a0a5f2d1fa507dcad27c25f328c64fffe796c06d4c0d98ca982d
-DIST io-streams-1.5.1.0.tar.gz 64044 BLAKE2B 9a1a4dce626f3a569f4a7866f93d5663e9e4e8b863d1c2332bffbeb2e4481e0a250c84b75ae375144a32473b62538dbd87b53dd0a08034daea855484660aa07a SHA512 01ddf89f09cba429ab600e55994cb6740d4fcdeb23ce85822098d39dbe530a74256d66ea52429798787d9d549db3cd99a5078362b333a7f49c4926e74e0b460c
+DIST io-streams-1.5.2.0.tar.gz 63812 BLAKE2B a555bc0bc365e4e2c28570da34e6c2891ff56a7460ec8a857285a22ea3a4a2b8975139c3024fd90ffec51386646d9ed632754971abef04fd2c358cba5e0a19c6 SHA512 2cb6c9cded0077f1501b0fba576b79e5ebf21ccc2711a91552ec46ef6d5e943e0c1255cdfda381aa8e4d7691b1e450956bedd2fbd4414b13ef7926b0cc3dc4c3
--- a/dev-haskell/io-streams/io-streams-1.5.1.0-r1.ebuild
+++ b/dev-haskell/io-streams/io-streams-1.5.1.0-r1.ebuild
@ -3,7 +3,7 @@

 EAPI=7

-# ebuild generated by hackport 0.5.6.9999
+# ebuild generated by hackport 0.6.6.9999
 #hackport: flags: +nointeractivetests

 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
@ -16,18 +16,18 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="+network +zlib"

-RESTRICT=test # one test case requires network access
+RESTRICT=test # requires network access

 RDEPEND=">=dev-haskell/attoparsec-0.10:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?]
 	>=dev-haskell/bytestring-builder-0.10:=[profile?] <dev-haskell/bytestring-builder-0.11:=[profile?]
-	>=dev-haskell/network-2.3:=[profile?]
-	>=dev-haskell/primitive-0.2:=[profile?]
+	>=dev-haskell/primitive-0.2:=[profile?] <dev-haskell/primitive-0.8:=[profile?]
 	>=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-1.3:=[profile?]
 	>=dev-haskell/vector-0.7:=[profile?] <dev-haskell/vector-0.13:=[profile?]
-	>=dev-haskell/zlib-bindings-0.1:=[profile?] <dev-haskell/zlib-bindings-0.2:=[profile?]
 	>=dev-lang/ghc-7.8.2:=
+	network? ( >=dev-haskell/network-2.3:=[profile?] <dev-haskell/network-3.2:=[profile?] )
+	zlib? ( >=dev-haskell/zlib-bindings-0.1:=[profile?] <dev-haskell/zlib-bindings-0.2:=[profile?] )
 "
 DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-1.18.1.3
@ -37,18 +37,12 @@ DEPEND="${RDEPEND}
 		>=dev-haskell/test-framework-0.6 <dev-haskell/test-framework-0.9
 		>=dev-haskell/test-framework-hunit-0.2.7 <dev-haskell/test-framework-hunit-0.4
 		>=dev-haskell/test-framework-quickcheck2-0.2.12.1 <dev-haskell/test-framework-quickcheck2-0.4
-		>=dev-haskell/zlib-0.5 <dev-haskell/zlib-0.7 )
+		zlib? ( >=dev-haskell/zlib-0.5 <dev-haskell/zlib-0.7 ) )
 "

-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'network            >= 2.3   && <3.1' 'network            >= 2.3' \
-		'primitive          >= 0.2   && <0.7' 'primitive          >= 0.2'
-}
-
 src_configure() {
 	haskell-cabal_src_configure \
-		--flag=nointeractivetests
+		$(cabal_flag network network) \
+		--flag=nointeractivetests \
+		$(cabal_flag zlib zlib)
 }
--- a/dev-haskell/io-streams/metadata.xml
+++ b/dev-haskell/io-streams/metadata.xml
@ -5,20 +5,24 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
+	<use>
+		<flag name="network">Include network support</flag>
+		<flag name="zlib">Include zlib support</flag>
+	</use>
 	<longdescription>
 		/Overview/
 		
 		The io-streams library contains simple and easy-to-use primitives for I/O
 		using streams. Most users will want to import the top-level convenience
-		module "System.IO.Streams", which re-exports most of the library:
+		module &quot;System.IO.Streams&quot;, which re-exports most of the library:
 		
 		@
-		import           "System.IO.Streams" (InputStream, OutputStream)
-		import qualified "System.IO.Streams" as Streams
+		import           System.IO.Streams (InputStream, OutputStream)
+		import qualified System.IO.Streams as Streams
 		@
 		
 		For first-time users, @io-streams@ comes with an included tutorial, which can
-		be found in the "System.IO.Streams.Tutorial" module.
+		be found in the &quot;System.IO.Streams.Tutorial&quot; module.
 		
 		/Features/
 		
@ -27,13 +31,13 @@
 		
 		@
 		\-\- read an item from an input stream
-		Streams.'System.IO.Streams.read' :: 'System.IO.Streams.InputStream' a -&gt; IO (Maybe a)
+		Streams.read :: InputStream a -&gt; IO (Maybe a)
 		
 		\-\- push an item back to an input stream
-		Streams.'System.IO.Streams.unRead' :: a -&gt; 'System.IO.Streams.InputStream' a -&gt; IO ()
+		Streams.unRead :: a -&gt; InputStream a -&gt; IO ()
 		
 		\-\- write to an output stream
-		Streams.'System.IO.Streams.write' :: Maybe a -&gt; 'System.IO.Streams.OutputStream' a -&gt; IO ()
+		Streams.write :: Maybe a -&gt; OutputStream a -&gt; IO ()
 		@
 		
 		Streams can be transformed by composition and hooked together with provided combinators:
@ -46,19 +50,19 @@
 		Stream composition leaves the original stream accessible:
 		
 		@
-		ghci&gt; input \&lt;- Streams.fromByteString \"long string\"
+		ghci&gt; input \&lt;- Streams.fromByteString \&quot;long string\&quot;
 		ghci&gt; wrapped \&lt;- Streams.takeBytes 4 input
 		ghci&gt; Streams.read wrapped
-		Just \"long\"
+		Just \&quot;long\&quot;
 		ghci&gt; Streams.read wrapped
 		Nothing
 		ghci&gt; Streams.read input
-		Just \" string\"
+		Just \&quot; string\&quot;
 		@
 		
 		Simple types and operations in the IO monad mean straightforward and simple
 		exception handling and resource cleanup using Haskell standard library
-		facilities like 'Control.Exception.bracket'.
+		facilities like &#39;Control.Exception.bracket&#39;.
 		
 		@io-streams@ comes with:
 		
@ -73,66 +77,5 @@
 		* support for parsing from streams using @attoparsec@.
 		
 		* support for spawning processes and communicating with them using streams.
-		
-		/ChangeLog/
-		
-		[@1.1.4.2@] Fixed a build error with network versions older than 2.4.
-		
-		[@1.1.4.1@] @System.IO.Streams.Network@: scalability improvement: buffers
-		for socket reads are now allocated by system malloc rather than
-		by pinned pointers in GHC (currently pinned pointer allocation
-		takes a global lock).
-		
-		[@1.1.4.0@] Widened @attoparsec@ and @text@ library dependencies to allow
-		the latest versions.
-		
-		[@1.1.3.0@] Added @System.IO.Streams.ByteString.takeExactly@. Widened
-		@network@ dependency to include 2.3. Added a
-		@NoInteractiveTests@ flag to selectively disable some tests for
-		environments where spawning interactive processes is
-		impossible.
-		
-		[@1.1.2.2@] Allowed newest versions of the @process@, @test-framework@,
-		and @text@ libraries.
-		
-		[@1.1.2.1@] Fixed build error when compiled against attoparsec-0.10.0.x.
-		
-		[@1.1.2.0@] Added @System.IO.Streams.Concurrent.makeChanPipe@, to create a
-		simple concurrent pipe between an @InputStream@/@OutputStream@
-		pair.
-		
-		[@1.1.1.0@] Added @System.IO.Streams.Network.socketToStreamsWithBufferSize@,
-		allowing control over the size of the receive buffers used when
-		reading from sockets.
-		
-		[@1.1.0.3@] Fixed an inconsistent version upper bound in the test suite.
-		
-		[@1.1.0.2@] Fixed a typo in the tutorial.
-		
-		[@1.1.0.1@] A couple of Haddock markup fixes.
-		
-		[@1.1.0.0@] Reworked, simplified, and streamlined the internals of the
-		library. Exports from "System.IO.Streams.Internal" relying on
-		Sources and Sinks were deleted because they are no longer
-		necessary: Source(..), Sink(..), defaultPushback,
-		withDefaultPushback, nullSource, nullSink, singletonSource,
-		simpleSource, sourceToStream, sinkToStream, generatorToSource,
-		and consumerToSink.
-		
-		[@1.0.2.2@] Fixed a bug in which \"takeBytes 0\" was erroneously requesting
-		input from the wrapped stream.
-		
-		[@1.0.2.1@] Fixed a compile error on GHC 7.0.x.
-		
-		[@1.0.2.0@] Added "System.IO.Streams.Process" (support for communicating
-		with system processes using streams), added new functions to
-		"System.IO.Streams.Handle" for converting @io-streams@ types to
-		'System.IO.Handle's. (Now you can pass streams from this
-		library to places that expect Handles and everything will
-		work.)
-		
-		[@1.0.1.0@] Added 'System.IO.Streams.Combinators.ignoreEof'.
-		
-		[@1.0.0.1@] Fixed some haddock markup.
 	</longdescription>
 </pkgmetadata>
--- a/dev-haskell/openssl-streams/Manifest
+++ b/dev-haskell/openssl-streams/Manifest
@ -1,2 +1 @@
-DIST openssl-streams-1.2.1.0.tar.gz 6266 BLAKE2B 2d7866b7667547f5c4f2c2873471c7ff9ac60ee89e9c791d816b46185bda456d4bdd13ce5894688ff56926b337d38208719f8c3d22cfd0606529732cfcec3235 SHA512 c429bdcbb4ce893d79941eccb849f7064fb88073423b4395e0f50795ddef699934c148549f800b551914c7983cb2b8fc988dccfb4e0363f422726c0cdeaa5018
-DIST openssl-streams-1.2.2.0.tar.gz 6376 BLAKE2B f0d0684c3ed5e13de4d4745d16cf6bccc75961e57d164cc3a5620d1de0b0cbb40acdf4819266c45ceacd4473bdd831ec9ca92aa086e01eab55408e2588f9a0eb SHA512 ff1262afd26c82e97ed0a8bc7237728b47341968e8c6fe4a2351780508241f1588d12b32709d9be3b385db14b9b56eee77676cacb1c0a6bf632a8f25bdb775eb
+DIST openssl-streams-1.2.3.0.tar.gz 6304 BLAKE2B c957be3a5d45f8785220f1bf645ab49df17f3c21dc609810651bc345c9bf6e576cbbb3a35f46b9f979ed48b525caaf8bd6c75f1fc41a38407fa8948b2719f17b SHA512 86c5f9348af82ad0ac9e8103ee078c78647e61345ecf0c48b02749206147a82a3a798f681b9cd20ec866276aca75a3739965ca2b76a0b302da4792bf1fc4917e
--- a/dev-haskell/openssl-streams/openssl-streams-1.2.1.0.ebuild
+++ b/dev-haskell/openssl-streams/openssl-streams-1.2.1.0.ebuild
@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="OpenSSL network support for io-streams"
-HOMEPAGE="https://hackage.haskell.org/package/openssl-streams"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/hsopenssl-0.10.3:=[profile?] <dev-haskell/hsopenssl-0.12:=[profile?]
-	>=dev-haskell/io-streams-1.0:=[profile?] <dev-haskell/io-streams-1.4:=[profile?]
-	>=dev-haskell/network-2.4:=[profile?] <dev-haskell/network-2.7:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-2
-		>=dev-haskell/test-framework-0.8.0.3 <dev-haskell/test-framework-0.9
-		>=dev-haskell/test-framework-hunit-0.3 <dev-haskell/test-framework-hunit-0.4 )
-"
--- a/dev-haskell/openssl-streams/openssl-streams-1.2.3.0.ebuild
+++ b/dev-haskell/openssl-streams/openssl-streams-1.2.3.0.ebuild
@ -3,7 +3,7 @@

 EAPI=7

-# ebuild generated by hackport 0.6.9999
+# ebuild generated by hackport 0.6.6

 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
@ -21,7 +21,7 @@ RESTRICT=test # requires network access

 RDEPEND=">=dev-haskell/hsopenssl-0.10.3:=[profile?] <dev-haskell/hsopenssl-0.12:=[profile?]
 	>=dev-haskell/io-streams-1.0:=[profile?] <dev-haskell/io-streams-1.6:=[profile?]
-	>=dev-haskell/network-2.4:=[profile?] <dev-haskell/network-3.1:=[profile?]
+	>=dev-haskell/network-2.4:=[profile?] <dev-haskell/network-3.2:=[profile?]
 	>=dev-lang/ghc-7.4.1:=
 "
 DEPEND="${RDEPEND}
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
--- a/dev-libs/boxfort/Manifest
+++ b/dev-libs/boxfort/Manifest
@ -1 +1,2 @@
+DIST boxfort-0.0.1_pre20200902.tar.gz 41643 BLAKE2B 6ac53b632f604ffd6b790a026703a2d64da65fc03cc71ebc3e4da3463e7c5a44ec99e85e3cdac8e5756afaf7d98785955815e194929bbc8dd6b6fd90bfb3fd52 SHA512 96090372f3e546f53f82c515c3f9e557fdd67eb7bc735683b30d8a66c2536cf21261b0467e449ccbd13e914b7cf4ea3da1a37c4108b215d6d0d08cdb68944b1e
 DIST boxfort-1456d9a3a3bcb506cdcd1b5d4b852e967deb5e57.tar.gz 41705 BLAKE2B 89644ecf64e5a5df718fa4f873d21e281c777c893af5a8f71c8a1913270ca6c67dc36113e5d219540bb04c7f9e26be22f7e778bd9bdce230df8c0edf3a707612 SHA512 249b0bd0048c53c74d2b50f1b7caf84b0ac0823679bb6adaade095a2ff26586f14f58cee960610d99dbc38c8196cbdb99143815b14d10b7f13a12f96d309e302
--- a/dev-libs/boxfort/boxfort-0.0.1_pre20200902.ebuild
+++ b/dev-libs/boxfort/boxfort-0.0.1_pre20200902.ebuild
@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit meson python-any-r1
+
+BOXFORT_COMMIT="ac0507b3f45fe58100b528baeb8ca04270b4a8ff"
+
+DESCRIPTION="Convenient & cross-platform sandboxing C library"
+HOMEPAGE="https://github.com/Snaipe/BoxFort"
+SRC_URI="https://github.com/Snaipe/BoxFort/archive/${BOXFORT_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="test? (
+		$(python_gen_any_dep 'dev-util/cram[${PYTHON_USEDEP}]')
+	)"
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}/BoxFort-${BOXFORT_COMMIT}"
+
+python_check_deps() {
+	use test && has_version "dev-util/cram[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dsamples=$(usex test true false)
+		-Dtests=$(usex test true false)
+	)
+
+	meson_src_configure
+}
--- a/dev-libs/elfutils/Manifest
+++ b/dev-libs/elfutils/Manifest
@ -1 +1,2 @@
 DIST elfutils-0.180.tar.bz2 9079640 BLAKE2B bd7863b82a71d2932a23c9d125d5eb6485977a3256a8a0b25980183d33f7345c3d9fae78277de5c955eb0ceeb955f8fa71d209f4f39bcf6dd49e46a8bbd7efcf SHA512 62e96035ccfe8928baca2285decbe8b8703a2daa956df81ece18fecf643272fb68955806b3e807a514141a7a9bf44520bf09461672aa580bd6807485fb604d25
+DIST elfutils-0.181.tar.bz2 9088984 BLAKE2B 3f35f1a494986ff23d755188aab2b8f5ca9729927dd0e01725abf8477ac09721f751ff79686aafeff3878cf52e0c3f3e06d794fdf6371382a1bffc85c0de3411 SHA512 d565541d5817f409dc89ebb1ee593366f69c371a1531308eeb67ff934b14a0fab0c9009fd7c23240efbaa1b4e04edac5c425e47d80e3e66ba03dcaf000afea36
--- a/dev-libs/elfutils/elfutils-0.181.ebuild
+++ b/dev-libs/elfutils/elfutils-0.181.ebuild
@ -0,0 +1,86 @@
+# Copyright 2003-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic multilib-minimal toolchain-funcs
+
+DESCRIPTION="Libraries/utilities to handle ELF objects (drop in replacement for libelf)"
+HOMEPAGE="http://elfutils.org/"
+SRC_URI="https://sourceware.org/elfutils/ftp/${PV}/${P}.tar.bz2"
+
+LICENSE="|| ( GPL-2+ LGPL-3+ ) utils? ( GPL-3+ )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="bzip2 lzma nls static-libs test +threads +utils valgrind"
+
+RDEPEND=">=sys-libs/zlib-1.2.8-r1[static-libs?,${MULTILIB_USEDEP}]
+	bzip2? ( >=app-arch/bzip2-1.0.6-r4[static-libs?,${MULTILIB_USEDEP}] )
+	lzma? ( >=app-arch/xz-utils-5.0.5-r1[static-libs?,${MULTILIB_USEDEP}] )
+	!dev-libs/libelf"
+DEPEND="${RDEPEND}
+	valgrind? ( dev-util/valgrind )
+"
+BDEPEND="nls? ( sys-devel/gettext )
+	>=sys-devel/flex-2.5.4a
+	sys-devel/m4"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.175-disable-biarch-test-PR24158.patch
+	"${FILESDIR}"/${PN}-0.177-disable-large.patch
+	"${FILESDIR}"/${PN}-0.180-PaX-support.patch
+	"${FILESDIR}"/${PN}-0.179-CC-in-tests.patch
+	"${FILESDIR}"/${PN}-0.181-CC-in-tests-p2.patch
+)
+
+src_prepare() {
+	default
+
+	if ! use static-libs; then
+		sed -i -e '/^lib_LIBRARIES/s:=.*:=:' -e '/^%.os/s:%.o$::' lib{asm,dw,elf}/Makefile.in || die
+	fi
+	# https://sourceware.org/PR23914
+	sed -i 's:-Werror::' */Makefile.in || die
+}
+
+src_configure() {
+	use test && append-flags -g #407135
+
+	# Symbol aliases are implemented as asm statements.
+	# Will require porting: https://gcc.gnu.org/PR48200
+	filter-flags '-flto*'
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		$(use_enable nls) \
+		$(use_enable threads thread-safety) \
+		$(use_enable valgrind) \
+		--disable-debuginfod \
+		--program-prefix="eu-" \
+		--with-zlib \
+		$(use_with bzip2 bzlib) \
+		$(use_with lzma)
+}
+
+multilib_src_test() {
+	# CC is a workaround for tests using ${CC-gcc}
+	env	LD_LIBRARY_PATH="${BUILD_DIR}/libelf:${BUILD_DIR}/libebl:${BUILD_DIR}/libdw:${BUILD_DIR}/libasm" \
+		LC_ALL="C" \
+		CC="$(tc-getCC)" \
+		emake check VERBOSE=1
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	dodoc NOTES
+	# These build quick, and are needed for most tests, so don't
+	# disable their building when the USE flag is disabled.
+	if ! use utils; then
+		rm -rf "${ED}"/usr/bin || die
+	fi
+}
--- a/dev-libs/elfutils/files/elfutils-0.181-CC-in-tests-p2.patch
+++ b/dev-libs/elfutils/files/elfutils-0.181-CC-in-tests-p2.patch
@ -0,0 +1,34 @@
+--- a/tests/run-test-includes.sh
+++ b/tests/run-test-includes.sh
+@@ -3,24 +3,24 @@
+ . $srcdir/test-subr.sh
+ 
+ echo '#include "libelf.h"' \
+-  | gcc -c -o /dev/null -I ${abs_srcdir}/../libelf -xc -
+  | ${CC-gcc} -c -o /dev/null -I ${abs_srcdir}/../libelf -xc -
+ echo '#include "gelf.h"' \
+-  | gcc -c -o /dev/null -I ${abs_srcdir}/../libelf -xc -
+  | ${CC-gcc} -c -o /dev/null -I ${abs_srcdir}/../libelf -xc -
+ 
+ echo '#include "dwarf.h"' \
+-  | gcc -c -o /dev/null -I ${abs_srcdir}/../libelf \
+  | ${CC-gcc} -c -o /dev/null -I ${abs_srcdir}/../libelf \
+         -I ${abs_srcdir}/../libdw -xc -
+ echo '#include "libdw.h"' \
+-  | gcc -c -o /dev/null -I ${abs_srcdir}/../libelf \
+  | ${CC-gcc} -c -o /dev/null -I ${abs_srcdir}/../libelf \
+         -I ${abs_srcdir}/../libdw -xc -
+ 
+ echo '#include "libdwfl.h"' \
+-  | gcc -c -o /dev/null -I ${abs_srcdir}/../libelf \
+  | ${CC-gcc} -c -o /dev/null -I ${abs_srcdir}/../libelf \
+     -I ${abs_srcdir}/../libdw -I ${abs_srcdir}/../libdwfl -xc -
+ echo '#include "libdwelf.h"' \
+-  | gcc -c -o /dev/null -I ${abs_srcdir}/../libelf \
+  | ${CC-gcc} -c -o /dev/null -I ${abs_srcdir}/../libelf \
+     -I ${abs_srcdir}/../libdw -I ${abs_srcdir}/../libdwelf -xc -
+ 
+ echo '#include "libasm.h"' \
+-  | gcc -c -o /dev/null -I ${abs_srcdir}/../libelf \
+  | ${CC-gcc} -c -o /dev/null -I ${abs_srcdir}/../libelf \
+     -I ${abs_srcdir}/../libasm -xc -
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
--- a/dev-python/beautifulsoup/beautifulsoup-4.9.1.ebuild
+++ b/dev-python/beautifulsoup/beautifulsoup-4.9.1.ebuild
@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_P}"

 LICENSE="MIT"
 SLOT="4"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"

 RDEPEND="
 	dev-python/soupsieve[${PYTHON_USEDEP}]
--- a/dev-python/cheroot/cheroot-8.4.2.ebuild
+++ b/dev-python/cheroot/cheroot-8.4.2.ebuild
@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/C/${PN/c/C}/${P}.tar.gz"

 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 arm arm64 ~ia64 ~ppc ~ppc64 ~x86"

 RDEPEND="
 	>=dev-python/six-1.11.0[${PYTHON_USEDEP}]
--- a/dev-python/coverage/coverage-5.2.1.ebuild
+++ b/dev-python/coverage/coverage-5.2.1.ebuild
@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"

 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 #IUSE="test"
 # The tests are impossible to appease.  Please run them externally
 # via tox.  Or fix the ebuild if you have hours of time to spend
--- a/dev-python/cryptography/cryptography-3.0.ebuild
+++ b/dev-python/cryptography/cryptography-3.0.ebuild
@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz

 LICENSE="|| ( Apache-2.0 BSD )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="libressl idna test"
 RESTRICT="!test? ( test )"

--- a/dev-python/ctypesgen/ctypesgen-1.0.2.ebuild
+++ b/dev-python/ctypesgen/ctypesgen-1.0.2.ebuild
@ -17,7 +17,7 @@ SRC_URI="https://github.com/davidjamesca/ctypesgen/archive/${P}.tar.gz"

 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE=""

 DEPEND=""
--- a/dev-python/dulwich/dulwich-0.20.5.ebuild
+++ b/dev-python/dulwich/dulwich-0.20.5.ebuild
@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"

 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"

--- a/dev-python/feedparser/feedparser-6.0.0_beta1.ebuild
+++ b/dev-python/feedparser/feedparser-6.0.0_beta1.ebuild
@ -18,7 +18,7 @@ S=${WORKDIR}/${MY_P}

 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"

 RDEPEND="dev-python/sgmllib3k[${PYTHON_USEDEP}]"

--- a/dev-python/flaky/flaky-3.7.0.ebuild
+++ b/dev-python/flaky/flaky-3.7.0.ebuild
@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"

 SLOT="0"
 LICENSE="Apache-2.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"

--- a/dev-python/hyperlink/hyperlink-20.0.1.ebuild
+++ b/dev-python/hyperlink/hyperlink-20.0.1.ebuild
@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"

 LICENSE="BSD MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"

 RDEPEND="
 	dev-python/idna[${PYTHON_USEDEP}]"
--- a/dev-python/jaraco-context/jaraco-context-3.0.0.ebuild
+++ b/dev-python/jaraco-context/jaraco-context-3.0.0.ebuild
@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"

 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 arm arm64 ~ia64 ~ppc ~ppc64 ~x86"

 RDEPEND="
 	>=dev-python/namespace-jaraco-2[${PYTHON_USEDEP}]
--- a/dev-python/keyring/keyring-21.3.0.ebuild
+++ b/dev-python/keyring/keyring-21.3.0.ebuild
@ -14,7 +14,7 @@ SRC_URI="https://github.com/jaraco/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"

 SLOT="0"
 LICENSE="PSF-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="doc"

 RDEPEND="
--- a/dev-python/pandas/Manifest
+++ b/dev-python/pandas/Manifest
@ -1,3 +1,4 @@
 DIST pandas-1.0.5.tar.gz 5007108 BLAKE2B 6aff9602f8b1642af1dca70c7c596f2978bfef8ca9bc782d55aeeab85d3768289849ccd0150291c33cab3442d38cedada91fb846abaade1b3905098edb06c06e SHA512 bb9e3ed9988f7b878ac6f9d7c6c054b119acfc4b960ae42ea92436979ef2098289123cac32b176753942a1edb3b6bd35c4eaf05112a25fbf8a89078fd76a2646
 DIST pandas-1.1.0.tar.gz 5211071 BLAKE2B 538e7579384dceb29f1761e00181fda4f07556ee15723a127966e47c317babead19b364943808d11f03007d5a48da3b28bf8fd9e5c1f40bb3285604307bff267 SHA512 496344967e6061ed451edfe2057d0b63d7277cdce0e12e2e2ce558aef2c23fa5d85daae239fcf88820196add3a928734f31af2734866da7b0385f363607e2885
 DIST pandas-1.1.1.tar.gz 5213685 BLAKE2B 6604c7def761f8eef4596a9ad6c1afe1f59fdd6181f9cdc9edfa97939a9e668e745ebc0abd8664eda4f864be54740d46e4aa10f32728306b897e397bd6e1f682 SHA512 db93e66956d832da594f04aaa5cb895ea22f66acd0e97ad76f22153f9e872e46845dad5b952b54463ec8ef3e2a73a766eea8d53e980a5508e3a3346429a07999
+DIST pandas-1.1.2.tar.gz 5220166 BLAKE2B 3351bf0e539335b7f13dd6e6590309989c3bd5d36c0fd188808be14a147b828f1a3a14007fc499e2b5f580072b02de8587885629a8ffb1fc70b2577fbd034001 SHA512 a81e9f82b866cc48eaf55c288610b150fe3fa6ba6100c0b13516eb0ce4b569397127b85161e53454d0b2b24f276aa9806baa007a521623aad2345e7b7168cbb5
--- a/dev-python/pandas/pandas-1.1.2.ebuild
+++ b/dev-python/pandas/pandas-1.1.2.ebuild
@ -0,0 +1,181 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_REQ_USE="threads(+)"
+
+VIRTUALX_REQUIRED="manual"
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1 flag-o-matic multiprocessing optfeature virtualx
+
+DESCRIPTION="Powerful data structures for data analysis and statistics"
+HOMEPAGE="https://pandas.pydata.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P/_/}.tar.gz"
+S="${WORKDIR}/${P/_/}"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="doc full-support minimal test X"
+RESTRICT="!test? ( test )"
+
+RECOMMENDED_DEPEND="
+	>=dev-python/bottleneck-1.2.1[${PYTHON_USEDEP}]
+	>=dev-python/numexpr-2.1[${PYTHON_USEDEP}]
+"
+
+# TODO: add pandas-gbq to the tree
+OPTIONAL_DEPEND="
+	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+	dev-python/blosc[${PYTHON_USEDEP}]
+	|| (
+		dev-python/html5lib[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+	)
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/matplotlib[${PYTHON_USEDEP}]
+	|| (
+		dev-python/openpyxl[${PYTHON_USEDEP}]
+		dev-python/xlsxwriter[${PYTHON_USEDEP}]
+	)
+	>=dev-python/pytables-3.2.1[${PYTHON_USEDEP}]
+	dev-python/s3fs[${PYTHON_USEDEP}]
+	dev-python/statsmodels[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/xarray-0.10.8[${PYTHON_USEDEP}]
+	' python3_{6,7})
+	>=dev-python/sqlalchemy-0.8.1[${PYTHON_USEDEP}]
+	>=dev-python/xlrd-1.0.0[${PYTHON_USEDEP}]
+	dev-python/xlwt[${PYTHON_USEDEP}]
+	>=sci-libs/scipy-1.1[${PYTHON_USEDEP}]
+	X? (
+		|| (
+			dev-python/PyQt5[${PYTHON_USEDEP}]
+			x11-misc/xclip
+			x11-misc/xsel
+		)
+	)
+"
+COMMON_DEPEND="
+	>dev-python/numpy-1.15.4[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-python/cython-0.29.20-r1[${PYTHON_USEDEP}]
+	doc? (
+		${VIRTUALX_DEPEND}
+		app-text/pandoc
+		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+		dev-python/html5lib[${PYTHON_USEDEP}]
+		dev-python/ipython[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		dev-python/nbsphinx[${PYTHON_USEDEP}]
+		>=dev-python/numpydoc-0.9.1[${PYTHON_USEDEP}]
+		>=dev-python/openpyxl-1.6.1[${PYTHON_USEDEP}]
+		>=dev-python/pytables-3.0.0[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+		dev-python/rpy[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/xlrd[${PYTHON_USEDEP}]
+		dev-python/xlwt[${PYTHON_USEDEP}]
+		sci-libs/scipy[${PYTHON_USEDEP}]
+		x11-misc/xclip
+	)
+	test? (
+		${VIRTUALX_DEPEND}
+		${RECOMMENDED_DEPEND}
+		${OPTIONAL_DEPEND}
+		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/openpyxl[${PYTHON_USEDEP}]
+		dev-python/pymysql[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		dev-python/psycopg:2[${PYTHON_USEDEP}]
+		dev-python/xlsxwriter[${PYTHON_USEDEP}]
+		x11-misc/xclip
+		x11-misc/xsel
+	)
+"
+# dev-python/statsmodels invokes a circular dep
+#  hence rm from doc? ( ), again
+RDEPEND="${COMMON_DEPEND}
+	!minimal? ( ${RECOMMENDED_DEPEND} )
+	full-support? ( ${OPTIONAL_DEPEND} )
+"
+
+python_prepare_all() {
+	# Prevent un-needed download during build
+	sed -e "/^              'sphinx.ext.intersphinx',/d" \
+		-i doc/source/conf.py || die
+
+	# requires package installed
+	sed -e 's:test_register_entrypoint:_&:' \
+		-i pandas/tests/plotting/test_backend.py || die
+
+	sed -e '/extra_compile_args =/s:"-Werror"::' \
+		-i setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	# To build docs the need be located in $BUILD_DIR,
+	# else PYTHONPATH points to unusable modules.
+	if use doc; then
+		cd "${BUILD_DIR}"/lib || die
+		cp -ar "${S}"/doc . && cd doc || die
+		LANG=C PYTHONPATH=. virtx ${EPYTHON} make.py html
+	fi
+}
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	local -x LC_ALL=C.UTF-8
+	pushd  "${BUILD_DIR}"/lib > /dev/null || die
+	"${EPYTHON}" -c "import pandas; pandas.show_versions()" || die
+	PYTHONPATH=. pytest pandas -v --skip-slow --skip-network \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" \
+		-m "not single" || die "Tests failed with ${EPYTHON}"
+	find . '(' -name .pytest_cache -o -name .hypothesis ')' \
+		-exec rm -r {} + || die
+	popd > /dev/null || die
+}
+
+python_install_all() {
+	if use doc; then
+		dodoc -r "${BUILD_DIR}"/lib/doc/build/html
+		einfo "An initial build of docs is absent of references to statsmodels"
+		einfo "due to circular dependency. To have them included, emerge"
+		einfo "statsmodels next and re-emerge pandas with USE doc"
+	fi
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "accelerating certain types of NaN evaluations, using specialized cython routines to achieve large speedups." dev-python/bottleneck
+	optfeature "accelerating certain numerical operations, using multiple cores as well as smart chunking and caching to achieve large speedups" ">=dev-python/numexpr-2.1"
+	optfeature "needed for pandas.io.html.read_html" dev-python/beautifulsoup:4 dev-python/html5lib dev-python/lxml
+	optfeature "for msgpack compression using blosc" dev-python/blosc
+	optfeature "necessary for Amazon S3 access" dev-python/s3fs
+	optfeature "Template engine for conditional HTML formatting" dev-python/jinja
+	optfeature "Plotting support" dev-python/matplotlib
+	optfeature "Needed for Excel I/O" ">=dev-python/openpyxl-1.6.1" dev-python/xlsxwriter dev-python/xlrd dev-python/xlwt
+	optfeature "necessary for HDF5-based storage" ">=dev-python/pytables-3.2.1"
+	optfeature "R I/O support" dev-python/rpy
+	optfeature "Needed for parts of pandas.stats" dev-python/statsmodels
+	optfeature "SQL database support" ">=dev-python/sqlalchemy-0.8.1"
+	optfeature "miscellaneous statistical functions" sci-libs/scipy
+	optfeature "necessary to use pandas.io.clipboard.read_clipboard support" dev-python/PyQt5 dev-python/pygtk x11-misc/xclip x11-misc/xsel
+}
--- a/dev-python/parso/parso-0.8.0.ebuild
+++ b/dev-python/parso/parso-0.8.0.ebuild
@ -13,7 +13,7 @@ SRC_URI="https://github.com/davidhalter/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.

 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 x86"

 distutils_enable_sphinx docs
 distutils_enable_tests pytest
--- a/dev-python/paste/paste-3.4.3.ebuild
+++ b/dev-python/paste/paste-3.4.3.ebuild
@ -16,7 +16,7 @@ S=${WORKDIR}/${MY_P}

 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris"

 RDEPEND="dev-python/namespace-paste[${PYTHON_USEDEP}]
 	>=dev-python/six-1.4.0[${PYTHON_USEDEP}]"
--- a/dev-python/path-py/path-py-15.0.0.ebuild
+++ b/dev-python/path-py/path-py-15.0.0.ebuild
@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_P}"

 SLOT="0"
 LICENSE="MIT"
-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 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"

 RDEPEND="
 	dev-python/appdirs[${PYTHON_USEDEP}]
--- a/dev-python/pushbullet-py/pushbullet-py-0.11.0-r1.ebuild
+++ b/dev-python/pushbullet-py/pushbullet-py-0.11.0-r1.ebuild
@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7
-PYTHON_COMPAT=( pypy3 python3_{6,7,8} )
+
+PYTHON_COMPAT=( pypy3 python3_{6,7,8,9} )

 inherit distutils-r1

--- a/dev-python/py/py-1.9.0.ebuild
+++ b/dev-python/py/py-1.9.0.ebuild
@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"

 LICENSE="MIT"
 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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"

 BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
--- a/dev-python/pytest-forked/pytest-forked-1.3.0.ebuild
+++ b/dev-python/pytest-forked/pytest-forked-1.3.0.ebuild
@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"

 SLOT="0"
 LICENSE="MIT"
-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"
 IUSE="test"
 RESTRICT="!test? ( test )"

--- a/dev-python/pytest-xdist/pytest-xdist-1.34.0.ebuild
+++ b/dev-python/pytest-xdist/pytest-xdist-1.34.0.ebuild
@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"

 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"

--- a/dev-python/sgmllib3k/sgmllib3k-1.0.0.ebuild
+++ b/dev-python/sgmllib3k/sgmllib3k-1.0.0.ebuild
@ -12,4 +12,4 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"

 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
--- a/dev-python/tblib/tblib-1.7.0.ebuild
+++ b/dev-python/tblib/tblib-1.7.0.ebuild
@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"

 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"

 RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
 BDEPEND="test? ( dev-python/twisted[${PYTHON_USEDEP}] )"
--- a/dev-python/tox/tox-3.19.0.ebuild
+++ b/dev-python/tox/tox-3.19.0.ebuild
@ -14,7 +14,7 @@ SRC_URI="https://github.com/tox-dev/tox/archive/${PV}.tar.gz -> ${P}.tar.gz"

 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86"
 # doc disabled because of missing deps in tree
 IUSE="test"
 RESTRICT="!test? ( test )"
--- a/dev-python/tqdm/tqdm-4.48.2.ebuild
+++ b/dev-python/tqdm/tqdm-4.48.2.ebuild
@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/tqdm/tqdm"
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86"
 fi

 DESCRIPTION="Add a progress meter to your loops in a second"
--- a/dev-python/ujson/ujson-3.1.0.ebuild
+++ b/dev-python/ujson/ujson-3.1.0.ebuild
@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"

 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 arm arm64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"

--- a/dev-python/vcrpy/vcrpy-4.1.0.ebuild
+++ b/dev-python/vcrpy/vcrpy-4.1.0.ebuild
@ -14,7 +14,7 @@ SRC_URI="https://github.com/kevin1024/vcrpy/archive/v${PV}.tar.gz -> ${P}.tar.gz

 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86"

 RDEPEND="
 	>=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
--- a/dev-ruby/sexp_processor/Manifest
+++ b/dev-ruby/sexp_processor/Manifest
@ -1,2 +1,3 @@
 DIST sexp_processor-4.12.0.gem 54784 BLAKE2B bdbb349a85fbd1c7750db3dcd22d9b792eb17605d5157c969d083a8fca404b1af3db1e2bfdcf76a6b7f392043996d246686dfa73117b9efacec529896d5a8e35 SHA512 d1e1ae7cf13b0b8c2e6786aad1bdeda25697d88abec86fc9415bb76d4e9e98097d2fecf16ceddbc80d1d447064bfa73beec5eaa5270ef38ce224c4bdbcdede3a
 DIST sexp_processor-4.15.0.gem 56320 BLAKE2B 8624b7fe28f4aa9447f42cf4f8c5b424088ca2c1628f3e785f746ceb60725449812205dc657ea856c5bead616ac18d689330315fdb44e92447ee3a89740557d1 SHA512 f7877ca59191ab39848c6d3b0cf9625c2e1c180784cd757c00a7cea67aa6eee5549ab5630641f4044c875a1aaadc89b8237f8adadc961ed86c5379cb72db33c3
+DIST sexp_processor-4.15.1.gem 56320 BLAKE2B 1f75dd7dbe39b3684ffcbfb607c961e9406ec16373ad24ccdf37d4bd8369a240b8fdfc16f6e7437dda06605c26b2f4b507a14bcf680b91e12bd7827539f54e53 SHA512 e2ae9f5e8f61c1a703f14c692cd171ceb9acda5839417589051ffcb818584ff65a6a86279f3d6f2b9ad8c97ce842d946b57be810e5887effd4c606b6fdf1d984
--- a/dev-ruby/sexp_processor/sexp_processor-4.15.1.ebuild
+++ b/dev-ruby/sexp_processor/sexp_processor-4.15.1.ebuild
@ -0,0 +1,28 @@
+# 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_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="README.rdoc History.rdoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Processor for s-expressions created as part of the ParseTree project"
+HOMEPAGE="https://www.zenspider.com/projects/sexp_processor.html"
+
+LICENSE="GPL-2"
+SLOT="4"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+ruby_add_bdepend "
+	test? (
+		>=dev-ruby/minitest-5.5
+	)"
+
+each_ruby_test() {
+	${RUBY} -Ilib:. -e 'Dir["test/test_*.rb"].each{|f| require f}' || die
+}
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
--- a/dev-util/cram/cram-0.7-r1.ebuild
+++ b/dev-util/cram/cram-0.7-r1.ebuild
@ -0,0 +1,21 @@
+# 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="Functional testing framework for command line applications"
+HOMEPAGE="https://bitheap.org/cram/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86"
+
+python_test() {
+	distutils_install_for_testing
+	"${EPYTHON}" "${TEST_DIR}"/scripts/cram tests || die "Tests fail with ${EPYTHON}"
+}
--- a/dev-util/systemtap/files/systemtap-4.0-AR.patch
+++ b/dev-util/systemtap/files/systemtap-4.0-AR.patch
@ -0,0 +1,11 @@
+https://bugs.gentoo.org/720710
+--- a/configure.ac
+++ b/configure.ac
+@@ -22,6 +22,7 @@ AC_PROG_LN_S
+ AC_PROG_CC
+ AC_PROG_CXX
+ AC_PROG_CPP
+AM_PROG_AR
+ AM_PROG_CC_C_O
+ AC_PROG_RANLIB
+ AC_OBJEXT
--- a/dev-util/systemtap/systemtap-4.0-r1.ebuild
+++ b/dev-util/systemtap/systemtap-4.0-r1.ebuild
@ -48,6 +48,7 @@ DOCS="AUTHORS HACKING NEWS README"

 PATCHES=(
 	"${FILESDIR}"/${PN}-3.1-ia64.patch
+	"${FILESDIR}"/${PN}-4.0-AR.patch
 )

 pkg_setup() {
--- a/games-rpg/Manifest.gz
+++ b/games-rpg/Manifest.gz
--- a/games-rpg/broken-age/Manifest
+++ b/games-rpg/broken-age/Manifest
@ -0,0 +1 @@
+DIST BrokenAge_linux.tar.gz 2159926882 BLAKE2B 351fd74310ce2a03682151b8112d5831d3d495a6fc9cba68a366205033ce0f35f3446f30ccf98024462f144db3782faf68f73944c814a537cdde8c09f6afbadc SHA512 6642fdae52dc5a22dcbaa1c9db865bfe8dee2365014c1854c53436a1cc4fc842134ad96d9576de221cb494d6e04ea6d30f213c5a62a19f29aaf466740e670284
--- a/games-rpg/broken-age/broken-age-2.4.800398.ebuild
+++ b/games-rpg/broken-age/broken-age-2.4.800398.ebuild
@ -0,0 +1,46 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils desktop xdg
+
+MY_PN="BrokenAge"
+DESCRIPTION="A point-and-click adventure from Tim Schafer's Double Fine Productions"
+HOMEPAGE="http://www.brokenagegame.com"
+SRC_URI="${MY_PN}_linux.tar.gz"
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+RESTRICT="bindist fetch splitdebug"
+
+RDEPEND="
+	media-libs/libsdl2[abi_x86_32,joystick,opengl,sound,video]
+	virtual/opengl[abi_x86_32]
+"
+
+S="${WORKDIR}"
+
+DIR="/opt/${PN}"
+QA_PREBUILT="${DIR}/*"
+
+pkg_nofetch() {
+	einfo "Please buy and download ${SRC_URI} from:"
+	einfo "  https://www.humblebundle.com/store/${PN}"
+	einfo "and move it to your distfiles directory."
+}
+
+src_install() {
+	exeinto "${DIR}"
+	doexe ${MY_PN}
+	make_wrapper ${PN} ./${MY_PN} "${DIR}"
+
+	insinto "${DIR}"
+	doins *.pck
+
+	exeinto "${DIR}"/lib
+	doexe lib/libfmod*.so
+
+	make_desktop_entry ${PN} "Broken Age" applications-games
+	dodoc ReadMe.txt
+}
--- a/games-rpg/broken-age/metadata.xml
+++ b/games-rpg/broken-age/metadata.xml
@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+</pkgmetadata>
--- a/gnome-extra/Manifest.gz
+++ b/gnome-extra/Manifest.gz
--- a/gnome-extra/cinnamon-control-center/Manifest
+++ b/gnome-extra/cinnamon-control-center/Manifest
@ -1 +1,2 @@
 DIST cinnamon-control-center-4.4.0.tar.gz 3868474 BLAKE2B 88e22670427416139468c35918105cc664c531aa5084636226498a09b27f56300c8541feff8f93a5ec860372436af01fdeb2ca2c0761b34a6f298439538dfb44 SHA512 3f176c067312bad68ed8ce2461937d8e8cd188839ab3cf786fb76930905691b8f5a91d700f1d88d75448eeecfd23b645b77ee15c0ec02e08718f7c9ac800677f
+DIST cinnamon-control-center-4.6.2.tar.gz 3877007 BLAKE2B f64ebfedc73eb92b96f81fb2743d818ec1602a550130d362eadba4c66a24a0e1f2bdffbe0bf80b23426ab57cead910c78b061b52e4eb82d0e6173d1da2d62749 SHA512 c759c14cc295ba15bde87ad1544d4bdef284d8e3fb8fbee528e9a258aaf83c6f6d76944042230725804ea6c05bd2cb5cbb59cb7507378b952221f381fc47075e
--- a/gnome-extra/cinnamon-control-center/cinnamon-control-center-4.6.2.ebuild
+++ b/gnome-extra/cinnamon-control-center/cinnamon-control-center-4.6.2.ebuild
@ -0,0 +1,88 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools eutils gnome2-utils xdg
+
+DESCRIPTION="Cinnamons's main interface to configure various aspects of the desktop"
+HOMEPAGE="https://projects.linuxmint.com/cinnamon/"
+SRC_URI="https://github.com/linuxmint/cinnamon-control-center/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="+colord debug input_devices_wacom +networkmanager +modemmanager systemd"
+REQUIRED_USE="modemmanager? ( networkmanager )"
+KEYWORDS="~amd64 ~x86"
+
+# False positives caused by nested configure scripts
+QA_CONFIGURE_OPTIONS=".*"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.31:2
+	dev-libs/libxml2:2
+	>=gnome-base/libgnomekbd-2.91.91:0=
+	>=gnome-extra/cinnamon-desktop-4.6:0=
+	>=gnome-extra/cinnamon-menus-4.4:0=
+	>=gnome-extra/cinnamon-settings-daemon-4.4:0=
+	media-libs/fontconfig
+	networkmanager? (
+		>=net-misc/networkmanager-1.2.0:=[modemmanager?]
+		>=gnome-extra/nm-applet-1.2.0
+		modemmanager? ( >=net-misc/modemmanager-0.7 )
+	)
+	>=sys-auth/polkit-0.103
+	>=x11-libs/gdk-pixbuf-2.23.0:2
+	>=x11-libs/gtk+-3.4.1:3
+	>=x11-libs/libnotify-0.7.3:0=
+	x11-libs/libX11
+	>=x11-libs/libxklavier-5.1
+	colord? ( >=x11-misc/colord-0.1.14:0= )
+	input_devices_wacom? (
+		>=dev-libs/libwacom-0.7
+		>=x11-libs/gtk+-3.8:3
+		>=x11-libs/libXi-1.2 )
+"
+# <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x
+# libgnomekbd needed only for gkbd-keyboard-display tool
+RDEPEND="${COMMON_DEPEND}
+	systemd? ( >=sys-apps/systemd-31 )
+	!systemd? ( app-admin/openrc-settingsd )
+	x11-themes/adwaita-icon-theme
+	colord? ( >=gnome-extra/gnome-color-manager-3 )
+	input_devices_wacom? ( gnome-extra/cinnamon-settings-daemon[input_devices_wacom] )
+"
+DEPEND="${COMMON_DEPEND}
+	app-text/iso-codes
+	sys-devel/autoconf-archive
+	x11-base/xorg-proto
+"
+BDEPEND="
+	dev-util/glib-utils
+	>=dev-util/intltool-0.40.1
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	xdg_src_prepare
+	eautoreconf
+	gnome2_disable_deprecation_warning
+}
+
+src_configure() {
+	econf \
+		--disable-maintainer-mode \
+		--enable-compile-warnings=minimum \
+		--disable-static \
+		--disable-onlineaccounts \
+		$(use_enable colord color) \
+		$(usex debug --enable-debug=yes ' ') \
+		$(use_enable input_devices_wacom wacom) \
+		$(use_enable networkmanager) \
+		$(use_enable modemmanager)
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
--- a/gnome-extra/cinnamon-desktop/Manifest
+++ b/gnome-extra/cinnamon-desktop/Manifest
@ -1 +1,2 @@
 DIST cinnamon-desktop-4.4.1.tar.gz 488102 BLAKE2B 8bf770e1f2af67c32381c5ba23e88f259d9d6c6a0b722e61202922da8c8c5374bd297b3866846f28924d6d527e6122432682df98d4b3979eeaf026674b6e5027 SHA512 3e3a1bb007ed6d921c83e377bf05642f01ae2ae29f4fb63d93e011de44dadc4e79967510079c6175b68207263fd4a589587c2d0904f17639f3fffad81ddbbde9
+DIST cinnamon-desktop-4.6.4.tar.gz 495195 BLAKE2B eba62e0d99bf824ea034a3bfdf08fcb157e9e5b156260f31c4b41244649ce4fd54adfc192654cffb1336d72c678d32ee151b2a7bbe114dccbe078e66f85ad261 SHA512 09a0e521bd97d4eead9e84ca929a04202d3d4ef35e689d84578a534cc00f1be0a22e04c407f7caaaca4bb5b5a837bd1a2893cd727d0045f15ee20938c36fae72
--- a/gnome-extra/cinnamon-desktop/cinnamon-desktop-4.6.4.ebuild
+++ b/gnome-extra/cinnamon-desktop/cinnamon-desktop-4.6.4.ebuild
@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit meson gnome2-utils python-any-r1 xdg
+
+DESCRIPTION="A collection of libraries and utilites used by Cinnamon"
+HOMEPAGE="https://projects.linuxmint.com/cinnamon/"
+SRC_URI="https://github.com/linuxmint/cinnamon-desktop/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+ FDL-1.1+ LGPL-2+"
+SLOT="0/4" # subslot = libcinnamon-desktop soname version
+KEYWORDS="~amd64 ~x86"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.37.3:2[dbus]
+	media-sound/pulseaudio[glib]
+	>=x11-libs/gdk-pixbuf-2.22:2[introspection]
+	>=dev-libs/gobject-introspection-0.10.2:=
+	>=x11-libs/gtk+-3.3.16:3[introspection]
+	>=x11-libs/libXext-1.1
+	>=x11-libs/libXrandr-1.3
+	x11-libs/cairo:=[X]
+	x11-libs/libX11
+	x11-libs/libxkbfile
+	x11-misc/xkeyboard-config
+	>=gnome-base/gsettings-desktop-schemas-3.5.91
+	sys-apps/accountsservice
+"
+RDEPEND="${COMMON_DEPEND}"
+DEPEND="${COMMON_DEPEND}
+	x11-base/xorg-proto
+"
+BDEPEND="${PYTHON_DEPS}
+	dev-util/glib-utils
+	>=dev-util/intltool-0.40.6
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+pkg_postinst() {
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	gnome2_schemas_update
+}
--- a/gnome-extra/cinnamon-menus/Manifest
+++ b/gnome-extra/cinnamon-menus/Manifest
@ -1 +1,2 @@
 DIST cinnamon-menus-4.4.0.tar.gz 96196 BLAKE2B 9bb16c3d4d0f3b92b38ea9e388e0a17ee80d1143ed77daab03fcdc0de63423e77900174c2f4a49b173b0d2f1dddff43d3864b1ce1c940a64740d5c53a7807f41 SHA512 68d63fc9b79ecd979dea39e284e1b3120e3c889f496a418e060e97acea04c92a07a31cb5a0b4f1a62b4af64731de3b8c5524a8613cab61361ff329f68a19cb90
+DIST cinnamon-menus-4.6.1.tar.gz 96294 BLAKE2B bdfacd5f4c5344833c9804b79846c5ac9908e74381c2e84b29b8cb765b10578ac69155d93e1c0bd8b6b8100d5e5f34ca1bc8bd77edb681eb705d759c5d9275bc SHA512 ef37662d4e1a49494c22481456b5e318039ec8c873e6ffcc0c55f89edbcc918d3bc97664b33007194da268b43884fe5abd08b27ac8bb5e7ba7bcb9928546aee9
--- a/gnome-extra/cinnamon-menus/cinnamon-menus-4.6.1.ebuild
+++ b/gnome-extra/cinnamon-menus/cinnamon-menus-4.6.1.ebuild
@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit meson xdg
+
+DESCRIPTION="Cinnamon's library for the Desktop Menu fd.o specification"
+HOMEPAGE="https://projects.linuxmint.com/cinnamon/"
+SRC_URI="https://github.com/linuxmint/cinnamon-menus/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug gtk-doc"
+
+RDEPEND="
+	>=dev-libs/glib-2.29.15:2
+	>=dev-libs/gobject-introspection-0.9.12:=
+"
+DEPEND="${RDEPEND}
+	dev-libs/gobject-introspection-common
+"
+BDEPEND="
+	>=dev-util/intltool-0.40.6
+	sys-devel/gettext
+	virtual/pkgconfig
+	gtk-doc? ( dev-util/gtk-doc )
+"
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use debug enable_debug)
+		$(meson_use gtk-doc enable_docs)
+	)
+	meson_src_configure
+}
--- a/gnome-extra/cinnamon-screensaver/Manifest
+++ b/gnome-extra/cinnamon-screensaver/Manifest
@ -1 +1,2 @@
 DIST cinnamon-screensaver-4.4.1.tar.gz 160214 BLAKE2B df19a370c76648e0717565a3aab4785c3d8b48b20b9d87cc5426506f196db72872642d0ed1109a40986311c0ad7a5c17fbdcfc69681083afd3884c04822c6afa SHA512 92050febcfd41ad03b277cef60b95080d56b8fd985d064e9420a3357d7d0475355a4ca55965e581ae45410df8f19f3c031f6df0e3eec5b6b78aee7141d0244f7
+DIST cinnamon-screensaver-4.6.0.tar.gz 141043 BLAKE2B ba9f1e02fb7567d269daa4eccdb39d2c73dd6ac6bd3a3a4e00e1bcec685b48394fc9247d5006f908091291748e013ae65cf7718a972ef67ed7fd11a226789d6d SHA512 c83a057ff12a22445a155d4f91a45638d922c9b2180a7655f1e34bfd8ddcd31ed901b5b038236fa0e06c6f7986547c34ee8ab61cd216b5bc75f1c202b545c28f
--- a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-4.6.0.ebuild
+++ b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-4.6.0.ebuild
@ -0,0 +1,76 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit meson python-single-r1 xdg
+
+DESCRIPTION="Screensaver for Cinnamon"
+HOMEPAGE="https://projects.linuxmint.com/cinnamon/"
+SRC_URI="https://github.com/linuxmint/cinnamon-screensaver/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="systemd xinerama"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+KEYWORDS="~amd64 ~x86"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.37.3:2[dbus]
+	>=x11-libs/gtk+-3.22:3[introspection]
+	>=gnome-extra/cinnamon-desktop-4.6:0=
+	>=dev-libs/dbus-glib-0.78
+
+	sys-apps/dbus
+	sys-libs/pam
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXrandr
+	x11-themes/adwaita-icon-theme
+
+	${PYTHON_DEPS}
+
+	xinerama? ( x11-libs/libXinerama )
+"
+RDEPEND="${COMMON_DEPEND}
+	$(python_gen_cond_dep '
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		dev-python/setproctitle[${PYTHON_USEDEP}]
+		dev-python/xapp[${PYTHON_USEDEP}]
+		dev-python/psutil[${PYTHON_USEDEP}]
+	')
+	systemd? ( >=sys-apps/systemd-31 )
+	!systemd? ( sys-auth/elogind )
+"
+DEPEND="${COMMON_DEPEND}
+	x11-base/xorg-proto
+"
+BDEPEND="
+	dev-util/gdbus-codegen
+	>=dev-util/intltool-0.40
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.6.0-python-build.patch
+	"${FILESDIR}"/${PN}-4.6.0-xinerama.patch
+)
+
+src_prepare() {
+	xdg_src_prepare
+	python_fix_shebang src
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use xinerama)
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	python_optimize "${ED}"/usr/share/cinnamon-screensaver/
+}
--- a/gnome-extra/cinnamon-screensaver/files/cinnamon-screensaver-4.6.0-python-build.patch
+++ b/gnome-extra/cinnamon-screensaver/files/cinnamon-screensaver-4.6.0-python-build.patch
@ -0,0 +1,77 @@
+From f838b2ab03af0285043d980feba9d52d96d66164 Mon Sep 17 00:00:00 2001
+From: Michael Webster <miketwebster@gmail.com>
+Date: Fri, 15 May 2020 08:34:40 -0400
+Subject: [PATCH] Build: Only generate python bytecode during builds with no
+ temporary install folder.  Package managers should handle this otherwise.
+
+This eliminates a lot of warnings during the packaging portion of
+the deb build.
+---
+ install-scripts/meson.build             | 16 ++++++++++++++++
+ install-scripts/meson_compile_python.py | 10 ++++++++++
+ meson.build                             |  1 +
+ src/meson.build                         |  2 --
+ 4 files changed, 27 insertions(+), 2 deletions(-)
+ create mode 100644 install-scripts/meson.build
+ create mode 100644 install-scripts/meson_compile_python.py
+
+diff --git a/install-scripts/meson.build b/install-scripts/meson.build
+new file mode 100644
+index 0000000..667d669
+--- /dev/null
+++ b/install-scripts/meson.build
+@@ -0,0 +1,16 @@
+# These scripts run as post-installation scripts.
+
+# They're designed to do nothing if DESTDIR is set, which happens
+# during debian builds for instance - there's a fake install target
+# so running these would be pointless.
+
+# When using deb packaging, these aren't needed, as these operations
+# are run automatically by the package manager.
+
+# They're really only necessary in straight builds where 'ninja install'
+# will be run directly, to install the program onto the system.
+
+
+# Generate python bytecode
+meson.add_install_script('meson_compile_python.py')
+
+diff --git a/install-scripts/meson_compile_python.py b/install-scripts/meson_compile_python.py
+new file mode 100644
+index 0000000..9ec0f4d
+--- /dev/null
+++ b/install-scripts/meson_compile_python.py
+@@ -0,0 +1,10 @@
+#!/usr/bin/python3
+
+import os
+import subprocess
+
+pythondir = os.path.join(os.environ['MESON_INSTALL_PREFIX'], 'share', 'cinnamon-screensaver')
+
+if not os.environ.get('DESTDIR'):
+    print('Generating python bytecode...')
+    subprocess.call(['sh', '-c', 'python3 -m compileall "%s"' % pythondir])
+diff --git a/meson.build b/meson.build
+index c508770..d7dcd31 100644
+--- a/meson.build
+++ b/meson.build
+@@ -123,6 +123,7 @@ conf_h = configure_file(
+ 
+ inc = include_directories('.')
+ 
+subdir('install-scripts')
+ subdir('libcscreensaver')
+ subdir('data')
+ subdir('src')
+diff --git a/src/meson.build b/src/meson.build
+index 7e0978e..f04fda0 100644
+--- a/src/meson.build
+++ b/src/meson.build
+@@ -64,5 +64,3 @@ foreach script : app_scripts
+   meson.add_install_script('sh', '-c',
+     'ln -sf "@0@" "$DESTDIR/@1@"'.format(join_paths(pkgdatadir, script[0]), join_paths(bindir, script[1])))
+ endforeach
+-
+-meson.add_install_script('sh', '-c', 'python3 -m compileall "$DESTDIR/@0@"'.format(pkgdatadir) )
--- a/gnome-extra/cinnamon-screensaver/files/cinnamon-screensaver-4.6.0-xinerama.patch
+++ b/gnome-extra/cinnamon-screensaver/files/cinnamon-screensaver-4.6.0-xinerama.patch
@ -0,0 +1,49 @@
+From 13575ae3f332e33a1952a803f2392d6d70df2028 Mon Sep 17 00:00:00 2001
+From: Sparky Bluefang <sparky@bluefang-logic.com>
+Date: Wed, 2 Sep 2020 17:59:45 -0400
+Subject: [PATCH] Fix meson syntax error when xinerama support is disabled.
+
+Fixes #346
+---
+ libcscreensaver/meson.build | 7 ++++++-
+ meson.build                 | 3 ++-
+ 2 files changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/libcscreensaver/meson.build b/libcscreensaver/meson.build
+index 1800c46..c2c3757 100644
+--- a/libcscreensaver/meson.build
+++ b/libcscreensaver/meson.build
+@@ -145,13 +145,18 @@ gir_sources = [
+   dbus_built
+ ]
+ 
+libcscreensaver_deps = [gobject, gtk, gdk, x11, xrandr, xext, glib, gio, gthread, pam, m]
+if use_xinerama
+  libcscreensaver_deps += xinerama
+endif
+
+ libcscreensaver = library(
+   'cscreensaver',
+   cscreensaver_sources + gir_sources,
+   version: '0.0.0',
+   include_directories: inc,
+   cpp_args: '-DG_LOG_DOMAIN="CScreensaver"',
+-  dependencies: [gobject, gtk, gdk, x11, xinerama, xrandr, xext, glib, gio, gthread, pam, m],
+  dependencies: libcscreensaver_deps,
+   install: true
+ )
+ 
+diff --git a/meson.build b/meson.build
+index b15c3fb..2f9a9a5 100644
+--- a/meson.build
+++ b/meson.build
+@@ -61,7 +61,8 @@ foreach sym : [
+   endif
+ endforeach
+ 
+-if get_option('xinerama')
+use_xinerama = get_option('xinerama')
+if use_xinerama
+   if host_machine.system() == 'solaris'
+     xinerama = cc.find_library('Xext')
+     xinerama_h = cc.has_header('X11/extensions/xinerama.h')
--- a/gnome-extra/cinnamon-session/Manifest
+++ b/gnome-extra/cinnamon-session/Manifest
@ -1 +1,2 @@
 DIST cinnamon-session-4.4.1.tar.gz 198819 BLAKE2B bd39b5a89011942239beb76976b01234eaf839e80f1f54d26e1ee988797596d876d2708bee91d4c016a584d76fd9ba1209b4f8e77da8e9db8d7a8b4e5a43dac1 SHA512 f5caf7a3797ca30c397433ea052b7736308a31da291442f64224f034a6bd50eb45307cc8987efe5148eb816c2c70c3033795290386c93f205684796d03b63c22
+DIST cinnamon-session-4.6.2.tar.gz 199292 BLAKE2B f4a2a7dc438846c6013b539a027cbc13359a3cb47ed01c6acb97daf4a28fc26da3754d4264aaa90e8f10504bb7415a82dcc509430825cfd3e50e3beac7c78616 SHA512 c4b9d21145a82ecd0c9645899bb76acff632c7cc7ce4c5cc162ef38b91c772a29c66ab1645a6e35f92dd121cea0bd6748cf86275bc95a2a6d045fdbb4aea7d24
--- a/gnome-extra/cinnamon-session/cinnamon-session-4.6.2.ebuild
+++ b/gnome-extra/cinnamon-session/cinnamon-session-4.6.2.ebuild
@ -0,0 +1,66 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit meson gnome2-utils xdg
+
+DESCRIPTION="Cinnamon session manager"
+HOMEPAGE="https://projects.linuxmint.com/cinnamon/"
+SRC_URI="https://github.com/linuxmint/cinnamon-session/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+ FDL-1.1+ LGPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc ipv6 systemd"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.37.3:2
+	media-libs/libcanberra
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3:3
+	x11-libs/cairo
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libXcomposite
+	x11-libs/libXext
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/pango[X]
+	>=x11-libs/xapps-1.0.4
+	virtual/opengl
+	systemd? ( >=sys-apps/systemd-183 )
+	!systemd? ( sys-auth/elogind[policykit] )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	>=gnome-extra/cinnamon-desktop-4.4
+"
+DEPEND="${COMMON_DEPEND}"
+BDEPEND="
+	>=dev-util/intltool-0.40.6
+	virtual/pkgconfig
+	doc? (
+		app-text/xmlto
+		dev-libs/libxslt )
+"
+
+src_configure() {
+	local emesonargs=(
+		-Dgconf=false
+		$(meson_use doc docbook)
+		$(meson_use ipv6)
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
--- a/gnome-extra/cinnamon-settings-daemon/Manifest
+++ b/gnome-extra/cinnamon-settings-daemon/Manifest
@ -1 +1,2 @@
 DIST cinnamon-settings-daemon-4.4.0.tar.gz 665615 BLAKE2B ef0666864a4735ff32d57a584004176c74d0f0ad4b077d3439e135c1d24c8d0606221a1b1693a0189972b462055478680b03917a6acfcdfdc80649f7ee0fc224 SHA512 dc4b0c570b345577bd20e85b44f4c99c3e3c88a2c2aea7c928e1fae931dc4dc07c6dd64c5917661434d35e3ae606c8189c3f77e0658925b5cc6ba2dc1885cb81
+DIST cinnamon-settings-daemon-4.6.4.tar.gz 668339 BLAKE2B 80e14d29a74004c1778e90d39c6ca892d3eee778134e43b8ea77cfec8cbad4f5ac21609cfbb9cdaab0b4d35b42e897223a5b9cdfd43de49d8112b8bc6fc45914 SHA512 77ddb637fd93fdfd59fb27c5a10082259fd99b4753ff36b3473db12f2fe0d19ee89d44c9e72f1ce9eab3f228c5fef418ce774dd78746d77b959ad9d8f93c1208
--- a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-4.4.0.ebuild
+++ b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-4.4.0.ebuild
@ -26,6 +26,7 @@ RDEPEND="
 	>=media-libs/lcms-2.2:2
 	media-libs/libcanberra:0=[gtk3]
 	>=sys-apps/dbus-1.1.2
+	dev-libs/dbus-glib
 	>=sys-auth/polkit-0.97
 	x11-libs/gdk-pixbuf:2
 	>=x11-libs/gtk+-3.9.10:3
@ -52,6 +53,7 @@ RDEPEND="
 	!systemd? ( sys-auth/elogind:0= )
 "
 DEPEND="${RDEPEND}
+	dev-util/glib-utils
 	dev-util/gdbus-codegen
 	dev-libs/libxml2:2
 	>=dev-util/intltool-0.37.1
--- a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-4.6.4.ebuild
+++ b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-4.6.4.ebuild
@ -0,0 +1,114 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools eutils gnome2-utils virtualx xdg
+
+DESCRIPTION="Cinnamon's settings daemon"
+HOMEPAGE="https://projects.linuxmint.com/cinnamon/"
+SRC_URI="https://github.com/linuxmint/cinnamon-settings-daemon/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+colord cups input_devices_wacom smartcard systemd"
+RESTRICT="test"
+
+# udev is non-optional since lots of plugins, not just gudev, pull it in
+RDEPEND="
+	>=dev-libs/glib-2.38:2
+	dev-libs/libgudev:=
+	>=gnome-base/libgnomekbd-3.6
+	>=gnome-extra/cinnamon-desktop-4.6:0=
+	media-libs/fontconfig
+	>=media-libs/lcms-2.2:2
+	media-libs/libcanberra:0=[gtk3]
+	>=sys-apps/dbus-1.1.2
+	dev-libs/dbus-glib
+	>=sys-auth/polkit-0.97
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3.9.10:3
+	>=x11-libs/libnotify-0.7.3:0=
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	>=x11-libs/libxklavier-5.0
+	>=sys-power/upower-0.9.11
+
+	colord? ( >=x11-misc/colord-0.1.27:= )
+	cups? (
+		>=net-print/cups-1.4[dbus]
+		app-admin/system-config-printer
+		net-print/cups-pk-helper )
+	input_devices_wacom? (
+		>=dev-libs/libwacom-0.7
+		>=gnome-base/librsvg-2.36.2
+		x11-drivers/xf86-input-wacom
+		x11-libs/libXtst )
+	smartcard? ( >=dev-libs/nss-3.11.2 )
+	systemd? ( sys-apps/systemd:0= )
+	!systemd? ( sys-auth/elogind:0= )
+"
+DEPEND="${RDEPEND}
+	dev-libs/libxml2:2
+	x11-base/xorg-proto
+"
+BDEPEND="
+	dev-util/glib-utils
+	dev-util/gdbus-codegen
+	>=dev-util/intltool-0.37.1
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	# Make account-services optional
+	"${FILESDIR}"/${PN}-3.8.0-accountservice.patch
+)
+
+src_prepare() {
+	xdg_src_prepare
+	eautoreconf
+	gnome2_disable_deprecation_warning
+
+	# Disable broken test
+	sed -e '/g_test_add_func ("\/color\/edid/d' \
+		-i plugins/color/gcm-self-test.c || die
+}
+
+src_configure() {
+	# no point in disabling gudev since other plugins pull it in
+	econf \
+		--disable-maintainer-mode \
+		--disable-schemas-compile \
+		--enable-compile-warnings=minimum \
+		--disable-static \
+		--enable-gudev \
+		--enable-polkit \
+		--enable-logind \
+		--disable-accountservice \
+		$(use_enable colord color) \
+		$(use_enable cups) \
+		$(use_enable smartcard smartcard-support) \
+		$(use_enable input_devices_wacom wacom)
+}
+
+src_test() {
+	virtx emake check
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+	dodoc MAINTAINERS
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
--- a/gnome-extra/cinnamon-translations/Manifest
+++ b/gnome-extra/cinnamon-translations/Manifest
@ -1 +1,2 @@
 DIST cinnamon-translations-4.4.2.tar.gz 11479907 BLAKE2B b1d38e1bac17e254a55d679f6d057ce24b643f0c17126fadb8581e60c81001c0d1dd357244d1f199661f2bddcdc8fece768f37d53c0bfbc61867a8c7ea3b93e0 SHA512 09700cc7fcd2e9e6599db8de994ec257da2be1931c32254af3042583310eeaf729b4dda0006346099922994f95310b32f99239916b5a35f9194bb4f8f8045eea
+DIST cinnamon-translations-4.6.2.tar.gz 11728647 BLAKE2B a1c8feb175be6bdb3bca3040c1e4a9227ccca744128f28b3ffd1e1ae53e103e6c2e40d5f2af54aa69ad9489d5be9acf4bbeda5175bd2c6f271bfbf6415494438 SHA512 b3bd19f140792988ce05e5a33e1beed9018048690bbd38db050c1c7b8c60091466892bbcfecc056118321a16aed80ca79df9a1c5b756c3c28539f940d9408517
--- a/gnome-extra/cinnamon-translations/cinnamon-translations-4.6.2.ebuild
+++ b/gnome-extra/cinnamon-translations/cinnamon-translations-4.6.2.ebuild
@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PLOCALES="af am an ar as ast az be be@latin bg bn bn_IN br bs ca ca@valencia crh cs csb cy da de dz el en@shaw en_AU en_CA en_GB en_IE en_NZ en_ZA eo es es_AR et eu fa fi fil fo fr fr_CA frp fur fy ga gd gl gu ha he hi hr hu hy ia id ie ig is it ja jv ka kab kk km kn ko ksw ku ky la li lo lt lv mai mg mi mk ml mn mr ms my nap nb nds ne nl nn no nso oc om or pa pap pl ps pt pt_BR ro ru rue rw sa sc sco shn si sk sl so sq sr sr@ijekavianlatin sr@latin sv sw szl ta te tg th tk tl tlh tpi tr ts tt ug uk ur uz uz@cyrillic vi wa xh yi yo zh_CN zh_HK zh_TW zu"
+inherit l10n
+
+DESCRIPTION="Translation data for Cinnamon"
+HOMEPAGE="https://projects.linuxmint.com/cinnamon/"
+SRC_URI="https://github.com/linuxmint/cinnamon-translations/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND=">gnome-extra/cinnamon-settings-daemon-3.6"
+RDEPEND="${DEPEND}"
+BDEPEND="sys-devel/gettext"
+
+src_configure() { :; }
+
+src_install() {
+	# Cannot run before since locales are not in the expected place for this to work
+	l10n_find_plocales_changes "${S}"/usr/share/locale "" ""
+
+	install_locale() {
+		insinto /usr/share/locale
+		doins -r usr/share/locale/${1}
+	}
+	l10n_for_each_locale_do install_locale
+}
--- a/gnome-extra/cinnamon/Manifest
+++ b/gnome-extra/cinnamon/Manifest
@ -1 +1,2 @@
 DIST cinnamon-4.4.8.tar.gz 2285252 BLAKE2B 8049093582c57d3e60f570561265b4edbc117e749e228b2d9638ec3afb2a33c1675604e4e8283c683a0fb54608f742552e89da8fc57fafd01bb6ba1567dc1fe3 SHA512 aedf9f470c04bd0a36cdc34546ed92d5709325e3ef2c0f40e8b026a76964231fc950c4a46bb6a87d46a2fa0f1cac50e7dcbe914008e18550b5fc1e27c7135978
+DIST cinnamon-4.6.7.tar.gz 2271281 BLAKE2B bbf8a5d82b6bd27a8578aebb30ed0df4190ef2addfc0d820448e70d4db6b3d8df633a5f33178b29fd2c012045e1790df60a4b1b281fdd70eda53caa5cacc0d7b SHA512 4807d5330c1e2a7e1804257b88dbec2822aa386b0bc2fe2d3aca8e5a27125703987dbabca35360e99216e7b4370bcf6339de562026b48529442a4edda6eb9070
--- a/gnome-extra/cinnamon/cinnamon-4.6.7.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-4.6.7.ebuild
@ -0,0 +1,181 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE="xml"
+
+inherit autotools eutils flag-o-matic gnome2-utils multilib pax-utils python-single-r1 xdg
+
+DESCRIPTION="A fork of GNOME Shell with layout similar to GNOME 2"
+HOMEPAGE="https://projects.linuxmint.com/cinnamon/"
+SRC_URI="https://github.com/linuxmint/cinnamon/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="gtk-doc +nls +networkmanager"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+KEYWORDS="~amd64 ~x86"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	app-accessibility/at-spi2-atk:2
+	app-misc/ca-certificates
+	dev-libs/dbus-glib
+	>=dev-libs/glib-2.35.0:2[dbus]
+	>=dev-libs/gobject-introspection-1.29.15:=
+	>=dev-libs/libcroco-0.6.2:0.6
+	dev-libs/libxml2:2
+	>=gnome-extra/cinnamon-desktop-4.6:0=
+	>=gnome-extra/cinnamon-menus-4.6
+	>=gnome-extra/cjs-4.6[cairo]
+	>=gnome-base/gsettings-desktop-schemas-2.91.91
+	media-libs/gstreamer:1.0
+	media-libs/gst-plugins-base:1.0
+	net-libs/libsoup:2.4[introspection]
+	>=sys-auth/polkit-0.100[introspection]
+	x11-libs/gdk-pixbuf:2[introspection]
+	>=x11-libs/gtk+-3.12.0:3[introspection]
+	x11-libs/pango[introspection]
+	>=x11-libs/startup-notification-0.11
+	x11-libs/libX11
+	>=x11-libs/libXfixes-5.0
+	>=x11-wm/muffin-4.0.3[introspection]
+	dev-libs/keybinder:3[introspection]
+	>=x11-libs/libnotify-0.7.3:0=[introspection]
+"
+# Runtime-only deps are probably incomplete and approximate.
+# Each block:
+# 2. Introspection stuff + dconf needed via imports.gi.*
+# 3. gnome-session is needed for gnome-session-quit
+# 4. Control shell settings
+# 5. accountsservice is needed for GdmUserManager (0.6.14 needed for fast
+#    user switching with gdm-3.1.x)
+# 6. caribou needed for on-screen keyboard
+# 7. xdg-utils needed for xdg-open, used by extension tool
+# 8. imaging, lxml needed for cinnamon-settings
+# 9. adwaita-icon-theme needed for various icons
+# 10. pygobject needed for menu editor
+# 11. nemo - default file manager, tightly integrated with cinnamon
+# 12. polkit-gnome - explicitly autostarted by us
+# TODO(lxnay): fix error: libgnome-desktop/gnome-rr-labeler.h: No such file or directory
+RDEPEND="${COMMON_DEPEND}
+	>=gnome-base/dconf-0.4.1
+	>=gnome-base/libgnomekbd-2.91.4
+	sys-power/upower[introspection]
+
+	>=gnome-extra/cinnamon-session-4.6
+	>=gnome-extra/cinnamon-settings-daemon-4.6
+
+	>=app-accessibility/caribou-0.3
+
+	dev-libs/libtimezonemap
+	x11-misc/xdg-utils
+	x11-libs/xapps[introspection]
+
+	$(python_gen_cond_dep '
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+		dev-python/distro[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		dev-python/pycairo[${PYTHON_USEDEP}]
+		dev-python/pyinotify[${PYTHON_USEDEP}]
+		dev-python/pypam[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/setproctitle[${PYTHON_USEDEP}]
+		dev-python/tinycss2[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+		dev-python/xapp[${PYTHON_USEDEP}]
+	')
+
+	x11-themes/gnome-themes-standard
+	x11-themes/adwaita-icon-theme
+
+	>=gnome-extra/nemo-4.6
+	>=gnome-extra/cinnamon-control-center-4.6[networkmanager=]
+	>=gnome-extra/cinnamon-screensaver-4.6
+
+	gnome-extra/polkit-gnome
+
+	nls? ( >=gnome-extra/cinnamon-translations-4.6 )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/intltool-0.40
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+	gtk-doc? ( dev-util/gtk-doc )
+"
+
+PATCHES=(
+	# Fix backgrounds path as cinnamon doesn't provide them
+	# https://github.com/linuxmint/Cinnamon/issues/3575
+	"${FILESDIR}"/${PN}-3.8.0-gnome-background-compatibility.patch
+
+	# Use wheel group instead of sudo (from Fedora/Arch)
+	# https://github.com/linuxmint/Cinnamon/issues/3576
+	"${FILESDIR}"/${PN}-3.6.6-wheel-sudo.patch
+)
+
+src_prepare() {
+	xdg_src_prepare
+	eautoreconf
+	gnome2_disable_deprecation_warning
+
+	# Add polkit agent to required components (from Fedora/Arch), bug #523958
+	# https://github.com/linuxmint/Cinnamon/issues/3579
+	sed -i 's/RequiredComponents=\(.*\)$/RequiredComponents=\1polkit-gnome-authentication-agent-1;/' \
+		files/cinnamon*.session.in || die
+
+	# shebang fixing craziness
+	local p
+	for p in $(grep -rl '#!.*python3'); do
+		python_fix_shebang "${p}"
+	done
+}
+
+src_configure() {
+	econf \
+		--disable-maintainer-mode \
+		--disable-schemas-compile \
+		--enable-compile-warnings=minimum \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
+		--with-ca-certificates="${EPREFIX}/etc/ssl/certs/ca-certificates.crt" \
+		$(use_enable gtk-doc) \
+		$(use_enable networkmanager) \
+		BROWSER_PLUGIN_DIR="${EPREFIX}/usr/$(get_libdir)/nsbrowser/plugins"
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+
+	python_optimize "${ED}"/usr/share/cinnamon/
+
+	# Required for gnome-shell on hardened/PaX, bug #398941
+	pax-mark mr "${ED}"/usr/bin/cinnamon
+
+	# Doesn't exist on Gentoo, causing this to be a dead symlink
+	rm -f "${ED}/etc/xdg/menus/cinnamon-applications-merged" || die
+
+	# Ensure authentication-agent is started, bug #523958
+	# https://github.com/linuxmint/Cinnamon/issues/3579
+	insinto /etc/xdg/autostart/
+	doins "${FILESDIR}"/polkit-cinnamon-authentication-agent-1.desktop
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+
+	if ! has_version 'media-libs/gst-plugins-good:1.0' || \
+	   ! has_version 'media-plugins/gst-plugins-vpx:1.0'; then
+		ewarn "To make use of Cinnamon's built-in screen recording utility,"
+		ewarn "you need to either install media-libs/gst-plugins-good:1.0"
+		ewarn "and media-plugins/gst-plugins-vpx:1.0, or use dconf-editor to change"
+		ewarn "org.cinnamon.recorder/pipeline to what you want to use."
+	fi
+}
+
+pkg_postrm() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
--- a/gnome-extra/cjs/Manifest
+++ b/gnome-extra/cjs/Manifest
@ -1 +1,2 @@
 DIST cjs-4.4.0.tar.gz 463019 BLAKE2B af276cd8f9ef0f66a6f4ab3e0072b485e33015e070bb796818907964df0696240b753f7a271bf45db788eb244e0cd1fb866f3b78798adf3ef8f9e76825fc4d74 SHA512 3b2bdc55ab572713d6b6f92978522b290819656f64fef620659065ff5673a04a0585b83a1a0248116570ac1cfee4f54acc228f355c02aa4e0a2a13b59fbafed2
+DIST cjs-4.6.0.tar.gz 463060 BLAKE2B 466f807539ea95eece8b468287582f2c085ce86a63cf37ed1489f6ed20c98dfcb7028c7679102526009b71aba7d737f6f56c9544bc926fbf5a0be540afeaee53 SHA512 b7b457b43b756918670c9acc1064fc5b424d7bb7ab826ec207595c98159f407411ceb6d3043d305570f21f7675e1b699d7e95466688835034e178e079e118dfe
--- a/gnome-extra/cjs/cjs-4.6.0.ebuild
+++ b/gnome-extra/cjs/cjs-4.6.0.ebuild
@ -0,0 +1,74 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools gnome2-utils pax-utils virtualx xdg-utils
+
+DESCRIPTION="Linux Mint's fork of gjs for Cinnamon"
+HOMEPAGE="https://projects.linuxmint.com/cinnamon/"
+SRC_URI="https://github.com/linuxmint/cjs/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )"
+SLOT="0"
+IUSE="+cairo examples gtk test"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="test"
+
+RDEPEND="
+	dev-lang/spidermonkey:52
+	>=dev-libs/glib-2.42:2
+	>=dev-libs/gobject-introspection-1.41.4:=
+	sys-libs/readline:0=
+	dev-libs/libffi:0=
+	cairo? ( x11-libs/cairo[X,glib] )
+	gtk? ( x11-libs/gtk+:3 )
+"
+DEPEND="${RDEPEND}
+	sys-devel/autoconf-archive
+	test? ( sys-apps/dbus )
+"
+BDEPEND="
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	xdg_environment_reset
+	default
+	eautoreconf
+	gnome2_disable_deprecation_warning
+
+	sed -ie "s/'Gjs'/'Cjs'/g" \
+		"${S}"/installed-tests/js/testExceptions.js \
+		"${S}"/installed-tests/js/testEverythingBasic.js || die
+}
+
+src_configure() {
+	# FIXME: add systemtap/dtrace support, like in glib:2
+	# FIXME: --enable-systemtap installs files in ${D}/${D} for some reason
+	econf \
+		--disable-maintainer-mode \
+		--enable-compile-warnings=minimum \
+		--disable-systemtap \
+		--disable-dtrace \
+		$(use_with cairo) \
+		$(use_with gtk)
+}
+
+src_test() {
+	virtx emake check
+}
+
+src_install() {
+	# installation sometimes fails in parallel
+	default -j1
+	find "${D}" -name '*.la' -delete || die
+
+	if use examples; then
+		docinto examples
+		dodoc "${S}"/examples/*
+	fi
+
+	# Required for cjs-console to run correctly on PaX systems
+	pax-mark mr "${ED}/usr/bin/cjs-console"
+}
--- a/gnome-extra/nemo/Manifest
+++ b/gnome-extra/nemo/Manifest
@ -1 +1,2 @@
 DIST nemo-4.4.2.tar.gz 1462269 BLAKE2B 365cd98a05c0c4aa1c86a3e7a565904852bd02d92ace8593043ae8a58f5b9d3eda71e8b0d329a177ed59c0d8f1330ae61f5bcc6671110e82bbd9baad84faa9f0 SHA512 b951c401f93d04061a0ef0accc810ecc7f0487617f089960ab58886a6ca6ecd0af3a98c47e9a620a4d6f8f530a11af9cae20903d089177e69bfa12f9ca31ec5c
+DIST nemo-4.6.5.tar.gz 1468701 BLAKE2B 42b47300782745e4ae98db164ca547b0794caf8f0883db4241f2f0ed2e375e5c8564cff6d878142b55744ce41f49c60aad3f24930398ff68444e32c572d7e9bd SHA512 3c8c95e75e8bc499b56d1fd133f5ccc86ad18dae2219772b732586fd684a4a7a36e51fa61e6b734ad182ffd96636bdf276b8645d049e5ca68795fac274236eb6
--- a/gnome-extra/nemo/metadata.xml
+++ b/gnome-extra/nemo/metadata.xml
@ -16,4 +16,7 @@
 	<upstream>
 		<remote-id type="github">linuxmint/nemo</remote-id>
 	</upstream>
+	<use>
+		<flag name="tracker">Add support for <pkg>app-misc/tracker</pkg> search</flag>
+	</use>
 </pkgmetadata>
--- a/gnome-extra/nemo/nemo-4.6.5.ebuild
+++ b/gnome-extra/nemo/nemo-4.6.5.ebuild
@ -0,0 +1,84 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit meson gnome2-utils python-single-r1 virtualx xdg
+
+DESCRIPTION="A file manager for Cinnamon, forked from Nautilus"
+HOMEPAGE="https://projects.linuxmint.com/cinnamon/"
+SRC_URI="https://github.com/linuxmint/nemo/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+ LGPL-2+ FDL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc exif +nls selinux tracker xmp"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT=test
+
+COMMON_DEPEND="
+	${PYTHON_DEPS}
+	>=dev-libs/glib-2.37.3:2[dbus]
+	>=dev-libs/gobject-introspection-0.6.4:=
+	>=gnome-extra/cinnamon-desktop-4.4:0=
+	>=x11-libs/pango-1.28.3
+	>=x11-libs/gtk+-3.9.10:3[introspection]
+	>=dev-libs/libxml2-2.7.8:2
+
+	gnome-base/dconf:0=
+	>=x11-libs/libnotify-0.7:=
+	x11-libs/libX11
+	>=x11-libs/xapps-1.4.0
+
+	exif? ( >=media-libs/libexif-0.6.20:= )
+	tracker? ( >=app-misc/tracker-2.0:= )
+	xmp? ( >=media-libs/exempi-2.2.0:= )
+	selinux? ( sys-libs/libselinux )
+"
+RDEPEND="${COMMON_DEPEND}
+	x11-themes/adwaita-icon-theme
+	nls? ( >=gnome-extra/cinnamon-translations-4.4 )
+	$(python_gen_cond_dep '
+		dev-python/polib[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+	')
+"
+PDEPEND=">=gnome-base/gvfs-0.1.2"
+DEPEND="${COMMON_DEPEND}
+	x11-base/xorg-proto
+"
+BDEPEND="
+	>=dev-util/gdbus-codegen-2.31.0
+	>=dev-util/intltool-0.40.1
+	sys-devel/gettext
+	virtual/pkgconfig
+	doc? ( dev-util/gtk-doc )
+"
+
+src_prepare() {
+	xdg_environment_reset
+	default
+	python_fix_shebang files/usr/share/nemo/actions
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use exif)
+		$(meson_use tracker)
+		$(meson_use xmp)
+		$(meson_use selinux)
+		$(meson_use doc gtk_doc)
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
--- a/Show More
+++ b/Show More
				`@ -0,0 +1 @@`
				`DIST BrokenAge_linux.tar.gz 2159926882 BLAKE2B 351fd74310ce2a03682151b8112d5831d3d495a6fc9cba68a366205033ce0f35f3446f30ccf98024462f144db3782faf68f73944c814a537cdde8c09f6afbadc SHA512 6642fdae52dc5a22dcbaa1c9db865bfe8dee2365014c1854c53436a1cc4fc842134ad96d9576de221cb494d6e04ea6d30f213c5a62a19f29aaf466740e670284`