Sync with portage [Mon Oct 19 18:06:53 MSK 2020].

4 years ago · 8d54d67617
parent 367d7d4ac3
commit 8d54d67617
195 changed files with 964 additions and 2608 deletions
--- a/30
+++ b/30
@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512

-MANIFEST Manifest.files.gz 29431 BLAKE2B 575eeef7ef2ccf42ab5d5e4ad1cc287b477fc3288de71b32f1a650e604869644f8c0207ce3e462e6752ef764f893bd695323e2e5bb33b226b443c961c6a6625d SHA512 2bd0c363b517b05b334f5e6f7b1f78b283b5c6e0efc4ea175e6330d3b9fdf85f956ee5fefcf3e7fa70c10610dc13c23f0ee61be1a5c22312a2d21f86015b3205
-TIMESTAMP 2020-10-19T05:38:38Z
+MANIFEST Manifest.files.gz 29430 BLAKE2B f5fd656c72930925f407a4ba3647f8377c324a5cadec05921996aa673818187cb68d23b24006694a782242a55b70b4f95460df64ace9d63ecb7f47edf0445b14 SHA512 581cf13b63a10a5ec7702316900be88b326df86d0bfdb6afea5fb95e11f2ae91023194448b0559b064f64e37addda310c69b8fbd9d407f5160bbab55ded42b35
+TIMESTAMP 2020-10-19T14:38:38Z
 -----BEGIN PGP SIGNATURE-----

-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl+NJl5fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl+NpO5fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCQqw//ZeBL6WcDdFbmm8Z+BV4Lmv2NpbUneDvGQ9akZ7civWLO5NwswDHjSa5U
-plbqSV1YbyE9YpcinAcW2KHlBlcRR+TsS3DfyNuPo0QbChBVtuH6VS7t1y9BSDUi
-1clEFhkrxCDaDlCI8KPugb0oR2F7gvVre76xJzWDatPXbc31Thy7Ng9UdwCST6T3
-uzK5ix9PnVtL8voHKpr6+tUSqFeUfEYj6c9vGTE5Xc6qURoF960MsJi1i5i4HqtU
-SnshZvObnCvYlVXcwHCg8xUFjELrrXrQp3wAN4B4hXYcFgaIBfgSLnXSd7Pms18c
-bSsl5FZOEMC79eVbSrsD2HMfpRGMTaGb/aMAUAwgU1Y0UGHy1qox+KzZ2ZGdTDxk
-flc5zCxSoVxzOztc+lyH/2NSiTUUpn/lcaXGgTxOF/5IqiC3eCulvDr9OQJ/hvEW
-wmAHrhSnmCox3w6qhae9w8rrBGXzhjoeTFfXAE4sM3RSMf7hg+FifZYM6ffTLRX4
-cIptECpwQeRBE9Y8UhigtfBUJ+7akjYcxyQRRuU6a7It1Y2hocLFsUATTNgSUK8o
-JHVXpcUOTbMDgr0EdQAjEs0YoxujdF7sNtrWVEU8uddcrsJp+NS8W5RXYSENPeRC
-vKhsiEFgX7MnZUivVHNSOBTNo3PPgo2LtLf+DzmfISpagTkn/3s=
-=Kkza
+klCEphAAlQBKz3MEYxYr6Ep5qxZsIDQ5f3B5p4vDwaKbfimUc/8uJcb+51VWPtz4
+S4JejHV+osnTTIYNzwfJHmUnrggBhrwvUhtxylVyrMnfzkaKHRPKM+p7Zd68OJUF
+hfDTSJ9DNxsiTJSWHp0nxh/j37hP+lypZx57hhe/aSTQy9gFDjPl8+pySakvcHLj
+V/M+YL2UyvOI2URe3d6KdjV3iOJdY7Sj0S8qKKpaNfbaSh/b//nb8wxUDrhhU45a
+QDoBsM6dpjPSD9z4XCQzpuAw3vZY/59SFkGub9h+ptQchiB7Y8hYc0aWGxdFcCfg
+Ux5uMvfejENSd4fXxNsAvtyxlGXFOyul4CKcgdUpYNhxQ2pX0YiO3nOKDMdIh/BM
+bdkaqYkYYqdrpquLckosumX7y1w+TrND86rBtoI8MrLlD6R4gTJD2C4/uN3HOjQ5
+3qBWQ+yCb7Y7z5NVnqbM4y4A96grH1s0tX8KGI2exQAFEpOeQ1F4No3b1ZhGIuic
+7CiUKGpHrwQkTZt1P6v1wPfSHFaOI6qYxtfoG5BgiWjQgX9Livs8l64zn2dxztLD
+i0CrN7mII4+SEhtJRA4gIXolsNXmdbkMAKbwUe42GghPsq1JcnIkJGhsr/5NcMMF
+W/9gpsB12Z4rfsDiN0nksGw0BRQTvt1YPSF0VR0U8lL+pTo/2LA=
+=yLy1
 -----END PGP SIGNATURE-----
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
--- a/app-backup/genbackupdata/Manifest
+++ b/app-backup/genbackupdata/Manifest
@ -1,3 +0,0 @@
-DIST genbackupdata_1.9.orig.tar.xz 14112 BLAKE2B 0d0bb2c68ca473ce5af406547ae42e5a9bdc95a08f7cdb056e0fd1c6539f2485b92fbeca163eabf0c28c93ba787a8fe5e74d54b36a700c0f20798daf62350cf6 SHA512 341c9cfa60f79c5fec7d6b607b2e8080d0768fb9b73622baf48569c91294f537a015ed7a23a57eb0d027dabb6f6d736a8660067e9ef80373a9372d1898043673
-EBUILD genbackupdata-1.9.ebuild 730 BLAKE2B 26b8feb6412d8804544a1d431fc4bfcbed50daed695b722b0a8d3f98f4e615b10b5f3f03b3427ca03c8760141b129d4f90504432b37088e70d51a3f2d9155547 SHA512 7f83af46da14acb68d2471a6f0cc01290b5b86a6a2c2fa1b49dcbf1ef2b9049ab54e01c63ee4cc0e2109cb7872e51f8fee9756121b7edb9365c76e094f43fbf8
-MISC metadata.xml 250 BLAKE2B fe89695d5dcb55e3a59fe901cba061e1b73e5d09cc72d362bb3ec127aecdba741ba23920096bfad7a39c43e35ffbc006fe84f3e50a34c91097a32deceeb91e84 SHA512 c599b09b9aaf744dfe13d0707adde7d3dfd1a8a411e937fcba25e65c6045792cdcf6ceb9004e3dd38b014c486c9f1334bfc898419f59806ec6abebfc71bca382
--- a/app-backup/genbackupdata/genbackupdata-1.9.ebuild
+++ b/app-backup/genbackupdata/genbackupdata-1.9.ebuild
@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads"
-
-inherit distutils-r1
-
-DESCRIPTION="Generate test data for backup software testing."
-HOMEPAGE="https://liw.fi/genbackupdata/"
-#SRC_URI="http://git.liw.fi/cgi-bin/cgit/cgit.cgi/$PN/snapshot/${P}.tar.gz"
-SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV}.orig.tar.xz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="${PYTHON_DEPS}
-	dev-python/cliapp[${PYTHON_USEDEP}]
-	>=dev-python/ttystatus-0.31[${PYTHON_USEDEP}]
-	"
-RDEPEND="${DEPEND}"
-
-src_compile() {
-	addwrite /proc/self/comm
-	distutils-r1_src_compile
-	emake genbackupdata.1
-}
--- a/app-backup/genbackupdata/metadata.xml
+++ b/app-backup/genbackupdata/metadata.xml
@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>robbat2@gentoo.org</email>
-		<name>Robin H. Johnson</name>
-	</maintainer>
-</pkgmetadata>
--- a/app-i18n/Manifest.gz
+++ b/app-i18n/Manifest.gz
--- a/app-i18n/pology/Manifest
+++ b/app-i18n/pology/Manifest
@ -1,3 +0,0 @@
-DIST pology-0.12.tar.bz2 1773467 BLAKE2B 7725b6dcb10c0f14533ee31a3d75c78e4fbd12d79ce21017b16d339a880cb73c47c8801e54f5ca0c49d8f364a12179caf6f4100b6eee5b5c47638f61d47a30d0 SHA512 2e23d1dd0c38cc17826908734adf46fb30c30d58f906fc223e2e9251791dad43d02840ae4eca55e04682af574df45a553ccd83faf85a785a1446f645e4222b4f
-EBUILD pology-0.12-r2.ebuild 1637 BLAKE2B 442bd1b818c343258f31fe93ed4b98a3bb43d5bdcb818bb62557533167f12700d2671b723f12d50b24828fb1adaf5cfa2f93e11c830fca05c1d6a0eeb60abe75 SHA512 780318047c162857ce910e6d5fdfb7b0125a4cf6b39b7c2235091ab3905491e28bd5ac91d18808f474d9dc1be2d588a5963c9137d22fb3eb6985d462b8dccaed
-MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
--- a/app-i18n/pology/metadata.xml
+++ b/app-i18n/pology/metadata.xml
@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
--- a/app-i18n/pology/pology-0.12-r2.ebuild
+++ b/app-i18n/pology/pology-0.12-r2.ebuild
@ -1,70 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-inherit bash-completion-r1 cmake kde.org python-single-r1
-
-DESCRIPTION="A framework for custom processing of PO files"
-HOMEPAGE="http://pology.nedohodnik.net"
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="http://pology.nedohodnik.net/release/${P}.tar.bz2"
-	KEYWORDS="amd64 x86"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-BDEPEND="
-	app-text/docbook-xsl-stylesheets
-	app-text/docbook-xml-dtd:4.5
-"
-RDEPEND="${PYTHON_DEPS}
-	dev-libs/libxml2
-	dev-libs/libxslt
-	$(python_gen_cond_dep '
-		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
-	')
-	sys-devel/gettext
-"
-DEPEND="${RDEPEND}"
-
-# Magic on python parsing makes it impossible to make it parallel safe
-MAKEOPTS+=" -j1"
-
-src_prepare() {
-	cmake_src_prepare
-	sed -e "/DOC_INSTALL_DIR/s/^/#DONT/" -i CMakeLists.txt || die
-	python_fix_shebang .
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DDOC_INSTALL_DIR="${EPREFIX}"/usr/share/doc/${PF}
-		-DCMAKE_DISABLE_FIND_PACKAGE_Epydoc=ON
-		-DCMAKE_DISABLE_FIND_PACKAGE_Pygments=ON
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	python_optimize
-
-	dosym ../../../pology/syntax/kate/synder.xml /usr/share/apps/katepart/syntax/synder.xml
-
-	newbashcomp "${ED}"/usr/share/pology/completion/bash/pology posieve
-	bashcomp_alias {posieve,poediff}{,.py}
-
-	elog "You should also consider following packages to install:"
-	elog "    app-text/aspell"
-	elog "    app-text/hunspell"
-	elog "    dev-vcs/git"
-	elog "    dev-vcs/subversion"
-	elog "    sci-misc/apertium"
-}
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
--- a/app-text/pdf2djvu/Manifest
+++ b/app-text/pdf2djvu/Manifest
@ -1,12 +0,0 @@
-AUX pdf2djvu-0.9.12-poppler-0.76-1.patch 1038 BLAKE2B 5867bf9bb8a9eceec872c6d366bf9acf489c2d7eaaea374115e7c308a58acf1c55ef0f85b0d8326414af2d84d489e5b7aa3c5fd42c8ab860cacad989a50e8c71 SHA512 ce2d2f486ba451e630ec2f7b4763b92f29d5546ced5600ba34205dec9f50cd26d5ed3464a6cec1431935976c3061dc21eccbe899951b5b5826264b8c3b502c5d
-AUX pdf2djvu-0.9.12-poppler-0.76-2.patch 2083 BLAKE2B 6d861148705ca78b03dead9a7e2c1e98039d0bdc5a8e70fafbd6ddb71c428c2df242e74f956ae972cccb73aeb5dbddafc95cbf9a05f5acdb34ac6af3e65d26a4 SHA512 ebe0594918f421cfa396ec0291da9da71f482dc2e869f8dd2374e8638253b150a4896b3c361f5e972dbda03994df18959c2ee9665da63225ec19a98d4ed5fca3
-AUX pdf2djvu-0.9.12-poppler-0.76-3.patch 1127 BLAKE2B 2556851d29ebe02e0e17b3e2fa733a533cbf98b61fa6a20b7fb9f9befe800d2ed0d5826b61d7aa1deade63277ef61173a6080782e0c33d5946fd1fd076c064fe SHA512 07ee2c2b8277d4c9ba90fc192885c299451b20558b3ee5c268030bf21e69e37c0e3f750b1158b9cb927d7504ee2458ced8fb662cb65ad2ecae76d14ae729ce10
-DIST pdf2djvu-0.9.11.tar.xz 291356 BLAKE2B 726d9132c43c7dabdecf1e6174a3f2627db7f6981b3ba1f280ea131272ea0fef38acdaaa0f78ab0c883dd2cd046017edac46bb10d91e10668a6e480322e465fb SHA512 7b47ff4cd3a49f3fa1fec08490a192725899307d9c2a75a65a21d36abcece2f308e56161ec4c4f77f32fbdedcc167520657cad2b06cf178335f7e2169b7ada82
-DIST pdf2djvu-0.9.12.tar.xz 295088 BLAKE2B 6dd8b04f089e464becd7923c96ac2ca35efc28412c1913270c8c85656b58a74a47777b1b5b932d29e3ee2ad4d75bc6bcb85b835e5aa7e9d9c6a0ef7b242b5c46 SHA512 2a3acd8efa682541f45a0650070c0260903dadbd49ac6d4560e2e5ee3c5a68a1310dcb9d170035ee8fec0e588171f2c402047b3d7dc4e7d4033abe95f2ebde74
-DIST pdf2djvu-0.9.15.tar.xz 296208 BLAKE2B 19a88e3d38c80b6a67b5c79b4c9d03b882385ffdf4602a8fcde189bee4d25a70ed8feac7a14310c159327b126607673df57985522b2eff5699e85193729b3529 SHA512 825b1a01ea4fdda8d2354ef5c0702f1deea44a30893bdab3d4292a31a812b093d682c94ad73b85b6bb7dca5d865cc0357e2911aa4edd1133737a14dd102ad34f
-DIST pdf2djvu-0.9.8.tar.xz 268976 BLAKE2B 318ef4fd5677056d2404d769bf54911c9474d6f0f839ef472e121375ee268db31ddaaad2b8ed791ef093d6cb1c665f6431619918ee852e479b4a11a3d7ae0e23 SHA512 5f5330d3d15808b5b6233a15a984d0ebf28619cfb50807a20c8992fed68d17f73d1edd62b1ad7cd3a09d526f6c9f0827e2c5e03d6d7c8ad92c1f106755025f5e
-EBUILD pdf2djvu-0.9.11.ebuild 1252 BLAKE2B b4ccf61994472843536d4997b853f7bb606b2a0c31369d7169831dfc21820a1224847ce690e91a8f08c4e9a8ad8ac9e6633d99a6cf523b7115b1f3da288f06b5 SHA512 c9f91f83aacabfd2ecb3b017ffcdf77fe10303fd0ffedc6edab762571e8b64437d8797bf5bafccaee1e7e07b997e03efda91401d68ec2e80f455a5b13fd91403
-EBUILD pdf2djvu-0.9.12.ebuild 1312 BLAKE2B ea4e4a3f5b9cc7beca80d68da7b8fd6569cbb4a727501c67d851982e02ed95ec0ce96f25f268ddd4d931aefd119c3d4c977cb29aa5e353dc1a5b8e15ff74091c SHA512 2926b385fea89fd0ef7b80b72791469abd3e6624da12d8f0b30c214a3079f8875f9b7dadb2f62b7fbb0c7ae0f9d32e87bdcef265de48e0154a4df9673e78aa25
-EBUILD pdf2djvu-0.9.15.ebuild 1265 BLAKE2B 81aa84f90d49053cd511d461a3f4b6e86f422cf13ade704d5f1a5d02cd948ca4c6fa981df9903168bb82eb701454328b60ff4e17a8931c766026777e218d25e7 SHA512 3b6b17c88e328cd725623ec4eed10ba2878b4594a287dfe51277ce26e635d96315e7d57eeca675c942259f745b5d3cd25156a9628f4416e6b727ac29e9373b27
-EBUILD pdf2djvu-0.9.8.ebuild 1252 BLAKE2B 7d80189ccf17851ceaf235b02235962385a265670d1c295ddc02a857a85370c8a3d259c26810181063be85a646de1f1e9965f6021cac8fdc4f8fc20d2a8177e0 SHA512 12d8383e20649dc250a0fc41875177a3f9bbe7f2bf209d8c0cdd4698da338c08720914acd5b0a9ae283e51ca9a839747773d644cc3d03c65562304648947a148
-MISC metadata.xml 351 BLAKE2B 68816123c075f603535faa42307dfc58066cc7c9db272b1f6004a9e0bba5d71d0a798b5b2fed9d4af704ed5145264b400f406c5b1185e3b759c97c0ccccc05d1 SHA512 98cfb584785e967dfd11dc82da694ccde0031609c28faca492d2384d6257020ebf8ac264dcb512129f5a681455ce3228b9f443aa2aa99197134ed7957901eb06
--- a/app-text/pdf2djvu/files/pdf2djvu-0.9.12-poppler-0.76-1.patch
+++ b/app-text/pdf2djvu/files/pdf2djvu-0.9.12-poppler-0.76-1.patch
@ -1,35 +0,0 @@
-From aa3fdae51c19ad2865f92882ec9007feeb7e477a Mon Sep 17 00:00:00 2001
-From: Jakub Wilk <jwilk@jwilk.net>
-Date: Mon, 1 Apr 2019 08:23:51 +0200
-Subject: [PATCH] Put Ref in pdf namespace.
-
---
- pdf-backend.hh | 1 +
- pdf2djvu.cc    | 2 +-
- 2 files changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/pdf-backend.hh b/pdf-backend.hh
-index 43899c0..d7872c3 100644
--- a/pdf-backend.hh
-+++ b/pdf-backend.hh
-@@ -82,6 +82,7 @@ namespace pdf
-   typedef ::Catalog Catalog;
-   typedef ::GooString String;
-   typedef ::Goffset Offset;
-+  typedef ::Ref Ref;
- 
- /* type definitions — annotations
-  * ==============================
-diff --git a/pdf2djvu.cc b/pdf2djvu.cc
-index 669eba5..d9e1532 100644
--- a/pdf2djvu.cc
-+++ b/pdf2djvu.cc
-@@ -86,7 +86,7 @@ static int get_page_for_goto_link(pdf::link::GoTo *goto_link, pdf::Catalog *cata
-     int page;
-     if (dest->isPageRef())
-     {
-      Ref pageref = dest->getPageRef();
-+      pdf::Ref pageref = dest->getPageRef();
-       page = catalog->findPage(pageref.num, pageref.gen);
-     }
-     else
--- a/app-text/pdf2djvu/files/pdf2djvu-0.9.12-poppler-0.76-2.patch
+++ b/app-text/pdf2djvu/files/pdf2djvu-0.9.12-poppler-0.76-2.patch
@ -1,69 +0,0 @@
-From 8b0348b3d5f33494d7e637411633fbea511a78d7 Mon Sep 17 00:00:00 2001
-From: Jakub Wilk <jwilk@jwilk.net>
-Date: Mon, 1 Apr 2019 08:49:02 +0200
-Subject: [PATCH] Use Catalog::findPage(Ref) as alternative to
- Catalog::findPage(int, int).
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Fixes:
-
-    pdf2djvu.cc: In function ‘int get_page_for_goto_link(pdf::link::GoTo*, pdf::Catalog*)’:
-    pdf2djvu.cc:90:56: error: no matching function for call to ‘Catalog::findPage(int&, int&)’
---
- pdf-backend.cc | 15 +++++++++++++++
- pdf-backend.hh |  2 ++
- pdf2djvu.cc    |  2 +-
- 3 files changed, 18 insertions(+), 1 deletion(-)
-
-diff --git a/pdf-backend.cc b/pdf-backend.cc
-index f1d7662..a1b9b63 100644
--- a/pdf-backend.cc
-+++ b/pdf-backend.cc
-@@ -631,4 +631,19 @@ const char * pdf::get_c_string(const pdf::String *str)
- }
- #endif
- 
-+template <typename C> static auto find_page_impl(C *catalog, pdf::Ref pgref) -> decltype(catalog->findPage(0, 0))
-+{
-+  return catalog->findPage(pgref.num, pgref.gen);
-+}
-+
-+template <typename C> static auto find_page_impl(C *catalog, pdf::Ref pgref) -> decltype(catalog->findPage(pgref))
-+{
-+  return catalog->findPage(pgref);
-+}
-+
-+int pdf::find_page(pdf::Catalog *catalog, pdf::Ref pgref)
-+{
-+  return find_page_impl<pdf::Catalog>(catalog, pgref);
-+}
-+
- // vim:ts=2 sts=2 sw=2 et
-diff --git a/pdf-backend.hh b/pdf-backend.hh
-index d7872c3..d88c956 100644
--- a/pdf-backend.hh
-+++ b/pdf-backend.hh
-@@ -436,6 +436,8 @@ namespace pdf
- 
-   const char * get_c_string(const pdf::String *str);
- 
-+  int find_page(pdf::Catalog *catalog, pdf::Ref pgref);
-+
- }
- 
- #endif
-diff --git a/pdf2djvu.cc b/pdf2djvu.cc
-index d9e1532..21f2d50 100644
--- a/pdf2djvu.cc
-+++ b/pdf2djvu.cc
-@@ -87,7 +87,7 @@ static int get_page_for_goto_link(pdf::link::GoTo *goto_link, pdf::Catalog *cata
-     if (dest->isPageRef())
-     {
-       pdf::Ref pageref = dest->getPageRef();
-      page = catalog->findPage(pageref.num, pageref.gen);
-+      page = pdf::find_page(catalog, pageref);
-     }
-     else
-       page = dest->getPageNum();
--- a/app-text/pdf2djvu/files/pdf2djvu-0.9.12-poppler-0.76-3.patch
+++ b/app-text/pdf2djvu/files/pdf2djvu-0.9.12-poppler-0.76-3.patch
@ -1,38 +0,0 @@
-From 8325358a9769e8aa33693fc5ea2ac771dd82716f Mon Sep 17 00:00:00 2001
-From: Jakub Wilk <jwilk@jwilk.net>
-Date: Tue, 23 Apr 2019 08:23:46 +0200
-Subject: [PATCH] pdf-backend: simplify find_page() implementation.
-
---
- pdf-backend.cc | 16 +++++-----------
- 1 file changed, 5 insertions(+), 11 deletions(-)
-
-diff --git a/pdf-backend.cc b/pdf-backend.cc
-index f6f5267..a94383e 100644
--- a/pdf-backend.cc
-+++ b/pdf-backend.cc
-@@ -631,19 +631,13 @@ const char * pdf::get_c_string(const pdf::String *str)
- }
- #endif
- 
-template <typename C> static auto find_page_impl(C *catalog, pdf::Ref pgref) -> decltype(catalog->findPage(0, 0))
-{
-  return catalog->findPage(pgref.num, pgref.gen);
-}
-
-template <typename C> static auto find_page_impl(C *catalog, pdf::Ref pgref) -> decltype(catalog->findPage(pgref))
-{
-  return catalog->findPage(pgref);
-}
-
- int pdf::find_page(pdf::Catalog *catalog, pdf::Ref pgref)
- {
-  return find_page_impl<pdf::Catalog>(catalog, pgref);
-+#if POPPLER_VERSION >= 7600
-+  return catalog->findPage(pgref);
-+#else
-+  return catalog->findPage(pgref.num, pgref.gen);
-+#endif
- }
- 
- // vim:ts=2 sts=2 sw=2 et
--- a/app-text/pdf2djvu/metadata.xml
+++ b/app-text/pdf2djvu/metadata.xml
@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>printing@gentoo.org</email>
-    <name>Gentoo Printing Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="bitbucket">jwilk/pdf2djvu</remote-id>
-  </upstream>
-</pkgmetadata>
--- a/app-text/pdf2djvu/pdf2djvu-0.9.11.ebuild
+++ b/app-text/pdf2djvu/pdf2djvu-0.9.11.ebuild
@ -1,61 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-any-r1 toolchain-funcs flag-o-matic
-
-DESCRIPTION="A tool to create DjVu files from PDF files"
-HOMEPAGE="http://jwilk.net/software/pdf2djvu"
-SRC_URI="https://github.com/jwilk/${PN}/releases/download/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+graphicsmagick nls openmp test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=app-text/djvu-3.5.21:=
-	>=app-text/poppler-0.16.7:=
-	dev-libs/libxml2:=
-	dev-libs/libxslt:=
-	graphicsmagick? ( media-gfx/graphicsmagick:= )
-"
-DEPEND="${RDEPEND}
-	dev-cpp/pstreams
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	test? (
-		${PYTHON_DEPS}
-		$(python_gen_any_dep 'dev-python/nose[${PYTHON_USEDEP}]')
-	)
-"
-
-REQUIRED_USE="test? ( graphicsmagick )"
-
-DOCS=(
-	doc/{changelog,credits,djvudigital,README}
-)
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	# bug 626874, poppler headers require C++11
-	append-cxxflags -std=c++11
-	default
-}
-
-src_configure() {
-	local openmp=--disable-openmp
-	use openmp && tc-has-openmp && openmp=--enable-openmp
-
-	econf \
-		${openmp} \
-		$(use_enable nls) \
-		$(use_with graphicsmagick)
-}
--- a/app-text/pdf2djvu/pdf2djvu-0.9.12.ebuild
+++ b/app-text/pdf2djvu/pdf2djvu-0.9.12.ebuild
@ -1,65 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-any-r1 toolchain-funcs flag-o-matic
-
-DESCRIPTION="A tool to create DjVu files from PDF files"
-HOMEPAGE="http://jwilk.net/software/pdf2djvu"
-SRC_URI="https://github.com/jwilk/${PN}/releases/download/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+graphicsmagick nls openmp test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=app-text/djvu-3.5.21:=
-	>=app-text/poppler-0.16.7:=
-	dev-libs/libxml2:=
-	dev-libs/libxslt:=
-	graphicsmagick? ( media-gfx/graphicsmagick:= )
-"
-DEPEND="${RDEPEND}
-	dev-cpp/pstreams
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	test? (
-		${PYTHON_DEPS}
-		$(python_gen_any_dep 'dev-python/nose[${PYTHON_USEDEP}]')
-	)
-"
-
-REQUIRED_USE="test? ( graphicsmagick )"
-
-DOCS=(
-	doc/{changelog,credits,djvudigital,README}
-)
-
-PATCHES=(
-	"${FILESDIR}"/${P}-poppler-0.76-{1,2,3}.patch
-)
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	# bug 626874, poppler headers require C++11
-	append-cxxflags -std=c++11
-	default
-}
-
-src_configure() {
-	local openmp=--disable-openmp
-	use openmp && tc-has-openmp && openmp=--enable-openmp
-
-	econf \
-		${openmp} \
-		$(use_enable nls) \
-		$(use_with graphicsmagick)
-}
--- a/app-text/pdf2djvu/pdf2djvu-0.9.15.ebuild
+++ b/app-text/pdf2djvu/pdf2djvu-0.9.15.ebuild
@ -1,64 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-any-r1 toolchain-funcs flag-o-matic
-
-DESCRIPTION="A tool to create DjVu files from PDF files"
-HOMEPAGE="http://jwilk.net/software/pdf2djvu"
-SRC_URI="https://github.com/jwilk/${PN}/releases/download/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+graphicsmagick nls openmp test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=app-text/djvu-3.5.21:=
-	>=app-text/poppler-0.16.7:=
-	dev-libs/libxml2:=
-	dev-libs/libxslt:=
-	graphicsmagick? ( media-gfx/graphicsmagick:= )
-"
-DEPEND="${RDEPEND}
-	dev-cpp/pstreams
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	test? (
-		${PYTHON_DEPS}
-		$(python_gen_any_dep 'dev-python/nose[${PYTHON_USEDEP}]')
-	)
-"
-
-REQUIRED_USE="test? ( graphicsmagick )"
-
-DOCS=(
-	doc/{changelog,credits,djvudigital,README}
-)
-
-PATCHES=(
-)
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	# bug 626874, poppler headers require C++11
-	append-cxxflags -std=c++11
-	default
-}
-
-src_configure() {
-	local openmp=--disable-openmp
-	use openmp && tc-has-openmp && openmp=--enable-openmp
-
-	econf \
-		${openmp} \
-		$(use_enable nls) \
-		$(use_with graphicsmagick)
-}
--- a/app-text/pdf2djvu/pdf2djvu-0.9.8.ebuild
+++ b/app-text/pdf2djvu/pdf2djvu-0.9.8.ebuild
@ -1,61 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-any-r1 toolchain-funcs flag-o-matic
-
-DESCRIPTION="A tool to create DjVu files from PDF files"
-HOMEPAGE="http://jwilk.net/software/pdf2djvu"
-SRC_URI="https://github.com/jwilk/${PN}/releases/download/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+graphicsmagick nls openmp test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=app-text/djvu-3.5.21:=
-	>=app-text/poppler-0.16.7:=
-	dev-libs/libxml2:=
-	dev-libs/libxslt:=
-	graphicsmagick? ( media-gfx/graphicsmagick:= )
-"
-DEPEND="${RDEPEND}
-	dev-cpp/pstreams
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	test? (
-		${PYTHON_DEPS}
-		$(python_gen_any_dep 'dev-python/nose[${PYTHON_USEDEP}]')
-	)
-"
-
-REQUIRED_USE="test? ( graphicsmagick )"
-
-DOCS=(
-	doc/{changelog,credits,djvudigital,README}
-)
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	# bug 626874, poppler headers require C++11
-	append-cxxflags -std=c++11
-	default
-}
-
-src_configure() {
-	local openmp=--disable-openmp
-	use openmp && tc-has-openmp && openmp=--enable-openmp
-
-	econf \
-		${openmp} \
-		$(use_enable nls) \
-		$(use_with graphicsmagick)
-}
--- a/app-text/sgmltools-lite/Manifest
+++ b/app-text/sgmltools-lite/Manifest
@ -1,4 +0,0 @@
-DIST nw-eps-icons-0.0.1.tar.gz 8733 BLAKE2B 467fa3f341c1d6ea20af059cfa88529a0b3bc729cefac72d5b3c264d3a224e8bfb05a89b5f491a22aaf4c194b72cd27ac103a381adb671d9867ef8fceb41f030 SHA512 597062e9882bb9bb73144bbdb056c3ccc2a6d99efc7da836f483ccd6f3799705bcbb897099cb1a580c8e22d936d281d95c3a875694f8e15b6989faf437f6cc7a
-DIST sgmltools-lite-3.0.3.tar.gz 61342 BLAKE2B 8fcac5b48fcdbb8fbbfdbf8ad055ab00cb3fb6a8447a27bf5b14faef968845554a86f04b4984c1ccc1e26d9c64dc5654d5831896bbc44bd3dee0ef3fc28109e5 SHA512 36709ba726859b734a7402c533ba7d2abc0546007bc97dba76ac824bc42f6f8ac7ef263b3740d0be51749cbc0982d010ba938646fca2006fa2c5094a296b3c81
-EBUILD sgmltools-lite-3.0.3-r16.ebuild 2556 BLAKE2B 2832e1838b9cce160538d9c57539d9887a2813f68e92dd59e1f14e8d77692be27092c23d27817574b171ac477a12cb56b0bc6ba525065899cc1a9b41d0c1a67d SHA512 6553c2c8ac76f45a6ca5cdbdccf1575071328c041aa2e695b5a5286c4b6695254c854c01409ffa22d65abdd290e72308f94896a965c8f01a44610664d6aefc66
-MISC metadata.xml 459 BLAKE2B 1a92db84d9abf25e81f6d603fe2b37f68106ebd8485fe7df7983881455826f686f4d923065a14c26e316e55f5a2feb9c244af4b520fdac6dd5f555c565dcc4b9 SHA512 6faa350897ac1a1a3e833ed29c039632333f8874ff0b1f139ffa4a8cbdc21e220357d073ee244665c668ed9c959c93bcd9d471056af75f7a825517436942a413
--- a/app-text/sgmltools-lite/metadata.xml
+++ b/app-text/sgmltools-lite/metadata.xml
@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>mgorny@gentoo.org</email>
-		<name>Michał Górny</name>
-	</maintainer>
-	<use>
-		<flag name="jadetex">
-			Add support for processing tex files produced by the TeX
-			backend of Jade
-		</flag>
-	</use>
-	<upstream>
-		<remote-id type="sourceforge">sgmltools-lite</remote-id>
-	</upstream>
-</pkgmetadata>
--- a/app-text/sgmltools-lite/sgmltools-lite-3.0.3-r16.ebuild
+++ b/app-text/sgmltools-lite/sgmltools-lite-3.0.3-r16.ebuild
@ -1,101 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-single-r1 sgml-catalog-r1
-
-DESCRIPTION="Python interface to SGML software in a DocBook/OpenJade env"
-HOMEPAGE="http://sgmltools-lite.sourceforge.net/"
-SRC_URI="
-	https://downloads.sourceforge.net/project/${PN}/${PN}/${PV}/${P}.tar.gz
-	https://downloads.sourceforge.net/project/${PN}/support%20files/0.0.1-1/nw-eps-icons-0.0.1.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
-IUSE="jadetex"
-
-RDEPEND="${PYTHON_DEPS}
-	app-text/sgml-common
-	app-text/docbook-sgml-dtd:3.1
-	app-text/docbook-dsssl-stylesheets
-	app-text/openjade
-	jadetex? ( dev-texlive/texlive-formatsextra )
-	|| (
-		www-client/w3m
-		www-client/lynx
-	)"
-DEPEND=${RDEPEND}
-
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-src_configure() {
-	econf \
-		--datadir='${prefix}/share' \
-		--mandir='${prefix}/share/man'
-}
-
-src_install() {
-	# yes, it does not respect DESTDIR
-	emake install \
-		prefix="${ED}/usr" \
-		etcdir="${ED}/etc/sgml"
-
-	dodoc ChangeLog POSTINSTALL README*
-
-	insinto /usr/share/sgml/docbook/dsssl-stylesheets/
-	doins -r "${WORKDIR}"/nw-eps-icons-0.0.1/images
-
-	rm "${ED}"/etc/sgml/catalog.{suse,rh62} || die
-
-	# Remove file provided by sgml-common
-	rm "${ED}"/usr/bin/sgmlwhich || die
-
-	# List of backends to alias with sgml2*
-	# Do not provide sgml2{txt,rtf,html} anymore, they are part of
-	# linuxdoc-tools
-	local backends=()
-	if use jadetex; then
-		backends+=(ps dvi pdf)
-	else
-		# Remove the backends that require jadetex
-		rm "${ED}"/usr/share/sgml/misc/sgmltools/python/backends/{Dvi,Ps,Pdf,JadeTeX}.py || die
-	fi
-
-	# Create simple alias scripts that people are used to
-	# And make the manpages for those link to the sgmltools-lite manpage
-	local b
-	for b in "${backends[@]}"; do
-		newbin - "sgml2${b}" <<-EOF
-			#!/bin/sh
-			exec sgmltools --backend=${b} "\${@}"
-		EOF
-
-		dosym sgmltools-lite.1 "/usr/share/man/man1/sgml2${b}.1"
-	done
-
-	insinto /etc/sgml
-	newins - sgml-lite.cat <<-EOF
-		CATALOG "${EPREFIX}/usr/share/sgml/stylesheets/sgmltools/sgmltools.cat"
-	EOF
-
-	python_fix_shebang "${D}"
-	python_optimize "${ED}/usr/share/sgml/misc/sgmltools/python"
-}
-
-pkg_preinst() {
-	# work-around old revision removing it
-	cp "${ED}"/etc/sgml/sgml-lite.cat "${T}" || die
-}
-
-pkg_postinst() {
-	local backup=${T}/sgml-lite.cat
-	local real=${EROOT}/etc/sgml/sgml-lite.cat
-	if ! cmp -s "${backup}" "${real}"; then
-		cp "${backup}" "${real}" || die
-	fi
-	sgml-catalog-r1_pkg_postinst
-}
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
--- a/dev-java/hamcrest-core/Manifest
+++ b/dev-java/hamcrest-core/Manifest
@ -1,7 +1,7 @@
 AUX hamcrest-1.3-empty_generator.patch 1227 BLAKE2B 4e0bc6d085f6d26de9f2da8e09eb061c451a58d99385a2c41be28a137b209783affd76e1e0bd901a5497d40b290ac219d61046fc65931ea056c725ae0f835ee1 SHA512 766f57a449d4535432ab192c40a37ff9a09fe760b06ce5beb6a68b2b804c77ce232e8003fb3f3ef7b71df1cd2ceae7ff13fd3de28d20ec0ced1274c912d414b5
 AUX hamcrest-core-1.3-fix_javadoc.patch 3036 BLAKE2B ee65eb88f113a5f6fd93b49dafb76d8c1c39266f6fb2f220849eeabec7ce5b084d2411c51102fa5b47853aed66acd6d237497c0c8bb2c688c93b7eb0785e27a3 SHA512 f50fe8f2ba32e17118c42e438ef96973f7c04b70321353ed2c19c7ec8f61ba0c801b49920295d0d30add50fb18dbab5cd079b1879f71f4d569b8253ca40b4ce3
 DIST hamcrest-1.3.tgz 3686096 BLAKE2B 38ff91a524064cb00b4d2e82c0a50a2df870bbb0a6e43055f33ce344a1dc8de3760530652691db26aa42890d8517940c038a570b5acaaf91b7e970aca7df3493 SHA512 5672bc627bc71d6fd64b6f776b89ac16ed68819fa4a0748c1250b57f1065c1e7e18ba184d9fe3392e54000ddeb353d0d8d67f4eecdf464974563f05c6b226fc2
-DIST hamcrest-core-1.1.zip 1344232 BLAKE2B de9d346ff12ff29c4d1a13138eb8a80a527865b003f5d738cdfba4927714170720e2a778aecefeb895b82d0c40feeb1980c2ae5ab17a7caf2c27e19a0fcf6188 SHA512 af8d5d3a82df70a446f79f7247252595368820b0b54d8f612aa5b9bb3166c4664b97aaae338278f8f5d84add2d58d9c7a764e5e03a93588d3eba4472eaaa712b
-EBUILD hamcrest-core-1.1-r1.ebuild 726 BLAKE2B 0bf2ceff64edd7c6359d06c2019e34dfea5862c0055f86865162127ed8946dafb71481d7fa37786bc613386cae965df060448841805e8f4c599097e47c09fc9e SHA512 7fa43c784e0ce93356d60704e1e1146fbfb34448252ea9d94849749a6f876a99c830fd3154fa37692fb14b12f2dc67c995b9047e067e968e59ccab04f318dc0c
-EBUILD hamcrest-core-1.3.ebuild 1517 BLAKE2B 7954ea5feca44fcd1b83e8d1a7f90036ff0351f4d7d4519d6fcc3e2d06ee702b3d58bbe6e6227623e745d931bd8e7b8026df54d9cf9724fcf7ee5c774a08ebbf SHA512 436023213e773fa3f92ca941225955b14ce8b8b6e7332a62965f121b735d2e4b3aef01978bc59f288a3a6d1c0e12667da106b0e6675cb70b2e757a99d02e60de
+DIST hamcrest-core-1.1.tar.gz 1247348 BLAKE2B 07b874ca2e61808cd1a30246cbfe7baa220a9c83df7be94dbb50c4df0279bcf906a32cc1b69aed0ebd81d51392af28050d070b7fabb50f8063964b0782b5e105 SHA512 d86080f1ef5982faee728e29675676a89b42a02c4b00783c67be948076e502e70a2b435568502d8ed3c5b1bcc5441b3cdd8817dab841cac537087edeee47632f
+EBUILD hamcrest-core-1.1-r3.ebuild 727 BLAKE2B dab3d360c689e3d084d2d9b07dec1c92233145c07305c2f3714462079b88ef4e833c9c0ee24afa266c29f39b99963ef58ff159f80b616c614e7a48d373c83eff SHA512 10f6bcf35293d321e42924924cb88f9341912e4ceb66a3e4bebfb8b29e7076c00f2166ce416969872f697b787ecf780b7388bceb233ef9a5f9924938b8c3f66e
+EBUILD hamcrest-core-1.3-r1.ebuild 1519 BLAKE2B fa37495a272a3a4e95450fd21e59fefa924b0d6577e71fd6724b935129e2cdc85457b29d09de6c502c783b2cdd97e0b38862b5af79e30f49a87c6103755c301b SHA512 6951d5260fc2de6348ce1271ccbbd1eb140aa083b668c03aba7f43bc4de04c9fad1d5ddb2f75a8668de667fb7138c6d5466bfb027a6a641807e0791dc3fa7b8e
 MISC metadata.xml 363 BLAKE2B 949dd901636266a4874e05a9902cabbfa703b665d96402ffa219ca9dfc6d6bb340518ecab596dac5cf38292b3303ebc63ae0831285cf3e6a3b5379c0ed9b7366 SHA512 7c71d7b035ce5a0a53a33932a8e7c90d2c4749deecb2a6e2b1dbaf7183b2526ad18d2233717f8c405039bf7d87939a544092d8f058f006418b8584caaff8fbf8
--- a/dev-java/hamcrest-core/hamcrest-core-1.1-r3.ebuild
+++ b/dev-java/hamcrest-core/hamcrest-core-1.1-r3.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=5
@ -12,7 +12,7 @@ MY_P="${MY_PN}-${PV}"

 DESCRIPTION="Library of matchers for building test expressions"
 HOMEPAGE="https://github.com/hamcrest"
-SRC_URI="https://github.com/${MY_PN}/JavaHamcrest/archive/${MY_PN}-java-${PV}.zip -> ${P}.zip"
+SRC_URI="https://github.com/${MY_PN}/JavaHamcrest/archive/${MY_PN}-java-${PV}.tar.gz -> ${P}.tar.gz"

 LICENSE="BSD-2"
 SLOT="0"
@ -20,10 +20,10 @@ KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-macos ~x64-solaris"
 IUSE=""

 RDEPEND="
-	>=virtual/jre-1.6"
+	>=virtual/jre-1.8"

 DEPEND="
-	>=virtual/jdk-1.6
+	virtual/jdk:1.8
 	source? ( app-arch/zip )"

 S="${WORKDIR}/JavaHamcrest-${MY_PN}-java-${PV}"
--- a/dev-java/hamcrest-core/hamcrest-core-1.3-r1.ebuild
+++ b/dev-java/hamcrest-core/hamcrest-core-1.3-r1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI="5"
@ -19,11 +19,11 @@ LICENSE="BSD-2"
 SLOT="${PV}"
 KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~ppc-macos ~x64-macos ~x86-macos"

-DEPEND=">=virtual/jdk-1.5
-	~dev-java/hamcrest-generator-${PV}
+DEPEND="virtual/jdk:1.8
+	~dev-java/hamcrest-generator-${PV}:1.3
 	userland_GNU? ( sys-apps/findutils )"

-RDEPEND=">=virtual/jre-1.5"
+RDEPEND=">=virtual/jre-1.8"

 JAVA_ANT_REWRITE_CLASSPATH="true"
 JAVA_ANT_CLASSPATH_TAGS="${JAVA_ANT_CLASSPATH_TAGS} java java-to-jar"
--- a/dev-java/hamcrest-generator/Manifest
+++ b/dev-java/hamcrest-generator/Manifest
@ -1,7 +1,4 @@
-AUX 1.1-build.xml.patch 4213 BLAKE2B cf48828ccc8b46ce9488f79462492a03b1a3ec8b5c0b4a1d86b1b8ff2bc605034bfd70e22df09c82044c12d2d59e508e6d8fb775081c017e5b631214bdd6fd78 SHA512 a4b9bcf15588f41ba39ca5f2d9ab70ee1a19eb295904b4da96f3bf66ad83ca14b38f0866de6689e8f1a2cca0530c90301e2ec7d7a172e880f51be34251a3b18a
 AUX hamcrest-generator-1.3-no_jarjar.patch 982 BLAKE2B 4c09b64a6b824025771682dad6875b8c048f488fd777545d7c8f7219de04193fe40eaea63b7e319d5c00843175f66033e26216f68436c2d99e256fe06218daba SHA512 26b77758ab603b02dde03ec7a51f6b1f1077aa45580e8a21ffa671fc385c54ff00b3a79f8a3be037f28a8b77289d1290493469a1c8c856a9b61846d4cedac58f
-DIST hamcrest-1.1.tgz 1670123 BLAKE2B 2b1242a782949e084374918778c17f20b3b09746521949c12153cf1e599ab38a2a5a2bf0174d9676a8146cfab1e3f7c91a8a1b3ec829dd617f34f92c6852b931 SHA512 07b55c539ffcd3b1d33e94bec518164b95cefa39d96e0c3d02fc97c0a20f71bd8d1dea90a59ffd163e748ed1007b087c3d0d355876a68a429e8e564d0cfd3595
 DIST hamcrest-1.3.tgz 3686096 BLAKE2B 38ff91a524064cb00b4d2e82c0a50a2df870bbb0a6e43055f33ce344a1dc8de3760530652691db26aa42890d8517940c038a570b5acaaf91b7e970aca7df3493 SHA512 5672bc627bc71d6fd64b6f776b89ac16ed68819fa4a0748c1250b57f1065c1e7e18ba184d9fe3392e54000ddeb353d0d8d67f4eecdf464974563f05c6b226fc2
-EBUILD hamcrest-generator-1.1.ebuild 1274 BLAKE2B 717dff6fd73252c1c6d347e3aca112a3f6bd998ba06062c793c251356d59a943b43f73cba2410d2e5f22a341ac4836e4cd8ead1014bb07578cd9b4d59f7b4a1d SHA512 377f209ef46d2754954e01dd969ac04226c464584ec8d92ea76d36cc2ce1462ef49af2b7159dd1da82b8a1481b08fdff5f3973aea1b4652964e4d2c0ecfe48d1
-EBUILD hamcrest-generator-1.3-r1.ebuild 1335 BLAKE2B fb8a85358fb10b39d4ff60cede789cc205f32abecff2d359b5e6de5b8b000e63a4150e70c7392b471c8b86e92df13189fa3ca9ea69f10ef557f5d66ce8afaeaa SHA512 c031ed09243682d55fce77f2ffa8226268e19afa30a8d15b1f8bff3cdbc24fc8bcb6f00d369d67c8e429e6d5634667e269760d9e41d427a7ddf4bc6eb7a6398f
+EBUILD hamcrest-generator-1.3-r2.ebuild 1335 BLAKE2B 4ca588b8727111656c541964dece54669b80f0b2109783b23088d59a77d2e047bb2224cff3f4df1c4c32832a2108b09f6169568407c55e5239f23e10e5ff0f65 SHA512 eff44e5a4f8caaebcf8f7f32a7c455f40b16faf375e4a144f6945aefca6b38b65dfb6f56f88f6e68ec00601f219ed1baae7f7c81b90d8e99942c05feda2d53e3
 MISC metadata.xml 363 BLAKE2B 949dd901636266a4874e05a9902cabbfa703b665d96402ffa219ca9dfc6d6bb340518ecab596dac5cf38292b3303ebc63ae0831285cf3e6a3b5379c0ed9b7366 SHA512 7c71d7b035ce5a0a53a33932a8e7c90d2c4749deecb2a6e2b1dbaf7183b2526ad18d2233717f8c405039bf7d87939a544092d8f058f006418b8584caaff8fbf8
--- a/dev-java/hamcrest-generator/files/1.1-build.xml.patch
+++ b/dev-java/hamcrest-generator/files/1.1-build.xml.patch
@ -1,93 +0,0 @@
-diff --git a/hamcrest-1.1/build.xml b/hamcrest-1.1/build.xml
-index f819d3d..18fba83 100644
--- a/hamcrest-1.1/build.xml
-+++ b/hamcrest-1.1/build.xml
-@@ -28,18 +28,6 @@
-                      classpath="
-                        lib/generator/qdox-1.6.1.jar;
-                      "/>
-        <taskdef name="jarjar"
-                 classname="com.tonicsystems.jarjar.JarJarTask"
-                 classpath="lib/generator/jarjar-1.0rc3.jar"/>
-        <!-- Bundle QDox classes in hamcrest-generator.jar so user doesn't need to care
-             about it's existence. Uses JarJar to place classes under a different package
-             to prevent conflict. -->
-        <jarjar jarfile="build/hamcrest-generator-${version}.jar">
-            <zipfileset src="build/temp/hamcrest-generator-${version}-nodeps.jar"/>
-            <zipfileset src="lib/generator/qdox-1.6.1.jar"/>
-            <rule pattern="com.thoughtworks.qdox.**"
-                  result="org.hamcrest.generator.qdox.@1"/>
-        </jarjar>
-     </target>
- 
-     <target name="core"
-@@ -94,16 +82,16 @@
-                      classpath="build/hamcrest-core-${version}.jar"/>
-     </target>
- 
-    <target name="text"
-            depends="core, library"
-            description="Build text pattern matcher">
-        <java-to-jar srcdir="hamcrest-text/src/main/java"
-                     destjar="build/hamcrest-text-${version}.jar"
-                     classpath="
-                        build/hamcrest-core-${version}.jar;
-                        build/hamcrest-library-${version}.jar"/>
-    </target>
-	
-+    <target name="text"
-+            depends="core, library"
-+            description="Build text pattern matcher">
-+        <java-to-jar srcdir="hamcrest-text/src/main/java"
-+                     destjar="build/hamcrest-text-${version}.jar"
-+                     classpath="
-+                        build/hamcrest-core-${version}.jar;
-+                        build/hamcrest-library-${version}.jar"/>
-+    </target>
-+	
-     <target name="integration"
-             depends="core, library"
-             description="Build integration with external tools">
-@@ -121,7 +109,7 @@
-                      destjar="build/hamcrest-unit-test-${version}.jar"
-                      classpath="
-                         build/hamcrest-core-${version}.jar;
-                        build/hamcrest-library-${version}.jar;
-+                        build/hamcrest-library-${version}.jar;
-         				build/hamcrest-text-${version}.jar;
-                         build/hamcrest-integration-${version}.jar;
-                         build/hamcrest-generator-${version}.jar"/>
-@@ -164,7 +152,7 @@
-         <jar jarfile="build/hamcrest-all-${version}.jar" duplicate="preserve">
-             <zipfileset src="build/hamcrest-core-${version}.jar"/>
-             <zipfileset src="build/hamcrest-library-${version}.jar"/>
-            <zipfileset src="build/hamcrest-text-${version}.jar"/>
-+            <zipfileset src="build/hamcrest-text-${version}.jar"/>
-             <zipfileset src="build/hamcrest-generator-${version}.jar"/>
-             <zipfileset src="build/hamcrest-integration-${version}.jar"/>
-         </jar>
-@@ -221,7 +209,7 @@
- 
- 			<packageset dir="hamcrest-core/src/main/java"/>
- 			<packageset dir="hamcrest-library/src/main/java" excludes="org/hamcrest/internal"/>
-			<packageset dir="hamcrest-text/src/main/java" excludes="**/internal/**"/>
-+			<packageset dir="hamcrest-text/src/main/java" excludes="**/internal/**"/>
- 			<packageset dir="hamcrest-integration/src/main/java"/>
- 			<packageset dir="build/generated-code"/>
- 			
-@@ -251,14 +239,10 @@
-                 </classpath>
-             </javac>
-             <copy file="LICENSE.txt" todir="build/temp/@{destjar}.contents"/>
-            <!-- Put Java source in Jars for user's convenience. -->
-            <copy todir="build/temp/@{destjar}.contents">
-                <fileset dir="@{srcdir}"/>
-            </copy>
-             <jar jarfile="@{destjar}">
-                 <fileset dir="build/temp/@{destjar}.contents"/>
-             </jar>
-         </sequential>
-     </macrodef>
- 
-</project>
-+</project>
--- a/dev-java/hamcrest-generator/hamcrest-generator-1.1.ebuild
+++ b/dev-java/hamcrest-generator/hamcrest-generator-1.1.ebuild
@ -1,52 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="source"
-
-inherit java-pkg-2 java-ant-2
-
-MY_PN="hamcrest"
-MY_P="${MY_PN}-${PV}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Code generator for Hamcrest's library of matchers for building test expressions"
-HOMEPAGE="https://github.com/hamcrest"
-SRC_URI="https://${MY_PN}.googlecode.com/files/${MY_P}.tgz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-
-CDEPEND="dev-java/qdox:1.6"
-
-DEPEND=">=virtual/jdk-1.5
-	userland_GNU? ( sys-apps/findutils )
-	${CDEPEND}"
-
-RDEPEND=">=virtual/jre-1.5
-	${CDEPEND}"
-
-EANT_BUILD_TARGET="generator"
-EANT_TEST_TARGET="unit-test"
-EANT_EXTRA_ARGS="-Dversion=${PV}"
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/build/temp/${PN}-${PV}-nodeps.jar"
-
-java_prepare() {
-	epatch "${FILESDIR}"/${PV}-build.xml.patch
-
-	find -iname "*.jar" -exec rm -v {} + || die "Unable to remove bundled JAR files"
-
-	# These jars must be symlinked.  Specifying them using gentoo.classpath
-	# does not work.
-	java-pkg_jar-from --into lib/generator qdox-1.6 qdox.jar qdox-1.6.1.jar
-}
-
-src_install() {
-	java-pkg_newjar build/temp/${PN}-${PV}-nodeps.jar ${PN}.jar
-
-	dodoc README.txt CHANGES.txt
-
-	use source && java-pkg_dosrc ${PN}/src/main/java/org
-}
--- a/dev-java/hamcrest-generator/hamcrest-generator-1.3-r2.ebuild
+++ b/dev-java/hamcrest-generator/hamcrest-generator-1.3-r2.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI="5"
@ -21,11 +21,11 @@ KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~ppc-macos ~x64-macos ~x86-macos"

 CDEPEND=">=dev-java/qdox-1.12-r1:1.12"

-DEPEND=">=virtual/jdk-1.5
+DEPEND=">=virtual/jdk-1.8
 	userland_GNU? ( sys-apps/findutils )
 	${CDEPEND}"

-RDEPEND=">=virtual/jre-1.5
+RDEPEND=">=virtual/jre-1.8
 	${CDEPEND}"

 EANT_BUILD_TARGET="generator"
--- a/dev-java/oracle-javamail/Manifest
+++ b/dev-java/oracle-javamail/Manifest
@ -1,3 +1,4 @@
 DIST oracle-javamail-1.5.6.zip 1812631 BLAKE2B 9fd43058b10726db9359c4b59fd42226da329268ec4974a510940a4e7d6bd16afc3a3a73b6ee17914cd5d3577c42ddf22f29bc93e2ca185660ea03196ed2bd28 SHA512 3fde7901f5975f4a58d675d94e397bf1a169db227b138bfd684c0e2d0f6522ea1c8e2a5425b23fc08775a6824a9e9e68b2d6e6312f20c53af127f00a897363e2
+EBUILD oracle-javamail-1.5.6-r1.ebuild 1310 BLAKE2B 04cd2e54d916b5d5ceb99e344430400debca7e26e2292ce870244e3ac09a211bf77e50de88ce391f2b4fbf5f28266875f7445772d73398bbcebce5a6cf6f1239 SHA512 1a7df3d904459d0e0ff0c6bd37a05083aa07c00aeab68c5f04793ffa0148ac80af99e801663ad6ad7db1f2403bb765ee2a1d602a87a231bc7652467f6ed7d921
 EBUILD oracle-javamail-1.5.6.ebuild 1258 BLAKE2B a275dffb12bc1bd57feb8477bfab10e51959b3b0ede40e3004b406a24e18a8aba23e2dd9540453e95bae31408714f32c4944fc2e90a382bb8ed326c3480fba1b SHA512 4b4b4b29779215c8502501d8eb823f42aedf43d4020ba8ac90d39630ea1643c4f36ac659b7878a406704df76320d38e0b6dfac7ce1b2f5a32198e5cebc1a4c10
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
--- a/dev-java/oracle-javamail/oracle-javamail-1.5.6-r1.ebuild
+++ b/dev-java/oracle-javamail/oracle-javamail-1.5.6-r1.ebuild
@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="A Java-based framework to build multiplatform mail and messaging applications"
+HOMEPAGE="https://java.net/projects/javamail/pages/Home"
+SRC_URI="https://java.net/projects/javamail/downloads/download/source/javamail-${PV}-src.zip -> ${P}.zip"
+
+# either of these
+LICENSE="CDDL GPL-2 BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND="virtual/jdk:1.8"
+RDEPEND="virtual/jre:1.8"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	default
+
+	# build.xml expects it here
+	mkdir -p legal/src/main/resources/META-INF || die
+	cp mail/src/main/resources/META-INF/LICENSE.txt \
+		legal/src/main/resources/META-INF || die
+}
+
+EANT_DOC_TARGET="docs"
+EANT_EXTRA_ARGS="-Dspec.dir=doc/spec"
+JAVA_PKG_BSFIX="off" #https://bugs.gentoo.org/698954
+
+src_install() {
+	java-pkg_dojar target/release/mail.jar
+
+	dodoc doc/release/{CHANGES,COMPAT,NOTES,NTLMNOTES,README,SSLNOTES}.txt
+	dohtml -r doc/release/{*.html,images}
+
+	use doc && java-pkg_dojavadoc target/release/docs/javadocs
+	use source && java-pkg_dosrc mail/src/main/java
+}
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
--- a/dev-libs/nettle/Manifest
+++ b/dev-libs/nettle/Manifest
@ -5,5 +5,5 @@ DIST nettle-3.6.tar.gz 2288173 BLAKE2B 45e08832e9c337f10d958956545c77f521b747b8a
 EBUILD nettle-3.4.1.ebuild 1790 BLAKE2B 556d39f46ddc010db277004599bc6ac59ee28192b05eb5cc46ca0c1d12349f9255a2548705000e6728a9c9739556665a52800ad5e8f2424c538f28124c0286ff SHA512 b3152d8e5f2569afad23587361ae302846d357f02956b9222642b1f9ae3267b52d6ef0ecf43ae53c0269c0c1cb677d9daf04127be88805417eb9d77eda230bc6
 EBUILD nettle-3.5.1-r1.ebuild 1751 BLAKE2B a6bb47e9a8df3e48403a94e801491b833072bdacbcb6ae84ee806854ea947424452ea16dfebabc5023a7ab7ab72678b8c704f4a003e0bcd420109dc2853cc7ba SHA512 b2f8977f00c4bfa283336978c3376b9fd30b2b19524f97d279ef2109bfdd2354610f6c7872f6c85a366cb198b9b05df66b345d5f8bf10399ac8f6d74a4b0e07a
 EBUILD nettle-3.6-r2.ebuild 1803 BLAKE2B 99529ed7e701fdcb8cb391f9d94f302eb96ec02ebf94bdd49795d92b18d13221a5524f3eab55e9ca4ebcc3b10bfeb7b092b6a183244d4e71feaf390ae23b5762 SHA512 06c5c7922cd14e0448b368884dd7847b1bdc69a4340a0899cace6a18d2887f1016ca4317e866eaa246aade350c874f964ca224ee56085942d94f9a44b08f96ff
-EBUILD nettle-3.6-r3.ebuild 1710 BLAKE2B 520b2fddec6ec91f809c904eca13ea6d12edf1602134d07f8dd01eaa45042313ca146c44198753dc629e101ade32a88be341d7662da28096ebddcb59fe44e590 SHA512 cb00a1bff94806caa7499d65a51aabf81e1667ff86c0892be81927b91ae6e38e4f9459c4170ba1654d397e14c1c6529d2bd7bc68154258ed2c0cd2cd89be6095
+EBUILD nettle-3.6-r3.ebuild 1716 BLAKE2B 623881563c09e6c2c257626d0348eb7d9adc670b44e9a3487290f02de24837ecb506736fc351dc1288e4ff52e08bc3ca8e13840c154a51f54da8c74a978aadc3 SHA512 3cecb277ec6f59f9c5ba355eac6de23f1b02c4c959dadbe07c5eb07b62d6c73a48f50efdbb49d95c7677ec7ff549888409952a5f2f2f009101610d4aa340be03
 MISC metadata.xml 460 BLAKE2B 66da3978fdcd6fb67c2d345578e78768795254f4bb9a8b1ea8236ce99a0516cb2206f77280b5bfc23b98acbbee92bd96c32be12776fd83faa1a670fd10b3f648 SHA512 6a08cf01475e5b46f05ec3fd7d2186b7210501769d2d06780b5d078e1db39c23fd564a8a1c671362eb359c1a88759fb5479cbe757e832507aff81296fd739972
--- a/dev-libs/nettle/nettle-3.6-r3.ebuild
+++ b/dev-libs/nettle/nettle-3.6-r3.ebuild
@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"

 LICENSE="|| ( LGPL-3 LGPL-2.1 )"
 SLOT="0/8-6" # subslot = libnettle - libhogweed soname version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="+asm doc +gmp static-libs test cpu_flags_x86_aes cpu_flags_arm_neon cpu_flags_x86_sha"
 RESTRICT="!test? ( test )"

--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
--- a/dev-python/lxml/Manifest
+++ b/dev-python/lxml/Manifest
@ -2,6 +2,8 @@ AUX lxml-4.5.0-tests-pypy.patch 17429 BLAKE2B d27a093c8419e0a9a8a192c91f0f764868
 AUX lxml-4.6.0-tests-pypy.patch 17417 BLAKE2B fb4c8452f1401c5d617ebbb3a944772c4da72d8261a99d3593c9886ec7c734d145f4919c61d5a4d434a3df942eb30183988965d28407fbfdae6f228c23dd5ab2 SHA512 527d330145491227319cfbf07d176f100b6d61b285a13f3e6fb0c3fb259df697de45ea22e2dd18db7d927cae32219992c542616c4c0120003b796a30974becb5
 DIST lxml-4.5.2.tar.gz 943480 BLAKE2B 11130d2507ff0d61637d7fef2f4b28c5fbbbfe8864504c8f3a231899be4db14e6be65edc6e780719686605663b0c5f76f161beb509dc58d16ee3a9158a7db59c SHA512 146dcb4414b7f0815c5930048d9dc89711bf0a3ee091c89f4475265cdd6f1690a20f82ec24a282a43cff8854f9b960f0cd4430cff79a7506d39ac1baf7770695
 DIST lxml-4.6.0.tar.gz 946217 BLAKE2B c13fa89d1e534d801bcd711850a41f20634d80690d23868904fe5b9e9b42132928345604582a6fc502555adf449b3dc1baed6c9e7a35c7d66af0b9c496facc2f SHA512 b92403b68babac8112ec87989909eb03b75ad365bcd938daef11f4768e95d9bc7a53dae90882d22eeb51bc1a04ae47f8deac504e426b1751826575280655c19e
+DIST lxml-4.6.1.tar.gz 946461 BLAKE2B b1ea8e15af1130b9f9683614bbc2480ec5008ad697f70536a332c1faf4bda4aa9525b2ef5d82d32c415c91e47ab54c7b3cb644e9a2933517946c3fc8ab7ec7c5 SHA512 3cc917e7535ac1be3db8939f72846313267c8b1f0adccc92a2155a160ed7299d0def718bdae1379e42398ca1b959b1130505597febca00f02cb87c8666f1f1c3
 EBUILD lxml-4.5.2-r1.ebuild 2237 BLAKE2B 3a14828b9740d490d9f6df146e69692aefc20ca3610585305c468f63528281f8fc09cb992210d46440b5effebbca3f8c78f902f1621cb777dfcfb94cd5b07e55 SHA512 ef536b193167c0e594bad724c5c7b48283dde809c8457d2f21adafcce238bd37e0e99f06762957fd1df921abdbc733347d448cdea72c3b1d0016fd9312c8ce92
 EBUILD lxml-4.6.0.ebuild 2246 BLAKE2B 4902a146aa0b585d40760067d0feb207941a91ea0813f7cf9023e64e696fd28909a782b824fc690bdf206032a83152776743e47cf799675abb6b4d04b4623fb0 SHA512 726256560efa98f67171697d144f1c2cad00d92bb22876f6b98b2c1c4a5735206b447f78e0510c3849feeff3802cd57dba5060e1b02fe967c2ae57cba16831ab
+EBUILD lxml-4.6.1.ebuild 2246 BLAKE2B 4902a146aa0b585d40760067d0feb207941a91ea0813f7cf9023e64e696fd28909a782b824fc690bdf206032a83152776743e47cf799675abb6b4d04b4623fb0 SHA512 726256560efa98f67171697d144f1c2cad00d92bb22876f6b98b2c1c4a5735206b447f78e0510c3849feeff3802cd57dba5060e1b02fe967c2ae57cba16831ab
 MISC metadata.xml 317 BLAKE2B ba93bbba5105423b6640b86b29f2a54ff50c9daf42424915cfe25049e983ca03c6f2fc066d4e27fe42292e8290b7091bc00d5a40f49d368a3dd6acce42c4504e SHA512 900609bfd7cd032821afb5d1f6e5c25287178f06a49e59431a710d4e76187a2b41a4a0da383d257777a2120b60f15620da37c70d145eca4a84aa30a08b824fae
--- a/dev-python/lxml/lxml-4.6.1.ebuild
+++ b/dev-python/lxml/lxml-4.6.1.ebuild
@ -0,0 +1,81 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
+
+inherit distutils-r1 optfeature toolchain-funcs
+
+DESCRIPTION="A Pythonic binding for the libxml2 and libxslt libraries"
+HOMEPAGE="https://lxml.de/ https://pypi.org/project/lxml/ https://github.com/lxml/lxml"
+SRC_URI="https://github.com/lxml/lxml/archive/${P}.tar.gz"
+S=${WORKDIR}/lxml-${P}
+
+LICENSE="BSD ElementTree GPL-2 PSF-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc examples +threads test"
+RESTRICT="!test? ( test )"
+
+# Note: lib{xml2,xslt} are used as C libraries, not Python modules.
+RDEPEND="
+	>=dev-libs/libxml2-2.9.5
+	>=dev-libs/libxslt-1.1.28"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	dev-python/cython[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/cssselect[${PYTHON_USEDEP}] )
+	"
+
+DISTUTILS_IN_SOURCE_BUILD=1
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.6.0-tests-pypy.patch
+)
+
+python_prepare_all() {
+	# avoid replacing PYTHONPATH in tests.
+	sed -i -e '/sys\.path/d' test.py || die
+
+	# don't use some random SDK on Darwin
+	sed -i -e '/_ldflags =/s/=.*isysroot.*darwin.*None/= None/' \
+		setupinfo.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	if ! python_is_python3; then
+		local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
+	fi
+	tc-export PKG_CONFIG
+	distutils-r1_python_compile
+}
+
+python_test() {
+	cp -r -l src/lxml/tests "${BUILD_DIR}"/lib/lxml/ || die
+	cp -r -l src/lxml/html/tests "${BUILD_DIR}"/lib/lxml/html/ || die
+	ln -s "${S}"/doc "${BUILD_DIR}"/ || die
+
+	"${EPYTHON}" test.py -vv --all-levels -p || die "Test ${test} fails with ${EPYTHON}"
+}
+
+python_install_all() {
+	if use doc; then
+		local DOCS=( README.rst *.txt doc/*.txt )
+		local HTML_DOCS=( doc/html/. )
+	fi
+	if use examples; then
+		dodoc -r samples
+	fi
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "Support for BeautifulSoup as a parser backend" dev-python/beautifulsoup
+	optfeature "Translates CSS selectors to XPath 1.0 expressions" dev-python/cssselect
+}
--- a/dev-python/mss/Manifest
+++ b/dev-python/mss/Manifest
@ -1,3 +1,3 @@
 DIST mss-6.0.0.tar.gz 90010 BLAKE2B 0e4f0a2dbd720d83c496dc3fe618a2fa8057c378426a5b758ccaa931a819a354732d6ec6d220ec02292d08ddc111bbccf89676f32bd124ba084dbf5e4d1287ed SHA512 751fda0fd988ff14e80d7a8bb35c3ae9101a85f4e37dc297b6fc8ac23f7484faf19b07424081183157c7617c95a41f31f74f2dee0ff3bcc8d6bf1a699732af6d
-EBUILD mss-6.0.0.ebuild 764 BLAKE2B 958d4870eebb79d4232aa142a7715e2048bf7cd59d0d46eb3ba9474d25d63fa145446621c14984f5b2393a5045e64166811597e816f1272658268940adc16201 SHA512 8977709f044e19d92614e909da161da29b37b61d7b5a71dfeb49579dcab6f7664ae8ebe1a9cc0c479216fe9f637a6427c6a9dc7105d9385c7afb06b2e247a5a6
+EBUILD mss-6.0.0.ebuild 763 BLAKE2B 36e6e807fc17be6e38c4b9f54fb4de534787d76db17f074eb748ca7823a10fdbbb869b376f5349b65005f2a14b3831031661b3d4f680ac7b2e0d8716ac0795df SHA512 5f88720683c5988908b763742c88df4e67ecea223a9dd8ba6cafa2ab5f0ffcb62df77fc22c36116b8709f922380826072d21bf18621fc66789f46a7c9994e7c4
 MISC metadata.xml 375 BLAKE2B 393138e315b4eae4dacb9339fbb5766e9dbaa84b7482babaddc08d524fb8b9939f6622ee9c6d09b66c61ac270fcc483fac39996a12ba87ccccf7cafd4c6d36db SHA512 9a44b6b9de4d1a61d6af9256519473541d5513cef349c15178c025dee3aaaa3f6772b1be56576411a985fcd9c70029c00743d8f577be8eaec4c5a44646c9cbf6
--- a/dev-python/mss/mss-6.0.0.ebuild
+++ b/dev-python/mss/mss-6.0.0.ebuild
@ -14,7 +14,7 @@ SRC_URI="https://github.com/BoboTiG/python-mss/archive/v${PV}.tar.gz -> ${P}.tar

 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"

 S="${WORKDIR}/python-${PN}-${PV}"

--- a/dev-python/os-xenapi/Manifest
+++ b/dev-python/os-xenapi/Manifest
@ -1,4 +1,4 @@
 DIST os-xenapi-0.3.4.tar.gz 139843 BLAKE2B 333b7af4bc5475584922264ea47a61e6c7a0fd813cd5ed99db1338c74fc86474d190df84ab8732d090668cfa5dc7ec43cfc75283f42a7298aad7d470deec5eb5 SHA512 4e5afbce07d38f93e93ac839eb26927a2436b33a39e14a57ed1e99cbd3501c7d2dec8db7f65617c8d6308e8227e60f5653102ac3a04d9322c0791040fa3f22a9
-EBUILD os-xenapi-0.3.4-r1.ebuild 882 BLAKE2B c78176de8fac9446d45ee74ce6bf04fea2b8fd4175c76825c57ae7c42803e8ba418f54330b58c951a888c25988d80f8b35bd24d9b43f0db727433b0c7a0034ec SHA512 47c0bdcade3503b304b1add00cb33c0122d302fc71de64b5ea5013a60c811c3a50b5a579f8690c532af553d43cab1c815ee8595f509b7c41d71e0e4272cb03d9
+EBUILD os-xenapi-0.3.4-r1.ebuild 915 BLAKE2B 581222a53ef2fc7543d3fd50afe24e8b7dba876280802fe65171d1dc74ad15e6e6f0f2fb5efea0b11cee06aade63aea8debd0f2192cf595bfa057fb05f84dc4b SHA512 3487f2a9a6290c373aaf4e749bf760416a6b1a6a2ce59a03542fb17f7f49ef2d71b082384a8cb4c201a2f94ff3673cb2a52b9e0bffc2a10ae8590d57e707f9e7
 EBUILD os-xenapi-0.3.4.ebuild 878 BLAKE2B 4293e86ce06e9ef84f568733b527945f0dd686f4089048c8413927bb8f0ba0ca312931ee7fa5e353599379801541b66f2a0196d5b70c9433dd875a8560b82c43 SHA512 472484b418dd1bf8a7df456da86f7d55b40f862f009dd495e2081b7b7d53f198b63d05486a01eec2a622247d6eb4370baa65e64b344beab30a9b66b2ae2321bc
 MISC metadata.xml 385 BLAKE2B f9d38f905be85b349d2afbc8c957f4da69f640e1156cf17ea94d64df946e836e7f1d5629f03eff601e625330320e99a1df11dea785bd142e82492beeedbe7a13 SHA512 b8a779ae9c1158dc5d435fdea67f528af82d880b858cacd091d6d9b0e1812cc0c909b46d76396785aeee8f26cb00d5ca53ce38b063c42ae05deb90efd01b586c
--- a/dev-python/os-xenapi/os-xenapi-0.3.4-r1.ebuild
+++ b/dev-python/os-xenapi/os-xenapi-0.3.4-r1.ebuild
@ -3,6 +3,7 @@

 EAPI=7
 PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend

 inherit distutils-r1

--- a/dev-python/pydata-sphinx-theme/Manifest
+++ b/dev-python/pydata-sphinx-theme/Manifest
@ -1,3 +1,3 @@
 DIST pydata-sphinx-theme-0.4.0.tar.gz 3276611 BLAKE2B fb260de2ad40f9a3b5e524ef299a5bf2ee9fbe3f36a0b0e365b53a04702f8a5644154535cfa9f1f3c1deced5de8adbbaf5671488b467d3024b9ae3f60a6f7018 SHA512 abe4924277ec41193019e80a26ccb2ce195741fdae9defc9b500ecc2a63ab9070d1eba5a3398415641ef87ccfe8d573ce6fd10eb069e0f13f09891b5b5e2f932
-EBUILD pydata-sphinx-theme-0.4.0.ebuild 964 BLAKE2B b57702e0af1dca7677f1ed83b6601f7825dd4ba17c5bd9e43bd97a2cf8b317d46a6e9763d40e37f493791fd58f0f56657125571733c34252b9e7e3dd1cfb4803 SHA512 dc0fa97451d3e85dcec6d7b3df5f37a48021bb40c0ee4812eb427695e3e41574481f328a4619a6c8d7091e00f94dc32800e5a7b99b36487ffc12074cd366d538
+EBUILD pydata-sphinx-theme-0.4.0.ebuild 963 BLAKE2B 696f60a0c0a1d9be9ea3d4a1efc8755aeb7a2265d3bddb1a6aff5039f6f5c2e8ffa67fe0f0ea905beefef19b08e0242de5a0bb674f796862f149c078e428c494 SHA512 025bcfcb6d9b871b86bd584d0d252fdc6ce67ec0fa31015f104d56c0852d9fa5ff275e5c3bafa4da7dba1fdf72613136286aed9a21e8bc2e555cb87d51698f32
 MISC metadata.xml 375 BLAKE2B 393138e315b4eae4dacb9339fbb5766e9dbaa84b7482babaddc08d524fb8b9939f6622ee9c6d09b66c61ac270fcc483fac39996a12ba87ccccf7cafd4c6d36db SHA512 9a44b6b9de4d1a61d6af9256519473541d5513cef349c15178c025dee3aaaa3f6772b1be56576411a985fcd9c70029c00743d8f577be8eaec4c5a44646c9cbf6
--- a/dev-python/pydata-sphinx-theme/pydata-sphinx-theme-0.4.0.ebuild
+++ b/dev-python/pydata-sphinx-theme/pydata-sphinx-theme-0.4.0.ebuild
@ -13,7 +13,7 @@ SRC_URI="https://github.com/pandas-dev/pydata-sphinx-theme/archive/v${PV}.tar.gz

 LICENSE="BSD-with-disclosure"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"

 BDEPEND="test? (
 	dev-python/beautifulsoup[${PYTHON_USEDEP}]
--- a/dev-python/scipy/Manifest
+++ b/dev-python/scipy/Manifest
@ -7,7 +7,11 @@ DIST scipy-1.4.1.tar.gz 24555206 BLAKE2B e35f6234404839cbd24d463c8cc2f1ea66aed91
 DIST scipy-1.5.2-html.zip 23166876 BLAKE2B a90d6a2eb25c56147c0c1cccb58cddd230c20cd70dcc5c39b7307acaeac5320ff1c6ed46e3027ec40f604db503a90620cf87212e45f3158c667ec20d95bac649 SHA512 35c675821675844b163eacdaf448173edb78adb5e9f3e438a70809b8b59425a987fd3ed7d6f7863612111ece4a6a36504279ef4492166f5e24a9b2c7ea9d21e7
 DIST scipy-1.5.2-ref.pdf 33462200 BLAKE2B 5784612eb41221a02520778d72341702a7dd4ee8c0147592e170054107219b03af4ccebe1f5e2a57f90f3b892455f95ec45d8eac8e4a7155e21e9ae0526b302f SHA512 15961b7280eb903d2db7a05915b94b3c298cabf68a6694da217680e23fe621885dd169dc88a033ee001a89bc6e6b13ef787ec61009f6ffe38aeaa2dfb84f8a47
 DIST scipy-1.5.2.tar.gz 25423944 BLAKE2B 0a4987da0cde4f33bbb0e2be571b59e9064b1c6554c61c1655100abdecfde54d64845cd30c5b3fcac3ae7426572757aa9a66065dd3b48e6e4cdd4d0ea847868e SHA512 45463df30a0f6270d9f4cf52235f31607904a6ae1375e12600e7f1ab2d27b1dc25a6211b49dceb71506be22c756890adaf9f81d9e6be7455def86c9caf0dc923
+DIST scipy-1.5.3-html.zip 23172844 BLAKE2B eb90cb6d54ff1a6afeff387baccc273df4491a5d37202afa2a8dcebc29ecacf11784e2427fd9b91db954d13c418dae26619d172487515747f49ef6e41f793310 SHA512 cd7131efeccef2095955a3f6d5260d6f3d6d038668d686e556acf87f7aa4d85df576474b4feb7939c3eba51e81dc264590813483427db22038a09164f44f75b0
+DIST scipy-1.5.3-ref.pdf 33463958 BLAKE2B 58939157eb5473278e1cde11a992082824e23220a83c6b3b87f219a12d7449a2290ce845e62d04fdbffb58ab9f6598da153b9ab75a139a071944e73738f19a1f SHA512 66dcb4e507f3f29ad82cc989e93dabe55e7c8147795ed8ed419c15ab50b0d6612e63dd918cab0640ab2085c68b1d14a3981d6da089baa4b4c2d302846aa4c496
+DIST scipy-1.5.3.tar.gz 25234560 BLAKE2B 734f29b7e3f6591b265ec43e173d1303683e2fcfa493cc03d71222fb34ccbc1bb6498d0a9c814d7cb3b08f8d82f06829a2280e46bab733f1c4d6c57742555d70 SHA512 ac65196179663905cf813e023cbbc4c0ef42948425d8190db9218339e23dc3a53e788759f0d7bb986395f8b86f6e97f5de87704ef70445d9f9c10c4ceee8e104
 EBUILD scipy-1.1.0.ebuild 4112 BLAKE2B 1dec8bf858c2051c3ca18bd77759b5add6ee996331e14f1a8c1831be44f5a5b95340bdefccfba44f0753bef43e07ec445e93d2955dce05e305dc5cba505b0846 SHA512 e99d842e6d558907e0e17164edba323e94ff8fe12bbcab8f9c3f840c25a36822f9d507a2fd3ae30870aefbe8e143a2b90155c8c094bb91b62f99b89edf2fa2d2
 EBUILD scipy-1.4.1.ebuild 4150 BLAKE2B 4f7ee074825feb1c58c2d297b6817137c95b2c12b97112adfe4006996e6ca6a20325cc2b7e19c99ba09cf0dd9fc42cec9c917bc3abae0a89e4152a834326c9e6 SHA512 2f7473b792726c709f1a62b2d465168ffeba66891117c1d203f1dc2f1b2de6f9dfd945580e539ffdc2e5d8254bfcd0a05d5abdc0b1216b4e94a5b31f2adeb5bb
 EBUILD scipy-1.5.2.ebuild 4392 BLAKE2B 51188b124be5d4c4c577caf30b8f4c813a4a14be9a51f5fb6238838b6acbb692c9d7b03bfddc09e9a4ec3a7e79b2a9581f7b2ab129ed2bb29d56eca88cbeed31 SHA512 371e38b7c270831675dbd7d5d42062ab0ae985d810fe239cb27e8a0b2c75a40904c6366f25db9f65793507683356b4bfacb5db08416a7803eb27d2933d09f645
+EBUILD scipy-1.5.3.ebuild 4393 BLAKE2B 2275f198af444b4650a3cfedba5920d83953bf93314f281d451fe72cdb3aaaf1cb9b854f5a654e39d2056a8975b081bc79d90cdc58144f5aa10650d706487db5 SHA512 56762eea7116319f68c5e058a40800f461c08726682845b5666db76116c1f315b7a1f5dad0118d36584c798b9b2ec0fd81d171b1d575e574603134f95c089d8f
 MISC metadata.xml 1038 BLAKE2B a17718312d2d1ead8646e838b2704c14a9f21be8c59fbc0cd8544ab45bdb28005443be05f3a9f5671581f0f28e3cf7507131e2baad5e7b128a452d1ca3fae19e SHA512 2ee6a44a4f32d34f52eb1a0bb787907c31d22c15af597c8db8820df72cafcbba72201c5157b60dede7df4ff0ba48847e8f764c5a67a0b7efacabe1b9fa9bd74a
--- a/dev-python/scipy/scipy-1.5.3.ebuild
+++ b/dev-python/scipy/scipy-1.5.3.ebuild
@ -0,0 +1,160 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_REQ_USE="threads(+)"
+
+DOC_PV=${PV}
+
+inherit fortran-2 distutils-r1 flag-o-matic multiprocessing toolchain-funcs
+
+DESCRIPTION="Scientific algorithms library for Python"
+HOMEPAGE="https://www.scipy.org/"
+SRC_URI="
+	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+	doc? (
+		https://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-html-${PV}.zip -> ${PN}-${DOC_PV}-html.zip
+		https://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-ref-${PV}.pdf -> ${PN}-${DOC_PV}-ref.pdf
+	)"
+
+LICENSE="BSD LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="doc sparse test"
+RESTRICT="!test? ( test )"
+
+CDEPEND="
+	>=dev-python/numpy-1.10[lapack,${PYTHON_USEDEP}]
+	sci-libs/arpack:0=
+	virtual/cblas
+	virtual/lapack
+	sparse? ( sci-libs/umfpack:0= )"
+DEPEND="${CDEPEND}
+	dev-lang/swig
+	>=dev-python/cython-0.29.13[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-36[${PYTHON_USEDEP}]
+	dev-python/pybind11[${PYTHON_USEDEP}]
+	virtual/pkgconfig
+	doc? ( app-arch/unzip )
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)"
+RDEPEND="${CDEPEND}
+	dev-python/pillow[${PYTHON_USEDEP}]"
+
+DOCS=( HACKING.rst.txt THANKS.txt )
+
+DISTUTILS_IN_SOURCE_BUILD=1
+
+src_unpack() {
+	default
+	if use doc; then
+		unzip -qo "${DISTDIR}"/${PN}-${DOC_PV}-html.zip -d html || die
+	fi
+}
+
+pc_incdir() {
+	$(tc-getPKG_CONFIG) --cflags-only-I $@ | \
+		sed -e 's/^-I//' -e 's/[ ]*-I/:/g' -e 's/[ ]*$//' -e 's|^:||'
+}
+
+pc_libdir() {
+	$(tc-getPKG_CONFIG) --libs-only-L $@ | \
+		sed -e 's/^-L//' -e 's/[ ]*-L/:/g' -e 's/[ ]*$//' -e 's|^:||'
+}
+
+pc_libs() {
+	$(tc-getPKG_CONFIG) --libs-only-l $@ | \
+		sed -e 's/[ ]-l*\(pthread\|m\)\([ ]\|$\)//g' \
+		-e 's/^-l//' -e 's/[ ]*-l/,/g' -e 's/[ ]*$//' \
+		| tr ',' '\n' | sort -u | tr '\n' ',' | sed -e 's|,$||'
+}
+
+python_prepare_all() {
+	# scipy automatically detects libraries by default
+	export {FFTW,FFTW3,UMFPACK}=None
+	use sparse && unset UMFPACK
+	# the missing symbols are in -lpythonX.Y, but since the version can
+	# differ, we just introduce the same scaryness as on Linux/ELF
+	[[ ${CHOST} == *-darwin* ]] \
+		&& append-ldflags -bundle "-undefined dynamic_lookup" \
+		|| append-ldflags -shared
+	[[ -z ${FC}  ]] && export FC="$(tc-getFC)"
+	# hack to force F77 to be FC until bug #278772 is fixed
+	[[ -z ${F77} ]] && export F77="$(tc-getFC)"
+	export F90="${FC}"
+	export SCIPY_FCONFIG="config_fc --noopt --noarch"
+	append-fflags -fPIC
+
+	local libdir="${EPREFIX}"/usr/$(get_libdir)
+	cat >> site.cfg <<-EOF || die
+		[blas]
+		include_dirs = $(pc_incdir cblas)
+		library_dirs = $(pc_libdir cblas blas):${libdir}
+		blas_libs = $(pc_libs cblas blas)
+		[lapack]
+		library_dirs = $(pc_libdir lapack):${libdir}
+		lapack_libs = $(pc_libs lapack)
+	EOF
+	cat >> setup.cfg <<-EOF || die
+		[options]
+		zip_safe = False
+	EOF
+
+	# Drop hashes to force rebuild of cython based .c code
+	rm cythonize.dat || die
+
+	# TODO
+	sed -e 's:test_magic_square_sparse_no_presolve:_&:' \
+		-i scipy/optimize/tests/test_linprog.py || die
+	sed -e "s:== 'levy_stable':in ('levy_stable', 'crystalball', 'ncf'):" \
+		-i scipy/stats/tests/test_continuous_basic.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	# bug 721860
+	test-flag-FC -fallow-argument-mismatch &&
+		append-fflags -fallow-argument-mismatch
+}
+
+python_compile() {
+	# FIXME: parallel python building fails, bug #614464
+	export MAKEOPTS=-j1
+
+	${EPYTHON} tools/cythonize.py || die
+	distutils-r1_python_compile \
+		${SCIPY_FCONFIG}
+}
+
+python_test() {
+	# fails with bdist_egg. should it be fixed in distutils-r1 eclass?
+	distutils_install_for_testing ${SCIPY_FCONFIG}
+	cd "${TEST_DIR}/lib" || die "no ${TEST_DIR} available"
+	PYTHONPATH=. "${EPYTHON}" -c "
+import scipy, sys
+r = scipy.test('fast', verbose=2)
+sys.exit(0 if r else 1)" || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && \
+		local DOCS=( "${DISTDIR}"/${PN}-${DOC_PV}-ref.pdf ) \
+		local HTML_DOCS=( "${WORKDIR}"/html/. )
+	distutils-r1_python_install_all
+}
+
+python_install() {
+	distutils-r1_python_install ${SCIPY_FCONFIG}
+	python_optimize
+}
+
+pkg_postinst() {
+	elog "You might want to set the variable SCIPY_PIL_IMAGE_VIEWER"
+	elog "to your prefered image viewer. Example:"
+	elog "\t echo \"export SCIPY_PIL_IMAGE_VIEWER=display\" >> ~/.bashrc"
+}
--- a/dev-python/sentry-sdk/Manifest
+++ b/dev-python/sentry-sdk/Manifest
@ -4,10 +4,12 @@ DIST sentry-sdk-0.17.7.tar.gz 184034 BLAKE2B de71b2e270594abe2e16d7e2fb9db3028e3
 DIST sentry-sdk-0.17.8.tar.gz 184271 BLAKE2B d34f881632e66d5db5cad0c6979de6c3c6205119af30b34996122ff7aff1ed7c3dd0c1603e57163f5d72c8525921f9af7c3e1c729adb14b43dbcee0aa4bd9fc5 SHA512 84ae0ca888457ed833b416320c45040e522a656d7c3ca0d64639f179e7be3237f53cfe4827e986a50d37bd7b61da765ed8c00ea663d478874cc47623ccf47a51
 DIST sentry-sdk-0.18.0.tar.gz 186389 BLAKE2B f531d68a1244c34d267cb332263c996afad31f7f72710b868e14850f06de6225a11fc37dca9ff820fc14d2f1b29919cfb10f59b7dc4449c0734458c6bd1b9816 SHA512 4c78418392668b1e061f0d6b88d3cc3511db138a99b08df50d2e610a7d8a5528ad83943ef1cfda8d508cb3b52f511f872ac87439460254a6b28348c9bb92406c
 DIST sentry-sdk-0.19.0.tar.gz 186477 BLAKE2B 67e538526d39f814827f2d53ca2b8f59f1a3f13e3a0622e5a1ae8870c04d320dadac2c93e8afa786b47feb9295e6e50beb831112448ab89a1eaae750895378df SHA512 5bf598af1fd7a565fd20f38a3e4961136fc2d102cdb9810cb43802e696897669ae679d82dec14cef5cdf0d3ee9dc7a3def39457b733b1018dd91f82066e2422f
+DIST sentry-sdk-0.19.1.tar.gz 186747 BLAKE2B ae26751ac2e640b86b3c7426829e699cfdbd1c35e70edf0f1f835e35da82f658990a5f61adc4e7b93b032f6c9824d0df90bb2146f125c1fb846c3436228d5516 SHA512 dd4234a36920893e55026ba5ab8b1476cbc91b035a4b4c78f9dcf29cc8e232dc49c6f7312b8fb3d64cf469552d08ef5cadb65d3a7fb58ba73b87e43375c27c8d
 EBUILD sentry-sdk-0.16.3.ebuild 621 BLAKE2B d2ffc79e8d2ec8daad9d01f0120760c3d1225bfebf1162cd5246bb1b7ddc5f176e6ba1b272701cb5b3a99aefe171f660cafa6be0e8594a65c0e7d2d803fb199f SHA512 32df9a79cf7988ae3687264f2ab7eca66af45447886e5e7cd33de8218373b49eb3222bb5cd30fa64648c46dbc6453176e555a27a94e1388d3d6295fe3c8060b8
 EBUILD sentry-sdk-0.17.6.ebuild 2705 BLAKE2B a5750df9d8da0160089bffc496d716dd427d772dc998fe00916c424fb8f21697557247cb5751404747277ff96a00a45b6708aadfef7777784d5c2f0628eb8160 SHA512 077901b2c5c659bffb6c0191dd779c6744df98b7bfc2e5204bfdb05c43fbd98129f5b5e71cebdcaa3a7cb01034416c4071e2bf06fbcc72a0573530f35be89616
 EBUILD sentry-sdk-0.17.7.ebuild 2705 BLAKE2B a5750df9d8da0160089bffc496d716dd427d772dc998fe00916c424fb8f21697557247cb5751404747277ff96a00a45b6708aadfef7777784d5c2f0628eb8160 SHA512 077901b2c5c659bffb6c0191dd779c6744df98b7bfc2e5204bfdb05c43fbd98129f5b5e71cebdcaa3a7cb01034416c4071e2bf06fbcc72a0573530f35be89616
 EBUILD sentry-sdk-0.17.8.ebuild 2705 BLAKE2B a5750df9d8da0160089bffc496d716dd427d772dc998fe00916c424fb8f21697557247cb5751404747277ff96a00a45b6708aadfef7777784d5c2f0628eb8160 SHA512 077901b2c5c659bffb6c0191dd779c6744df98b7bfc2e5204bfdb05c43fbd98129f5b5e71cebdcaa3a7cb01034416c4071e2bf06fbcc72a0573530f35be89616
 EBUILD sentry-sdk-0.18.0.ebuild 2705 BLAKE2B a5750df9d8da0160089bffc496d716dd427d772dc998fe00916c424fb8f21697557247cb5751404747277ff96a00a45b6708aadfef7777784d5c2f0628eb8160 SHA512 077901b2c5c659bffb6c0191dd779c6744df98b7bfc2e5204bfdb05c43fbd98129f5b5e71cebdcaa3a7cb01034416c4071e2bf06fbcc72a0573530f35be89616
 EBUILD sentry-sdk-0.19.0.ebuild 2705 BLAKE2B a5750df9d8da0160089bffc496d716dd427d772dc998fe00916c424fb8f21697557247cb5751404747277ff96a00a45b6708aadfef7777784d5c2f0628eb8160 SHA512 077901b2c5c659bffb6c0191dd779c6744df98b7bfc2e5204bfdb05c43fbd98129f5b5e71cebdcaa3a7cb01034416c4071e2bf06fbcc72a0573530f35be89616
+EBUILD sentry-sdk-0.19.1.ebuild 2705 BLAKE2B a5750df9d8da0160089bffc496d716dd427d772dc998fe00916c424fb8f21697557247cb5751404747277ff96a00a45b6708aadfef7777784d5c2f0628eb8160 SHA512 077901b2c5c659bffb6c0191dd779c6744df98b7bfc2e5204bfdb05c43fbd98129f5b5e71cebdcaa3a7cb01034416c4071e2bf06fbcc72a0573530f35be89616
 MISC metadata.xml 446 BLAKE2B d115ce1b9a1d92cfeb93cd220c96247f1d6ae9514b0d598a0abc9fc6b17e45851a33e6f61b364f682f6530e4ac2611fd0a65b2fb5b21d394e78030f6ef34d1fa SHA512 f7167d56812496468a0766bf6e7d29b99e5efcef8cd61723ed7b09188b515b50fa13275d665f7ff8400b5b451e05ddcec403cc4c75e55509b21b849cafde0a3e
--- a/dev-python/sentry-sdk/sentry-sdk-0.19.1.ebuild
+++ b/dev-python/sentry-sdk/sentry-sdk-0.19.1.ebuild
@ -0,0 +1,85 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python client for Sentry"
+HOMEPAGE="https://getsentry.com https://pypi.org/project/sentry-sdk/"
+SRC_URI="https://github.com/getsentry/sentry-python/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/sentry-python-${PV}"
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+RDEPEND="
+	dev-python/urllib3[${PYTHON_USEDEP}]
+	dev-python/certifi[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/asttokens[${PYTHON_USEDEP}]
+		<dev-python/dnspython-2[${PYTHON_USEDEP}]
+		dev-python/executing[${PYTHON_USEDEP}]
+		dev-python/eventlet[${PYTHON_USEDEP}]
+		dev-python/fakeredis[${PYTHON_USEDEP}]
+		dev-python/flask-login[${PYTHON_USEDEP}]
+		dev-python/gevent[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+		dev-python/pyrsistent[${PYTHON_USEDEP}]
+		dev-python/pytest-aiohttp[${PYTHON_USEDEP}]
+		dev-python/pytest-forked[${PYTHON_USEDEP}]
+		dev-python/pytest-localserver[${PYTHON_USEDEP}]
+		dev-python/werkzeug[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/aiocontextvars[${PYTHON_USEDEP}]
+			dev-python/contextvars[${PYTHON_USEDEP}]
+		' python3_6)
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local deselect=(
+		# tests require Internet access
+		--deselect tests/integrations/stdlib/test_httplib.py
+		--deselect tests/integrations/requests/test_requests.py
+		# wtf is it supposed to do?!
+		--deselect tests/integrations/gcp/test_gcp.py
+		# fails on py3.6, hangs on py3.7+
+		--deselect
+		'tests/test_transport.py::test_transport_works[eventlet'
+		# TODO
+		--deselect
+		'tests/test_basics.py::test_auto_enabling_integrations_catches_import_error'
+		--deselect
+		tests/test_client.py::test_databag_depth_stripping
+		--deselect
+		tests/test_client.py::test_databag_string_stripping
+		--deselect
+		tests/test_client.py::test_databag_breadth_stripping
+		# test_filename: apparently unhappy about pytest being called pytest
+		--deselect 'tests/utils/test_general.py::test_filename'
+		# test_circular_references: apparently fragile
+		--deselect
+		'tests/integrations/threading/test_threading.py::test_circular_references'
+	)
+	[[ ${EPYTHON} == python3.6 ]] && deselect+=(
+		# broken with contextvars on py3.6
+		--deselect
+		'tests/utils/test_contextvars.py::test_leaks[greenlet]'
+		--deselect
+		'tests/test_transport.py::test_transport_works[greenlet'
+	)
+
+	# Prevent tests/integrations/modules/test_modules.py:test_basic failure
+	# Needs to detect sentry-sdk in the installed modules
+	distutils_install_for_testing
+
+	pytest -vv "${deselect[@]}" || die "Tests failed with ${EPYTHON}"
+}
--- a/dev-python/sphinxcontrib-spelling/Manifest
+++ b/dev-python/sphinxcontrib-spelling/Manifest
@ -1,7 +1,9 @@
 DIST sphinxcontrib-spelling-5.1.2.tar.gz 22962 BLAKE2B c7b15289b4b6dce5e6c5fb529c4be2cd7c1f41d8bfc6ac86daf1a982f711bd2c426d9b3a615471538fe221197b64ccd907efd4620ea2440f6ec07b2a078d6bee SHA512 4a0398b7c79a035e12d9ae96100fcaa4df42aeae07a01a73f7d875ba04fbbeb3d7441c9debe77491876d78b0a3753677cff4cb3a575e3490364fe5780f5a70b2
 DIST sphinxcontrib-spelling-5.3.0.tar.gz 45665 BLAKE2B c44c8c2621aecd74734c6137e1344a763e99fb61b3ce882c8ea70364df17a7e2fac49acc8878753cab1b70df2cf084de5087bed77f8b1bffe311410ecec3504d SHA512 8f3c4718877e55b0ebcd3d8c0f078a6c06c27c2cdd3cc557fd2e0e990f0c8956179fd9a8b3135b280973e45c0c8657f71372746ef4b55319078db8f16c7e00e9
 DIST sphinxcontrib-spelling-5.4.0.tar.gz 46823 BLAKE2B 8303a97b87d953a37db4548d895559baf93969c11f8417aafeb67804ec537f9ea028bcbf6a56eb3290f13871a782dcde142b1927865a6f9eefd5a20dc53061b1 SHA512 7e0fe6289f9482982825a1204c926490a1e31dc85e25e6418ba47f5575430875e3df5f77202ad458044b810bc2a29f989e6bc6f0c9b4934af938716a4ab887f0
+DIST sphinxcontrib-spelling-6.0.0.tar.gz 46607 BLAKE2B f5283fe16c8e72eea3a79b1a54036bb1a9b87857a1ba19082ed486c0bf87ea474fcbc7e1930449bb2b61b3c9c7f3e69de94bbe187927571d06ef7ce3adabf5cc SHA512 bd2725740ab5b7b225f66d45a811ae7d282859f182d2088ad4b4f1314fdccf464eddf2e534207bca467bddf0df2fcd5f8abc52a90cf0135ac15231d14c363c25
 EBUILD sphinxcontrib-spelling-5.1.2.ebuild 941 BLAKE2B d7a4baf4284165354c8689e49e1f9c35d856c2e8bc2d207db2a30b358daefa72a9b70ee7f37b19f0b184646e3f9d6f505e93c55bd7045f229f3c5752f1e3e99e SHA512 70cfa8fd9fd9c229b4b1e3f48016e28e4ca1a5355a47fab5cef9163b3560b76d6483407ddb264189a03c07e72a863658b5f5031fceca6dc74d746565276b5e93
 EBUILD sphinxcontrib-spelling-5.3.0.ebuild 1120 BLAKE2B fd891f4242e64cd52b7492513760e326af4ee401617fbf980ff433f6b03eaf031d1adef4cda1d5d55475789dd7eed2de536395e90cdbf552a8ebc2d4ee857aed SHA512 a1b57522cf62a4a5f52462654a30dbd5860b7b2642f2e6d0ced2d4ec0d8ef07c7e0693f4841d3e6a878b3bec14e429a1ba9e4217523d9480c4ee6934575ab747
 EBUILD sphinxcontrib-spelling-5.4.0.ebuild 1318 BLAKE2B 94d5b822ee8a7abc29cf8a61f2a758d602147960e8aa67eec41925ea8106423a024b55a63cda506dc5903b5e9bc453114232b793eaccf19c525e24d04b7e35fa SHA512 1089c1a310080fa7f15884a9cd7816f373149000ab5750547015637d29db8ecf8e29cf9d9354466a3eefe9d0a2555c425d0e68cde8081e094d2029744ac009c7
+EBUILD sphinxcontrib-spelling-6.0.0.ebuild 1295 BLAKE2B 523e40ad0b5278f8dc00b12810d8b2f2aed0f61e0e65b8eead0c3d0d2a5bdd32518a53bd3ab9847a6703dbb8a958b38b225c9427e9267f3cb0ca9cf5218dc44d SHA512 ab1e4b927bffee054c17e3b84f97707abdc53cace491bf0adf4d77203e30c428ef7955bbd4eac07c9e04c438f2574f9296cd1d82bb404488cbf332f8b0abed6d
 MISC metadata.xml 450 BLAKE2B a64fc81ee1b159f6ad2d8fe754cfbb8be207a77d128d01cb7cc0d46b6ba4deea1e49e49654a6b0759699d4dbddcede66cb38457c0b476e4120eb3bd5d34cd37b SHA512 0decb41e64275e11d327f2025732865ac4469b7dffe45386b100f6813df5554e71097bd957f57331856d64c9c8c89ad371abfbb25e0db54f3bf7efe2c85ad1ec
--- a/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-6.0.0.ebuild
+++ b/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-6.0.0.ebuild
@ -0,0 +1,52 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Sphinx spelling extension"
+HOMEPAGE="https://github.com/sphinx-contrib/spelling"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_metadata-1.7.0[${PYTHON_USEDEP}]
+	' python3_{6,7})
+	dev-python/pyenchant[${PYTHON_USEDEP}]
+	dev-python/sphinx[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/pbr[${PYTHON_USEDEP}]
+	test? (
+		app-dicts/myspell-en
+	)
+"
+
+# The doc can only be built from a git repository
+distutils_enable_tests pytest
+
+# We don't want distutils_enable_tests to add the namespace
+# package to BDEPEND under "test?". Therefore we add it to RDEPEND
+# after running distutils_enable_tests.
+RDEPEND+="
+	dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	# Needs to be run from a git repository
+	sed -i 's/test_contributors/_&/' \
+		tests/test_filter.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	find "${ED}" -name '*.pth' -delete || die
+}
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
--- a/dev-ruby/bluecloth/Manifest
+++ b/dev-ruby/bluecloth/Manifest
@ -1,3 +0,0 @@
-DIST bluecloth-2.2.0.gem 94208 BLAKE2B e2fd3eaeebbbe365ebe076c3027ba1528c11e036eada18c9b6aecc2f0b1f389aa23c4072fbeba6ac2d86831943e3d6710308ad9d26d7c29a9ab571a7b5c52b98 SHA512 498ffc9eddd47ded1df5c60e8ae8647de1e0376c7787c42dad2450c15a237b01a734bd0a2742c56cb59831cddc5b35c88e954abc0a087fc803ce4890c07c2852
-EBUILD bluecloth-2.2.0-r3.ebuild 1155 BLAKE2B 71aeb5378c396f346a0fea63a8636132f8486193df611c134ddb7ce755bc9f8967014b90ce2f6c1621b2b6a7724dcdde25b97e66f7a39e12c456985cae3cea0d SHA512 f75b6649cc409d60ca6ebeb4ef706f52e42dc171bad3e0acd9a44bb62cd2cd7edd6e31bb21f55eb52009dba6fe0dfb629aaa27d8e8c285cd23260f3754b37e77
-MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
--- a/dev-ruby/bluecloth/bluecloth-2.2.0-r3.ebuild
+++ b/dev-ruby/bluecloth/bluecloth-2.2.0-r3.ebuild
@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="History.rdoc README.rdoc"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-
-inherit multilib ruby-fakegem eutils
-
-DESCRIPTION="A Ruby implementation of Markdown"
-HOMEPAGE="http://www.deveiate.org/projects/BlueCloth"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE="test"
-
-DEPEND+=" doc? ( dev-lang/perl )"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/diff-lcs
-		dev-ruby/tidy-ext
-	)"
-
-all_ruby_prepare() {
-	# for Ruby 1.9.2 and 2.2.x compatibility
-	sed -i -e '1i $: << "."' \
-		-e 's/Config/RbConfig/' Rakefile || die
-}
-
-each_ruby_configure() {
-	${RUBY} -Cext extconf.rb || die
-}
-
-all_ruby_compile() {
-	pod2man --center --release --name bluecloth --utf8 bluecloth.1.pod bluecloth.1 || die
-
-	all_fakegem_compile
-}
-
-each_ruby_compile() {
-	emake -Cext
-	cp ext/bluecloth_ext$(get_modname) lib/ || die
-}
-
-all_ruby_install() {
-	doman man/man1/bluecloth.1
-
-	all_fakegem_install
-}
--- a/dev-ruby/bluecloth/metadata.xml
+++ b/dev-ruby/bluecloth/metadata.xml
@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>ruby@gentoo.org</email>
-	<name>Gentoo Ruby Project</name>
-</maintainer>
-</pkgmetadata>
--- a/dev-ruby/calendar_date_select/Manifest
+++ b/dev-ruby/calendar_date_select/Manifest
@ -1,3 +0,0 @@
-DIST calendar_date_select-2.1.2.gem 22016 BLAKE2B 3cd19112e1d6f3acd9c3543a39b650c753803f3aee4581562cfe5625cdbc1593fbdae45ef2caa15391e6b4caaaa98f9563a70240f45a7806772bcaaec4a5f7f8 SHA512 99d4cadd8b58c49882767787a1c04d1238f2679e6034a1705d24dfc1d1830c9101028b583f36b8fa3403e58ad1b995ead4fe33cda42dd16cbe17d435c1198af1
-EBUILD calendar_date_select-2.1.2.ebuild 659 BLAKE2B 29b6f72acfbfe55a999691af90f966f748b8ceafddbec44a6e4505c4701dd62ab62159f64740e1412df205c269ed1bc15019010b91aba4214225f0bfe288cdc5 SHA512 ec501f659544cf016424ec6718d1626d5e85640d7dc3a2b257af6140a93eb2bb598a05d29cb74638aeb854c05fce8d2b0d6e253b7190a40a6d060065e04c6b47
-MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
--- a/dev-ruby/calendar_date_select/calendar_date_select-2.1.2.ebuild
+++ b/dev-ruby/calendar_date_select/calendar_date_select-2.1.2.ebuild
@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-# There are no unit tests, only integration tests against a full Rails
-# 3.2 application. Skipping those for now due to difficulty in getting
-# all dependencies right.
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_EXTRAINSTALL="app"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A popular and flexible JavaScript DatePicker for RubyOnRails"
-HOMEPAGE="https://github.com/timcharper/calendar_date_select"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/rails-3.1:*"
--- a/dev-ruby/calendar_date_select/metadata.xml
+++ b/dev-ruby/calendar_date_select/metadata.xml
@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>ruby@gentoo.org</email>
-	<name>Gentoo Ruby Project</name>
-</maintainer>
-</pkgmetadata>
--- a/dev-ruby/capistrano-stats/Manifest
+++ b/dev-ruby/capistrano-stats/Manifest
@ -1,3 +0,0 @@
-DIST capistrano-stats-1.1.1.gem 7168 BLAKE2B cad6fbe0119af877b4398c2e6d0c6319ac82b5c6f8e45b8a28c523ecf6b2ed2cb366dbcc0424dbc6c97b9b1030f7af856457b9d2a9258c8147410cf0e5264398 SHA512 d7198052dba1f518a972b4d9e4656b23b226222c58c4898745abf90876722f1040d0f0acce07d97aa090b77d4c7655ce300f73dd0d6f55666e551862a13b7e2b
-EBUILD capistrano-stats-1.1.1.ebuild 435 BLAKE2B 17effc8138aed024b523b5c420665f054fd7c89ff440d8f11553c832fef05f71fc1d47c67369c6ae3612539ddf86abc71256450fb3a4d86cbf82033df0207151 SHA512 7a4e853710062d35ab91c0b122cdd239f059c159b64b5c1bf24ee5277389e9f5600784d325977e50fa1591f15068c20865791fb17cfa418fbc2653a20bec99b2
-MISC metadata.xml 395 BLAKE2B de7df6f620f49f99e10fb18c145f58369dc5cbb85b70a2c10fa05c8bb12fd8700ee5fc57fe1c695fe8be2625f82d7b96e1b9bfb24af23eb7776231c763ac64c3 SHA512 c969db304610c45088a5efac1e694bc7ccfcf0360631fa43fe10f48ea045f6c400ec6cf3faa97e153b95133a1d1e1ebc9fca48c1d3ea1b63f73bb33d5546bc28
--- a/dev-ruby/capistrano-stats/capistrano-stats-1.1.1.ebuild
+++ b/dev-ruby/capistrano-stats/capistrano-stats-1.1.1.ebuild
@ -1,21 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_EXTRAINSTALL="tasks"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Official metrics to help the development direction of Capistrano"
-HOMEPAGE="http://metrics.capistranorb.com/"
-
-LICENSE="MIT"
-SLOT="1"
-KEYWORDS="~amd64"
-IUSE=""
--- a/dev-ruby/capistrano-stats/metadata.xml
+++ b/dev-ruby/capistrano-stats/metadata.xml
@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>ruby@gentoo.org</email>
-	<name>Gentoo Ruby Project</name>
-</maintainer>
-<longdescription>
-Capistrano is a utility and framework for executing commands in parallel on
-multiple remote machines, via SSH.
-</longdescription>
-</pkgmetadata>
--- a/dev-ruby/expression_parser/Manifest
+++ b/dev-ruby/expression_parser/Manifest
@ -1,3 +0,0 @@
-DIST expression_parser-0.9.0_p20130518.tar.gz 4212 BLAKE2B 10974bff0b671f6105bc38356d1681e9673b96ddf62278b68e4327d5db8505d468a32699f15966b02600368f842b3baf4ebadb6eb203ee53c3568c2d7bc64f9a SHA512 d0d031570e99987a78a4285cfc5ebdb3ec517fbfdd053b7da3dae9c3f2ccf47083f0964b135f3c2501aebe44bd789f1a360cd386620a2f3585af014dd81fc474
-EBUILD expression_parser-0.9.0_p20130518.ebuild 630 BLAKE2B e83aa8f50377ed6be94452f96f4073292c66bf148c71c83db31144d0f95838f7e9dc1415e3de465e82aae8fe5959663c863af0c4d5e36f7a26d98826b55a8560 SHA512 5fe42a8fdc8da482d18d643dfc99162307d90177b5e559de14a702206766732ac8e12966ed7bce47d1ee4b57e8df29dab970c9573fa4cd3d4b661cc59072c449
-MISC metadata.xml 352 BLAKE2B c91e2a8f30d8ba651b4beffe3c0238504224f5657909bf8ebfc11181714858bcffc26d64bfbf2c99e58a68a61a0f262bd279a73e87e81025d4544306c855859e SHA512 8dc7c99a4c036e1fc2ab5c899ae70984456c44726fb8f20be2cff28df6acf93bca56a7231c79f8526be09189136cc29799727f4ca01a594fab18dcce3195cc24
--- a/dev-ruby/expression_parser/expression_parser-0.9.0_p20130518.ebuild
+++ b/dev-ruby/expression_parser/expression_parser-0.9.0_p20130518.ebuild
@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README"
-RUBY_FAKEGEM_VERSION="0.9.0.20130518"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A math parser"
-HOMEPAGE="https://lukaszwrobel.pl/blog/math-parser-part-3-implementation"
-COMMIT_ID="6e3c7973423ff0f2cd33db2304fcd4eac3af01ad"
-SRC_URI="https://github.com/nricciar/${PN}/archive/${COMMIT_ID}.tar.gz -> ${P}.tar.gz"
-
-RUBY_S="${PN}-${COMMIT_ID}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
--- a/dev-ruby/expression_parser/metadata.xml
+++ b/dev-ruby/expression_parser/metadata.xml
@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>ruby@gentoo.org</email>
-    <name>Gentoo Ruby Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">nricciar/expression_parser</remote-id>
-  </upstream>
-</pkgmetadata>
--- a/dev-ruby/hoe-seattlerb/Manifest
+++ b/dev-ruby/hoe-seattlerb/Manifest
@ -1,3 +0,0 @@
-DIST hoe-seattlerb-1.3.5.gem 14336 BLAKE2B 76dd4e82e4b3ceee897d484e2bbf596414bfbe50d998f2f3833e6be63dacbec4d4d1014b14d9504cbf9615736f584ea3c083c8f5b15609f400264ce5cb31856b SHA512 a5cdb38114e22e07824749e721ad7ff85724c04d8ca1c66996ca86fc9ec150a3b0b7b3bc83511932af0c4acd7e9b581d6b1583eda60160bf7ed91021ab803d0f
-EBUILD hoe-seattlerb-1.3.5.ebuild 763 BLAKE2B c5943b0f2adf4be01e58a9faea538105ff423a9a9ada2d4e8ae4617fb06e249dd7ddd1ad34b5fcc6bf74a2af79233a233287d182482a3fcb2822e8dfb0544f11 SHA512 4cbeb442c9385a9c3af0046e45c8632922a29ca21440f73df98031b5d801bce746631bd6ed45092008cf3323b2c0411ff8dc189c9d8f629abdb196b4e0fe1b91
-MISC metadata.xml 339 BLAKE2B dfe565b89582b66fb99b6c9e50c9ca3efc0eeeb4a2c2cecd5e103f2d9526fde1a6e591c240cc83163d55c2973adb9482dc8c91ec3cea5a8f67848aa0bcdf5e4c SHA512 2e0d6992a3e11200d4373727efa7ea4c1a1eb1e1cc2a1023b0d0b651769580d2405378c4560e498ee5f52f7350fee443a443247ccedef5178be40f014f44cd20
--- a/dev-ruby/hoe-seattlerb/hoe-seattlerb-1.3.5.ebuild
+++ b/dev-ruby/hoe-seattlerb/hoe-seattlerb-1.3.5.ebuild
@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-# no tests present
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.txt History.txt"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Hoe plugins providing tasks used by seattle.rb"
-HOMEPAGE="https://github.com/seattlerb/hoe-seattlerb"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-all_ruby_prepare() {
-	# Not a real fix, but otherwise USE="doc" breaks and defaulte license is MIT
-	sed -i -e "/license/d" Rakefile || die
-}
--- a/dev-ruby/hoe-seattlerb/metadata.xml
+++ b/dev-ruby/hoe-seattlerb/metadata.xml
@ -1,11 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ruby@gentoo.org</email>
-		<name>Gentoo Ruby Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">seattlerb/hoe-seattlerb</remote-id>
-	</upstream>
-</pkgmetadata>
--- a/dev-ruby/inifile/Manifest
+++ b/dev-ruby/inifile/Manifest
@ -1,3 +0,0 @@
-DIST inifile-3.0.0.gem 18432 BLAKE2B 28c778b9dc49e618dd5f86ab6d87a21e6a1e8ff577ce98390a7767778033012fc3c4d5476de48d80807b0a74bace0b5f775317106949fe142e88854a95436e94 SHA512 d77344812bb62a5639b0a36e5ac2726280990210000b85bab700819fe0fb9f56415517c00436d0056ca090e3d568596bc30f8ed211a00aced5b929e534d0a72b
-EBUILD inifile-3.0.0.ebuild 568 BLAKE2B bf5a234319150e3319536f491f72d6093367ec024054609d96dc900db0b9dc4027314c59093e5481416c5522d77c0aba4eeadf2440d801097088a370f57e4738 SHA512 bad11d43624769aa12edd917538e2ede2e0de2b493c8371f4bf2c68b01927fb058613df8b4a9b2527a59b9c7c49877aa2f292e9b798c2660c1ba8a8af29d7c30
-MISC metadata.xml 337 BLAKE2B c33d25d55fb6a46e6b48375526f6c1052a8e1c39231551b6911cae898445701a9ad9a9358c1f21be5b1546142a02ab3cf45441a0044464b0b798f7e07ec55ea8 SHA512 49523edec5fc510375831232351c9d1fb622da7c14a0ce2b7e7a229882d5ff1c6647461d9f1363098e90bec422d48ae711eb1a7af048387ef5636f4c9c488a43
--- a/dev-ruby/inifile/inifile-3.0.0.ebuild
+++ b/dev-ruby/inifile/inifile-3.0.0.ebuild
@ -1,26 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_TASK_TEST="test"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="README.md History.txt"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Native Ruby package for reading and writing INI files"
-HOMEPAGE="https://github.com/TwP/inifile"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-each_ruby_test() {
-	${RUBY} -Ilib:test:. -e 'Dir["test/test_*.rb"].each{|f| require f}' || die
-}
--- a/dev-ruby/inifile/metadata.xml
+++ b/dev-ruby/inifile/metadata.xml
@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>ruby@gentoo.org</email>
-    <name>Gentoo Ruby Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">TwP/inifile</remote-id>
-  </upstream>
-</pkgmetadata>
--- a/dev-ruby/journey/Manifest
+++ b/dev-ruby/journey/Manifest
@ -1,4 +0,0 @@
-AUX journey-1.0.4-fix-tests.patch 2149 BLAKE2B 17693a10ad41b43d17541cd93a3f7485a60766bf5bfa9f96c9e1031db44cf9ce04f02f7e5aaa78de29241346d3707591ae15dbe17f268b90a482a6158962d2f6 SHA512 d4b34ed92f131e6e17f4af6d9be5ec743b6950f86ee724d32be67fe88b378cd8998c6551e78d6dc7b72b2911afbb14ec8ddad3be414694b86c696a39513a2857
-DIST journey-1.0.4.gem 28672 BLAKE2B fe78647c9f80ad4b9874eab9488cca199cd69d354e69f3f5b47b417452ca259790109d07a27c4c2d99778683d9264413399d4d7acd7eb4d8e78f7e37ccf2a8d7 SHA512 9e6a06da8b77f6efb9941c58f53254e8cf3a1ebb6f8261a66ef3fed9c21ff4e4a90567fee88507b8e2c1fecc0fbdf204a9d3c8473b671bbb4b8c6b9faa6f2a07
-EBUILD journey-1.0.4-r1.ebuild 640 BLAKE2B ee6448b4ff69130d8ecf70bf79804b2ab77bef34f12f6e31de8e5c72aff90025f058c95ca263849d1ed0f1be645db0c3e8f6c089b181e3281d524199447b2ff9 SHA512 2666c80ea88b6f604ac9ef65956152ad7811340bdf17329293651d9f96c04359dcd371bd4c125419fb2c3909d0f5c697518e15ca697d5de636df4382a3a50f8f
-MISC metadata.xml 339 BLAKE2B ccf9044fae8d836e4a60fa4bb0c95bd245b55a21dfcb7367e8a41c854f32c0bf3b65bff9a0ef625bb645063f84ad01cc2cc0a13a1f2cad4732e959fae7122e1d SHA512 482ceff436735ee12e21e9519a174803b5c035dfc31df0e25eacecd6186682ec9209f5bea95d3ec8263dace8cd64145daee26986dc10820bf99db2793f942f7a
--- a/dev-ruby/journey/files/journey-1.0.4-fix-tests.patch
+++ b/dev-ruby/journey/files/journey-1.0.4-fix-tests.patch
@ -1,66 +0,0 @@
-From d836e960d9a20c4c5bc986630d2ba34a340959ea Mon Sep 17 00:00:00 2001
-From: Aaron Patterson <aaron.patterson@gmail.com>
-Date: Fri, 27 Jul 2012 11:20:58 -0700
-Subject: [PATCH] fix assertion calls
-
---
- test/path/test_pattern.rb | 22 +++++++++++-----------
- 1 file changed, 11 insertions(+), 11 deletions(-)
-
-diff --git a/test/path/test_pattern.rb b/test/path/test_pattern.rb
-index c684a0a..ec93471 100644
--- a/test/path/test_pattern.rb
-+++ b/test/path/test_pattern.rb
-@@ -85,9 +85,9 @@ def test_to_regexp_with_extended_group
-           ["/", ".", "?"]
-         )
-         path = Pattern.new strexp
-        assert_match('/page/tender', path)
-        assert_match('/page/love', path)
-        refute_match('/page/loving', path)
-+        assert_match(path, '/page/tender')
-+        assert_match(path, '/page/love')
-+        refute_match(path, '/page/loving')
-       end
- 
-       def test_optional_names
-@@ -108,8 +108,8 @@ def test_to_regexp_match_non_optional
-           ["/", ".", "?"]
-         )
-         path = Pattern.new strexp
-        assert_match('/123', path)
-        refute_match('/', path)
-+        assert_match(path, '/123')
-+        refute_match(path, '/')
-       end
- 
-       def test_to_regexp_with_group
-@@ -119,9 +119,9 @@ def test_to_regexp_with_group
-           ["/", ".", "?"]
-         )
-         path = Pattern.new strexp
-        assert_match('/page/tender', path)
-        assert_match('/page/love', path)
-        refute_match('/page/loving', path)
-+        assert_match(path, '/page/tender')
-+        assert_match(path, '/page/love')
-+        refute_match(path, '/page/loving')
-       end
- 
-       def test_ast_sets_regular_expressions
-@@ -186,9 +186,9 @@ def test_insensitive_regexp_with_group
-           ["/", ".", "?"]
-         )
-         path = Pattern.new strexp
-        assert_match('/page/TENDER/aaron', path)
-        assert_match('/page/loVE/aaron', path)
-        refute_match('/page/loVE/AAron', path)
-+        assert_match(path, '/page/TENDER/aaron')
-+        assert_match(path, '/page/loVE/aaron')
-+        refute_match(path, '/page/loVE/AAron')
-       end
- 
-       def test_to_regexp_with_strexp
-- 
-1.9.1
-
--- a/dev-ruby/journey/journey-1.0.4-r1.ebuild
+++ b/dev-ruby/journey/journey-1.0.4-r1.ebuild
@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.rdoc README.rdoc"
-
-inherit ruby-fakegem versionator
-
-DESCRIPTION="Journey is a router. It routes requests"
-HOMEPAGE="https://github.com/rails/journey"
-
-LICENSE="MIT"
-SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos ~x86-solaris"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/hoe
-	dev-ruby/json
-	dev-ruby/minitest )"
-
-RUBY_PATCHES=( "${FILESDIR}"/${P}-fix-tests.patch )
--- a/dev-ruby/journey/metadata.xml
+++ b/dev-ruby/journey/metadata.xml
@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>ruby@gentoo.org</email>
-    <name>Gentoo Ruby Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">rails/journey</remote-id>
-  </upstream>
-</pkgmetadata>
--- a/dev-ruby/rack/Manifest
+++ b/dev-ruby/rack/Manifest
@ -1,8 +1,6 @@
-DIST rack-1.6.12.gem 230912 BLAKE2B 98a3ae6905535b284a5e723d39db7788f97c11b29506fbdb3c584c53d1dae35d1e8006724e5f63195d8407521806c53a5fcf47544b4241370a3576e6dbea0dc6 SHA512 9d0f6f44d228c1b6a7b0fbf29a1e5a2f45339b4749d563336c1729d88c3e37d6360fedde75b7cfcddcd7e051025fc50f04b594fb68d499899e96e2385478fe76
 DIST rack-2.0.9.gem 256512 BLAKE2B 7da7b239e5679a2f6d19626cbaf8b4ec02a7ce7ffd086732925963ac6fe0397f180548c6065abdbe8d55de802583d7dd09de38da0d4d695559456d852d2b3d4c SHA512 5b56d1aa7bcca11c631f8205605e71f9c661ec9ea7694a16f32f6fdb493cf015d184f924fdf342abebacfbb185e367c9e6dd1288ffe9dabaf4e6566b8853a191
 DIST rack-2.1.4.tar.gz 251772 BLAKE2B 9dbd1ac1dade5935a3819b8c23e492b3e637ed2fc99a95ad0592d40501ea4171433ac4bba08a6031cd77521f4ae0f430ea60394c51b7c5f25cd9e82b72067ba8 SHA512 ce36902125171d2c9baffdd85a171237b9262a47115f043ce96486fb60fcd77826ae28d9416c43a3549db657a3da1c7be45f14842e4b343517f23dab82abd81a
 DIST rack-2.2.3.tar.gz 278045 BLAKE2B 2182ab6ee2ca0e40bd131dc96cf15d7e1015570a0702c2419e50da9eae6afedc0f1543a2fdc1fb32022a65788ab486b7add688c8bf201ad46a3d101b6e625a8b SHA512 0daefd1fd7d1c83a5aaf0e8a3c0d734f805f6718c3f2d20673e78242f10fa99c24f8e8d480cb7f0ee299d96a4b691e4a19c967785de946dc863e9b78e0c3ac53
-EBUILD rack-1.6.12.ebuild 1691 BLAKE2B 27974bc4f722c22e14cab0486e18c45ea52840898e4db6979f337fa0efdf77f8d160d73ac42ddc668b7fc41c6d726ed9f6e0533f3632483670ab44a9b71e14c7 SHA512 2c68b3554715800a3d4c299d9c655618b369540925922418bc6d233da6d363a39d2eccc72d652900e4da8154a0dfeef2896cd40819e23096cdbf7396d5497f34
 EBUILD rack-2.0.9.ebuild 1449 BLAKE2B d9462a4fb6d7c0811b49c776fd0778b79986e229789047d750ef1dceb62470750d3099d55bde1af758300b1b8f973081e184d2587d1521258d9e94da0af75869 SHA512 f4c6734000355a69552b6446d85475a505d00195a1eee31780435ffdb543dd87fe575da36cca9d74198f0f1b4d105f50a18a5430b66754f3434677a6a3bce65a
 EBUILD rack-2.1.4.ebuild 1698 BLAKE2B 19566995b14950f7d79dc361a5170ec56df9b7a8900c658de03e5f47e3344355e96733dac9113a90245545f4c7cc3d053db1ee7877acf2750c858ce17eeb6546 SHA512 f7af118477ae7fce8fccb8c25258f6357cc7159e548f1dce89f35041c6a5172eee018f425d480b0d2511859b68973f786d3963fa74e660b2ea8d5bb6cec53be8
 EBUILD rack-2.2.3.ebuild 1490 BLAKE2B 04b52537a1e2e56ac56d18fa67e509fac6a6ea81d38c22b84f045d742d677937559791e1d8d3e6f74f9041a48845774537e1738d8b1501a37a55843b98e6e6e9 SHA512 994ebba8be17a50dc31d50fb6f6e496a7c452d1a17007c90529ae25e71c9b26dfcb70653f97969714f274f1a394d957601a70b33190bef84d5e243caeee645f6
--- a/dev-ruby/rack/rack-1.6.12.ebuild
+++ b/dev-ruby/rack/rack-1.6.12.ebuild
@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="HISTORY.md KNOWN-ISSUES README.rdoc SPEC"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem eapi7-ver
-
-DESCRIPTION="A modular Ruby webserver interface"
-HOMEPAGE="https://rack.github.com/"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_rdepend "virtual/ruby-ssl"
-
-# The gem has automagic dependencies over mongrel, ruby-openid,
-# memcache-client, thin, mongrel and camping; not sure if we should
-# make them dependencies at all.
-ruby_add_bdepend "test? ( dev-ruby/bacon )"
-
-# Block against versions in older slots that also try to install a binary.
-RDEPEND="${RDEPEND} !<dev-ruby/rack-1.5.2-r4:1.5"
-
-all_ruby_prepare() {
-	# The build system tries to generate the ChangeLog from git. Create
-	# an empty file to avoid a needless dependency on git.
-	touch ChangeLog || die
-
-	# Skip test also failing upstream in preference of making a security release available.
-	sed -i -e '/knows to prefer plaintext for non-html/,/^  end/ s:^:#:' test/spec_showexceptions.rb || die
-}
-
-each_ruby_test() {
-	# Since the Rakefile calls specrb directly rather than loading it, we
-	# cannot use it to launch the tests or only the currently-selected
-	# RUBY interpreter will be tested.
-	${RUBY} -S bacon -Ilib -w -a \
-		-q -t '^(?!Rack::Handler|Rack::Adapter|Rack::Session::Memcache|Rack::Server)' \
-		|| die "test failed for ${RUBY}"
-}
--- a/dev-ruby/rgen/Manifest
+++ b/dev-ruby/rgen/Manifest
@ -1,3 +0,0 @@
-DIST rgen-0.8.4.tar.gz 277720 BLAKE2B bf7c5f017f056d05464d7f15a4faa8dee41eb857b1ff026be6ea9185d1e4bc2162d0548eb061bf99b2564b61303b4c5204a2db376ff7610ba2c1bbb85cbe9ca4 SHA512 7a1691624a88468674fe3988c3eb098f3c955ab380401cc43f55ab5a84dae81b25d9d19e237b1c9e0251165f298138ca58f9a358124fe4fe8fd233e622d28015
-EBUILD rgen-0.8.4.ebuild 796 BLAKE2B cb6a8d6ebf6619dc5e3907a3bf56889c1278fd06c7b5491a930754b86c9d6ef0fbd4a0af435c8149c85332a77ed4caff98e26de06f46380d0300bf99a0fc70d1 SHA512 ec293558d2f82cf0a1fddb5d50b52642e8d07059efdecbce3e6da655bab16ad13177bf3c2a46d754e49158a48a9bf8a3dc78af42137213dcf144bcc7c13a488c
-MISC metadata.xml 338 BLAKE2B 93ef49d518bff5cbddf74d2d851eadfdc01b79389f77fb002c456c453978d41c5157f545cce8dfa09878f42599daba66d8cfce611f6ebe91496cdb1589309ee5 SHA512 714e42942d30a44542c2c9804e4c5532fb69bedd0c12b9488cf23f64fb58abc80c068c7049e10f793005ae1c6d1c54694dbef0982f2adee03dff58855f41b9b6
--- a/dev-ruby/rgen/metadata.xml
+++ b/dev-ruby/rgen/metadata.xml
@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>ruby@gentoo.org</email>
-    <name>Gentoo Ruby Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">mthiede/rgen</remote-id>
-  </upstream>
-</pkgmetadata>
--- a/dev-ruby/rgen/rgen-0.8.4.ebuild
+++ b/dev-ruby/rgen/rgen-0.8.4.ebuild
@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.rdoc"
-RUBY_FAKEGEM_GEMSPEC="rgen.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Ruby Modelling and Generator Framework"
-HOMEPAGE="https://github.com/mthiede/rgen"
-SRC_URI="https://github.com/mthiede/rgen/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86"
-
-ruby_add_bdepend "
-	test? ( >=dev-ruby/minitest-5.10:5 >=dev-ruby/nokogiri-1.6.8.1 )
-"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/ s:^:#:' Rakefile || die
-	sed -i -e 's/Can not use a Fixnum/Can not use a Integer/' test/metamodel_builder_test.rb || die
-}
--- a/dev-ruby/ruby_dep/Manifest
+++ b/dev-ruby/ruby_dep/Manifest
@ -1,3 +0,0 @@
-DIST ruby_dep-1.5.0.gem 11776 BLAKE2B 0883eb6908c4e0aeec3bb88eaa2a3fd526ce6f16f4b9feb3b817ea32f40f86967c3e9f60791f8bd83e52b108bf748784c98d07d5d121ccf884ed19f76fa8266f SHA512 f12b589262d84525b301370845840221f0d204b0cfee66fbbbee62eb61e817c46590e87f70318f8d14d000da20280182448d129b685468701ff7ffa8e6965377
-EBUILD ruby_dep-1.5.0.ebuild 490 BLAKE2B 633bab2502d08e60cabfcfe8da6945c9895bc3160c60b830973a9d7630e81382aac8ea4eee3eacdafbb4d2860ba3cbed8e8a2912f55bea1759a69cc17b2a1879 SHA512 7ae7e1bc6a064e2ddb1584fde445bef5df9db85222045b95e0e24e628137cae62f7a1e2c030d10db40feb90d6d78ac9b41822d969826b791459d887739dd3ce6
-MISC metadata.xml 327 BLAKE2B 5708c74c786998a5e5c9d5e14c9890cd5271e73f0469cf60e3a657facefed7e1326b1a270f7f67f0767664a1936c20c3e2650ae9930b680e61d3f86302b3b962 SHA512 be034c994d4c7eebe730b0b3cdea143d872b8519d99fcde3e49776c7b729a5f1d5b9a3acb411850d7ea518018e9d645820297afbdff11d5f4d3554d649f4e01e
--- a/dev-ruby/ruby_dep/metadata.xml
+++ b/dev-ruby/ruby_dep/metadata.xml
@ -1,11 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ruby@gentoo.org</email>
-		<name>Gentoo Ruby Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">e2/ruby_dep</remote-id>
-	</upstream>
-</pkgmetadata>
--- a/dev-ruby/ruby_dep/ruby_dep-1.5.0.ebuild
+++ b/dev-ruby/ruby_dep/ruby_dep-1.5.0.ebuild
@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_TASK_TEST=""
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Creates a version constraint of supported Rubies,suitable for a gemspec file"
-HOMEPAGE="https://github.com/e2/ruby_dep"
-
-LICENSE="MIT"
-SLOT="1"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
--- a/media-plugins/Manifest.gz
+++ b/media-plugins/Manifest.gz
--- a/media-plugins/kodi-game-libretro-twentyfortyeight/Manifest
+++ b/media-plugins/kodi-game-libretro-twentyfortyeight/Manifest
@ -1,8 +1,10 @@
 DIST kodi-game-libretro-twentyfortyeight-1.0.0.111.tar.gz 94690 BLAKE2B 54a48051a2b49161ab8fd75872935af2d313856b1e465d37270819aaaaa7548a01c4078020911e5630ecabc348475842c5d8f813cdb6e94d4868fbcc686fb423 SHA512 3f539c4e238ed9f8872fc443f15fd4ecf6234a6c5e3f9dd701b53fec0804a98f87d27a40023fd861afca3cafd4d17fa5b187e24b921fd87d37a23205a6c798e8
 DIST kodi-game-libretro-twentyfortyeight-1.0.0.113.tar.gz 94713 BLAKE2B d161fd0b5314b21bdddb97cd4a4bcdf6066ad6b0280d75ca5c810435867d0edc1b7d58e77021744bc9d39628025d151f628ef07f3e9e5a6be8cc1b039dd0ae2c SHA512 19e667bb4a658a8319c626113f8ff839d5c84afd23a1dd013adce51a29cc9761cd2a93f30f4a8cf3a82a84685269c8e5354982b3022d464057a6f6059eb301d3
 DIST kodi-game-libretro-twentyfortyeight-1.0.0.114.tar.gz 94692 BLAKE2B a2592d2b275b22476276e5539831080366e7859d12f364a68964845e6dbe19f596c7027a9e79c50cf44d20a4e44279a2ff090a0c68b4e87a22190dac6f5c38f8 SHA512 84e95b4f67bfb11d2ebc5fe12adf32b80137db87ff945b8a5359043cba7cf23a773751b7c7a661af9c0f127bbdd2ce4bf999e2a75f562e2497ab3037e7b220e1
+DIST kodi-game-libretro-twentyfortyeight-1.0.0.115.tar.gz 94691 BLAKE2B ff0a422e7f869f03b6e9fc8171b9d25119d9b658d4ab8446b4b2ac3631d9d43d42b39e4a8759281c957852ed01b10c302e5cfe0dd3a7e4bee93ab67469c22e8e SHA512 6184079e45731218b772096bf681301d79b04a328cf006a09fb0684ba2e99d1a5aee8fda0a26715b118b57b5641939a9bce4c7f4cfa952e10ac1fef7ed7e38c3
 EBUILD kodi-game-libretro-twentyfortyeight-1.0.0.111.ebuild 920 BLAKE2B e79ca0c71d4d2bfe9a032236396d6429f5d2ab2b37e5758635dc196a8aab9258176887026bb48f726859f3b8c89c515aa541a9b548260382cace23ca5bf2e97a SHA512 d3014ecaf71d074b0c4d82949acc4e6333cb6c20f65daa1e37609a0af2aae751b100751d2aab269344f354e64b09dc784d281ead4f7a5fa6af9b83f54ff3ede0
 EBUILD kodi-game-libretro-twentyfortyeight-1.0.0.113.ebuild 926 BLAKE2B 20e2e512c04c3c8370be9c3c77dddb2f8379ec5fb0e37ac2e1b97f2f93d5f626f43009eb531c19383b3cf9130947e5eaf319dc5982162c7dcf3761c38f15e58f SHA512 0a3c51312a25ed6ae45c86e27cacf6f9bc5d6ca623fa529062cd790f50eacc10c98ca0fc084288b6f8b9cd4051d7ffe279e72f5b3c9b97e783025d5f9c4eabac
 EBUILD kodi-game-libretro-twentyfortyeight-1.0.0.114.ebuild 926 BLAKE2B 20e2e512c04c3c8370be9c3c77dddb2f8379ec5fb0e37ac2e1b97f2f93d5f626f43009eb531c19383b3cf9130947e5eaf319dc5982162c7dcf3761c38f15e58f SHA512 0a3c51312a25ed6ae45c86e27cacf6f9bc5d6ca623fa529062cd790f50eacc10c98ca0fc084288b6f8b9cd4051d7ffe279e72f5b3c9b97e783025d5f9c4eabac
+EBUILD kodi-game-libretro-twentyfortyeight-1.0.0.115.ebuild 926 BLAKE2B 20e2e512c04c3c8370be9c3c77dddb2f8379ec5fb0e37ac2e1b97f2f93d5f626f43009eb531c19383b3cf9130947e5eaf319dc5982162c7dcf3761c38f15e58f SHA512 0a3c51312a25ed6ae45c86e27cacf6f9bc5d6ca623fa529062cd790f50eacc10c98ca0fc084288b6f8b9cd4051d7ffe279e72f5b3c9b97e783025d5f9c4eabac
 EBUILD kodi-game-libretro-twentyfortyeight-9999.ebuild 927 BLAKE2B 4e305e130809f3b107a6d5ca442213fa4c6f0b3995b6c508890dfa0d835ee4320bde3d38d4ca4e9d8420fc40d56f74d19d3e55c97e73da1f1a74c7b8a61ab1b0 SHA512 7c39e51a0806f3dd2c05c3ca29c929cecdd404e3cce3b72e3127e4da3e4c7f3d001761b258729f3c1013a31403ad447cee00d8d51c2cd58fd0f87e8269596939
 MISC metadata.xml 371 BLAKE2B 55bef28562de92933232e1501ecd61a191d67364952a9e9c5458b9f10ed69068af45d3b348ee301e7a98a34034862fa21f72bd54f8c9ebaf9b0e9fe6389fff76 SHA512 3c9f02874803d1a666237c1293a63d68cc1f6bd60bd25fec9519a6cfdf95b1c3ec074ebedccd0915262311d5e3bc8f05b018f4097d68bd8a853cd0026622fcbd
--- a/media-plugins/kodi-game-libretro-twentyfortyeight/kodi-game-libretro-twentyfortyeight-1.0.0.115.ebuild
+++ b/media-plugins/kodi-game-libretro-twentyfortyeight/kodi-game-libretro-twentyfortyeight-1.0.0.115.ebuild
@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake kodi-addon
+
+DESCRIPTION="2048 for Kodi"
+HOMEPAGE="https://github.com/kodi-game/game.libretro.2048"
+SRC_URI=""
+
+if [[ ${PV} == *9999 ]]; then
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/kodi-game/game.libretro.2048.git"
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~x86"
+	CODENAME="Matrix"
+	SRC_URI="https://github.com/kodi-game/game.libretro.2048/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/game.libretro.2048-${PV}-${CODENAME}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-19*
+	games-emulation/libretro-twentyfortyeight
+	"
+RDEPEND="
+	media-plugins/kodi-game-libretro
+	${DEPEND}
+	"
+
+src_prepare() {
+	echo 'find_library(2048_LIB NAMES 2048_libretro${CMAKE_SHARED_LIBRARY_SUFFIX} PATH_SUFFIXES libretro)' > "${S}/Findlibretro-2048.cmake" || die
+	cmake_src_prepare
+}
--- a/media-plugins/kodi-pvr-hts/Manifest
+++ b/media-plugins/kodi-pvr-hts/Manifest
@ -8,6 +8,7 @@ DIST kodi-pvr-hts-4.4.20.tar.gz 161693 BLAKE2B d69e72c8d189b540f2d8abc97c50e5a9e
 DIST kodi-pvr-hts-7.1.1.tar.gz 167379 BLAKE2B f2391d7997a7e17ed1fb7b2326cdb0cddfecdf9a6b0785fc89ecf8b58004575c6b7a1f6efb976edda827b9e83d334e0bba518498886c1e1769b9ed1deacf25d7 SHA512 5d1e049c23e82964ab87b22c716028d57322f81b749f84f07f66e3bbd2990e711186eee2b562d1f326a369b5fc52d1f7b2aea31b4d8edc827f6555965fec2b69
 DIST kodi-pvr-hts-7.1.4.tar.gz 167634 BLAKE2B 34c19b9be6f8e66c22b93e74703d55ccf66970fb39b4c2ac52146aa9d94175280406339fbe6651a53be4b9216713dbeb25fc004f9959a1ce1db42e13b0aec2f7 SHA512 91f9420ad88ec806d2d16e618827583039b90e488014d0f998108c9d94906aa247755f5d53dc4b59badc9fdfad96c975b0d7c98ef0ffd7116171e8abd247c94b
 DIST kodi-pvr-hts-7.2.0.tar.gz 167998 BLAKE2B 4da53589b58849259d66a03d2f719067cc1749ea181ad6037f03ca178879a34e209422039a1b2d0b3900ee2a2ef65d32a09cae0f177dc17dd8aa97e06dea4f2b SHA512 736188c4464c9110e4916223cd0aa79195547d4ff568aea711aa42c1145d5aa981d1d5f62d4ed79b37575592bda9f2bbc532eff7b09e48785e644e8fdea668c0
+DIST kodi-pvr-hts-7.2.1.tar.gz 180461 BLAKE2B c0beed28549d80f71e5bb7197a396c5abf6c26e119caee5624e37c250d718425519d93317e26e1fa831f13d83903807e2fa3917831645ed83e465f8177cc77d3 SHA512 6f971a14e04c4ebb7b300286f7b10f64092eac91a63cbb1ea7ce0d47431231743080b73eb9939273e775f69c1659c2daa669ee53b22be3dafa4c732b095c43f8
 EBUILD kodi-pvr-hts-4.4.12.ebuild 721 BLAKE2B 6c0f27c40208e8d4734f9dc79a7cd59bbf7b38335957815ebbab26f322c669f0f29a6562206973d65c276ab8bfaa885f0770db96bccc3eeb32256fdc414fae8a SHA512 cb3f4940a9617fec746d3977022c347060ef2c038218d2f3520f2546b1d7c000fce3f3a776d7575884e02e09e8b1c8f2367a5c389c7971ad1cbb88633c990ec3
 EBUILD kodi-pvr-hts-4.4.13.ebuild 721 BLAKE2B 6c0f27c40208e8d4734f9dc79a7cd59bbf7b38335957815ebbab26f322c669f0f29a6562206973d65c276ab8bfaa885f0770db96bccc3eeb32256fdc414fae8a SHA512 cb3f4940a9617fec746d3977022c347060ef2c038218d2f3520f2546b1d7c000fce3f3a776d7575884e02e09e8b1c8f2367a5c389c7971ad1cbb88633c990ec3
 EBUILD kodi-pvr-hts-4.4.14.ebuild 721 BLAKE2B 6c0f27c40208e8d4734f9dc79a7cd59bbf7b38335957815ebbab26f322c669f0f29a6562206973d65c276ab8bfaa885f0770db96bccc3eeb32256fdc414fae8a SHA512 cb3f4940a9617fec746d3977022c347060ef2c038218d2f3520f2546b1d7c000fce3f3a776d7575884e02e09e8b1c8f2367a5c389c7971ad1cbb88633c990ec3
@ -18,5 +19,6 @@ EBUILD kodi-pvr-hts-4.4.20.ebuild 721 BLAKE2B 6c0f27c40208e8d4734f9dc79a7cd59bbf
 EBUILD kodi-pvr-hts-7.1.1.ebuild 686 BLAKE2B 71475aa7b92deb77359b521d10487da4a340fd4d6b5282d144c984a34afe2515059f21205e12ebb95f182a1b27cae107daa9900c9c1876691da9dc121b74b08d SHA512 34df4626bd706780cafda9f15e8d308573b0155a2cca4bb4d556bf95e8c64d34ed07868fd77085f06043fde19848ba4ae27632340d3dac925342453469b4031f
 EBUILD kodi-pvr-hts-7.1.4.ebuild 686 BLAKE2B 71475aa7b92deb77359b521d10487da4a340fd4d6b5282d144c984a34afe2515059f21205e12ebb95f182a1b27cae107daa9900c9c1876691da9dc121b74b08d SHA512 34df4626bd706780cafda9f15e8d308573b0155a2cca4bb4d556bf95e8c64d34ed07868fd77085f06043fde19848ba4ae27632340d3dac925342453469b4031f
 EBUILD kodi-pvr-hts-7.2.0.ebuild 686 BLAKE2B 71475aa7b92deb77359b521d10487da4a340fd4d6b5282d144c984a34afe2515059f21205e12ebb95f182a1b27cae107daa9900c9c1876691da9dc121b74b08d SHA512 34df4626bd706780cafda9f15e8d308573b0155a2cca4bb4d556bf95e8c64d34ed07868fd77085f06043fde19848ba4ae27632340d3dac925342453469b4031f
-EBUILD kodi-pvr-hts-9999.ebuild 687 BLAKE2B c7e85954a91a7bcb2fc5c6df8a52c886143a64422a46d3ea2c76deb2e13908b1e97ce5e0070c731bdfe43edea4ca9756c8b1aa4e1998479676b94075768520ce SHA512 502828e8917351e5f39c8185e90ca2dab634d98f2563ff7deb17ab963f1af6a7d94f243f6fee9bb5b2c16d9204a9d335c4d959df2c0cb0ebf836b37d89f5f3d6
+EBUILD kodi-pvr-hts-7.2.1.ebuild 660 BLAKE2B a079cd60833f98854c3b7a53cefe70b53feed00599dcb5963074911479c20c7120541c809944138f91f317d6d521bb12985f7f16811999ca2eee8eeda19d730d SHA512 55d0745e9dea4804e81f6f49c4578c8ec306937c29059314365789e33a5022aaa8810f4d9660ce6d23b842c6328198a155584d8c4716bc2a5daec9f20feca19b
+EBUILD kodi-pvr-hts-9999.ebuild 661 BLAKE2B 2e17ace5bb95016788db8c07b1d0aef10f72c5bf82f7c0321d27525550a382a565df112d4a5125233ae029dc294962da333d1f384a46bedd643d81e1c1a65fa0 SHA512 f6122a34e52426853d476eedfa33209d9435e02c79ae75520e6c64ae36a5cb663ee9140c96d53f2e7437c20135776ab8071c1a2de6cf73841c0cf3adc8bd10da
 MISC metadata.xml 439 BLAKE2B bc951f0eaf43cf751137213ab717ca84d60964687c640b778459afcc461700148ade8cf59afa7d0d0805fc53285db28de84950f38a0b9c3c7bb6c5a2c553214c SHA512 92746f7dacc9316b473e2e62ffaecedf88d760f91970cfd794d306e117ba45cdb509fc0cc7d868d55f70d8c567ffc34517c27c37dc51e0756758ce2860739a5f
--- a/media-plugins/kodi-pvr-hts/kodi-pvr-hts-7.2.1.ebuild
+++ b/media-plugins/kodi-pvr-hts/kodi-pvr-hts-7.2.1.ebuild
@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake kodi-addon
+
+DESCRIPTION="Tvheadend Live TV and Radio PVR client addon for Kodi"
+HOMEPAGE="https://github.com/kodi-pvr/pvr.hts"
+SRC_URI=""
+
+if [[ ${PV} == 9999 ]]; then
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.hts.git"
+	inherit git-r3
+else
+	CODENAME="Matrix"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/kodi-pvr/pvr.hts/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/pvr.hts-${PV}-${CODENAME}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-19*
+	"
+
+RDEPEND="
+	${DEPEND}
+	"
--- a/media-plugins/kodi-pvr-hts/kodi-pvr-hts-9999.ebuild
+++ b/media-plugins/kodi-pvr-hts/kodi-pvr-hts-9999.ebuild
@ -25,7 +25,6 @@ SLOT="0"
 IUSE=""

 DEPEND="
-	=dev-libs/libplatform-2*
 	~media-tv/kodi-9999
 	"

--- a/media-plugins/kodi-pvr-vuplus/Manifest
+++ b/media-plugins/kodi-pvr-vuplus/Manifest
@ -11,6 +11,7 @@ DIST kodi-pvr-vuplus-6.1.1.tar.gz 278369 BLAKE2B e8c9ba3a00fbe467eb4779d22ff189e
 DIST kodi-pvr-vuplus-6.1.2.tar.gz 278841 BLAKE2B ab74d558ef6d2ecba91942968c4800b04ec3d3f6d383de51fe3fb6fca042f8613989d5e334e11c97a7c8fb52b57c1232913ffe1ccedb840293be3b4f6c8eec92 SHA512 174a49b7aea537c05a6e102fec72ceee59e58d9f3f06dbef81ae24a35ab302f401ca43297cd09c74a52072311db1c9666b31f57086751c4c70564dbf910a1180
 DIST kodi-pvr-vuplus-6.1.3.tar.gz 278849 BLAKE2B b95fe39455e15432450f3ba0c6204004295ec6d883c8afeabbaea6c69ca223bdb4e9874a0973b780459c123a2c62976c2a94f48448d9038b206f9433e8a54475 SHA512 97a1f3b8fe968966634bfbd36dfc9b9a7b455d2854426dd467103279a24e5142ee657be4118872032e652071f3b83f4b4f911b00470273c7152a98d4e1430d94
 DIST kodi-pvr-vuplus-6.2.1.tar.gz 265691 BLAKE2B bc1216fee4853228f2dd306ce95e56eead0a1086bbf73e52f494f93edea16a472a36644dc16e49dd6a7ab55e595ec2ebf2a6d715d5fed9ffc3baffaf67e735cf SHA512 dd98695c6d6aa2f4d16353fc901419f66cfdbaf8cb925d3610c14fde38c2b7dcba387dae5f51542003c33525f98a98623d860a9526e0939f142b576191251537
+DIST kodi-pvr-vuplus-6.3.0.tar.gz 269830 BLAKE2B 8751f7d8bbca823dae36c46ebcb8ed200606dc0126fa0c99645e1d423f89b239a614c3c7c56a04f8c4d6f22c605b32618814390bba80424b75634b744047d99c SHA512 8af272a2a01dedc9b6556120aab70749534bd28c167aa218c9b1b0d07c82e7f6d24264335ea00165aa3f7c733c6a7ee4ca3feffcddac5d039f123611b5d76836
 EBUILD kodi-pvr-vuplus-3.28.0.ebuild 714 BLAKE2B ddc7ca2601a67b0e9d6caea02534bb560f98289893d4d42f354962a7997e3103484bd47842b7d10db546064176dd470c7b14cdc5831334464361a97e41fba1c7 SHA512 1aeb62f2471889fd95448abf155566ce450dc043f27a69c7318e6c5cd874c382a12f9787b86ed4a3f72f867862dc793680660c0bbfd80377481115a6ad9664f6
 EBUILD kodi-pvr-vuplus-3.28.1.ebuild 793 BLAKE2B 481cf99f95fe3b9e01d2f4e30f9d9704ea5220cfe91b21625b1c3d1df0abdce1e9d83910971cae71ed01be8b9c9f10efa832517d8bf169d88765b30dc9a03e7b SHA512 9b5763dbc1b0c9eda706a18e6f669f32e4f5aa9f8f11e9221e81ab6c51ae3cf844ae129a9f3c9a1eec94fa2a280b32a8cbf07af268da75ae08926d112832a4d2
 EBUILD kodi-pvr-vuplus-3.28.2.ebuild 793 BLAKE2B 481cf99f95fe3b9e01d2f4e30f9d9704ea5220cfe91b21625b1c3d1df0abdce1e9d83910971cae71ed01be8b9c9f10efa832517d8bf169d88765b30dc9a03e7b SHA512 9b5763dbc1b0c9eda706a18e6f669f32e4f5aa9f8f11e9221e81ab6c51ae3cf844ae129a9f3c9a1eec94fa2a280b32a8cbf07af268da75ae08926d112832a4d2
@ -24,5 +25,6 @@ EBUILD kodi-pvr-vuplus-6.1.1.ebuild 790 BLAKE2B 318c0bb6d01af96d85197cb7a09f5c7a
 EBUILD kodi-pvr-vuplus-6.1.2.ebuild 790 BLAKE2B 318c0bb6d01af96d85197cb7a09f5c7a409321e4fc08736bc726efd3000084cfca631eba3aba714ac0d90e692a9ffc4286969e17bf7e4e0371a6225b70cb2333 SHA512 0cc0c5cd415ef5ce9a42cafe109fd7d397b4702de87779278390422c549d27e564b1d0f606d4074ae5e11261e4664ef2308ae0306ce93d94e24c7862a8ba28f3
 EBUILD kodi-pvr-vuplus-6.1.3.ebuild 790 BLAKE2B 318c0bb6d01af96d85197cb7a09f5c7a409321e4fc08736bc726efd3000084cfca631eba3aba714ac0d90e692a9ffc4286969e17bf7e4e0371a6225b70cb2333 SHA512 0cc0c5cd415ef5ce9a42cafe109fd7d397b4702de87779278390422c549d27e564b1d0f606d4074ae5e11261e4664ef2308ae0306ce93d94e24c7862a8ba28f3
 EBUILD kodi-pvr-vuplus-6.2.1.ebuild 790 BLAKE2B 318c0bb6d01af96d85197cb7a09f5c7a409321e4fc08736bc726efd3000084cfca631eba3aba714ac0d90e692a9ffc4286969e17bf7e4e0371a6225b70cb2333 SHA512 0cc0c5cd415ef5ce9a42cafe109fd7d397b4702de87779278390422c549d27e564b1d0f606d4074ae5e11261e4664ef2308ae0306ce93d94e24c7862a8ba28f3
-EBUILD kodi-pvr-vuplus-9999.ebuild 791 BLAKE2B 9f92260c4ea414dc0e8bee61d366b1c6a48c1055d2c55f7ef2209a17fef92d360c56167726c4f3fc5ea034542c90e5ef6a320a92d0932d3a31436dac5cb62daf SHA512 a98f18e3e191e4964f1fb0cc262489951aca47c7f7bff7dade9976ac0d6c2bedde1430d177a3f4512d62272a91e73cbe27b87b8754418ab48331ab321d3f8610
+EBUILD kodi-pvr-vuplus-6.3.0.ebuild 764 BLAKE2B e750f6bc6b70f71139ff3de3a4d53ff40be230ffa644cbbd96f2357d2f6e5668eedcfaeaec1807e49dd5922188849ed57f05d1066c29e095ed76eb57f899edc2 SHA512 e98c3657e70d28f2c9d0c64dcc46e19b07d4c56f7b7f65f72ab8bf5de034806570586be8198310a0e86f07ca3add31be051cebdbe58d8c43c6e0cdbbdd3a6a2f
+EBUILD kodi-pvr-vuplus-9999.ebuild 765 BLAKE2B 65a7bb78532a89ffa205709e64b92a14f6088412e8456d8a836ab496f1a010150b602ce9f8841f38cdb585dcf1135662405f2ca200658a88ff0dd0944ad07852 SHA512 70534928d3d77fe610b75048d73443481ea0eaa0419a22a6376774aff60d04382f8e9305c5a8d42cd7425dbe5c4bde17dd81026ea8074323bfd3599c094d4b8f
 MISC metadata.xml 362 BLAKE2B b551dbe10d765427e74ffc88979ea464caa79988f4204b05ced79d38745ffb4dff3fefd0464a999af66de4d132dcc0439ceb1239ccea3f924bf2a2c9083fd3ee SHA512 c9053d27b0f39fcef4c226c9a6c5578ae9cb076288fdd8f6ee39fb12b12b445499005515e79e5de8e4ba9e96fa991fd0210b3621b682960b41143ded1d84ac14
--- a/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-6.3.0.ebuild
+++ b/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-6.3.0.ebuild
@ -0,0 +1,43 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake kodi-addon
+
+DESCRIPTION="Kodi's VuPlus client addon"
+HOMEPAGE="https://github.com/kodi-pvr/pvr.vuplus"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.vuplus.git"
+	inherit git-r3
+	;;
+*)
+	CODENAME="Matrix"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/kodi-pvr/pvr.vuplus/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/pvr.vuplus-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-19*
+	dev-libs/tinyxml
+	dev-cpp/nlohmann_json
+	"
+
+RDEPEND="
+	${DEPEND}
+	"
+
+src_prepare() {
+	[ -d depends ] && rm -rf depends || die
+	cmake_src_prepare
+}
--- a/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-9999.ebuild
+++ b/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-9999.ebuild
@ -29,7 +29,6 @@ IUSE=""

 DEPEND="
 	~media-tv/kodi-9999
-	=dev-libs/libplatform-2*
 	dev-libs/tinyxml
 	dev-cpp/nlohmann_json
 	"
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@ -1 +1 @@
-Mon, 19 Oct 2020 05:38:34 +0000
+Mon, 19 Oct 2020 14:38:34 +0000
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@ -2,22 +2,22 @@
 Hash: SHA512

 MANIFEST Manifest.files.gz 486533 BLAKE2B 4add1fc6c5177737645d68a97fe822553d429ab8edb478daf15eed9d1314026061ebf49c7636deb54a8af1b403c770a5641fcbe50b8df71f645b3ced6cf2526f SHA512 cc31bbb5814dea988baced22898094f7fa07400eb001e5838a72284fb7edc33ec9115c98e0c76a7bb304e048ca4f467cae5a11e002a1da9bf58e8389b9de5ef4
-TIMESTAMP 2020-10-19T05:38:37Z
+TIMESTAMP 2020-10-19T14:38:38Z
 -----BEGIN PGP SIGNATURE-----

-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl+NJl1fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl+NpO5fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDX/RAApezfONTT/nJDUrP8SS9BbMsxNvfo+yKW30JCDeKNmFQwAc2nqLBcCHnF
-/BHD95skcf6dyEod5QYT1ZNqnAykpgeR0DL684+gjizC4AhNKZ10IexNa67Vao6P
-GZuyoPxBFpRXY4dy57JqokUVQAoGp5TbZ40oOr5yRcOP1wP21SvbVbIRz5RDQQvb
-EjCnzl1U4T9PbrPIwlICnABx63q/edpYA9UDoJqFktPh2FW+wX677c8GWW/tY7HV
-gRIHplgFZxwAcWiL3qh//pPHY07xyDhaAblZj2bw40t0ncSkLL2onxEFicR4dq+5
-E9DJDN9orN4wtoJOMWzjv1VHSwapD2nnAPgvWBGSMSpGdXKlEA1YbqZ4umO2o6S5
-kiVSusVOI7XTW3NYPxN6oowsKJBqlq54m1YFCuElt8nJK5v1D5CpKvuq6HNlUh7K
-h7ij00Bj3BqoQKlOW1i83dSJt/NZVpWP5mbu0Kffzf3yczEuHAHd4LQ4mZeSCSDH
-x0lsbSNlLjrXjemTIpTa7l8EivLmVajZvCb0IkrOX61o86vB3CbTXuKlzpQ8uJII
-GLXkl37Xj4JYcEm2NQk+aAFEMVgpbHt9ZizqA5gf7qNK7xyIt9nm+tVXheHTsKjg
-UzoV8BxhkTyKH6PvJHWF0o1IcR4KKI/WCmItTxXLFfX1ITBOpA8=
-=cW7R
+klBA8Q/9GL+2Pm3/5MuLVPTtc58+DYEDK5KjPqGoJ5Tf+ZLmpi63M1bYpPhoGl//
+BoAoddEs9umkNKwiMCkIr+kzXqplPASiyETK4H5qqCpm7KfpYkO1yMQ8RkAaYT22
+fzedqVsHdTJYv0rgoI1KWAo+Bx3ylHDmb5ECUdBDYsiT6dxl2UeSx5a+4l0stgzW
+5JcaVgxBH5+P2ZUtQjK8teHE6Dtjlpns90dTU+AKxg24KGzt9lbQ/vVy3U1cS7rQ
+MqbpDyOV/A1ZwHWQ6uFDXLy8ENoMJDPO/OwaXKWGgZ5YtBVFNX6VZJr2Ijs5gq4Q
+tHWiEfP9y5QxFGrS2HK9szbcFsJiA0PJofOLPoAnVmBfsLY8XtMNT9Bx+ZFgld2z
+jk1gdjD0kS9VLX5CKLuFZoNk5S1gtxslLxoAp+l84dy0gD8VQ5g2vyggsjLrcgjt
+0Dug1fTf1JoE7LZjwMiwsQZ/6NI7BIFv2MHybe/SssBwxDAtuKDSV0KM8qFKuyN3
+/vctGoDSto/ERwdY3McW9MWbK+ghzVIW5/KFUFUTpv88hzoHeTQafgsWOW7Obs8m
+R3RXXP1vfPczM+gVFhogDbPSGTZ2/XAThUvanLi1UsTelMZTKySARYuIdm2jb4Ra
+F39uD1fYso5Aj+xUYLSgnJ/1T5pEeCv9+Hq3aivBEKBVLB9gyN0=
+=f24m
 -----END PGP SIGNATURE-----
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@ -1 +1 @@
-Mon, 19 Oct 2020 05:38:34 +0000
+Mon, 19 Oct 2020 14:38:34 +0000
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
--- a/metadata/md5-cache/app-backup/Manifest.gz
+++ b/metadata/md5-cache/app-backup/Manifest.gz
--- a/metadata/md5-cache/app-backup/genbackupdata-1.9
+++ b/metadata/md5-cache/app-backup/genbackupdata-1.9
@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/cliapp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/ttystatus-0.31[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Generate test data for backup software testing.
-EAPI=5
-HOMEPAGE=https://liw.fi/genbackupdata/
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/cliapp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/ttystatus-0.31[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://debian/pool/main/g/genbackupdata/genbackupdata_1.9.orig.tar.xz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e0c5521315e7dd45912a07750ec55a43
--- a/metadata/md5-cache/app-i18n/Manifest.gz
+++ b/metadata/md5-cache/app-i18n/Manifest.gz
--- a/metadata/md5-cache/app-i18n/pology-0.12-r2
+++ b/metadata/md5-cache/app-i18n/pology-0.12-r2
@ -1,15 +0,0 @@
-BDEPEND=app-text/docbook-xsl-stylesheets app-text/docbook-xml-dtd:4.5 dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install nofetch prepare setup test unpack
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-libs/libxml2 dev-libs/libxslt python_single_target_python2_7? ( dev-python/dbus-python[python_targets_python2_7(-)] ) sys-devel/gettext
-DESCRIPTION=A framework for custom processing of PO files
-EAPI=7
-HOMEPAGE=http://pology.nedohodnik.net
-IUSE=+python_single_target_python2_7
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-libs/libxml2 dev-libs/libxslt python_single_target_python2_7? ( dev-python/dbus-python[python_targets_python2_7(-)] ) sys-devel/gettext
-REQUIRED_USE=^^ ( python_single_target_python2_7 )
-SLOT=0
-SRC_URI=http://pology.nedohodnik.net/release/pology-0.12.tar.bz2
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d1a4b2395ec089b90a766681bb9916aa
--- a/Show More
+++ b/Show More