Sync with portage [Fri Oct 30 16:46:51 MSK 2020].

acct-group/xpra/metadata.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+        <email>dilfridge@gentoo.org</email>
+        <name>Andreas K. Huettel</name>
+</maintainer>
+<maintainer type="person">
+        <email>heroxbd@gentoo.org</email>
+        <name>Benda Xu</name>
+</maintainer>
+<maintainer type="person">
+        <email>alexxy@gentoo.org</email>
+        <name>Alexey Shvetsov</name>
+</maintainer>
+</pkgmetadata>

acct-group/xpra/xpra-0.ebuild

@@ -0,0 +1,9 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="group for x11-wm/xpra"
+ACCT_GROUP_ID=462

app-accessibility/kontrast/kontrast-1.0.2.ebuild

@@ -12,7 +12,7 @@ HOMEPAGE="https://apps.kde.org/en/kontrast"
 
 if [[ ${KDE_BUILD_TYPE} == release ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
-	KEYWORDS="~amd64"
+	KEYWORDS="~amd64 ~arm64"
 fi
 
 LICENSE="GPL-3+"

app-arch/brotli/brotli-1.0.9-r1.ebuild

@@ -29,7 +29,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/google/${PN}.git"
 	inherit git-r3
 else
-	KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
 	SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 fi
 

app-crypt/acme-tiny/Manifest

@@ -1 +1,2 @@
 DIST acme-tiny-4.0.4.tar.gz 12667 BLAKE2B 6177d639a2d65080f84ca93400405c01ef18cb3c8d18ef5e7e57af1eede9d6f1e105ca7f6f89014e79c5cb1d865d3c81f590abdb37e8caa6b9699ea20064f698 SHA512 e66befe8262b3396e5e55ea01fc47c668c527868832d2ccdc2786156ec52e698fd20cb6fa4fe861d97947d64f4b6c751be9c79bf546eaac34978c53b9e6f85e4
+DIST acme-tiny-4.1.0.tar.gz 12776 BLAKE2B 7efd9d1399ec3bbd98180511c9f36fbf6f9a96a0d4e0e72b9d4c85d16246118eaaad25bc26ba42f746fd4b60b498ceca5307e279d788157237ac6ad153848501 SHA512 31d69a5031c019acbc23b3f06041eae8e261766396d4a7420fd70a71cfa16de953bea4c0c2ad0c6a6e793ed61ab5331f40145352ffce69f4f062f35dd0db7519

app-crypt/acme-tiny/acme-tiny-4.1.0.ebuild

@@ -0,0 +1,47 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7,3_8,3_9} )
+inherit distutils-r1
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/diafygi/${PN}.git"
+else
+	SRC_URI="https://github.com/diafygi/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="A tiny, auditable script for Let's Encrypt's ACME Protocol"
+HOMEPAGE="https://github.com/diafygi/acme-tiny"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+DEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]"
+RDEPEND="dev-libs/openssl:0"
+
+pkg_setup() {
+	if [[ ${PV} != 9999 ]]; then
+		export SETUPTOOLS_SCM_PRETEND_VERSION="${PV}"
+	fi
+}
+
+src_prepare() {
+	sed -i 's|#!/usr/bin/sh|#!/bin/sh|g' README.md || die
+
+	distutils-r1_src_prepare
+}
+
+pkg_postinst() {
+	for v in ${REPLACING_VERSIONS}; do
+		if ver_test "$v" "-lt" "4.0.3" || ver_test "$v" "-ge" "9999"; then
+			einfo "The --account-email flag has been changed to --contact and"
+			einfo "has different syntax."
+			einfo "Please update your scripts accordingly"
+		fi
+	done
+}

app-crypt/acme-tiny/acme-tiny-9999.ebuild

@@ -3,13 +3,12 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7,3_8,3_8} )
 inherit distutils-r1
 
 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/diafygi/${PN}.git"
-	KEYWORDS=""
 else
 	SRC_URI="https://github.com/diafygi/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"

app-editors/kile/kile-2.9.93-r1.ebuild

@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/en/kile https://kile.sourceforge.io/"
 
 if [[ ${KDE_BUILD_TYPE} == release ]]; then
 	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 x86"
 fi
 
 LICENSE="FDL-1.2 GPL-2"

app-misc/terminal-colors/Manifest

@@ -1,2 +1 @@
-DIST terminal-colors-2.2.bz2 4826 BLAKE2B 8a0e2918dd4fbeade61a683fd965b947fc0acdd01be028ddce3c42831e563d97e2bbc260a9781ee0d7cb1d104a9be06f3a5bc78d9725b4cb100c172b0f4994d4 SHA512 ddd1a3cf6786011372ca83b3fe86a88c863a1fa1b5cf8450cabd364a3330847145cf4bd5eb8d50baa7c26b17c392eb0f629007dbb765b36b3904d0783216ce36
 DIST terminal-colors-2.3.gz 5424 BLAKE2B e08635c0e989a430805159829b133f18b7c30959c945e4373a77442ac15628bb8bf3a5a2d14cd4f5705a5dd332297fa3d41611b52f56baaf9b1a882c26626714 SHA512 64fbfe766563c4c25bec23d1657187414f97b6f92e8a4a35337563210ef9873db495376676ef0a2f4e440ad77a6c1b43ee9c27fe04b34c2839eb4fffd5289a00

app-misc/terminal-colors/terminal-colors-2.2.ebuild

@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-PYTHON_REQ_USE="ncurses"
-
-inherit python-r1
-
-DESCRIPTION="A tool to display color charts for 8, 16, 88, and 256 color terminals"
-HOMEPAGE="http://zhar.net/projects/shell/terminal-colors"
-SRC_URI="https://dev.gentoo.org/~radhermit/distfiles/${P}.bz2"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86 ~x64-macos"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}"
-
-S=${WORKDIR}
-
-src_install() {
-	python_foreach_impl python_newscript ${P} ${PN}
-}

app-misc/terminal-colors/terminal-colors-2.3.ebuild

@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+PYTHON_COMPAT=( python3_{6..9} )
 PYTHON_REQ_USE="ncurses"
 
 inherit python-r1

app-office/calligra/calligra-3.2.1.ebuild → app-office/calligra/calligra-3.2.1-r1.ebuild

@@ -6,8 +6,8 @@ EAPI=7
 CHECKREQS_DISK_BUILD="4G"
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="forceoptional"
-KFMIN=5.60.0
-QTMIN=5.12.3
+KFMIN=5.74.0
+QTMIN=5.15.1
 inherit check-reqs ecm kde.org
 
 DESCRIPTION="KDE Office Suite"
@@ -73,7 +73,7 @@ COMMON_DEPEND="
 	virtual/libiconv
 	activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
 	charts? ( dev-libs/kdiagram:5 )
-	crypt? ( app-crypt/qca:2[qt5(+)] )
+	crypt? ( >=app-crypt/qca-2.3.0:2 )
 	fontconfig? ( media-libs/fontconfig )
 	gemini? ( >=dev-qt/qtdeclarative-${QTMIN}:5[widgets] )
 	gsl? ( sci-libs/gsl )
@@ -84,7 +84,6 @@ COMMON_DEPEND="
 		app-text/libwpg:*
 		>=app-text/libwps-0.4
 		dev-libs/librevenge
-		>=kde-frameworks/khtml-${KFMIN}:5
 		media-libs/libvisio
 	)
 	lcms? (
@@ -94,7 +93,7 @@ COMMON_DEPEND="
 	okular? ( kde-apps/okular:5 )
 	openexr? ( media-libs/openexr )
 	pdf? ( app-text/poppler:=[qt5] )
-	phonon? ( media-libs/phonon[qt5(+)] )
+	phonon? ( >=media-libs/phonon-4.11.0 )
 	spacenav? ( dev-libs/libspnav )
 	truetype? ( media-libs/freetype:2 )
 	X? (
@@ -132,11 +131,6 @@ pkg_setup() {
 src_prepare() {
 	ecm_src_prepare
 
-	if ! use test; then
-		sed -e "/add_subdirectory( *benchmarks *)/s/^/#DONT/" \
-			-i libs/pigment/CMakeLists.txt || die
-	fi
-
 	# Unconditionally disable deprecated deps (required by QtQuick1)
 	ecm_punt_bogus_dep Qt5 Declarative
 	ecm_punt_bogus_dep Qt5 OpenGL
@@ -158,6 +152,8 @@ src_configure() {
 		-DPACKAGERS_BUILD=OFF
 		-DRELEASE_BUILD=ON
 		-DWITH_Iconv=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_KF5CalendarCore=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_KF5KHtml=ON
 		-DPRODUCTSET="${myproducts[*]}"
 		$(cmake_use_find_package activities KF5Activities)
 		$(cmake_use_find_package charts KChart)
@@ -174,7 +170,6 @@ src_configure() {
 		-DWITH_LibWpg=$(usex import-filter)
 		-DWITH_LibWps=$(usex import-filter)
 		$(cmake_use_find_package phonon Phonon4Qt5)
-		-DCMAKE_DISABLE_FIND_PACKAGE_KF5CalendarCore=ON
 		-DWITH_LCMS2=$(usex lcms)
 		-DWITH_Okular5=$(usex okular)
 		-DWITH_OpenEXR=$(usex openexr)

app-office/calligraplan/calligraplan-3.2.2.ebuild → app-office/calligraplan/calligraplan-3.2.2-r1.ebuild

@@ -5,12 +5,12 @@ EAPI=7
 
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="forceoptional"
-KFMIN=5.60.0
-QTMIN=5.12.3
+KFMIN=5.74.0
+QTMIN=5.15.1
 inherit ecm kde.org
 
 DESCRIPTION="Project management application"
-HOMEPAGE="https://www.calligra.org/"
+HOMEPAGE="https://calligra.org/plan/"
 
 if [[ ${KDE_BUILD_TYPE} == release ]]; then
 	SRC_URI="mirror://kde/stable/calligra/${PV}/${P}.tar.xz"
@@ -42,7 +42,6 @@ DEPEND="
 	>=kde-frameworks/kdbusaddons-${KFMIN}:5
 	>=kde-frameworks/kglobalaccel-${KFMIN}:5
 	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/khtml-${KFMIN}:5
 	>=kde-frameworks/ki18n-${KFMIN}:5
 	>=kde-frameworks/kiconthemes-${KFMIN}:5
 	>=kde-frameworks/kio-${KFMIN}:5
@@ -60,7 +59,7 @@ DEPEND="
 	activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
 	holidays? ( >=kde-frameworks/kholidays-${KFMIN}:5 )
 	kwallet? (
-		app-crypt/qca:2[qt5(+)]
+		>=app-crypt/qca-2.3.0:2
 		>=kde-frameworks/kwallet-${KFMIN}:5
 	)
 	X? (
@@ -75,7 +74,10 @@ RDEPEND="${DEPEND}
 
 RESTRICT+=" test"
 
-PATCHES=( "${FILESDIR}/${P}-qt-5.15.patch" ) # bug 741710
+PATCHES=(
+	"${FILESDIR}/${P}-qt-5.15.patch" # bug 741710
+	"${FILESDIR}/${P}-no-khtml.patch"
+)
 
 src_configure() {
 	local mycmakeargs=(

app-office/calligraplan/files/calligraplan-3.2.2-no-khtml.patch

@@ -0,0 +1,463 @@
+From 3097da1c42ba7fe3b6a26ccb64df64db9c5588b7 Mon Sep 17 00:00:00 2001
+From: Dag Andersen <dag.andersen@kdemail.net>
+Date: Mon, 26 Oct 2020 13:46:06 +0100
+Subject: [PATCH 1/2] Remove dependency on KHtml
+
+This also removes the introductory pages,
+but these should be cver by the documentation.
+---
+ CMakeLists.txt              | 10 +++----
+ src/CMakeLists.txt          |  2 --
+ src/kptmaindocument.cpp     |  1 -
+ src/kptmaindocument.h       |  5 ----
+ src/kptpart.cpp             | 47 --------------------------------
+ src/kptpart.h               |  4 ---
+ src/kptview.cpp             | 53 -------------------------------------
+ src/kptview.h               | 10 -------
+ src/libs/ui/CMakeLists.txt  |  5 +---
+ src/welcome/WelcomeView.cpp |  9 -------
+ src/welcome/WelcomeView.h   |  1 -
+ src/welcome/WelcomeView.ui  |  6 +----
+ 12 files changed, 7 insertions(+), 146 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 4348601c..13ac4d24 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -150,11 +150,11 @@ if(KF5Activities_FOUND)
+     set(HAVE_KACTIVITIES TRUE)
+ endif()
+ 
+-find_package(KF5KHtml)
+-set_package_properties(KF5KHtml PROPERTIES
+-    PURPOSE "Required for rich text support"
+-    TYPE REQUIRED
+-)
++#find_package(KF5KHtml)
++#set_package_properties(KF5KHtml PROPERTIES
++    #PURPOSE "Required for rich text support"
++    #TYPE REQUIRED
++#)
+ 
+ find_package(KF5Holidays)
+ set_package_properties(KF5Holidays PROPERTIES
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 54f1df57..ee1a6137 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -145,8 +145,6 @@ set(planprivate_LIB_SRCS
+     kptinsertfiledlg.cpp
+     kptloadsharedprojectsdialog.cpp
+ 
+-    about/aboutpage.cpp
+-
+     KPlatoXmlLoader.cpp
+ )
+ 
+diff --git a/src/kptmaindocument.cpp b/src/kptmaindocument.cpp
+index b4fe670f..f65f2eb0 100644
+--- a/src/kptmaindocument.cpp
++++ b/src/kptmaindocument.cpp
+@@ -257,7 +257,6 @@ void MainDocument::setProject(Project *project)
+         connect(m_project, &Project::nodeChanged, this, &MainDocument::slotNodeChanged);
+         connect(m_project, &Project::sigCalculationFinished, this, &MainDocument::slotCalculationFinished);
+     }
+-    m_aboutPage.setProject(project);
+ 
+     QString dir = QStandardPaths::writableLocation(QStandardPaths::AppDataLocation);
+     if (!dir.isEmpty()) {
+diff --git a/src/kptmaindocument.h b/src/kptmaindocument.h
+index 44ab931c..01ad942d 100644
+--- a/src/kptmaindocument.h
++++ b/src/kptmaindocument.h
+@@ -31,7 +31,6 @@
+ #include "kptconfig.h"
+ #include "kptwbsdefinition.h"
+ #include "kptxmlloaderobject.h"
+-#include "about/aboutpage.h"
+ 
+ #include "KoDocument.h"
+ 
+@@ -130,8 +129,6 @@ public:
+     bool insertProject(Project &project, Node *parent, Node *after);
+     bool mergeResources(Project &project);
+ 
+-    KPlatoAboutPage &aboutPage() { return m_aboutPage; }
+-
+     bool extractFiles(KoStore *store, Package *package);
+     bool extractFile(KoStore *store, Package *package, const Document *doc);
+ 
+@@ -254,8 +251,6 @@ private:
+     QList<QUrl> m_skipUrls;
+     QMap<QDateTime, Project*> m_mergedPackages;
+ 
+-    KPlatoAboutPage m_aboutPage;
+-
+     QDomDocument m_reports;
+ 
+     bool m_viewlistModified;
+diff --git a/src/kptpart.cpp b/src/kptpart.cpp
+index cd31b6ce..d498f5e1 100644
+--- a/src/kptpart.cpp
++++ b/src/kptpart.cpp
+@@ -25,7 +25,6 @@
+ #include "kptmaindocument.h"
+ #include "kptfactory.h"
+ #include "welcome/WelcomeView.h"
+-#include "kpthtmlview.h"
+ #include "Help.h"
+ #include "calligraplansettings.h"
+ #include "kptdebug.h"
+@@ -163,7 +162,6 @@ void Part::createStarUpWidget(KoMainWindow *parent)
+     startUpWidget = new QStackedWidget(parent);
+ 
+     startUpWidget->addWidget(createWelcomeView(parent));
+-    startUpWidget->addWidget(createIntroductionView());
+ }
+ 
+ void Part::finish()
+@@ -188,7 +186,6 @@ QWidget *Part::createWelcomeView(KoMainWindow *mw)
+ 
+     connect(v, &WelcomeView::loadSharedResources, doc, &MainDocument::insertResourcesFile);
+     connect(v, &WelcomeView::recentProject, mw, &KoMainWindow::slotFileOpenRecent);
+-    connect(v, &WelcomeView::showIntroduction, this, &Part::slotShowIntroduction);
+     connect(v, &WelcomeView::projectCreated, doc, &MainDocument::slotProjectCreated);
+     connect(v, &WelcomeView::finished, this, &Part::finish);
+ 
+@@ -197,50 +194,6 @@ QWidget *Part::createWelcomeView(KoMainWindow *mw)
+     return v;
+ }
+ 
+-void Part::slotShowIntroduction()
+-{
+-    startUpWidget->setCurrentIndex(1);
+-    slotOpenUrlRequest(static_cast<HtmlView*>(startUpWidget->currentWidget()), QUrl("about:plan/main"));
+-}
+-
+-void Part::slotOpenUrlRequest(HtmlView *v, const QUrl &url)
+-{
+-    debugPlan<<url;
+-    if (url.scheme() == QLatin1String("about")) {
+-        if (url.url() == QLatin1String("about:close")) {
+-            startUpWidget->setCurrentIndex(0);
+-            return;
+-        }
+-        if (url.url().startsWith(QLatin1String("about:plan"))) {
+-            MainDocument *doc = static_cast<MainDocument*>(document());
+-            doc->aboutPage().generatePage(v->htmlPart(), url);
+-            return;
+-        }
+-    }
+-    if (url.scheme() == QLatin1String("help")) {
+-        KHelpClient::invokeHelp("", url.fileName());
+-        return;
+-    }
+-    // try to open the url
+-    debugPlan<<url<<"is external, discard";
+-    new KRun(url,  currentMainwindow());
+-}
+-
+-QWidget *Part::createIntroductionView()
+-{
+-    HtmlView *v = new HtmlView(this, document(), startUpWidget);
+-    v->htmlPart().setJScriptEnabled(false);
+-    v->htmlPart().setJavaEnabled(false);
+-    v->htmlPart().setMetaRefreshEnabled(false);
+-    v->htmlPart().setPluginsEnabled(false);
+-
+-    slotOpenUrlRequest(v, QUrl("about:plan/main"));
+-
+-    connect(v, &KPlato::HtmlView::openUrlRequest, this, &KPlato::Part::slotOpenUrlRequest);
+-
+-    return v;
+-}
+-
+ void Part::configure(KoMainWindow *mw)
+ {
+     //debugPlan;
+diff --git a/src/kptpart.h b/src/kptpart.h
+index 90f50257..20429fe2 100644
+--- a/src/kptpart.h
++++ b/src/kptpart.h
+@@ -33,7 +33,6 @@ class QStackedWidget;
+ namespace KPlato
+ {
+ class MainDocument;
+-class HtmlView;
+ 
+ class PLAN_EXPORT Part : public KoPart
+ {
+@@ -63,8 +62,6 @@ public Q_SLOTS:
+     void finish();
+ 
+ protected Q_SLOTS:
+-    void slotShowIntroduction();
+-    void slotOpenUrlRequest(KPlato::HtmlView *v, const QUrl &url);
+     void openTemplate(const QUrl& url) override;
+     void slotOpenTemplate(const QUrl& url);
+ 
+@@ -74,7 +71,6 @@ protected Q_SLOTS:
+ protected:
+     void createStarUpWidget(KoMainWindow *parent);
+     QWidget *createWelcomeView(KoMainWindow *parent);
+-    QWidget *createIntroductionView();
+ 
+ private:
+     KPlato::MainDocument *m_document;
+diff --git a/src/kptview.cpp b/src/kptview.cpp
+index aa2c3dd7..7af53136 100644
+--- a/src/kptview.cpp
++++ b/src/kptview.cpp
+@@ -103,7 +103,6 @@
+ #include "kptpertresult.h"
+ #include "kptinsertfiledlg.h"
+ #include "kptloadsharedprojectsdialog.h"
+-#include "kpthtmlview.h"
+ #include "about/aboutpage.h"
+ #include "kptlocaleconfigmoneydialog.h"
+ #include "kptflatproxymodel.h"
+@@ -196,7 +195,6 @@ View::View(KoPart *part, MainDocument *doc, QWidget *parent)
+ ////////////////////////////////////////////////////////////////////////////////////////////////////
+ 
+     // Add sub views
+-    createIntroductionView();
+ 
+     // The menu items
+     // ------ File
+@@ -258,11 +256,6 @@ View::View(KoPart *part, MainDocument *doc, QWidget *parent)
+     connect(actionOpenReportFile, QAction::triggered, this, &View::slotOpenReportFile);
+ #endif
+ 
+-    // ------ Help
+-    actionIntroduction  = new QAction(koIcon("dialog-information"), i18n("Introduction to Plan"), this);
+-    actionCollection()->addAction("plan_introduction", actionIntroduction);
+-    connect(actionIntroduction, &QAction::triggered, this, &View::slotIntroduction);
+-
+     // ------ Popup
+     actionOpenNode  = new QAction(koIcon("document-edit"), i18n("Edit..."), this);
+     actionCollection()->addAction("node_properties", actionOpenNode);
+@@ -762,46 +755,6 @@ ViewInfo View::defaultCategoryInfo(const QString &type) const
+     return vi;
+ }
+ 
+-void View::slotOpenUrlRequest(HtmlView *v, const QUrl &url)
+-{
+-    debugPlan<<url;
+-    if (url.scheme() == QLatin1String("about")) {
+-        if (url.url() == QLatin1String("about:close")) {
+-            int view = m_visitedViews.count() < 2 ? qMin(m_defaultView, m_tab->count()-1) : m_visitedViews.at(m_visitedViews.count() - 2);
+-            debugPlan<<"Prev:"<<view<<m_visitedViews;
+-            m_tab->setCurrentIndex(view);
+-            return;
+-        }
+-        if (url.url().startsWith(QLatin1String("about:plan"))) {
+-            getPart()->aboutPage().generatePage(v->htmlPart(), url);
+-            return;
+-        }
+-    }
+-    if (url.scheme() == QLatin1String("help")) {
+-        KHelpClient::invokeHelp("", url.fileName());
+-        return;
+-    }
+-    // try to open the url
+-    debugPlan<<url<<"is external, try to open";
+-    new KRun(url, mainWindow());
+-}
+-
+-ViewBase *View::createIntroductionView()
+-{
+-    HtmlView *v = new HtmlView(getKoPart(), getPart(), m_tab);
+-    v->htmlPart().setJScriptEnabled(false);
+-    v->htmlPart().setJavaEnabled(false);
+-    v->htmlPart().setMetaRefreshEnabled(false);
+-    v->htmlPart().setPluginsEnabled(false);
+-
+-    slotOpenUrlRequest(v, QUrl("about:plan/main"));
+-
+-    connect(v, &HtmlView::openUrlRequest, this, &View::slotOpenUrlRequest);
+-
+-    m_tab->addWidget(v);
+-    return v;
+-}
+-
+ ViewBase *View::createResourceAppointmentsGanttView(ViewListItem *cat, const QString &tag, const QString &name, const QString &tip, int index)
+ {
+     ResourceAppointmentsGanttView *v = new ResourceAppointmentsGanttView(getKoPart(), getPart(), m_tab);
+@@ -1966,12 +1919,6 @@ void View::slotDefineWBSFinished(int result)
+     dia->deleteLater();
+ }
+ 
+-void View::slotIntroduction()
+-{
+-    m_tab->setCurrentIndex(0);
+-}
+-
+-
+ Calendar *View::currentCalendar()
+ {
+     ViewBase *v = dynamic_cast<ViewBase*>(m_tab->currentWidget());
+diff --git a/src/kptview.h b/src/kptview.h
+index b9242811..33b9a198 100644
+--- a/src/kptview.h
++++ b/src/kptview.h
+@@ -84,7 +84,6 @@ class ResourceGroup;
+ class Relation;
+ class Context;
+ class ViewAdaptor;
+-class HtmlView;
+ class ReportView;
+ 
+ class ReportDesignDialog;
+@@ -179,8 +178,6 @@ public Q_SLOTS:
+ 
+     void slotCreateView();
+ 
+-    void slotIntroduction();
+-
+     void openRelationDialog(KPlato::Node *par, KPlato::Node *child);
+     void slotEditRelation(KPlato::Relation *rel);
+     void slotAddRelation(KPlato::Node *par, KPlato::Node *child, int linkType);
+@@ -258,8 +255,6 @@ protected Q_SLOTS:
+     void slotMailWorkpackage(KPlato::Node *node, KPlato::Resource *resource = nullptr);
+     void slotPublishWorkpackages(const QList<KPlato::Node*> &nodes, KPlato::Resource *resource, bool mailTo);
+ 
+-    void slotOpenUrlRequest(KPlato::HtmlView *v, const QUrl &url);
+-
+     void createReportView(const QDomDocument &doc);
+ 
+     void saveTaskModule(const QUrl &url, KPlato::Project *project);
+@@ -281,8 +276,6 @@ protected:
+ 
+     ViewBase *currentView() const;
+ 
+-    ViewBase *createIntroductionView();
+-
+ private Q_SLOTS:
+     void slotActionDestroyed(QObject *o);
+     void slotViewListItemRemoved(KPlato::ViewListItem *item);
+@@ -383,9 +376,6 @@ private:
+     // ------ Settings
+     QAction *actionConfigure;
+ 
+-    // ------ Help
+-    QAction *actionIntroduction;
+-
+     // ------ Popup
+     QAction *actionOpenNode;
+     QAction *actionTaskProgress;
+diff --git a/src/libs/ui/CMakeLists.txt b/src/libs/ui/CMakeLists.txt
+index ca22f77f..15d8087c 100644
+--- a/src/libs/ui/CMakeLists.txt
++++ b/src/libs/ui/CMakeLists.txt
+@@ -96,8 +96,6 @@ set(planui_LIB_SRCS
+     kptworkpackagemergedialog.cpp
+     kptrecalculatedialog.cpp
+ 
+-    kpthtmlview.cpp
+-
+     locale/localemon.cpp
+     kptlocaleconfigmoneydialog.cpp
+ 
+@@ -166,13 +164,12 @@ target_link_libraries(planui
+     PUBLIC
+         planmain
+         planmodels
+-        KF5::KHtml
++        KF5::TextWidgets
+     PRIVATE
+         KChart
+         KF5::ItemViews
+         KF5::IconThemes
+         KF5::Archive
+-        KF5::TextWidgets
+         KF5::KIOCore
+         KF5::KIOFileWidgets
+         KF5::KIOWidgets
+diff --git a/src/welcome/WelcomeView.cpp b/src/welcome/WelcomeView.cpp
+index bede7f4f..b6115fd7 100644
+--- a/src/welcome/WelcomeView.cpp
++++ b/src/welcome/WelcomeView.cpp
+@@ -156,14 +156,6 @@ WelcomeView::WelcomeView(KoPart *part, KoDocument *doc, QWidget *parent)
+                           "<nl/>This enables you to quickly open projects you have worked on recently."
+                           "</para>"));
+ 
+-    Help::add(ui.introductionBtn,
+-                   xi18nc("@info:whatsthis",
+-                          "<title>Introduction to <application>Plan</application></title>"
+-                          "<para>"
+-                          "These introductory pages gives you hints and tips on what"
+-                          " you can use <application>Plan</application> for, and how to use it."
+-                          "</para>"));
+-
+     Help::add(ui.contextHelp,
+                    xi18nc("@info:whatsthis",
+                           "<title>Context help</title>"
+@@ -199,7 +191,6 @@ WelcomeView::WelcomeView(KoPart *part, KoDocument *doc, QWidget *parent)
+     connect(ui.newProjectBtn, &QAbstractButton::clicked, this, &WelcomeView::slotNewProject);
+     connect(ui.createResourceFileBtn, &QAbstractButton::clicked, this, &WelcomeView::slotCreateResourceFile);
+     connect(ui.openProjectBtn, &QAbstractButton::clicked, this, &WelcomeView::slotOpenProject);
+-    connect(ui.introductionBtn, &QAbstractButton::clicked, this, &WelcomeView::showIntroduction);
+ 
+     connect(ui.recentProjects, &QAbstractItemView::activated, this, &WelcomeView::slotRecentFileSelected);
+ 
+diff --git a/src/welcome/WelcomeView.h b/src/welcome/WelcomeView.h
+index a09ebe2d..be604de7 100644
+--- a/src/welcome/WelcomeView.h
++++ b/src/welcome/WelcomeView.h
+@@ -64,7 +64,6 @@ Q_SIGNALS:
+     void newProject();
+     void openProject();
+     void recentProject(const QUrl &file, KoPart *part);
+-    void showIntroduction();
+     void selectDefaultView();
+     void loadSharedResources(const QUrl &url, const QUrl &projects);
+     void openExistingFile(const QUrl &url);
+diff --git a/src/welcome/WelcomeView.ui b/src/welcome/WelcomeView.ui
+index 7317214b..9b3363db 100644
+--- a/src/welcome/WelcomeView.ui
++++ b/src/welcome/WelcomeView.ui
+@@ -231,14 +231,10 @@
+         </spacer>
+        </item>
+        <item>
+-        <widget class="QPushButton" name="introductionBtn">
++        <widget class="QLabel" name="label_6">
+          <property name="text">
+           <string>Introduction</string>
+          </property>
+-         <property name="icon">
+-          <iconset theme="help-hint">
+-           <normaloff>.</normaloff>.</iconset>
+-         </property>
+         </widget>
+        </item>
+        <item>
+-- 
+2.29.1
+
+
+From 8aec5de56c525e71ae650abd4abfba756f5e5724 Mon Sep 17 00:00:00 2001
+From: Dag Andersen <dag.andersen@kdemail.net>
+Date: Mon, 26 Oct 2020 14:17:48 +0100
+Subject: [PATCH 2/2] User docs now on docs.kde.org
+
+---
+ src/welcome/WelcomeView.ui | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/welcome/WelcomeView.ui b/src/welcome/WelcomeView.ui
+index 9b3363db..741913b3 100644
+--- a/src/welcome/WelcomeView.ui
++++ b/src/welcome/WelcomeView.ui
+@@ -307,7 +307,7 @@
+         <string>https://userbase.kde.org/Plan</string>
+        </property>
+        <property name="text">
+-        <string comment="@action:button">&lt;a href=&quot;https://userbase.kde.org/Plan&quot;&gt;Plan user documentation&lt;/a&gt;</string>
++        <string comment="@action:button">&lt;a href=&quot;https://docs.kde.org/index.php?application=calligraplan&quot;&gt;Plan user documentation&lt;/a&gt;</string>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignCenter</set>
+-- 
+2.29.1
+

app-office/libreoffice/Manifest

@@ -22,4 +22,4 @@ DIST libreoffice-6.4.7.2.tar.xz 232364676 BLAKE2B 1df8f2a3aa00bd057dd1d6d9665a54
 DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
 DIST libreoffice-help-6.4.6.2.tar.xz 88297908 BLAKE2B 919758e81ed46138331b49668f89c6bf7f50253d7632d113aa957f524ae26e2b99f2ba490b405830314822ea91185eb2308018df77c5bd3d7197cbba940ae2ba SHA512 8ada2568a40dc4f1c843cb37dde6abe3bd61b6e5d9910b985096821e1fce5af47d4a10bff8ae91913298e593130bc1f8668b4e1c59c46591d457157e3d4b7501
 DIST libreoffice-help-6.4.7.2.tar.xz 88296892 BLAKE2B 9ee12ec6aa6d5539408e0206e313901540533e28686585fa0bb4edbeaa482bb0ad1cd4ae37ac18dab66bb3e2ea32d52d9960236cbf3e0f8fb5ca07c007f38794 SHA512 a5381a8cca9988998dc01d3815869e47193c1da814b714cbedb51a2099f7dc5444315c657e32defab2eb0b9a9e2a922bc4c5fbc36b7a2b60e7c551887a9cdbb3
-DIST skia-m83-8ce842d38d0b32149e874d6855c91e8c68ba65a7.tar.xz 8218672 BLAKE2B cfeb805d82ce1f5dd70c7365983fa8107d5ccda9409b2654c032115cdf8a1c32fa0451162b0cceec3dcc0054e3d0d0e13583ea93843b0d0a6eb948cc31c15ce0 SHA512 1018fc1cc8a7edc15745cc20791f9a22e5b318018ba619d6cb5b6995d3e81ab93c910bb3a42734872d3be54893c2ce7db507b2c61088660b2ce6630ff9b36ebb
+DIST skia-m85-e684c6daef6bfb774a325a069eda1f76ca6ac26c.tar.xz 8375536 BLAKE2B 8e3849123ce426a4dc43705537b176df82c6039a23911d75b7b3b26ca44f4a600c96c67c5f4d935a8d6a5064362f7f2167231b2aafbc44533c07299a8980aafe SHA512 4aeba56400d20e5fe234c7927b3d196233e19513a3202e074a88fad0d14d168221574a5a72b8dd9398cf3a9453c46eba4e4ed23d8d2031522b6cb11bc8bb43c1

app-office/libreoffice/files/libreoffice-7.0.3.1-fix-non-pdfium-build.patch

@@ -0,0 +1,29 @@
+From 5f3f17a9c64e33fb787a79dc94d902147da77d71 Mon Sep 17 00:00:00 2001
+From: Noel Grandin <noelgrandin@gmail.com>
+Date: Sat, 19 Sep 2020 20:38:29 +0200
+Subject: fix non-pdfium build
+
+Change-Id: Ic1e30a412927748ba58a21cf2ee922cd1a490aa4
+Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103040
+Tested-by: Jenkins
+Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
+---
+ vcl/source/filter/ipdf/pdfread.cxx       |  2 +-
+ xmlsecurity/source/pdfio/pdfdocument.cxx | 12 +++++++-----
+ 2 files changed, 8 insertions(+), 6 deletions(-)
+
+diff --git a/vcl/source/filter/ipdf/pdfread.cxx b/vcl/source/filter/ipdf/pdfread.cxx
+index 39c2933be8d5..a9b079a75bc3 100644
+--- a/vcl/source/filter/ipdf/pdfread.cxx
++++ b/vcl/source/filter/ipdf/pdfread.cxx
+@@ -220,7 +220,7 @@ size_t RenderPDFBitmaps(const void* pBuffer, int nSize, std::vector<Bitmap>& rBi
+     (void)rBitmaps;
+     (void)nFirstPage;
+     (void)nPages;
+-    (void)fResolutionDPI;
++    (void)pSizeHint;
+     return 0;
+ #endif // HAVE_FEATURE_PDFIUM
+ }
+-- 
+cgit v1.2.1

app-office/libreoffice/libreoffice-6.4.9999.ebuild → app-office/libreoffice/libreoffice-7.0.9999.ebuild

@@ -44,7 +44,11 @@ unset DEV_URI
 # These are bundles that can't be removed for now due to huge patchsets.
 # If you want them gone, patches are welcome.
 ADDONS_SRC=(
-	# QR code generating library for >=libreoffice-6.4
+	# not packaged in Gentoo, https://www.netlib.org/fp/dtoa.c
+	"${ADDONS_URI}/dtoa-20180411.tgz"
+	# not packaged in Gentoo, https://skia.org/
+	"${ADDONS_URI}/skia-m85-e684c6daef6bfb774a325a069eda1f76ca6ac26c.tar.xz"
+	# QR code generating library for >=libreoffice-6.4, bug #691740
 	"${ADDONS_URI}/QR-Code-generator-1.4.0.tar.gz"
 	"base? (
 		${ADDONS_URI}/commons-logging-1.2-src.tar.gz
@@ -235,7 +239,10 @@ DEPEND="${COMMON_DEPEND}
 	x11-libs/libXtst
 	java? (
 		dev-java/ant-core
-		>=virtual/jdk-1.8
+		|| (
+			dev-java/openjdk:11
+			dev-java/openjdk-bin:11
+		)
 	)
 	test? (
 		app-crypt/gnupg
@@ -250,7 +257,11 @@ RDEPEND="${COMMON_DEPEND}
 	!app-office/openoffice
 	media-fonts/liberation-fonts
 	|| ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
-	java? ( >=virtual/jre-1.8 )
+	java? ( || (
+		dev-java/openjdk:11
+		dev-java/openjdk-jre-bin:11
+		>=virtual/jre-1.8
+	) )
 	kde? ( kde-frameworks/breeze-icons:* )
 "
 if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
@@ -267,10 +278,6 @@ PATCHES=(
 	# not upstreamable stuff
 	"${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
 	"${FILESDIR}/${PN}-6.1-nomancompress.patch"
-
-	# git master
-	"${FILESDIR}/${PN}-6.4.3.2-boost-1.73.patch" # bug 721806
-	"${FILESDIR}/${PN}-6.4.6.2-llvm-10.patch" # bug 713574
 )
 
 S="${WORKDIR}/${PN}-${MY_PV}"
@@ -396,7 +403,7 @@ src_configure() {
 	# --without-system-sane: just sane.h header that is used for scan in writer,
 	#   not linked or anything else, worthless to depend on
 	# --disable-pdfium: not yet packaged
-	# --without-system-qrencode: has no real build system and LO is the only user
+	# --without-system-qrcodegen: has no real build system and LO is the only user
 	local myeconfargs=(
 		--with-system-dicts
 		--with-system-epoxy
@@ -421,7 +428,7 @@ src_configure() {
 		--disable-openssl
 		--disable-pdfium
 		--disable-vlc
-		--with-build-version="${gentoo_buildid}"
+		--with-extra-buildid="${gentoo_buildid}"
 		--enable-extension-integration
 		--with-external-dict-dir="${EPREFIX}/usr/share/myspell"
 		--with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
@@ -487,9 +494,12 @@ src_configure() {
 			--without-junit
 			--without-system-hsqldb
 			--with-ant-home="${ANT_HOME}"
-			--with-jdk-home=$(java-config --jdk-home 2>/dev/null)
-			--with-jvm-path="${EPREFIX}/usr/lib/"
 		)
+		if has_version "dev-java/openjdk:11"; then
+			myeconfargs+=( -with-jdk-home="${EPREFIX}/usr/$(get_libdir)/openjdk-11" )
+		elif has_version "dev-java/openjdk-bin:11"; then
+			myeconfargs+=( --with-jdk-home="/opt/openjdk-bin-11" )
+		fi
 
 		use libreoffice_extensions_scripting-beanshell && \
 			myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )

app-office/libreoffice/libreoffice-9999.ebuild

@@ -47,8 +47,8 @@ ADDONS_SRC=(
 	# not packaged in Gentoo, https://www.netlib.org/fp/dtoa.c
 	"${ADDONS_URI}/dtoa-20180411.tgz"
 	# not packaged in Gentoo, https://skia.org/
-	"${ADDONS_URI}/skia-m83-8ce842d38d0b32149e874d6855c91e8c68ba65a7.tar.xz"
-	# QR code generating library for >=libreoffice-6.4
+	"${ADDONS_URI}/skia-m85-e684c6daef6bfb774a325a069eda1f76ca6ac26c.tar.xz"
+	# QR code generating library for >=libreoffice-6.4, bug #691740
 	"${ADDONS_URI}/QR-Code-generator-1.4.0.tar.gz"
 	"base? (
 		${ADDONS_URI}/commons-logging-1.2-src.tar.gz
@@ -239,7 +239,10 @@ DEPEND="${COMMON_DEPEND}
 	x11-libs/libXtst
 	java? (
 		dev-java/ant-core
-		>=virtual/jdk-1.8
+		|| (
+			dev-java/openjdk:11
+			dev-java/openjdk-bin:11
+		)
 	)
 	test? (
 		app-crypt/gnupg
@@ -254,7 +257,11 @@ RDEPEND="${COMMON_DEPEND}
 	!app-office/openoffice
 	media-fonts/liberation-fonts
 	|| ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
-	java? ( >=virtual/jre-1.8 )
+	java? ( || (
+		dev-java/openjdk:11
+		dev-java/openjdk-jre-bin:11
+		>=virtual/jre-1.8
+	) )
 	kde? ( kde-frameworks/breeze-icons:* )
 "
 if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
@@ -396,7 +403,7 @@ src_configure() {
 	# --without-system-sane: just sane.h header that is used for scan in writer,
 	#   not linked or anything else, worthless to depend on
 	# --disable-pdfium: not yet packaged
-	# --without-system-qrencode: has no real build system and LO is the only user
+	# --without-system-qrcodegen: has no real build system and LO is the only user
 	local myeconfargs=(
 		--with-system-dicts
 		--with-system-epoxy
@@ -421,7 +428,7 @@ src_configure() {
 		--disable-openssl
 		--disable-pdfium
 		--disable-vlc
-		--with-build-version="${gentoo_buildid}"
+		--with-extra-buildid="${gentoo_buildid}"
 		--enable-extension-integration
 		--with-external-dict-dir="${EPREFIX}/usr/share/myspell"
 		--with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
@@ -487,9 +494,12 @@ src_configure() {
 			--without-junit
 			--without-system-hsqldb
 			--with-ant-home="${ANT_HOME}"
-			--with-jdk-home=$(java-config --jdk-home 2>/dev/null)
-			--with-jvm-path="${EPREFIX}/usr/lib/"
 		)
+		if has_version "dev-java/openjdk:11"; then
+			myeconfargs+=( -with-jdk-home="${EPREFIX}/usr/$(get_libdir)/openjdk-11" )
+		elif has_version "dev-java/openjdk-bin:11"; then
+			myeconfargs+=( --with-jdk-home="/opt/openjdk-bin-11" )
+		fi
 
 		use libreoffice_extensions_scripting-beanshell && \
 			myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )

app-portage/eix/Manifest

@@ -1,3 +1,4 @@
 DIST eix-0.34.10.tar.xz 630356 BLAKE2B 6336652dbb3703295693dea40cb2d2a2d5c7fc17d28150faae07b566cccfddb8d103b83c5db34e839434b1fbbe0ff87a08c4af84d2f80c5e9b786d88d5743f96 SHA512 35270b7fafe6a13ebb33271b3baba07f61928d9c9c40aafabc47d8f7bd4a8d44e1013004361e9cf81e8517d5b1a8a3010d18c6fcac02dcc8b44dc443762f82a3
+DIST eix-0.34.11.tar.xz 629932 BLAKE2B 7b203a4763a880379e5bafe086f70aeca6ad508cd558cc53d53683d8ee4a85111ba9fdea9fa81cd9c3939dd01ea392876b2714257138fd40a2c6b124e0fdbc90 SHA512 518dee499ed27acd39ea4c26e7b94a1098408b1d8cf6bc593e5e4b06aa973ae664e155886681c1e90e4a89afe8b54e05f8bd08d6ace2a2e1559fa613e5a351e7
 DIST eix-0.34.4.tar.xz 628516 BLAKE2B 0c7cb4d7cd13d7715ba35cc0edd38e549fd1d1618bfdcacb272ee8325a844276a6df59a701ab2b4ecc693e5dad2d95c96c000e96eb8bce72709baf22f3fa490f SHA512 a96714fba8324529bf63de63f9eb11cc76da05e3d43c5eedad49079b6e3a1960376bd5d3bc116dba49bc7f694c7588741e518438936abd4b37edfe0a097ecd3d
 DIST eix-0.34.9.tar.xz 629672 BLAKE2B ba9a5de98f74baa711e7483e284980c0fe5e956512de590954bf848f6cf6baad5db899256e927e7cb984d7276157fa9c42052cc8fb1ccc52e5e530cc31d39d84 SHA512 5cb00c813bc31971a0cfd77cae0c676040d33f24963cb241274918d2e381956ca949593e0637d81040a9751db0a925552913188cc25ada9a90c6007c31f72e43

app-portage/eix/eix-0.34.11.ebuild

@@ -0,0 +1,102 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools bash-completion-r1 flag-o-matic tmpfiles
+
+DESCRIPTION="Search and query ebuilds"
+HOMEPAGE="https://github.com/vaeth/eix/"
+SRC_URI="https://github.com/vaeth/eix/releases/download/v${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="debug doc nls sqlite"
+
+BOTHDEPEND="nls? ( virtual/libintl )
+	sqlite? ( >=dev-db/sqlite-3:= )"
+RDEPEND="${BOTHDEPEND}
+	>=app-shells/push-2.0-r1
+	>=app-shells/quoter-3.0_p2-r1"
+DEPEND="${BOTHDEPEND}
+	app-arch/xz-utils
+	nls? ( sys-devel/gettext )"
+
+pkg_setup() {
+	# remove stale cache file to prevent collisions
+	local old_cache=${EROOT}/var/cache/${PN}
+	if [[ -f ${old_cache} ]]; then
+		rm "${old_cache}" || die
+	fi
+}
+
+src_prepare() {
+	default
+	sed -i -e "s:/:${EPREFIX}/:" tmpfiles.d/eix.conf || die
+
+	sed -e "/eixf_source=/s:push.sh:cat \"${EPREFIX}/usr/share/push/push.sh\":" \
+		-e "/eixf_source=/s:quoter_pipe.sh:cat \"${EPREFIX}/usr/share/quoter/quoter_pipe.sh\":" \
+		-i src/eix-functions.sh.in || die
+	sed -e "s:'\$(bindir)/eix-functions.sh':cat \\\\\"${EPREFIX}/usr/share/eix/eix-functions\\\\\":" \
+		-i src/Makefile.am || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		$(use_enable debug paranoic-asserts)
+		$(use_enable nls)
+		$(use_with doc extra-doc)
+		$(use_with sqlite)
+		--without-protobuf
+
+		# default configuration
+		$(use_with prefix always-accept-keywords)
+		--with-dep-default
+		--with-required-use-default
+
+		# paths
+		--with-portage-rootpath="${ROOTPATH}"
+		--with-eprefix-default="${EPREFIX}"
+
+		# build a single executable with symlinks
+		--disable-separate-binaries
+		--disable-separate-tools
+
+		# used purely to control/disrespect *FLAGS
+		--disable-debugging
+		--disable-new_dialect
+		--disable-optimization
+		--disable-strong-optimization
+		--disable-security
+		--disable-nopie-security
+		--disable-strong-security
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	dobashcomp bash/eix
+	dotmpfiles tmpfiles.d/eix.conf
+
+	rm -r "${ED}"/usr/bin/eix-functions.sh || die
+}
+
+pkg_postinst() {
+	tmpfiles_process eix.conf
+
+	local obs=${EROOT}/var/cache/eix.previous
+	if [[ -f ${obs} ]]; then
+		ewarn "Found obsolete ${obs}, please remove it"
+	fi
+}
+
+pkg_postrm() {
+	if [[ ! -n ${REPLACED_BY_VERSION} ]]; then
+		rm -rf "${EROOT}/var/cache/${PN}" || die
+	fi
+}

app-portage/eix/eix-0.34.9.ebuild

@@ -11,7 +11,7 @@ SRC_URI="https://github.com/vaeth/eix/releases/download/v${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug doc nls sqlite"
 
 BOTHDEPEND="nls? ( virtual/libintl )

app-text/mupdf/metadata.xml

@@ -5,4 +5,8 @@
 		<email>johu@gentoo.org</email>
 		<name>Johannes Huber</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>sam@gentoo.org</email>
+		<name>Sam James</name>
+	</maintainer>
 </pkgmetadata>

app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.6.ebuild

@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-pdf-mupdf.git"
 	EGIT_BRANCH="develop"
 else
-	KEYWORDS="~amd64 ~arm x86"
+	KEYWORDS="~amd64 arm x86"
 	SRC_URI="https://github.com/pwmt/zathura-pdf-mupdf/archive/${PV}.tar.gz -> ${P}.tar.gz"
 fi
 

dev-cpp/glibmm/glibmm-2.64.2.ebuild

@@ -9,7 +9,7 @@ HOMEPAGE="https://www.gtkmm.org"
 
 LICENSE="LGPL-2.1+"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="doc debug test"
 RESTRICT="!test? ( test )"
 

dev-cpp/mm-common/mm-common-1.0.1.ebuild

@@ -10,7 +10,7 @@ HOMEPAGE="https://www.gtkmm.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 sparc x86"
 IUSE=""
 
 RDEPEND=""

dev-java/icedtea/Manifest

@@ -1,13 +1,13 @@
-DIST icedtea-3.16-aarch32-ecc1eb1dc760.tar.xz 6854900 BLAKE2B a4b0a4fec267f0dd64618aa83a2cf487e83bfa133e03914a079d451abb6be573e4d157f12372d6d2eaa66f834d4a1ec0bad8f1a65d2619468bb3de8567863036 SHA512 20ba1980a4f4161c632e8ec02330c3b0c971a5eff19456a568b2df4622fcfedb18594c7e350318a15a31a5395c0544899160d71805f0a3d3886ae7a16019c010
-DIST icedtea-3.16-corba-ea3169880d70.tar.xz 947604 BLAKE2B 22e7fdab5168b01501791c9537b72f884cdd008ec912e1e7afb05c410e47ab9fffc37aeeab78400a39b6216612927eb63bdc6ba2169fc7e74fe8d6c60b1af978 SHA512 bf90c95f401d4628e32b9a7ea78b7d43944f82882818a81d2ff368f09e49148091bf823d78ed56c343c175fe6d25492d9b78e25b725f218592ea94c4ae285e56
-DIST icedtea-3.16-hotspot-eeb08cfebded.tar.xz 6906968 BLAKE2B 78bd9ecef9801a190ce2993d1023d6eb3db8276cc7fc726cccbf406e630a4bc62401299885de42df85f92611da10c732ae50600af9e337dcf3014472777ba38a SHA512 19490ccc377fde5dc3d4396425e945f32e121ad0cc4be394b07f8698a7e3805b16fc41e427bab5fa290cb84efc7edb62acf8ca98072176343f5584d692592d2d
-DIST icedtea-3.16-jaxp-883803235596.tar.xz 2293880 BLAKE2B c749477661d9e492ab15e0b773d641f68865196c8d2897eceeafd341cacf143e73c6b55face57d528ca5d1a648798db4533e7b924daa918c2ce62d26b407bf5b SHA512 86e8c18741c1f4baca27d784b068765e404a5c2ee6ecb172c826fc1d6192b5776133f103b749839c39154fcaec87a0df95e8fd5bcb56b1e9b811711b296a4836
-DIST icedtea-3.16-jaxws-e5d96dc9988a.tar.xz 2276192 BLAKE2B 79c33b530f95ab098297d0cdb5844660df4330555195c366611cadde8478711cc4a0fef3b68a23bbd710d4213298cd4293cdec3d12a07c0682f6e264489e9d11 SHA512 824ef15aa70ec629406fd9b98a69e5699fe8f6a8ab06be00ac546bcda1daf485b20de6ea0310064e000efbaf35b1cebee25bf69033634fdce8434efb3bb16f1d
-DIST icedtea-3.16-jdk-bb9b9a0ad162.tar.xz 39849832 BLAKE2B 2b9b3ca3988955015760c82481a86af73c13b37b0c26714fbdac33de73b70ecf2fb3abcd908406dfe7dc202b02c70d66ba6b64f838b8e0b2ecb55a46944998c3 SHA512 9202f88b360637ad474920d8a6f85740e6a425679617ef713efd67778b4c7ca0b3eba7e4fc9d33de0bbd5dacda4862c8a9b63a13880204388b01af29d5fb6a55
-DIST icedtea-3.16-langtools-e47d37e5fe0b.tar.xz 2078808 BLAKE2B 2f7286c15c90607e67eea8b8ca560cc83a21e4a3ebbb5846afeb79ccfefe0713fe27ebe56a505f263276476e0a99c470171030cbaa406fbbc7cdef13acbf89b1 SHA512 1858bb3b7dd37edd817a52c67a878b48bc9b790623e77d9a6107f54b141638cb101ae3b8df560e3352c9ca2925aa5d493b4924e36a238be5a9628c714cc23642
-DIST icedtea-3.16-nashorn-1d70dcb4ab53.tar.xz 2319492 BLAKE2B c328c3a99fbd49be1efbecbb12e46be57d4cb78c65ca778f95644e2d193a4390ed1ad1ce3cddc6f737241d5e02b18b50adbc37748907db3eabe406a4880a6afb SHA512 4bf87e7441ac747f133612e1fba5c06946c6731bae76132ffc614b41fcb689fda9d9ceb1e1fee3765765c6109894c85cf0f6e6fa9eb301f9a2d640ea6cd1c16c
-DIST icedtea-3.16-openjdk-bca1f7228ce8.tar.xz 363112 BLAKE2B aff804d5b5d58dcb25f9a576aa0a23355d2229f89d5dc69142580d5fab3bdd688225d2e33090714a3d292d9d98758867feaef9c179a4c77b5cab37c21c5f0610 SHA512 76b32457958c2cdbb0006629bb41652286a1a9bfbda862665eddf822d4653d4858f9f2565e849b0e49f031b7667be73be8fe8c71abc65e1795eb570a96d1fd1e
-DIST icedtea-3.16-shenandoah-e4e81ae21643.tar.xz 7081200 BLAKE2B bbbd4f3cc7f3adb34a3c3497c62eeb1336d554f7396b952b94ad8f573295c1537e9c3416fc2d2881efef6d6a1750bd069da0fac37a0d556eeb55a0ace9b7b385 SHA512 adbb279d59d4978403b222caf9f0823b3ae2a0d6e27911a38243fe6ef9b1a7f0d8640d71b67fa510c341dc175031e52b4b6aa6187a37ac467372a55946ae37d3
-DIST icedtea-3.16.0.tar.xz 1534432 BLAKE2B ef8ffc6773c2ea1d71a2bad1f425f891edd65cb61fd22b1c36b06539b9656f211422d897e35b707bac1b0005eaa95d31bab3079c5e31454383be01d9750394ba SHA512 67964f283b5a220ded7c86141ac359fc51f41077686d3e68568a9f303d2e5e6d62472bef2d6f5f9d53897a55589c84d3212983194607b9a6704192752f8ad2ac
+DIST icedtea-3.17-aarch32-3.17.0.tar.xz 7054840 BLAKE2B 461939116607f82b5aef6dd093204dcf383e209630945f6f0ff0360bbe306e7afc2b1ae339911954c2b80446d37e0d25a587912cbfbebe0ace2e701c2e9e9f67 SHA512 493d9a98166255a630306bf1e67e681e0b2ece42b6e7a96c75b2cfb6cb0639b8c9ed8918eb129c9543fab1805a4ac33774f25ecb2272703eabd6eeb680327717
+DIST icedtea-3.17-corba-3.17.0.tar.xz 948464 BLAKE2B 97050f07a9ee39c763cff67dcb19ad772fa2529103647b0ec7cdfd40f926cea67e6e02d3f10e7d5aefd8221476c923630f4b9fd6d5f95ae4c74b46e44c911520 SHA512 cec56b02b47f96ac97d6485fc18ea30100ba64c0acd509d408ddfe43e36e14ebf2345b3fefcf001af378af9ed3628ca8c45add604bd435806eba47c9f2945993
+DIST icedtea-3.17-hotspot-3.17.0.tar.xz 7107508 BLAKE2B 61148d11c2cea5fa18e9d115be7dfefa68825cb5396465c2b1c991402ba1a000f2e780773a83a95741571a38992839206e21f26954773fa2306e1a6d4d7eaad9 SHA512 cb1bdf3ab9aee48e745108d2762992c2a6be21e22bf6633a512f4bff28becb61e4cdd3662e7301aa7067271c6c80a8ac2a65fdb5b432b8c02d38b6fd74c7f9e8
+DIST icedtea-3.17-jaxp-3.17.0.tar.xz 2268024 BLAKE2B c1fe1e2a6f28d7108dcbdead86e5ef0836877ebb89ba0446045aad3797616e5a16125d6d6dba425b244710bba77ce8a5ac4c6780dd0ab2b9b35f51d551f291b3 SHA512 a7d69f94cb7ce63522dbe1d16376ff0f39e5e5f013f3a895070dcb05d524f63ecbb1ab3d109edbd48e3bfc6e5758200c95b7ec18ceb84cc580a93395760b975a
+DIST icedtea-3.17-jaxws-3.17.0.tar.xz 2277156 BLAKE2B 0ea611d90eac928c974d80ae366a95ba7d13b958b7b5e31766ede059015478c3bd87bce4cee2f4350e7dbc8ab27ac2a6e7190efdb61b4e595e8741ab28fa8b1f SHA512 65821e62a2f25e77f3345894d1982e2b6d877ee6ddd2b1dba77b94f1175f7d88fd77ca2d2727f625765702846711f85821f87f62fb6359d2502f57436a22290c
+DIST icedtea-3.17-jdk-3.17.0.tar.xz 40601488 BLAKE2B 18c0629aba53b763680fb2e0dd4ad500db286e584d6aaaf43339559907636f8cd4cae9445131164be810ac2518445c8025d4e361e4c6f31d5436bbea1cb254e3 SHA512 42d5387b228ea3143eb91e4fe661a1d578b879b884f098045b8248c77d1f4a583921c520cfab078847b74615732f2e9318bd532b00ce266dad2364f5a640251d
+DIST icedtea-3.17-langtools-3.17.0.tar.xz 2079284 BLAKE2B 0e1d435a54167cf9b3cd381cf12d156ce59da99dd3f02d72422329ee70d7f00dbb25713c315b36a4569408a7ab376de21f0ae525bf7cb3ef54c5fa51ebe50eb1 SHA512 7cd63565adb0beb0a7bf6efc35dacc9bcc8cc48e0e6462c4f295783a48de999fe877964509b81375603fbae18c231084c82cf22c1ee3bb4309360ec2685cebe0
+DIST icedtea-3.17-nashorn-3.17.0.tar.xz 2320268 BLAKE2B d77ea15aa6d1b268fcd06a3222f7f526cb46887e0454a612ddf7fd57465c166ebe1ce16436c90ada71a097292be334e25622b223fb40708976f3d3cd7514e23a SHA512 50c5a4e4faa377e8b61395062a7b86856553e48a66d32d83730a536bb8c09f768a78dfc604e679c8fa5c9297887d6432012b2db2f7810b00aaebee3c775960b3
+DIST icedtea-3.17-openjdk-3.17.0.tar.xz 364764 BLAKE2B c0bb286b691c50ca9d0e6982dab73929065a3af13f1974bd661a51e4959eec38a045fa7032854a65a17cc3f8a826f881c46eda062225af551da7c22f9591ee4f SHA512 4b074a6b14efcb23476a1fed56d52e8f2defea16f840a714324cfd0c3302e3a742123e86f8964a5708600f0856ae1c4daacd0513eaed35d299512277eed7eca8
+DIST icedtea-3.17-shenandoah-3.17.0.tar.xz 7277048 BLAKE2B 034d27ce07b48d27302180da2b100cdf97adc7109a56e9cb67ee37f93957f009f65a460b706ff563c0022efdfd1749322caee069916df4e090aee217ca60b1cd SHA512 ce7df9784a48028ea69f6a2b0f5b08a13456e71ce3e8773b14e5a7c801b0917dd7f5609e2dcdf574836ec2d69bc0acec0648ee087283052c200822b3786e155d
+DIST icedtea-3.17.0.tar.xz 1565156 BLAKE2B f2b5f0b0ac1de70ddd5faa1215fcb17b5b7bee726ca5dd81bc2e3948c7fd342dfe1d7c9dbd232696bf0f2d68f214b0132f386d182b1fe15ec72cdb77cc0ba67c SHA512 4183037d6829f7fdd25b970853e84bfeecb45adca7fb78e773c431e401c155c212b78bc6daf80d8479c13e9ca63ad5446122a8ec2d6e6b1bede8ee747ba7a91b
 DIST icedtea-cacao-c182f119eaad.tar.xz 3056520 BLAKE2B 6b1be66ce19f491d49f1591babcd8c088e8e327f828dca3f30b8f8b04c132140f8b9f487ef6d91aed212aebab2c7c3052d79fa3f2d76d3832341d94d48e77089 SHA512 22e8a031db5f93f82b276b310c175f1e926e48d64e1e50bebe51138e0f66391cd005501491a959d31663f338f27a29ec984ac29f77078f59472856e4d08edef7
 DIST icedtea-jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz 317187 BLAKE2B 1ca581a02be4cf5c09162687bbc90ec01b58b4910d866d11512cf17a1caff181fdc69e42f7498b2df9deb875ddc6efc6bc2888428f411da94bbc2313ddf5a2c9 SHA512 a31348481e1c02747f5bb9db333f855c45a1555aa187ee35de5ef553a10a8a47dfcc1beb1e69502046c1758438b91958a328e0a0015812c153221f67734a70a6

dev-java/icedtea/icedtea-3.16.0.ebuild → dev-java/icedtea/icedtea-3.17.0.ebuild

@@ -17,16 +17,16 @@ ICEDTEA_BRANCH=$(get_version_component_range 1-2)
 ICEDTEA_PKG=icedtea-${ICEDTEA_VER}
 ICEDTEA_PRE=$(get_version_component_range _)
 
-CORBA_TARBALL="ea3169880d70.tar.xz"
-JAXP_TARBALL="883803235596.tar.xz"
-JAXWS_TARBALL="e5d96dc9988a.tar.xz"
-JDK_TARBALL="bb9b9a0ad162.tar.xz"
-LANGTOOLS_TARBALL="e47d37e5fe0b.tar.xz"
-OPENJDK_TARBALL="bca1f7228ce8.tar.xz"
-NASHORN_TARBALL="1d70dcb4ab53.tar.xz"
-HOTSPOT_TARBALL="eeb08cfebded.tar.xz"
-SHENANDOAH_TARBALL="e4e81ae21643.tar.xz"
-AARCH32_TARBALL="ecc1eb1dc760.tar.xz"
+CORBA_TARBALL="${PV}.tar.xz"
+JAXP_TARBALL="${PV}.tar.xz"
+JAXWS_TARBALL="${PV}.tar.xz"
+JDK_TARBALL="${PV}.tar.xz"
+LANGTOOLS_TARBALL="${PV}.tar.xz"
+OPENJDK_TARBALL="${PV}.tar.xz"
+NASHORN_TARBALL="${PV}.tar.xz"
+HOTSPOT_TARBALL="${PV}.tar.xz"
+SHENANDOAH_TARBALL="${PV}.tar.xz"
+AARCH32_TARBALL="${PV}.tar.xz"
 
 CACAO_TARBALL="cacao-c182f119eaad.tar.xz"
 JAMVM_TARBALL="jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz"
@@ -137,10 +137,10 @@ RDEPEND="${COMMON_DEP}
 # Ant is no longer needed under the new build system
 DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP} ${X_DEPEND}
 	|| (
+		dev-java/openjdk-bin:8
+		dev-java/openjdk:8
 		dev-java/icedtea-bin:8
 		dev-java/icedtea:8
-		dev-java/openjdk:8
-		dev-java/openjdk-bin:8
 	)
 	app-arch/cpio
 	app-arch/unzip
@@ -179,8 +179,8 @@ pkg_setup() {
 	icedtea_check_requirements
 
 	JAVA_PKG_WANT_BUILD_VM="
-		icedtea-8 icedtea-bin-8
-		openjdk-8 openjdk-bin-8"
+		openjdk-8 openjdk-bin-8
+		icedtea-8 icedtea-bin-8"
 	JAVA_PKG_WANT_SOURCE="1.5"
 	JAVA_PKG_WANT_TARGET="1.5"
 

dev-java/maven-bin/maven-bin-3.6.3.ebuild

@@ -16,7 +16,7 @@ HOMEPAGE="https://maven.apache.org/"
 
 LICENSE="Apache-2.0"
 SLOT="3.6"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 
 DEPEND="
 	>=virtual/jdk-1.8

dev-java/openjdk-bin/Manifest

@@ -1,15 +1,8 @@
-DIST OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.8_10.tar.gz 190206674 BLAKE2B 1e5ac030b23cdcd16e9efb696bf4f22da1178234241c4951b36d19e9567c8e838e99311be0aafe336b92cd5cecd2a53bb4dcfdd40f7ad13a26abaf41dddc5cbc SHA512 e81cc6a0d3aa3afdf021b8a5c39fc821827eba3010c437d97ad219336749b15cbb057bc92b129b0899da104066003554065e5591a6fda622b9852db2ad895237
 DIST OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.9_11.tar.gz 190728488 BLAKE2B beda483e90e733932ca9cf9631ae3f97b7106fd3c80b4a70465f9d32d52bf2ba4f395fa5ad7b08a4998e5c72f3794e0189750a883422aaeaf42877750d7c4647 SHA512 a9fbd1336357bf7880e6eebaab9649ca2b5db5ea93bb184e9fa682d64f18bfa0addb87de5a04e13bc337536b2edce5189bba703c8eb3a524567073add6d29a95
-DIST OpenJDK11U-jdk_arm_linux_hotspot_11.0.8_10.tar.gz 182327847 BLAKE2B ad71bfd979f27ffd05abea804069402a7a47906cff70cbe68c29a8185d97043e4e28471d6444af757955c9be5d73d8d17f3f73120b8d2997dc5fb5b21f9045dc SHA512 32843b32d89125da14c8e77509e4dfb86b1aae55407edabb52a592a29ecb3ba17d300b91751f937189f370edfd57d60fa622cb9da2a9e190f35b219d0cd58774
 DIST OpenJDK11U-jdk_arm_linux_hotspot_11.0.9_11.tar.gz 182835103 BLAKE2B 2b8849c5b9f490bf7700317525d3538ace19abcd73436a5c27251a282348345dba3c438c062ee60a2070f64c8c8e93a5d5d632a44f410775ed4fff1d691219f8 SHA512 707efc9d0660f0c06d4955e56761422b9da41b5afacfa337711c6a2500441f80fad1c65d8a4b0a1334ec6d5c6e55d464fc1cff1ade21e8cca42cffd0c161c1e2
-DIST OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.8_10.tar.gz 176566452 BLAKE2B 584adc02d816cda72e5396d9e2a34768fe9c1ad3f6b37ad4b599ee45ee008389d7bec93ca983aec3e91995fa05548137f4ecb5c84b524333e0c7a35c5fc917ec SHA512 ab7768556488f0d13c3868e65ee22bedfaffc904d2b6af6d1c0ad48a382c2bc761dce99bd3a196e4ddd2a67f56019774a84edeab7db3e9e4650ef020f0d2e0a5
 DIST OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.9_11.tar.gz 177065013 BLAKE2B 04bb16a464a7984df770c52c5e2b8b1d9ec79142eb8a9c9a95a8ea02656b823a2505085e1521d94b9d994a1f5675fb524b917c9fdea46269e45a43d10c066947 SHA512 45619214cfc54be5b68e1ac8112a239a156be5a126631b2ff994a3b70e2e0aa899e5f9a4d31381eba2eb743790e4bdc2014ac342419a004502ce40945b3f4890
-DIST OpenJDK11U-jdk_x64_linux_hotspot_11.0.8_10.tar.gz 193398310 BLAKE2B 079f48381bf58edb7b9b75f4305df72184710c90101588fccce4edb0535b976b2f6332b66fdd8cf8b442eebbeee5a6044e0445519f9bbd8ed20b02f50e9fc203 SHA512 115b5627d6d1245f8393e3cd869bdb7accb42c35bc0e9030fb60701f61253ea8ce382edec75ded85ff5b0a0c8bbfbecdec81b16aef87fb6fc76c684628abf1e5
 DIST OpenJDK11U-jdk_x64_linux_hotspot_11.0.9_11.tar.gz 193980586 BLAKE2B cc927d923ca29ca41ea9cfc38bf07761904fb9f31fa59b5c882ec260d982a9af6c49034d80e6ed4d141c5ece1a1d297c3c153358ad940e61a4f667c53d6c040c SHA512 1ccaba9673a85287953a6ffbedf7caec4c2d64e0a121277bca6e40a6d47eaf414ed7470971f271e28309b97e95268348a7ad4fb2a03861eeb193d1f0536f2727
-DIST OpenJDK8U-jdk_aarch64_linux_hotspot_8u265b01.tar.gz 103150208 BLAKE2B 70880514e63402b740554cde3eba80106e2494d354751a620e54cde0376cebbf1ca5c2b10b0c340f59d9d1f390791c07ba39b13e72c938872e2a8b102b608f34 SHA512 37d9efe9c087dae9c180ee47e9f4f010e7726f4578edb5638d40ab4aea450912e3fa5e1d9254f6290779f43ffb5b0c6d1e3e9ac42c889b0c50072645deadbddb
 DIST OpenJDK8U-jdk_aarch64_linux_hotspot_8u272b10.tar.gz 103598972 BLAKE2B 34ee2fc6a1cf23c9c04522a82f74ba60c53cc461e370c8aa88d6b62b4c4539e96d233a232f38390b9f0932768c5fb662a44e425d0f5bebbf982c657686b163d7 SHA512 5b44f094219daf383743d463c50917c2d60b289187e363748c3a4dc16471d84e4d28b6bc30879d137b79645f7ce977c755e8a5714bc272e012bce900f3db8ea4
-DIST OpenJDK8U-jdk_arm_linux_hotspot_8u265b01.tar.gz 97641656 BLAKE2B 76d24e975c2ec173b6b4806d145f79d02828e12e2dd412b60a921648fba20920b3b69b03630ece8d5cefeaf408dad01573b15db7f4a7bbdd024806a7b01bd6ae SHA512 8f96d73038579d2873b84d19bfbcc7f481b031a91c35d86d35e127951b6c743a6a1d5230a61ebcacddf854b73c55b18cc53112b9a2759b283254bf93fd691459
-DIST OpenJDK8U-jdk_ppc64le_linux_hotspot_8u265b01.tar.gz 100453105 BLAKE2B e57230d5f90821cb8f4c35baf0e5a9580164ad7df10ac67a528b959154317ea14b7bc0dd5c530a2b826ab6322611ddf2387617bc8dd1f444039b00a778a30025 SHA512 6de5694d0415e905848cc99ec6863e96640fca3ded4e851528c794dad82a0961e097f64f8338304d9325357729ae9ea5bc5d2eceecefebdad69a14bc7b50194a
+DIST OpenJDK8U-jdk_arm_linux_hotspot_8u272b10.tar.gz 99368824 BLAKE2B 970a0859a09002978b7603beb9cd94556fcdbb8923a88e48dca167e5ecc1495fddd00c786c7b9c0e608de48d485b2e8b4da7491d4e85e488fd1baf7ddc021951 SHA512 6974c06644aed4c7fb8f6004f4d8fd7790252e148ecfb3e1d29a7251429e413e8adbd910231b3cd5b9dd195a570b3fbeb95e6ab09b3ae318f3f842eb7ac418c6
 DIST OpenJDK8U-jdk_ppc64le_linux_hotspot_8u272b10.tar.gz 100818464 BLAKE2B b2666ed3bf564bdbac874320805f622a1bd80809cf2c402ee393ed585c7ae9e7aa6fcf0e69f70fde16ef5d3a2059ff2979013865112c455cb64761c521a04578 SHA512 bfc138bbb979c23fdb154fa3f7e61ae71b0703a839c9495a470544205c80511ab090f0e52e228050e38606e24c2912092ef601347a9a3979f3a7a25d1ca15ce3
-DIST OpenJDK8U-jdk_x64_linux_hotspot_8u265b01.tar.gz 103157351 BLAKE2B efd8a4bcab5472c9775997713b09ab9e94ef4636564f07392263d6963850e07dc07569b2c066856846c16229f1641c169eecedcbb61533067af330262f07b927 SHA512 932fe2702aa3575bcb08d01e384fbd6a49768280931fdc1fb56314656343dc2f8e5b2650c8d72369d0294ac6024df0a142fd14cb0768f9aa7831aa986679e9ae
 DIST OpenJDK8U-jdk_x64_linux_hotspot_8u272b10.tar.gz 103650413 BLAKE2B 6fd50cdefa5daf6d155000b653b695511953d486ba9f4bf7426caf8dc6d7b7d3cf46c4426982a400c19a6fe0f6eb557a232853c3e4211e1961e8aa890c1721cf SHA512 22a4b5c27d2fad79b7bf8a8ae896a9b30e3d303bb4ca30611dbbb1f5811f4524a98c44a68c4546906f566b7d672f6ab48d10cf270870c1b86e7a7688d249c555

dev-java/openjdk-bin/openjdk-bin-11.0.8_p10.ebuild

@@ -1,111 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit java-vm-2 toolchain-funcs
-
-abi_uri() {
-	echo "${2-$1}? (
-			https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk-${MY_PV}/OpenJDK${SLOT}U-jdk_${1}_linux_hotspot_${MY_PV//+/_}.tar.gz
-		)"
-}
-
-MY_PV=${PV/_p/+}
-SLOT=${MY_PV%%[.+]*}
-
-SRC_URI="
-	$(abi_uri arm)
-	$(abi_uri aarch64 arm64)
-	$(abi_uri ppc64le ppc64)
-	$(abi_uri x64 amd64)
-"
-
-DESCRIPTION="Prebuilt Java JDK binaries provided by AdoptOpenJDK"
-HOMEPAGE="https://adoptopenjdk.net"
-LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
-IUSE="alsa cups +gentoo-vm headless-awt selinux source"
-
-RDEPEND="
-	media-libs/fontconfig:1.0
-	media-libs/freetype:2
-	>=sys-apps/baselayout-java-0.1.0-r1
-	>=sys-libs/glibc-2.2.5:*
-	sys-libs/zlib
-	alsa? ( media-libs/alsa-lib )
-	cups? ( net-print/cups )
-	selinux? ( sec-policy/selinux-java )
-	!headless-awt? (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXi
-		x11-libs/libXrender
-		x11-libs/libXtst
-	)"
-
-RESTRICT="preserve-libs splitdebug"
-QA_PREBUILT="*"
-
-S="${WORKDIR}/jdk-${MY_PV}"
-
-pkg_pretend() {
-	if [[ "$(tc-is-softfloat)" != "no" ]]; then
-		die "These binaries require a hardfloat system."
-	fi
-}
-
-src_install() {
-	local dest="/opt/${P}"
-	local ddest="${ED%/}/${dest#/}"
-
-	# Not sure why they bundle this as it's commonly available and they
-	# only do so on x86_64. It's needed by libfontmanager.so. IcedTea
-	# also has an explicit dependency while Oracle seemingly dlopens it.
-	rm -vf lib/libfreetype.so || die
-
-	# Oracle and IcedTea have libjsoundalsa.so depending on
-	# libasound.so.2 but AdoptOpenJDK only has libjsound.so. Weird.
-	if ! use alsa ; then
-		rm -v lib/libjsound.* || die
-	fi
-
-	if use headless-awt ; then
-		rm -v lib/lib*{[jx]awt,splashscreen}* || die
-	fi
-
-	if ! use source ; then
-		rm -v lib/src.zip || die
-	fi
-
-	rm -v lib/security/cacerts || die
-	dosym ../../../../etc/ssl/certs/java/cacerts \
-		"${dest}"/lib/security/cacerts
-
-	dodir "${dest}"
-	cp -pPR * "${ddest}" || die
-
-	# provide stable symlink
-	dosym "${P}" "/opt/${PN}-${SLOT}"
-
-	use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
-	java-vm_set-pax-markings "${ddest}"
-	java-vm_revdep-mask
-	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
-}
-
-pkg_postinst() {
-	java-vm-2_pkg_postinst
-
-	if use gentoo-vm ; then
-		ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JDK"
-		ewarn "recognised by the system. This will almost certainly break"
-		ewarn "many java ebuilds as they are not ready for openjdk-11"
-	else
-		ewarn "The experimental gentoo-vm USE flag has not been enabled so this JDK"
-		ewarn "will not be recognised by the system. For example, simply calling"
-		ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo"
-		ewarn "fully supports Java 11. This JDK must therefore be invoked using its"
-		ewarn "absolute location under ${EPREFIX}/opt/${P}."
-	fi
-}

dev-java/openjdk-bin/openjdk-bin-8.265_p01.ebuild

@@ -1,92 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eapi7-ver java-vm-2
-
-abi_uri() {
-	echo "${2-$1}? (
-			https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk${MY_PV}/OpenJDK8U-jdk_${1}_linux_hotspot_${MY_PV/-/}.tar.gz
-		)"
-}
-
-MY_PV=$(ver_rs 1 'u' 2 '-' ${PV//p/b})
-SLOT="$(ver_cut 1)"
-
-DESCRIPTION="Prebuilt Java JDK binaries provided by AdoptOpenJDK"
-HOMEPAGE="https://adoptopenjdk.net"
-SRC_URI="
-	$(abi_uri aarch64 arm64)
-	$(abi_uri arm)
-	$(abi_uri ppc64le ppc64)
-	$(abi_uri x64 amd64)
-"
-
-LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="amd64 ~arm arm64 ppc64"
-
-IUSE="alsa cups examples headless-awt selinux source"
-
-RDEPEND="
-	media-libs/fontconfig:1.0
-	media-libs/freetype:2
-	>=sys-apps/baselayout-java-0.1.0-r1
-	>=sys-libs/glibc-2.2.5:*
-	sys-libs/zlib
-	alsa? ( media-libs/alsa-lib )
-	arm? ( dev-libs/libffi-compat:6 )
-	cups? ( net-print/cups )
-	selinux? ( sec-policy/selinux-java )
-	!headless-awt? (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXi
-		x11-libs/libXrender
-		x11-libs/libXtst
-	)
-"
-
-RESTRICT="preserve-libs strip"
-QA_PREBUILT="*"
-
-S="${WORKDIR}/jdk${MY_PV}"
-
-src_install() {
-	local dest="/opt/${P}"
-	local ddest="${ED%/}/${dest#/}"
-
-	rm ASSEMBLY_EXCEPTION LICENSE THIRD_PARTY_README || die
-
-	# this does not exist on arm64 hence -f
-	rm -fv jre/lib/*/libfreetype.so* || die
-
-	if ! use alsa ; then
-		rm -v jre/lib/*/libjsoundalsa.so* || die
-	fi
-
-	if ! use examples ; then
-		rm -vr sample || die
-	fi
-
-	if use headless-awt ; then
-		rm -fvr {,jre/}lib/*/lib*{[jx]awt,splashscreen}* \
-			{,jre/}bin/policytool bin/appletviewer || die
-	fi
-
-	if ! use source ; then
-		rm -v src.zip || die
-	fi
-
-	rm -v jre/lib/security/cacerts || die
-	dosym ../../../../../etc/ssl/certs/java/cacerts \
-		"${dest}"/jre/lib/security/cacerts
-
-	dodir "${dest}"
-	cp -pPR * "${ddest}" || die
-
-	java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
-	java-vm_set-pax-markings "${ddest}"
-	java-vm_revdep-mask
-	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
-}

dev-java/openjdk-bin/openjdk-bin-8.272_p10.ebuild

@@ -18,12 +18,13 @@ DESCRIPTION="Prebuilt Java JDK binaries provided by AdoptOpenJDK"
 HOMEPAGE="https://adoptopenjdk.net"
 SRC_URI="
 	$(abi_uri aarch64 arm64)
+	$(abi_uri arm)
 	$(abi_uri ppc64le ppc64)
 	$(abi_uri x64 amd64)
 "
 
 LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="~amd64 arm64 ~ppc64"
+KEYWORDS="amd64 ~arm arm64 ppc64"
 
 IUSE="alsa cups examples headless-awt selinux source"
 

dev-java/openjdk-jre-bin/Manifest

@@ -1,4 +1,2 @@
-DIST OpenJDK11U-jre_x64_linux_hotspot_11.0.8_10.tar.gz 42904191 BLAKE2B cfd04b2a422e95465cd2938449f7632d29fe655eadadf5745045db6eb74625dffa0e02d8713a93e0bc8fa7da6dc57116fbbd9217a9b30723becd5b9eaceefccd SHA512 55ab4c6122422f4765542df747bce5c65bc78e0e5f4fff4b7efc95342d81eb34d72dbdc13c820781c626f92a2c3687161d0c7edfbe4f83c455c75fcecf8ae3d0
 DIST OpenJDK11U-jre_x64_linux_hotspot_11.0.9_11.tar.gz 43086814 BLAKE2B 20785b5edb3fbfae99c7cdc76fba964a7a00eb148e68125138281c0995d6a82cfe9924c7f653dd188ab97da41135004546ec822bfa845f599135c8a9ec5e9336 SHA512 b0c53febc2628b91763cd5304cce782adaa71ff466c4dd9d056c7f1ac18e8f1f4ad2fc355882b2990fbd71e7792134697bcd1204eb9e03c12cf3b287ac33c3f0
-DIST OpenJDK8U-jre_x64_linux_hotspot_8u265b01.tar.gz 41757024 BLAKE2B 39c184654dd5c4c17c617a48e962a392e3a4aaebe56a4286b6e5b0e980345b7260effbc54e2b197f8b747c57856e5260a048cf572cd4f375a2b38f3abebbde2f SHA512 01090a26bb18d226da19c82fca173f0d994ba56562178757347b565d39989b6735f5ff37bb22163c9ea270380fe922098bd0efa87d52615b50cde9f0e8291095
 DIST OpenJDK8U-jre_x64_linux_hotspot_8u272b10.tar.gz 42139854 BLAKE2B 52e7a594aab1a70d351daf9dc42598b4952894a9a72ed996e261e347eece4337fe95c5f63850a0dde2d8862045d22ef41832a6af51df5113b81713bab20c797e SHA512 2fd45a9b967e96309c79724fea047d7c35f31da8e0290bd5cdafeea47b83941b9269129d0d557ee488526c0667ba581dee860381fc344374971e1005105db376

dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.8_p10-r1.ebuild

@@ -1,97 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit java-vm-2
-
-abi_uri() {
-	echo "${2-$1}? (
-			https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk-${MY_PV}/OpenJDK${SLOT}U-jre_${1}_linux_hotspot_${MY_PV//+/_}.tar.gz
-		)"
-}
-
-MY_PV=${PV/_p/+}
-SLOT=${MY_PV%%[.+]*}
-
-SRC_URI="
-	$(abi_uri x64 amd64)
-"
-
-DESCRIPTION="Prebuilt Java JRE binaries provided by AdoptOpenJDK"
-HOMEPAGE="https://adoptopenjdk.net"
-LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="~amd64"
-IUSE="alsa cups +gentoo-vm headless-awt selinux"
-
-RDEPEND="
-	media-libs/fontconfig:1.0
-	media-libs/freetype:2
-	>net-libs/libnet-1.1
-	>=sys-apps/baselayout-java-0.1.0-r1
-	>=sys-libs/glibc-2.2.5:*
-	sys-libs/zlib
-	alsa? ( media-libs/alsa-lib )
-	cups? ( net-print/cups )
-	selinux? ( sec-policy/selinux-java )
-	!headless-awt? (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXi
-		x11-libs/libXrender
-		x11-libs/libXtst
-	)"
-
-RESTRICT="preserve-libs splitdebug"
-QA_PREBUILT="*"
-
-S="${WORKDIR}/jdk-${MY_PV}-jre"
-
-src_install() {
-	local dest="/opt/${P}"
-	local ddest="${ED%/}/${dest#/}"
-
-	# Not sure why they bundle this as it's commonly available and they
-	# only do so on x86_64. It's needed by libfontmanager.so. IcedTea
-	# also has an explicit dependency while Oracle seemingly dlopens it.
-	rm -vf lib/libfreetype.so || die
-
-	# Oracle and IcedTea have libjsoundalsa.so depending on
-	# libasound.so.2 but AdoptOpenJDK only has libjsound.so. Weird.
-	if ! use alsa ; then
-		rm -v lib/libjsound.* || die
-	fi
-
-	if use headless-awt ; then
-		rm -v lib/lib*{[jx]awt,splashscreen}* || die
-	fi