diff --git a/Manifest.files.gz b/Manifest.files.gz
index dc6fb0f66884..001751f8bbbf 100644
Binary files a/Manifest.files.gz and b/Manifest.files.gz differ
diff --git a/acct-group/Manifest.gz b/acct-group/Manifest.gz
index c74b883796da..22aca9c4df5f 100644
Binary files a/acct-group/Manifest.gz and b/acct-group/Manifest.gz differ
diff --git a/acct-group/abrt/Manifest b/acct-group/abrt/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/acct-group/abrt/abrt-0.ebuild b/acct-group/abrt/abrt-0.ebuild
new file mode 100644
index 000000000000..ab6310011a09
--- /dev/null
+++ b/acct-group/abrt/abrt-0.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for the automatic bug detection and reporting tool"
+ACCT_GROUP_ID=422
diff --git a/acct-group/abrt/metadata.xml b/acct-group/abrt/metadata.xml
new file mode 100644
index 000000000000..b79c2cda0f30
--- /dev/null
+++ b/acct-group/abrt/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ gnome@gentoo.org
+ Gentoo GNOME Desktop
+
+
diff --git a/acct-user/Manifest.gz b/acct-user/Manifest.gz
index c3150721a851..633e202e4dfc 100644
Binary files a/acct-user/Manifest.gz and b/acct-user/Manifest.gz differ
diff --git a/acct-user/abrt/Manifest b/acct-user/abrt/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/acct-user/abrt/abrt-0.ebuild b/acct-user/abrt/abrt-0.ebuild
new file mode 100644
index 000000000000..ca0f60d5930c
--- /dev/null
+++ b/acct-user/abrt/abrt-0.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for the automatic bug detection and reporting tool"
+ACCT_USER_ID=422
+ACCT_USER_GROUPS=( abrt )
+
+acct-user_add_deps
diff --git a/acct-user/abrt/metadata.xml b/acct-user/abrt/metadata.xml
new file mode 100644
index 000000000000..b79c2cda0f30
--- /dev/null
+++ b/acct-user/abrt/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ gnome@gentoo.org
+ Gentoo GNOME Desktop
+
+
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index aa26e7dcec53..52331fa59ea3 100644
Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ
diff --git a/app-admin/abrt/Manifest b/app-admin/abrt/Manifest
index 5866ff387575..921dcefe515c 100644
--- a/app-admin/abrt/Manifest
+++ b/app-admin/abrt/Manifest
@@ -1 +1,2 @@
DIST abrt-2.12.0.tar.gz 6799338 BLAKE2B 57a9b3fac4a4a5f55630be0573b26d4ae2d921d4f09d6566339a77f314c413c1a9e242f882fe20befabf30a58e7df21395edcf1b0d560bfeadf8e854bff6a705 SHA512 3567332399cd9708505a6d05c9388c7da5c14c7432e6fd40e5e76b6bcea8859c17b3b6c52a96ce54740e3682d75d8bf77dbc5fede80bd4fc6f72c60014f9cded
+DIST abrt-2.14.0.tar.gz 6102393 BLAKE2B 6bba45604406c1f2f84d778475acc6b5db3747f292fcb74a881703491b2d92adda3cc88d6ed741087c1ed2f88a68cdc4858f3640b506a6be650ea4d1d1f2bfd3 SHA512 26cf04ef6f52da445e825d5f1074186c4c77d1b093174bb6f7b0a8fa6175e265fcaf56fa4a977851a2352f9fd004425bc397e35a91f6f8e78f37564cd492c571
diff --git a/app-admin/abrt/abrt-2.14.0.ebuild b/app-admin/abrt/abrt-2.14.0.ebuild
new file mode 100644
index 000000000000..ed552da0f4c8
--- /dev/null
+++ b/app-admin/abrt/abrt-2.14.0.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit autotools python-single-r1 systemd xdg-utils
+
+DESCRIPTION="Automatic bug detection and reporting tool"
+HOMEPAGE="https://github.com/abrt/abrt/wiki/ABRT-Project"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="selinux test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+ >=dev-libs/glib-2.56:2
+ >=dev-libs/libreport-2.10.0[python]
+ dev-libs/libxml2:2
+ >=gnome-base/gsettings-desktop-schemas-3.15.1
+ net-libs/libsoup:2.4
+ sys-apps/dbus
+ sys-apps/systemd:0=
+ sys-auth/polkit
+ sys-libs/libcap
+ sys-fs/inotify-tools
+ x11-libs/gtk+:3
+"
+RDEPEND="${DEPEND}
+ acct-user/abrt
+ acct-group/abrt
+ app-arch/cpio
+ app-arch/rpm[python,${PYTHON_SINGLE_USEDEP}]
+ dev-libs/elfutils
+ dev-libs/json-c:0=
+ sys-apps/util-linux
+ >=sys-devel/gdb-7
+ $(python_gen_cond_dep '
+ dev-libs/satyr[${PYTHON_MULTI_USEDEP}]
+ dev-python/argcomplete[${PYTHON_MULTI_USEDEP}]
+ dev-python/argh[${PYTHON_MULTI_USEDEP}]
+ dev-python/humanize[${PYTHON_MULTI_USEDEP}]
+ ')
+"
+BDEPEND="
+ test? (
+ $(python_gen_cond_dep 'dev-python/pytest[${PYTHON_MULTI_USEDEP}]')
+ )
+ app-text/asciidoc
+ app-text/xmlto
+ >=dev-util/intltool-0.35.0
+ virtual/pkgconfig
+ >=sys-devel/gettext-0.17
+"
+
+pkg_setup() {
+ python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ python_fix_shebang .
+ default
+
+ # Install under proper directory
+ sed -i -e 's:dbusabrtdocdir = ${datadir}/doc/abrt-dbus-${VERSION}/html:dbusabrtdocdir = ${datadir}/doc/${PF}/html:' doc/problems-service/Makefile.am || die
+
+ # Ensure this works for systems with and without /usr merge
+ sed -i -e "s:/usr/bin/bash:$(which bash):" init-scripts/abrtd.service || die
+
+ # Fix hardcoded "pytest-3"
+ sed -i -e "s:pytest-3:pytest:" \
+ configure.ac src/python-problem/tests/Makefile.am src/cli/test || die
+
+ # pyhook test is sensitive to the format of python's error messages, and
+ # fails with certain python versions
+ sed -e '/pyhook.at/ d' \
+ -i tests/Makefile.* tests/testsuite.at || die "sed remove pyhook tests failed"
+ ./gen-version || die # Needed to be run before autoreconf
+ eautoreconf
+}
+
+src_configure() {
+ myeconfargs=(
+ --libdir="${EPREFIX}/usr/$(get_libdir)"
+ --localstatedir="${EPREFIX}/var"
+ --without-bodhi
+ # package breaks due to not finding libreport-web with bodhi plugin enabled
+ --without-rpm
+ $(usex selinux "" "--without-selinux")
+ --with-python3
+ --without-pythondoc
+ # package breaks due to no sphinx-build-3
+ $(use_with test pythontests)
+ )
+
+ econf "${myeconfargs[@]}"
+}
+
+src_install() {
+ default
+ python_optimize
+
+ keepdir /var/run/abrt
+ # /var/spool/abrt is created by dev-libs/libreport
+
+ diropts -m 700 -o abrt -g abrt
+ keepdir /var/spool/abrt-upload
+
+ diropts -m 775 -o abrt -g abrt
+ keepdir /var/cache/abrt-di
+
+ find "${D}" -name '*.la' -delete || die
+
+ newinitd "${FILESDIR}/${PN}-2.0.12-r1-init" abrt
+ newconfd "${FILESDIR}/${PN}-2.0.12-r1-conf" abrt
+}
+
+pkg_postinst() {
+ xdg_icon_cache_update
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+}
diff --git a/app-admin/bcfg2/Manifest b/app-admin/bcfg2/Manifest
deleted file mode 100644
index e249295a4c00..000000000000
--- a/app-admin/bcfg2/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST bcfg2-1.2.4.tar.gz 1959767 BLAKE2B abd99f054a549c1239c938591ee4d5bd808a6fdad36d784d5efccbcc878b1a8b64413dcf84adce547ba46f036b612f76ad8d748fcbffe33a87501a0f63ec67e5 SHA512 15f9079dd18485088464da5ea63e53435e2a2141970e6c0400797424bd3c612928349438ed0f6bb2874eb4599768e210e3fef970ed09f8fb2c2d673b986221d9
diff --git a/app-admin/bcfg2/bcfg2-1.2.4-r1.ebuild b/app-admin/bcfg2/bcfg2-1.2.4-r1.ebuild
deleted file mode 100644
index 8b8b427e03e6..000000000000
--- a/app-admin/bcfg2/bcfg2-1.2.4-r1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='ssl'
-
-inherit distutils-r1
-
-DESCRIPTION="Configuration management tool"
-HOMEPAGE="http://bcfg2.org"
-SRC_URI="ftp://ftp.mcs.anl.gov/pub/bcfg/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
-IUSE="doc cheetah genshi server"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
- doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-RDEPEND="app-portage/gentoolkit[${PYTHON_USEDEP}]
- cheetah? ( dev-python/cheetah[${PYTHON_USEDEP}] )
- genshi? ( dev-python/genshi[${PYTHON_USEDEP}] )
- server? (
- dev-libs/libgamin[python,${PYTHON_USEDEP}]
- dev-python/lxml[${PYTHON_USEDEP}]
- dev-python/nose[${PYTHON_USEDEP}]
- !kernel_linux? ( virtual/fam ) )"
-
-python_compile_all() {
- if use doc; then
- einfo "Building Bcfg2 documentation"
- sphinx-build doc doc_output || die
- fi
-}
-
-python_install() {
- distutils-r1_python_install \
- --record=PY_SERVER_LIBS
-
- if ! use server; then
- rm -f "${ED%/}"/usr/bin/bcfg2-* || die
- rm -f "${D%/}$(python_get_scriptdir)"/bcfg2-* || die
- rm -rf "${ED%/}"/usr/share/bcfg2 || die
- rm -rf "${ED%/}"/usr/share/man/man8 || die
- else
- newinitd "${FILESDIR}/${PN}-server-1.2.0.rc" bcfg2-server
- fi
-
- insinto /etc
- doins examples/bcfg2.conf
-
- if use doc; then
- cd doc_output || die
- docinto html
- dodoc -r [a-z]* _images _static
- fi
-}
-
-pkg_postinst() {
- if use server; then
- einfo "If this is a new installation, you probably need to run:"
- einfo " bcfg2-admin init"
- fi
-}
diff --git a/app-admin/bcfg2/files/bcfg2-server-1.2.0.rc b/app-admin/bcfg2/files/bcfg2-server-1.2.0.rc
deleted file mode 100644
index f40248037079..000000000000
--- a/app-admin/bcfg2/files/bcfg2-server-1.2.0.rc
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/sbin/openrc-run
-#
-# bcfgd - bcfg configuration daemon
-#
-#
-
-depend () {
- need net
-}
-
-start () {
- ebegin "Starting bcfg2-server"
- start-stop-daemon --start --quiet --pidfile /var/run/bcfg2-server.pid \
- --exec /usr/sbin/bcfg2-server -- -D /var/run/bcfg2-server.pid
- eend $? "Failed to start bcfg2-server"
-}
-
-stop () {
- ebegin "Stopping bcfg2-server"
- start-stop-daemon --stop --quiet --pidfile /var/run/bcfg2-server.pid \
- --signal INT
- eend $? "Failed to stop bcfg2-server"
-}
diff --git a/app-admin/bcfg2/metadata.xml b/app-admin/bcfg2/metadata.xml
deleted file mode 100644
index 882636d976ea..000000000000
--- a/app-admin/bcfg2/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
diff --git a/app-admin/calamares/Manifest b/app-admin/calamares/Manifest
index 4c0f5ca38d5c..81e23affb810 100644
--- a/app-admin/calamares/Manifest
+++ b/app-admin/calamares/Manifest
@@ -1 +1 @@
-DIST calamares-3.2.17.1.tar.gz 3128350 BLAKE2B a6926faaf1d521647cc0037b88686f9ceee1cc8167b888fe3c25228cbca8058572c8786a51f6ce0ccb77b31351d21ac41fa6c86a6577569c118729e1263ccafa SHA512 fa8f1906aa7774b0f6bd65d1dc87ea2e08df92018c162f7e7fe01fe6119e65d6391141bc242623f88040bb18eb8b71003cb7417b27c10b39bc30de0f0bf8deb0
+DIST calamares-3.2.20.tar.gz 3246752 BLAKE2B 11bc23da8f035a0399f54c1f0f9e11806b0e3b77ad9f57c694c15de077ad37d3f282d29d0b4c010f19372e78d14af2cf9c58b95b03d6d867ea6c0c104e701fab SHA512 473422eca83007ce0d82e09d637b73c114fffab338ece8269d37a4496d786eeef5e75b06b60ec51fb85bbd145984d37f0a586edd9c5d58e23abde665b8370c7c
diff --git a/app-admin/calamares/calamares-3.2.17.1-r1.ebuild b/app-admin/calamares/calamares-3.2.20.ebuild
similarity index 97%
rename from app-admin/calamares/calamares-3.2.17.1-r1.ebuild
rename to app-admin/calamares/calamares-3.2.20.ebuild
index de32e110d2e0..8ad695ecfb23 100644
--- a/app-admin/calamares/calamares-3.2.17.1-r1.ebuild
+++ b/app-admin/calamares/calamares-3.2.20.ebuild
@@ -4,7 +4,7 @@
EAPI=7
ECM_TEST="true"
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_7 )
inherit ecm python-single-r1
DESCRIPTION="Distribution-independent installer framework"
@@ -78,6 +78,7 @@ src_prepare() {
src_configure() {
local mycmakeargs=(
+ -DINSTALL_CONFIG=ON
-DWEBVIEW_FORCE_WEBKIT=OFF
-DCMAKE_DISABLE_FIND_PACKAGE_LIBPARTED=ON
-DWITH_PYTHONQT=$(usex pythonqt)
diff --git a/app-admin/filebeat/files/filebeat.initd b/app-admin/filebeat/files/filebeat.initd
index 1d9a987c87bd..de4bf3ae8434 100644
--- a/app-admin/filebeat/files/filebeat.initd
+++ b/app-admin/filebeat/files/filebeat.initd
@@ -1,5 +1,5 @@
#!/sbin/openrc-run
-# Copyright 1999-2019 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
FILEBEAT_USER="${FILEBEAT_USER:-root}"
diff --git a/app-admin/filebeat/files/filebeat.initd.1 b/app-admin/filebeat/files/filebeat.initd.1
index 3bad7654d348..c6b90fbb6105 100644
--- a/app-admin/filebeat/files/filebeat.initd.1
+++ b/app-admin/filebeat/files/filebeat.initd.1
@@ -1,5 +1,5 @@
#!/sbin/openrc-run
-# Copyright 1999-2019 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
FILEBEAT_USER="${FILEBEAT_USER:-root}"
diff --git a/app-admin/webapp-config/Manifest b/app-admin/webapp-config/Manifest
index f3a98ce64784..958441a48502 100644
--- a/app-admin/webapp-config/Manifest
+++ b/app-admin/webapp-config/Manifest
@@ -1,4 +1 @@
-DIST webapp-config-1.52.tar.bz2 62951 BLAKE2B 8abc9f5503c9204fdb2d860f819e06a9f75f285bc0190bf1c479caea08754da92a351a12abe026d8600a51d8e33d57d827b027e8a0f9da5a8af1f09daa0de1e5 SHA512 ec616067588e6ab306af067e70bab9d17961aa675f387ee67a2291235ce81638b49a784d9a6c31891b7c78a712f276c3e62c6681a5e496a52c7e6fe7753922ea
-DIST webapp-config-1.53.tar.bz2 63429 BLAKE2B bb13d52a4c19859ff4730df2f7db75452effa23d1864d97aada38137f00ada8eec530f728f1c3ae06ecbed713a2d489b7225db3fc02aeabbf6241d0956761609 SHA512 7d2fc7197d537f2264c26b68b61e69273d2fcd3eec93657db54ba685c8383e7b8245cf05ed2ddd8b72453bf3fbf8f4bc4867e53d608331799df2e6162be14820
-DIST webapp-config-1.54.tar.bz2 58954 BLAKE2B 42a4305c51ccb8bb9db455c6ae2663b5d17c9d477eee3e504569c802e5f0d10183f3e6cd1e747462dcc0559d6ed7ba53a8b5607ed422f34813a33e0e8148bb90 SHA512 fa61e88696eaed130575e5ae9a17ec827aa14aece359e5ba43fa723ad00083def22e44fb02d99fc5ba6000a5949c5ce7aecea9307d2bfae333e202ef111dcd31
DIST webapp-config-1.55.tar.bz2 72583 BLAKE2B be958dc991f0e1f6835d9c29350b7d97e3f23d52971f6013165ce59a8f4b32ac6262c9719956d1bcdbe60797f07d77910b44a749ae545c4dc15f765525144709 SHA512 44294b276fd036908438cd984ebf70433639caa18d8330bab348433b4f39ea2c42c57fa8de4f0a6198f7875429a3ef9ebe61321c288d910f9be8b3414865f438
diff --git a/app-admin/webapp-config/files/webapp-config-1.52-nulls-doctest.patch b/app-admin/webapp-config/files/webapp-config-1.52-nulls-doctest.patch
deleted file mode 100644
index 97c64a90df25..000000000000
--- a/app-admin/webapp-config/files/webapp-config-1.52-nulls-doctest.patch
+++ /dev/null
@@ -1,185 +0,0 @@
-From 5f61d249507c3502c3c76faf3926522e6e63370d Mon Sep 17 00:00:00 2001
-From: Devan Franchini
-Date: Fri, 3 Jan 2014 21:03:00 -0500
-Subject: [PATCH] WebappConfig/{ebuild,content}.py: Nulls doctest code.
-
-Due to the variable nature of the returning values of the two functions
-run_vars() and add(), it is unrealistic to depend on doctest to not
-fail. It has been decided that disabling these two doctest codes would
-be the best decision to prevent failures that are not detrimental.
-
-X-Gentoo-Bug: 430010
-X-Gentoo-Bug-URL: https://bugs.gentoo.org/430010
----
- WebappConfig/content.py | 36 ++++++++++++++++++------------------
- WebappConfig/ebuild.py | 46 +++++++++++++++++++++++-----------------------
- 2 files changed, 41 insertions(+), 41 deletions(-)
-
-diff --git a/WebappConfig/content.py b/WebappConfig/content.py
-index 8fe5be9..c635f5a 100644
---- a/WebappConfig/content.py
-+++ b/WebappConfig/content.py
-@@ -379,71 +379,71 @@ class Contents:
- (and this is important for md5)
- relative - 1 for storing a relative filename, 0 otherwise
-
-- >>> OUT.color_off()
-- >>> import os.path
-- >>> here = os.path.dirname(os.path.realpath(__file__))
-+ OUT.color_off()
-+ import os.path
-+ here = os.path.dirname(os.path.realpath(__file__))
-
- One for pretending:
-
-- >>> a = Contents(here + '/tests/testfiles/contents/app/',
-+ a = Contents(here + '/tests/testfiles/contents/app/',
- ... package = 'test', version = '1.0',
- ... pretend = True)
-
- And this one is for real:
-
-- >>> b = Contents(here + '/tests/testfiles/contents/app/',
-+ b = Contents(here + '/tests/testfiles/contents/app/',
- ... package = 'test', version = '1.0')
-
- Pretend to add a file:
-
-- >>> a.add('file', 'config-owned',
-+ a.add('file', 'config-owned',
- ... destination = here + '/tests/testfiles/contents/app/',
- ... path = '/test1', relative = True)
- * pretending to add: file 1 config-owned "test1"
-
- Lets not pretend this time:
-
-- >>> b.add('file', 'config-owned',
-+ b.add('file', 'config-owned',
- ... destination = here + '/tests/testfiles/contents/app/',
- ... path = '/test1', relative = True)
-- >>> b.entry(here + '/tests/testfiles/contents/app/test1') #doctest: +ELLIPSIS
-+ b.entry(here + '/tests/testfiles/contents/app/test1') #doctest: +ELLIPSIS
- 'file 1 config-owned "test1" ... d8e8fca2dc0f896fd7cb4cb0031ba249 '
-
- Lets produce an error with a file that does not exist:
-
-- >>> b.add('file', 'config-owned',
-+ b.add('file', 'config-owned',
- ... destination = here + '/tests/testfiles/contents/app/',
- ... path = '/nothere', relative = True) #doctest: +ELLIPSIS
- * Cannot access file .../tests/testfiles/contents/app/nothere to add it as installation content. This should not happen!
-
- Other file types:
-
-- >>> b.add('hardlink', 'config-owned',
-+ b.add('hardlink', 'config-owned',
- ... destination = here + '/tests/testfiles/contents/app/',
- ... path = '/test2', relative = True)
-- >>> b.entry(here + '/tests/testfiles/contents/app/test2') #doctest: +ELLIPSIS
-+ b.entry(here + '/tests/testfiles/contents/app/test2') #doctest: +ELLIPSIS
- 'file 1 config-owned "test2" ... d8e8fca2dc0f896fd7cb4cb0031ba249 '
-- >>> b.add('dir', 'default-owned',
-+ b.add('dir', 'default-owned',
- ... destination = here + '/tests/testfiles/contents/app/',
- ... path = '/dir1', relative = True)
-- >>> b.entry(here + '/tests/testfiles/contents/app/dir1') #doctest: +ELLIPSIS
-+ b.entry(here + '/tests/testfiles/contents/app/dir1') #doctest: +ELLIPSIS
- 'dir 1 default-owned "dir1" ... 0 '
-- >>> b.add('dir', 'default-owned', destination = here + '/tests/testfiles/contents/app',
-+ b.add('dir', 'default-owned', destination = here + '/tests/testfiles/contents/app',
- ... path = '/dir1',
- ... relative = False)
-- >>> b.entry(here + '/tests/testfiles/contents/app/dir1') #doctest: +ELLIPSIS
-+ b.entry(here + '/tests/testfiles/contents/app/dir1') #doctest: +ELLIPSIS
- 'dir 0 default-owned ".../tests/testfiles/contents/app/dir1" ... 0 '
-
- Q: Is the full link to the target what we want?
- A: Yes, since the link will still be ok even if we move the directory.
-
-- >>> b.add('sym', 'virtual',
-+ b.add('sym', 'virtual',
- ... destination = here + '/tests/testfiles/contents/app/',
- ... path = '/test3', relative = True)
-- >>> b.entry(here + '/tests/testfiles/contents/app/test3') #doctest: +ELLIPSIS
-+ b.entry(here + '/tests/testfiles/contents/app/test3') #doctest: +ELLIPSIS
- 'sym 1 virtual "test3" ... 0 .../tests/testfiles/contents/app/test1'
-
-- >>> b.db_print() #doctest: +ELLIPSIS
-+ b.db_print() #doctest: +ELLIPSIS
- file 1 config-owned "test1" ... d8e8fca2dc0f896fd7cb4cb0031ba249
- file 1 config-owned "test2" ... d8e8fca2dc0f896fd7cb4cb0031ba249
- sym 1 virtual "test3" ... 0 .../tests/testfiles/contents/app/test1
-diff --git a/WebappConfig/ebuild.py b/WebappConfig/ebuild.py
-index 03c0c57..cc23bec 100644
---- a/WebappConfig/ebuild.py
-+++ b/WebappConfig/ebuild.py
-@@ -201,35 +201,35 @@ class Ebuild:
- The procedure from above is repeated to set up the default
- environment:
-
-- >>> import WebappConfig.config
-- >>> config = WebappConfig.config.Config()
-- >>> config.config.set('USER', 'my_htdocsbase', 'htdocs')
-- >>> config.config.set('USER', 'pn', 'horde')
-- >>> config.config.set('USER', 'pvr', '3.0.5')
-- >>> import os.path
-- >>> here = os.path.dirname(os.path.realpath(__file__))
-- >>> config.config.set('USER', 'my_approot', here +
-- ... '/tests/testfiles/share-webapps')
-- >>> my_approot = config.config.get('USER', 'my_approot')
-- >>> my_appdir = my_approot + "/horde/3.0.5"
-- >>> config.config.set('USER', 'my_appdir', my_appdir)
-- >>> config.config.set('USER', 'my_hookscriptsdir', my_appdir + '/hooks')
-- >>> config.config.set('USER', 'my_cgibinbase', 'cgi-bin')
-- >>> config.config.set('USER', 'my_errorsbase', 'error')
-- >>> config.config.set('USER', 'my_iconsbase', 'icons')
-- >>> config.config.set('USER', 'my_serverconfigdir', '/'.join([my_appdir,'conf']))
-- >>> config.config.set('USER', 'my_hostrootdir', '/'.join([my_appdir,'hostroot']))
-- >>> config.config.set('USER', 'my_htdocsdir', '/'.join([my_appdir,'htdocs']))
-- >>> config.config.set('USER', 'my_sqlscriptsdir', '/'.join([my_appdir,'sqlscripts']))
-+ "">>> import WebappConfig.config"
-+ ">>> config = WebappConfig.config.Config()"
-+ ">>> config.config.set('USER', 'my_htdocsbase', 'htdocs')"
-+ ">>> config.config.set('USER', 'pn', 'horde')"
-+ ">>> config.config.set('USER', 'pvr', '3.0.5')"
-+ ">>> import os.path"
-+ ">>> here = os.path.dirname(os.path.realpath(__file__))"
-+ ">>> config.config.set('USER', 'my_approot', here +"
-+ "... '/tests/testfiles/share-webapps')"
-+ ">>> my_approot = config.config.get('USER', 'my_approot')"
-+ ">>> my_appdir = my_approot + "/horde/3.0.5""
-+ ">>> config.config.set('USER', 'my_appdir', my_appdir)"
-+ ">>> config.config.set('USER', 'my_hookscriptsdir', my_appdir + '/hooks')"
-+ ">>> config.config.set('USER', 'my_cgibinbase', 'cgi-bin')"
-+ ">>> config.config.set('USER', 'my_errorsbase', 'error')"
-+ ">>> config.config.set('USER', 'my_iconsbase', 'icons')"
-+ ">>> config.config.set('USER', 'my_serverconfigdir', '/'.join([my_appdir,'conf']))"
-+ ">>> config.config.set('USER', 'my_hostrootdir', '/'.join([my_appdir,'hostroot']))"
-+ ">>> config.config.set('USER', 'my_htdocsdir', '/'.join([my_appdir,'htdocs']))"
-+ ">>> config.config.set('USER', 'my_sqlscriptsdir', '/'.join([my_appdir,'sqlscripts']))"
-
- Time to create the ebuild handler:
-
-- >>> a = Ebuild(config)
-+ ">>> a = Ebuild(config)"
-
- The dummy post-install file should display all the variables
- that are exported here:
-
-- >>> a.show_postinst() #doctest: +ELLIPSIS
-+ ">>> a.show_postinst() #doctest: +ELLIPSIS
-
- =================================================================
- POST-INSTALL INSTRUCTIONS
-@@ -270,7 +270,7 @@ class Ebuild:
- PVR: 3.0.5
-
- =================================================================
--
-+ "
- '''
-
- v_root = self.get_config('vhost_root')
---
-1.8.3.2
-
diff --git a/app-admin/webapp-config/files/webapp-config-1.53-sources-function.sh-from-lib-gentoo.patch b/app-admin/webapp-config/files/webapp-config-1.53-sources-function.sh-from-lib-gentoo.patch
deleted file mode 100644
index 06a924a426be..000000000000
--- a/app-admin/webapp-config/files/webapp-config-1.53-sources-function.sh-from-lib-gentoo.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From ff7ba0d89c79584f14a8137d886a656a9af6de5c Mon Sep 17 00:00:00 2001
-From: Devan Franchini
-Date: Sat, 27 Dec 2014 20:43:08 -0500
-Subject: [PATCH] webapp-cleaner: sources function.sh from /lib/gentoo
-
----
- sbin/webapp-cleaner | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/sbin/webapp-cleaner b/sbin/webapp-cleaner
-index bfec623..52e44ac 100755
---- a/sbin/webapp-cleaner
-+++ b/sbin/webapp-cleaner
-@@ -13,7 +13,7 @@ CMD="emerge -Cav"
- WEBAPP_DIR="/usr/share/webapps"
- WEBAPP_CONFIG=
-
--[[ -z ${RC_GOT_FUNCTIONS} ]] && source /etc/init.d/functions.sh
-+[[ -z ${RC_GOT_FUNCTIONS} ]] && source /lib/gentoo/functions.sh
-
- function help() {
- echo "Remove obsolete and unused versions of web applications"
---
-2.0.5
-
diff --git a/app-admin/webapp-config/files/webapp-config-1.54-fix-bashism.patch b/app-admin/webapp-config/files/webapp-config-1.54-fix-bashism.patch
deleted file mode 100644
index 9958c142d4a7..000000000000
--- a/app-admin/webapp-config/files/webapp-config-1.54-fix-bashism.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur WebappConfig.old/ebuild.py WebappConfig/ebuild.py
---- WebappConfig/ebuild.py
-+++ WebappConfig/ebuild.py
-@@ -101,7 +101,7 @@
-
- for i in post_instructions:
- i = i.replace('"', '\\"')
-- post.append(os.popen('echo -n "' + i + '"\n').read()[:-1])
-+ post.append(os.popen('printf "' + i + '"\n').read()[:-1])
-
- post = post + [
- '',
diff --git a/app-admin/webapp-config/files/webapp-config-1.54-pvr-check.patch b/app-admin/webapp-config/files/webapp-config-1.54-pvr-check.patch
deleted file mode 100644
index 9a35ad70cafb..000000000000
--- a/app-admin/webapp-config/files/webapp-config-1.54-pvr-check.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-commit 9e251c7574d074e424ea19024f743c754f321979
-Author: Devan Franchini
-Date: Fri Jul 10 21:25:17 2015 -0400
-
- config.py: Fixes package version checking regression
-
- Previously webapp-config would not do any sanity checks when
- setting the package version. After adding a sanity check in 1.54
- I made the mistake of not being flexible enough and this caused
- a regression that prevented web apps with versions such as
- "20140929d"[1] to be installed. This commit fixes that while still
- allowing for some sanity checking.
-
- [1]: https://github.com/gentoo/webapp-config/issues/2
-
-diff --git a/WebappConfig/config.py b/WebappConfig/config.py
-index 6c915c3..3a176a0 100644
---- a/WebappConfig/config.py
-+++ b/WebappConfig/config.py
-@@ -996,17 +996,20 @@ class Config:
- OUT.die('Invalid package name')
-
- if len(args) > 1:
-- argsvr = args[1].split('.')
-- if len(argsvr) == 1:
-- OUT.die('Invalid package version: %(pvr)s'
-+ pvr = args[1]
-+ has_int = False # A package version should have at least one
-+ # numerical value, but we want to allow for
-+ # the flexibility of having any alphanumeric
-+ # value while checking to make sure it's sane.
-+
-+ for char in pvr:
-+ if char.isdigit():
-+ has_int = True
-+
-+ if not has_int:
-+ OUT.die('Invalid package version: "%(pvr)s"'
- % {'pvr': args[1]})
-
-- pvr = ''
-- for i in range(0, len(argsvr)):
-- if not i == len(argsvr) - 1:
-- pvr += argsvr[i] + '.'
-- else:
-- pvr += argsvr[i]
- self.config.set('USER', 'pvr', pvr)
-
- if (not options['dir'] and
diff --git a/app-admin/webapp-config/webapp-config-1.52-r1.ebuild b/app-admin/webapp-config/webapp-config-1.52-r1.ebuild
deleted file mode 100644
index 09cd5701172a..000000000000
--- a/app-admin/webapp-config/webapp-config-1.52-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-SRC_URI="https://dev.gentoo.org/~twitch153/${PN}/${P}.tar.bz2"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
-
-DESCRIPTION="Gentoo's installer for web-based applications"
-HOMEPAGE="https://sourceforge.net/projects/webapp-config/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+portage"
-
-DEPEND="app-text/xmlto
- !dev-python/configparser"
-RDEPEND="portage? ( sys-apps/portage[${PYTHON_USEDEP}] )"
-
-python_prepare() {
- epatch "${FILESDIR}/${P}-nulls-doctest.patch"
-}
-
-python_compile_all() {
- emake -C doc/
-}
-
-python_install() {
- # According to this discussion:
- # http://mail.python.org/pipermail/distutils-sig/2004-February/003713.html
- # distutils does not provide for specifying two different script install
- # locations. Since we only install one script here the following should
- # be ok
- distutils-r1_python_install --install-scripts="${EPREFIX}/usr/sbin"
-}
-
-python_install_all() {
- distutils-r1_python_install_all
-
- insinto /etc/vhosts
- doins config/webapp-config
-
- keepdir /usr/share/webapps
- keepdir /var/db/webapps
-
- dodoc AUTHORS
- doman doc/*.[58]
- dohtml doc/*.[58].html
-}
-
-python_test() {
- PYTHONPATH="." "${PYTHON}" WebappConfig/tests/dtest.py \
- || die "Testing failed with ${EPYTHON}"
-}
-
-pkg_postinst() {
- elog "Now that you have upgraded webapp-config, you **must** update your"
- elog "config files in /etc/vhosts/webapp-config before you emerge any"
- elog "packages that use webapp-config."
-}
diff --git a/app-admin/webapp-config/webapp-config-1.53-r2.ebuild b/app-admin/webapp-config/webapp-config-1.53-r2.ebuild
deleted file mode 100644
index ee19757707a0..000000000000
--- a/app-admin/webapp-config/webapp-config-1.53-r2.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-RESTRICT="test"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-SRC_URI="https://dev.gentoo.org/~twitch153/${PN}/${P}.tar.bz2"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
-
-DESCRIPTION="Gentoo's installer for web-based applications"
-HOMEPAGE="https://sourceforge.net/projects/webapp-config/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+portage"
-
-DEPEND="app-text/xmlto
- !dev-python/configparser
- sys-apps/gentoo-functions"
-RDEPEND="portage? ( sys-apps/portage[${PYTHON_USEDEP}] )"
-
-python_prepare() {
- epatch "${FILESDIR}/${P}-sources-function.sh-from-lib-gentoo.patch"
-}
-
-python_compile_all() {
- emake -C doc/
-}
-
-python_install() {
- # According to this discussion:
- # http://mail.python.org/pipermail/distutils-sig/2004-February/003713.html
- # distutils does not provide for specifying two different script install
- # locations. Since we only install one script here the following should
- # be ok
- distutils-r1_python_install --install-scripts="${EPREFIX}/usr/sbin"
-}
-
-python_install_all() {
- distutils-r1_python_install_all
-
- insinto /etc/vhosts
- doins config/webapp-config
-
- keepdir /usr/share/webapps
- keepdir /var/db/webapps
-
- dodoc AUTHORS
- doman doc/*.[58]
- dohtml doc/*.[58].html
-}
-
-python_test() {
- PYTHONPATH="." "${PYTHON}" WebappConfig/tests/dtest.py \
- || die "Testing failed with ${EPYTHON}"
-}
-
-pkg_postinst() {
- elog "Now that you have upgraded webapp-config, you **must** update your"
- elog "config files in /etc/vhosts/webapp-config before you emerge any"
- elog "packages that use webapp-config."
-}
diff --git a/app-admin/webapp-config/webapp-config-1.54-r2.ebuild b/app-admin/webapp-config/webapp-config-1.54-r2.ebuild
deleted file mode 100644
index 8e74ce226438..000000000000
--- a/app-admin/webapp-config/webapp-config-1.54-r2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_6} )
-
-inherit distutils-r1
-
-SRC_URI="https://dev.gentoo.org/~twitch153/${PN}/${P}.tar.bz2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-
-DESCRIPTION="Gentoo's installer for web-based applications"
-HOMEPAGE="https://sourceforge.net/projects/webapp-config/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+portage"
-
-DEPEND="app-text/xmlto
- sys-apps/gentoo-functions"
-RDEPEND="portage? ( sys-apps/portage[${PYTHON_USEDEP}] )"
-
-python_prepare() {
- epatch "${FILESDIR}/${P}-pvr-check.patch"\
- "${FILESDIR}/${P}-fix-bashism.patch"
-}
-python_compile_all() {
- emake -C doc/
-}
-
-python_install() {
- # According to this discussion:
- # http://mail.python.org/pipermail/distutils-sig/2004-February/003713.html
- # distutils does not provide for specifying two different script install
- # locations. Since we only install one script here the following should
- # be ok
- distutils-r1_python_install --install-scripts="${EPREFIX}/usr/sbin"
-}
-
-python_install_all() {
- distutils-r1_python_install_all
-
- insinto /etc/vhosts
- doins config/webapp-config
-
- keepdir /usr/share/webapps
- keepdir /var/db/webapps
-
- dodoc AUTHORS
- doman doc/*.[58]
- dohtml doc/*.[58].html
-}
-
-python_test() {
- PYTHONPATH="." "${PYTHON}" WebappConfig/tests/external.py \
- || die "Testing failed with ${EPYTHON}"
-}
-
-pkg_postinst() {
- elog "webapp-config now requires that all -I/-U/-C commands be followed"
- elog "by the package name and package version of the webapp"
- elog "eg.) 'webapp-config -d drupal -I drupal 8.0.0_beta10'"
- elog "See 'man 8 webapp-config' for more information"
-}
diff --git a/app-admin/webapp-config/webapp-config-1.55-r1.ebuild b/app-admin/webapp-config/webapp-config-1.55-r1.ebuild
index 2966dd2dcd94..5c673ce152b7 100644
--- a/app-admin/webapp-config/webapp-config-1.55-r1.ebuild
+++ b/app-admin/webapp-config/webapp-config-1.55-r1.ebuild
@@ -3,7 +3,7 @@
EAPI=5
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
inherit distutils-r1 prefix
diff --git a/app-admin/webapp-config/webapp-config-9999.ebuild b/app-admin/webapp-config/webapp-config-9999.ebuild
index 9e17168b7675..98c743df74fb 100644
--- a/app-admin/webapp-config/webapp-config-9999.ebuild
+++ b/app-admin/webapp-config/webapp-config-9999.ebuild
@@ -3,7 +3,7 @@
EAPI=5
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
inherit distutils-r1 prefix
diff --git a/app-antivirus/Manifest.gz b/app-antivirus/Manifest.gz
index f51903434359..b5aff9ba3a26 100644
Binary files a/app-antivirus/Manifest.gz and b/app-antivirus/Manifest.gz differ
diff --git a/app-antivirus/skyldav/Manifest b/app-antivirus/skyldav/Manifest
deleted file mode 100644
index 83194e446f6e..000000000000
--- a/app-antivirus/skyldav/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST skyldav-0.7.tar.gz 244444 BLAKE2B 7c5e6448a1a3ab83904d01844e9054471666ca3c7f32bc89c3fb56caf02711ade4adf0d7ea73738f21e4c3db1936b8382d7c12d992ea6576dffc3537dbc8e774 SHA512 008988ca7ab24ea8b77377e7a639ddc0a26149eab41af1d429cf8f870320617feda01ec2c9403493a3bb0bd5cd0c8cad94701bcb6c28993f2d9739e1a1b36c0b
diff --git a/app-antivirus/skyldav/files/skyldav-conf.patch b/app-antivirus/skyldav/files/skyldav-conf.patch
deleted file mode 100644
index ed5b2058f6a6..000000000000
--- a/app-antivirus/skyldav/files/skyldav-conf.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -urN skyldav-0.7.orig/examples/etc/skyldav.conf skyldav-0.7/examples/etc/skyldav.conf
---- skyldav-0.7.orig/examples/etc/skyldav.conf 2016-06-12 18:39:51.000000000 +0200
-+++ skyldav-0.7/examples/etc/skyldav.conf 2017-02-21 15:12:06.875945224 +0100
-@@ -22,6 +22,9 @@
-
- # Directories that shall not be scanned (including subdirectories)
- # EXCLUDE_PATH = /var/noscan, /opt/noscan
-+#
-+# Exclude various portage directories for performance reasons
-+EXCLUDE_PATH = /usr/portage, /var/cache/edb, /var/db/pkg, /var/tmp/portage, /var/tmp/binpkgs, /var/log/portage
-
- # File systems that are local, virus scan results may be cached.
- # LOCAL_FS = ext3, ext4, iso9660, tmpfs, vfat
-@@ -31,6 +34,7 @@
- # File systems that shall not be marked for virus scan.
- # Cifs uses a background daemon which causes problems when scanned.
- # Exclusion of fuse file systems is hard coded.
-+# Do not exclude devtmpfs and configfs, as userspace could write malware onto them!
- # NOMARK_FS = proc, sysfs
- NOMARK_FS = proc, sysfs, devpts, debugfs, securityfs, cgroup, rpc_pipefs
- NOMARK_FS = mqueue, autofs, cifs
diff --git a/app-antivirus/skyldav/files/skyldav-examples.patch b/app-antivirus/skyldav/files/skyldav-examples.patch
deleted file mode 100644
index b62e78cc9698..000000000000
--- a/app-antivirus/skyldav/files/skyldav-examples.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -urN skyldav-0.7.orig/Makefile.am skyldav-0.7/Makefile.am
---- skyldav-0.7.orig/Makefile.am 2016-06-12 18:39:51.000000000 +0200
-+++ skyldav-0.7/Makefile.am 2017-02-21 15:11:35.709518793 +0100
-@@ -9,7 +9,6 @@
- rm -rf doc/doxygen
-
- install-data-local: \
-- install-skyldav-examples \
- install-skyldav-conf \
- install-skyldavnotify-desktop
-
diff --git a/app-antivirus/skyldav/files/skyldav.confd b/app-antivirus/skyldav/files/skyldav.confd
deleted file mode 100644
index 87829b658ebe..000000000000
--- a/app-antivirus/skyldav/files/skyldav.confd
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Config file for /etc/init.d/skyldav
-
-# Options to pass to the skyldav daemon.
-# Option -d for daemonizing is always passed!
-# See the skyldav(1) man page for more info.
-
-#SKYLDAV_OPTS="-m 1"
diff --git a/app-antivirus/skyldav/files/skyldav.initd b/app-antivirus/skyldav/files/skyldav.initd
deleted file mode 100644
index 539cd4f083cd..000000000000
--- a/app-antivirus/skyldav/files/skyldav.initd
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-SKYLDAV_BIN="/usr/sbin/skyldav"
-SKYLDAV_OPTS="${SKYLDAV_OPTS:--m 2}"
-SKYLDAV_CONFIGFILE="/etc/skyldav.conf"
-SKYLDAV_PIDFILE_DIR="${SKYLDAV_PIDFILE_DIR:-/var/run/${RC_SVCNAME}}"
-SKYLDAV_PIDFILE="${SKYLDAV_PIDFILE:-${SKYLDAV_PIDFILE_DIR}/${RC_SVCNAME}.pid}"
-
-name="${SKYLDAV_BIN##*/}"
-command="${SKYLDAV_BIN}"
-command_args="-d ${SKYLDAV_OPTS}"
-pidfile="${SKYLDAV_PIDFILE}"
-description="Skyld AV is an anti-virus on-access scanner based upon Clam AV and fanotify"
-required_files="${SKYLDAV_CONFIG}"
-
-depend() {
- use logger
- need localmount
-}
-
-start_pre() {
- checkpath -d -m 0755 -o root:root "${SKYLDAV_PIDFILE_DIR}"
-}
diff --git a/app-antivirus/skyldav/files/skyldav.service-r1 b/app-antivirus/skyldav/files/skyldav.service-r1
deleted file mode 100644
index decd788a9f83..000000000000
--- a/app-antivirus/skyldav/files/skyldav.service-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-[Unit]
-Description=SkyldAV anti-virus on-access scanning daemon based upon Clam AV and fanotify
-Requires=local-fs.target clamd.service
-After=local-fs.target clamd.service
-Before=multi-user.target
-
-[Service]
-Type=simple
-Environment="SKYLDAV_MESSAGE_LEVEL=2"
-ExecStart=/usr/sbin/skyldav -d -m ${SKYLDAV_MESSAGE_LEVEL}
-#KillMode=process
-#KillSignal=SIGTERM
-
-[Install]
-WantedBy=multi-user.target
diff --git a/app-antivirus/skyldav/files/skyldav.service.conf b/app-antivirus/skyldav/files/skyldav.service.conf
deleted file mode 100644
index 79c23a3ff05d..000000000000
--- a/app-antivirus/skyldav/files/skyldav.service.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-[Service]
-# skyldav message level (-m)
-#Environment="SKYLDAV_MESSAGE_LEVEL=1"
diff --git a/app-antivirus/skyldav/files/skyldav.tmpfilesd b/app-antivirus/skyldav/files/skyldav.tmpfilesd
deleted file mode 100644
index a4f7cdc47423..000000000000
--- a/app-antivirus/skyldav/files/skyldav.tmpfilesd
+++ /dev/null
@@ -1,2 +0,0 @@
-# skyldav runtime directory for skyldav.pid and log (used by skyldavnotify)
-d /run/skyldav 0755 root root -
diff --git a/app-antivirus/skyldav/metadata.xml b/app-antivirus/skyldav/metadata.xml
deleted file mode 100644
index 260112f35a3d..000000000000
--- a/app-antivirus/skyldav/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
- xypron/skyldav
-
-
-
diff --git a/app-antivirus/skyldav/skyldav-0.7.ebuild b/app-antivirus/skyldav/skyldav-0.7.ebuild
deleted file mode 100644
index 0a0ef09e08fb..000000000000
--- a/app-antivirus/skyldav/skyldav-0.7.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit flag-o-matic linux-info linux-mod autotools-utils readme.gentoo-r1 systemd
-
-DESCRIPTION="Skyld AV: on-access scanning daemon for ClamAV using fanotify"
-HOMEPAGE="http://xypron.github.io/skyldav/"
-
-## github release tarball
-MY_PV=${PV/_rc/rc}
-MY_P="${PN}-${MY_PV}"
-SRC_URI="https://github.com/xypron/skyldav/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
-
-## selfmade tarball
-#MY_PVR=${PVR/_rc/rc}
-#MY_P="${PN}-${MY_PVR}"
-#SRC_URI="https://dev.gentoo.org/~wschlich/src/${CATEGORY}/${PN}/${MY_P}.tar.gz"
-
-## github commit tarball
-#MY_GIT_COMMIT="49bdb5e710b5a77c38ceb87da6015afb7009f1f9"
-#MY_P="xypron-${PN}-${MY_GIT_COMMIT:0:7}"
-#SRC_URI="https://github.com/xypron/${PN}/tarball/${MY_GIT_COMMIT} -> ${PF}.tar.gz"
-
-S="${WORKDIR}/${MY_P}"
-
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-LICENSE="Apache-2.0"
-IUSE="libnotify systemd"
-
-RDEPEND=">=app-antivirus/clamav-0.97.8
- sys-apps/util-linux
- sys-libs/libcap
- libnotify? (
- media-libs/libcanberra[gtk]
- x11-libs/libnotify
- x11-libs/gtk+:2
- )"
-DEPEND="${RDEPEND}
- sys-devel/autoconf-archive"
-
-## autotools-utils.eclass settings
-AUTOTOOLS_AUTORECONF="1"
-AUTOTOOLS_IN_SOURCE_BUILD="1"
-DOCS=( AUTHORS NEWS README )
-PATCHES=(
- "${FILESDIR}/${PN}-examples.patch"
- "${FILESDIR}/${PN}-conf.patch"
-)
-
-pkg_setup() {
- linux-info_pkg_setup
- kernel_is ge 3 8 0 || die "Linux 3.8.0 or newer recommended"
- CONFIG_CHECK="FANOTIFY FANOTIFY_ACCESS_PERMISSIONS"
- check_extra_config
-
- ## define contents for README.gentoo
- if use systemd; then
- DOC_CONTENTS='Skyld AV provides a systemd service.'$'\n'
- DOC_CONTENTS+='Please edit the systemd service config file to match your needs:'$'\n'
- DOC_CONTENTS+='/etc/systemd/system/skyldav.service.d/00gentoo.conf'$'\n'
- DOC_CONTENTS+='# systemctl daemon-reload'$'\n'
- DOC_CONTENTS+='# systemctl restart skyldav.service'$'\n'
- DOC_CONTENTS+='Example for enabling the Skyld AV service:'$'\n'
- DOC_CONTENTS+='# systemctl enable skyldav.service'$'\n'
- else
- DOC_CONTENTS='Skyld AV provides an init script for OpenRC.'$'\n'
- DOC_CONTENTS+='Please edit the init script config file to match your needs:'$'\n'
- DOC_CONTENTS+='/etc/conf.d/skyldav'$'\n'
- DOC_CONTENTS+='Example for enabling the Skyld AV init script:'$'\n'
- DOC_CONTENTS+='# rc-update add skyldav default'$'\n'
- fi
-}
-
-src_configure() {
- local myeconfargs=(
- $(use_with libnotify notification)
- )
- autotools-utils_src_configure
-}
-
-src_install() {
- autotools-utils_src_install
-
- ## install systemd service or OpenRC init scripts
- if use systemd; then
- systemd_newunit "${FILESDIR}/skyldav.service-r1" skyldav.service
- systemd_install_serviced "${FILESDIR}"/skyldav.service.conf
- systemd_newtmpfilesd "${FILESDIR}"/skyldav.tmpfilesd skyldav.conf
- else
- newinitd "${FILESDIR}/${PN}.initd" ${PN}
- newconfd "${FILESDIR}/${PN}.confd" ${PN}
- fi
-
- ## create README.gentoo from ${DOC_CONTENTS}
- DISABLE_AUTOFORMATTING=1 readme.gentoo_create_doc
-}
-
-pkg_postinst() {
- ## workaround for /usr/lib/tmpfiles.d/skyldav.conf
- ## not getting processed until the next reboot
- if use systemd; then
- install -d -m 0755 -o root -g root /run/skyldav
- fi
-}
diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index b30bdef519f1..877802c5a043 100644
Binary files a/app-backup/Manifest.gz and b/app-backup/Manifest.gz differ
diff --git a/app-backup/rdiff-backup/Manifest b/app-backup/rdiff-backup/Manifest
index 786ad0fa90a5..5a6e800202c1 100644
--- a/app-backup/rdiff-backup/Manifest
+++ b/app-backup/rdiff-backup/Manifest
@@ -1,3 +1,2 @@
DIST rdiff-backup-1.3.3.tar.gz 198412 BLAKE2B 95141b64ecb3442b2a420e3e2f4325a80bc4e3949e920f3fb04d8d7e69cd20b2809d230a5f9f6af6958f47689d73cf9fdc2d95134d41a5a9d0d6037ee87cf96e SHA512 e2731464a6ff146cdecac49d2d99275dc5e6b4a3ff5b8209fe6dc71fd80cdbf573d029531325a879e9a169c12b31568f75fdcb812f53df33896784c5bc550280
-DIST rdiff-backup-1.4.0b0.tar.gz 280675 BLAKE2B f729d7c4db08e32ca02a303afd7b88028efaba50e7dc9da20bac1e94835cd929c7277a73fb1f614d6acdf3ff72c96698bf6ca1a36c64c426649230f3f917ffe0 SHA512 50d3ca8ea155c9c001bf0284d8142757f8d12c4b9ef99b4ace43978c625dd6ddb06b04d2f91d0804a445c5ffcfef0dc1e1742a45d51731a728bde054cf3642f9
-DIST rdiff-backup-1.9.1b0.tar.gz 318549 BLAKE2B 726b3aec733861cbba45d3d3b13302c52d3e09fdf9f5a1912145b5af4503cc804ea1cf19bdb88c92ea77ad64c0a836bae470e0f4d672cc71eeef15fb00157678 SHA512 48dd4126ba13ebc1fda1a6855279d3d54c8c79571a2d8117a0204b37521aeb802e65e9d242c9ba6c360a196125da419c1bf36f95f5b73ceb39a8ba5f5dee0f2a
+DIST rdiff-backup-2.0.0.tar.gz 408352 BLAKE2B c2a7ae90ea147398d648142e20761e3caf4f08948dcd0a3de22254a13857d3e99cb2801c83084dd13dd84764cebc7651b42a70a788553c67925521e2ed123953 SHA512 0bf06d4eefffd41e86224d798e6ac6852ca0fd356be73d651ffaf63c37aaa043a6d22f8025619ab4a86e54f6e98e61f445ab68a6f87f4f2f48e635507ea110ec
diff --git a/app-backup/rdiff-backup/files/rdiff-backup-1.4.0-no-docs.patch b/app-backup/rdiff-backup/files/rdiff-backup-2.0.0-no-docs.patch
similarity index 70%
rename from app-backup/rdiff-backup/files/rdiff-backup-1.4.0-no-docs.patch
rename to app-backup/rdiff-backup/files/rdiff-backup-2.0.0-no-docs.patch
index 2d2ecb3ed0b0..bbac52538303 100644
--- a/app-backup/rdiff-backup/files/rdiff-backup-1.4.0-no-docs.patch
+++ b/app-backup/rdiff-backup/files/rdiff-backup-2.0.0-no-docs.patch
@@ -1,7 +1,7 @@
-diff -Naur rdiff-backup-1.4.0b0.orig/setup.py rdiff-backup-1.4.0b0/setup.py
---- rdiff-backup-1.4.0b0.orig/setup.py 2019-11-22 22:34:17.000000000 +0100
-+++ rdiff-backup-1.4.0b0/setup.py 2019-11-29 18:24:40.251407907 +0100
-@@ -152,18 +152,6 @@
+diff -Naur rdiff-backup-2.0.0.orig/setup.py rdiff-backup-2.0.0/setup.py
+--- rdiff-backup-2.0.0.orig/setup.py 2020-03-15 08:25:32.000000000 +0100
++++ rdiff-backup-2.0.0/setup.py 2020-03-18 20:36:48.579570457 +0100
+@@ -194,19 +194,6 @@
scripts=["src/rdiff-backup", "src/rdiff-backup-statistics"],
data_files=[
("share/man/man1", ["build/rdiff-backup.1", "build/rdiff-backup-statistics.1"]),
@@ -15,6 +15,7 @@ diff -Naur rdiff-backup-1.4.0b0.orig/setup.py rdiff-backup-1.4.0b0/setup.py
- "docs/examples.md",
- "docs/DEVELOP.md",
- "docs/Windows-README.md",
+- "docs/Windows-DEVELOP.md",
- ],
- ),
("share/bash-completion/completions", ["tools/bash-completion/rdiff-backup"]),
diff --git a/app-backup/rdiff-backup/rdiff-backup-1.4.0_beta.ebuild b/app-backup/rdiff-backup/rdiff-backup-1.4.0_beta.ebuild
deleted file mode 100644
index 6ddfec209fa7..000000000000
--- a/app-backup/rdiff-backup/rdiff-backup-1.4.0_beta.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-inherit distutils-r1
-
-UPSTREAM_PV=$(ver_rs 3 '.')
-
-DESCRIPTION="Local/remote mirroring+incremental backup"
-HOMEPAGE="https://github.com/rdiff-backup/rdiff-backup"
-SRC_URI="https://github.com/rdiff-backup/${PN}/releases/download/v${PV/_/.}/${P/_beta/b0}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="examples"
-
-DEPEND=">=net-libs/librsync-1.0:0="
-RDEPEND="${DEPEND}
- dev-python/pylibacl[${PYTHON_USEDEP}]
- dev-python/pyxattr[${PYTHON_USEDEP}]"
-
-PATCHES=(
- "${FILESDIR}/${PN}-1.4.0-no-docs.patch"
-)
-
-S=${WORKDIR}/${P/_beta/b0}
-
-python_install_all() {
- local DOCS=( docs/FAQ.md )
- use examples && DOCS+=( docs/examples.md )
- distutils-r1_python_install_all
-}
diff --git a/app-backup/rdiff-backup/rdiff-backup-1.9.1_beta.ebuild b/app-backup/rdiff-backup/rdiff-backup-2.0.0.ebuild
similarity index 86%
rename from app-backup/rdiff-backup/rdiff-backup-1.9.1_beta.ebuild
rename to app-backup/rdiff-backup/rdiff-backup-2.0.0.ebuild
index ca92ff700f72..f60e5ef0cb97 100644
--- a/app-backup/rdiff-backup/rdiff-backup-1.9.1_beta.ebuild
+++ b/app-backup/rdiff-backup/rdiff-backup-2.0.0.ebuild
@@ -6,11 +6,9 @@ EAPI=7
PYTHON_COMPAT=( python3_{6,7,8} )
inherit distutils-r1
-MY_PV=${PV/_beta/b0}
-
DESCRIPTION="Local/remote mirroring+incremental backup"
HOMEPAGE="https://github.com/rdiff-backup/rdiff-backup"
-SRC_URI="https://github.com/rdiff-backup/${PN}/releases/download/v${MY_PV}/${PN}-${MY_PV}.tar.gz"
+SRC_URI="https://github.com/rdiff-backup/${PN}/releases/download/v${PV}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
@@ -24,11 +22,9 @@ RDEPEND="dev-python/pylibacl[${PYTHON_USEDEP}]
>=net-libs/librsync-1.0:0="
PATCHES=(
- "${FILESDIR}/${PN}-1.4.0-no-docs.patch"
+ "${FILESDIR}/${PN}-2.0.0-no-docs.patch"
)
-S=${WORKDIR}/${PN}-${MY_PV}
-
python_install_all() {
local DOCS=( docs/FAQ.md )
use examples && DOCS+=( docs/examples.md )
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 69ac5812211d..c11710f7dce8 100644
Binary files a/app-crypt/Manifest.gz and b/app-crypt/Manifest.gz differ
diff --git a/app-crypt/qca/Manifest b/app-crypt/qca/Manifest
index b72a547ab01d..73f8c879420b 100644
--- a/app-crypt/qca/Manifest
+++ b/app-crypt/qca/Manifest
@@ -1,2 +1 @@
-DIST qca-2.2.1.tar.xz 691676 BLAKE2B d5bcc0d6e791811e1efcdbf2e09916fe40ad682b0e59b2993c73a5bd79e09fc28facdec81259a982bee05223c8dfce78b9a6b729ca4e566c0901a13b91575379 SHA512 3a0e8aa7cf3ea9a7244facaf1d521ebca2753af37636e7bf5f21c57ae880ac9682ae7d6d9fa5ce41b73568ff9538214956b89cd41228c2cb828d9068c2031a9c
DIST qca-2.3.0.tar.xz 729504 BLAKE2B 71cf9dfae00066c14e1055da1fa1a8e1210f538b1addfde1b99a9b26b1e8f7dd61e289d0f505b5ec04d5f4745216d4fd0f8be8f8de9e9cbf74123907ba703d0e SHA512 ca9251868e073834562fa62ffc64b3e7817c9ddadc6bc3fb99cf8b5c8d859969562170a98874be9590c617b2dd8e5590d2c83792554f54bb880c677902db22fe
diff --git a/app-crypt/qca/qca-2.2.1.ebuild b/app-crypt/qca/qca-2.2.1.ebuild
deleted file mode 100644
index 0f23610c98fb..000000000000
--- a/app-crypt/qca/qca-2.2.1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake qmake-utils
-
-DESCRIPTION="Qt Cryptographic Architecture (QCA)"
-HOMEPAGE="https://userbase.kde.org/QCA"
-SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-
-LICENSE="LGPL-2.1"
-SLOT="2"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
-
-IUSE="botan debug doc examples gcrypt gpg logger nss pkcs11 sasl softstore +ssl test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
- doc? ( app-doc/doxygen )
-"
-RDEPEND="
- dev-qt/qtcore:5
- botan? ( dev-libs/botan:= )
- gcrypt? ( dev-libs/libgcrypt:= )
- gpg? ( app-crypt/gnupg )
- nss? ( dev-libs/nss )
- pkcs11? (
- dev-libs/openssl:0
- dev-libs/pkcs11-helper
- )
- sasl? ( dev-libs/cyrus-sasl:2 )
- ssl? ( >=dev-libs/openssl-1.0.1:0= )
-"
-DEPEND="${RDEPEND}
- test? (
- dev-qt/qtnetwork:5
- dev-qt/qttest:5
- )
-"
-
-PATCHES=( "${FILESDIR}/${PN}-disable-pgp-test.patch" )
-
-qca_plugin_use() {
- echo -DWITH_${2:-$1}_PLUGIN=$(usex "$1")
-}
-
-src_configure() {
- local mycmakeargs=(
- -DQCA_FEATURE_INSTALL_DIR="${EPREFIX}$(qt5_get_mkspecsdir)/features"
- -DQCA_PLUGINS_INSTALL_DIR="${EPREFIX}$(qt5_get_plugindir)"
- $(qca_plugin_use botan)
- $(qca_plugin_use gcrypt)
- $(qca_plugin_use gpg gnupg)
- $(qca_plugin_use logger)
- $(qca_plugin_use nss)
- $(qca_plugin_use pkcs11)
- $(qca_plugin_use sasl cyrus-sasl)
- $(qca_plugin_use softstore)
- $(qca_plugin_use ssl ossl)
- -DBUILD_TESTS=$(usex test)
- )
- cmake_src_configure
-}
-
-src_test() {
- local -x QCA_PLUGIN_PATH="${BUILD_DIR}/lib/qca"
- cmake_src_test
-}
-
-src_install() {
- cmake_src_install
-
- if use doc; then
- pushd "${BUILD_DIR}" >/dev/null || die
- doxygen Doxyfile || die
- dodoc -r apidocs/html
- popd >/dev/null || die
- fi
-
- if use examples; then
- dodoc -r "${S}"/examples
- fi
-}
diff --git a/app-crypt/qca/qca-2.3.0.ebuild b/app-crypt/qca/qca-2.3.0.ebuild
index 848ff4467833..b954f235e01f 100644
--- a/app-crypt/qca/qca-2.3.0.ebuild
+++ b/app-crypt/qca/qca-2.3.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
LICENSE="LGPL-2.1"
SLOT="2"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
IUSE="botan debug doc examples gcrypt gpg logger nss pkcs11 sasl softstore +ssl test"
RESTRICT="!test? ( test )"
diff --git a/app-crypt/yubikey-manager-qt/yubikey-manager-qt-1.1.4.ebuild b/app-crypt/yubikey-manager-qt/yubikey-manager-qt-1.1.4-r2.ebuild
similarity index 93%
rename from app-crypt/yubikey-manager-qt/yubikey-manager-qt-1.1.4.ebuild
rename to app-crypt/yubikey-manager-qt/yubikey-manager-qt-1.1.4-r2.ebuild
index 6fb3d2e0e306..28af6261aa86 100644
--- a/app-crypt/yubikey-manager-qt/yubikey-manager-qt-1.1.4.ebuild
+++ b/app-crypt/yubikey-manager-qt/yubikey-manager-qt-1.1.4-r2.ebuild
@@ -1,11 +1,11 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{6,7,8} )
-inherit eutils qmake-utils python-single-r1
+inherit eutils qmake-utils python-single-r1 desktop
DESCRIPTION="Cross-platform application for configuring any YubiKey over all USB transports"
HOMEPAGE="https://developers.yubico.com/yubikey-manager-qt https://github.com/Yubico/yubikey-manager-qt"
diff --git a/app-crypt/yubikey-manager/yubikey-manager-3.1.1.ebuild b/app-crypt/yubikey-manager/yubikey-manager-3.1.1-r1.ebuild
similarity index 97%
rename from app-crypt/yubikey-manager/yubikey-manager-3.1.1.ebuild
rename to app-crypt/yubikey-manager/yubikey-manager-3.1.1-r1.ebuild
index ac83c7f009ad..9585e25beb8d 100644
--- a/app-crypt/yubikey-manager/yubikey-manager-3.1.1.ebuild
+++ b/app-crypt/yubikey-manager/yubikey-manager-3.1.1-r1.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{6,7,8} )
inherit readme.gentoo-r1 distutils-r1
DESCRIPTION="Python library and command line tool for configuring a YubiKey"
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index dfda0f7444a7..8883091c3ada 100644
Binary files a/app-emulation/Manifest.gz and b/app-emulation/Manifest.gz differ
diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest
index 115dd1725692..875d3ffc6a7f 100644
--- a/app-emulation/libvirt/Manifest
+++ b/app-emulation/libvirt/Manifest
@@ -1,3 +1,2 @@
-DIST libvirt-5.10.0.tar.xz 8732120 BLAKE2B 9b191a624cca2c84d157482c48cd4eec0456382aa861958880bbbdc25785625386f63320a0626e52683776cca25c4af80ee65d19349ed0b2862e76a074e4e419 SHA512 bb518a6aa6731a7de4b24fc7b8ffdcd2cdd84dfe49047374e0f02265c274eb06dbe1732c9cc4954412853d36d9dd5c1124fb8a5e37f4c01654d85013773ffa23
DIST libvirt-6.0.0.tar.xz 8686092 BLAKE2B 669054aa3bb3e4f2cf0be2e9ea796b820786661f65495597322e178d7c7e42355b0e3752c8a847cb2fc4405928a30a00544829647aa84cc2e71bc0cb8ce9af5f SHA512 64259c0cffa9fc01192c5474f69d88a61ed0bae0a100379fed6112723a37eff1865ccfc85a19d6b8cd39ed504f04998bb3f6390aaafff797bb41ef65b6ec413c
DIST libvirt-6.1.0.tar.xz 8276964 BLAKE2B cf57e28d17e868ab4a69f03fe77b0d779362c6cb8cf1a38196ba7bad873ec4ecfa8ad1744ce97251820ab898be1ddc9bf30b788f1708172bfd23ec2c7cd3bdac SHA512 17a2641f300a4a05149261bae74ac856e9a2511a259146595d2e2412c4a0601d88369b0544ba86edc80e433a47cf828317d8de38c6ec86a1b3efaca75294a606
diff --git a/app-emulation/libvirt/libvirt-5.10.0.ebuild b/app-emulation/libvirt/libvirt-5.10.0.ebuild
deleted file mode 100644
index 6e3d68eee334..000000000000
--- a/app-emulation/libvirt/libvirt-5.10.0.ebuild
+++ /dev/null
@@ -1,379 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit autotools out-of-source bash-completion-r1 eutils linux-info python-any-r1 readme.gentoo-r1 systemd
-
-if [[ ${PV} = *9999* ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://libvirt.org/git/libvirt.git"
- SRC_URI=""
- KEYWORDS="amd64 x86"
- SLOT="0"
-else
- SRC_URI="https://libvirt.org/sources/${P}.tar.xz"
- KEYWORDS="amd64 ~arm64 ~ppc64 x86"
- SLOT="0/${PV}"
-fi
-
-DESCRIPTION="C toolkit to manipulate virtual machines"
-HOMEPAGE="http://www.libvirt.org/"
-LICENSE="LGPL-2.1"
-IUSE="
- apparmor audit +caps +dbus dtrace firewalld fuse glusterfs iscsi
- iscsi-direct +libvirtd lvm libssh lxc +macvtap nfs nls numa openvz
- parted pcap phyp policykit +qemu rbd sasl selinux +udev +vepa
- virtualbox virt-network wireshark-plugins xen zfs
-"
-
-REQUIRED_USE="
- firewalld? ( virt-network )
- libvirtd? ( || ( lxc openvz qemu virtualbox xen ) )
- lxc? ( caps libvirtd )
- openvz? ( libvirtd )
- policykit? ( dbus )
- qemu? ( libvirtd )
- vepa? ( macvtap )
- virt-network? ( libvirtd )
- virtualbox? ( libvirtd )
- xen? ( libvirtd )"
-
-# gettext.sh command is used by the libvirt command wrappers, and it's
-# non-optional, so put it into RDEPEND.
-# We can use both libnl:1.1 and libnl:3, but if you have both installed, the
-# package will use 3 by default. Since we don't have slot pinning in an API,
-# we must go with the most recent
-RDEPEND="
- acct-user/qemu
- policykit? ( acct-group/libvirt )
- app-misc/scrub
- >=dev-libs/glib-2.48.0
- dev-libs/libgcrypt:0
- dev-libs/libnl:3
- >=dev-libs/libxml2-2.7.6
- >=net-analyzer/openbsd-netcat-1.105-r1
- >=net-libs/gnutls-1.0.25:0=
- net-libs/libssh2
- net-libs/libtirpc
- net-libs/rpcsvc-proto
- >=net-misc/curl-7.18.0
- sys-apps/dmidecode
- >=sys-apps/util-linux-2.17
- sys-devel/gettext
- sys-libs/ncurses:0=
- sys-libs/readline:=
- apparmor? ( sys-libs/libapparmor )
- audit? ( sys-process/audit )
- caps? ( sys-libs/libcap-ng )
- dbus? ( sys-apps/dbus )
- dtrace? ( dev-util/systemtap )
- firewalld? ( >=net-firewall/firewalld-0.6.3 )
- fuse? ( sys-fs/fuse:0= )
- glusterfs? ( >=sys-cluster/glusterfs-3.4.1 )
- iscsi? ( sys-block/open-iscsi )
- iscsi-direct? ( >=net-libs/libiscsi-1.18.0 )
- libssh? ( net-libs/libssh )
- lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] )
- lxc? ( !sys-apps/systemd[-cgroup-hybrid(+)] )
- nfs? ( net-fs/nfs-utils )
- numa? (
- >sys-process/numactl-2.0.2
- sys-process/numad
- )
- parted? (
- >=sys-block/parted-1.8[device-mapper]
- sys-fs/lvm2[-device-mapper-only(-)]
- )
- pcap? ( >=net-libs/libpcap-1.0.0 )
- policykit? ( >=sys-auth/polkit-0.9 )
- qemu? (
- >=app-emulation/qemu-1.5.0
- dev-libs/yajl
- )
- rbd? ( sys-cluster/ceph )
- sasl? ( dev-libs/cyrus-sasl )
- selinux? ( >=sys-libs/libselinux-2.0.85 )
- virt-network? (
- net-dns/dnsmasq[script]
- net-firewall/ebtables
- >=net-firewall/iptables-1.4.10[ipv6]
- net-misc/radvd
- sys-apps/iproute2[-minimal]
- )
- virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) )
- wireshark-plugins? ( net-analyzer/wireshark:= )
- xen? (
- >=app-emulation/xen-4.6.0
- app-emulation/xen-tools:=
- )
- udev? (
- virtual/udev
- >=x11-libs/libpciaccess-0.10.9
- )
- zfs? ( sys-fs/zfs )"
-
-DEPEND="${RDEPEND}
- ${PYTHON_DEPS}
- app-text/xhtml1
- dev-lang/perl
- dev-libs/libxslt
- dev-perl/XML-XPath
- virtual/pkgconfig"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-5.7.0-do-not-use-sysconf.patch
- "${FILESDIR}"/${PN}-1.2.16-fix_paths_in_libvirt-guests_sh.patch
- "${FILESDIR}"/${PN}-5.2.0-fix-paths-for-apparmor.patch
-)
-
-pkg_setup() {
- # Check kernel configuration:
- CONFIG_CHECK=""
- use fuse && CONFIG_CHECK+="
- ~FUSE_FS"
-
- use lvm && CONFIG_CHECK+="
- ~BLK_DEV_DM
- ~DM_MULTIPATH
- ~DM_SNAPSHOT"
-
- use lxc && CONFIG_CHECK+="
- ~BLK_CGROUP
- ~CGROUP_CPUACCT
- ~CGROUP_DEVICE
- ~CGROUP_FREEZER
- ~CGROUP_NET_PRIO
- ~CGROUP_PERF
- ~CGROUPS
- ~CGROUP_SCHED
- ~CPUSETS
- ~IPC_NS
- ~MACVLAN
- ~NAMESPACES
- ~NET_CLS_CGROUP
- ~NET_NS
- ~PID_NS
- ~POSIX_MQUEUE
- ~SECURITYFS
- ~USER_NS
- ~UTS_NS
- ~VETH
- ~!GRKERNSEC_CHROOT_MOUNT
- ~!GRKERNSEC_CHROOT_DOUBLE
- ~!GRKERNSEC_CHROOT_PIVOT
- ~!GRKERNSEC_CHROOT_CHMOD
- ~!GRKERNSEC_CHROOT_CAPS"
-
- kernel_is lt 4 7 && use lxc && CONFIG_CHECK+="
- ~DEVPTS_MULTIPLE_INSTANCES"
-
- use macvtap && CONFIG_CHECK+="
- ~MACVTAP"
-
- use virt-network && CONFIG_CHECK+="
- ~BRIDGE_EBT_MARK_T
- ~BRIDGE_NF_EBTABLES
- ~NETFILTER_ADVANCED
- ~NETFILTER_XT_CONNMARK
- ~NETFILTER_XT_MARK
- ~NETFILTER_XT_TARGET_CHECKSUM
- ~IP_NF_FILTER
- ~IP_NF_MANGLE
- ~IP_NF_NAT
- ~IP_NF_TARGET_MASQUERADE
- ~IP6_NF_FILTER
- ~IP6_NF_MANGLE
- ~IP6_NF_NAT"
- # Bandwidth Limiting Support
- use virt-network && CONFIG_CHECK+="
- ~BRIDGE_EBT_T_NAT
- ~IP_NF_TARGET_REJECT
- ~NET_ACT_POLICE
- ~NET_CLS_FW
- ~NET_CLS_U32
- ~NET_SCH_HTB
- ~NET_SCH_INGRESS
- ~NET_SCH_SFQ"
-
- # Handle specific kernel versions for different features
- kernel_is lt 3 6 && CONFIG_CHECK+=" ~CGROUP_MEM_RES_CTLR"
- if kernel_is ge 3 6; then
- CONFIG_CHECK+=" ~MEMCG ~MEMCG_SWAP "
- kernel_is lt 4 5 && CONFIG_CHECK+=" ~MEMCG_KMEM "
- fi
-
- ERROR_USER_NS="Optional depending on LXC configuration."
-
- if [[ -n ${CONFIG_CHECK} ]]; then
- linux-info_pkg_setup
- fi
-}
-
-src_prepare() {
- touch "${S}/.mailmap"
-
- default
-
- if [[ ${PV} = *9999* ]]; then
- # Reinitialize submodules as this is required for gnulib's bootstrap
- git submodule init
- # git checkouts require bootstrapping to create the configure script.
- # Additionally the submodules must be cloned to the right locations
- # bug #377279
- ./bootstrap || die "bootstrap failed"
- (
- git submodule status .gnulib | awk '{ print $1 }'
- git hash-object bootstrap.conf
- git ls-tree -d HEAD gnulib/local | awk '{ print $3 }'
- ) >.git-module-status
- fi
-
- # Tweak the init script:
- cp "${FILESDIR}/libvirtd.init-r18" "${S}/libvirtd.init" || die
- sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \
- -i "${S}/libvirtd.init" || die "sed failed"
-
- eautoreconf
-}
-
-my_src_configure() {
- local myeconfargs=(
- $(use_with apparmor)
- $(use_with apparmor apparmor-profiles)
- $(use_with audit)
- $(use_with caps capng)
- $(use_with dbus)
- $(use_with dtrace)
- $(use_with firewalld)
- $(use_with fuse)
- $(use_with glusterfs)
- $(use_with glusterfs storage-gluster)
- $(use_with iscsi storage-iscsi)
- $(use_with iscsi-direct storage-iscsi-direct)
- $(use_with libvirtd)
- $(use_with libssh)
- $(use_with lvm storage-lvm)
- $(use_with lvm storage-mpath)
- $(use_with lxc)
- $(use_with macvtap)
- $(use_enable nls)
- $(use_with numa numactl)
- $(use_with numa numad)
- $(use_with openvz)
- $(use_with parted storage-disk)
- $(use_with pcap libpcap)
- $(use_with phyp)
- $(use_with policykit polkit)
- $(use_with qemu)
- $(use_with qemu yajl)
- $(use_with rbd storage-rbd)
- $(use_with sasl)
- $(use_with selinux)
- $(use_with udev)
- $(use_with vepa virtualport)
- $(use_with virt-network network)
- $(use_with wireshark-plugins wireshark-dissector)
- $(use_with xen libxl)
- $(use_with zfs storage-zfs)
-
- --without-hal
- --without-netcf
- --without-sanlock
-
- --with-esx
- --with-init-script=systemd
- --with-qemu-group=$(usex caps qemu root)
- --with-qemu-user=$(usex caps qemu root)
- --with-remote
- --with-storage-fs
- --with-vmware
-
- --disable-static
- --disable-werror
-
- --localstatedir=/var
- --enable-dependency-tracking
- )
-
- if use virtualbox && has_version app-emulation/virtualbox-ose; then
- myeconfargs+=( --with-vbox=/usr/lib/virtualbox-ose/ )
- else
- myeconfargs+=( $(use_with virtualbox vbox) )
- fi
-
- econf "${myeconfargs[@]}"
-
- if [[ ${PV} = *9999* ]]; then
- # Restore gnulib's config.sub and config.guess
- # bug #377279
- (cd "${S}"/.gnulib && git reset --hard > /dev/null)
- fi
-}
-
-my_src_test() {
- # remove problematic tests, bug #591416, bug #591418
- sed -i -e 's#commandtest$(EXEEXT) # #' \
- -e 's#virfirewalltest$(EXEEXT) # #' \
- -e 's#nwfilterebiptablestest$(EXEEXT) # #' \
- -e 's#nwfilterxml2firewalltest$(EXEEXT)$##' \
- tests/Makefile
-
- export VIR_TEST_DEBUG=1
- HOME="${T}" emake check
-}
-
-my_src_install() {
- emake DESTDIR="${D}" \
- SYSTEMD_UNIT_DIR="$(systemd_get_systemunitdir)" install
-
- find "${D}" -name '*.la' -delete || die
-
- # Remove bogus, empty directories. They are either not used, or
- # libvirtd is able to create them on demand
- rm -rf "${D}"/etc/sysconfig
- rm -rf "${D}"/var
-
- newbashcomp "${S}/tools/bash-completion/vsh" virsh
- bashcomp_alias virsh virt-admin
-
- use libvirtd || return 0
- # From here, only libvirtd-related instructions, be warned!
-
- systemd_install_serviced \
- "${FILESDIR}"/libvirtd.service.conf libvirtd.service
-
- systemd_newtmpfilesd "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf
-
- newinitd "${S}/libvirtd.init" libvirtd
- newinitd "${FILESDIR}/libvirt-guests.init-r4" libvirt-guests
- newinitd "${FILESDIR}/virtlockd.init-r1" virtlockd
- newinitd "${FILESDIR}/virtlogd.init-r1" virtlogd
-
- newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd
- newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests
-
- DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r2")
- DISABLE_AUTOFORMATTING=true
- readme.gentoo_create_doc
-}
-
-pkg_preinst() {
- # we only ever want to generate this once
- if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
- rm -rf "${D}"/etc/libvirt/qemu/networks/default.xml
- fi
-}
-
-pkg_postinst() {
- if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
- touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml
- fi
-
- use libvirtd || return 0
- # From here, only libvirtd-related instructions, be warned!
-
- readme.gentoo_print_elog
-}
diff --git a/app-emulation/qemu/qemu-4.2.0-r1.ebuild b/app-emulation/qemu/qemu-4.2.0-r1.ebuild
deleted file mode 100644
index c33721da592f..000000000000
--- a/app-emulation/qemu/qemu-4.2.0-r1.ebuild
+++ /dev/null
@@ -1,829 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python{3_6,3_7} )
-PYTHON_REQ_USE="ncurses,readline"
-
-PLOCALES="bg de_DE fr_FR hu it tr zh_CN"
-
-FIRMWARE_ABI_VERSION="4.0.0-r50"
-
-inherit eutils linux-info toolchain-funcs multilib python-r1 \
- udev fcaps readme.gentoo-r1 pax-utils l10n xdg-utils
-
-if [[ ${PV} = *9999* ]]; then
- EGIT_REPO_URI="https://git.qemu.org/git/qemu.git"
- EGIT_SUBMODULES=(
- slirp
- tests/fp/berkeley-{test,soft}float-3
- ui/keycodemapdb
- )
- inherit git-r3
- SRC_URI=""
-else
- SRC_URI="https://download.qemu.org/${P}.tar.xz"
- KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86"
-fi
-
-DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
-HOMEPAGE="http://www.qemu.org http://www.linux-kvm.org"
-
-LICENSE="GPL-2 LGPL-2 BSD-2"
-SLOT="0"
-
-IUSE="accessibility +aio alsa bzip2 capstone +caps +curl debug doc
- +fdt glusterfs gnutls gtk infiniband iscsi jemalloc +jpeg kernel_linux
- kernel_FreeBSD lzo ncurses nfs nls numa opengl +oss +pin-upstream-blobs
- plugins +png pulseaudio python rbd sasl +seccomp sdl selinux smartcard snappy
- spice ssh static static-user systemtap tci test usb usbredir vde
- +vhost-net vhost-user-fs virgl virtfs +vnc vte xattr xen xfs +xkb"
-
-COMMON_TARGETS="aarch64 alpha arm cris hppa i386 m68k microblaze microblazeel
- mips mips64 mips64el mipsel nios2 or1k ppc ppc64 riscv32 riscv64 s390x
- sh4 sh4eb sparc sparc64 x86_64 xtensa xtensaeb"
-IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS}
- lm32 moxie tricore unicore32"
-IUSE_USER_TARGETS="${COMMON_TARGETS}
- aarch64_be armeb mipsn32 mipsn32el ppc64abi32 ppc64le sparc32plus
- tilegx"
-
-use_softmmu_targets=$(printf ' qemu_softmmu_targets_%s' ${IUSE_SOFTMMU_TARGETS})
-use_user_targets=$(printf ' qemu_user_targets_%s' ${IUSE_USER_TARGETS})
-IUSE+=" ${use_softmmu_targets} ${use_user_targets}"
-
-RESTRICT="!test? ( test )"
-# Allow no targets to be built so that people can get a tools-only build.
-# Block USE flag configurations known to not work.
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- qemu_softmmu_targets_arm? ( fdt )
- qemu_softmmu_targets_microblaze? ( fdt )
- qemu_softmmu_targets_mips64el? ( fdt )
- qemu_softmmu_targets_ppc64? ( fdt )
- qemu_softmmu_targets_ppc? ( fdt )
- qemu_softmmu_targets_riscv32? ( fdt )
- qemu_softmmu_targets_riscv64? ( fdt )
- static? ( static-user !alsa !gtk !opengl !pulseaudio !plugins !rbd !snappy )
- static-user? ( !plugins )
- virtfs? ( xattr )
- vte? ( gtk )
- plugins? ( !static !static-user )
-"
-
-# Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...)
-# and user/softmmu targets (qemu-*, qemu-system-*).
-#
-# Yep, you need both libcap and libcap-ng since virtfs only uses libcap.
-#
-# The attr lib isn't always linked in (although the USE flag is always
-# respected). This is because qemu supports using the C library's API
-# when available rather than always using the external library.
-ALL_DEPEND="
- >=dev-libs/glib-2.0[static-libs(+)]
- sys-libs/zlib[static-libs(+)]
- python? ( ${PYTHON_DEPS} )
- systemtap? ( dev-util/systemtap )
- xattr? ( sys-apps/attr[static-libs(+)] )"
-
-# Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...)
-# softmmu targets (qemu-system-*).
-SOFTMMU_TOOLS_DEPEND="
- dev-libs/libxml2[static-libs(+)]
- xkb? ( x11-libs/libxkbcommon[static-libs(+)] )
- >=x11-libs/pixman-0.28.0[static-libs(+)]
- accessibility? (
- app-accessibility/brltty[api]
- app-accessibility/brltty[static-libs(+)]
- )
- aio? ( dev-libs/libaio[static-libs(+)] )
- alsa? ( >=media-libs/alsa-lib-1.0.13 )
- bzip2? ( app-arch/bzip2[static-libs(+)] )
- capstone? ( dev-libs/capstone:= )
- caps? ( sys-libs/libcap-ng[static-libs(+)] )
- curl? ( >=net-misc/curl-7.15.4[static-libs(+)] )
- fdt? ( >=sys-apps/dtc-1.5.0[static-libs(+)] )
- glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] )
- gnutls? (
- dev-libs/nettle:=[static-libs(+)]
- >=net-libs/gnutls-3.0:=[static-libs(+)]
- )
- gtk? (
- x11-libs/gtk+:3
- vte? ( x11-libs/vte:2.91 )
- )
- infiniband? (
- sys-fabric/libibumad:=[static-libs(+)]
- sys-fabric/libibverbs:=[static-libs(+)]
- sys-fabric/librdmacm:=[static-libs(+)]
- )
- iscsi? ( net-libs/libiscsi )
- jemalloc? ( dev-libs/jemalloc )
- jpeg? ( virtual/jpeg:0=[static-libs(+)] )
- lzo? ( dev-libs/lzo:2[static-libs(+)] )
- ncurses? (
- sys-libs/ncurses:0=[unicode]
- sys-libs/ncurses:0=[static-libs(+)]
- )
- nfs? ( >=net-fs/libnfs-1.9.3:=[static-libs(+)] )
- numa? ( sys-process/numactl[static-libs(+)] )
- opengl? (
- virtual/opengl
- media-libs/libepoxy[static-libs(+)]
- media-libs/mesa[static-libs(+)]
- media-libs/mesa[egl,gbm]
- )
- png? ( media-libs/libpng:0=[static-libs(+)] )
- pulseaudio? ( media-sound/pulseaudio )
- rbd? ( sys-cluster/ceph )
- sasl? ( dev-libs/cyrus-sasl[static-libs(+)] )
- sdl? (
- media-libs/libsdl2[X]
- media-libs/libsdl2[static-libs(+)]
- )
- seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] )
- smartcard? ( >=app-emulation/libcacard-2.5.0[static-libs(+)] )
- snappy? ( app-arch/snappy:= )
- spice? (
- >=app-emulation/spice-protocol-0.12.3
- >=app-emulation/spice-0.12.0[static-libs(+)]
- )
- ssh? ( >=net-libs/libssh-0.8.6[static-libs(+)] )
- usb? ( >=virtual/libusb-1-r2[static-libs(+)] )
- usbredir? ( >=sys-apps/usbredir-0.6[static-libs(+)] )
- vde? ( net-misc/vde[static-libs(+)] )
- virgl? ( media-libs/virglrenderer[static-libs(+)] )
- virtfs? ( sys-libs/libcap )
- xen? ( app-emulation/xen-tools:= )
- xfs? ( sys-fs/xfsprogs[static-libs(+)] )"
-
-X86_FIRMWARE_DEPEND="
- pin-upstream-blobs? (
- ~sys-firmware/edk2-ovmf-201905[binary]
- ~sys-firmware/ipxe-1.0.0_p20190728[binary]
- ~sys-firmware/seabios-1.12.0[binary,seavgabios]
- ~sys-firmware/sgabios-0.1_pre8[binary]
- )
- !pin-upstream-blobs? (
- sys-firmware/edk2-ovmf
- sys-firmware/ipxe
- >=sys-firmware/seabios-1.10.2[seavgabios]
- sys-firmware/sgabios
- )"
-PPC64_FIRMWARE_DEPEND="
- pin-upstream-blobs? (
- ~sys-firmware/seabios-1.12.0[binary,seavgabios]
- )
- !pin-upstream-blobs? (
- >=sys-firmware/seabios-1.10.2[seavgabios]
- )
-"
-
-BDEPEND="
- $(python_gen_impl_dep)
- dev-lang/perl
- sys-apps/texinfo
- virtual/pkgconfig
- doc? ( dev-python/sphinx )
- gtk? ( nls? ( sys-devel/gettext ) )
- test? (
- dev-libs/glib[utils]
- sys-devel/bc
- )
-"
-CDEPEND="
- !static? (
- ${ALL_DEPEND//\[static-libs(+)]}
- ${SOFTMMU_TOOLS_DEPEND//\[static-libs(+)]}
- )
- qemu_softmmu_targets_i386? ( ${X86_FIRMWARE_DEPEND} )
- qemu_softmmu_targets_x86_64? ( ${X86_FIRMWARE_DEPEND} )
- qemu_softmmu_targets_ppc64? ( ${PPC64_FIRMWARE_DEPEND} )
-"
-DEPEND="${CDEPEND}
- kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 )
- static? (
- ${ALL_DEPEND}
- ${SOFTMMU_TOOLS_DEPEND}
- )
- static-user? ( ${ALL_DEPEND} )"
-RDEPEND="${CDEPEND}
- acct-group/kvm
- selinux? ( sec-policy/selinux-qemu )"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-2.5.0-cflags.patch
- "${FILESDIR}"/${PN}-2.5.0-sysmacros.patch
- "${FILESDIR}"/${PN}-2.11.1-capstone_include_path.patch
- "${FILESDIR}"/${PN}-4.0.0-sanitize-interp_info.patch
- "${FILESDIR}"/${PN}-4.0.0-mkdir_systemtap.patch #684902
-)
-
-QA_PREBUILT="
- usr/share/qemu/hppa-firmware.img
- usr/share/qemu/openbios-ppc
- usr/share/qemu/openbios-sparc64
- usr/share/qemu/openbios-sparc32
- usr/share/qemu/palcode-clipper
- usr/share/qemu/s390-ccw.img
- usr/share/qemu/s390-netboot.img
- usr/share/qemu/u-boot.e500"
-
-QA_WX_LOAD="usr/bin/qemu-i386
- usr/bin/qemu-x86_64
- usr/bin/qemu-alpha
- usr/bin/qemu-arm
- usr/bin/qemu-cris
- usr/bin/qemu-m68k
- usr/bin/qemu-microblaze
- usr/bin/qemu-microblazeel
- usr/bin/qemu-mips
- usr/bin/qemu-mipsel
- usr/bin/qemu-or1k
- usr/bin/qemu-ppc
- usr/bin/qemu-ppc64
- usr/bin/qemu-ppc64abi32
- usr/bin/qemu-sh4
- usr/bin/qemu-sh4eb
- usr/bin/qemu-sparc
- usr/bin/qemu-sparc64
- usr/bin/qemu-armeb
- usr/bin/qemu-sparc32plus
- usr/bin/qemu-s390x
- usr/bin/qemu-unicore32"
-
-DOC_CONTENTS="If you don't have kvm compiled into the kernel, make sure you have the
-kernel module loaded before running kvm. The easiest way to ensure that the
-kernel module is loaded is to load it on boot.
- For AMD CPUs the module is called 'kvm-amd'.
- For Intel CPUs the module is called 'kvm-intel'.
-Please review /etc/conf.d/modules for how to load these.
-
-Make sure your user is in the 'kvm' group. Just run
- $ gpasswd -a kvm
-then have re-login.
-
-For brand new installs, the default permissions on /dev/kvm might not let
-you access it. You can tell udev to reset ownership/perms:
- $ udevadm trigger -c add /dev/kvm
-
-If you want to register binfmt handlers for qemu user targets:
-For openrc:
- # rc-update add qemu-binfmt
-For systemd:
- # ln -s /usr/share/qemu/binfmt.d/qemu.conf /etc/binfmt.d/qemu.conf"
-
-pkg_pretend() {
- if use kernel_linux && kernel_is lt 2 6 25; then
- eerror "This version of KVM requres a host kernel of 2.6.25 or higher."
- elif use kernel_linux; then
- if ! linux_config_exists; then
- eerror "Unable to check your kernel for KVM support"
- else
- CONFIG_CHECK="~KVM ~TUN ~BRIDGE"
- ERROR_KVM="You must enable KVM in your kernel to continue"
- ERROR_KVM_AMD="If you have an AMD CPU, you must enable KVM_AMD in"
- ERROR_KVM_AMD+=" your kernel configuration."
- ERROR_KVM_INTEL="If you have an Intel CPU, you must enable"
- ERROR_KVM_INTEL+=" KVM_INTEL in your kernel configuration."
- ERROR_TUN="You will need the Universal TUN/TAP driver compiled"
- ERROR_TUN+=" into your kernel or loaded as a module to use the"
- ERROR_TUN+=" virtual network device if using -net tap."
- ERROR_BRIDGE="You will also need support for 802.1d"
- ERROR_BRIDGE+=" Ethernet Bridging for some network configurations."
- use vhost-net && CONFIG_CHECK+=" ~VHOST_NET"
- ERROR_VHOST_NET="You must enable VHOST_NET to have vhost-net"
- ERROR_VHOST_NET+=" support"
-
- if use amd64 || use x86 || use amd64-linux || use x86-linux; then
- if grep -q AuthenticAMD /proc/cpuinfo; then
- CONFIG_CHECK+=" ~KVM_AMD"
- elif grep -q GenuineIntel /proc/cpuinfo; then
- CONFIG_CHECK+=" ~KVM_INTEL"
- fi
- fi
-
- use python && CONFIG_CHECK+=" ~DEBUG_FS"
- ERROR_DEBUG_FS="debugFS support required for kvm_stat"
-
- # Now do the actual checks setup above
- check_extra_config
- fi
- fi
-
- if grep -qs '/usr/bin/qemu-kvm' "${EROOT}"/etc/libvirt/qemu/*.xml; then
- eerror "The kvm/qemu-kvm wrappers no longer exist, but your libvirt"
- eerror "instances are still pointing to it. Please update your"
- eerror "configs in /etc/libvirt/qemu/ to use the -enable-kvm flag"
- eerror "and the right system binary (e.g. qemu-system-x86_64)."
- die "update your virt configs to not use qemu-kvm"
- fi
-}
-
-# Sanity check to make sure target lists are kept up-to-date.
-check_targets() {
- local var=$1 mak=$2
- local detected sorted
-
- pushd "${S}"/default-configs >/dev/null || die
-
- # Force C locale until glibc is updated. #564936
- detected=$(echo $(printf '%s\n' *-${mak}.mak | sed "s:-${mak}.mak::" | LC_COLLATE=C sort -u))
- sorted=$(echo $(printf '%s\n' ${!var} | LC_COLLATE=C sort -u))
- if [[ ${sorted} != "${detected}" ]] ; then
- eerror "The ebuild needs to be kept in sync."
- eerror "${var}: ${sorted}"
- eerror "$(printf '%-*s' ${#var} configure): ${detected}"
- die "sync ${var} to the list of targets"
- fi
-
- popd >/dev/null
-}
-
-handle_locales() {
- # Make sure locale list is kept up-to-date.
- local detected sorted
- detected=$(echo $(cd po && printf '%s\n' *.po | grep -v messages.po | sed 's:.po$::' | sort -u))
- sorted=$(echo $(printf '%s\n' ${PLOCALES} | sort -u))
- if [[ ${sorted} != "${detected}" ]] ; then
- eerror "The ebuild needs to be kept in sync."
- eerror "PLOCALES: ${sorted}"
- eerror " po/*.po: ${detected}"
- die "sync PLOCALES"
- fi
-
- # Deal with selective install of locales.
- if use nls ; then
- # Delete locales the user does not want. #577814
- rm_loc() { rm po/$1.po || die; }
- l10n_for_each_disabled_locale_do rm_loc
- else
- # Cheap hack to disable gettext .mo generation.
- rm -f po/*.po
- fi
-}
-
-src_prepare() {
- check_targets IUSE_SOFTMMU_TARGETS softmmu
- check_targets IUSE_USER_TARGETS linux-user
-
- default
-
- # Use correct toolchain to fix cross-compiling
- tc-export AR LD NM OBJCOPY PKG_CONFIG
- export WINDRES=${CHOST}-windres
-
- # Verbose builds
- MAKEOPTS+=" V=1"
-
- # Run after we've applied all patches.
- handle_locales
-
- # Remove bundled copy of libfdt
- rm -r dtc || die
-}
-
-##
-# configures qemu based on the build directory and the build type
-# we are using.
-#
-qemu_src_configure() {
- debug-print-function ${FUNCNAME} "$@"
-
- local buildtype=$1
- local builddir="${S}/${buildtype}-build"
-
- mkdir "${builddir}"
-
- local conf_opts=(
- --prefix=/usr
- --sysconfdir=/etc
- --bindir=/usr/bin
- --libdir=/usr/$(get_libdir)
- --datadir=/usr/share
- --docdir=/usr/share/doc/${PF}/html
- --mandir=/usr/share/man
- --with-confsuffix=/qemu
- --localstatedir=/var
- --disable-bsd-user
- --disable-guest-agent
- --disable-strip
- --disable-werror
- # We support gnutls/nettle for crypto operations. It is possible
- # to use gcrypt when gnutls/nettle are disabled (but not when they
- # are enabled), but it's not really worth the hassle. Disable it
- # all the time to avoid automatically detecting it. #568856
- --disable-gcrypt
- --python="${PYTHON}"
- --cc="$(tc-getCC)"
- --cxx="$(tc-getCXX)"
- --host-cc="$(tc-getBUILD_CC)"
- $(use_enable debug debug-info)
- $(use_enable debug debug-tcg)
- $(use_enable doc docs)
- $(use_enable plugins)
- $(use_enable tci tcg-interpreter)
- $(use_enable xattr attr)
- )
-
- # Disable options not used by user targets. This simplifies building
- # static user targets (USE=static-user) considerably.
- conf_notuser() {
- if [[ ${buildtype} == "user" ]] ; then
- echo "--disable-${2:-$1}"
- else
- use_enable "$@"
- fi
- }
- conf_opts+=(
- --disable-bluez
- $(conf_notuser accessibility brlapi)
- $(conf_notuser aio linux-aio)
- $(conf_notuser bzip2)
- $(conf_notuser capstone)
- $(conf_notuser caps cap-ng)
- $(conf_notuser curl)
- $(conf_notuser fdt)
- $(conf_notuser glusterfs)
- $(conf_notuser gnutls)
- $(conf_notuser gnutls nettle)
- $(conf_notuser gtk)
- $(conf_notuser infiniband rdma)
- $(conf_notuser iscsi libiscsi)
- $(conf_notuser jemalloc jemalloc)
- $(conf_notuser jpeg vnc-jpeg)
- $(conf_notuser kernel_linux kvm)
- $(conf_notuser lzo)
- $(conf_notuser ncurses curses)
- $(conf_notuser nfs libnfs)
- $(conf_notuser numa)
- $(conf_notuser opengl)
- $(conf_notuser png vnc-png)
- $(conf_notuser rbd)
- $(conf_notuser sasl vnc-sasl)
- $(conf_notuser sdl)
- $(conf_notuser seccomp)
- $(conf_notuser smartcard)
- $(conf_notuser snappy)
- $(conf_notuser spice)
- $(conf_notuser ssh libssh)
- $(conf_notuser usb libusb)
- $(conf_notuser usbredir usb-redir)
- $(conf_notuser vde)
- $(conf_notuser vhost-net)
- $(conf_notuser vhost-user-fs)
- $(conf_notuser virgl virglrenderer)
- $(conf_notuser virtfs)
- $(conf_notuser vnc)
- $(conf_notuser vte)
- $(conf_notuser xen)
- $(conf_notuser xen xen-pci-passthrough)
- $(conf_notuser xfs xfsctl)
- $(conf_notuser xkb xkbcommon)
- )
-
- if [[ ${buildtype} == "user" ]] ; then
- conf_opts+=( --disable-libxml2 )
- else
- conf_opts+=( --enable-libxml2 )
- fi
-
- if [[ ! ${buildtype} == "user" ]] ; then
- # audio options
- local audio_opts=(
- $(usev alsa)
- $(usev oss)
- $(usev sdl)
- $(usex pulseaudio pa "")
- )
- conf_opts+=(
- --audio-drv-list=$(printf "%s," "${audio_opts[@]}")
- )
- fi
-
- case ${buildtype} in
- user)
- conf_opts+=(
- --enable-linux-user
- --disable-system
- --disable-blobs
- --disable-tools
- )
- local static_flag="static-user"
- ;;
- softmmu)
- conf_opts+=(
- --disable-linux-user
- --enable-system
- --disable-tools
- )
- local static_flag="static"
- ;;
- tools)
- conf_opts+=(
- --disable-linux-user
- --disable-system
- --disable-blobs
- --enable-tools
- )
- local static_flag="static"
- ;;
- esac
-
- local targets="${buildtype}_targets"
- [[ -n ${targets} ]] && conf_opts+=( --target-list="${!targets}" )
-
- # Add support for SystemTAP
- use systemtap && conf_opts+=( --enable-trace-backend=dtrace )
-
- # We always want to attempt to build with PIE support as it results
- # in a more secure binary. But it doesn't work with static or if
- # the current GCC doesn't have PIE support.
- if use ${static_flag}; then
- conf_opts+=( --static --disable-pie )
- else
- tc-enables-pie && conf_opts+=( --enable-pie )
- fi
-
- echo "../configure ${conf_opts[*]}"
- cd "${builddir}"
- ../configure "${conf_opts[@]}" || die "configure failed"
-
- # FreeBSD's kernel does not support QEMU assigning/grabbing
- # host USB devices yet
- use kernel_FreeBSD && \
- sed -i -E -e "s|^(HOST_USB=)bsd|\1stub|" "${S}"/config-host.mak
-}
-
-src_configure() {
- local target
-
- python_setup
-
- softmmu_targets= softmmu_bins=()
- user_targets= user_bins=()
-
- for target in ${IUSE_SOFTMMU_TARGETS} ; do
- if use "qemu_softmmu_targets_${target}"; then
- softmmu_targets+=",${target}-softmmu"
- softmmu_bins+=( "qemu-system-${target}" )
- fi
- done
-
- for target in ${IUSE_USER_TARGETS} ; do
- if use "qemu_user_targets_${target}"; then
- user_targets+=",${target}-linux-user"
- user_bins+=( "qemu-${target}" )
- fi
- done
-
- softmmu_targets=${softmmu_targets#,}
- user_targets=${user_targets#,}
-
- [[ -n ${softmmu_targets} ]] && qemu_src_configure "softmmu"
- [[ -n ${user_targets} ]] && qemu_src_configure "user"
- qemu_src_configure "tools"
-}
-
-src_compile() {
- if [[ -n ${user_targets} ]]; then
- cd "${S}/user-build"
- default
- fi
-
- if [[ -n ${softmmu_targets} ]]; then
- cd "${S}/softmmu-build"
- default
- fi
-
- cd "${S}/tools-build"
- default
-}
-
-src_test() {
- if [[ -n ${softmmu_targets} ]]; then
- cd "${S}/softmmu-build"
- pax-mark m */qemu-system-* #515550
- emake -j1 check
- emake -j1 check-report.html
- fi
-}
-
-qemu_python_install() {
- python_domodule "${S}/python/qemu"
-
- python_doscript "${S}/scripts/kvm/vmxcap"
- python_doscript "${S}/scripts/qmp/qmp-shell"
- python_doscript "${S}/scripts/qmp/qemu-ga-client"
-}
-
-# Generate binfmt support files.
-# - /etc/init.d/qemu-binfmt script which registers the user handlers (openrc)
-# - /usr/share/qemu/binfmt.d/qemu.conf (for use with systemd-binfmt)
-generate_initd() {
- local out="${T}/qemu-binfmt"
- local out_systemd="${T}/qemu.conf"
- local d="${T}/binfmt.d"
-
- einfo "Generating qemu binfmt scripts and configuration files"
-
- # Generate the debian fragments first.
- mkdir -p "${d}"
- "${S}"/scripts/qemu-binfmt-conf.sh \
- --debian \
- --exportdir "${d}" \
- --qemu-path "${EPREFIX}/usr/bin" \
- || die
- # Then turn the fragments into a shell script we can source.
- sed -E -i \
- -e 's:^([^ ]+) (.*)$:\1="\2":' \
- "${d}"/* || die
-
- # Generate the init.d script by assembling the fragments from above.
- local f qcpu package interpreter magic mask
- cat "${FILESDIR}"/qemu-binfmt.initd.head >"${out}" || die
- for f in "${d}"/qemu-* ; do
- source "${f}"
-
- # Normalize the cpu logic like we do in the init.d for the native cpu.
- qcpu=${package#qemu-}
- case ${qcpu} in
- arm*) qcpu="arm";;
- mips*) qcpu="mips";;
- ppc*) qcpu="ppc";;
- s390*) qcpu="s390";;
- sh*) qcpu="sh";;
- sparc*) qcpu="sparc";;
- esac
-
- # we use 'printf' here to be portable across 'sh'
- # implementations: #679168
- cat <>"${out}"
- if [ "\${cpu}" != "${qcpu}" -a -x "${interpreter}" ] ; then
- printf '%s\n' ':${package}:M::${magic}:${mask}:${interpreter}:'"\${QEMU_BINFMT_FLAGS}" >/proc/sys/fs/binfmt_misc/register
- fi
-EOF
-
- echo ":${package}:M::${magic}:${mask}:${interpreter}:OC" >>"${out_systemd}"
-
- done
- cat "${FILESDIR}"/qemu-binfmt.initd.tail >>"${out}" || die
-}
-
-src_install() {
- if [[ -n ${user_targets} ]]; then
- cd "${S}/user-build"
- emake DESTDIR="${ED}" install
-
- # Install binfmt handler init script for user targets.
- generate_initd
- doinitd "${T}/qemu-binfmt"
-
- # Install binfmt/qemu.conf.
- insinto "/usr/share/qemu/binfmt.d"
- doins "${T}/qemu.conf"
- fi
-
- if [[ -n ${softmmu_targets} ]]; then
- cd "${S}/softmmu-build"
- emake DESTDIR="${ED}" install
-
- # This might not exist if the test failed. #512010
- [[ -e check-report.html ]] && dodoc check-report.html
-
- if use kernel_linux; then
- udev_newrules "${FILESDIR}"/65-kvm.rules-r1 65-kvm.rules
- fi
-
- if use python; then
- python_foreach_impl qemu_python_install
- fi
- fi
-
- cd "${S}/tools-build"
- emake DESTDIR="${ED}" install
-
- # Disable mprotect on the qemu binaries as they use JITs to be fast #459348
- pushd "${ED}"/usr/bin >/dev/null
- pax-mark mr "${softmmu_bins[@]}" "${user_bins[@]}" # bug 575594
- popd >/dev/null
-
- # Install config file example for qemu-bridge-helper
- insinto "/etc/qemu"
- doins "${FILESDIR}/bridge.conf"
-
- cd "${S}"
- dodoc Changelog MAINTAINERS docs/specs/pci-ids.txt
- newdoc pc-bios/README README.pc-bios
-
- # Disallow stripping of prebuilt firmware files.
- dostrip -x ${QA_PREBUILT}
-
- if [[ -n ${softmmu_targets} ]]; then
- # Remove SeaBIOS since we're using the SeaBIOS packaged one
- rm "${ED}/usr/share/qemu/bios.bin"
- rm "${ED}/usr/share/qemu/bios-256k.bin"
- if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
- dosym ../seabios/bios.bin /usr/share/qemu/bios.bin
- dosym ../seabios/bios-256k.bin /usr/share/qemu/bios-256k.bin
- fi
-
- # Remove vgabios since we're using the seavgabios packaged one
- rm "${ED}/usr/share/qemu/vgabios.bin"
- rm "${ED}/usr/share/qemu/vgabios-cirrus.bin"
- rm "${ED}/usr/share/qemu/vgabios-qxl.bin"
- rm "${ED}/usr/share/qemu/vgabios-stdvga.bin"
- rm "${ED}/usr/share/qemu/vgabios-virtio.bin"
- rm "${ED}/usr/share/qemu/vgabios-vmware.bin"
- # PPC64 loads vgabios-stdvga
- if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386 || use qemu_softmmu_targets_ppc64; then
- dosym ../seavgabios/vgabios-isavga.bin /usr/share/qemu/vgabios.bin
- dosym ../seavgabios/vgabios-cirrus.bin /usr/share/qemu/vgabios-cirrus.bin
- dosym ../seavgabios/vgabios-qxl.bin /usr/share/qemu/vgabios-qxl.bin
- dosym ../seavgabios/vgabios-stdvga.bin /usr/share/qemu/vgabios-stdvga.bin
- dosym ../seavgabios/vgabios-virtio.bin /usr/share/qemu/vgabios-virtio.bin
- dosym ../seavgabios/vgabios-vmware.bin /usr/share/qemu/vgabios-vmware.bin
- fi
-
- # Remove sgabios since we're using the sgabios packaged one
- rm "${ED}/usr/share/qemu/sgabios.bin"
- if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
- dosym ../sgabios/sgabios.bin /usr/share/qemu/sgabios.bin
- fi
-
- # Remove iPXE since we're using the iPXE packaged one
- rm "${ED}"/usr/share/qemu/pxe-*.rom
- if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
- dosym ../ipxe/8086100e.rom /usr/share/qemu/pxe-e1000.rom
- dosym ../ipxe/80861209.rom /usr/share/qemu/pxe-eepro100.rom
- dosym ../ipxe/10500940.rom /usr/share/qemu/pxe-ne2k_pci.rom
- dosym ../ipxe/10222000.rom /usr/share/qemu/pxe-pcnet.rom
- dosym ../ipxe/10ec8139.rom /usr/share/qemu/pxe-rtl8139.rom
- dosym ../ipxe/1af41000.rom /usr/share/qemu/pxe-virtio.rom
- fi
- fi
-
- DISABLE_AUTOFORMATTING=true
- readme.gentoo_create_doc
-}
-
-firmware_abi_change() {
- local pv
- for pv in ${REPLACING_VERSIONS}; do
- if ver_test $pv -lt ${FIRMWARE_ABI_VERSION}; then
- return 0
- fi
- done
- return 1
-}
-
-pkg_postinst() {
- if [[ -n ${softmmu_targets} ]] && use kernel_linux; then
- udev_reload
- fi
-
- xdg_icon_cache_update
-
- [[ -z ${EPREFIX} ]] && [[ -f ${EROOT}/usr/libexec/qemu-bridge-helper ]] && \
- fcaps cap_net_admin ${EROOT}/usr/libexec/qemu-bridge-helper
-
- DISABLE_AUTOFORMATTING=true
- readme.gentoo_print_elog
-
- if use pin-upstream-blobs && firmware_abi_change; then
- ewarn "This version of qemu pins new versions of firmware blobs:"
- ewarn " $(best_version sys-firmware/edk2-ovmf)"
- ewarn " $(best_version sys-firmware/ipxe)"
- ewarn " $(best_version sys-firmware/seabios)"
- ewarn " $(best_version sys-firmware/sgabios)"
- ewarn "This might break resume of hibernated guests (started with a different"
- ewarn "firmware version) and live migration to/from qemu versions with different"
- ewarn "firmware. Please (cold) restart all running guests. For functional"
- ewarn "guest migration ensure that all"
- ewarn "hosts run at least"
- ewarn " app-emulation/qemu-${FIRMWARE_ABI_VERSION}."
- fi
-}
-
-pkg_info() {
- echo "Using:"
- echo " $(best_version app-emulation/spice-protocol)"
- echo " $(best_version sys-firmware/edk2-ovmf)"
- if has_version 'sys-firmware/edk2-ovmf[binary]'; then
- echo " USE=binary"
- else
- echo " USE=''"
- fi
- echo " $(best_version sys-firmware/ipxe)"
- echo " $(best_version sys-firmware/seabios)"
- if has_version 'sys-firmware/seabios[binary]'; then
- echo " USE=binary"
- else
- echo " USE=''"
- fi
- echo " $(best_version sys-firmware/sgabios)"
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
-}
diff --git a/app-eselect/Manifest.gz b/app-eselect/Manifest.gz
index 70c84d93dbf2..79ffaeaa05ec 100644
Binary files a/app-eselect/Manifest.gz and b/app-eselect/Manifest.gz differ
diff --git a/app-eselect/eselect-blas/files/blas.eselect-0.2 b/app-eselect/eselect-blas/files/blas.eselect-0.2
index 001ddb941e82..f860674acec6 100644
--- a/app-eselect/eselect-blas/files/blas.eselect-0.2
+++ b/app-eselect/eselect-blas/files/blas.eselect-0.2
@@ -1,5 +1,5 @@
# -*-eselect-*- vim: ft=eselect
-# Copyright 2019 Gentoo Foundation
+# Copyright 2019 Gentoo Authors
# Distributed under the terms of the GNU GPL version 2 or later
inherit config tests multilib skel
@@ -63,7 +63,7 @@ do_list() {
done
libdirs=( $@ )
fi
-
+
for libdir in ${libdirs[@]}; do
[[ ! -d ${EROOT}/usr/$libdir ]] || [[ -L ${EROOT}/usr/$libdir ]] && continue
targets=( $(find_targets_in $libdir) )
diff --git a/app-eselect/eselect-lapack/files/lapack.eselect-0.2 b/app-eselect/eselect-lapack/files/lapack.eselect-0.2
index 76c038e13f8c..985da0d9ebd1 100644
--- a/app-eselect/eselect-lapack/files/lapack.eselect-0.2
+++ b/app-eselect/eselect-lapack/files/lapack.eselect-0.2
@@ -1,5 +1,5 @@
# -*-eselect-*- vim: ft=eselect
-# Copyright 2019 Gentoo Foundation
+# Copyright 2019 Gentoo Authors
# Distributed under the terms of the GNU GPL version 2 or later
inherit config tests multilib skel
@@ -62,7 +62,7 @@ do_list() {
done
libdirs=( $@ )
fi
-
+
for libdir in ${libdirs[@]}; do
[[ ! -d ${EROOT}/usr/$libdir ]] || [[ -L ${EROOT}/usr/$libdir ]] && continue
targets=( $(find_targets_in $libdir) )
diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index 3df671c61cc2..c73b4a70c2fd 100644
Binary files a/app-i18n/Manifest.gz and b/app-i18n/Manifest.gz differ
diff --git a/app-i18n/man-pages-de/Manifest b/app-i18n/man-pages-de/Manifest
index 942b525d3268..fd26cde6b896 100644
--- a/app-i18n/man-pages-de/Manifest
+++ b/app-i18n/man-pages-de/Manifest
@@ -1 +1,2 @@
DIST manpages-de-v2.12.tar.bz2 10242050 BLAKE2B fa497a6fce2c2387dad2ab9443584174d8d5fab530b94e0123e71286c588cb3a2e52aa96760dbfd6545bed013c460e1bf61eb4a5af0673bb84c1c0f0c960a357 SHA512 548d3dd500ce1eadc71365119e35072b71e3fbe36eba664d992e94897f442fb93f9397053f72363f83dff2e931d93e2af995976736d8513d11d7c42bdb471862
+DIST manpages-l10n-v2.16.tar.bz2 26569385 BLAKE2B ff5877a2a58e48fb7411559bbc22dae5918bda2d1fa38b5239bb6fc0561d85c44a276a491a368fee75ee26508f0128b5f4a5d0afe344321b4d4c653dd6a24898 SHA512 e534276b693c124a70a409ba9318a4a3e168c3d10c8e2837811f27d471ebb25eb4235eff9910cfc57624560fbc6273379a2d813b4a8cec2dd7ca1a0cd09ed78d
diff --git a/app-i18n/man-pages-de/man-pages-de-2.16.ebuild b/app-i18n/man-pages-de/man-pages-de-2.16.ebuild
new file mode 100644
index 000000000000..16658870cb89
--- /dev/null
+++ b/app-i18n/man-pages-de/man-pages-de-2.16.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+MY_P="manpages-l10n-v${PV}"
+
+DESCRIPTION="A somewhat comprehensive collection of Linux german man page translations"
+HOMEPAGE="https://salsa.debian.org/manpages-l10n-team/manpages-l10n"
+SRC_URI="https://salsa.debian.org/manpages-l10n-team/manpages-l10n/-/archive/v${PV}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-3+ man-pages GPL-2+ GPL-2 BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+RDEPEND="virtual/man"
+BDEPEND="app-text/po4a
+ dev-lang/perl"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+ default
+
+ # some packages have their own translations
+ local manpage
+ local noinst_manpages=(
+ # sys-apps/shadow
+ po/de/man1/groups.1.po
+ po/de/man1/su.1.po
+ # sys-process/procps
+ po/de/man1/tload.1.po
+ po/de/man1/pwdx.1.po
+ po/de/man1/uptime.1.po
+ po/de/man1/pmap.1.po
+ po/de/man1/pgrep.1.po
+ po/de/man1/free.1.po
+ po/de/man5/sysctl.conf.5.po
+ po/de/man8/sysctl.8.po
+ po/de/man8/vmstat.8.po
+ # app-arch/xz-utils
+ po/de/man1/xz.1.po
+ po/de/man1/xzdiff.1.po
+ po/de/man1/xzgrep.1.po
+ po/de/man1/xzless.1.po
+ po/de/man1/xzmore.1.po
+ )
+ for manpage in ${noinst_manpages[@]} ; do
+ echo "${manpage}"
+ rm "${manpage}" || die
+ done
+
+ eautoreconf
+}
+
+src_configure() {
+ econf --enable-compression="none"
+}
+
+src_compile() { :; }
+
+src_install() {
+ emake mandir="${ED}"/usr/share/man install
+ dodoc CHANGES.md README.md
+}
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index b9ed2f04f9f5..d04f42c0ae8a 100644
Binary files a/app-misc/Manifest.gz and b/app-misc/Manifest.gz differ
diff --git a/app-misc/geneweb/Manifest b/app-misc/geneweb/Manifest
index 70d8a86db7c0..57f17eca5ea1 100644
--- a/app-misc/geneweb/Manifest
+++ b/app-misc/geneweb/Manifest
@@ -1,3 +1 @@
-DIST geneweb-6.08-ocaml-4.patch.gz 22259 BLAKE2B c3471b44bae06db04f51f4fbfacaf5d93388f79673686d0fdd988df482f836bd49f853c5acb3b94c39f890b7d9bd8d118b4042100c466a06a2e57227da9eee3b SHA512 333a9ca899bf454e1c534f6c890b5cbe842821573b39e9d0e432cfbdf30dbe3a495a5ecb5a9b4a00882ee51bbb3ec1ca4b417e34050a7f84e434d0424c126def
DIST geneweb-6.08.01.tar.gz 1796215 BLAKE2B 4b7d05126d244984b62ebadda3419ba8cf97326ac3103c73ca5433a8f9edeab8acd968d05942d299e70127bcf75efe5cb9a9af9f7d97ec08fd9a8a6a5aae100d SHA512 54e1ed05e540f1de167c66dee46976a8324a37ca36a9dfd6ab03105fe925053c570842e1a263499fd8bd7aecfebac8f9596b1573fcec1e104e3892337376f84d
-DIST geneweb-6.08.tar.gz 1791450 BLAKE2B 35fcd0a4087892b992b87dd4fb54b458be0e300042a237458fdeea9a4a9b8649f93261d896d6b7ad19b681b95b343013d99d99027d86b1796f74cab916178d32 SHA512 7f1d552342e8a5b05961be75c1afb768853f22cc7eb4477fa63d6a3af29ea852862ce043ae89cd1589ede20fe561ad7d77ab757cc1ecb26ce1473f0e3621b835
diff --git a/app-misc/geneweb/geneweb-6.08-r1.ebuild b/app-misc/geneweb/geneweb-6.08-r1.ebuild
deleted file mode 100644
index 55528f558666..000000000000
--- a/app-misc/geneweb/geneweb-6.08-r1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils user
-
-DESCRIPTION="Genealogy software program with a Web interface"
-HOMEPAGE="https://github.com/geneanet/geneweb"
-SRC_URI="https://github.com/geneweb/geneweb/archive/v6.08.tar.gz -> ${P}.tar.gz
- https://dev.gentoo.org/~tupone/${P}-ocaml-4.patch.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+ocamlopt"
-RESTRICT="strip"
-
-RDEPEND="dev-lang/ocaml[ocamlopt?]
- dev-ml/camlp5[ocamlopt?]"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
- "${WORKDIR}"/${P}-ocaml-4.patch
- "${FILESDIR}"/${PF}-gentoo.patch
- "${FILESDIR}"/${P}-parallellbuild.patch )
-
-src_compile() {
- if use ocamlopt; then
- emake
- else
- emake OCAMLC=ocamlc OCAMLOPT=ocamlopt out
- # If using bytecode we dont want to strip the binary as it would remove
- # the bytecode and only leave ocamlrun...
- fi
-}
-
-src_install() {
- dodoc ICHANGES
- emake new_distrib
- emake wrappers
- # Install doc
- cd distribution
- dodoc CHANGES.txt
- # Install binaries
- cd gw
- dobin gwc gwc1 gwc2 consang gwd gwu update_nldb ged2gwb ged2gwb2 gwb2ged gwsetup
- insinto /usr/lib/${PN}
- doins -r gwtp_tmp/*
- dodoc a.gwf
- insinto /usr/share/${PN}
- doins -r etc images lang setup gwd.arg only.txt
-
- cd ../..
-
- # Install binaries
- dobin src/check_base
- # Install manpages
- doman man/*
-
- # Install doc
- dodoc -r contrib
- docompress -x /usr/share/doc/${PF}/contrib
-
- newinitd "${FILESDIR}/geneweb.initd" geneweb
- newconfd "${FILESDIR}/geneweb.confd" geneweb
-}
-
-pkg_postinst() {
- enewuser geneweb "" "/bin/bash" /var/lib/geneweb
- einfo "A CGI program has been installed in /usr/lib/${PN}. Follow the"
- einfo "instructions on the README in that directory to use it"
- einfo "For 64 bits architecture you need to rebuild the database"
- einfo "\"gwu foo > foo.gw \" will save the database (use the previous"
- einfo "version to do that). \"gwc2 foo.gw -o bar \" will restore it "
- einfo "(using the current package)"
-}
diff --git a/app-misc/geneweb/geneweb-6.08-r2.ebuild b/app-misc/geneweb/geneweb-6.08-r2.ebuild
deleted file mode 100644
index a962e673485d..000000000000
--- a/app-misc/geneweb/geneweb-6.08-r2.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit eutils
-
-DESCRIPTION="Genealogy software program with a Web interface"
-HOMEPAGE="https://github.com/geneanet/geneweb"
-SRC_URI="https://github.com/geneweb/geneweb/archive/v6.08.tar.gz -> ${P}.tar.gz
- https://dev.gentoo.org/~tupone/${P}-ocaml-4.patch.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+ocamlopt"
-RESTRICT="strip"
-
-RDEPEND="dev-lang/ocaml[ocamlopt?]
- dev-ml/camlp5[ocamlopt?]
- acct-user/geneweb
- acct-group/geneweb"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
- "${WORKDIR}"/${P}-ocaml-4.patch
- "${FILESDIR}"/${P}-r1-gentoo.patch
- "${FILESDIR}"/${P}-parallellbuild.patch )
-
-src_compile() {
- if use ocamlopt; then
- emake
- else
- emake OCAMLC=ocamlc OCAMLOPT=ocamlopt out
- # If using bytecode we dont want to strip the binary as it would remove
- # the bytecode and only leave ocamlrun...
- fi
-}
-
-src_install() {
- dodoc ICHANGES
- emake new_distrib
- emake wrappers
- # Install doc
- cd distribution
- dodoc CHANGES.txt
- # Install binaries
- cd gw
- dobin gwc gwc1 gwc2 consang gwd gwu update_nldb ged2gwb ged2gwb2 gwb2ged gwsetup
- insinto /usr/lib/${PN}
- doins -r gwtp_tmp/*
- dodoc a.gwf
- insinto /usr/share/${PN}
- doins -r etc images lang setup gwd.arg only.txt
-
- cd ../..
-
- # Install binaries
- dobin src/check_base
- # Install manpages
- doman man/*
-
- # Install doc
- dodoc -r contrib
- docompress -x /usr/share/doc/${PF}/contrib
-
- newinitd "${FILESDIR}/geneweb.initd" geneweb
- newconfd "${FILESDIR}/geneweb.confd" geneweb
-}
-
-pkg_postinst() {
- einfo "A CGI program has been installed in /usr/lib/${PN}. Follow the"
- einfo "instructions on the README in that directory to use it"
- einfo "For 64 bits architecture you need to rebuild the database"
- einfo "\"gwu foo > foo.gw \" will save the database (use the previous"
- einfo "version to do that). \"gwc2 foo.gw -o bar \" will restore it "
- einfo "(using the current package)"
-}
diff --git a/app-misc/hivex/Manifest b/app-misc/hivex/Manifest
index a3290cd9d4d8..933c62f73e32 100644
--- a/app-misc/hivex/Manifest
+++ b/app-misc/hivex/Manifest
@@ -1 +1,2 @@
DIST hivex-1.3.14.tar.gz 1332257 BLAKE2B fe7c19e05d29c7e98a334842cc1144aa76b148a3b7aae91449a4923a124eb54227a9a004346ef3558732c688c4f92cacd0c9328056930c33dba0404465634da0 SHA512 dd7dd52dceda580179a815fc48a2a2c7e8f7234614beceb937fba7e317df17984e65453338160c4c467b70d7d4f9bd61b48aad3ca51e19bd5e4cfbca8ee3adb6
+DIST hivex-1.3.18.tar.gz 1542133 BLAKE2B 961d0797770a2bd3176ce288a509fab8685de91317d55f05e5295f9f56fd54c31acb64847e0cbb6a6074627ccbdfdf35bd0d35150beb7746a8b3de9128ac24e3 SHA512 1851351118921e81df9e505f90d00048a178572c2edd3de40194a69915176bdb615e2eb5afea408d57063e98257c8d1e3d0cd6730407153892cc9e3befc4aa3a
diff --git a/app-misc/hivex/hivex-1.3.18.ebuild b/app-misc/hivex/hivex-1.3.18.ebuild
new file mode 100644
index 000000000000..ac1bd5848abb
--- /dev/null
+++ b/app-misc/hivex/hivex-1.3.18.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby23 ruby24 ruby25"
+RUBY_OPTIONAL=yes
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit eutils perl-module ruby-ng python-single-r1
+
+DESCRIPTION="Library for reading and writing Windows Registry 'hive' binary files"
+HOMEPAGE="http://libguestfs.org"
+SRC_URI="http://libguestfs.org/download/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ocaml readline +perl python test static-libs ruby"
+
+RDEPEND="
+ virtual/libiconv
+ virtual/libintl
+ dev-libs/libxml2:2
+ ocaml? ( dev-lang/ocaml[ocamlopt]
+ dev-ml/findlib[ocamlopt]
+ )
+ readline? ( sys-libs/readline:0 )
+ perl? (
+ dev-lang/perl:=
+ dev-perl/IO-stringy
+ )
+ ruby? ( $(ruby_implementations_depend) )
+ python? ( ${PYTHON_DEPS} )
+ "
+
+DEPEND="${RDEPEND}
+ perl? (
+ test? ( dev-perl/Pod-Coverage
+ dev-perl/Test-Pod-Coverage )
+ )
+ "
+
+ruby_add_bdepend "ruby? ( dev-ruby/rake
+ virtual/rubygems
+ dev-ruby/rdoc )"
+ruby_add_rdepend "ruby? ( virtual/rubygems )"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
+ ruby? ( || ( $(ruby_get_use_targets) ) )"
+
+DOCS=( README )
+
+S="${WORKDIR}/${P}"
+
+pkg_setup() {
+ if use python; then
+ python-single-r1_pkg_setup
+ fi
+}
+
+src_unpack() {
+ default
+ cp -prlP "${WORKDIR}/${P}" "${WORKDIR}"/all
+}
+
+src_configure() {
+ ruby-ng_src_configure
+
+ if use perl; then
+ pushd perl
+ perl-module_src_configure
+ popd
+ fi
+
+ local myeconfargs=(
+ $(use_with readline)
+ $(use_enable ocaml)
+ $(use_enable perl)
+ --enable-nls
+ --disable-ruby
+ $(use_enable python)
+ --disable-rpath
+ )
+
+ econf ${myeconfargs[@]}
+}
+
+src_compile() {
+ default
+ ruby-ng_src_compile
+}
+
+src_install() {
+ strip-linguas -i po
+
+ emake install DESTDIR="${ED}" "LINGUAS=""${LINGUAS}"""
+ python_optimize
+
+ ruby-ng_src_install
+
+ if use perl; then
+ perl_delete_localpod
+ fi
+
+ #can't figure out a better way to do this
+ mv "${ED}"/usr/man/man3/* "${ED}/usr/share/man/man3/" || die
+ rm -r "${ED}/usr/man" || die
+}
diff --git a/app-misc/lirc/lirc-0.10.1.ebuild b/app-misc/lirc/lirc-0.10.1.ebuild
deleted file mode 100644
index ff58dab0f42e..000000000000
--- a/app-misc/lirc/lirc-0.10.1.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit eutils flag-o-matic linux-info python-single-r1 systemd xdg-utils
-
-DESCRIPTION="decode and send infra-red signals of many commonly used remote controls"
-HOMEPAGE="http://www.lirc.org/"
-
-LIRC_DRIVER_DEVICE="/dev/lirc0"
-
-MY_P=${PN}-${PV/_/-}
-
-if [[ "${PV/_pre/}" = "${PV}" ]]; then
- SRC_URI="mirror://sourceforge/lirc/${MY_P}.tar.bz2"
-else
- SRC_URI="http://www.lirc.org/software/snapshots/${MY_P}.tar.bz2"
-fi
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc ppc64 x86"
-IUSE="audio +devinput doc ftdi gtk inputlirc static-libs systemd +uinput usb X"
-
-REQUIRED_USE="
- ${PYTHON_REQUIRED_USE}
- gtk? ( X )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-COMMON_DEPEND="
- ${PYTHON_DEPS}
- audio? (
- >media-libs/portaudio-18
- media-libs/alsa-lib
- )
- $(python_gen_cond_dep '
-
lirc
-
- LIRC (Linux Infrared remote control) allows users to receive and send infrared signals.
-
diff --git a/app-misc/tails-installer/Manifest b/app-misc/tails-installer/Manifest
deleted file mode 100644
index 4546b6db9f15..000000000000
--- a/app-misc/tails-installer/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST tails-installer-4.4.11.tar.gz 346123 BLAKE2B c6e0888cce180d411ab60a8098581da0df64ea6b2201076e58d6ae4d489feb5e9967fd67a457e8d333fad9934350d5df13044e02e2d428980bee335fd5420dcd SHA512 06d7e21f01841250ada8eca3dcb14078331450b61be4a15923fd0543970b9fb4284aba6cf12729515b2adff9dfa3f8a011e48d97a114356fff1edfd1eb914684
diff --git a/app-misc/tails-installer/files/fix-desktop-file.patch b/app-misc/tails-installer/files/fix-desktop-file.patch
deleted file mode 100644
index ef6b5880d445..000000000000
--- a/app-misc/tails-installer/files/fix-desktop-file.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/data/tails-installer-launcher.desktop b/data/tails-installer-launcher.desktop
-index b8a3f81..c7c5b2a 100644
---- a/data/tails-installer-launcher.desktop
-+++ b/data/tails-installer-launcher.desktop
-@@ -6,8 +6,8 @@ Name[sv]=Tails installerare
- Comment=Install, clone, upgrade Tails
- Comment[fr]=Installer, cloner, mettre à jour Tails
- Comment[sv]=Installera, klona, uppgradera Tails
--Icon=tails-installer.svg
-+Icon=tails-installer
- Exec=tails-installer-launcher
- Terminal=false
--Categories=System;Tails;
-+Categories=System;
- Keywords=Tails;Install;Upgrade;Update;Copy;Clone;Installer;USB;Installation;Anonymity;Tor;Anonymous;SD;Amnesic;Amnesia;
-diff --git a/data/tails-installer.desktop b/data/tails-installer.desktop
-index 7d7fd2c..a79b57a 100644
---- a/data/tails-installer.desktop
-+++ b/data/tails-installer.desktop
-@@ -2,7 +2,7 @@
- Type=Application
- Name=Tails Installer
- Comment=Write operating system images to a USB device
--Icon=tails-installer.svg
-+Icon=tails-installer
- Exec=tails-installer
- Terminal=false
- Categories=System;
diff --git a/app-misc/tails-installer/files/sgdisk.patch b/app-misc/tails-installer/files/sgdisk.patch
deleted file mode 100644
index 21339b23ae6c..000000000000
--- a/app-misc/tails-installer/files/sgdisk.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- /tails_installer/creator.py
-+++ /tails_installer/creator.py
-@@ -220,7 +220,7 @@
- raise NotImplementedError
-
- def update_system_partition_properties(self):
-- cmd = ( [ '/sbin/sgdisk' ]
-+ cmd = ( [ '/usr/sbin/sgdisk' ]
- + [ '--typecode=1:%s' % ESP_GUID ]
- + [ self.drive['parent'] ])
- self.popen(cmd, shell=False)
-@@ -235,7 +235,7 @@
- if not device:
- device = self.drive['device']
-
-- proc = self.popen(['/sbin/sgdisk', '--print', device], shell=False, passive=True)
-+ proc = self.popen(['/usr/sbin/sgdisk', '--print', device], shell=False, passive=True)
- if proc.returncode:
- return False
- return True
-@@ -249,7 +249,7 @@
- # understand... while we want to make it do this reset
- # precisely to fix that unreadable partition table issue.
- # Chicken'n'egg, right.
-- self.popen(['/sbin/sgdisk', '--zap-all', device],
-+ self.popen(['/usr/sbin/sgdisk', '--zap-all', device],
- shell=False, passive=True)
-
- def switch_drive_to_system_partition(self):
diff --git a/app-misc/tails-installer/metadata.xml b/app-misc/tails-installer/metadata.xml
deleted file mode 100644
index 3d969f378b50..000000000000
--- a/app-misc/tails-installer/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
- Tails Installer is a graphical tool to install or upgrade Tails on a USB stick from an ISO image.
-
-
diff --git a/app-misc/tails-installer/tails-installer-4.4.11-r1.ebuild b/app-misc/tails-installer/tails-installer-4.4.11-r1.ebuild
deleted file mode 100644
index 241bab952e7e..000000000000
--- a/app-misc/tails-installer/tails-installer-4.4.11-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit distutils-r1 gnome2-utils
-
-DESCRIPTION="A graphical tool to install or upgrade Tails on a USB stick from an ISO image"
-HOMEPAGE="https://tails.boum.org https://git.tails.boum.org/liveusb-creator"
-SRC_URI="https://deb.tails.boum.org/pool/main/t/${PN}/${PN}_${PV}+dfsg.orig.tar.gz -> ${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-PATCHES=( ${FILESDIR}/fix-desktop-file.patch ${FILESDIR}/sgdisk.patch )
-
-DEPEND="${PYTHON_DEPS}
- $(python_gen_cond_dep '
- dev-python/python-distutils-extra[${PYTHON_MULTI_USEDEP}]
- ')"
-RDEPEND="${PYTHON_DEPS}
- app-arch/p7zip
- dev-libs/glib:2
- $(python_gen_cond_dep '
- dev-python/configobj[${PYTHON_MULTI_USEDEP}]
- dev-python/pygobject[${PYTHON_MULTI_USEDEP}]
- dev-python/urlgrabber[${PYTHON_MULTI_USEDEP}]
- ')
- sys-apps/gptfdisk
- sys-auth/polkit
- sys-boot/syslinux
- sys-fs/dosfstools
- sys-fs/mtools
- sys-fs/udisks:2[introspection]
- virtual/cdrtools
- x11-libs/gtk+:3[introspection]"
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
-}
diff --git a/app-misc/ytree/Manifest b/app-misc/ytree/Manifest
index 654026c78695..5ef4653db19a 100644
--- a/app-misc/ytree/Manifest
+++ b/app-misc/ytree/Manifest
@@ -1,3 +1,4 @@
DIST ytree-1.99pl2.tar.gz 124601 BLAKE2B c0cdabbdcc46169edb64c52bec737e51e1dbe4d70ff58eb6ad414fbdfa08a57027ea755609b31d098539e17d4ec9794a384bf0f5b9d655157de597503b880c3b SHA512 a82c897a0ba6c744a213bd04d8d1a2032419761f4a0948e0ca605ee0eacb8a477b960bc7485cd72dca2cfc3e4844bfca0082e84d2cd78eca8d996222e5b414c5
DIST ytree-2.00.tar.gz 124654 BLAKE2B db55a463c3103a544ce882da9e5297a9bde3d6e5b618332cf863dec87e6d1842197c5f6ae282e05d4a0674a8c8d52807f9eb2c163e87c1adf0b8c484e1874d62 SHA512 4306ac6f46187dafd48103348fc30cafd8cec50a196a526249c15528604ad635b0bbf96897fedcb69360b43000d0447698523168589aa917a5884252fa183529
DIST ytree-2.01.tar.gz 124683 BLAKE2B b6ee398b21f22ded23d4cba03ab50fa45113f57341029db1bbba2bafdf286f77191904e9d785b1009d57d79d58d82dafebd4bf75753f0724c855f3410e867299 SHA512 2a3ee821462f5aec21aeb613b336831b1f94a5595a3aefc718b4e7516471f43db85e8e430f2d9593d199f455719bacb7ee19e3419806a599354c29ff49d71ae6
+DIST ytree-2.02.tar.gz 124868 BLAKE2B e0b9b4251617df9d851752382e695657eb3bef5ce58deff00604ded14d6d29dad1c50b2d9f394defdabc3338bcdf491a9cec5821022e1171f2aa2b6887b274cb SHA512 31a425e9acd81921c111f1ef72f9e2d9342c04cdd9121d9cecd81893518b6f9579bfe22c3630d4d117783aed536cfafdf09866eb80bace3e5cbd59fd393e77a1
diff --git a/app-misc/ytree/ytree-2.02.ebuild b/app-misc/ytree/ytree-2.02.ebuild
new file mode 100644
index 000000000000..3a14d3abcd18
--- /dev/null
+++ b/app-misc/ytree/ytree-2.02.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="A curses-based file manager"
+HOMEPAGE="https://www.han.de/~werner/ytree.html"
+SRC_URI="https://www.han.de/~werner/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="virtual/pkgconfig"
+DEPEND="
+ sys-libs/ncurses:0=
+ sys-libs/readline:0=
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-1.99-tinfo.patch"
+)
+
+DOCS=( CHANGES README THANKS ytree.conf )
+
+pkg_setup() {
+ tc-export CC
+}
+
+src_install() {
+ einstalldocs
+ dobin ${PN}
+ doman ${PN}.1
+}
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index 0a78cd70184a..8cacfd408afa 100644
Binary files a/app-portage/Manifest.gz and b/app-portage/Manifest.gz differ
diff --git a/app-portage/metagen/Manifest b/app-portage/metagen/Manifest
index 1b2af5426b92..c08b2074a5a2 100644
--- a/app-portage/metagen/Manifest
+++ b/app-portage/metagen/Manifest
@@ -1,8 +1 @@
-DIST metagen-0.6.2.tar.gz 6100 BLAKE2B c5e3fb2e3b6c2f5624923a161e7a22d4b81dd1e084b68152d312dfcb73a6b96face64fe6918fc66d7f87d2d7114725028d82d1e74d72f6b7ebc1a499f0fce268 SHA512 0ab8d7755259b870c995c471f366a976f4acc336dda4c2fa1c4e5b78b5aa701fb75d4dd88ac0ee069a231550b07b89b4a8f724c94ec791efe6c4c64b97ac19ff
-DIST metagen-0.6.3.tar.bz2 6118 BLAKE2B 1356111b23a96c6435bd997ff824682fd76074d004cc32f8af2fdff766e16eb70f395bfaa9fd9555397cebcb7859e87b16988b63fe7bd35684ca95e8cb12d9c3 SHA512 1a25e1ebd35ae97e0823aee2f929c09b9041c78496c2425cf5c0bf3d9f1747313dcf30b7e0a5d4e861cbd0caaf48b506f85eb5f25ab0b9e75a62514b0bb64ecd
-DIST metagen-0.6.4.2.tar.bz2 6837 BLAKE2B a9595045fea006e53fd23e3b96da0acd884b6f33e0089fc56bc7fb118ba1d205ddc81754a8cc2bc3e5207ad9cd9f537e1a3e7b25be0e5c804ebed5e66b481abc SHA512 cec88403ee06449f30524e0fe485b2e76f4f3bdc23feee0eb60503ab6e9c351bab3f55cdf3847ccec14a8f1e1b9ebe820a5f76feb095b13be11fe5fcf258ed2c
-DIST metagen-0.6.5.tar.bz2 6973 BLAKE2B 2cac99056bde1e6420ef3bb54e6655b17fb43b27dc0024cd3eb2b5c09dcb05b5db318dc4f52c3389d562275e46c901fab863ab50bd0555a6409a8fe5c0bd8de7 SHA512 6a95ce78c7b8ead89a28ea927d9e36cf806a1d363cc703c86c553a74499304081ac360d3fba390d5cc54de08572e8305ab1896d73eceff35166de32760162fe0
-DIST metagen-0.6.6.tar.bz2 6341 BLAKE2B e45e06570cbe6c690b4fdfef036282c5828ec1c86b1773c35000f19c557df7784e777a59e20f1c27fc5ae0edf5169a6d1ebcfc2d08ffa1cc4ab77265041550ac SHA512 0accac41957a555a35261c72053fb93ade62eb449d9ee4a2b1683afddb853d7bfb6394dc06c90643044cba1b573932663f1c7b559bf400ec15fce0c3f8c231ca
-DIST metagen-0.7.0.tar.bz2 6367 BLAKE2B 939fff83d9b6af7600ab7a89293d12fdcc79fb5ca47c5285989af31a6d0ea2ba539f7bb56489f50d6b8272afcf956b6e5a71b98a952ba829de60dde5766c820b SHA512 a41b8d0fb401b7fd8e2a3899cbe2ba95e42acae9dc274923b25a2933e12587838c6d599045c16387d895df0a5823ebf7b4b71ca383a75cb714959baa8355a77e
-DIST metagen-0.7.1.tar.gz 8276 BLAKE2B 7445e9729e8f7eab7d808ad95c3ee775bfb90c9264feabbc31d77d65a9eda7b61f9d7dded8c54e1b5cad5a5577cb0ef31b8d5fafd747804b957c8890ad0a7fea SHA512 7532c6a82fac10bc775b990605a8b5d23dab14e1d8a7f166c37640ffb6bebdfff57885e129a727e78ffb926b164f716f5171ea333d640030316271d0b354af88
DIST metagen-0.7.2.tar.gz 8391 BLAKE2B 3ec53ff7fa12ea816c88bcbd4e45a3cc66527e6a507f01bc8934abc6bb6ae142e6c6620f82af7c6775b9001d6549832d6fab42c1b44c966f72a40ec0a0f66b2a SHA512 8a78d47ce8228df73a36d4c0f346d75250fbf8568ca6c8cc9ff9313b61c43ba514cf6dc13b36ea90f1ea5b194337748224ff81449d56527fbfc6b7a91e408054
diff --git a/app-portage/metagen/metagen-0.6.2-r1.ebuild b/app-portage/metagen/metagen-0.6.2-r1.ebuild
deleted file mode 100644
index e8a7369e1a69..000000000000
--- a/app-portage/metagen/metagen-0.6.2-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="metadata.xml generator for ebuilds"
-HOMEPAGE="https://cgit.gentoo.org/proj/metagen.git"
-SRC_URI="https://dev.gentoo.org/~neurogeek/metagen_releases/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 hppa ppc x86 ~amd64-linux ~x86-linux"
-
-IUSE=""
-DEPEND=">=dev-python/jaxml-3.01[${PYTHON_USEDEP}]
- >=sys-apps/portage-2.1.9.42[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-python_install() {
- distutils-r1_python_install
- python_newscript metagen/main.py metagen
-}
-
-python_install_all() {
- distutils-r1_python_install_all
- doman docs/metagen.1
-}
-
-python_test() {
- "${PYTHON}" -c "from metagen import metagenerator; metagenerator.do_tests()" || die
-}
diff --git a/app-portage/metagen/metagen-0.6.3.ebuild b/app-portage/metagen/metagen-0.6.3.ebuild
deleted file mode 100644
index 46e06ca46727..000000000000
--- a/app-portage/metagen/metagen-0.6.3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="metadata.xml generator for ebuilds"
-HOMEPAGE="https://cgit.gentoo.org/proj/metagen.git"
-SRC_URI="https://cgit.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 hppa ppc x86 ~amd64-linux ~x86-linux"
-
-IUSE=""
-DEPEND=">=dev-python/jaxml-3.01[${PYTHON_USEDEP}]
- >=sys-apps/portage-2.1.9.42[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-python_install() {
- distutils-r1_python_install
- python_newscript metagen/main.py metagen
-}
-
-python_install_all() {
- distutils-r1_python_install_all
- doman docs/metagen.1
-}
-
-python_test() {
- "${PYTHON}" -c "from metagen import metagenerator; metagenerator.do_tests()" || die
-}
diff --git a/app-portage/metagen/metagen-0.6.4.2.ebuild b/app-portage/metagen/metagen-0.6.4.2.ebuild
deleted file mode 100644
index 6ae80946042b..000000000000
--- a/app-portage/metagen/metagen-0.6.4.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="metadata.xml generator for ebuilds"
-HOMEPAGE="https://cgit.gentoo.org/proj/metagen.git"
-SRC_URI="https://cgit.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86 ~amd64-linux ~x86-linux"
-
-IUSE=""
-DEPEND=">=dev-python/jaxml-3.01[${PYTHON_USEDEP}]
- >=sys-apps/portage-2.1.9.42[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-python_install() {
- distutils-r1_python_install
- python_newscript metagen/main.py metagen
-}
-
-python_install_all() {
- distutils-r1_python_install_all
- doman docs/metagen.1
-}
-
-python_test() {
- "${PYTHON}" -c "from metagen import metagenerator; metagenerator.do_tests()" || die
-}
diff --git a/app-portage/metagen/metagen-0.6.5-r1.ebuild b/app-portage/metagen/metagen-0.6.5-r1.ebuild
deleted file mode 100644
index e02882e2ab73..000000000000
--- a/app-portage/metagen/metagen-0.6.5-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="metadata.xml generator for ebuilds"
-HOMEPAGE="https://cgit.gentoo.org/proj/metagen.git"
-SRC_URI="https://cgit.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86 ~amd64-linux ~x86-linux"
-
-IUSE=""
-DEPEND=">=dev-python/jaxml-3.01[${PYTHON_USEDEP}]
- || (
- ( >=sys-apps/portage-2.3.0_rc1[${PYTHON_USEDEP}] app-portage/repoman[${PYTHON_USEDEP}] )
- )"
-RDEPEND="${DEPEND}"
-
-python_install() {
- distutils-r1_python_install
- python_newscript metagen/main.py metagen
-}
-
-python_install_all() {
- distutils-r1_python_install_all
- doman docs/metagen.1
-}
-
-python_test() {
- "${PYTHON}" -c "from metagen import metagenerator; metagenerator.do_tests()" || die
-}
diff --git a/app-portage/metagen/metagen-0.6.5.ebuild b/app-portage/metagen/metagen-0.6.5.ebuild
deleted file mode 100644
index 3eb87efbb6ec..000000000000
--- a/app-portage/metagen/metagen-0.6.5.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="metadata.xml generator for ebuilds"
-HOMEPAGE="https://cgit.gentoo.org/proj/metagen.git"
-SRC_URI="https://cgit.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 hppa ppc x86 ~amd64-linux ~x86-linux"
-
-IUSE=""
-DEPEND=">=dev-python/jaxml-3.01[${PYTHON_USEDEP}]
- >=sys-apps/portage-2.1.9.42[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-python_install() {
- distutils-r1_python_install
- python_newscript metagen/main.py metagen
-}
-
-python_install_all() {
- distutils-r1_python_install_all
- doman docs/metagen.1
-}
-
-python_test() {
- "${PYTHON}" -c "from metagen import metagenerator; metagenerator.do_tests()" || die
-}
diff --git a/app-portage/metagen/metagen-0.6.6-r1.ebuild b/app-portage/metagen/metagen-0.6.6-r1.ebuild
deleted file mode 100644
index 6616bbef45e4..000000000000
--- a/app-portage/metagen/metagen-0.6.6-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="metadata.xml generator for ebuilds"
-HOMEPAGE="https://cgit.gentoo.org/proj/metagen.git"
-SRC_URI="https://cgit.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86 ~amd64-linux ~x86-linux"
-
-IUSE=""
-DEPEND=">=dev-python/jaxml-3.01[${PYTHON_USEDEP}]
- sys-apps/portage[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-python_install() {
- distutils-r1_python_install
- python_newscript metagen/main.py metagen
-}
-
-python_install_all() {
- distutils-r1_python_install_all
- doman docs/metagen.1
-}
-
-python_test() {
- "${PYTHON}" -c "from metagen import metagenerator; metagenerator.do_tests()" || die
-}
diff --git a/app-portage/metagen/metagen-0.7.0.ebuild b/app-portage/metagen/metagen-0.7.0.ebuild
deleted file mode 100644
index b1219098e37f..000000000000
--- a/app-portage/metagen/metagen-0.7.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_COMPAT=( python{2_7,3_{6,7,8}} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="metadata.xml generator for ebuilds"
-HOMEPAGE="https://cgit.gentoo.org/proj/metagen.git"
-SRC_URI="https://cgit.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86 ~amd64-linux ~x86-linux"
-
-IUSE=""
-DEPEND="dev-python/lxml[${PYTHON_USEDEP}]
- sys-apps/portage[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-python_install_all() {
- distutils-r1_python_install_all
- doman docs/metagen.1
-}
-
-python_test() {
- "${PYTHON}" -c "from metagen import metagenerator; metagenerator.do_tests()" || die
-}
diff --git a/app-portage/metagen/metagen-0.7.1.ebuild b/app-portage/metagen/metagen-0.7.1.ebuild
deleted file mode 100644
index dff9c50a5517..000000000000
--- a/app-portage/metagen/metagen-0.7.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_COMPAT=( python{2_7,3_{6,7,8}} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="metadata.xml generator for ebuilds"
-HOMEPAGE="https://cgit.gentoo.org/proj/metagen.git"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86 ~amd64-linux ~x86-linux"
-
-IUSE=""
-DEPEND="dev-python/lxml[${PYTHON_USEDEP}]
- sys-apps/portage[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-python_install_all() {
- distutils-r1_python_install_all
- doman docs/metagen.1
-}
-
-python_test() {
- "${PYTHON}" -c "from metagen import metagenerator; metagenerator.do_tests()" || die
-}
diff --git a/app-portage/metagen/metagen-0.7.2.ebuild b/app-portage/metagen/metagen-0.7.2.ebuild
index 75ad843cbe5d..65ff4f6e164a 100644
--- a/app-portage/metagen/metagen-0.7.2.ebuild
+++ b/app-portage/metagen/metagen-0.7.2.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
-PYTHON_COMPAT=( python{2_7,3_{6,7,8}} )
+PYTHON_COMPAT=( python3_{6,7,8} )
DISTUTILS_USE_SETUPTOOLS=rdepend
inherit distutils-r1
diff --git a/app-portage/metagen/metagen-9999.ebuild b/app-portage/metagen/metagen-9999.ebuild
index 9880fd95a4b3..5ac50c432b42 100644
--- a/app-portage/metagen/metagen-9999.ebuild
+++ b/app-portage/metagen/metagen-9999.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
-PYTHON_COMPAT=( python{2_7,3_{6,7,8}} )
+PYTHON_COMPAT=( python3_{6,7,8} )
DISTUTILS_USE_SETUPTOOLS=rdepend
inherit distutils-r1 git-r3
diff --git a/app-portage/overlint/overlint-0.5.3-r1.ebuild b/app-portage/overlint/overlint-0.5.3-r1.ebuild
index 644952c2c6d9..e43431ab544c 100644
--- a/app-portage/overlint/overlint-0.5.3-r1.ebuild
+++ b/app-portage/overlint/overlint-0.5.3-r1.ebuild
@@ -3,7 +3,7 @@
EAPI=5
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
inherit distutils-r1
diff --git a/app-portage/porthole/Manifest b/app-portage/porthole/Manifest
deleted file mode 100644
index eca66003e970..000000000000
--- a/app-portage/porthole/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST porthole-0.6.1.tar.bz2 958696 BLAKE2B e4eb7493a66278cd7d16ac68304fe74ad8623054a95bb3dca84b0b8236f76cb9b0a92f446d1ffd95f907c29d703d93bdd48e8e5064485b69282e8680f5fcb658 SHA512 9bc1d79c587ad8228b9bb4eee6cb32559a5d7b6a9f4f6ece752fce9030f71fdbfd6158d7a2a055641b63df1f0a1c31995747e15b618de79cd8a7a56e4d8f634c
diff --git a/app-portage/porthole/files/porthole-0.6.1-masking_status.patch b/app-portage/porthole/files/porthole-0.6.1-masking_status.patch
deleted file mode 100644
index e626fbb3c58f..000000000000
--- a/app-portage/porthole/files/porthole-0.6.1-masking_status.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: porthole/backends/portagelib.py
-===================================================================
---- porthole/backends/portagelib.py (revision 1209)
-+++ porthole/backends/portagelib.py (working copy)
-@@ -452,7 +452,11 @@
-
-
- def get_masking_status(ebuild):
-- return portage.getmaskingstatus(ebuild)
-+ try:
-+ status = portage.getmaskingstatus(ebuild)
-+ except KeyError:
-+ status = ['deprecated']
-+ return status
-
-
- def get_masking_reason(ebuild):
diff --git a/app-portage/porthole/files/porthole-0.6.1-missing-attribute.patch b/app-portage/porthole/files/porthole-0.6.1-missing-attribute.patch
deleted file mode 100644
index aa011a174b17..000000000000
--- a/app-portage/porthole/files/porthole-0.6.1-missing-attribute.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -uNr porthole/db/user_configs.py.old porthole/db/user_configs.py
-
---- porthole/db/user_configs.py.old 2010-11-27 13:34:35.000000000 +0600
-+++ porthole/db/user_configs.py 2010-11-27 13:31:24.000000000 +0600
-@@ -364,7 +364,7 @@
- debug.dprint("USER_CONFIGS: set_user_config(): add: " +
- "%s,\n remove: %s " %(str(add),str(remove)))
- set_config.set_user_config(filename=file, name=name, ebuild=ebuild,
-- comment=comment, username=privileges.USER,
-+ comment=comment, username=privileges.user,
- add=add, remove=remove)
- self.set_config_callback()
- else:
-
\ No newline at end of file
diff --git a/app-portage/porthole/files/porthole-0.6.1-missing_import.patch b/app-portage/porthole/files/porthole-0.6.1-missing_import.patch
deleted file mode 100644
index 33c9e4ee3353..000000000000
--- a/app-portage/porthole/files/porthole-0.6.1-missing_import.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- porthole/db/user_configs.py 2010/03/20 12:32:29 1217
-+++ porthole/db/user_configs.py 2010/03/20 14:10:46 1218
-@@ -36,6 +36,7 @@
- from porthole import backends
- portage_lib = backends.portage_lib
- from porthole.utils import debug
-+from porthole.privilege import controller as privileges
-
- ## set up this module to act as a user configs data server,
- ## watch the user configs for changes and auto update
-@@ -363,7 +364,7 @@
- debug.dprint("USER_CONFIGS: set_user_config(): add: " +
- "%s,\n remove: %s " %(str(add),str(remove)))
- set_config.set_user_config(filename=file, name=name, ebuild=ebuild,
-- comment=comment, username=priviliges.USER,
-+ comment=comment, username=privileges.USER,
- add=add, remove=remove)
- self.set_config_callback()
- else:
diff --git a/app-portage/porthole/metadata.xml b/app-portage/porthole/metadata.xml
deleted file mode 100644
index c49c4019f904..000000000000
--- a/app-portage/porthole/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
- tools-portage@gentoo.org
- Gentoo Portage tools team
-
-
- porthole
-
-
diff --git a/app-portage/porthole/porthole-0.6.1-r5.ebuild b/app-portage/porthole/porthole-0.6.1-r5.ebuild
deleted file mode 100644
index 8dbd7c1237fe..000000000000
--- a/app-portage/porthole/porthole-0.6.1-r5.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=(python2_7)
-PYTHON_REQ_USE="threads(+),xml(+)"
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="A GTK+-based frontend to Portage"
-HOMEPAGE="http://porthole.sourceforge.net"
-SRC_URI="mirror://sourceforge/porthole/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ppc ppc64 sparc x86"
-IUSE="nls"
-LANGS="de pl ru vi it fr tr"
-
-RDEPEND="
- >=sys-apps/portage-2.1[${PYTHON_USEDEP}]
- dev-python/pygtk:2[${PYTHON_USEDEP}]
- gnome-base/libglade:2.0
- dev-python/pygtksourceview:2[${PYTHON_USEDEP}]
- nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
- nls? ( >=sys-devel/gettext-0.14 )"
-
-PATCHES=(
- "${FILESDIR}/${P}-masking_status.patch" # bug 307037
- "${FILESDIR}/${P}-missing_import.patch" # bug 323179
- "${FILESDIR}/${P}-missing-attribute.patch" #bug 323179
-)
-
-src_compile() {
- # Compile localizations if necessary
- if use nls ; then
- cd scripts
- ./pocompile.sh -emerge ${LINGUAS} || die "pocompile failed"
- fi
-}
-
-python_install_all() {
- distutils-r1_python_install_all
-
- dodoc TODO README NEWS AUTHORS
-
- keepdir /var/log/porthole
- fperms g+w /var/log/porthole
- keepdir /var/db/porthole
- fperms g+w /var/db/porthole
-
- # nls
- if use nls; then
- # mo directory doesn't exists with nls enabled and unsupported LINGUAS
- [[ -d porthole/i18n/mo ]] && domo porthole/i18n/mo/*
- fi
-}
-
-pkg_preinst() {
- chgrp portage "${D}"/var/log/porthole
- chgrp portage "${D}"/var/db/porthole
-}
-
-pkg_postinst() {
- einfo
- einfo "Porthole has updated the way that the upgrades are sent to emerge."
- einfo "In this new way the user needs to set any 'Settings' menu emerge options"
- einfo "Porthole automatically adds '--oneshot' for all upgrades selections"
- einfo "Other options recommended are '--noreplace' along with '--update'"
- einfo "They allow for portage to skip any packages that might have already"
- einfo "been upgraded as a dependency of another previously upgraded package"
- einfo
-}
diff --git a/app-portage/repoman/repoman-2.3.16.ebuild b/app-portage/repoman/repoman-2.3.16.ebuild
index 900147ef47e0..5257354e7c85 100644
--- a/app-portage/repoman/repoman-2.3.16.ebuild
+++ b/app-portage/repoman/repoman-2.3.16.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
PYTHON_REQ_USE='bzip2(+)'
inherit distutils-r1
diff --git a/app-portage/repoman/repoman-2.3.20.ebuild b/app-portage/repoman/repoman-2.3.20.ebuild
index d02e96affaee..7308d367e69d 100644
--- a/app-portage/repoman/repoman-2.3.20.ebuild
+++ b/app-portage/repoman/repoman-2.3.20.ebuild
@@ -4,7 +4,7 @@
EAPI=6
DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8} )
PYTHON_REQ_USE='bzip2(+)'
inherit distutils-r1
diff --git a/app-portage/repoman/repoman-2.3.21.ebuild b/app-portage/repoman/repoman-2.3.21.ebuild
index c77f2d7f7328..00c74119bc39 100644
--- a/app-portage/repoman/repoman-2.3.21.ebuild
+++ b/app-portage/repoman/repoman-2.3.21.ebuild
@@ -4,7 +4,7 @@
EAPI=6
DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8} )
PYTHON_REQ_USE='bzip2(+)'
inherit distutils-r1
diff --git a/app-portage/repoman/repoman-9999.ebuild b/app-portage/repoman/repoman-9999.ebuild
index b19cdf422382..bf3bbc925f13 100644
--- a/app-portage/repoman/repoman-9999.ebuild
+++ b/app-portage/repoman/repoman-9999.ebuild
@@ -4,7 +4,7 @@
EAPI=6
DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
PYTHON_REQ_USE='bzip2(+)'
inherit distutils-r1
diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index 9bd6e9aacee1..a1cb68a90b54 100644
Binary files a/app-shells/Manifest.gz and b/app-shells/Manifest.gz differ
diff --git a/app-shells/zsh/Manifest b/app-shells/zsh/Manifest
index 1a144b9f3a00..37076afac198 100644
--- a/app-shells/zsh/Manifest
+++ b/app-shells/zsh/Manifest
@@ -1,4 +1,2 @@
-DIST zsh-5.7.1-doc.tar.xz 3062112 BLAKE2B cb67aada97d79b4b5b1116fb0737294785a2a510c2f4396cf77b671b62631e778ee9d57a32dcd257e079a9e4c35acaeeb68c0ec951b6ae8d8d8b647c05ef365c SHA512 e51bc8eb408bcb20bf8a4f0b8588f7803fdd433445efa282f598a3bec4575cba7feaad117cd2d5077f51150bf0ba41a673ffb925ade33c435db498f1d791cc8c
-DIST zsh-5.7.1.tar.xz 3126308 BLAKE2B 4f1aa2d5aea0341ba7839cf05687020889b5ca6879654a376ce838986211af4bddb7ab521a8a35cc06701f730a75a9778c633726b447f31845f5c140ec1e8d80 SHA512 a6aa88e1955a80229a4784a128866e325f79a8b5f73c922ab480048411036f1835cbb31daa30ab38bd16ab2a50040eda8f4f1f64704b21b6acc3051b1dbf18d0
DIST zsh-5.8-doc.tar.xz 3088696 BLAKE2B f738bf15b137e84df91fff8500b6c309884d8a1777e3158807f6028a411ae3f345e6ccba49bdff04c6607c4eb06fc2913313e84e1f78be0a0f92d23e46ba87db SHA512 38cc549818eb9c6952051b714dd2008d99605aba4ca4f614e62b033c9b067dd2031fff766ac5c1efe5bb52eae32bd482dea5df2b2d46decb7ecdb458f3da9d52
DIST zsh-5.8.tar.xz 3193284 BLAKE2B b1186dd27aede3318763d7c42253e919e60d00a018d085b2de7e8d985c872e9756a3ce112f623a088ec0878abd7a38d04dfa5ec552ef0f0a72e623191a7ba5e3 SHA512 96198ecef498b7d7945fecebbe6bf14065fa8c5d81a7662164579eba8206b79575812d292adea1864bc7487ac0818ba900e25f9ab3802449340de80417c2c533
diff --git a/app-shells/zsh/zsh-5.7.1-r1.ebuild b/app-shells/zsh/zsh-5.7.1-r1.ebuild
deleted file mode 100644
index 38bb5002a8fa..000000000000
--- a/app-shells/zsh/zsh-5.7.1-r1.ebuild
+++ /dev/null
@@ -1,221 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic prefix
-
-if [[ ${PV} == 9999* ]] ; then
- inherit git-r3
- EGIT_REPO_URI="https://git.code.sf.net/p/zsh/code"
-else
- KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
- SRC_URI="https://www.zsh.org/pub/${P}.tar.xz
- https://www.zsh.org/pub/old/${P}.tar.xz
- mirror://sourceforge/${PN}/${P}.tar.xz
- doc? (
- https://www.zsh.org/pub/${P}-doc.tar.xz
- mirror://sourceforge/${PN}/${P}-doc.tar.xz
- )"
-fi
-
-DESCRIPTION="UNIX Shell similar to the Korn shell"
-HOMEPAGE="https://www.zsh.org/"
-
-LICENSE="ZSH gdbm? ( GPL-2 )"
-SLOT="0"
-IUSE="caps debug doc examples gdbm maildir pcre static unicode"
-
-RDEPEND="
- >=sys-libs/ncurses-5.1:0=
- static? ( >=sys-libs/ncurses-5.7-r4:0=[static-libs] )
- caps? ( sys-libs/libcap )
- pcre? (
- >=dev-libs/libpcre-3.9
- static? ( >=dev-libs/libpcre-3.9[static-libs] )
- )
- gdbm? ( sys-libs/gdbm:= )
- ! Doc/zshall.1 || die
-
- # add openrc specific options for init.d completion
- eapply "${FILESDIR}"/${PN}-5.3-init.d-gentoo.diff
- fi
-
- default
-
- hprefixify configure.ac
- if [[ ${PV} == 9999* ]] ; then
- sed -i "/^VERSION=/s/=.*/=${PV}/" Config/version.mk || die
- fi
- eautoreconf
-}
-
-src_configure() {
- local myconf=(
- --bindir="${EPREFIX}"/bin
- --libdir="${EPREFIX}"/usr/$(get_libdir)
- --enable-etcdir="${EPREFIX}"/etc/zsh
- --enable-runhelpdir="${EPREFIX}"/usr/share/zsh/${PV%_*}/help
- --enable-fndir="${EPREFIX}"/usr/share/zsh/${PV%_*}/functions
- --enable-site-fndir="${EPREFIX}"/usr/share/zsh/site-functions
- --enable-function-subdirs
- --with-tcsetpgrp
- --with-term-lib="$(usex unicode 'tinfow ncursesw' 'tinfo ncurses')"
- $(use_enable maildir maildir-support)
- $(use_enable pcre)
- $(use_enable caps cap)
- $(use_enable unicode multibyte)
- $(use_enable gdbm)
- )
-
- if use static ; then
- myconf+=( --disable-dynamic )
- append-ldflags -static
- fi
- if use debug ; then
- myconf+=(
- --enable-zsh-debug
- --enable-zsh-mem-debug
- --enable-zsh-mem-warning
- --enable-zsh-secure-free
- --enable-zsh-hash-debug
- )
- fi
-
- if [[ ${CHOST} == *-darwin* ]]; then
- myconf+=( --enable-libs=-liconv )
- append-ldflags -Wl,-x
- fi
-
- econf "${myconf[@]}"
-
- if use static ; then
- # compile all modules statically, see Bug #27392
- # removed cap and curses because linking failes
- sed -e "s,link=no,link=static,g" \
- -e "/^name=zsh\/cap/s,link=static,link=no," \
- -e "/^name=zsh\/curses/s,link=static,link=no," \
- -i "${S}"/config.modules || die
- if ! use gdbm ; then
- sed -i '/^name=zsh\/db\/gdbm/s,link=static,link=no,' \
- "${S}"/config.modules || die
- fi
- fi
-}
-
-src_compile() {
- default
-
- if [[ ${PV} == 9999* ]] && use doc ; then
- emake -C Doc everything
- fi
-}
-
-src_test() {
- addpredict /dev/ptmx
- local i
- for i in C02cond.ztst V08zpty.ztst X02zlevi.ztst Y01completion.ztst Y02compmatch.ztst Y03arguments.ztst ; do
- rm "${S}"/Test/${i} || die
- done
- emake check
-}
-
-src_install() {
- emake DESTDIR="${D}" install $(usex doc "install.info" "")
-
- insinto /etc/zsh
- export PREFIX_QUOTE_CHAR='"' PREFIX_EXTRA_REGEX="/EUID/s,0,${EUID},"
- newins "$(prefixify_ro "${FILESDIR}"/zprofile-4)" zprofile
-
- keepdir /usr/share/zsh/site-functions
- insinto /usr/share/zsh/${PV%_*}/functions/Prompts
- newins "${FILESDIR}"/prompt_gentoo_setup-1 prompt_gentoo_setup
-
- local i
-
- # install miscellaneous scripts (bug #54520)
- sed -e "s:/usr/local/bin/perl:${EPREFIX}/usr/bin/perl:g" \
- -e "s:/usr/local/bin/zsh:${EPREFIX}/bin/zsh:g" \
- -i {Util,Misc}/* || die
- for i in Util Misc ; do
- insinto /usr/share/zsh/${PV%_*}/${i}
- doins ${i}/*
- done
-
- # install header files (bug #538684)
- insinto /usr/include/zsh
- doins config.h Src/*.epro
- for i in Src/{zsh.mdh,*.h} ; do
- sed -e 's@\.\./config\.h@config.h@' \
- -e 's@#\(\s*\)include "\([^"]\+\)"@#\1include @' \
- -i "${i}"
- doins "${i}"
- done
-
- dodoc ChangeLog* META-FAQ NEWS README config.modules
-
- if use doc ; then
- pushd "${WORKDIR}/${PN}-${PV%_*}" >/dev/null
- dodoc Doc/zsh.{dvi,pdf}
- docinto html
- dodoc Doc/*.html
- popd >/dev/null
- fi
-
- docinto StartupFiles
- dodoc StartupFiles/z*
-}
-
-pkg_postinst() {
- if [[ -z ${REPLACING_VERSIONS} ]] ; then
- echo
- elog "If you want to enable Portage completions and Gentoo prompt,"
- elog "emerge app-shells/gentoo-zsh-completions and add"
- elog " autoload -U compinit promptinit"
- elog " compinit"
- elog " promptinit; prompt gentoo"
- elog "to your ~/.zshrc"
- echo
- elog "Also, if you want to enable cache for the completions, add"
- elog " zstyle ':completion::complete:*' use-cache 1"
- elog "to your ~/.zshrc"
- echo
- elog "Note that a system zprofile startup file is installed. This will override"
- elog "PATH and possibly other variables that a user may set in ~/.zshenv."
- elog "Custom PATH settings and similar overridden variables can be moved to ~/.zprofile"
- elog "or other user startup files that are sourced after the system zprofile."
- echo
- elog "If PATH must be set in ~/.zshenv to affect things like non-login ssh shells,"
- elog "one method is to use a separate path-setting file that is conditionally sourced"
- elog "in ~/.zshenv and also sourced from ~/.zprofile. For more information, see the"
- elog "zshenv example in ${EROOT}/usr/share/doc/${PF}/StartupFiles/."
- echo
- elog "See https://wiki.gentoo.org/wiki/Zsh/HOWTO for more introduction documentation."
- echo
- fi
-}
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 9f36654328d3..8508445e8c2a 100644
Binary files a/app-text/Manifest.gz and b/app-text/Manifest.gz differ
diff --git a/app-text/openlp/Manifest b/app-text/openlp/Manifest
deleted file mode 100644
index abbd62a15f53..000000000000
--- a/app-text/openlp/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST OpenLP-2.4.6.tar.gz 7303683 BLAKE2B 4e5b1a60c8eb8772cdecf453e8277a69cfb1cdd51ab6478425332b58c52319713dd411027a108113485ee7fdc4c770cb6f94a626b23c6cca82231311a62df08a SHA512 071ca83c6969c5281213dea5efe6dfc60a3d22b56534b93e2fd1f8e43760ba5cab851b6f4dca485a31254d2090e26ce640359cb9f9797d84b9509426061dfb7a
diff --git a/app-text/openlp/files/OpenLP-2.4.2-disable-tests.patch b/app-text/openlp/files/OpenLP-2.4.2-disable-tests.patch
deleted file mode 100644
index 0b1de65e85af..000000000000
--- a/app-text/openlp/files/OpenLP-2.4.2-disable-tests.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -urN a/setup.cfg b/setup.cfg
---- a/setup.cfg 2016-06-25 13:20:56.000000000 -0500
-+++ b/setup.cfg 2016-09-08 22:30:54.606413547 -0500
-@@ -2,3 +2,5 @@
- exclude=resources.py,vlc.py
- max-line-length = 120
- ignore = E402
-+[install]
-+install_scripts=/usr/bin
-\ No newline at end of file
-diff -urN a/setup.py b/setup.py
---- a/setup.py 2016-06-25 13:20:56.000000000 -0500
-+++ b/setup.py 2016-09-08 22:30:50.523413394 -0500
-@@ -157,7 +157,7 @@
- author_email='raoulsnyman@openlp.org',
- url='http://openlp.org/',
- license='GNU General Public License',
-- packages=find_packages(exclude=['ez_setup', 'examples', 'tests']),
-+ packages=find_packages(exclude=['ez_setup', 'examples', 'tests', 'tests.*']),
- scripts=['openlp.py'],
- include_package_data=True,
- zip_safe=False,
diff --git a/app-text/openlp/metadata.xml b/app-text/openlp/metadata.xml
deleted file mode 100644
index b6f70e4456a8..000000000000
--- a/app-text/openlp/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
- openlp
-
-
diff --git a/app-text/openlp/openlp-2.4.6.ebuild b/app-text/openlp/openlp-2.4.6.ebuild
deleted file mode 100644
index 49765ea89237..000000000000
--- a/app-text/openlp/openlp-2.4.6.ebuild
+++ /dev/null
@@ -1,43 +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='sqlite'
-
-inherit distutils-r1
-
-DESCRIPTION="Free church presentation software"
-HOMEPAGE="https://openlp.org/"
-SRC_URI="https://get.openlp.org/"${PV}"/OpenLP-"${PV}".tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
- dev-python/alembic[${PYTHON_USEDEP}]
- dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
- dev-python/chardet[${PYTHON_USEDEP}]
- dev-python/lxml[${PYTHON_USEDEP}]
- dev-python/mako[${PYTHON_USEDEP}]
- >=dev-python/pyenchant-1.3[${PYTHON_USEDEP}]
- dev-python/pyodbc
- dev-python/PyQt5[multimedia,gui,network,svg,webkit,${PYTHON_USEDEP}]
- dev-python/setuptools[${PYTHON_USEDEP}]
- dev-python/sip[${PYTHON_USEDEP}]
- >=dev-python/sqlalchemy-0.5[${PYTHON_USEDEP}]
- dev-python/sqlalchemy-migrate[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/OpenLP-${PV}
-
-PATCHES=( "${FILESDIR}"/OpenLP-2.4.2-disable-tests.patch )
-
-python_install_all() {
- distutils-r1_python_install_all
- domenu resources/openlp.desktop
- mv "${D}"/usr/bin/openlp.py "${D}"/usr/bin/openlp
- doicon -s scalable resources/images/openlp.svg
-}
diff --git a/dev-ada/Manifest.gz b/dev-ada/Manifest.gz
index 80453b85fbee..7fcd6f23d274 100644
Binary files a/dev-ada/Manifest.gz and b/dev-ada/Manifest.gz differ
diff --git a/dev-ada/gps/gps-2019-r1.ebuild b/dev-ada/gps/gps-2019-r1.ebuild
index 3caffdfab7c3..58c5f6bc13bb 100644
--- a/dev-ada/gps/gps-2019-r1.ebuild
+++ b/dev-ada/gps/gps-2019-r1.ebuild
@@ -24,7 +24,7 @@ SRC_URI="https://github.com/AdaCore/${PN}/archive/${commitId}.tar.gz
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
RDEPEND="${PYTHON_DEPS}
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 1764256dc099..163af9526e86 100644
Binary files a/dev-db/Manifest.gz and b/dev-db/Manifest.gz differ
diff --git a/dev-db/mariadb/mariadb-10.4.12.ebuild b/dev-db/mariadb/mariadb-10.4.12.ebuild
index 0e5f5ec5df15..b355f9f09486 100644
--- a/dev-db/mariadb/mariadb-10.4.12.ebuild
+++ b/dev-db/mariadb/mariadb-10.4.12.ebuild
@@ -325,6 +325,9 @@ src_configure() {
# Bug #114895, bug #110149
filter-flags "-O" "-O[01]"
+ # It fails on alpha without this
+ use alpha && append-ldflags "-Wl,--no-relax"
+
append-cxxflags -felide-constructors
# bug #283926, with GCC4.4, this is required to get correct behavior.
diff --git a/dev-db/mysql/mysql-5.6.44-r1.ebuild b/dev-db/mysql/mysql-5.6.44-r1.ebuild
index beb0cfb51484..22a588a07670 100644
--- a/dev-db/mysql/mysql-5.6.44-r1.ebuild
+++ b/dev-db/mysql/mysql-5.6.44-r1.ebuild
@@ -37,7 +37,7 @@ RESTRICT="!test? ( test ) libressl? ( test )"
REQUIRED_USE="?? ( tcmalloc jemalloc ) static? ( yassl )"
-KEYWORDS="~alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
# Shorten the path because the socket path length must be shorter than 107 chars
# and we will run a mysql server during test phase
diff --git a/dev-db/mysql/mysql-5.6.45-r2.ebuild b/dev-db/mysql/mysql-5.6.45-r2.ebuild
index 31f2e40e4ae7..db948d673b5e 100644
--- a/dev-db/mysql/mysql-5.6.45-r2.ebuild
+++ b/dev-db/mysql/mysql-5.6.45-r2.ebuild
@@ -37,7 +37,7 @@ RESTRICT="!test? ( test ) libressl? ( test )"
REQUIRED_USE="?? ( tcmalloc jemalloc ) static? ( yassl )"
-KEYWORDS="~alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
# Shorten the path because the socket path length must be shorter than 107 chars
# and we will run a mysql server during test phase
diff --git a/dev-db/mysql/mysql-5.7.26-r1.ebuild b/dev-db/mysql/mysql-5.7.26-r1.ebuild
index 6a6d86bf27bc..5ca98c440915 100644
--- a/dev-db/mysql/mysql-5.7.26-r1.ebuild
+++ b/dev-db/mysql/mysql-5.7.26-r1.ebuild
@@ -34,7 +34,7 @@ RESTRICT="!test? ( test ) libressl? ( test )"
REQUIRED_USE="?? ( tcmalloc jemalloc ) static? ( yassl )"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
# Shorten the path because the socket path length must be shorter than 107 chars
# and we will run a mysql server during test phase
diff --git a/dev-db/mysql/mysql-5.7.27-r1.ebuild b/dev-db/mysql/mysql-5.7.27-r1.ebuild
index 912e350a9125..1f9c1cc0f989 100644
--- a/dev-db/mysql/mysql-5.7.27-r1.ebuild
+++ b/dev-db/mysql/mysql-5.7.27-r1.ebuild
@@ -34,7 +34,7 @@ RESTRICT="!test? ( test ) libressl? ( test )"
REQUIRED_USE="?? ( tcmalloc jemalloc ) static? ( yassl )"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
# Shorten the path because the socket path length must be shorter than 107 chars
# and we will run a mysql server during test phase
diff --git a/dev-db/mysql/mysql-5.7.29.ebuild b/dev-db/mysql/mysql-5.7.29.ebuild
index 0c3c8fe4d524..dceca6a058f4 100644
--- a/dev-db/mysql/mysql-5.7.29.ebuild
+++ b/dev-db/mysql/mysql-5.7.29.ebuild
@@ -34,7 +34,7 @@ RESTRICT="!test? ( test ) libressl? ( test )"
REQUIRED_USE="?? ( tcmalloc jemalloc ) static? ( yassl )"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
# Shorten the path because the socket path length must be shorter than 107 chars
# and we will run a mysql server during test phase
diff --git a/dev-db/percona-server/percona-server-5.7.27.30.ebuild b/dev-db/percona-server/percona-server-5.7.27.30.ebuild
index 200a7c0f7436..300c67c70366 100644
--- a/dev-db/percona-server/percona-server-5.7.27.30.ebuild
+++ b/dev-db/percona-server/percona-server-5.7.27.30.ebuild
@@ -43,7 +43,7 @@ RESTRICT="!test? ( test ) libressl? ( test )"
REQUIRED_USE="?? ( tcmalloc jemalloc ) static? ( yassl )"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
# Shorten the path because the socket path length must be shorter than 107 chars
# and we will run a mysql server during test phase
diff --git a/dev-games/Manifest.gz b/dev-games/Manifest.gz
index c8fe9d26c89a..9c36e78955f9 100644
Binary files a/dev-games/Manifest.gz and b/dev-games/Manifest.gz differ
diff --git a/dev-games/tiled/Manifest b/dev-games/tiled/Manifest
index 9ca80d8f3671..9d54c29c2cf3 100644
--- a/dev-games/tiled/Manifest
+++ b/dev-games/tiled/Manifest
@@ -2,3 +2,4 @@ DIST tiled-1.2.4.tar.gz 16875074 BLAKE2B 19d9e000949a889af90f48c31862aab8d00cbd9
DIST tiled-1.2.5.tar.gz 16878267 BLAKE2B 75d7ba6f715963cc5209181664052aa276dead8311e8fb99561c8375c4fce3400b60f71f4bce3213e1198e3217812e8debdedc72c87dff3f553e391ed1e9438d SHA512 2b0009a8aa785d4289d6759369ff579e62e4fb969090ee6ba2b3fae4dd42d4e9562bd6d2a74ae372c07d9bbfd108390c79a48b49e05f0881e87497f6a727cb3a
DIST tiled-1.3.1.tar.gz 15728903 BLAKE2B f9b6aa89b450bbb6fe101610f81f3f8a2c385149eb07d79c3b2ddf33bb654c7d1f48b8938975be5037824a1fd14840a7ee8b4a0cc8b009808bdfdc4aec99525e SHA512 b2ed5c0ff043990177809873417e31e8ee2894473b3084d0302e5557c19043c1763cf55d8ade16335ba3d64e7b4b903dd5fb88fd4bcf878c7c4d873bc9c7ed73
DIST tiled-1.3.2.tar.gz 15826960 BLAKE2B 3e9669eaee3c1cd5a891cdb7516b620d183d955a0f988bed20403edfdcb629dfeff13baab91fad973f9fe5311e7a1aac9e422dfffb29a550ad7ca5658152279f SHA512 25dedfde6f48b0bd34a500481662c3da8c6f78b023b4d5c63559c4240db22fb664ec057d3d801714cb682a6bd2e870bf072ab688b1d00c017f0ea5af980d5ead
+DIST tiled-1.3.3.tar.gz 15859368 BLAKE2B a79f1944daf4fffdccf38fc8250475c4e46844204800fb2c77eaa65882836507257013ba0f107cbf19b780ccf8c4593bdd071138c7fa6068b20d93f686b5eb62 SHA512 61207f2634ee841207598d06bc4bb97cd25182e25228c97b6a369b88e3a79ddf63c91786eb80254a658380f54b08d4f0bef1891ff7437aedc29f6344a405ee08
diff --git a/dev-games/tiled/tiled-1.3.3.ebuild b/dev-games/tiled/tiled-1.3.3.ebuild
new file mode 100644
index 000000000000..b510b361b4ab
--- /dev/null
+++ b/dev-games/tiled/tiled-1.3.3.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_6 )
+inherit gnome2-utils multilib python-single-r1 qmake-utils xdg-utils
+
+DESCRIPTION="A general purpose tile map editor"
+HOMEPAGE="https://www.mapeditor.org/"
+SRC_URI="https://github.com/bjorn/tiled/archive/v${PV}/${P}.tar.gz"
+
+LICENSE="BSD BSD-2 GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="examples python"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+ >=dev-qt/qtcore-5.10:5
+ >=dev-qt/qtdeclarative-5.10:5
+ >=dev-qt/qtgui-5.10:5
+ >=dev-qt/qtnetwork-5.10:5
+ >=dev-qt/qtwidgets-5.10:5
+ sys-libs/zlib
+ python? ( ${PYTHON_DEPS} )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-qt/linguist-tools:5"
+
+DOCS=( AUTHORS COPYING NEWS.md README.md )
+
+pkg_setup() {
+ use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+ eqmake5 LIBDIR="/usr/$(get_libdir)" PREFIX="/usr" DISABLE_PYTHON_PLUGIN="$(usex !python)"
+}
+
+src_install() {
+ emake INSTALL_ROOT="${D}" install
+
+ einstalldocs
+
+ if use examples ; then
+ docompress -x /usr/share/doc/${PF}/examples
+ dodoc -r examples
+ fi
+}
+
+pkg_postinst() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 7d3caaa10e28..622559651bf7 100644
Binary files a/dev-java/Manifest.gz and b/dev-java/Manifest.gz differ
diff --git a/dev-java/openjfx/openjfx-11.0.6_p2.ebuild b/dev-java/openjfx/openjfx-11.0.6_p2.ebuild
index 49791b2a62a1..23574d61505c 100644
--- a/dev-java/openjfx/openjfx-11.0.6_p2.ebuild
+++ b/dev-java/openjfx/openjfx-11.0.6_p2.ebuild
@@ -7,7 +7,7 @@ MY_PV=${PV/_p/+}
SLOT=${MY_PV%%[.+]*}
EGRADLE_VER="4.8"
-inherit java-pkg-2 multiprocessing
+inherit flag-o-matic java-pkg-2 multiprocessing
DESCRIPTION="Java OpenJFX client application platform"
HOMEPAGE="https://openjfx.io"
@@ -167,6 +167,8 @@ src_prepare() {
}
src_configure() {
+ append-flags -Wno-error
+
#FIXME: still calls gcc, pkg-config etc by name without chost prefix
#FIXME: should we enable webkit? doubt so
diff --git a/dev-java/openjfx/openjfx-11.0.7_p0.ebuild b/dev-java/openjfx/openjfx-11.0.7_p0.ebuild
index 3a331f16e219..e09a3d360f67 100644
--- a/dev-java/openjfx/openjfx-11.0.7_p0.ebuild
+++ b/dev-java/openjfx/openjfx-11.0.7_p0.ebuild
@@ -7,7 +7,7 @@ MY_PV="${PV/_p/+}"
SLOT="${MY_PV%%[.+]*}"
EGRADLE_VER="4.8"
-inherit java-pkg-2 multiprocessing
+inherit flag-o-matic java-pkg-2 multiprocessing
DESCRIPTION="Java OpenJFX client application platform"
HOMEPAGE="https://openjfx.io"
@@ -167,6 +167,8 @@ src_prepare() {
}
src_configure() {
+ append-flags -Wno-error
+
#FIXME: still calls gcc, pkg-config etc by name without chost prefix
#FIXME: should we enable webkit? doubt so
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index a7064437eb3c..5bb6e60b93f5 100644
Binary files a/dev-lang/Manifest.gz and b/dev-lang/Manifest.gz differ
diff --git a/dev-lang/rust-bin/Manifest b/dev-lang/rust-bin/Manifest
index 28903a0187ed..f3768c764de0 100644
--- a/dev-lang/rust-bin/Manifest
+++ b/dev-lang/rust-bin/Manifest
@@ -68,3 +68,17 @@ DIST rust-1.41.1-powerpc64le-unknown-linux-gnu.tar.xz 110594504 BLAKE2B eaf9c92e
DIST rust-1.41.1-s390x-unknown-linux-gnu.tar.xz 114814112 BLAKE2B ef22c377e1d89ef4ebe78df19d91bcf042e2e1d8997be80d7d40998b18f6b44f8bb1232b1f72e42e3ffb6d1ff235f3cd2f04854e996bbf7be8f6d5d7299e8514 SHA512 f809adc626876df5c6e050362d59189ede5e3991ac41fd129922540abeb728f618e1a3f3925cee34895de5e037141aabb1f8c2b94d4069945d174e38446e8153
DIST rust-1.41.1-x86_64-unknown-linux-gnu.tar.xz 111202140 BLAKE2B 226c68b1e97cc9be82e81f6c9e065e08514166a65a57159c2f63527063ae5f514650afc2591e0c4854ecd0239dc82cbc9a97b99412608645aca879a71354d857 SHA512 c75d4a18cf9300c6ab480d34c5e4b41be971535931455239330cb2a0e927bcf9cf102498cad5dd1d5d802fd1d9c9d214b80e8ff15aa6be68d3e7f41420cad666
DIST rust-1.41.1-x86_64-unknown-linux-musl.tar.xz 96076684 BLAKE2B 3672e24a83c1e4c97a0844f9522a9fced19d5ef01c89d44e54bba8683514a86f7a14ea2e8c2f28d03c65b7e2e0358ff3cea2f85de1e69eb5334c55e18a8c8e4f SHA512 29e7b2aae35017d7f4313e0a482712390ffec752e62d8b1bda95d56a1f93ba882a8f610b469b5d2d7fa3d6d35c2cdc4e45d219ad85b8a3f71ba6ce04b1add48b
+DIST rust-1.42.0-aarch64-unknown-linux-gnu.tar.xz 99903344 BLAKE2B 77e64c56c2f3ab505af9d9003d127b8beb3b2204344985faa6de92905c96d92342485e062e0ff1228baf51a67c8c2274078a60cc86e0c67ba99481a5c01d4d0d SHA512 691a11e279efdcafa6bdafacb7fb48ccf653e180e0e85909b6031105a297d47538efb36d63216f6185427f818483a51aa827f351ca2123840d72caf60079fe13
+DIST rust-1.42.0-arm-unknown-linux-gnueabi.tar.xz 102380528 BLAKE2B 5df9a33fa2b1414c9986f01d8dbd85fab2a705818336e1b2c94ca63136be7be63d25a2586efa956cf31aa604106b3c92857e2133169c7f3062da22006f1896bf SHA512 8e1b5351a3289441823ed0ce12f2fb0cedc267efe5c504966aefbc9a74f37ed11f4da1086295d7351c58c2d0bf59c4b7b54b23d5ec0dec4750bd7e38500afeb0
+DIST rust-1.42.0-arm-unknown-linux-gnueabihf.tar.xz 100300920 BLAKE2B eb90db613230e44f5002388d83460b635f33ceee349b094ca2472171d54ce3d459b6a2143a66705ef7ea89dcb0fc9b21e6d2f2f53479098ca8559f7c84ee0697 SHA512 d58c1820f39abfdf74569e26ba4f13347dde16632415d4ec0b54cc99c3b04563ed551ed1ba717b33e9b1a9b13e2502008203472f8ed712e302d1db66909e7ccf
+DIST rust-1.42.0-armv7-unknown-linux-gnueabihf.tar.xz 105021972 BLAKE2B 5a04715582193138344ef05700af4ccc90074a1b7d6ed8109993b6c59315e6fd6bc947504fcde36b869da8db4b7b8d8240f908387c8b2d78e21e35f6c27fdef7 SHA512 26768ec530506e20fed8f9ef2c1ca85eec155fc90949f2063836b6109b296a976c8430a698971a8b1c11e8f6ad043d854a36e9f0e849417178411dc5cbd30e59
+DIST rust-1.42.0-i686-unknown-linux-gnu.tar.xz 124258356 BLAKE2B 3e2e0c11e792943be65c989d4b9ba98cc92b2a1dfec7b8506f00d20e439050faf744b991e7e4fa91f0c8a52f7a4e5fb8dc5d383fd0430fa46c4e35dfa5bb26e7 SHA512 7376be5abed573bbf68f73ed5609fa8e22dfa3ead19a3f3d78d553347e3ae01604ab9906f5317f1687a8ab3f9ad9c38cde44ef6f56d7da65a788a74aee9df057
+DIST rust-1.42.0-mips-unknown-linux-gnu.tar.xz 95265764 BLAKE2B b02a340c7689812f7e13286f3dcde893933869c9becb071e9b0455eb68130d74fd67babdf85859ff7b4ef449261be6e09f230a4cf6196041c199d717324c8b21 SHA512 cc19b383ac3dde62750cd247e7fdec9ca4b4ee16880b9b00c42e62c57b46c522950983b500bf8fc70b8198469a18ab92c1ca382e8a07abf8bc937d8f17208d5d
+DIST rust-1.42.0-mips64-unknown-linux-gnuabi64.tar.xz 99814476 BLAKE2B 405fa7426a8d21648be97f6b93065b20878419a2c0aa5889ea6a66b9c0f5804d2673a23932a2462965f04e320c4e78f4c79d5b0a6f9877dfe9909d4b4b8864be SHA512 e8933af6290f2cb881fdfc7d2ba3da1c47ef67d847c8a3e659f8f626b7154f202f071ccd4e90555333a3f3dc2bf4101a645b5665dd00a6d72b5acacd6ad317a2
+DIST rust-1.42.0-mipsel-unknown-linux-gnu.tar.xz 95248132 BLAKE2B 875597ba699281d7160ba2f36fe03f3a234d19e5c6e91ce1291ab2369799349a42e1e7e6dcdf524980548a8c499693d6b48967913d4280776da7a921dfd18ab1 SHA512 733307eec1f938385a43b38aadcd84b7d4c1cfc084e070333d955d8b36f3192a7f7e6c05c5c07d782b945acbb261e48db94f2f9f7d3a09e8669055a577c90528
+DIST rust-1.42.0-powerpc-unknown-linux-gnu.tar.xz 100228400 BLAKE2B e05749ab974ffb0dbae332d4f59c8f71047f86c5e33a368555d996ccf14d229b0cda2cfbcf7f05902746fcf9b18a9a1ba4cd8d8cfeb51d3128f04914e8bc062d SHA512 ad2c9d3ebae5ccffd1f70d0a732a3e6cf793b203a8ab7bea3b90d45b63dac84cd513fcc494c7401a6dedcc1e4c3b6fa4ba95a4d3c10411dce5c2a06b84ef934a
+DIST rust-1.42.0-powerpc64-unknown-linux-gnu.tar.xz 106116524 BLAKE2B bfa533d3fdeaba4c539f18f205ddaa99c6a6be8f4213cf2d02090cc576ee17c721295262c78d84ec01bc286b59f6a30bf32e7c44e435205908fec03de1a8d60a SHA512 668d1d353bdaf676043ab7f4baad464b202e8ae1be7713e3481b8e9fb5fabd1020e10e178d69d099541cb1b23362b50b826790740156f1c96efa3d2a7457e404
+DIST rust-1.42.0-powerpc64le-unknown-linux-gnu.tar.xz 109926880 BLAKE2B 92a9067ff95bf2293eb5dc3f055275646f9f9764a59ea5dc772b1d8da78c28acfbd93e7a9076dd7ddfb36255cecda0646a7e5cc4ef4767cdb320aaf046f77162 SHA512 e1db9bbef45e88e7d1d5b905379c04786a015c90d0d9de6a6c16276a3e91c342a8231dda7a4d46ecc7adc969d07fd7dd8595975647b9ab69f8997fee74401219
+DIST rust-1.42.0-s390x-unknown-linux-gnu.tar.xz 116937084 BLAKE2B 4d68801c7c40aa0aca24d19d25e80614b5b40aa2715aacddb6b9f5441b1c7e19e7b0d396caea860607df1dc580deadc43d9cd1f988cbe654b3132b665f9032af SHA512 85b1331a9a71cc43a2fa628b8510590ff072e409c2c38ebfd9089ab7a245182e23b52f6221b25c63f6048e1bf4ada0f561dd8f3f810680c9727040bc8a0d8d46
+DIST rust-1.42.0-x86_64-unknown-linux-gnu.tar.xz 110826392 BLAKE2B 8c90bacc9b350d64c4084edf104e9004461d681e19f8e8179ff6eb0b2bc50e25d95e3ed13c83f77224cc60f374f3961f0069dfe20512c844598b8eb2393300b0 SHA512 87c06d4503e7ba12bd3dfc8dd279a3bdf33a24d2c22eec1378b79b2c17ccdad9b4c8dbd0d4704eae1f3476aec5639d3ba143e8c74a296d631b17b57da7447e70
+DIST rust-1.42.0-x86_64-unknown-linux-musl.tar.xz 97471188 BLAKE2B 29e7089a33a20e5c57a68c171e6b049e5dbc97d4c940106bbf7116c970e7ddb2271b1cf33162b4141d89b0b59049e09ca49c848a326036eefbc03e369f3ab18e SHA512 d804a08e38fa6735ce57067a3c39c59e2932943aa8baf43419815e9c743f50e198d88ef80d87fc193b8bcba011c685471146c0741954095eed74e41f86de38c8
diff --git a/dev-lang/rust-bin/rust-bin-1.42.0.ebuild b/dev-lang/rust-bin/rust-bin-1.42.0.ebuild
new file mode 100644
index 000000000000..51deede915ab
--- /dev/null
+++ b/dev-lang/rust-bin/rust-bin-1.42.0.ebuild
@@ -0,0 +1,167 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1 rust-toolchain toolchain-funcs
+
+MY_P="rust-${PV}"
+
+DESCRIPTION="Systems programming language from Mozilla"
+HOMEPAGE="https://www.rust-lang.org/"
+SRC_URI="$(rust_all_arch_uris ${MY_P})"
+
+LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
+SLOT="stable"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="clippy cpu_flags_x86_sse2 doc libressl rustfmt"
+
+DEPEND=""
+RDEPEND="
+ >=app-eselect/eselect-rust-20190311
+ sys-libs/zlib
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )
+ net-libs/libssh2
+ net-misc/curl[ssl]
+"
+
+REQUIRED_USE="x86? ( cpu_flags_x86_sse2 )"
+
+QA_PREBUILT="
+ opt/${P}/bin/*-${PV}
+ opt/${P}/lib/*.so
+ opt/${P}/lib/rustlib/*/bin/*
+ opt/${P}/lib/rustlib/*/lib/*.so
+ opt/${P}/lib/rustlib/*/lib/*.rlib*
+"
+
+pkg_pretend() {
+ if [[ "$(tc-is-softfloat)" != "no" ]] && [[ ${CHOST} == armv7* ]]; then
+ die "${CHOST} is not supported by upstream Rust. You must use a hard float version."
+ fi
+}
+
+src_unpack() {
+ default
+ mv "${WORKDIR}/${MY_P}-$(rust_abi)" "${S}" || die
+}
+
+src_install() {
+ local std=$(grep 'std' ./components)
+ local components="rustc,cargo,${std}"
+ use doc && components="${components},rust-docs"
+ use clippy && components="${components},clippy-preview"
+ use rustfmt && components="${components},rustfmt-preview"
+ ./install.sh \
+ --components="${components}" \
+ --disable-verify \
+ --prefix="${ED}/opt/${P}" \
+ --mandir="${ED}/opt/${P}/man" \
+ --disable-ldconfig \
+ || die
+
+ local rustc=rustc-bin-${PV}
+ local rustdoc=rustdoc-bin-${PV}
+ local rustgdb=rust-gdb-bin-${PV}
+ local rustgdbgui=rust-gdbgui-bin-${PV}
+ local rustlldb=rust-lldb-bin-${PV}
+
+ mv "${ED}/opt/${P}/bin/rustc" "${ED}/opt/${P}/bin/${rustc}" || die
+ mv "${ED}/opt/${P}/bin/rustdoc" "${ED}/opt/${P}/bin/${rustdoc}" || die
+ mv "${ED}/opt/${P}/bin/rust-gdb" "${ED}/opt/${P}/bin/${rustgdb}" || die
+ mv "${ED}/opt/${P}/bin/rust-gdbgui" "${ED}/opt/${P}/bin/${rustgdbgui}" || die
+ mv "${ED}/opt/${P}/bin/rust-lldb" "${ED}/opt/${P}/bin/${rustlldb}" || die
+
+ dosym "${rustc}" "/opt/${P}/bin/rustc"
+ dosym "${rustdoc}" "/opt/${P}/bin/rustdoc"
+ dosym "${rustgdb}" "/opt/${P}/bin/rust-gdb"
+ dosym "${rustgdbgui}" "/opt/${P}/bin/rust-gdbgui"
+ dosym "${rustlldb}" "/opt/${P}/bin/rust-lldb"
+
+ dosym "../../opt/${P}/bin/${rustc}" "/usr/bin/${rustc}"
+ dosym "../../opt/${P}/bin/${rustdoc}" "/usr/bin/${rustdoc}"
+ dosym "../../opt/${P}/bin/${rustgdb}" "/usr/bin/${rustgdb}"
+ dosym "../../opt/${P}/bin/${rustgdbgui}" "/usr/bin/${rustgdbgui}"
+ dosym "../../opt/${P}/bin/${rustlldb}" "/usr/bin/${rustlldb}"
+
+ local cargo=cargo-bin-${PV}
+ mv "${ED}/opt/${P}/bin/cargo" "${ED}/opt/${P}/bin/${cargo}" || die
+ dosym "${cargo}" "/opt/${P}/bin/cargo"
+ dosym "../../opt/${P}/bin/${cargo}" "/usr/bin/${cargo}"
+
+ if use clippy; then
+ local clippy_driver=clippy-driver-bin-${PV}
+ local cargo_clippy=cargo-clippy-bin-${PV}
+ mv "${ED}/opt/${P}/bin/clippy-driver" "${ED}/opt/${P}/bin/${clippy_driver}" || die
+ mv "${ED}/opt/${P}/bin/cargo-clippy" "${ED}/opt/${P}/bin/${cargo_clippy}" || die
+ dosym "${clippy_driver}" "/opt/${P}/bin/clippy-driver"
+ dosym "${cargo_clippy}" "/opt/${P}/bin/cargo-clippy"
+ dosym "../../opt/${P}/bin/${clippy_driver}" "/usr/bin/${clippy_driver}"
+ dosym "../../opt/${P}/bin/${cargo_clippy}" "/usr/bin/${cargo_clippy}"
+ fi
+ if use rustfmt; then
+ local rustfmt=rustfmt-bin-${PV}
+ local cargo_fmt=cargo-fmt-bin-${PV}
+ mv "${ED}/opt/${P}/bin/rustfmt" "${ED}/opt/${P}/bin/${rustfmt}" || die
+ mv "${ED}/opt/${P}/bin/cargo-fmt" "${ED}/opt/${P}/bin/${cargo_fmt}" || die
+ dosym "${rustfmt}" "/opt/${P}/bin/rustfmt"
+ dosym "${cargo_fmt}" "/opt/${P}/bin/cargo-fmt"
+ dosym "../../opt/${P}/bin/${rustfmt}" "/usr/bin/${rustfmt}"
+ dosym "../../opt/${P}/bin/${cargo_fmt}" "/usr/bin/${cargo_fmt}"
+ fi
+
+ cat <<-EOF > "${T}"/50${P}
+ LDPATH="/opt/${P}/lib"
+ MANPATH="/opt/${P}/man"
+ EOF
+ doenvd "${T}"/50${P}
+
+ # note: eselect-rust adds EROOT to all paths below
+ cat <<-EOF > "${T}/provider-${P}"
+ /usr/bin/rustdoc
+ /usr/bin/rust-gdb
+ /usr/bin/rust-gdbgui
+ /usr/bin/rust-lldb
+ EOF
+ echo /usr/bin/cargo >> "${T}/provider-${P}"
+ if use clippy; then
+ echo /usr/bin/clippy-driver >> "${T}/provider-${P}"
+ echo /usr/bin/cargo-clippy >> "${T}/provider-${P}"
+ fi
+ if use rustfmt; then
+ echo /usr/bin/rustfmt >> "${T}/provider-${P}"
+ echo /usr/bin/cargo-fmt >> "${T}/provider-${P}"
+ fi
+
+ insinto /etc/env.d/rust
+ doins "${T}/provider-${P}"
+}
+
+pkg_postinst() {
+ eselect rust update --if-unset
+
+ elog "Rust installs a helper script for calling GDB now,"
+ elog "for your convenience it is installed under /usr/bin/rust-gdb-bin-${PV},"
+
+ if has_version app-editors/emacs; then
+ elog "install app-emacs/rust-mode to get emacs support for rust."
+ fi
+
+ if has_version app-editors/gvim || has_version app-editors/vim; then
+ elog "install app-vim/rust-vim to get vim support for rust."
+ fi
+
+ if use elibc_musl; then
+ ewarn "${PN} on *-musl targets is configured with crt-static"
+ ewarn ""
+ ewarn "you will need to set RUSTFLAGS=\"-C target-feature=-crt-static\" in make.conf"
+ ewarn "to use it with portage, otherwise you may see failures like"
+ ewarn "error: cannot produce proc-macro for serde_derive v1.0.98 as the target "
+ ewarn "x86_64-unknown-linux-musl does not support these crate types"
+ fi
+}
+
+pkg_postrm() {
+ eselect rust cleanup
+}
diff --git a/dev-lang/rust/Manifest b/dev-lang/rust/Manifest
index c26da6db2c7e..1f07666b244a 100644
--- a/dev-lang/rust/Manifest
+++ b/dev-lang/rust/Manifest
@@ -68,8 +68,23 @@ DIST rust-1.40.0-powerpc64le-unknown-linux-gnu.tar.xz 87972788 BLAKE2B ad1e460db
DIST rust-1.40.0-s390x-unknown-linux-gnu.tar.xz 95398844 BLAKE2B e897ac3e1f46a63c7ad14e0e5229b7028ac325256e084439bcad0ced631eb26d50ca72710c46e59accb0e3d0574d08a9c15455be59a8d78173387d35ddd3bed7 SHA512 e71d3a1d85975653b6d972a4854c9e53be7f2d093a601145261c97f7917f869399fbc6322a04f63b782a5a28b91c3be40041a8c77367d19dec8d0e857cbbef14
DIST rust-1.40.0-x86_64-unknown-linux-gnu.tar.xz 110186516 BLAKE2B ad89d8cecbd565b23c98ec095bad218de971cb4bb89924bbcb012df6c9ecf0db2b50d624abdf6b050fe1f5067aea9311dc01852950a5ca5e993e99f913fc5dbc SHA512 11a2ad1d8b9e91cbe9ee6a1954d46ac75eeaa83f0c2425a8ad70d191727b02e86ead33d6464222effca6f5134c31a165801a854aa57bdb5f12944d605de3c1d1
DIST rust-1.40.0-x86_64-unknown-linux-musl.tar.xz 96869284 BLAKE2B 61cdf2eab51455e377e079e7013959ee51358c9846f8442f81a3240062af573f452a0f5f007e63cbbcdd0db98ac22ab0d4f3006f6ef30327b609d303410cba8c SHA512 3e6d7cf7b24c09d13266e06f20ab317c5ffb68de3242719c71e95c3d778269c4076e06badfb488e8fc223b822246ebbeb888d4168ddf6e2401793e23e77810bb
+DIST rust-1.41.1-aarch64-unknown-linux-gnu.tar.xz 96755608 BLAKE2B f8635737089bb028cfac6d6478c4226a78c2c8a8aa12f28cba267744e2e915e062f49edb505f26b6deaeca0d2fdb4ec4b83e791f87bf1eab6c0536dc41e2c641 SHA512 54eac5c380b418c1714931ead7d6284b225bb427fcc501e147240000b71d31b667e308aea7f38f3299b1311ab04f19011b914d37a4581c7a64028965569cd58e
+DIST rust-1.41.1-arm-unknown-linux-gnueabi.tar.xz 98856136 BLAKE2B dbb3996a9ae302290886bf1cd4642d99a9b3f883f9d39817bb15f105565147e416e23d19e0d08314b08ed441f1ac528c20d8bee27ccef68cb585d8ef64a19e45 SHA512 1b01acd430af3cf99d838aa367dec4f6e4bfcec91388d4a2323cd781d53246edae0f14687b087b73b87c349f243e3acabe193538ce31303f07d59c6a03c31565
+DIST rust-1.41.1-arm-unknown-linux-gnueabihf.tar.xz 99107336 BLAKE2B 0dd84e7ad6081b8fdcfcb2691496ed3a493e08db4757e6d3bb2aa9a36fc6f020772a84bc21d0c60efeecf635512f25737b8d6b49a53020c4045c89c5b89881d7 SHA512 462e6d354a4b3b848781bb059decc5eb1ebb4d8a31651623d076a2654e2c8fd02f0f87ddafb124efa40cb134c9438eb252035c2b5bfdf936881b14a23bfbfe9f
+DIST rust-1.41.1-armv7-unknown-linux-gnueabihf.tar.xz 103399676 BLAKE2B da35342be05e58c11e6f96ab566b6a2f334d6975d4251deb2f41069d4a549ebf58aba43e1f07b99dedf0426ab0a8e8616b32799ca54a5f601d70910deca3efaf SHA512 400bf8d013fe5030243bc0ccb7066ea3d03a2c10727e04b6830ab91dfe9b04f78cfef10794a1c7bb6276fb00c86f1e1c42a74faba19f3125859b3464726d01c2
+DIST rust-1.41.1-i686-unknown-linux-gnu.tar.xz 120834812 BLAKE2B 4615eeb7c63392f66487243743fc57677654e232c786f9f970a9be9996dcb08e265631f6764e09e0444f8bb767b9c76366a26fe8fca9dcc149c81df5c2a3dd18 SHA512 c6d74b2653c537043eb2ea721095ff053def592b4c330bdc104690cfb51d648f515288cc0451743d94260f18a55d6757bcb8eb1e6c0217da3498d08b681ca6af
+DIST rust-1.41.1-mips-unknown-linux-gnu.tar.xz 92620720 BLAKE2B dff1be71d459e0256a19fb88f324e59cbf2e10fda693157802a63a08329c7dd4feca4b260510b3a1d6afb4afc9ed9dc549b741f598f3aedf50a982810d0bd140 SHA512 4fdca72b98a4fd25a2ddf33e0f31d9549c39fae9dfad6f1648556f144f82cfb2a487f6777d61476ad18bb0a0ac63810b99bb09a18719ec5344e89fccb16ac693
+DIST rust-1.41.1-mips64-unknown-linux-gnuabi64.tar.xz 96215100 BLAKE2B c52d564010d56df01bac6b2f447d56c00855c52ed8ebe6a2ac1b7786e8c73a1d529be7e7d5a4f7b427892494782aadcc4c8cc54157287d43f58938b0a57486c6 SHA512 2ed84ade11c6f4961e83e06a61d998a7abc9165cc384cc69470658e8244dc399e30c3f983a9f11b0bf88032d855bc47fe6d71f5db95cc7168e6f810c69095633
+DIST rust-1.41.1-mipsel-unknown-linux-gnu.tar.xz 93365592 BLAKE2B cd0d16f99a0976076530fa601f9bfeb61e1204bc278f78db015bc8d1629ce8f19da61a12573fdf9cf0d3d29e56f6915338aeaea3ef4d9b374eeb4095189fe71c SHA512 a0b7cc55ffeb0911d1d82d93cf2f4ea2a683ee76a783952b2f42c0b3c3d02b2bfc7df6f5762af91e6d02963e22a08ba26f143f594dfd6d41ad8198f7e8a862c0
+DIST rust-1.41.1-powerpc-unknown-linux-gnu.tar.xz 98530136 BLAKE2B 41399fcc9f1d88cc5a6fe0651012e4ebd1addde428c22611c30918a09ddad3640fb326bf48f94e5d12a610d2709eecf95c5d023f10bc6636eb6de1808a104e48 SHA512 545b2a4459bbfa7049755cbb63ad6e2917bf03cb9568eccbf3b01ea8f846263fbdc97ad29b42c440fa92dd9737b398196c1cdaf96c9716bba2f9e1d4a3a20125
+DIST rust-1.41.1-powerpc64-unknown-linux-gnu.tar.xz 104058752 BLAKE2B 10b3e3e4970fc05952f83e80e7d133d308045bdd3342199e885d2e6add113ada7959a93010046f48b1fedfe85f0346793fc54e0bf0c55d096f82622e198a928c SHA512 50367685783085cc384be944d4321dfde850f3a0e94de0625a08f17160af2c0b795276f96574d1bea84092cbc1cd3cde619d97fe2e37b07ead17f49164e1c995
+DIST rust-1.41.1-powerpc64le-unknown-linux-gnu.tar.xz 110594504 BLAKE2B eaf9c92ea9599314d12c5f9d0b654b523ceb8f40cc779cdbc2d50b4b07e0a37cd42d34000f0ace9c19154a1bd17110c097e30ee2b617f3a29de4966bb9303301 SHA512 1b2bf6d35321dd0a0fc9735005317f09f8b9a81b520612484530e29156ea254d5cada583e44f7e4a840edde09d70c34f7ead1208d8aa6037c652540dfa38cede
+DIST rust-1.41.1-s390x-unknown-linux-gnu.tar.xz 114814112 BLAKE2B ef22c377e1d89ef4ebe78df19d91bcf042e2e1d8997be80d7d40998b18f6b44f8bb1232b1f72e42e3ffb6d1ff235f3cd2f04854e996bbf7be8f6d5d7299e8514 SHA512 f809adc626876df5c6e050362d59189ede5e3991ac41fd129922540abeb728f618e1a3f3925cee34895de5e037141aabb1f8c2b94d4069945d174e38446e8153
+DIST rust-1.41.1-x86_64-unknown-linux-gnu.tar.xz 111202140 BLAKE2B 226c68b1e97cc9be82e81f6c9e065e08514166a65a57159c2f63527063ae5f514650afc2591e0c4854ecd0239dc82cbc9a97b99412608645aca879a71354d857 SHA512 c75d4a18cf9300c6ab480d34c5e4b41be971535931455239330cb2a0e927bcf9cf102498cad5dd1d5d802fd1d9c9d214b80e8ff15aa6be68d3e7f41420cad666
+DIST rust-1.41.1-x86_64-unknown-linux-musl.tar.xz 96076684 BLAKE2B 3672e24a83c1e4c97a0844f9522a9fced19d5ef01c89d44e54bba8683514a86f7a14ea2e8c2f28d03c65b7e2e0358ff3cea2f85de1e69eb5334c55e18a8c8e4f SHA512 29e7b2aae35017d7f4313e0a482712390ffec752e62d8b1bda95d56a1f93ba882a8f610b469b5d2d7fa3d6d35c2cdc4e45d219ad85b8a3f71ba6ce04b1add48b
DIST rustc-1.37.0-src.tar.xz 98654252 BLAKE2B ddee92c7959a0e1ee11ffe5ded6017703cfac7bbf2a00dc46c37ed28f1cd1d31e1d5b62cc1a5ae2d55d64f8705d0cb282f4968deddf36c3152e5e0cfdfbea67d SHA512 bfee43f578e6d44ead950b870b9fd31087e1bd3f917611f5dce7ad56504b83185edf43e297e8d1304e9e97b9a580d1e6adf6608ab8ed6dee0dc8c5153cdbc5d4
DIST rustc-1.38.0-src.tar.xz 96163304 BLAKE2B 1e900b44db64727477ccf8e58e0ebb9ec209bbeb349816b5f7937e58c165db8befae33c5667732e5aaaa677c5a6c1e0229d9969ab8967fda9b8d7a593e6c5eb6 SHA512 b756d29a7a222bc7b5c7f42ff397346ab840f78e559f93e6e36b65e76eea525cf429899fe4de9fb8966623a2225b552feef9fa831bee50f9e25c976fa2af8c0a
DIST rustc-1.39.0-src.tar.xz 96495140 BLAKE2B 6df6bf0c3b38c28753713acdc477ea6929740c32893171dd9b8620992439e45730ef6f9489a6fc411ff5884c661ac4c07b7b93f5a4174207ed53351d2dea09bf SHA512 8610b2ec77722087c572bd84ac562a5b7c5f1a644aea58c5d5daa07a9aed242703b7816e73e2eaa049f773d5907859e259744a0de700622df005584fd798dab0
DIST rustc-1.40.0-src.tar.xz 92306352 BLAKE2B 762b9592414e5c816540f6fd37d07b3b0ffe97a151968cc8ae77be2fda03a6d66905192985edc65055cc7811dbd90faa2b2c056481f72161c6f7ccbcce13671a SHA512 b5ac3079acefb62d3c985b77f624d7fb68de23a59396fed9ccb292db61641c064f3146ee54d3cf59067b17ebfaadd14a6b2b466def60316bb5b13ba3aef01e1f
DIST rustc-1.41.1-src.tar.xz 93754192 BLAKE2B 235ece650d0c75e1c8700ce73d3811997cd0d827b850a6dd435a269f3f86d85849d54755ea346c5ddcbe0d1224836fd78213f6abeab4a9a8c4c3e2d8a05ff7b4 SHA512 ef33565c9cf4e27ca279072bfed3301e0276c09407d49727640746ba78d289de285278d64b1cce8708461fd6c97c7ab2ea8d56e7a4c4a23b2e66e2d164c35fc9
+DIST rustc-1.42.0-src.tar.xz 94186592 BLAKE2B 82298ef3da44188546bb945bcbfc1af630e6a4466b643667da08a04a33c6417afd68fc86302bdd22ab36c208fdb13cbc479e762d1217c05507bbfeb13bfbef7e SHA512 589bfdc92deedd33b8ea0df7f7c64c2a9a085fbea64936eff92f81e812309c060ed7a7adc96f6010d7adf62a68434a230da0f6c5b3540df4e0a5c6de05a31b16
diff --git a/dev-lang/rust/metadata.xml b/dev-lang/rust/metadata.xml
index 70279a4bbfdf..0d0d683b8b44 100644
--- a/dev-lang/rust/metadata.xml
+++ b/dev-lang/rust/metadata.xml
@@ -11,12 +11,13 @@
diff --git a/dev-lang/rust/rust-1.42.0.ebuild b/dev-lang/rust/rust-1.42.0.ebuild
new file mode 100644
index 000000000000..89ac74e33319
--- /dev/null
+++ b/dev-lang/rust/rust-1.42.0.ebuild
@@ -0,0 +1,383 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit bash-completion-r1 check-reqs estack flag-o-matic llvm multiprocessing multilib-build python-any-r1 rust-toolchain toolchain-funcs
+
+if [[ ${PV} = *beta* ]]; then
+ betaver=${PV//*beta}
+ BETA_SNAPSHOT="${betaver:0:4}-${betaver:4:2}-${betaver:6:2}"
+ MY_P="rustc-beta"
+ SLOT="beta/${PV}"
+ SRC="${BETA_SNAPSHOT}/rustc-beta-src.tar.xz"
+else
+ ABI_VER="$(ver_cut 1-2)"
+ SLOT="stable/${ABI_VER}"
+ MY_P="rustc-${PV}"
+ SRC="${MY_P}-src.tar.xz"
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+fi
+
+RUST_STAGE0_VERSION="1.$(($(ver_cut 2) - 1)).1"
+
+DESCRIPTION="Systems programming language from Mozilla"
+HOMEPAGE="https://www.rust-lang.org/"
+
+SRC_URI="
+ https://static.rust-lang.org/dist/${SRC} -> rustc-${PV}-src.tar.xz
+ !system-bootstrap? ( $(rust_all_arch_uris rust-${RUST_STAGE0_VERSION}) )
+"
+
+ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430
+ NVPTX PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore )
+ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
+LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?}
+
+LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
+
+IUSE="clippy cpu_flags_x86_sse2 debug doc libressl miri nightly parallel-compiler rls rustfmt system-bootstrap system-llvm wasm ${ALL_LLVM_TARGETS[*]}"
+
+# Please keep the LLVM dependency block separate. Since LLVM is slotted,
+# we need to *really* make sure we're not pulling more than one slot
+# simultaneously.
+
+# How to use it:
+# 1. List all the working slots (with min versions) in ||, newest first.
+# 2. Update the := to specify *max* version, e.g. < 10.
+# 3. Specify LLVM_MAX_SLOT, e.g. 9.
+LLVM_DEPEND="
+ || (
+ sys-devel/llvm:9[${LLVM_TARGET_USEDEPS// /,}]
+ wasm? ( =sys-devel/lld-9* )
+ )
+ =dev-lang/rust-1.$(($(ver_cut 2) - 1)).0-r1 >=dev-lang/rust-bin-1.$(($(ver_cut 2) - 1)) )"
+
+COMMON_DEPEND="
+ net-libs/libssh2:=
+ net-libs/http-parser:=
+ net-misc/curl:=[ssl]
+ sys-libs/zlib:=
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )
+ elibc_musl? ( sys-libs/libunwind )
+ system-llvm? (
+ ${LLVM_DEPEND}
+ )
+"
+
+DEPEND="${COMMON_DEPEND}
+ ${PYTHON_DEPS}
+ || (
+ >=sys-devel/gcc-4.7
+ >=sys-devel/clang-3.5
+ )
+ system-bootstrap? ( ${BOOTSTRAP_DEPEND} )
+ !system-llvm? (
+ dev-util/cmake
+ dev-util/ninja
+ )
+"
+
+RDEPEND="${COMMON_DEPEND}
+ >=app-eselect/eselect-rust-20190311
+"
+
+REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )
+ miri? ( nightly )
+ parallel-compiler? ( nightly )
+ wasm? ( llvm_targets_WebAssembly )
+ x86? ( cpu_flags_x86_sse2 )
+"
+
+QA_FLAGS_IGNORED="
+ usr/bin/.*-${PV}
+ usr/lib.*/lib.*.so
+ usr/lib/rustlib/.*/codegen-backends/librustc_codegen_llvm-llvm.so
+ usr/lib/rustlib/.*/lib/lib.*.so
+"
+
+QA_SONAME="usr/lib.*/librustc_macros.*.so"
+
+PATCHES=(
+ "${FILESDIR}"/1.40.0-add-soname.patch
+)
+
+S="${WORKDIR}/${MY_P}-src"
+
+toml_usex() {
+ usex "$1" true false
+}
+
+pre_build_checks() {
+ CHECKREQS_DISK_BUILD="9G"
+ eshopts_push -s extglob
+ if is-flagq '-g?(gdb)?([1-9])'; then
+ CHECKREQS_DISK_BUILD="15G"
+ fi
+ eshopts_pop
+ check-reqs_pkg_setup
+}
+
+pkg_pretend() {
+ pre_build_checks
+}
+
+pkg_setup() {
+ pre_build_checks
+ python-any-r1_pkg_setup
+
+ # use bundled for now, #707746
+ # will need dev-libs/libgit2 slotted dep if re-enabled
+ #export LIBGIT2_SYS_USE_PKG_CONFIG=1
+ export LIBSSH2_SYS_USE_PKG_CONFIG=1
+ export PKG_CONFIG_ALLOW_CROSS=1
+
+ if use system-llvm; then
+ llvm_pkg_setup
+
+ local llvm_config="$(get_llvm_prefix "$LLVM_MAX_SLOT")/bin/llvm-config"
+
+ export LLVM_LINK_SHARED=1
+ export RUSTFLAGS="${RUSTFLAGS} -Lnative=$("${llvm_config}" --libdir)"
+ fi
+}
+
+src_prepare() {
+ if ! use system-bootstrap; then
+ local rust_stage0_root="${WORKDIR}"/rust-stage0
+ local rust_stage0="rust-${RUST_STAGE0_VERSION}-$(rust_abi)"
+
+ "${WORKDIR}/${rust_stage0}"/install.sh --disable-ldconfig \
+ --destdir="${rust_stage0_root}" --prefix=/ || die
+ fi
+
+ default
+}
+
+src_configure() {
+ local rust_target="" rust_targets="" arch_cflags
+
+ # Collect rust target names to compile standard libs for all ABIs.
+ for v in $(multilib_get_enabled_abi_pairs); do
+ rust_targets="${rust_targets},\"$(rust_abi $(get_abi_CHOST ${v##*.}))\""
+ done
+ if use wasm; then
+ rust_targets="${rust_targets},\"wasm32-unknown-unknown\""
+ fi
+ rust_targets="${rust_targets#,}"
+
+ local extended="true" tools="\"cargo\","
+ if use clippy; then
+ tools="\"clippy\",$tools"
+ fi
+ if use miri; then
+ tools="\"miri\",$tools"
+ fi
+ if use rls; then
+ tools="\"rls\",\"analysis\",\"src\",$tools"
+ fi
+ if use rustfmt; then
+ tools="\"rustfmt\",$tools"
+ fi
+
+ local rust_stage0_root
+ if use system-bootstrap; then
+ rust_stage0_root="$(rustc --print sysroot)"
+ else
+ rust_stage0_root="${WORKDIR}"/rust-stage0
+ fi
+
+ rust_target="$(rust_abi)"
+
+ cat <<- EOF > "${S}"/config.toml
+ [llvm]
+ optimize = $(toml_usex !debug)
+ release-debuginfo = $(toml_usex debug)
+ assertions = $(toml_usex debug)
+ targets = "${LLVM_TARGETS// /;}"
+ experimental-targets = ""
+ link-shared = $(toml_usex system-llvm)
+ [build]
+ build = "${rust_target}"
+ host = ["${rust_target}"]
+ target = [${rust_targets}]
+ cargo = "${rust_stage0_root}/bin/cargo"
+ rustc = "${rust_stage0_root}/bin/rustc"
+ docs = $(toml_usex doc)
+ compiler-docs = $(toml_usex doc)
+ submodules = false
+ python = "${EPYTHON}"
+ locked-deps = true
+ vendor = true
+ extended = ${extended}
+ tools = [${tools}]
+ verbose = 2
+ [install]
+ prefix = "${EPREFIX}/usr"
+ libdir = "lib"
+ docdir = "share/doc/${PF}"
+ mandir = "share/man"
+ [rust]
+ optimize = true
+ debug = $(toml_usex debug)
+ debug-assertions = $(toml_usex debug)
+ default-linker = "$(tc-getCC)"
+ parallel-compiler = $(toml_usex parallel-compiler)
+ channel = "$(usex nightly nightly stable)"
+ rpath = false
+ lld = $(usex system-llvm false $(toml_usex wasm))
+ backtrace-on-ice = true
+ [dist]
+ src-tarball = false
+ EOF
+
+ for v in $(multilib_get_enabled_abi_pairs); do
+ rust_target=$(rust_abi $(get_abi_CHOST ${v##*.}))
+ arch_cflags="$(get_abi_CFLAGS ${v##*.})"
+
+ cat <<- EOF >> "${S}"/config.env
+ CFLAGS_${rust_target}=${arch_cflags}
+ EOF
+
+ cat <<- EOF >> "${S}"/config.toml
+ [target.${rust_target}]
+ cc = "$(tc-getBUILD_CC)"
+ cxx = "$(tc-getBUILD_CXX)"
+ linker = "$(tc-getCC)"
+ ar = "$(tc-getAR)"
+ EOF
+ # librustc_target/spec/linux_musl_base.rs sets base.crt_static_default = true;
+ if use elibc_musl; then
+ cat <<- EOF >> "${S}"/config.toml
+ crt-static = false
+ EOF
+ fi
+ if use system-llvm; then
+ cat <<- EOF >> "${S}"/config.toml
+ llvm-config = "$(get_llvm_prefix "${LLVM_MAX_SLOT}")/bin/llvm-config"
+ EOF
+ fi
+ done
+
+ if use wasm; then
+ cat <<- EOF >> "${S}"/config.toml
+ [target.wasm32-unknown-unknown]
+ linker = "$(usex system-llvm lld rust-lld)"
+ EOF
+ fi
+
+ einfo "Rust configured with the following settings:"
+ cat "${S}"/config.toml || die
+}
+
+src_compile() {
+ env $(cat "${S}"/config.env)\
+ "${EPYTHON}" ./x.py build -vv --config="${S}"/config.toml -j$(makeopts_jobs) || die
+}
+
+src_install() {
+ env $(cat "${S}"/config.env) DESTDIR="${D}" \
+ "${EPYTHON}" ./x.py install -vv --config="${S}"/config.toml || die
+
+ # bug #689562, #689160
+ rm "${D}/etc/bash_completion.d/cargo" || die
+ rmdir "${D}"/etc{/bash_completion.d,} || die
+ dobashcomp build/tmp/dist/cargo-image/etc/bash_completion.d/cargo
+
+ mv "${ED}/usr/bin/rustc" "${ED}/usr/bin/rustc-${PV}" || die
+ mv "${ED}/usr/bin/rustdoc" "${ED}/usr/bin/rustdoc-${PV}" || die
+ mv "${ED}/usr/bin/rust-gdb" "${ED}/usr/bin/rust-gdb-${PV}" || die
+ mv "${ED}/usr/bin/rust-gdbgui" "${ED}/usr/bin/rust-gdbgui-${PV}" || die
+ mv "${ED}/usr/bin/rust-lldb" "${ED}/usr/bin/rust-lldb-${PV}" || die
+ mv "${ED}/usr/bin/cargo" "${ED}/usr/bin/cargo-${PV}" || die
+ if use clippy; then
+ mv "${ED}/usr/bin/clippy-driver" "${ED}/usr/bin/clippy-driver-${PV}" || die
+ mv "${ED}/usr/bin/cargo-clippy" "${ED}/usr/bin/cargo-clippy-${PV}" || die
+ fi
+ if use miri; then
+ mv "${ED}/usr/bin/miri" "${ED}/usr/bin/miri-${PV}" || die
+ mv "${ED}/usr/bin/cargo-miri" "${ED}/usr/bin/cargo-miri-${PV}" || die
+ fi
+ if use rls; then
+ mv "${ED}/usr/bin/rls" "${ED}/usr/bin/rls-${PV}" || die
+ fi
+ if use rustfmt; then
+ mv "${ED}/usr/bin/rustfmt" "${ED}/usr/bin/rustfmt-${PV}" || die
+ mv "${ED}/usr/bin/cargo-fmt" "${ED}/usr/bin/cargo-fmt-${PV}" || die
+ fi
+
+ # Move public shared libs to abi specific libdir
+ # Private and target specific libs MUST stay in /usr/lib/rustlib/${rust_target}/lib
+ if [[ $(get_libdir) != lib ]]; then
+ dodir /usr/$(get_libdir)
+ mv "${ED}/usr/lib"/*.so "${ED}/usr/$(get_libdir)/" || die
+ fi
+
+ dodoc COPYRIGHT
+
+ # note: eselect-rust adds EROOT to all paths below
+ cat <<-EOF > "${T}/provider-${P}"
+ /usr/bin/rustdoc
+ /usr/bin/rust-gdb
+ /usr/bin/rust-gdbgui
+ /usr/bin/rust-lldb
+ EOF
+ echo /usr/bin/cargo >> "${T}/provider-${P}"
+ if use clippy; then
+ echo /usr/bin/clippy-driver >> "${T}/provider-${P}"
+ echo /usr/bin/cargo-clippy >> "${T}/provider-${P}"
+ fi
+ if use miri; then
+ echo /usr/bin/miri >> "${T}/provider-${P}"
+ echo /usr/bin/cargo-miri >> "${T}/provider-${P}"
+ fi
+ if use rls; then
+ echo /usr/bin/rls >> "${T}/provider-${P}"
+ fi
+ if use rustfmt; then
+ echo /usr/bin/rustfmt >> "${T}/provider-${P}"
+ echo /usr/bin/cargo-fmt >> "${T}/provider-${P}"
+ fi
+
+ insinto /etc/env.d/rust
+ doins "${T}/provider-${P}"
+}
+
+pkg_postinst() {
+ eselect rust update --if-unset
+
+ elog "Rust installs a helper script for calling GDB and LLDB,"
+ elog "for your convenience it is installed under /usr/bin/rust-{gdb,lldb}-${PV}."
+
+ ewarn "cargo is now installed from dev-lang/rust{,-bin} instead of dev-util/cargo."
+ ewarn "This might have resulted in a dangling symlink for /usr/bin/cargo on some"
+ ewarn "systems. This can be resolved by calling 'sudo eselect rust set ${P}'."
+
+ if has_version app-editors/emacs; then
+ elog "install app-emacs/rust-mode to get emacs support for rust."
+ fi
+
+ if has_version app-editors/gvim || has_version app-editors/vim; then
+ elog "install app-vim/rust-vim to get vim support for rust."
+ fi
+
+ if use elibc_musl; then
+ ewarn "${PN} on *-musl targets is configured with crt-static"
+ ewarn ""
+ ewarn "you will need to set RUSTFLAGS=\"-C target-feature=-crt-static\" in make.conf"
+ ewarn "to use it with portage, otherwise you may see failures like"
+ ewarn "error: cannot produce proc-macro for serde_derive v1.0.98 as the target "
+ ewarn "x86_64-unknown-linux-musl does not support these crate types"
+ fi
+}
+
+pkg_postrm() {
+ eselect rust cleanup
+}
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 56a52f28858c..a960e0b00319 100644
Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ
diff --git a/dev-libs/grantlee/Manifest b/dev-libs/grantlee/Manifest
index d0d20f2b0388..d56c4763280d 100644
--- a/dev-libs/grantlee/Manifest
+++ b/dev-libs/grantlee/Manifest
@@ -1,2 +1 @@
-DIST grantlee-5.1.0.tar.gz 1175380 BLAKE2B 6468c0131a334c3ac52b841a64171093a41605686e4ec2af1a60bbb829f652d388fb48e501a0c1f5eef54ff3253c10b0d6ebd5a4439ed2852f8746188011f9e4 SHA512 2b806a0770b9c6d02f207d5b4939ae8cae325de4fa01901320ffef5c8442ef0f1c10dd799966d0bf0d223e6541f93db8568aaf922ea1b334bcb2f85f6373a936
DIST grantlee-5.2.0.tar.gz 1166467 BLAKE2B 89f66fefe3c5bbd087cdaed0f83a6b9ca2456629465dfd68d32c6f316d6d4533ece09e5a1444833897c70abbeb8258e0ca9faba09388dcbf40245c04f72f5040 SHA512 94b53d103aa775e6d45357d44d5634a5214d12ea7178d251fda30c5a88ddc2682ae44501ee8b7dc475793b84fa0998eb0bc13eea3f2e10ab29b1489db6ea60bd
diff --git a/dev-libs/grantlee/files/grantlee-5.1.0-cxx11.patch b/dev-libs/grantlee/files/grantlee-5.1.0-cxx11.patch
deleted file mode 100644
index d049d6c96f81..000000000000
--- a/dev-libs/grantlee/files/grantlee-5.1.0-cxx11.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 3a5fc7662da3261be6496611900c095844e56ab1 Mon Sep 17 00:00:00 2001
-From: Albert Astals Cid
-Date: Sat, 20 Jul 2019 17:35:30 +0200
-Subject: [PATCH] Fix compile with newer Qt/cmake combination
-
-Without this i get huge errors about Qt needing C++11 support
----
- CMakeLists.txt | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 6d51110..0859788 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -11,6 +11,9 @@ endif()
-
- project(Grantlee)
-
-+set (CMAKE_CXX_STANDARD 11)
-+set (CMAKE_CXX_EXTENSIONS OFF)
-+
- # Workaround for http://public.kitware.com/Bug/view.php?id=12301
- if (MINGW)
- if(NOT CMAKE_BUILD_TYPE)
diff --git a/dev-libs/grantlee/files/grantlee-5.1.0-qt-5.13.patch b/dev-libs/grantlee/files/grantlee-5.1.0-qt-5.13.patch
deleted file mode 100644
index 67a92c1f869b..000000000000
--- a/dev-libs/grantlee/files/grantlee-5.1.0-qt-5.13.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 0cee029ee03ab4906c6d19b57458b5036852b0f8 Mon Sep 17 00:00:00 2001
-From: Michael Pyne
-Date: Tue, 18 Dec 2018 17:47:21 -0500
-Subject: [PATCH] Fix build with Qt 5.13 / GCC 8.2.
-
-At this point Grantlee doesn't build for me because QList is an
-incomplete type. I think the compiler is right to complain, so I fix by
-including the appropriate header.
-
-Fixes issue #47.
----
- templates/lib/lexer_p.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/templates/lib/lexer_p.h b/templates/lib/lexer_p.h
-index 275aeea..1ae451a 100644
---- a/templates/lib/lexer_p.h
-+++ b/templates/lib/lexer_p.h
-@@ -24,7 +24,7 @@
- #include "textprocessingmachine_p.h"
- #include "token.h"
-
--template class QList;
-+#include
-
- namespace Grantlee
- {
diff --git a/dev-libs/grantlee/files/grantlee-5.1.0-slot.patch b/dev-libs/grantlee/files/grantlee-5.1.0-slot.patch
deleted file mode 100644
index 5b0d61d5c1eb..000000000000
--- a/dev-libs/grantlee/files/grantlee-5.1.0-slot.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Install headers to a custom location to permit slotting with Qt4 version.
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 1324566..f98d5da 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -100,7 +100,7 @@ set (LIB_SUFFIX "" CACHE STRING "Define suffix of library directory name (eg. '6
- set( LIB_INSTALL_DIR lib${LIB_SUFFIX} )
- set( PLUGIN_INSTALL_DIR ${LIB_INSTALL_DIR}/grantlee/${Grantlee5_MAJOR_MINOR_VERSION_STRING} )
- set( BIN_INSTALL_DIR bin )
--set( INCLUDE_INSTALL_DIR include )
-+set( INCLUDE_INSTALL_DIR include/grantlee5 )
- set( DATA_INSTALL_DIR share/apps )
-
- # set up RPATH/install_name_dir
-diff --git a/templates/lib/CMakeLists.txt b/templates/lib/CMakeLists.txt
-index dad2ef8..434d163 100644
---- a/templates/lib/CMakeLists.txt
-+++ b/templates/lib/CMakeLists.txt
-@@ -107,6 +107,7 @@ if (Qt5Script_FOUND)
-
- target_sources(Grantlee_Templates PRIVATE ${scriptabletags_SRCS})
- target_include_directories(Grantlee_Templates PRIVATE ../scriptabletags)
-+ target_include_directories(Grantlee_Templates INTERFACE "$")
- target_link_libraries(Grantlee_Templates
- LINK_PRIVATE Qt5::Script
- )
-diff --git a/textdocument/lib/CMakeLists.txt b/textdocument/lib/CMakeLists.txt
-index 557d262..d2dbaa1 100644
---- a/textdocument/lib/CMakeLists.txt
-+++ b/textdocument/lib/CMakeLists.txt
-@@ -42,6 +42,7 @@ if (CMAKE_GENERATOR MATCHES "Visual Studio")
- )
- endforeach()
- endif()
-+target_include_directories(Grantlee_TextDocument INTERFACE "$")
-
- target_link_libraries(Grantlee_TextDocument
- LINK_PUBLIC Qt5::Gui
diff --git a/dev-libs/grantlee/grantlee-5.1.0.ebuild b/dev-libs/grantlee/grantlee-5.1.0.ebuild
deleted file mode 100644
index 8bcda9a613cb..000000000000
--- a/dev-libs/grantlee/grantlee-5.1.0.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-VIRTUALX_REQUIRED="test"
-inherit cmake-utils virtualx
-
-DESCRIPTION="C++ string template engine based on the Django template system"
-HOMEPAGE="https://github.com/steveire/grantlee"
-SRC_URI="http://downloads.grantlee.org/${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
-IUSE="debug doc test"
-
-BDEPEND="
- doc? ( app-doc/doxygen[dot] )
-"
-RDEPEND="
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtscript:5
-"
-DEPEND="${RDEPEND}
- test? ( dev-qt/qttest:5 )
-"
-
-# bug 682258
-RESTRICT="test"
-
-PATCHES=(
- "${FILESDIR}/${PN}-0.3.0-nonfatal-warnings.patch"
- "${FILESDIR}/${P}-slot.patch"
- "${FILESDIR}/${P}-qt-5.13.patch"
- "${FILESDIR}/${P}-cxx11.patch"
-)
-
-src_prepare() {
- cmake-utils_src_prepare
- sed -e '/testfilters/d' \
- -i templates/tests/CMakeLists.txt || die # bug 661900
-}
-
-src_configure() {
- local mycmakeargs=(
- -DBUILD_TESTS=$(usex test)
- )
-
- cmake-utils_src_configure
-}
-
-src_compile() {
- cmake-utils_src_compile
-
- use doc && cmake-utils_src_compile docs
-}
-
-src_test() {
- virtx cmake-utils_src_test
-}
-
-src_install() {
- use doc && HTML_DOCS=("${BUILD_DIR}/apidox/")
-
- cmake-utils_src_install
-}
diff --git a/dev-libs/grantlee/grantlee-5.2.0.ebuild b/dev-libs/grantlee/grantlee-5.2.0.ebuild
index 94df8e673a61..677164dc81ea 100644
--- a/dev-libs/grantlee/grantlee-5.2.0.ebuild
+++ b/dev-libs/grantlee/grantlee-5.2.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://downloads.grantlee.org/${P}.tar.gz"
LICENSE="LGPL-2.1+"
SLOT="5"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
IUSE="debug doc test"
BDEPEND="
diff --git a/dev-libs/libinput/Manifest b/dev-libs/libinput/Manifest
index 511eed6d257d..c06d6ff256e3 100644
--- a/dev-libs/libinput/Manifest
+++ b/dev-libs/libinput/Manifest
@@ -1,2 +1,3 @@
DIST libinput-1.15.2.tar.xz 580624 BLAKE2B a13bf121b12c58d904f3505fe2fa60ea32eee78a057ac1fe9e64d3017fa840bb92af053f472d2b163d46a958f2a3a5039154efbb9558eddabda3b2422cafb2ca SHA512 f6b50dbdf6ee6b65f88e020c4292c94c3178125d58629f27c2e52f92b658ccd67e0c5604fbf0b303621ff0386637ce1e291daaa991761d4145e8bcda4dd128a2
DIST libinput-1.15.3.tar.xz 580408 BLAKE2B d5d462f81303e408f295fbc958609363ec9e3f4eb20494aa8fa977a458283619f321309f88167c70069ac7bd07dc782d948e9a75583ae6e930524f63dad5cafe SHA512 6636fd618e2b9cfa5ee44701207dc98f2639adc53eb3ef135509d936fb19b2cedf5184eab58e887798d9cf8ee65f35bc9062f7e3630080bcbe45a90a8b631ef2
+DIST libinput-1.15.4.tar.xz 580616 BLAKE2B cac324f08b8dc3c6cc18ca62d528c3a00fbd70a1d434aa171da2e144d8d74f961bcb491f6dc39b365f766ea8e5ed87b29b1dd5aa9f62b12707f8e49e5c63a5d7 SHA512 4659818952dc729cd5bdb78ebe21edbbacbf8a66a592b13ba30f3bb4c4e264208ec94440a253cfa4edc8b2ef904954eecea6be0f8d63cf239e3858d3abb64a80
diff --git a/dev-libs/libinput/libinput-1.15.4.ebuild b/dev-libs/libinput/libinput-1.15.4.ebuild
new file mode 100644
index 000000000000..7ae9b0b06559
--- /dev/null
+++ b/dev-libs/libinput/libinput-1.15.4.ebuild
@@ -0,0 +1,83 @@
+# Copyright 2014-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit meson python-any-r1 udev
+
+DESCRIPTION="Library to handle input devices in Wayland"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/libinput/ https://gitlab.freedesktop.org/libinput/libinput"
+SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0/10"
+[[ "$(ver_cut 3)" -gt 900 ]] || \
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="doc input_devices_wacom test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+ virtual/pkgconfig
+ doc? (
+ $(python_gen_any_dep '
+ dev-python/commonmark[${PYTHON_USEDEP}]
+ dev-python/recommonmark[${PYTHON_USEDEP}]
+ dev-python/sphinx[${PYTHON_USEDEP}]
+ >=dev-python/sphinx_rtd_theme-0.2.4[${PYTHON_USEDEP}]
+ ')
+ >=app-doc/doxygen-1.8.3
+ >=media-gfx/graphviz-2.38.0
+ )
+"
+# test? ( dev-util/valgrind )
+RDEPEND="
+ input_devices_wacom? ( >=dev-libs/libwacom-0.20 )
+ >=dev-libs/libevdev-1.3
+ >=sys-libs/mtdev-1.1
+ virtual/libudev:=
+ virtual/udev
+"
+DEPEND="${RDEPEND}
+ test? ( >=dev-libs/check-0.9.10 )"
+
+python_check_deps() {
+ has_version "dev-python/commonmark[${PYTHON_USEDEP}]" && \
+ has_version "dev-python/recommonmark[${PYTHON_USEDEP}]" && \
+ has_version "dev-python/sphinx[${PYTHON_USEDEP}]" && \
+ has_version ">=dev-python/sphinx_rtd_theme-0.2.4[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+ use doc && python-any-r1_pkg_setup
+}
+
+src_configure() {
+ # gui can be built but will not be installed
+ local emesonargs=(
+ -Ddebug-gui=false
+ $(meson_use doc documentation)
+ $(meson_use input_devices_wacom libwacom)
+ $(meson_use test tests)
+ -Dudev-dir="${EPREFIX}$(get_udevdir)"
+ )
+ meson_src_configure
+}
+
+src_install() {
+ meson_src_install
+ if use doc ; then
+ docinto html
+ dodoc -r "${BUILD_DIR}"/Documentation/.
+ fi
+}
+
+pkg_postinst() {
+ pkgname="dev-python/python-libevdev"
+ if [[ -z "${REPLACING_VERSIONS}" ]] && ! has_version "${pkgname}"; then
+ einfo "${pkgname} must be installed to use the"
+ einfo "libinput measure and libinput replay tools."
+ fi
+
+ udevadm hwdb --update --root="${ROOT}"
+}
diff --git a/dev-libs/libreport/Manifest b/dev-libs/libreport/Manifest
index 1c1906dd4cae..1c28bd0fb52d 100644
--- a/dev-libs/libreport/Manifest
+++ b/dev-libs/libreport/Manifest
@@ -1 +1,2 @@
DIST libreport-2.10.0.tar.gz 2278084 BLAKE2B 95ac1fbf32e6e021e9553b35b10f9e46b7ea2e9cc6f21e53eb39a32a5261f7a6e49b2172381fdea30341fcc4311928691e68749a8bb5c41a4bf709151935687a SHA512 978ea442d82b75abf80b2075f540cb05c5577387a9221f2070c9695c4546d36169738d223f5e903d0b774b7e1566a6111c55a6bb51a0822ad1676095f067c45b
+DIST libreport-2.12.0.tar.gz 1842875 BLAKE2B 930666ec0c675a8ff457412a80511652dfa3bd3d771115506370432a7b74f3d1d9f6264dc3696c582b4a0939b2493137a18e1379eca268f25bc787a03a7d6c39 SHA512 d85c1beea330e4b21ce66b6f4acadaa132010738496a6701d161ee75b2254e629c496270145a6167e8eb81cf2204b0488aa0eb15c1e898f49aa3aec1331bff0c
diff --git a/dev-libs/libreport/libreport-2.12.0.ebuild b/dev-libs/libreport/libreport-2.12.0.ebuild
new file mode 100644
index 000000000000..7be927077753
--- /dev/null
+++ b/dev-libs/libreport/libreport-2.12.0.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit autotools python-r1
+
+DESCRIPTION="Generic library for reporting software bugs"
+HOMEPAGE="https://github.com/abrt/libreport"
+SRC_URI="https://github.com/abrt/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="gtk +python"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+ app-admin/augeas
+ >=dev-libs/glib-2.43.4:2
+ dev-libs/satyr:0=
+ dev-libs/json-c:=
+ dev-libs/libtar
+ dev-libs/libxml2:2
+ dev-libs/nettle:=
+ dev-libs/newt:=
+ dev-libs/xmlrpc-c:=
+ net-libs/libproxy:=
+ net-misc/curl:=[ssl]
+ sys-apps/dbus
+ sys-apps/systemd
+ gtk? ( >=x11-libs/gtk+-3.3.12:3 )
+ python? ( ${PYTHON_DEPS} )
+ x11-misc/xdg-utils
+"
+RDEPEND="${DEPEND}
+ acct-user/abrt
+ acct-group/abrt
+"
+BDEPEND="
+ app-text/asciidoc
+ app-text/xmlto
+ >=dev-util/intltool-0.3.50
+ >=sys-devel/gettext-0.17
+ virtual/pkgconfig
+"
+
+# Tests require python-meh, which is highly redhat-specific.
+RESTRICT="test"
+
+src_prepare() {
+ default
+ ./gen-version || die # Needed to be run before autoreconf
+ eautoreconf
+ use python && python_copy_sources
+}
+
+src_configure() {
+ use python && python_setup
+
+ local myargs=(
+ --localstatedir="${EPREFIX}/var"
+ --without-bugzilla
+ $(use_with gtk)
+ $(use_with python python3)
+ )
+ if use python; then
+ python_foreach_impl run_in_build_dir econf "${myargs[@]}"
+ else
+ econf "${myargs[@]}"
+ fi
+}
+
+src_compile() {
+ if use python; then
+ python_foreach_impl run_in_build_dir default
+ else
+ default
+ fi
+}
+
+src_install() {
+ if use python; then
+ python_install() {
+ default
+ python_optimize
+ }
+ python_foreach_impl run_in_build_dir python_install
+ else
+ default
+ fi
+
+ # Need to set correct ownership for use by app-admin/abrt
+ diropts -o abrt -g abrt
+ keepdir /var/spool/abrt
+
+ find "${D}" -name '*.la' -exec rm -f {} + || die
+}
diff --git a/dev-libs/qtkeychain/qtkeychain-0.10.0.ebuild b/dev-libs/qtkeychain/qtkeychain-0.10.0.ebuild
index e26facbfa95b..876be5e44d20 100644
--- a/dev-libs/qtkeychain/qtkeychain-0.10.0.ebuild
+++ b/dev-libs/qtkeychain/qtkeychain-0.10.0.ebuild
@@ -23,14 +23,12 @@ IUSE="gnome-keyring"
BDEPEND="
dev-qt/linguist-tools:5
"
-RDEPEND="
+DEPEND="
dev-qt/qtcore:5
dev-qt/qtdbus:5
gnome-keyring? ( dev-libs/glib:2 )
"
-DEPEND="${RDEPEND}
- gnome-keyring? ( gnome-base/libgnome-keyring )
-"
+RDEPEND="${DEPEND}"
DOCS=( ChangeLog ReadMe.txt )
diff --git a/dev-libs/satyr/Manifest b/dev-libs/satyr/Manifest
index b4a7736f4bc2..6a336244deaa 100644
--- a/dev-libs/satyr/Manifest
+++ b/dev-libs/satyr/Manifest
@@ -1 +1,2 @@
DIST satyr-0.27.tar.gz 435341 BLAKE2B ade40bc6a1c48e6fc0af7913ff94ed044c63fdb63b8d86ba010bebcfd2098831bc6c7361d116851aee88f49c640d1457dd8953becad60b6ff6dc32deec6c7942 SHA512 7b01cf16489644fbfbe2150477279a94c6fa9b3310edebc84b83bab58d1058df0be478ab6bf4c6910b4168122721dde10d573711abb983b0eb5ccda09cb80710
+DIST satyr-0.30.tar.gz 427940 BLAKE2B 97fedef59cc77b2ae81857c491532552c352a272658d02564d2661d06a4ccc99c18bcd57e5e68e5a612e9e65c5878f19b2f18bbe74066874a7295e2f65d64149 SHA512 ebc6e9c0fd8cd130cf1701573c8ecdadf73fe54efa563759a47f990a91b217cf1dec01045be624d15cfa96b1370ddf2412b0537e57ed628dc27e860be46e21cf
diff --git a/dev-libs/satyr/satyr-0.30.ebuild b/dev-libs/satyr/satyr-0.30.ebuild
new file mode 100644
index 000000000000..f654d70e26bb
--- /dev/null
+++ b/dev-libs/satyr/satyr-0.30.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit autotools multiprocessing python-r1
+
+DESCRIPTION="Satyr is a collection of low-level algorithms for program failure processing"
+HOMEPAGE="https://github.com/abrt/satyr"
+SRC_URI="https://github.com/abrt/${PN}/archive/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0/4"
+
+IUSE="python"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="python? ( ${PYTHON_DEPS} )
+ >=dev-libs/elfutils-0.158
+ dev-libs/json-c:=
+ dev-libs/nettle:=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ virtual/pkgconfig
+ dev-util/gperf
+"
+
+src_prepare() {
+ default
+ ./gen-version || die # Needs to be run before full autoreconf
+ eautoreconf
+ use python && python_copy_sources
+}
+
+src_configure() {
+ use python && python_setup
+
+ local myargs=(
+ --localstatedir="${EPREFIX}/var"
+ --without-rpm
+ $(usex python "--with-python3" "--without-python3")
+ )
+
+ if use python; then
+ python_configure() {
+ econf "${myargs[@]}"
+ }
+ python_foreach_impl run_in_build_dir python_configure
+ else
+ econf "${myargs[@]}"
+ fi
+}
+
+src_compile() {
+ if use python; then
+ python_foreach_impl run_in_build_dir default
+ else
+ default
+ fi
+
+}
+
+src_test() {
+ local extra_args
+
+ # In order to pass --jobs to the test runner
+ run_tests() {
+ cd tests || die
+ emake testsuite
+ ./testsuite --jobs=$(makeopts_jobs) ${extra_args[@]} $@
+
+ # Only run the python bindings tests for other python impls
+ extra_args=('-k' 'python3_bindings.*')
+ }
+
+ if use python; then
+ python_foreach_impl run_in_build_dir run_tests
+ else
+ run_tests SKIP_PYTHON3=yes
+ fi
+}
+
+src_install() {
+ if use python; then
+ python_install() {
+ default
+ python_optimize
+ }
+ python_foreach_impl run_in_build_dir python_install
+ else
+ default
+ fi
+
+ find "${D}" -name '*.la' -type f -delete || die
+}
diff --git a/dev-libs/xmlsec/Manifest b/dev-libs/xmlsec/Manifest
index ae0c9a29b072..471398af14da 100644
--- a/dev-libs/xmlsec/Manifest
+++ b/dev-libs/xmlsec/Manifest
@@ -1,2 +1 @@
-DIST xmlsec1-1.2.28.tar.gz 1995599 BLAKE2B 5d90646d9a72024856da2638adb6d0d00d5142f8d3eaa5b12a993e2e6ae78ad49aab69822ebe331191bf1fc5b98431b85e113545aec84e2bb7d5c5add9028df0 SHA512 17fa59e4ffee5e024caa4895e8ed21d1435f14e3a37d0ed781b1dd216333ae3b6099c460efd45d4a8097d0202522150b7b0ad543b47c1596d8473b6922270480
DIST xmlsec1-1.2.29.tar.gz 1989360 BLAKE2B a0057ddf2d641745933f8d788c5358b4bb17892ed175ef11a9041a34ff1f91d0ffe6cb90316308805b5bc2157b9c2e211b37731ff8cfc7723a85f349543aa7a6 SHA512 07c3012179da4392f0a9d41a51ed51d692ca8b491310488b955d5fef0637f104d3f82374754b0ef175fadc663a8ca8c996178198c5dd77b3a8b34393d1482e4d
diff --git a/dev-libs/xmlsec/files/xmlsec-1.2.28-test.patch b/dev-libs/xmlsec/files/xmlsec-1.2.28-test.patch
deleted file mode 100644
index ae80e1fa5f36..000000000000
--- a/dev-libs/xmlsec/files/xmlsec-1.2.28-test.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 3d5c9e38d9576aea252ba186dd2913c57a7a8dd8 Mon Sep 17 00:00:00 2001
-From: Alon Bar-Lev
-Date: Tue, 16 Apr 2019 23:07:08 +0300
-Subject: [PATCH] tests: workout test --X509-skip-strict-checks
-
-Apply --X509-skip-strict-checks parameter to verify commands.
-
-[PORT]
-
-Signed-off-by: Alon Bar-Lev
----
-diff --git a/tests/testrun.sh b/tests/testrun.sh
-index ea65802b..9950d4fb 100755
---- a/tests/testrun.sh
-+++ b/tests/testrun.sh
-@@ -59,7 +59,7 @@ if [ "z$XMLSEC_DEFAULT_CRYPTO" != "z" ] ; then
- elif [ "z$crypto" != "z" ] ; then
- xmlsec_params="$xmlsec_params --crypto $crypto"
- fi
--xmlsec_params="$xmlsec_params --X509-skip-strict-checks --crypto-config $crypto_config"
-+xmlsec_params="$xmlsec_params --crypto-config $crypto_config"
-
- #
- # Setup keys config
-@@ -308,8 +308,9 @@ execDSigTest() {
- # run tests
- if [ -n "$params1" ] ; then
- printf " Verify existing signature "
-- echo "$VALGRIND $xmlsec_app verify $xmlsec_params $params1 $full_file.xml" >> $curlogfile
-- $VALGRIND $xmlsec_app verify $xmlsec_params $params1 $full_file.xml >> $curlogfile 2>> $curlogfile
-+ params1="$(echo $params1 | sed 's/--X509-skip-strict-checks//')"
-+ echo "$VALGRIND $xmlsec_app verify --X509-skip-strict-checks $xmlsec_params $params1 $full_file.xml" >> $curlogfile
-+ $VALGRIND $xmlsec_app verify --X509-skip-strict-checks $xmlsec_params $params1 $full_file.xml >> $curlogfile 2>> $curlogfile
- printRes $expected_res $?
- if [ $? != 0 ]; then
- failures=`expr $failures + 1`
-@@ -328,8 +328,9 @@ execDSigTest() {
-
- if [ -n "$params3" -a -z "$PERF_TEST" ] ; then
- printf " Verify new signature "
-- echo "$VALGRIND $xmlsec_app verify $xmlsec_params $params3 $tmpfile" >> $curlogfile
-- $VALGRIND $xmlsec_app verify $xmlsec_params $params3 $tmpfile >> $curlogfile 2>> $curlogfile
-+ params3="$(echo $params3 | sed 's/--X509-skip-strict-checks//')"
-+ echo "$VALGRIND $xmlsec_app verify --X509-skip-strict-checks $xmlsec_params $params3 $tmpfile" >> $curlogfile
-+ $VALGRIND $xmlsec_app verify --X509-skip-strict-checks $xmlsec_params $params3 $tmpfile >> $curlogfile 2>> $curlogfile
- printRes $res_success $?
- if [ $? != 0 ]; then
- failures=`expr $failures + 1`
---
-2.21.0
-
diff --git a/dev-libs/xmlsec/xmlsec-1.2.28.ebuild b/dev-libs/xmlsec/xmlsec-1.2.28.ebuild
deleted file mode 100644
index e81558aad10c..000000000000
--- a/dev-libs/xmlsec/xmlsec-1.2.28.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Command line tool for signing, verifying, encrypting and decrypting XML"
-HOMEPAGE="https://www.aleksey.com/xmlsec"
-SRC_URI="https://www.aleksey.com/xmlsec/download/${PN}1-${PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc ppc64 ~sparc x86"
-IUSE="doc gcrypt gnutls libressl nss +openssl static-libs test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="|| ( gcrypt gnutls nss openssl )
- gnutls? ( gcrypt )"
-
-RDEPEND=">=dev-libs/libxml2-2.7.4:=
- >=dev-libs/libxslt-1.0.20:=
- gcrypt? ( >=dev-libs/libgcrypt-1.4.0:0= )
- gnutls? ( >=net-libs/gnutls-2.8.0:= )
- nss? (
- >=dev-libs/nspr-4.4.1:=
- >=dev-libs/nss-3.9:=
- )
- openssl? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
- )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig
- test? (
- nss? (
- >=dev-libs/nss-3.9[utils]
- )
- )"
-
-S="${WORKDIR}/${PN}1-${PV}"
-
-PATCHES=(
- "${FILESDIR}/${P}-test.patch"
-)
-
-src_configure() {
- econf \
- $(use_enable doc docs) \
- $(use_enable static-libs static) \
- $(use_with gcrypt) \
- $(use_with gnutls) \
- $(use_with nss nspr) \
- $(use_with nss) \
- $(use_with openssl) \
- --enable-mans \
- --enable-pkgconfig
-}
-
-src_test() {
- emake TMPFOLDER="${T}" check
-}
-
-src_install() {
- default
- find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/xmlsec/xmlsec-1.2.29.ebuild b/dev-libs/xmlsec/xmlsec-1.2.29.ebuild
index 80fdc8fc2dea..5f12985e1172 100644
--- a/dev-libs/xmlsec/xmlsec-1.2.29.ebuild
+++ b/dev-libs/xmlsec/xmlsec-1.2.29.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.aleksey.com/xmlsec/download/${PN}1-${PV}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm arm64 ppc ppc64 ~sparc x86"
IUSE="doc gcrypt gnutls libressl nss +openssl static-libs test"
RESTRICT="!test? ( test )"
REQUIRED_USE="|| ( gcrypt gnutls nss openssl )
diff --git a/dev-perl/DBD-Pg/DBD-Pg-3.10.0.ebuild b/dev-perl/DBD-Pg/DBD-Pg-3.10.0.ebuild
index 9a42fd47b3ea..65b6b954e06f 100644
--- a/dev-perl/DBD-Pg/DBD-Pg-3.10.0.ebuild
+++ b/dev-perl/DBD-Pg/DBD-Pg-3.10.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
DESCRIPTION="PostgreSQL database driver for the DBI module"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~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 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND="
diff --git a/dev-perl/DBD-mysql/DBD-mysql-4.50.0.ebuild b/dev-perl/DBD-mysql/DBD-mysql-4.50.0.ebuild
index 04e46b7ebb93..dd346ad80cef 100644
--- a/dev-perl/DBD-mysql/DBD-mysql-4.50.0.ebuild
+++ b/dev-perl/DBD-mysql/DBD-mysql-4.50.0.ebuild
@@ -10,7 +10,7 @@ inherit eutils perl-module
DESCRIPTION="MySQL driver for the Perl5 Database Interface (DBI)"
SLOT="0"
-KEYWORDS="amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sparc x86"
IUSE="mariadb +mysql test +ssl"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Manifest.gz b/dev-perl/Manifest.gz
index e9bc2aebeef5..248c71734bae 100644
Binary files a/dev-perl/Manifest.gz and b/dev-perl/Manifest.gz differ
diff --git a/dev-python/Kivy/Kivy-1.10.1.ebuild b/dev-python/Kivy/Kivy-1.10.1.ebuild
deleted file mode 100644
index fef777e0c348..000000000000
--- a/dev-python/Kivy/Kivy-1.10.1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DISTUTILS_IN_SOURCE_BUILD=1
-
-DESCRIPTION="Library for rapid development of hardware-accelerated multitouch applications"
-HOMEPAGE="https://kivy.org/"
-SRC_URI="https://github.com/kivy/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="cairo doc examples garden gstreamer +sdl spell test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- media-libs/mesa[gles2]
- dev-python/pillow[${PYTHON_USEDEP}]
- cairo? ( dev-python/pycairo[${PYTHON_USEDEP}] )
- garden? ( dev-python/kivy-garden[${PYTHON_USEDEP}] )
- gstreamer? ( dev-python/gst-python:1.0[${PYTHON_USEDEP}] )
- sdl? ( media-libs/libsdl2
- media-libs/sdl2-ttf
- media-libs/sdl2-image
- media-libs/sdl2-mixer )
- !sdl? ( dev-python/pygame[${PYTHON_USEDEP}] )
- spell? ( dev-python/pyenchant[${PYTHON_USEDEP}] )"
-DEPEND="${RDEPEND}
- dev-python/cython[${PYTHON_USEDEP}]
- dev-python/setuptools[${PYTHON_USEDEP}]
- doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
- test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${P,,}"
-
-python_prepare_all() {
-# sed -e '/data_files=/d' -i "${S}/setup.py" || die
-# sed -e 's/PYTHON = python/PYTHON ?= python/' -i Makefile || die
-
- export USE_SDL2=$(usex sdl 1 0)
- export USE_GSTREAMER=$(usex gstreamer 1 0)
- export KIVY_USE_SETUPTOOLS=1
- distutils-r1_python_prepare_all
-}
-
-python_compile() {
- esetup.py build_ext --inplace
- esetup.py build
-}
-
-python_compile_all() {
- use doc && emake html
-}
-
-python_test() {
- emake test PYTHON="${PYTHON}"
-}
-
-python_install_all() {
- use doc && HTML_DOCS=( doc/build/html/. )
- if use examples; then
- insinto "/usr/share/doc/${PF}/examples/${f}/"
- doins "${S}/examples"/* "${S}/examples"/*/*
- fi
- distutils-r1_python_install_all
-}
diff --git a/dev-python/Kivy/Manifest b/dev-python/Kivy/Manifest
deleted file mode 100644
index 5fc86976a87a..000000000000
--- a/dev-python/Kivy/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Kivy-1.10.1.tar.gz 24318169 BLAKE2B 3032034717ad580af437eb280ad8474f057e1ab9f797edf3358db1073eda6e65ee8765862e39e77818debdf0a2a972ce3701b305ddfba307d9a8bfe2ce8edbc5 SHA512 2208e1a148dd1a7c507336419e7388de87d2ab340db055e09fce99837d50639e2e38f275e383503e5bdfc4b9d3def8176d758a80bf3455467604a4219c19d642
diff --git a/dev-python/Kivy/metadata.xml b/dev-python/Kivy/metadata.xml
deleted file mode 100644
index 91807a2b42c3..000000000000
--- a/dev-python/Kivy/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
- Kivy
-
-
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 2d703b0885bf..f99232a33b85 100644
Binary files a/dev-python/Manifest.gz and b/dev-python/Manifest.gz differ
diff --git a/dev-python/asciitable/Manifest b/dev-python/asciitable/Manifest
deleted file mode 100644
index dbd37974c49b..000000000000
--- a/dev-python/asciitable/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST asciitable-0.8.0.tar.gz 299640 BLAKE2B e98aab28a0173793ed609084f691af50f67d753da3117288525e49f4f1b42efb52b051f79a3a3206a2b5ad9d9fa4325f9a819e30be3136284f2bf8c38d08051c SHA512 a74dfcc3515a9959af8a0ec0906e440aaabd402ba8987a581c774bc97344abece0fbb62957b0a5af89e290a505acc4df1dad5a22c08ca2ea8c7c65ca0a582a22
diff --git a/dev-python/asciitable/asciitable-0.8.0-r1.ebuild b/dev-python/asciitable/asciitable-0.8.0-r1.ebuild
deleted file mode 100644
index a360b54f5258..000000000000
--- a/dev-python/asciitable/asciitable-0.8.0-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="An extensible ASCII table reader"
-HOMEPAGE="http://cxc.harvard.edu/contrib/asciitable"
-SRC_URI="mirror://pypi/a/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
- test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-python_test() {
- nosetests || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/asciitable/metadata.xml b/dev-python/asciitable/metadata.xml
deleted file mode 100644
index d05a47d3a219..000000000000
--- a/dev-python/asciitable/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-
- sci-astronomy@gentoo.org
- Gentoo Astronomy Project
-
-
- asciitable is a Python module that can read a wide range of ASCII
- table formats used in astronomy, via a built-in extension reader
- class.
-
-
- asciitable
-
-
diff --git a/dev-python/ecdsa/Manifest b/dev-python/ecdsa/Manifest
index 53ec75ac6418..efaa6f0ef6b9 100644
--- a/dev-python/ecdsa/Manifest
+++ b/dev-python/ecdsa/Manifest
@@ -1,4 +1,2 @@
-DIST ecdsa-0.13.2.tar.gz 61595 BLAKE2B 0a8c8a0609a680ab26e84963f84d6194eaeb8aba78281fe277f585008d90a23469df66c9d4f4d0b7bf218445b596a13f7a9824c764827253f21bbd5d943b2702 SHA512 2b485d85a3cd48b2b9155eb36df8721a4bc76f1152a544970f535c056ddd944d72951e76b2cf5cbfe45277c2a156f2fb15f3b62c2b0fcc9a251962dec2a0f9de
DIST ecdsa-0.13.3.tar.gz 60477 BLAKE2B 4dba6c4778460dc8b778c2d7294e79a33d0fa23a50b3c04f7fe9011b2df95e9712bb41fa502043ec62efa8186374555c0eb4b59b96d2ae99d9861f816bd6c9e3 SHA512 621d36dcbdc0338b5e595e73337f62de0cc69febcabae40a6ba9292f2466f5d8818346d9d29d0b1c479ad4400fa57bdc52a7b264a475f8abed4c4a1161902b58
-DIST ecdsa-0.13.tar.gz 55579 BLAKE2B b8fab652527f945820b87931477d431bbfa605ec123fd5fea313b377edc118809c4109737ec6f6a97fb536f4aad193a4fd3154401d40f26fe05a336ab730e33e SHA512 f21d4d196404455135a1a2255c889ffa26160ea1e9b9d16c914ea82614831816acb6d27c86aac68cdaafa8b1d5fefe065b5f49ce45acaae4a035cd7f08a97594
DIST ecdsa-0.14.1.tar.gz 100303 BLAKE2B f7f02bcd99752a7e0c7ac7d22625f5a42638fefb9a92fefda3da279cdbb76d1a5337df5abfd43eb1edccf794c5b2fe34e10df876696d74e921c5ddb35f61f3a5 SHA512 6a66e07ec75e93af73d2363dfd817b35a103f8ff8d62c5ce3af9e98e917d38213aa4f80d570f81c830938123f9599e24d96605a36650eaefd806ed07ab0c14a5
diff --git a/dev-python/ecdsa/ecdsa-0.13.2.ebuild b/dev-python/ecdsa/ecdsa-0.13.2.ebuild
deleted file mode 100644
index bff9c0832d57..000000000000
--- a/dev-python/ecdsa/ecdsa-0.13.2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="ECDSA cryptographic signature library in pure Python"
-HOMEPAGE="https://github.com/warner/python-ecdsa"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
- esetup.py test
-}
diff --git a/dev-python/ecdsa/ecdsa-0.13.ebuild b/dev-python/ecdsa/ecdsa-0.13.ebuild
deleted file mode 100644
index 32fbbba6cc3a..000000000000
--- a/dev-python/ecdsa/ecdsa-0.13.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="ECDSA cryptographic signature library in pure Python"
-HOMEPAGE="https://github.com/warner/python-ecdsa"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
- esetup.py test
-}
diff --git a/dev-python/ecdsa/metadata.xml b/dev-python/ecdsa/metadata.xml
index 09ecea64c51f..b4fc2bd63769 100644
--- a/dev-python/ecdsa/metadata.xml
+++ b/dev-python/ecdsa/metadata.xml
@@ -1,13 +1,9 @@
-
- luke-jr+gentoobugs@utopios.org
- Luke Dashjr
-
- proxy-maint@gentoo.org
- Proxy Maintainers
+ python@gentoo.org
+ Python
ecdsa
diff --git a/dev-python/fido2/fido2-0.7.3.ebuild b/dev-python/fido2/fido2-0.7.3.ebuild
index de26e16eb4bf..d59bb437ce44 100644
--- a/dev-python/fido2/fido2-0.7.3.ebuild
+++ b/dev-python/fido2/fido2-0.7.3.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{6,7,8} )
inherit distutils-r1
DESCRIPTION="Python based FIDO 2.0 library"
diff --git a/dev-python/fido2/fido2-0.8.1.ebuild b/dev-python/fido2/fido2-0.8.1.ebuild
index 5cbdb73cf539..84a0ac3d31f2 100644
--- a/dev-python/fido2/fido2-0.8.1.ebuild
+++ b/dev-python/fido2/fido2-0.8.1.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{6,7,8} )
inherit distutils-r1
DESCRIPTION="Python based FIDO 2.0 library"
diff --git a/dev-python/gnuplot-py/Manifest b/dev-python/gnuplot-py/Manifest
deleted file mode 100644
index f665d9828bfc..000000000000
--- a/dev-python/gnuplot-py/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST gnuplot-py-1.8.tar.gz 118828 BLAKE2B 880062169b2fa047d60318cc7dc556c60794bfd81317681395329a56712506f7e406efecb79f37cd98103e76a6feb8b635e55fe056c3ce5bee0c670c8bcaf7a8 SHA512 748dc95ea53acd362f67c821a3cc7cf23b6329c2dd13c130c91e1c9f89afe1ffd84619ed321923c65455adf86ee58976dd6dd187881ee3ede5e0f5f551fb027d
diff --git a/dev-python/gnuplot-py/files/gnuplot-py-1.7-mousesupport.patch b/dev-python/gnuplot-py/files/gnuplot-py-1.7-mousesupport.patch
deleted file mode 100644
index 2eaf6ae379ed..000000000000
--- a/dev-python/gnuplot-py/files/gnuplot-py-1.7-mousesupport.patch
+++ /dev/null
@@ -1,75 +0,0 @@
---- _Gnuplot.py.orig 2003-10-17 16:28:10.000000000 +0200
-+++ _Gnuplot.py 2004-10-28 14:39:20.000000000 +0200
-@@ -18,6 +18,27 @@
-
- import gp, PlotItems, termdefs
-
-+def test_mouse():
-+ """Return whether mouse support is present or not.
-+
-+ The detection is done by calling gnuplot with a file containing only the
-+ "set mouse" command. If gnuplot does have mouse support, it should simply
-+ execute the file silently, producing no output."""
-+
-+ import os,tempfile,commands
-+
-+ tmpname = tempfile.mktemp()
-+ tfile = open(tmpname,"w")
-+ tfile.write("set mouse")
-+ tfile.close()
-+ msg = commands.getoutput(gp.GnuplotOpts.gnuplot_command + " " +
-+ tmpname)
-+ os.unlink(tmpname)
-+ if msg: # Gnuplot won"t print anything if it has mouse support
-+ has_mouse = 0
-+ else:
-+ has_mouse = 1
-+ return has_mouse
-
- class _GnuplotFile:
- """A file to which gnuplot commands can be written.
-@@ -152,7 +173,7 @@
- 'output' : 'string',
- }
-
-- def __init__(self, filename=None, persist=None, debug=0):
-+ def __init__(self, filename=None, persist=None, debug=0, mouse=None):
- """Create a Gnuplot object.
-
- Create a 'Gnuplot' object. By default, this starts a gnuplot
-@@ -172,8 +193,19 @@
- 'debug=1' -- echo the gnuplot commands to stderr as well as
- sending them to gnuplot.
-
-+ "mouse=1" -- activate mouse support (officially available as of
-+ gnuplot 4.0 under certain platforms).
-+
- """
-
-+ # The mouse check must be done first, so we can decide whether to use
-+ # inline data and fifos or not (they break mouse support)
-+ if mouse is None:
-+ mouse = test_mouse()
-+ if mouse:
-+ gp.GnuplotOpts.prefer_inline_data = 0
-+ gp.GnuplotOpts.prefer_fifo_data = 0
-+
- if filename is None:
- self.gnuplot = gp.GnuplotProcess(persist=persist)
- else:
-@@ -182,10 +214,14 @@
- 'Gnuplot with output to file does not allow '
- 'persist option.')
- self.gnuplot = _GnuplotFile(filename)
-+
- self._clear_queue()
- self.debug = debug
- self.plotcmd = 'plot'
-- self('set terminal %s' % (gp.GnuplotOpts.default_term,))
-+ # The "set mouse" command MUST be the VERY FIRST command passed to gnuplot
-+ if mouse:
-+ self("set mouse")
-+ self("set terminal %s" % gp.GnuplotOpts.default_term)
-
- def __call__(self, s):
- """Send a command string to gnuplot.
diff --git a/dev-python/gnuplot-py/gnuplot-py-1.8-r2.ebuild b/dev-python/gnuplot-py/gnuplot-py-1.8-r2.ebuild
deleted file mode 100644
index 921b7992021f..000000000000
--- a/dev-python/gnuplot-py/gnuplot-py-1.8-r2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-PYTHON_SINGLE_IMPL=true
-
-inherit distutils-r1
-
-DESCRIPTION="A python wrapper for Gnuplot"
-HOMEPAGE="http://gnuplot-py.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~ia64 ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc"
-
-DEPEND="
- || (
- dev-python/numpy-python2[${PYTHON_USEDEP}]
- dev-python/numpy[${PYTHON_USEDEP}]
- )"
-RDEPEND="${DEPEND}
- sci-visualization/gnuplot"
-
-DOCS=( ANNOUNCE.txt CREDITS.txt FAQ.txt NEWS.txt TODO.txt )
-
-PATCHES=( "${FILESDIR}"/${PN}-1.7-mousesupport.patch )
-
-python_install_all() {
- use doc && local HTML_DOCS=( doc/Gnuplot/. )
- distutils-r1_python_install_all
-}
-# testsuite does NOT run unattended, so left out here
diff --git a/dev-python/gnuplot-py/metadata.xml b/dev-python/gnuplot-py/metadata.xml
deleted file mode 100644
index fe1997fa7b08..000000000000
--- a/dev-python/gnuplot-py/metadata.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-
- python@gentoo.org
- Python
-
-
- Gnuplot.py is a Python module that interfaces to gnuplot, the popular
- plotting program. It allows you to use gnuplot from within Python to
- plot arrays of data from memory, data files, or mathematical
- functions. If you use Python to perform computations or as `glue' for
- numerical programs, you can use this module to plot data on the fly as
- they are computed. And the combination with Python makes it is easy to
- automate things, including to create crude `animations' by plotting
- different datasets one after another.
-
-
- gnuplot-py
-
-
diff --git a/dev-python/hiredis/hiredis-0.2.0-r2.ebuild b/dev-python/hiredis/hiredis-0.2.0-r2.ebuild
new file mode 100644
index 000000000000..3ed30be879fc
--- /dev/null
+++ b/dev-python/hiredis/hiredis-0.2.0-r2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python extension that wraps hiredis"
+HOMEPAGE="https://github.com/pietern/hiredis-py"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND=">=dev-libs/hiredis-0.13.1"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}"/${P}-r1-system-libs.patch )
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index 6eda1b1aac2c..d17794657146 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -1,9 +1,5 @@
DIST hypothesis-python-4.47.5.tar.gz 6805022 BLAKE2B 737a558c794f3ac428bef4b38858d47fddba613ce37eb9a9554afa3c189776e9172965dd31f8497747ac13b2ab1d34ee6de8671646972e71b82c5260db489b9a SHA512 9b6920181dca75b9e551ae5e598101f35cfc26e9e3a1b20cab652c151bc6355413d0c9602d3242fb23f808ab00335793009df938d55ee19a6af1ce2a8b085e3c
DIST hypothesis-python-4.50.8.tar.gz 6814518 BLAKE2B f2c39cae3708fe88d1854cda97633ba420c32fda38093bb852ef45929762cade0f7f0d1ef696ff96f7ebe7460e8bf53f63de9c959bbbd9e8ec162196d307aac0 SHA512 8c77439fd029e2380afbc059d2edf977414997ba81ecdfde14dfe9dbe9515a92e701751d13879c6b879271f817e01926c2dc66945ae76eb141818da1775bc545
DIST hypothesis-python-4.57.1.tar.gz 9005030 BLAKE2B 3d318896cbe2d24fa6847e764a109791d3acf3821852f8e170991b0be5b069f166e16bdacf7a82fbe49bd9db5188315cdec7cdb4592647571233949ec5732991 SHA512 28622ce8a1d89d09df65f3fbf7e92a1ad98dac140ab646fe11fcb15e6aa9a9672eb51d459f984384d92b819f902de911b06cec2542582d529dd556d2f99ed952
-DIST hypothesis-python-5.4.1.tar.gz 8993002 BLAKE2B b96f9080f7a5b307698ee1119495cb5356ccd2836f1d3ae66077bc0be2793d5d62beba09b2a38e5486f6d0d09e95ac85e81511c5ab7434c7285608a0ae62caa7 SHA512 bf01c50ea998aee2a547132806845aa9330a3830ce2b864f0ab9e2d9b9dd7dbdc9ec4db2ef77bfb9a76467b00f3ca1c00acbba7bdea569dab3038914a598d0c0
-DIST hypothesis-python-5.5.0.tar.gz 8996266 BLAKE2B c9eebe4bf1df5cbf7a40dabeecc9991e71ceda4c2084a1b045f77a2455d5581d055e55b22dde48d627eb3cd3b111bdb06b14ada2f31dccd201390430a4a38c15 SHA512 302211f91be253e15bb84c81e80e72c6de41c3a640569363aeac27b2650e569275f9614a678beb9e03f1e97090de4eab7954bc39b55a4324be0ef0b45daf5228
-DIST hypothesis-python-5.5.1.tar.gz 8996186 BLAKE2B 0e1e013b0339e504603b583882f6d05efa96e5b97b02967c49001c329923df7b2b2666a5351f223ab991cc86f6b0b7ae91c3f6e34c1e089a9f06a271dc7b887f SHA512 4129d85a0e4d2614cd2d8d018043b6346d59f973cce79cdbab2d8688d1c18e9dd0b9044515d715c80e03812020f134a8897931a9942eaad181567750a7cee049
-DIST hypothesis-python-5.5.2.tar.gz 8996253 BLAKE2B eccdbae595e3242b6e0f8d5b363aa4b23f279959bf87e801885be2f072ea8cafa39ec1122695f26a333ee99a191cf17342d95b74a4d216e06fecda53ab47d96f SHA512 e2be0bfd07e0e192e104b827616f822c1a4e87f7691a6b754a623d8ec268851f769ff9a0bf64c424cf583b5d87e4040df92ec203eac1b41034b4d24d5ea1d1d2
-DIST hypothesis-python-5.5.4.tar.gz 8997160 BLAKE2B ef85a521a9572afd4fa3d682722bddca04f6e5a5cb4283e05099148b374a635e1ad67d4b72b8baf752d33d4b9967464d28c5e293113af1a2218928352ffb2e15 SHA512 fa1946722a8fa3bb90ec0fa0786b03da11514779d5598d549c98a17217ce6e848603904de06b5f8a24321adbfa7b3c6e0d79e63d158c633619572623243deb13
DIST hypothesis-python-5.6.0.tar.gz 8997446 BLAKE2B 245c9219ae5642f74813d7c218cfec44065c6febcbc89811f0cee08261e35ae50ef56e9779b2a7434bea88b5764721ef7752cf198b846f08e15c8dfe647d7640 SHA512 40fe07f6f19d667a961d4ace7febe0c5476922c8929f0b7f77af52229e6d667a1a1b2d40c91e2ea18d9919288821508e598afcdb4b5edb71f03084e43d1eaa4b
+DIST hypothesis-python-5.7.0.tar.gz 8998146 BLAKE2B 4f1646056350350bc0382816efacf5f8aad3608198bcf3391268f94229ed02b9f98f3870c26d27943fa958d10c8aead5559f75ad5f3f90343c59f00d16ec78ab SHA512 e3bac3e8be3808ec773dcf1a28e47074f1ce2915b79224dbd4ac6e4ce97dff9436e97e1576e540bb7c2d5155502eb5280e1161ef1d36828074865fe1dd9428ba
diff --git a/dev-python/hypothesis/hypothesis-5.4.1.ebuild b/dev-python/hypothesis/hypothesis-5.4.1.ebuild
deleted file mode 100644
index d1f7fce2bf73..000000000000
--- a/dev-python/hypothesis/hypothesis-5.4.1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
-PYTHON_REQ_USE="threads(+),sqlite"
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="A library for property based testing"
-HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
-SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar.gz"
-S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~sparc ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- >=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
- >=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
- test? (
- ${RDEPEND}
- dev-python/mock[${PYTHON_USEDEP}]
- dev-python/pexpect[${PYTHON_USEDEP}]
- >=dev-python/pytest-4.3[${PYTHON_USEDEP}]
- !!=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
- >=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
- test? (
- ${RDEPEND}
- dev-python/mock[${PYTHON_USEDEP}]
- dev-python/pexpect[${PYTHON_USEDEP}]
- >=dev-python/pytest-4.3[${PYTHON_USEDEP}]
- !!=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
- >=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
- test? (
- ${RDEPEND}
- dev-python/mock[${PYTHON_USEDEP}]
- dev-python/pexpect[${PYTHON_USEDEP}]
- >=dev-python/pytest-4.3[${PYTHON_USEDEP}]
- !!=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
- >=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
- test? (
- ${RDEPEND}
- dev-python/mock[${PYTHON_USEDEP}]
- dev-python/pexpect[${PYTHON_USEDEP}]
- >=dev-python/pytest-5.3.5[${PYTHON_USEDEP}]
- !! ${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+# Requires active X display
+RESTRICT="test"
+
+RDEPEND="${PYTHON_DEPS}
+ dev-qt/qtcore:5
+ dev-qt/qtdeclarative:5
+ dev-qt/qtgui:5
+ dev-qt/qtsvg:5
+ "
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+ sed -i -e "s/qtquicktests//" pyotherside.pro || die
+
+ default
+}
+
+src_configure() {
+ eqmake5
+}
+
+src_install() {
+ emake install INSTALL_ROOT="${D}"
+}
diff --git a/dev-python/pyprof2calltree/Manifest b/dev-python/pyprof2calltree/Manifest
index ddf94826fa4c..260a36b16fe4 100644
--- a/dev-python/pyprof2calltree/Manifest
+++ b/dev-python/pyprof2calltree/Manifest
@@ -1 +1,2 @@
DIST pyprof2calltree-1.4.0.tar.gz 7784 BLAKE2B e8b9ecd857930406bb3b7f7851913a68f1e3433f3b42c262922b5d5b0fbfa692078fdad811d4ca358f7c74d14320c914cfa779ed0b9da8c4fcd7d8e021fd3319 SHA512 b1acba29cd4e5112012eeeffdac53900688a28707306ef3a8a3827f7422c35bc921d59d33db3209db923bb8640014e7d9d7d819eafbcb19e0cf7e6159537bded
+DIST pyprof2calltree-1.4.4.tar.gz 8797 BLAKE2B 0929728d3a6de1cc40e54bd4581bb4b64875a4d7f3ccef725300d40d2b3fd175d8ff462591357e32a471e5c3a4c5c51ac7e9c81c2e857050745a748bc4117d8a SHA512 7ffc228e542a568cb421394035660623415495472b5b3659a35b02c7ccccb7f578dc872d2bb1daf4fdfcd44134e1ad9b5ce3a18f49b15dd4aeb3b5f1201a28d8
diff --git a/dev-python/pyprof2calltree/pyprof2calltree-1.4.4.ebuild b/dev-python/pyprof2calltree/pyprof2calltree-1.4.4.ebuild
new file mode 100644
index 000000000000..e4a9af870f68
--- /dev/null
+++ b/dev-python/pyprof2calltree/pyprof2calltree-1.4.4.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="convert python profile data to kcachegrind calltree form"
+HOMEPAGE="https://pypi.org/project/pyprof2calltree/"
+# pypi tarball lacks tests
+SRC_URI="https://github.com/pwaller/pyprof2calltree/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+distutils_enable_tests setup.py
diff --git a/dev-python/pyscard/Manifest b/dev-python/pyscard/Manifest
index c4cd86b9fe58..ced7e8e99edb 100644
--- a/dev-python/pyscard/Manifest
+++ b/dev-python/pyscard/Manifest
@@ -1 +1,2 @@
DIST pyscard-1.9.7.tar.gz 144692 BLAKE2B 5a842b790e01ff5461c462d6fe2d7763a79725cd1bcb841c1aaa49f2b17decb251446adb908fa8b525b91f418a6df6a76ddf779a67b7e8547211993837aed2bd SHA512 339d6efd5fcaa361e30029e736d4e2e98e05acd701c39574b40960b4bcec4782ca9c1d6927cea0b3641c5e6a137d0b9fbd961b58422a4151cfbdfa067dcd4b4a
+DIST pyscard-1.9.9.tar.gz 145428 BLAKE2B c62d9c2f13d9f19df1b7399509efc9df2baf2da00a9dc0bd9a0b440dcef232beeb0f7da88b12e3fb8ecffeb28f268eaaa04c9d45dc3420a1071835afe7a36c95 SHA512 88c7314c10153f509eb9bf6318e62210c7182e51b531af752a402bf8d05cfa2658cc1a4e7b9385a474038ddfa5a1bfbf1f208fcd9abe02a60161ce7c757c67b2
diff --git a/dev-python/pyscard/pyscard-1.9.7.ebuild b/dev-python/pyscard/pyscard-1.9.7.ebuild
index 37623d99e50c..9321e8fa39a1 100644
--- a/dev-python/pyscard/pyscard-1.9.7.ebuild
+++ b/dev-python/pyscard/pyscard-1.9.7.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{6,7,8} )
inherit distutils-r1 eutils
diff --git a/dev-python/pyscard/pyscard-1.9.9.ebuild b/dev-python/pyscard/pyscard-1.9.9.ebuild
new file mode 100644
index 000000000000..5c90cee6a2f5
--- /dev/null
+++ b/dev-python/pyscard/pyscard-1.9.9.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="Smart cards support in python"
+HOMEPAGE="https://pyscard.sourceforge.io/
+ https://github.com/LudovicRousseau/pyscard
+ https://pypi.org/project/pyscard/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+RDEPEND="${PYTHON_DEP}
+ sys-apps/pcsc-lite"
+DEPEND="${RDEPEND}
+ dev-python/setuptools[${PYTHON_USEDEP}]"
+BDEPEND="${PYTHON_DEP}
+ dev-lang/swig"
+
+python_test() {
+ esetup.py test
+}
+
+pkg_postinst() {
+ optfeature "Gui support" dev-python/wxpython
+ optfeature "Support of remote readers with Pyro" dev-python/pyro
+}
diff --git a/dev-python/pyusb/pyusb-1.0.2.ebuild b/dev-python/pyusb/pyusb-1.0.2.ebuild
index 1a0858382292..f6dfae4b0c7f 100644
--- a/dev-python/pyusb/pyusb-1.0.2.ebuild
+++ b/dev-python/pyusb/pyusb-1.0.2.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_6,3_7,3_8} )
inherit distutils-r1
diff --git a/dev-python/pyyaml/Manifest b/dev-python/pyyaml/Manifest
index f23dcd2aa3f5..0757ac887526 100644
--- a/dev-python/pyyaml/Manifest
+++ b/dev-python/pyyaml/Manifest
@@ -3,3 +3,4 @@ DIST PyYAML-3.13.tar.gz 270607 BLAKE2B f365f63587b911234497426c9796f98b85f5de052
DIST PyYAML-5.1.2.tar.gz 265034 BLAKE2B a3f6fe4a0c0a24f8934b94545e7727fad26b397755416a8127bd52fd9ea5e8fea3c6452ddfbd91edfa2e8ca88522b1ae9061c9221f394c8fa4cbd1c2dc256f72 SHA512 b5ee201c612486a95c87b7e41d474313160284359b8b30ababc80b51325aef9dd7dc27eb3b8a03a4749cb8c7e3789c5684d5c285fe35d4b20be1f189641531e0
DIST PyYAML-5.1.tar.gz 274244 BLAKE2B ea8cc4b56b9fc70bc7b01f8c654ceb8b73c82dcc936c939cba3c3654df04fe32fc46c7df322a38869d28ad5a58f6134b35cbe43924df3b4d5f3e54e33700dc73 SHA512 8f27f92bdfa310a99dd6d83947332cc033fa18f0011998bb585ad5c4340a2da20d8c20bfdb53beaae15651198d1240c986818379b0a05b230f74d1f30f53e7fd
DIST PyYAML-5.3.tar.gz 268214 BLAKE2B 2017ec6d64744323c7e6f3bdcea77b249943ba93844de363ba5d2b14cf70cc5c06e8427d12515e1e60f8432a87a115df1033d959fc42851f61818d0bdc8cd7a2 SHA512 9124bf4d58ebe925f430fd6ed749e5a3311a54d536a035d39794c485843ddb80692fd7f7bac05797507128b933297ff730d967f49e7237c7c567086a83ee9e1f
+DIST pyyaml-5.3.1.gh.tar.gz 168044 BLAKE2B 2acc62ecc7448925eb340c2555001c8a74bd883d720b992d6deaea890b4eac435e4ae02eb129db3a6778c0be21a231fa9d96ee8ae59a4a39bc49961e5fb0d6ab SHA512 27d97e8493c7660c7c0c471e20a8aa46c85431e4559a98bcbdafc2bd89a67fd04c6f2090e54ff6b206c868b33635ef8be68070a4c25d17a25c97fd5ad3549556
diff --git a/dev-python/pyyaml/pyyaml-5.3.1.ebuild b/dev-python/pyyaml/pyyaml-5.3.1.ebuild
new file mode 100644
index 000000000000..47cae9d58fb9
--- /dev/null
+++ b/dev-python/pyyaml/pyyaml-5.3.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="YAML parser and emitter for Python"
+HOMEPAGE="https://pyyaml.org/wiki/PyYAML
+ https://pypi.org/project/PyYAML/
+ https://github.com/yaml/pyyaml"
+SRC_URI="https://github.com/yaml/pyyaml/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="examples +libyaml"
+
+RDEPEND="libyaml? ( dev-libs/libyaml:= )"
+DEPEND="${RDEPEND}
+ libyaml? (
+ $(python_gen_cond_dep '
+ dev-python/cython[${PYTHON_USEDEP}]
+ ' 'python*')
+ )"
+
+PATCHES=(
+ # bug #659348
+ "${FILESDIR}/pyyaml-5.1-cve-2017-18342.patch"
+)
+
+distutils_enable_tests setup.py
+
+python_configure_all() {
+ mydistutilsargs=( $(use_with libyaml) )
+}
+
+python_install_all() {
+ distutils-r1_python_install_all
+ if use examples; then
+ dodoc -r examples
+ docompress -x /usr/share/doc/${PF}
+ fi
+}
diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz
index e182e3b54ea6..505303d4dc4f 100644
Binary files a/dev-qt/Manifest.gz and b/dev-qt/Manifest.gz differ
diff --git a/dev-qt/assistant/assistant-5.14.1.ebuild b/dev-qt/assistant/assistant-5.14.1.ebuild
index edfb372bac76..738dfafd633b 100644
--- a/dev-qt/assistant/assistant-5.14.1.ebuild
+++ b/dev-qt/assistant/assistant-5.14.1.ebuild
@@ -8,7 +8,7 @@ inherit desktop qt5-build xdg-utils
DESCRIPTION="Tool for viewing on-line documentation in Qt help file format"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ppc64 ~sparc ~x86"
fi
IUSE="webkit"
diff --git a/dev-qt/designer/designer-5.14.1.ebuild b/dev-qt/designer/designer-5.14.1.ebuild
index 5c0e04ada589..50d070dab107 100644
--- a/dev-qt/designer/designer-5.14.1.ebuild
+++ b/dev-qt/designer/designer-5.14.1.ebuild
@@ -8,7 +8,7 @@ inherit desktop qt5-build xdg-utils
DESCRIPTION="WYSIWYG tool for designing and building graphical user interfaces with QtWidgets"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ppc ppc64 ~x86"
fi
IUSE="declarative webkit"
diff --git a/dev-qt/linguist-tools/linguist-tools-5.14.1.ebuild b/dev-qt/linguist-tools/linguist-tools-5.14.1.ebuild
index 0a33d76631c5..849f27e9edc4 100644
--- a/dev-qt/linguist-tools/linguist-tools-5.14.1.ebuild
+++ b/dev-qt/linguist-tools/linguist-tools-5.14.1.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
DESCRIPTION="Tools for working with Qt translation data files"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc ~x86"
fi
IUSE="qml"
diff --git a/dev-qt/linguist/linguist-5.14.1.ebuild b/dev-qt/linguist/linguist-5.14.1.ebuild
index b28a1407c038..b0ae106adff8 100644
--- a/dev-qt/linguist/linguist-5.14.1.ebuild
+++ b/dev-qt/linguist/linguist-5.14.1.ebuild
@@ -8,7 +8,7 @@ inherit desktop qt5-build xdg-utils
DESCRIPTION="Graphical tool for translating Qt applications"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ppc64 ~x86"
fi
IUSE=""
diff --git a/dev-qt/pixeltool/pixeltool-5.14.1.ebuild b/dev-qt/pixeltool/pixeltool-5.14.1.ebuild
index 51b58f231643..c992e1fd48e6 100644
--- a/dev-qt/pixeltool/pixeltool-5.14.1.ebuild
+++ b/dev-qt/pixeltool/pixeltool-5.14.1.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
DESCRIPTION="Qt screen magnifier"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ppc64 ~sparc ~x86"
fi
IUSE=""
diff --git a/dev-qt/qdbus/qdbus-5.14.1.ebuild b/dev-qt/qdbus/qdbus-5.14.1.ebuild
index f9addd8e1919..9f4034e798a2 100644
--- a/dev-qt/qdbus/qdbus-5.14.1.ebuild
+++ b/dev-qt/qdbus/qdbus-5.14.1.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
DESCRIPTION="Interface to Qt applications communicating over D-Bus"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc ~x86"
fi
IUSE=""
diff --git a/dev-qt/qdbusviewer/qdbusviewer-5.14.1.ebuild b/dev-qt/qdbusviewer/qdbusviewer-5.14.1.ebuild
index 8ac73f897b2b..cdf04b9d3d36 100644
--- a/dev-qt/qdbusviewer/qdbusviewer-5.14.1.ebuild
+++ b/dev-qt/qdbusviewer/qdbusviewer-5.14.1.ebuild
@@ -8,7 +8,7 @@ inherit desktop qt5-build xdg-utils
DESCRIPTION="Graphical tool that lets you introspect D-Bus objects and messages"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ppc64 ~sparc ~x86"
fi
IUSE=""
diff --git a/dev-qt/qtconcurrent/qtconcurrent-5.14.1.ebuild b/dev-qt/qtconcurrent/qtconcurrent-5.14.1.ebuild
index bf4babfa36bb..414d180d7a64 100644
--- a/dev-qt/qtconcurrent/qtconcurrent-5.14.1.ebuild
+++ b/dev-qt/qtconcurrent/qtconcurrent-5.14.1.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
DESCRIPTION="Multi-threading concurrence support library for the Qt5 framework"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc ~x86"
fi
IUSE=""
diff --git a/dev-qt/qtcore/qtcore-5.14.1-r1.ebuild b/dev-qt/qtcore/qtcore-5.14.1-r1.ebuild
index d96ec59bb319..6077d72eb27d 100644
--- a/dev-qt/qtcore/qtcore-5.14.1-r1.ebuild
+++ b/dev-qt/qtcore/qtcore-5.14.1-r1.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
DESCRIPTION="Cross-platform application development framework"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc ~x86"
fi
IUSE="icu systemd"
diff --git a/dev-qt/qtdbus/qtdbus-5.14.1.ebuild b/dev-qt/qtdbus/qtdbus-5.14.1.ebuild
index 15f81bd99000..fa078d62fe4b 100644
--- a/dev-qt/qtdbus/qtdbus-5.14.1.ebuild
+++ b/dev-qt/qtdbus/qtdbus-5.14.1.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
DESCRIPTION="Qt5 module for inter-process communication over the D-Bus protocol"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc ~x86"
fi
IUSE=""
diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.14.1-r1.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.14.1-r1.ebuild
index 74bb692c392a..c7911db39935 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-5.14.1-r1.ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-5.14.1-r1.ebuild
@@ -8,7 +8,7 @@ inherit python-any-r1 qt5-build
DESCRIPTION="The QML and Quick modules for the Qt5 framework"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ppc ppc64 ~x86"
fi
IUSE="gles2 +jit localstorage vulkan +widgets"
diff --git a/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.14.1.ebuild b/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.14.1.ebuild
index ec75dc760768..87d18f37a571 100644
--- a/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.14.1.ebuild
+++ b/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.14.1.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
DESCRIPTION="Set of QML types for adding visual effects to user interfaces"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ppc ppc64 ~x86"
fi
IUSE=""
diff --git a/dev-qt/qtgui/qtgui-5.14.1-r3.ebuild b/dev-qt/qtgui/qtgui-5.14.1-r3.ebuild
index 187c3e0c5035..9b6e6fb26ff8 100644
--- a/dev-qt/qtgui/qtgui-5.14.1-r3.ebuild
+++ b/dev-qt/qtgui/qtgui-5.14.1-r3.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="The GUI module and platform plugins for the Qt5 framework"
SLOT=5/${PV} # bug 707658
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc ~x86"
fi
# TODO: linuxfb
diff --git a/dev-qt/qthelp/qthelp-5.14.1.ebuild b/dev-qt/qthelp/qthelp-5.14.1.ebuild
index 139a71c459b2..adf40327f318 100644
--- a/dev-qt/qthelp/qthelp-5.14.1.ebuild
+++ b/dev-qt/qthelp/qthelp-5.14.1.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
DESCRIPTION="Qt5 module for integrating online documentation into applications"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc ~x86"
fi
IUSE=""
diff --git a/dev-qt/qtimageformats/qtimageformats-5.14.1.ebuild b/dev-qt/qtimageformats/qtimageformats-5.14.1.ebuild
index 64b53f6914c5..d8d3bdbfbea1 100644
--- a/dev-qt/qtimageformats/qtimageformats-5.14.1.ebuild
+++ b/dev-qt/qtimageformats/qtimageformats-5.14.1.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
DESCRIPTION="Additional format plugins for the Qt image I/O system"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ppc64 ~sparc ~x86"
fi
IUSE="mng"
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.14.1.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.14.1.ebuild
index e2eca0bb1711..b2f359ddcd0d 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.14.1.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.14.1.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
DESCRIPTION="Multimedia (audio, video, radio, camera) library for the Qt5 framework"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc ~x86"
fi
IUSE="alsa gles2 gstreamer openal pulseaudio qml widgets"
diff --git a/dev-qt/qtnetwork/qtnetwork-5.14.1.ebuild b/dev-qt/qtnetwork/qtnetwork-5.14.1.ebuild
index 66f05153348a..5f87d04364aa 100644
--- a/dev-qt/qtnetwork/qtnetwork-5.14.1.ebuild
+++ b/dev-qt/qtnetwork/qtnetwork-5.14.1.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
DESCRIPTION="Network abstraction library for the Qt5 framework"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc ~x86"
fi
IUSE="bindist connman libproxy networkmanager sctp +ssl"
diff --git a/dev-qt/qtopengl/qtopengl-5.14.1.ebuild b/dev-qt/qtopengl/qtopengl-5.14.1.ebuild
index 70acdd2313a0..c8c04589f139 100644
--- a/dev-qt/qtopengl/qtopengl-5.14.1.ebuild
+++ b/dev-qt/qtopengl/qtopengl-5.14.1.ebuild
@@ -9,7 +9,7 @@ inherit qt5-build
DESCRIPTION="OpenGL support library for the Qt5 framework (deprecated)"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc ~x86"
fi
IUSE="gles2"
diff --git a/dev-qt/qtpaths/qtpaths-5.14.1.ebuild b/dev-qt/qtpaths/qtpaths-5.14.1.ebuild
index 7e77477f537d..7e78f128573d 100644
--- a/dev-qt/qtpaths/qtpaths-5.14.1.ebuild
+++ b/dev-qt/qtpaths/qtpaths-5.14.1.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
DESCRIPTION="Command line client to QStandardPaths"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc ~x86"
fi
IUSE=""
diff --git a/dev-qt/qtpositioning/qtpositioning-5.14.1.ebuild b/dev-qt/qtpositioning/qtpositioning-5.14.1.ebuild
index 0db24b237f92..42f37b8e8663 100644
--- a/dev-qt/qtpositioning/qtpositioning-5.14.1.ebuild
+++ b/dev-qt/qtpositioning/qtpositioning-5.14.1.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
DESCRIPTION="Physical position determination library for the Qt5 framework"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc ~x86"
fi
IUSE="geoclue +qml"
diff --git a/dev-qt/qtprintsupport/qtprintsupport-5.14.1.ebuild b/dev-qt/qtprintsupport/qtprintsupport-5.14.1.ebuild
index 4fdc401dafd5..096e1db7fc28 100644
--- a/dev-qt/qtprintsupport/qtprintsupport-5.14.1.ebuild
+++ b/dev-qt/qtprintsupport/qtprintsupport-5.14.1.ebuild
@@ -9,7 +9,7 @@ inherit qt5-build
DESCRIPTION="Printing support library for the Qt5 framework"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc ~x86"
fi
IUSE="cups gles2"
diff --git a/dev-qt/qtquickcontrols/qtquickcontrols-5.14.1.ebuild b/dev-qt/qtquickcontrols/qtquickcontrols-5.14.1.ebuild
index c2df28c1c253..aede14700c0f 100644
--- a/dev-qt/qtquickcontrols/qtquickcontrols-5.14.1.ebuild
+++ b/dev-qt/qtquickcontrols/qtquickcontrols-5.14.1.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
DESCRIPTION="Set of Qt Quick controls to create complete user interfaces (deprecated)"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ppc ppc64 ~x86"
fi
IUSE="+widgets"
diff --git a/dev-qt/qtscript/qtscript-5.14.1.ebuild b/dev-qt/qtscript/qtscript-5.14.1.ebuild
index 34b9dbc92753..a993c99637b2 100644
--- a/dev-qt/qtscript/qtscript-5.14.1.ebuild
+++ b/dev-qt/qtscript/qtscript-5.14.1.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
DESCRIPTION="Application scripting library for the Qt5 framework (deprecated)"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc ~x86"
fi
IUSE="+jit scripttools"
diff --git a/dev-qt/qtsensors/qtsensors-5.14.1.ebuild b/dev-qt/qtsensors/qtsensors-5.14.1.ebuild
index 6780b05a4fcf..9b3c0a6220ee 100644
--- a/dev-qt/qtsensors/qtsensors-5.14.1.ebuild
+++ b/dev-qt/qtsensors/qtsensors-5.14.1.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
DESCRIPTION="Hardware sensor access library for the Qt5 framework"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~sparc ~x86"
fi
# TODO: simulator
diff --git a/dev-qt/qtserialport/qtserialport-5.14.1.ebuild b/dev-qt/qtserialport/qtserialport-5.14.1.ebuild
index d510efe398ec..d62e8b268854 100644
--- a/dev-qt/qtserialport/qtserialport-5.14.1.ebuild
+++ b/dev-qt/qtserialport/qtserialport-5.14.1.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
DESCRIPTION="Serial port abstraction library for the Qt5 framework"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc ~x86"
fi
IUSE=""
diff --git a/dev-qt/qtsql/qtsql-5.14.1.ebuild b/dev-qt/qtsql/qtsql-5.14.1.ebuild
index 473bf4e8bccc..64587ad88435 100644
--- a/dev-qt/qtsql/qtsql-5.14.1.ebuild
+++ b/dev-qt/qtsql/qtsql-5.14.1.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="SQL abstraction library for the Qt5 framework"
SLOT=5/$(ver_cut 1-3) # bug 639140
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc ~x86"
fi
IUSE="freetds mysql oci8 odbc postgres +sqlite"
diff --git a/dev-qt/qtsvg/qtsvg-5.14.1.ebuild b/dev-qt/qtsvg/qtsvg-5.14.1.ebuild
index 9584f7c08b50..2687148c82ff 100644
--- a/dev-qt/qtsvg/qtsvg-5.14.1.ebuild
+++ b/dev-qt/qtsvg/qtsvg-5.14.1.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
DESCRIPTION="SVG rendering library for the Qt5 framework"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc ~x86"
fi
IUSE=""
diff --git a/dev-qt/qttest/qttest-5.14.1.ebuild b/dev-qt/qttest/qttest-5.14.1.ebuild
index b72dc1733a67..2312c47880e2 100644
--- a/dev-qt/qttest/qttest-5.14.1.ebuild
+++ b/dev-qt/qttest/qttest-5.14.1.ebuild
@@ -9,7 +9,7 @@ inherit qt5-build
DESCRIPTION="Unit testing library for the Qt5 framework"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc ~x86"
fi
IUSE=""
diff --git a/dev-qt/qttranslations/qttranslations-5.14.1.ebuild b/dev-qt/qttranslations/qttranslations-5.14.1.ebuild
index b882082d4fe2..6376da79cddb 100644
--- a/dev-qt/qttranslations/qttranslations-5.14.1.ebuild
+++ b/dev-qt/qttranslations/qttranslations-5.14.1.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
DESCRIPTION="Translation files for the Qt5 framework"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc ~x86"
fi
IUSE=""
diff --git a/dev-qt/qtwayland/qtwayland-5.14.1-r1.ebuild b/dev-qt/qtwayland/qtwayland-5.14.1-r1.ebuild
deleted file mode 100644
index cba6645459a4..000000000000
--- a/dev-qt/qtwayland/qtwayland-5.14.1-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit qt5-build
-
-DESCRIPTION="Wayland platform plugin for Qt"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
-fi
-
-IUSE="+libinput vulkan xcomposite"
-
-DEPEND="
- >=dev-libs/wayland-1.6.0
- ~dev-qt/qtcore-${PV}
- ~dev-qt/qtdeclarative-${PV}
- ~dev-qt/qtgui-${PV}[egl,libinput=,vulkan=]
- media-libs/mesa[egl]
- >=x11-libs/libxkbcommon-0.2.0
- vulkan? ( dev-util/vulkan-headers )
- xcomposite? (
- x11-libs/libX11
- x11-libs/libXcomposite
- )
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- qt_use_disable_config libinput xkbcommon \
- src/client/client.pro \
- src/compositor/compositor.pro \
- src/compositor/wayland_wrapper/wayland_wrapper.pri \
- src/plugins/shellintegration/ivi-shell/ivi-shell.pro \
- src/plugins/shellintegration/wl-shell/wl-shell.pro \
- src/plugins/shellintegration/xdg-shell/xdg-shell.pro \
- src/plugins/shellintegration/xdg-shell-v5/xdg-shell-v5.pro \
- src/plugins/shellintegration/xdg-shell-v6/xdg-shell-v6.pro \
- tests/auto/compositor/compositor/compositor.pro
-
- qt_use_disable_config vulkan wayland-vulkan-server-buffer \
- src/plugins/hardwareintegration/client/client.pro \
- src/plugins/hardwareintegration/compositor/compositor.pro
-
- use xcomposite || rm -r config.tests/xcomposite || die
-
- qt5-build_src_prepare
-}
diff --git a/dev-qt/qtwayland/qtwayland-5.14.1-r2.ebuild b/dev-qt/qtwayland/qtwayland-5.14.1-r2.ebuild
new file mode 100644
index 000000000000..45f3d043e285
--- /dev/null
+++ b/dev-qt/qtwayland/qtwayland-5.14.1-r2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit qt5-build
+
+DESCRIPTION="Wayland platform plugin for Qt"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ppc ppc64 ~x86"
+fi
+
+IUSE="vulkan X"
+
+DEPEND="
+ >=dev-libs/wayland-1.6.0
+ ~dev-qt/qtcore-${PV}
+ ~dev-qt/qtdeclarative-${PV}
+ ~dev-qt/qtgui-${PV}[egl,libinput,vulkan=]
+ media-libs/mesa[egl]
+ >=x11-libs/libxkbcommon-0.2.0
+ vulkan? ( dev-util/vulkan-headers )
+ X? (
+ x11-libs/libX11
+ x11-libs/libXcomposite
+ )
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ use X || rm -r config.tests/xcomposite || die
+
+ qt5-build_src_prepare
+}
+
+src_configure() {
+ local myqmakeargs=(
+ --
+ $(qt_use vulkan feature-wayland-vulkan-server-buffer)
+ $(qt_use X feature-xcomposite-egl)
+ $(qt_use X feature-xcomposite-glx)
+ )
+ qt5-build_src_configure
+}
diff --git a/dev-qt/qtwebchannel/qtwebchannel-5.14.1.ebuild b/dev-qt/qtwebchannel/qtwebchannel-5.14.1.ebuild
index 6d9ff18316c6..d58d4d7252ad 100644
--- a/dev-qt/qtwebchannel/qtwebchannel-5.14.1.ebuild
+++ b/dev-qt/qtwebchannel/qtwebchannel-5.14.1.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
DESCRIPTION="Qt5 module for integrating C++ and QML applications with HTML/JavaScript clients"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ppc64 ~x86"
fi
IUSE="qml"
diff --git a/dev-qt/qtwebsockets/qtwebsockets-5.14.1.ebuild b/dev-qt/qtwebsockets/qtwebsockets-5.14.1.ebuild
index bb21ea253730..753218f3e3d1 100644
--- a/dev-qt/qtwebsockets/qtwebsockets-5.14.1.ebuild
+++ b/dev-qt/qtwebsockets/qtwebsockets-5.14.1.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
DESCRIPTION="Implementation of the WebSocket protocol for the Qt5 framework"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~sparc ~x86"
fi
IUSE="qml +ssl"
diff --git a/dev-qt/qtwidgets/qtwidgets-5.14.1.ebuild b/dev-qt/qtwidgets/qtwidgets-5.14.1.ebuild
index 3d14a9cd5446..ca98fa02b4c3 100644
--- a/dev-qt/qtwidgets/qtwidgets-5.14.1.ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5.14.1.ebuild
@@ -9,7 +9,7 @@ inherit qt5-build
DESCRIPTION="Set of components for creating classic desktop-style UIs for the Qt5 framework"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc ~x86"
fi
# keep IUSE defaults in sync with qtgui
diff --git a/dev-qt/qtx11extras/qtx11extras-5.14.1.ebuild b/dev-qt/qtx11extras/qtx11extras-5.14.1.ebuild
index 32aefe9b955d..ae1d5bd6e37f 100644
--- a/dev-qt/qtx11extras/qtx11extras-5.14.1.ebuild
+++ b/dev-qt/qtx11extras/qtx11extras-5.14.1.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
DESCRIPTION="Linux/X11-specific support library for the Qt5 framework"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc ~x86"
fi
IUSE=""
diff --git a/dev-qt/qtxml/qtxml-5.14.1.ebuild b/dev-qt/qtxml/qtxml-5.14.1.ebuild
index 8d0e1d4f9e93..b3314b1fc12e 100644
--- a/dev-qt/qtxml/qtxml-5.14.1.ebuild
+++ b/dev-qt/qtxml/qtxml-5.14.1.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
DESCRIPTION="Implementation of SAX and DOM for the Qt5 framework"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc ~x86"
fi
IUSE=""
diff --git a/dev-qt/qtxmlpatterns/qtxmlpatterns-5.14.1.ebuild b/dev-qt/qtxmlpatterns/qtxmlpatterns-5.14.1.ebuild
index 66fa234d35c7..26442255684d 100644
--- a/dev-qt/qtxmlpatterns/qtxmlpatterns-5.14.1.ebuild
+++ b/dev-qt/qtxmlpatterns/qtxmlpatterns-5.14.1.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
DESCRIPTION="XPath, XQuery, XSLT, and XML Schema validation library for the Qt5 framework"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc ~x86"
fi
IUSE="qml"
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index bfa60961e76e..27e0a1ad36ab 100644
Binary files a/dev-util/Manifest.gz and b/dev-util/Manifest.gz differ
diff --git a/dev-util/ccache/ccache-3.7.6.ebuild b/dev-util/ccache/ccache-3.7.6.ebuild
index d516baace6e4..033b34c72fe9 100644
--- a/dev-util/ccache/ccache-3.7.6.ebuild
+++ b/dev-util/ccache/ccache-3.7.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ccache/ccache/releases/download/v${PV}/ccache-${PV}.
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86"
IUSE="test"
DEPEND="app-arch/xz-utils
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index 33acc45a26d2..a92b82516d73 100644
Binary files a/eclass/Manifest.gz and b/eclass/Manifest.gz differ
diff --git a/eclass/ecm.eclass b/eclass/ecm.eclass
index 2892b0e0e942..0e3c64b0a2ad 100644
--- a/eclass/ecm.eclass
+++ b/eclass/ecm.eclass
@@ -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
# @ECLASS: ecm.eclass
@@ -218,27 +218,6 @@ case ${ECM_DESIGNERPLUGIN} in
;;
esac
-# @ECLASS-VARIABLE: KDE_DESIGNERPLUGIN
-# @DESCRIPTION:
-# If set to "false", do nothing.
-# Otherwise, add "designer" to IUSE to toggle build of designer plugins
-# and add the necessary BDEPEND.
-# TODO: drop after KDE Applications 19.08.3 removal
-: ${KDE_DESIGNERPLUGIN:=false}
-case ${KDE_DESIGNERPLUGIN} in
- true)
- IUSE+=" designer"
- BDEPEND+="
- designer? ( >=kde-frameworks/kdesignerplugin-${KFMIN}:${KFSLOT} )
- "
- ;;
- false) ;;
- *)
- eerror "Unknown value for \${KDE_DESIGNERPLUGIN}"
- die "Value ${KDE_DESIGNERPLUGIN} is not supported"
- ;;
-esac
-
case ${ECM_EXAMPLES} in
true)
IUSE+=" examples"
@@ -545,11 +524,6 @@ ecm_src_configure() {
cmakeargs+=( -DBUILD_DESIGNERPLUGIN=$(usex designer) )
fi
- # TODO: drop after KDE Applications 19.08.3 removal
- if in_iuse designer && [[ ${KDE_DESIGNERPLUGIN} != false ]] ; then
- cmakeargs+=( $(cmake_use_find_package designer KF5DesignerPlugin) )
- fi
-
if [[ ${ECM_QTHELP} = true ]]; then
cmakeargs+=( -DBUILD_QCH=$(usex doc) )
fi
diff --git a/eclass/kde.org.eclass b/eclass/kde.org.eclass
index 2776b5b972f2..bb9bd618eb2e 100644
--- a/eclass/kde.org.eclass
+++ b/eclass/kde.org.eclass
@@ -110,10 +110,9 @@ _kde.org_calculate_src_uri() {
if [[ ${KDE_RELEASE_SERVICE} = true ]]; then
case ${PV} in
??.??.[6-9]? )
- _src_uri+="unstable/applications/${PV}/src/"
+ _src_uri+="unstable/release-service/${PV}/src/"
RESTRICT+=" mirror"
;;
- 19.08.3? ) _src_uri+="stable/applications/${PV}/src/" ;;
*) _src_uri+="stable/release-service/${PV}/src/" ;;
esac
fi
diff --git a/games-rpg/Manifest.gz b/games-rpg/Manifest.gz
index ead400bb2ee5..ffa0f3a2a25c 100644
Binary files a/games-rpg/Manifest.gz and b/games-rpg/Manifest.gz differ
diff --git a/games-rpg/arx-fatalis-data/Manifest b/games-rpg/arx-fatalis-data/Manifest
deleted file mode 100644
index e663a4befb19..000000000000
--- a/games-rpg/arx-fatalis-data/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST ArxFatalis_1.21_MULTILANG.exe 9064611 BLAKE2B 42a81491ff470843a80bd6f801a1d8d5b1295603c3b6ec759f545d6fed9530b64ca684b772735f92187eb4eb613b12f68ce7d0491a157123578476b835bb40eb SHA512 885260c6173ee5f2d6d6072bcfd14d085f11b997a0ce45cbdee9a347612e96da13477ef7d71b9c015fb02f2e47bdfb968a2aa89b0c92e9327abbd75b724e47c2
-DIST setup_arx_fatalis_2.0.0.7.exe 525046992 BLAKE2B 558bffc8f4a0096761a9b1c8003b8127480bf03b1198b943dfe3c0bc8c6b9642275f86f5f4e9c6bbc2211bf48e38bebef634b24196b48d1d5520abf75254033f SHA512 08be7870d02ed6da8cedceb652906ea169eedcb44497a4517ef6a42d9db37403b5146b9e5a3a628a465f23088b0c09d958719e05454dcbb5ac12225c32d35942
diff --git a/games-rpg/arx-fatalis-data/arx-fatalis-data-1.21-r4.ebuild b/games-rpg/arx-fatalis-data/arx-fatalis-data-1.21-r4.ebuild
deleted file mode 100644
index bc295f53bfd0..000000000000
--- a/games-rpg/arx-fatalis-data/arx-fatalis-data-1.21-r4.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-CDROM_OPTIONAL="yes"
-inherit eutils cdrom check-reqs
-
-DESCRIPTION="Arx Fatalis data files"
-HOMEPAGE="https://www.arkane-studios.com/uk/arx.php"
-SRC_URI="cdinstall? ( https://cdn.bethsoft.com/arxfatalis/patches/1.21/ArxFatalis_1.21_MULTILANG.exe )
- gog? ( setup_arx_fatalis_2.0.0.7.exe )"
-
-LICENSE="cdinstall? ( ArxFatalis-EULA-JoWooD ) gog? ( GOG-EULA )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gog"
-REQUIRED_USE="^^ ( cdinstall gog )"
-RESTRICT="binchecks bindist mirror gog? ( fetch )"
-
-RDEPEND="games-rpg/arx-libertatis"
-DEPEND="app-arch/innoextract
- cdinstall? ( app-arch/cabextract )"
-
-CHECKREQS_DISK_BUILD="621M"
-CHECKREQS_DISK_USR="617M"
-
-S=${WORKDIR}
-
-detect_language() {
- speech_checksum=$(find '.' -iname "speech.pak" \
- -exec md5sum -b '{}' \; | sed "s/ .*//g")
- if [[ -z $speech_checksum ]] ; then
- speech_checksum=$(find '.' -iname "speech_default.pak" \
- -exec md5sum -b '{}' \; | sed "s/ .*//g")
- fi
-
- # check if the checksum is of a known localisation and set data_lang to
- # the language string to be used with the 1.21 patch installer
- case "$speech_checksum" in
- '4c3fdb1f702700255924afde49081b6e') data_lang='german' ;;
- # Bundled version of AF included with NVIDIA card
- 'ab8a93161688d793a7c78fbefd7d133e') data_lang='german' ;;
- '4e8f962d8204bcfd79ce6f3226d6d6de') data_lang='english' ;;
- '2f88c67ae1537919e69386d27583125b') data_lang='spanish' ;;
- '4edf9f8c799190590b4cd52cfa5f91b1') data_lang='french' ;;
- '81f05dea47c52d43f01c9b44dd8fe962') data_lang='italian' ;;
- '677163bc319cd1e9aa1b53b5fb3e9402') data_lang='russian' ;;
- '') eerror "speech*.pak not found"
- die "speech*.pak not found" ;;
- *) eerror "unsupported data language - speech*.pak checksum:" \
- "$speech_checksum" \
- "please file a gentoo bug"
- die "unsupported data language, file a gentoo bug" ;;
- esac
-}
-
-pkg_nofetch() {
- einfo "Please download ${A} from your GOG.com account after buying Arx Fatalis"
- einfo "and put it into your DISTDIR directory."
-}
-
-src_unpack() {
- local data_lang
-
- if use cdinstall ; then
- cdrom_get_cds bin/Arx.ttf
- find "${CDROM_ROOT}" -iname "setup*.cab" -exec cabextract '{}' \;
- detect_language
- else
- # gog only offers english
- data_lang="english"
- fi
-
- einfo "Data language: $data_lang"
- innoextract --lowercase --language=${data_lang} \
- "${DISTDIR}"/${A} || die
-}
-
-src_install() {
- insinto /usr/share/arx
- doins -r app/{graph,misc}
- find . -iname "*.pak" -exec doins '{}' \;
-
- dodoc app/{manual,map}.pdf
-
- # convert to lowercase
- cd "${D}"
- find . -type f -exec sh -c 'echo "${1}"
- lower="`echo "${1}" | tr [:upper:] [:lower:]`"
- [ "${1}" = "${lower}" ] || mv "${1}" "${lower}"' - {} \;
-}
diff --git a/games-rpg/arx-fatalis-data/metadata.xml b/games-rpg/arx-fatalis-data/metadata.xml
deleted file mode 100644
index 5890880ff15c..000000000000
--- a/games-rpg/arx-fatalis-data/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-
-
- daniel@constexpr.org
- Daniel Scharrer
-
-
- games@gentoo.org
- Gentoo Games Project
-
-
-
diff --git a/games-rpg/arx-fatalis-demo/Manifest b/games-rpg/arx-fatalis-demo/Manifest
deleted file mode 100644
index ed8eae152c00..000000000000
--- a/games-rpg/arx-fatalis-demo/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST arx_demo_english.zip 160545354 BLAKE2B 2693bdd2546c8788eb8c9fc303065f880c3995cfa1d75ca613b8ebb32238a3852dd7eeb20731f7c685521b669c47df45bcf22842772227be5cc3483ec3869c77 SHA512 0cbf0d6da1a373ed29edc49c65ed431117c868ec7bcab04166abd59f5d799460faec506baf191c83fa7c61372888009abb260d8a50e28507a5ec8ab7913a9ad7
diff --git a/games-rpg/arx-fatalis-demo/arx-fatalis-demo-0-r1.ebuild b/games-rpg/arx-fatalis-demo/arx-fatalis-demo-0-r1.ebuild
deleted file mode 100644
index 5cc328681b2f..000000000000
--- a/games-rpg/arx-fatalis-demo/arx-fatalis-demo-0-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop
-
-DESCRIPTION="Arx Fatalis demo"
-HOMEPAGE="https://www.arkane-studios.com/uk/arx.php"
-SRC_URI="arx_demo_english.zip"
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT="fetch"
-
-RDEPEND="games-rpg/arx-libertatis"
-DEPEND="
- app-arch/cabextract
- app-arch/unzip
-"
-
-S="${WORKDIR}"
-
-pkg_nofetch() {
- einfo "Please find and download ${SRC_URI} and put it into your distfiles directory."
- einfo "There is a list of possible download locations at"
- einfo "http://wiki.arx-libertatis.org/Getting_the_game_data#Demo"
-}
-
-src_unpack() {
- unpack ${A}
- cabextract Setup1.cab || die "cabextract failed"
- cabextract Setup2.cab || die "cabextract failed"
- cabextract Setup3.cab || die "cabextract failed"
-}
-
-src_install() {
- insinto /usr/share/${PN}
- doins -r *.pak bin/*.pak
- insinto /usr/share/${PN}/misc
- doins bin/Logo.bmp bin/Arx.ttf
-
- # convert to lowercase
- cd "${D}"
- find . -type f -exec sh -c 'echo "${1}"
- lower="`echo "${1}" | tr [:upper:] [:lower:]`"
- [ "${1}" = "${lower}" ] || mv "${1}" "${lower}"' - {} \;
-
- make_desktop_entry "arx --data-dir=/usr/share/arx-fatalis-demo" \
- "Arx Fatalis Demo" arx-libertatis
-}
diff --git a/games-rpg/arx-fatalis-demo/metadata.xml b/games-rpg/arx-fatalis-demo/metadata.xml
deleted file mode 100644
index a1d60835a707..000000000000
--- a/games-rpg/arx-fatalis-demo/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-
-
- daniel@constexpr.org
- Daniel Scharrer
-
-
- games@gentoo.org
- Gentoo Games Project
-
-
diff --git a/games-rpg/arx-libertatis/Manifest b/games-rpg/arx-libertatis/Manifest
deleted file mode 100644
index 4d7dfa3bcd26..000000000000
--- a/games-rpg/arx-libertatis/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST arx-libertatis-1.1.2.tar.xz 970608 BLAKE2B 1d4cef400db8223a930d1ff7b3bffbdcd46e47836d99f0c4545ad1bfc575b2b0ed972c9962272c043830be75a54be7992a70429d2692e5811865786370c35d6d SHA512 d4cb8187e7f63934408e38a51a44b7da03c8628820d43139507ff97ebd463b9cd7baf6cc4e85a3d4191d6e5f56850d77d07cfffc33d8f5a51378dfb41f719fb8
diff --git a/games-rpg/arx-libertatis/arx-libertatis-1.1.2-r2.ebuild b/games-rpg/arx-libertatis/arx-libertatis-1.1.2-r2.ebuild
deleted file mode 100644
index 5d5f2d64dac9..000000000000
--- a/games-rpg/arx-libertatis/arx-libertatis-1.1.2-r2.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CMAKE_WARN_UNUSED_CLI=yes
-inherit cmake-utils gnome2-utils
-
-DESCRIPTION="Cross-platform port of Arx Fatalis, a first-person role-playing game"
-HOMEPAGE="https://arx-libertatis.org/"
-SRC_URI="mirror://sourceforge/arx/${P}/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="c++0x crash-reporter debug static tools +unity-build"
-
-COMMON_DEPEND="
- media-libs/freetype
- media-libs/libsdl[X,video,opengl]
- media-libs/openal
- sys-libs/zlib
- virtual/opengl
- crash-reporter? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5[ssl]
- dev-qt/qtwidgets:5
- )
- !static? ( media-libs/glew:= )"
-RDEPEND="${COMMON_DEPEND}
- crash-reporter? ( sys-devel/gdb )"
-DEPEND="${COMMON_DEPEND}
- dev-libs/boost
- virtual/pkgconfig
- static? ( media-libs/glew[static-libs] )"
-
-DOCS=( README.md AUTHORS CHANGELOG )
-
-PATCHES=( "${FILESDIR}"/${P}-cmake-3.5.patch )
-
-src_configure() {
- # editor does not build
- local mycmakeargs=(
- -DBUILD_EDITOR=OFF
- -DBUILD_TOOLS=$(usex tools)
- -DDEBUG=$(usex debug)
- -DICONDIR=/usr/share/icons/hicolor/128x128/apps
- -DINSTALL_SCRIPTS=ON
- -DSET_OPTIMIZATION_FLAGS=OFF
- -DSTRICT_USE=ON
- -DUNITY_BUILD=$(usex unity-build)
- -DUSE_CXX11=$(usex c++0x)
- -DUSE_NATIVE_FS=ON
- -DUSE_OPENAL=ON
- -DUSE_OPENGL=ON
- -DUSE_SDL=ON
- -DBUILD_CRASHREPORTER=$(usex crash-reporter)
- $(usex crash-reporter "-DUSE_QT5=ON" "")
- -DUSE_STATIC_LIBS=$(usex static)
- )
-
- cmake-utils_src_configure
-}
-
-pkg_postinst() {
- elog "optional dependencies:"
- elog " games-rpg/arx-fatalis-data (from CD or GOG)"
- elog " games-rpg/arx-fatalis-demo (free demo)"
- elog
- elog "This package only installs the game binary."
- elog "You need the demo or full game data. Also see:"
- elog "http://wiki.arx-libertatis.org/Getting_the_game_data"
- elog
- elog "If you have already installed the game or use the STEAM version,"
- elog "run \"/usr/bin/arx-install-data\""
-
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
-}
diff --git a/games-rpg/arx-libertatis/files/arx-libertatis-1.1.2-cmake-3.5.patch b/games-rpg/arx-libertatis/files/arx-libertatis-1.1.2-cmake-3.5.patch
deleted file mode 100644
index d085afafe393..000000000000
--- a/games-rpg/arx-libertatis/files/arx-libertatis-1.1.2-cmake-3.5.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From c4262bc600dc01d3ddbacc7811132b29ea46ad3b Mon Sep 17 00:00:00 2001
-From: Daniel Scharrer
-Date: Thu, 24 Mar 2016 22:47:44 +0100
-Subject: [PATCH] CMake: Disable variable expansion for quoted strings in if()
-
-This makes the build system more robust against stray variables
-coming from included CMake scripts provided by the system.
-
-Fixes build with CMake 3.5.
-
-This has been fixed in master with commit 60e43c.
----
- CMakeLists.txt | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 93f1ee3..8347544 100755
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -13,6 +13,11 @@ else()
- cmake_minimum_required(VERSION 2.8)
- endif()
-
-+if(POLICY CMP0054)
-+ # CMake 3.1+: Only interpret if() arguments as variables or keywords when unquoted.
-+ cmake_policy(SET CMP0054 NEW)
-+endif()
-+
-
- # Define configuration options
-
---
-2.7.4
-
diff --git a/games-rpg/arx-libertatis/metadata.xml b/games-rpg/arx-libertatis/metadata.xml
deleted file mode 100644
index 36eb9d054450..000000000000
--- a/games-rpg/arx-libertatis/metadata.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-
-
-
-
- games@gentoo.org
- Gentoo Games Project
-
-
-
- Arx Libertatis is a cross-platform, open source port of
- Arx Fatalis, a 2002 first-person role-playing game/dungeon crawler
- developed by Arkane Studios.
- Arx Fatalis features crafting, melee and ranged combat, as well
- as a unique casting system where the player draws runes in real
- time to effect the desired spell.
- Arx Libertatis updates and improves Arx Fatalis by supporting
- modern systems, porting the game to new systems as well as
- eliminating bugs and limitations.
-
-
- Arx Libertatis ist eine cross-platform, open source Portierung
- von Arx Fatalis, ein Rollenspiel/Dungeon Crawler in Ego-Perspektive
- aus dem Jahr 2002, entwickelt von Arkane Studios.
- Arx Fatalist umfasst das Herstellen von Gegenständen,
- Nah- und Fernkampf, sowie ein einzigartiges Magiesystem,
- in dem der Spieler Runen in Echtzeit zeichnen muss, um einen
- Zauberspruch auszusprechen.
- Arx Libertatis aktualisiert und verbessert Arx Fatalis, indem
- es moderne Systeme unterstützt, das Spiel auch zu neuen Systemen
- portiert und bugs und Beschränkungen behebt.
-
-
-
- daniel@constexpr.org
- Daniel Scharrer
-
- https://bugs.arx-libertatis.org/
-
- http://wiki.arx-libertatis.org/Changelog
-
- http://wiki.arx-libertatis.org/
- arx/ArxLibertatis
- arx
- arx-libertatis
-
-
diff --git a/games-strategy/Manifest.gz b/games-strategy/Manifest.gz
index 823712b93f90..3e6973be539c 100644
Binary files a/games-strategy/Manifest.gz and b/games-strategy/Manifest.gz differ
diff --git a/games-strategy/lightyears/Manifest b/games-strategy/lightyears/Manifest
deleted file mode 100644
index ed5bf410ae79..000000000000
--- a/games-strategy/lightyears/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST lightyears-1.4.tar.bz2 693877 BLAKE2B 871b8f66088c3a947de50e7b47a8aeef4d06f9c7919f4f361a6719ff0dfa6b48acabb759dca6969d09255e2c89c158caa0cd560ef02567df6e46bbcda2eb9417 SHA512 68f576d820d54b353adbc504f8aa3341547e2e56474717cc59aecc2368fc0eb533458e09876b3cd2a9062914a8a58d39a35ce944256372bb9e15830210924597
diff --git a/games-strategy/lightyears/files/lightyears-1.4-gentoo.patch b/games-strategy/lightyears/files/lightyears-1.4-gentoo.patch
deleted file mode 100644
index 325c4365ded4..000000000000
--- a/games-strategy/lightyears/files/lightyears-1.4-gentoo.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- a/lightyears
-+++ b/lightyears
-@@ -1,7 +1,6 @@
- #!/usr/bin/python
-
- # Set the location of the LightYears files here:
--LIGHTYEARS_DIR = "."
- # LIGHTYEARS_DIR = "/usr/share/games/lightyears" # (for Debian)
-
- # Save games and configuration files are stored in the user's
-@@ -10,31 +9,6 @@
- import sys, os
-
- if __name__ == "__main__":
-- # Path to data/code dir can be overridden by environment variable
-- LIGHTYEARS_DIR = os.environ.get("LIGHTYEARS_DIR", LIGHTYEARS_DIR)
--
-- # Path does not exist? Try current directory.
-- if ((LIGHTYEARS_DIR == None)
-- or (not os.path.isdir(LIGHTYEARS_DIR))
-- or (not os.path.isfile(os.path.join(LIGHTYEARS_DIR,
-- 'code', 'startup.py')))):
-- LIGHTYEARS_DIR = os.getcwd()
--
-- # Paths obtained
-- sys.path.insert(0, os.path.join(LIGHTYEARS_DIR, 'code'))
-- data_dir = os.path.join(LIGHTYEARS_DIR, 'data')
--
-- # Go
-- try:
-- import startup
-- assert os.path.isdir(data_dir)
-- except:
-- print "Unable to find LightYears code & data in:"
-- for p in sys.path:
-- print ' ', p
--
-- sys.exit(1)
--
-- startup.Main(data_dir)
--
--
-+ sys.path.insert(0, "@GENTOO_LIBDIR@")
-+ import startup
-+ startup.Main("@GENTOO_DATADIR@/data")
diff --git a/games-strategy/lightyears/lightyears-1.4-r3.ebuild b/games-strategy/lightyears/lightyears-1.4-r3.ebuild
deleted file mode 100644
index e0e5bb0741d9..000000000000
--- a/games-strategy/lightyears/lightyears-1.4-r3.ebuild
+++ /dev/null
@@ -1,58 +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 desktop python-single-r1 xdg-utils
-
-DESCRIPTION="A single-player game with a science-fiction theme"
-HOMEPAGE="https://www.jwhitham.org/20kly/"
-SRC_URI="https://www.jwhitham.org/20kly/${P}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
- $(python_gen_cond_dep '
- dev-python/pygame[${PYTHON_MULTI_USEDEP}]
- ')
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
- "${FILESDIR}/${P}"-gentoo.patch
-)
-
-src_prepare() {
- default
-
- sed -i \
- -e "s:@GENTOO_LIBDIR@:/usr/$(get_libdir)/${PN}:" \
- -e "s:@GENTOO_DATADIR@:/usr/share/${PN}:" \
- ${PN} || die
-
- python_fix_shebang .
-}
-
-src_install() {
- dobin ${PN}
-
- insinto /usr/"$(get_libdir)/${PN}"
- doins code/*.py
-
- einstalldocs
-
- insinto "/usr/share/${PN}"
- doins -r audio data manual
-
- python_optimize "${ED}/usr/$(get_libdir)/${PN}"
-
- newicon data/32.png ${PN}.png
- make_desktop_entry ${PN} "Light Years Into Space"
-}
-
-pkg_postinst() { xdg_icon_cache_update; }
-pkg_postrm() { xdg_icon_cache_update; }
diff --git a/games-strategy/lightyears/metadata.xml b/games-strategy/lightyears/metadata.xml
deleted file mode 100644
index c314eef5e089..000000000000
--- a/games-strategy/lightyears/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
- games@gentoo.org
- Gentoo Games Project
-
-
-"20,000 Light Years Into Space" was written for Pyweek (March 2006) by Jack
-Whitham. It is a single-player real-time strategy game with a science-fiction
-theme.
-
-
diff --git a/games-strategy/outerspace/Manifest b/games-strategy/outerspace/Manifest
deleted file mode 100644
index eecab4f65957..000000000000
--- a/games-strategy/outerspace/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST outerspace-0.5.68.tar.gz 2249703 BLAKE2B 16b8c2d6c4e0516867d9a07a2762112da39f9a1074dffad9a9a3c343dd75662cba74d50f2a028b530013f320ffd7481317d061a3ebb449e9acf2f41bf56312a3 SHA512 dc2cbebf16fefabcc3356efb496766b90a5eabbf218f085fdc83cf956ca9503e99ef3154e0905c2432a3bf7caabd1f2af585a43397ba368581cd66546fcddc6b
-DIST outerspace_0.5.68-0ubuntu1_all.deb 2634188 BLAKE2B fd1667ae130e9a0ed603c369e9751d0b83414f20dd06c2f7e9941e2c465bdad0ff050ca41a928906bc5cc755eb05c0a5dfa18a8c35c868650c3fec6cf2e4f1f8 SHA512 9520cf1207a59497d6253b42bc34d580f9b805cf4ae55a5c921082e965892aa67921c4624ea94a5145c911dc2b24a1cca2806c06770ef8d1ded10855fb42666c
diff --git a/games-strategy/outerspace/files/outerspace b/games-strategy/outerspace/files/outerspace
deleted file mode 100644
index 2a6bbe26dafb..000000000000
--- a/games-strategy/outerspace/files/outerspace
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-mkdir -p ~/.outerspace
-cd ~/.outerspace || exit 1
-
-ln -sf "@GENTOO_LIBDIR@"/{osc.py,lib,libsrvr} .
-ln -sf "@GENTOO_DATADIR@"/res .
-
-exec python osc.py "$@"
diff --git a/games-strategy/outerspace/files/outerspace-0.5.68-setup.patch b/games-strategy/outerspace/files/outerspace-0.5.68-setup.patch
deleted file mode 100644
index c95852dca3dc..000000000000
--- a/games-strategy/outerspace/files/outerspace-0.5.68-setup.patch
+++ /dev/null
@@ -1,83 +0,0 @@
---- a/setup.py
-+++ b/setup.py
-@@ -42,12 +42,7 @@
-
- # collect data files
- data_files = []
--data_files.append(
-- (
-- ".",
-- ["../ChangeLog.txt", "../COPYING", "../README", "../README_CZ"]
-- )
--)
-+
-
- # resources
- for root, dirs, files in os.walk('res'):
-@@ -57,16 +52,6 @@
- pass
- if files:
- data_files.append((root, [os.path.join(root, file) for file in files]))
--
--data_files.append(
-- (
-- "res/techspec",
-- [
-- "../server/lib/ige/ospace/Rules/techs.spf",
-- "../server/lib/ige/ospace/Rules/Tech.spf",
-- ]
-- )
--)
-
- if havePy2Exe:
- data_files.append((".", ["../updater/update.exe"]))
-@@ -114,10 +99,3 @@
- **extraArgs
- )
-
--# cleanup
--def onerror(func, path, err):
-- if func is os.remove:
-- os.chmod(path, stat.S_IWRITE)
-- os.remove(path)
--
--shutil.rmtree("libsrvr", onerror = onerror)
---- a/osc.py
-+++ b/osc.py
-@@ -23,12 +23,36 @@
- # tweak PYTHONPATH
- import sys
- import os
-+import errno
- sys.path.insert(0, "lib")
-
- for item in ("libsrvr", "../server/lib"):
- if os.path.exists(item):
- sys.path.insert(0, item)
- break
-+
-+userdir=os.path.expanduser("~/.outerspace")
-+resdir=os.path.join(userdir, "res")
-+rootresdir="@GENTOO_DATADIR@/res"
-+
-+if not (os.path.isdir(userdir)):
-+ try:
-+ os.makedirs(userdir)
-+ except:
-+ sys.exit("unable to create %s" % userdir)
-+
-+try:
-+ os.symlink(rootresdir, resdir)
-+except OSError, e:
-+ if e.errno == errno.EEXIST:
-+ os.remove(resdir)
-+ os.symlink(rootresdir, resdir)
-+
-+try:
-+ os.chdir(userdir)
-+except:
-+ sys.exit("unable to cd into %s" % userdir)
-+
-
- #configure gc
- #import gc
diff --git a/games-strategy/outerspace/metadata.xml b/games-strategy/outerspace/metadata.xml
deleted file mode 100644
index 8868ccd042b9..000000000000
--- a/games-strategy/outerspace/metadata.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-
- games@gentoo.org
- Gentoo Games Project
-
-
-Outer Space is an on-line strategy game which takes place in the dangerous
-universe. You will become powerful commander of many stars, planets, and great
-fleets and will struggle for survival with other commanders.
-
-Outer Space communicates with the server in the same way as your browser, but
-you will need a special client to play it. Using this client you can create an
-account on the server and you can start to explore the world of the Outer Space.
-
-
- ospace
-
-
diff --git a/games-strategy/outerspace/outerspace-0.5.68-r1.ebuild b/games-strategy/outerspace/outerspace-0.5.68-r1.ebuild
deleted file mode 100644
index ca9da045166c..000000000000
--- a/games-strategy/outerspace/outerspace-0.5.68-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit desktop gnome2-utils distutils-r1
-
-MY_PN="${PN/outerspace/Outer Space}"
-DESCRIPTION="On-line strategy game taking place in the dangerous universe"
-HOMEPAGE="https://www.ospace.net/ https://sourceforge.net/projects/ospace/"
-SRC_URI="mirror://sourceforge/ospace/Client/${PV}/Outer%20Space-${PV}.tar.gz -> ${P}.tar.gz
- mirror://sourceforge/ospace/Client/${PV}/outerspace_${PV}-0ubuntu1_all.deb"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-python/pygame-1.7"
-DEPEND=""
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_unpack() {
- default
- unpack ./data.tar.gz
-}
-
-python_install() {
- distutils-r1_python_install \
- --install-scripts="/usr/bin" \
- --install-data="/usr/share/${PN}" \
- --install-lib="$(python_get_sitedir)"
-
- # source tarball is missing files
- # get them from ubuntu.deb
- python_moduleinto ige.ospace.Rules
- python_domodule "${WORKDIR}"/usr/share/games/outerspace/libsrvr/ige/ospace/Rules/{Tech,techs}.spf
-}
-
-src_prepare() {
- default
-
- # fix setup script
- # rework python start script to avoid shell-wrapper script
- eapply "${FILESDIR}"/${P}-setup.patch
-
- sed -i\
- -e "s:@GENTOO_DATADIR@:/usr/share/${PN}:" \
- osc.py || die "sed failed"
-
- distutils-r1_src_prepare
-}
-
-src_install() {
- distutils-r1_src_install
- newicon res/logo-login.png ${PN}.png
- make_desktop_entry "osc.py" "${MY_PN}"
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
-}
diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index 02e98943dc97..5808e79539a7 100644
Binary files a/gnome-extra/Manifest.gz and b/gnome-extra/Manifest.gz differ
diff --git a/gnome-extra/gnome-shell-extension-dash-to-panel/Manifest b/gnome-extra/gnome-shell-extension-dash-to-panel/Manifest
index 59949dedbd87..3fe9cb5b4f8b 100644
--- a/gnome-extra/gnome-shell-extension-dash-to-panel/Manifest
+++ b/gnome-extra/gnome-shell-extension-dash-to-panel/Manifest
@@ -1,3 +1,4 @@
DIST gnome-shell-extension-dash-to-panel-26.tar.gz 21100594 BLAKE2B da90d4f496e10c14c554edb74065c95bf211f6778c097e3b81d863a46d0d3477f281cebac72f334b461f28b998284a861363b27d6c17ef5b1d47947a1f44bf01 SHA512 45bc148d2419db5943d0c2170ea3739a36c5a928c39d070501c5dfbec3910ba08058af1926c42f75d6b3e5918d8c30aef4f38db0af14115c11027520fa582a2f
DIST gnome-shell-extension-dash-to-panel-29.tar.gz 21107847 BLAKE2B 1a5440208a61ddadd0f0a3f22cfe2d2d675ad2784757aef69eb16c305c5b1a86ecfe1a73e22457d2641f599ab1d8162b24cc573621c33cbd0298a24ef9faf4c1 SHA512 6ed189a5ac5ac00d9ce33701dbde898c81c37ac13da353c9e44cea835ca4b7ab748e42cca4639e9c1f4f6dafe2ba6c5b72ba524eca67eb8365aec354ddfca05c
+DIST gnome-shell-extension-dash-to-panel-30.tar.gz 21113887 BLAKE2B 91b606090461e4dbd15e9f72ce0f9f6dcfea741560d2bca8f93335a124ee3136b62948ac0686015d96da7841a550e586c711977244ed178ee71103b0fa822fd0 SHA512 64b17297174473460c22591a3b1dc53c0884ccae05cf4e92335be273227de4037b25ef65d98af2403077eebf89d5ee8977a81b454f017f41f7f0d081f1411b72
DIST tango-gentoo-v1.1.tar.gz 29322 BLAKE2B 83fa2bf37727e60851dd679054fe1b153ebfea58c9a9a40f891f7d68d3b047b02e8effa1d1b4e08d64500a2072ce7200f159c92a352da7124de27e1b05bb6027 SHA512 87d47ddab68361db6d99866c51705dcb3e198f8345a1096859acf2c6cca5099dd23c7fb30d124f52c4933ea38fd45fadffbbe6ecbdfa84f5b60938a4824f9045
diff --git a/gnome-extra/gnome-shell-extension-dash-to-panel/gnome-shell-extension-dash-to-panel-30.ebuild b/gnome-extra/gnome-shell-extension-dash-to-panel/gnome-shell-extension-dash-to-panel-30.ebuild
new file mode 100644
index 000000000000..c5470a35cce9
--- /dev/null
+++ b/gnome-extra/gnome-shell-extension-dash-to-panel/gnome-shell-extension-dash-to-panel-30.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome2-utils
+
+MY_PN="${PN/gnome-shell-extension-/}"
+MY_P="${MY_PN}-${PV}"
+DESCRIPTION="An icon taskbar for the Gnome Shell"
+HOMEPAGE="https://github.com/home-sweet-gnome/dash-to-panel"
+SRC_URI="
+ https://github.com/home-sweet-gnome/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+ branding? ( https://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.tar.gz )
+"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="branding"
+
+COMMON_DEPEND="dev-libs/glib:2"
+RDEPEND="${COMMON_DEPEND}
+ app-eselect/eselect-gnome-shell-extensions
+ >=gnome-base/gnome-shell-3.18.0
+"
+DEPEND="${COMMON_DEPEND}"
+BDEPEND="
+ dev-util/intltool
+ sys-devel/gettext
+"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+ # Enable by default custom opacity to get panel slightly transparent
+ # as was done in older Gnome versions
+ "${FILESDIR}"/${PN}-26-opacity.patch
+)
+
+src_prepare() {
+ default
+
+ # Set correct version
+ export VERSION="${PV}"
+
+ # Don't install README and COPYING in unwanted locations
+ sed -i -e 's/COPYING//g' -e 's/README.md//g' Makefile || die
+
+ # Provide fancy Gentoo icon when requested
+ use branding && eapply "${FILESDIR}"/${PN}-26-branding.patch
+}
+
+src_install() {
+ default
+ if use branding; then
+ insinto /usr/share/gnome-shell/extensions/dash-to-panel@jderose9.github.com/img
+ doins "${WORKDIR}/tango-gentoo-v1.1/scalable/gentoo.svg"
+ fi
+}
+
+pkg_preinst() {
+ gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+ gnome2_schemas_update
+ ebegin "Updating list of installed extensions"
+ eselect gnome-shell-extensions update
+ eend $?
+}
+
+pkg_postrm() {
+ gnome2_schemas_update
+}
diff --git a/kde-apps/Manifest.gz b/kde-apps/Manifest.gz
index 3f554142dc3b..70ddd3e15963 100644
Binary files a/kde-apps/Manifest.gz and b/kde-apps/Manifest.gz differ
diff --git a/kde-apps/akonadi-calendar/Manifest b/kde-apps/akonadi-calendar/Manifest
index 4da3d0ee26dc..6ee1273fe8d3 100644
--- a/kde-apps/akonadi-calendar/Manifest
+++ b/kde-apps/akonadi-calendar/Manifest
@@ -1,2 +1 @@
-DIST akonadi-calendar-19.08.3.tar.xz 331796 BLAKE2B 0e43007a230c315919daf5203f5df71caead01b6c63e5a5ba01b1ac45726adcafcaed7e4a87a2900677baf81539630f4238792d62224d41a6fd86dd17f25bfb8 SHA512 e4c22cb43b7ec87f947ceb2746e159d75f6c370f16a9448c7d6ab46b30ce00f25624fc94f68e5a866651e49689248aa36de6f2d72cd3e15d5ef05eb82d6885ae
DIST akonadi-calendar-19.12.3.tar.xz 331488 BLAKE2B cbf967e03d0106cc8938f677e8a6db2fa6853ae7e2bd2661fd00f524ba6e064ac9b1dc6df425b5ab643ed6f6530924e97ffb2b0b1678e129afbad4a723642ea8 SHA512 217d525fa6f2a0cdd3ee0e9b0273c1b2058aa0fb3ac5a5dff1d1a00cf90a7ed51408c7ab22cd31207d242724dd513d45e26971ac608198e9ec25685eb2c711f1
diff --git a/kde-apps/akonadi-calendar/akonadi-calendar-19.08.3.ebuild b/kde-apps/akonadi-calendar/akonadi-calendar-19.08.3.ebuild
deleted file mode 100644
index 868b59f79eb8..000000000000
--- a/kde-apps/akonadi-calendar/akonadi-calendar-19.08.3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Library for akonadi calendar integration"
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="5"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
- >=kde-frameworks/kcalendarcore-${KFMIN}:5
- >=kde-frameworks/kcodecs-${KFMIN}:5
- >=kde-frameworks/kconfig-${KFMIN}:5
- >=kde-frameworks/kconfigwidgets-${KFMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/kdbusaddons-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/kiconthemes-${KFMIN}:5
- >=kde-frameworks/kio-${KFMIN}:5
- >=kde-frameworks/kitemmodels-${KFMIN}:5
- >=kde-frameworks/kjobwidgets-${KFMIN}:5
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
- >=kde-frameworks/kxmlgui-${KFMIN}:5
- >=kde-apps/akonadi-${PVCUT}:5
- >=kde-apps/akonadi-contacts-${PVCUT}:5
- >=kde-apps/akonadi-mime-${PVCUT}:5
- >=kde-apps/kcalutils-${PVCUT}:5
- >=kde-apps/kidentitymanagement-${PVCUT}:5
- >=kde-apps/kmailtransport-${PVCUT}:5
- >=kde-apps/kmime-${PVCUT}:5
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
-"
-RDEPEND="${DEPEND}
- !kde-apps/kdepim-l10n
- !=kde-frameworks/kcodecs-${KFMIN}:5
- >=kde-frameworks/kcompletion-${KFMIN}:5
- >=kde-frameworks/kconfig-${KFMIN}:5
- >=kde-frameworks/kconfigwidgets-${KFMIN}:5
- >=kde-frameworks/kcontacts-${KFMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/kdbusaddons-${KFMIN}:5
- >=kde-frameworks/kiconthemes-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/kio-${KFMIN}:5
- >=kde-frameworks/kservice-${KFMIN}:5
- >=kde-frameworks/ktextwidgets-${KFMIN}:5
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
- >=kde-frameworks/kxmlgui-${KFMIN}:5
- >=kde-frameworks/prison-${KFMIN}:5
- >=kde-apps/akonadi-${PVCUT}:5
- >=kde-apps/kmime-${PVCUT}:5
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
-"
-RDEPEND="${DEPEND}
- !kde-apps/kdepim-l10n
- !=kde-frameworks/kcompletion-${KFMIN}:5
- >=kde-frameworks/kconfig-${KFMIN}:5
- >=kde-frameworks/kcontacts-${KFMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/kcrash-${KFMIN}:5
- >=kde-frameworks/kdbusaddons-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/kwallet-${KFMIN}:5
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
- >=kde-frameworks/kxmlgui-${KFMIN}:5
- >=kde-apps/akonadi-${PVCUT}:5
- >=kde-apps/kidentitymanagement-${PVCUT}:5
- >=kde-apps/kmailtransport-${PVCUT}:5
- >=kde-apps/libkdepim-${PVCUT}:5
- >=kde-apps/mailcommon-${PVCUT}:5
- >=kde-apps/mailimporter-${PVCUT}:5
- >=kde-apps/messagelib-${PVCUT}:5
- >=kde-apps/pimcommon-${PVCUT}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=dev-qt/qtxml-${QTMIN}:5
-"
-RDEPEND="${DEPEND}
- !kde-apps/kdepim-l10n
- !kde-apps/kmail:4
-"
diff --git a/kde-apps/akonadi-import-wizard/akonadi-import-wizard-19.12.3.ebuild b/kde-apps/akonadi-import-wizard/akonadi-import-wizard-19.12.3.ebuild
index 16a431359ef0..59c490af2c75 100644
--- a/kde-apps/akonadi-import-wizard/akonadi-import-wizard-19.12.3.ebuild
+++ b/kde-apps/akonadi-import-wizard/akonadi-import-wizard-19.12.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE+=" https://userbase.kde.org/Kmail/Import_Options"
LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
IUSE=""
DEPEND="
diff --git a/kde-apps/akonadi-mime/Manifest b/kde-apps/akonadi-mime/Manifest
index 3b508daa843d..1c8652c47b5e 100644
--- a/kde-apps/akonadi-mime/Manifest
+++ b/kde-apps/akonadi-mime/Manifest
@@ -1,2 +1 @@
-DIST akonadi-mime-19.08.3.tar.xz 132756 BLAKE2B 4083a820e8ff6c1134f34fc14c179064abbfbb8747a52c1d7ee82a065ae9c96b8e17ac6857e308674ee41f24ed8993a342adf4ff8348751d275e07165aa02a1c SHA512 a8f501f36107818f5e0553aef7a4b958ad58fdea9c335e5ab53fd4dbb7729f49be2c459c6e3ad3d42ff4807817ef38059acbb1d1a11d1f9f88290758299c84c6
DIST akonadi-mime-19.12.3.tar.xz 132344 BLAKE2B c6d461675702916760e74d3fd08e7d10ad20431183acda2e9010f3056a3e8f2e736ef1d61fdb517a0fcc4dcb5ee491a9106488215010bbdb4603a9fa17816ce3 SHA512 d8c22ae1a2a349990248f209be017ceb2976bbb138ed25dc1e67993738d91c426897371f0844e6baecf095b5b39240b8dd836babb970c50b61af3aecc45dc251
diff --git a/kde-apps/akonadi-mime/akonadi-mime-19.08.3.ebuild b/kde-apps/akonadi-mime/akonadi-mime-19.08.3.ebuild
deleted file mode 100644
index 6ffd471e42f6..000000000000
--- a/kde-apps/akonadi-mime/akonadi-mime-19.08.3.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Library for akonadi mime types"
-SLOT="5"
-KEYWORDS="amd64 arm64 x86"
-LICENSE="GPL-2+ LGPL-2.1+"
-IUSE=""
-
-# some akonadi tests time out, that probably needs more work as it's ~700 tests
-RESTRICT+=" test"
-
-DEPEND="
- >=kde-frameworks/kconfig-${KFMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/kdbusaddons-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/kio-${KFMIN}:5
- >=kde-frameworks/kitemmodels-${KFMIN}:5
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
- >=kde-frameworks/kxmlgui-${KFMIN}:5
- >=kde-apps/akonadi-${PVCUT}:5
- >=kde-apps/kmime-${PVCUT}:5
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- dev-libs/libxslt
-"
-RDEPEND="${DEPEND}
- !kde-apps/kdepim-l10n
- !=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-apps/kmime-${PVCUT}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtxml-${QTMIN}:5
-"
-RDEPEND="${DEPEND}
- !kde-apps/kdepim-l10n
-"
diff --git a/kde-apps/akonadi-notes/akonadi-notes-19.12.3.ebuild b/kde-apps/akonadi-notes/akonadi-notes-19.12.3.ebuild
index 01a7e8d8867a..39464f704a5c 100644
--- a/kde-apps/akonadi-notes/akonadi-notes-19.12.3.ebuild
+++ b/kde-apps/akonadi-notes/akonadi-notes-19.12.3.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Library for akonadi notes integration"
LICENSE="GPL-2+"
SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
IUSE=""
DEPEND="
diff --git a/kde-apps/akonadi-search/Manifest b/kde-apps/akonadi-search/Manifest
index 793d5ab1df30..f49dff3e6f79 100644
--- a/kde-apps/akonadi-search/Manifest
+++ b/kde-apps/akonadi-search/Manifest
@@ -1,2 +1 @@
-DIST akonadi-search-19.08.3.tar.xz 82480 BLAKE2B eeba0750d0c77d0942efffd01043ddfb02836a0b1174b9c3848c3f696744d6fcb7c7b0f38701da791db0f5f0a209e41ceac3ff1bf9331562b32944186d85065d SHA512 48e9b6247acab7c8dd874693c7302566b43f7758089a51b2c2e4d4c1eeb6ad6d217529c418254f8d930370d69c977264ddd1919f26a7f692ba0cff2426d0b3ec
DIST akonadi-search-19.12.3.tar.xz 83404 BLAKE2B cde6298784ae995e4b666c029f325ea4f09b2ba0265ff714005d2228410a4671932c967bf3c5edb285250d04b0d4698b91d447a04656c752f275adbb65372f57 SHA512 d51ecd671efa043994465b6f0386e0e97fa0c75e0426dc9f67c3627a0bd18141fc076382126071f27e02cec0215a05eff159cd86afeb04a267e54287d3bdeab8
diff --git a/kde-apps/akonadi-search/akonadi-search-19.08.3.ebuild b/kde-apps/akonadi-search/akonadi-search-19.08.3.ebuild
deleted file mode 100644
index b8da159402d9..000000000000
--- a/kde-apps/akonadi-search/akonadi-search-19.08.3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Libraries and daemons to implement searching in Akonadi"
-HOMEPAGE="https://cgit.kde.org/akonadi-search.git"
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="5"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-BDEPEND="
- test? ( >=kde-apps/akonadi-${PVCUT}:5[tools] )
-"
-COMMON_DEPEND="
- >=kde-frameworks/kcalendarcore-${KFMIN}:5
- >=kde-frameworks/kcmutils-${KFMIN}:5
- >=kde-frameworks/kcodecs-${KFMIN}:5
- >=kde-frameworks/kconfig-${KFMIN}:5
- >=kde-frameworks/kconfigwidgets-${KFMIN}:5
- >=kde-frameworks/kcontacts-${KFMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/kdbusaddons-${KFMIN}:5
- >=kde-frameworks/kio-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/krunner-${KFMIN}:5
- >=kde-apps/akonadi-${PVCUT}:5
- >=kde-apps/akonadi-mime-${PVCUT}:5
- >=kde-apps/kmime-${PVCUT}:5
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=dev-libs/xapian-1.3:=[chert(+)]
-"
-DEPEND="${COMMON_DEPEND}
- dev-libs/boost
- test? ( >=kde-apps/akonadi-${PVCUT}:5[mysql,postgres,sqlite] )
-"
-RDEPEND="${COMMON_DEPEND}
- !kde-apps/kdepim-l10n
-"
diff --git a/kde-apps/akonadi-search/akonadi-search-19.12.3.ebuild b/kde-apps/akonadi-search/akonadi-search-19.12.3.ebuild
index 584b72b6acc0..d4c51cdbf759 100644
--- a/kde-apps/akonadi-search/akonadi-search-19.12.3.ebuild
+++ b/kde-apps/akonadi-search/akonadi-search-19.12.3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://cgit.kde.org/akonadi-search.git"
LICENSE="GPL-2+ LGPL-2.1+"
SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
IUSE=""
RESTRICT+=" test" # perpetually broken, bug 662378
diff --git a/kde-apps/akonadi/Manifest b/kde-apps/akonadi/Manifest
index 11cb81ea6e66..30858a3bddec 100644
--- a/kde-apps/akonadi/Manifest
+++ b/kde-apps/akonadi/Manifest
@@ -1,2 +1 @@
-DIST akonadi-19.08.3.tar.xz 1579468 BLAKE2B c7df5162768a00d395d598a098a25aa789c2e9694958cef47a014a744b4e7322471b3855963fb1ec63708608a59c29f5cdbf7049848d8a44ad7e88366316c18f SHA512 612cf8860476c32462dfa565c392a94f7fdb60953dc3afe7ea87ffdd9e78ec5f01e44aaf2ba0c6b018fa0f4cc75d1c56da1211daa13eb9589f270c2761da1e6e
DIST akonadi-19.12.3.tar.xz 1583264 BLAKE2B 32bf2f3821628624216c8afe57988739a8b62808c3e17b13d907d9e88e271f5391210ec13e5620bde7550bf706ee305775b213e84032450b499b5a32fa2242fd SHA512 d8eb31948a649e4f3ba4d5d000a384d1188075aee8971fea401cfb9e392e111c4f2b19888783ea4a9430443c9c216ea7a2a8275555935cc3965335bfc07296b0
diff --git a/kde-apps/akonadi/akonadi-19.08.3.ebuild b/kde-apps/akonadi/akonadi-19.08.3.ebuild
deleted file mode 100644
index 6f92902e7f16..000000000000
--- a/kde-apps/akonadi/akonadi-19.08.3.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_DESIGNERPLUGIN="true"
-ECM_TEST="forceoptional"
-VIRTUALDBUS_TEST="true"
-VIRTUALX_REQUIRED="test"
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Storage service for PIM data and libraries for PIM apps"
-HOMEPAGE="https://community.kde.org/KDE_PIM/akonadi"
-
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 x86"
-LICENSE="LGPL-2.1+"
-IUSE="+mysql postgres sqlite tools xml"
-
-REQUIRED_USE="|| ( mysql postgres sqlite ) test? ( tools )"
-
-COMMON_DEPEND="
- >=kde-frameworks/kcompletion-${KFMIN}:5
- >=kde-frameworks/kconfig-${KFMIN}:5
- >=kde-frameworks/kconfigwidgets-${KFMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/kcrash-${KFMIN}:5
- >=kde-frameworks/kdbusaddons-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/kiconthemes-${KFMIN}:5
- >=kde-frameworks/kio-${KFMIN}:5
- >=kde-frameworks/kitemmodels-${KFMIN}:5
- >=kde-frameworks/kitemviews-${KFMIN}:5
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
- >=kde-frameworks/kwindowsystem-${KFMIN}:5
- >=kde-frameworks/kxmlgui-${KFMIN}:5
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtnetwork-${QTMIN}:5
- >=dev-qt/qtsql-${QTMIN}:5[mysql?,postgres?]
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=dev-qt/qtxml-${QTMIN}:5
- sqlite? (
- >=dev-qt/qtsql-${QTMIN}:5=[sqlite]
- dev-db/sqlite:3
- )
- xml? ( dev-libs/libxml2 )
-"
-DEPEND="${COMMON_DEPEND}
- dev-libs/boost
- dev-libs/libxslt
- test? ( sys-apps/dbus )
-"
-RDEPEND="${COMMON_DEPEND}
- !=dev-db/mariadb-10.4"; then
- ewarn "If an existing Akonadi QMYSQL database is being upgraded using"
- ewarn ">=dev-db/mariadb-10.4 and KMail stops fetching and sending mail,"
- ewarn "check ~/.local/share/akonadi/akonadiserver.error for errors like:"
- ewarn " \"Cannot add or update a child row: a foreign key constraint fails\""
- ewarn
- ewarn "Manual steps are required to fix it, see also:"
- ewarn " https://bugs.gentoo.org/688746 (see Whiteboard)"
- ewarn " https://bugs.kde.org/show_bug.cgi?id=409224"
- ewarn
- fi
-
- if use sqlite || has_version "<${CATEGORY}/${P}[sqlite]"; then
- ewarn "We strongly recommend you change your Akonadi database backend to either MySQL"
- ewarn "or PostgreSQL in your user configuration."
- ewarn "In particular, kde-apps/kmail does not work properly with the sqlite backend."
- fi
-
- ecm_pkg_setup
-}
-
-src_configure() {
- local mycmakeargs=(
- -DAKONADI_BUILD_QSQLITE=$(usex sqlite)
- -DBUILD_TOOLS=$(usex tools)
- $(cmake_use_find_package xml LibXml2)
- )
-
- ecm_src_configure
-}
-
-src_install() {
- # Who knows, maybe it accidentally fixes our permission issues
- cat <<-EOF > "${T}"/akonadiserverrc
-[%General]
-Driver=${DRIVER}
-EOF
- insinto /usr/share/config/akonadi
- doins "${T}"/akonadiserverrc
-
- ecm_src_install
-}
-
-pkg_postinst() {
- ecm_pkg_postinst
- elog "You can select the storage backend in ~/.config/akonadi/akonadiserverrc."
- elog "Available drivers are:"
- use mysql && elog " QMYSQL"
- use postgres && elog " QPSQL"
- use sqlite && elog " QSQLITE3"
- elog "${DRIVER} has been set as your default akonadi storage backend."
-}
diff --git a/kde-apps/akonadi/akonadi-19.12.3.ebuild b/kde-apps/akonadi/akonadi-19.12.3.ebuild
index 99c0dfac96ed..e4b212c938e4 100644
--- a/kde-apps/akonadi/akonadi-19.12.3.ebuild
+++ b/kde-apps/akonadi/akonadi-19.12.3.ebuild
@@ -16,7 +16,7 @@ DESCRIPTION="Storage service for PIM data and libraries for PIM apps"
HOMEPAGE="https://community.kde.org/KDE_PIM/akonadi"
SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
LICENSE="LGPL-2.1+"
IUSE="+kaccounts +mysql postgres sqlite tools xml"
diff --git a/kde-apps/akonadiconsole/Manifest b/kde-apps/akonadiconsole/Manifest
index 841b52e0a0f4..367efc7661d0 100644
--- a/kde-apps/akonadiconsole/Manifest
+++ b/kde-apps/akonadiconsole/Manifest
@@ -1,2 +1 @@
-DIST akonadiconsole-19.08.3.tar.xz 193848 BLAKE2B 0450da29afb328cf63cd027028f65c6e6c498f7269755631b0a5aa654ed1258f76b6b35fb592dd11c3031ee00cd8a02c27592571c748a3f8ff03b6a0a0596e01 SHA512 dec8b73d970e16906fc21bc10cc6b102f79b3891c2e5fbcf543473393803809414a5bf17045fe504d0bce8cf6bd5456b046d0a47b667b2b5902bb61b31fa2071
DIST akonadiconsole-19.12.3.tar.xz 194080 BLAKE2B 411c3a7610c7437b87d4488741f8768bc36b9798b8c5a9b892a523c357a31b82d887309a753022f498ea9b1623259bfd2397615a617a64d8ad33497be2f257f3 SHA512 39131877e0bc7b09141e0d218a01eaa86bd3aa9963514eaa3f44fe510aa7a88b4478ddf1461fc1ce59084d0dfa34186d3d0e4ab8d4763204ba651e8ab4c7d355
diff --git a/kde-apps/akonadiconsole/akonadiconsole-19.08.3.ebuild b/kde-apps/akonadiconsole/akonadiconsole-19.08.3.ebuild
deleted file mode 100644
index a64681759094..000000000000
--- a/kde-apps/akonadiconsole/akonadiconsole-19.08.3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional" # FIXME: Check back for doc in release
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Application for debugging Akonadi Resources"
-LICENSE="GPL-2+ LGPL-2.1+ handbook? ( FDL-1.2+ )"
-HOMEPAGE="https://kde.org/"
-SLOT="5"
-KEYWORDS="amd64 arm64 x86"
-
-IUSE=""
-
-DEPEND="
- >=kde-frameworks/kcalendarcore-${KFMIN}:5
- >=kde-frameworks/kcompletion-${KFMIN}:5
- >=kde-frameworks/kconfig-${KFMIN}:5
- >=kde-frameworks/kconfigwidgets-${KFMIN}:5
- >=kde-frameworks/kcontacts-${KFMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/kcrash-${KFMIN}:5
- >=kde-frameworks/kdbusaddons-${KFMIN}:5
- >=kde-frameworks/kio-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/kitemmodels-${KFMIN}:5
- >=kde-frameworks/kitemviews-${KFMIN}:5
- >=kde-frameworks/ktextwidgets-${KFMIN}:5
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
- >=kde-frameworks/kxmlgui-${KFMIN}:5
- >=kde-apps/akonadi-${PVCUT}:5
- >=kde-apps/akonadi-contacts-${PVCUT}:5
- >=kde-apps/akonadi-search-${PVCUT}:5
- >=kde-apps/calendarsupport-${PVCUT}:5
- >=kde-apps/kmime-${PVCUT}:5
- >=kde-apps/libkdepim-${PVCUT}:5
- >=kde-apps/messagelib-${PVCUT}:5
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtsql-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- dev-libs/xapian:=
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/akonadiconsole/akonadiconsole-19.12.3.ebuild b/kde-apps/akonadiconsole/akonadiconsole-19.12.3.ebuild
index 72ed3a3d699f..5f5a8622c63c 100644
--- a/kde-apps/akonadiconsole/akonadiconsole-19.12.3.ebuild
+++ b/kde-apps/akonadiconsole/akonadiconsole-19.12.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://techbase.kde.org/KDE_PIM/Akonadi/Development_Tools"
LICENSE="GPL-2+ LGPL-2.1+ handbook? ( FDL-1.2+ )"
SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
IUSE=""
DEPEND="
diff --git a/kde-apps/akregator/Manifest b/kde-apps/akregator/Manifest
index 7708fc201117..67ec21dd3a0f 100644
--- a/kde-apps/akregator/Manifest
+++ b/kde-apps/akregator/Manifest
@@ -1,2 +1 @@
-DIST akregator-19.08.3.tar.xz 2193472 BLAKE2B eaea7e2136736cf0f2ca568782bed6fa9532d2d3f20bf489e5e3934b99f6ac1d63be43099de7b36a4bcf8c2677ec2ae76ee40a313e8545268bf4de7d196328eb SHA512 96b24da53a1491a51949e5fdf4417b1dc2698cd8914a20b202bd03e598c69d9d7605964ec6c4703efaaa4150c3f5ecd84a92714cd89010f84b27c950aedc2475
DIST akregator-19.12.3.tar.xz 2194372 BLAKE2B ff42d62cacc7fb2d3319762a147d05e80ac9df92c4d673329cbdd222799cb6d7682696542cde2a006507f51a07a8dbc0e76dca6eca3892f847276e6da63521a2 SHA512 8670184ae7e89f60e25525a6a6046f54759e5a277b3ed85fe003c045c3cf39f3666f5327283f39a65cadd3442006478348ef6a16541b4d7474ce45158d0989fc
diff --git a/kde-apps/akregator/akregator-19.08.3.ebuild b/kde-apps/akregator/akregator-19.08.3.ebuild
deleted file mode 100644
index 9e7082443caf..000000000000
--- a/kde-apps/akregator/akregator-19.08.3.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="News feed aggregator"
-HOMEPAGE="https://kde.org/applications/internet/akregator"
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-SLOT="5"
-KEYWORDS="amd64 arm64 x86"
-
-IUSE=""
-
-COMMON_DEPEND="
- >=kde-frameworks/kcmutils-${KFMIN}:5
- >=kde-frameworks/kcodecs-${KFMIN}:5
- >=kde-frameworks/kcompletion-${KFMIN}:5
- >=kde-frameworks/kconfig-${KFMIN}:5
- >=kde-frameworks/kconfigwidgets-${KFMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/kcrash-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/kiconthemes-${KFMIN}:5
- >=kde-frameworks/kio-${KFMIN}:5
- >=kde-frameworks/kjobwidgets-${KFMIN}:5
- >=kde-frameworks/knotifications-${KFMIN}:5
- >=kde-frameworks/knotifyconfig-${KFMIN}:5
- >=kde-frameworks/kparts-${KFMIN}:5
- >=kde-frameworks/kservice-${KFMIN}:5
- >=kde-frameworks/ktextwidgets-${KFMIN}:5
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
- >=kde-frameworks/kxmlgui-${KFMIN}:5
- >=kde-frameworks/syndication-${KFMIN}:5
- >=kde-apps/grantleetheme-${PVCUT}:5
- >=kde-apps/kontactinterface-${PVCUT}:5
- >=kde-apps/kpimtextedit-${PVCUT}:5
- >=kde-apps/libkdepim-${PVCUT}:5
- >=kde-apps/messagelib-${PVCUT}:5
- >=kde-apps/pimcommon-${PVCUT}:5
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtnetwork-${QTMIN}:5
- >=dev-qt/qtwebengine-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=dev-qt/qtxml-${QTMIN}:5
-"
-DEPEND="${COMMON_DEPEND}
- dev-libs/grantlee:5
-"
-RDEPEND="${COMMON_DEPEND}
- !kde-apps/kdepim-l10n
-"
diff --git a/kde-apps/akregator/akregator-19.12.3.ebuild b/kde-apps/akregator/akregator-19.12.3.ebuild
index f6b2ea7281c0..aa6ca1bd3cee 100644
--- a/kde-apps/akregator/akregator-19.12.3.ebuild
+++ b/kde-apps/akregator/akregator-19.12.3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://kde.org/applications/internet/org.kde.akregator"
LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
IUSE=""
RDEPEND="
diff --git a/kde-apps/analitza/Manifest b/kde-apps/analitza/Manifest
index 02a3c8d1ac9a..5c059a0a1e4d 100644
--- a/kde-apps/analitza/Manifest
+++ b/kde-apps/analitza/Manifest
@@ -1,2 +1 @@
-DIST analitza-19.08.3.tar.xz 332648 BLAKE2B 33b14050ee7a62f4615c131295e935d73fb59c6643bc208f7a6daf1c34fa1d63d7d404e828cc27904588d9ced23186326a322e9657d4d17c28acfa508f23387f SHA512 962e854383b44b8acaa12188d69dc60122455836275dae3f5f79cce7607a1ce998cfdf18f48d4557b2708d91ebc15964c4842b24aad7f9974b9d7299418912bb
DIST analitza-19.12.3.tar.xz 331472 BLAKE2B 91222cbba015ba77800aaaa55b711124478a557fb7be915d1c3ec0ea7297e7b2cfe975482b70fffaba1fef8deb86aa988f55bcdf046ea4e70ff0218fe84fe950 SHA512 3b858af0a79174ec8c7ae28a703d067a6d2545dd5319a2d37d72831bba9f6196c6a6cedf6d277eb5ede812fb39ffab297f966da6c40926b26c0943ca10426eb9
diff --git a/kde-apps/analitza/analitza-19.08.3.ebuild b/kde-apps/analitza/analitza-19.08.3.ebuild
deleted file mode 100644
index 7df385e57cf5..000000000000
--- a/kde-apps/analitza/analitza-19.08.3.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="forceoptional-recursive"
-VIRTUALX_REQUIRED="test"
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="KDE library for mathematical features"
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 arm64 x86"
-IUSE="eigen nls"
-
-BDEPEND="
- nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
-"
-DEPEND="
- >=dev-qt/qtdeclarative-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5[-gles2]
- >=dev-qt/qtprintsupport-${QTMIN}:5
- >=dev-qt/qtsvg-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=dev-qt/qtxml-${QTMIN}:5
- eigen? ( dev-cpp/eigen:3 )
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- ecm_src_prepare
-
- if ! use test; then
- sed -i \
- -e "/add_subdirectory(examples)/ s/^/#DONT/" \
- analitzaplot/CMakeLists.txt || die
- fi
-}
-
-src_configure() {
- local mycmakeargs=(
- $(cmake_use_find_package eigen Eigen3)
- )
-
- ecm_src_configure
-}
diff --git a/kde-apps/analitza/analitza-19.12.3.ebuild b/kde-apps/analitza/analitza-19.12.3.ebuild
index 37c37e163790..4a914f25115b 100644
--- a/kde-apps/analitza/analitza-19.12.3.ebuild
+++ b/kde-apps/analitza/analitza-19.12.3.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="KDE library for mathematical features"
LICENSE="GPL-2" # TODO: CHECK
SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
IUSE="eigen nls"
BDEPEND="
diff --git a/kde-apps/ark/Manifest b/kde-apps/ark/Manifest
index 297b15238cd9..c26237963cea 100644
--- a/kde-apps/ark/Manifest
+++ b/kde-apps/ark/Manifest
@@ -1,2 +1 @@
-DIST ark-19.08.3.tar.xz 2585196 BLAKE2B 2f3ad8052ad5ead34d30d5fff41c076e387740ac77c80791a8f600d9158c254592916a92e8e181b98adee916baee2f58c3d668bfdd1d9d1be7a36f7b8d61c07c SHA512 2bbbce37e5f892840517688eb4ce78770514eb5c780d34ae3c33c4b4e60cd153ebc190e4613411d5e01f01a78b6a74bad86c79b9efe8a156250c18033a3271cf
DIST ark-19.12.3.tar.xz 2586112 BLAKE2B c4bde5469dde1ac7cc48b4ecfec260596e2bd3123d9b7c83a5281f45d17675477c2641b708469301e536f04f0e2b469e733c9f95053201682e4af1c2bf378226 SHA512 0f1a155bcfaca1b28b5035943a3d881de89a68c5e8bac156dd1304aa431c5700b6da6dc70e43e82560594bc5aab0ee1d3f3ec50ed4dd15e7f3dd053acbb1a14a
diff --git a/kde-apps/ark/ark-19.08.3.ebuild b/kde-apps/ark/ark-19.08.3.ebuild
deleted file mode 100644
index 18ae6f375bf2..000000000000
--- a/kde-apps/ark/ark-19.08.3.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="optional"
-VIRTUALX_REQUIRED="test"
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="KDE Archiving tool"
-HOMEPAGE="https://kde.org/applications/utilities/ark
-https://utils.kde.org/projects/ark/"
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 arm64 x86"
-IUSE="bzip2 lzma zip"
-
-BDEPEND="
- sys-devel/gettext
-"
-RDEPEND="
- >=kde-frameworks/karchive-${KFMIN}:5
- >=kde-frameworks/kcompletion-${KFMIN}:5
- >=kde-frameworks/kconfig-${KFMIN}:5
- >=kde-frameworks/kconfigwidgets-${KFMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/kcrash-${KFMIN}:5
- >=kde-frameworks/kdbusaddons-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/kiconthemes-${KFMIN}:5
- >=kde-frameworks/kio-${KFMIN}:5
- >=kde-frameworks/kitemmodels-${KFMIN}:5
- >=kde-frameworks/kjobwidgets-${KFMIN}:5
- >=kde-frameworks/kparts-${KFMIN}:5
- >=kde-frameworks/kpty-${KFMIN}:5
- >=kde-frameworks/kservice-${KFMIN}:5
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
- >=kde-frameworks/kxmlgui-${KFMIN}:5
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- app-arch/libarchive:=[bzip2?,lzma?,zlib]
- sys-libs/zlib
- zip? ( >=dev-libs/libzip-1.2.0:= )
-"
-DEPEND="${RDEPEND}
- >=dev-qt/qtconcurrent-${QTMIN}:5
-"
-
-# bug #560548, last checked with 16.04.1
-RESTRICT+=" test"
-
-src_configure() {
- local mycmakeargs=(
- $(cmake_use_find_package bzip2 BZip2)
- $(cmake_use_find_package lzma LibLZMA)
- $(cmake_use_find_package zip LibZip)
- )
-
- ecm_src_configure
-}
-
-pkg_postinst() {
- ecm_pkg_postinst
-
- if [[ -z "${REPLACING_VERSIONS}" ]]; then
- if ! has_version app-arch/rar; then
- elog "For creating/extracting rar archives, installing app-arch/rar is required."
- if ! has_version app-arch/unar && ! has_version app-arch/unrar; then
- elog "Alternatively, for only extracting rar archives, install app-arch/unar (free) or app-arch/unrar (non-free)."
- fi
- fi
-
- has_version app-arch/p7zip || \
- elog "For handling 7-Zip archives, install app-arch/p7zip."
-
- has_version app-arch/lrzip || \
- elog "For handling lrz archives, install app-arch/lrzip."
- fi
-}
diff --git a/kde-apps/ark/ark-19.12.3.ebuild b/kde-apps/ark/ark-19.12.3.ebuild
index 190dafd87995..53fc4c087280 100644
--- a/kde-apps/ark/ark-19.12.3.ebuild
+++ b/kde-apps/ark/ark-19.12.3.ebuild
@@ -16,7 +16,7 @@ https://utils.kde.org/projects/ark/"
LICENSE="GPL-2" # TODO: CHECK
SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
IUSE="bzip2 lzma zip"
BDEPEND="
diff --git a/kde-apps/artikulate/Manifest b/kde-apps/artikulate/Manifest
index 32640221eeaf..1e9d48690910 100644
--- a/kde-apps/artikulate/Manifest
+++ b/kde-apps/artikulate/Manifest
@@ -1,2 +1 @@
-DIST artikulate-19.08.3.tar.xz 3998692 BLAKE2B 77849480349e3edbd6b6a98884cc25b28ab6246dd36991f728659d9535f751ff68a13065fca4c510d96b87bfc12982f8c911cb59de2ef13ef33886d8ae157334 SHA512 2c27d37462fde6fe4b1b68efb96f71e4ee4b88c2685274872cad44a264a46a98bddc143d2074b3ccb0fe214a73abd54de204a52aeeb0ddae150a55c0c08ffb8c
DIST artikulate-19.12.3.tar.xz 4012108 BLAKE2B ea108b73b297af31cd145cba0617a726b5c62f6b7fb9f9787579c7195d2a9d39c71eb52229345c2df604c269659e1e8b455d895705e55b26057ade24b579c80b SHA512 aaf8054d928a7e76ac868ca0bbf99edde6d3402dd175880cb04088f18b8b23d15c7281775d694be0b0bef4ec37a2101f5cf1873a6d933ff5a3cdf4352b017e32
diff --git a/kde-apps/artikulate/artikulate-19.08.3.ebuild b/kde-apps/artikulate/artikulate-19.08.3.ebuild
deleted file mode 100644
index 283725ca9839..000000000000
--- a/kde-apps/artikulate/artikulate-19.08.3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="optional"
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Language learning application that helps improving pronunciation skills"
-HOMEPAGE="https://edu.kde.org/applications/language/artikulate"
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 arm64 x86"
-IUSE="+gstreamer qtmedia"
-
-REQUIRED_USE="|| ( gstreamer qtmedia )"
-
-DEPEND="
- >=kde-frameworks/karchive-${KFMIN}:5
- >=kde-frameworks/kconfig-${KFMIN}:5
- >=kde-frameworks/kconfigwidgets-${KFMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/kcrash-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/knewstuff-${KFMIN}:5
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
- >=kde-frameworks/kxmlgui-${KFMIN}:5
- >=dev-qt/qtdeclarative-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtsql-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=dev-qt/qtxml-${QTMIN}:5
- >=dev-qt/qtxmlpatterns-${QTMIN}:5
- gstreamer? ( >=media-libs/qt-gstreamer-1.2.0[qt5(+)] )
- qtmedia? ( >=dev-qt/qtmultimedia-${QTMIN}:5 )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
- local mycmakeargs=(
- -DBUILD_GSTREAMER_PLUGIN=$(usex gstreamer)
- -DBUILD_QTMULTIMEDIA_PLUGIN=$(usex qtmedia)
- )
-
- ecm_src_configure
-}
diff --git a/kde-apps/artikulate/artikulate-19.12.3.ebuild b/kde-apps/artikulate/artikulate-19.12.3.ebuild
index b252762c31c4..2c2e46d71418 100644
--- a/kde-apps/artikulate/artikulate-19.12.3.ebuild
+++ b/kde-apps/artikulate/artikulate-19.12.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://kde.org/applications/education/org.kde.artikulate"
LICENSE="GPL-2" # TODO: CHECK
SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
IUSE="+gstreamer qtmedia"
REQUIRED_USE="|| ( gstreamer qtmedia )"
diff --git a/kde-apps/audiocd-kio/Manifest b/kde-apps/audiocd-kio/Manifest
index a679e4585993..4fa1ad9caaca 100644
--- a/kde-apps/audiocd-kio/Manifest
+++ b/kde-apps/audiocd-kio/Manifest
@@ -1,2 +1 @@
-DIST audiocd-kio-19.08.3.tar.xz 355684 BLAKE2B c2cdd23f8138982be9eee050a3ed803898f76abf7b1e1aa8dd5a2fc1509dd89c1b26540728ab11461ede2fccdc8799f8ec3731882cf94f4eb89f9f27068bcc64 SHA512 602d125e05e3d86256860efd8bc822373b8d4c464f12ff05c811e16a5adc0d48fcd0523b09b521f5c759021e3f0c2fe47d57928f4be3132a757e61748d447b9e
DIST audiocd-kio-19.12.3.tar.xz 358248 BLAKE2B 06f600e152409ad9d1912afd4a23f5f0839d91d10b45dbd2cdd7908b13bf69bc11fa0b49a6bc84b3d78120b01f461b9ce337f6d831d799af7d228b8f0974a396 SHA512 dc89cbf8707bd47f533cc30174d197ea7a479d03ac69512de03d5ddf0d5361f25c2075d30781ac3a0fe2a04eaa7ce99a0dc2f36d9e9515a8b89aae33dcca0f4e
diff --git a/kde-apps/audiocd-kio/audiocd-kio-19.08.3.ebuild b/kde-apps/audiocd-kio/audiocd-kio-19.08.3.ebuild
deleted file mode 100644
index 82666c261330..000000000000
--- a/kde-apps/audiocd-kio/audiocd-kio-19.08.3.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="kioslave for accessing audio CDs"
-LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
-SLOT="5"
-KEYWORDS="amd64 arm64 x86"
-IUSE="flac vorbis"
-
-DEPEND="
- >=kde-frameworks/kcompletion-${KFMIN}:5
- >=kde-frameworks/kconfig-${KFMIN}:5
- >=kde-frameworks/kconfigwidgets-${KFMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/kcmutils-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/kio-${KFMIN}:5
- >=kde-apps/libkcddb-${PVCUT}:5
- >=kde-apps/libkcompactdisc-${PVCUT}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- media-sound/cdparanoia
- flac? ( >=media-libs/flac-1.1.2 )
- vorbis? (
- media-libs/libogg
- media-libs/libvorbis
- )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${PN}-19.04.0-handbook.patch" )
-
-src_configure() {
- local mycmakeargs=(
- $(cmake_use_find_package flac FLAC)
- $(cmake_use_find_package vorbis OggVorbis)
- )
-
- ecm_src_configure
-}
diff --git a/kde-apps/audiocd-kio/audiocd-kio-19.12.3.ebuild b/kde-apps/audiocd-kio/audiocd-kio-19.12.3.ebuild
index 48c9e0a377ac..26b4c973c0a0 100644
--- a/kde-apps/audiocd-kio/audiocd-kio-19.12.3.ebuild
+++ b/kde-apps/audiocd-kio/audiocd-kio-19.12.3.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="kioslave for accessing audio CDs"
LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
IUSE="flac vorbis"
DEPEND="
diff --git a/kde-apps/baloo-widgets/Manifest b/kde-apps/baloo-widgets/Manifest
index 356e5861b763..2bd676d8295a 100644
--- a/kde-apps/baloo-widgets/Manifest
+++ b/kde-apps/baloo-widgets/Manifest
@@ -1,2 +1 @@
-DIST baloo-widgets-19.08.3.tar.xz 261744 BLAKE2B 43580ec151165c1c5c59363a986e049e3366d1da4ae2ee79de9430ed9a09e9dd60be13ee5f9aaba92032be901be6a0ab497ae45a0735f0d0f64c8ee387d8b732 SHA512 f63525822a3e90e1f0c13e6b8d893f1e796efbd6061cdb6b976d9869e929b1c05ad5af1a955be0c7664372ba82f87978337a4ff3b4141d30cad80ad4606fded5
DIST baloo-widgets-19.12.3.tar.xz 259264 BLAKE2B fdc384d9b856d99e63cab88cd1a1cd723af84fb5c96ef97c1434b6fbeca7c925f5c79deda28de68902fc6eb3f1defb572f6995a0322163d5b51d30ddf6153031 SHA512 99c4f0aef513015371c9dce10e25e64b3eb7bf2e9dd741451332d141459bce777a0b0be29f2fb5cb198193ce6055d53744e84e9e5be089d958e829c39eb79f0f
diff --git a/kde-apps/baloo-widgets/baloo-widgets-19.08.3.ebuild b/kde-apps/baloo-widgets/baloo-widgets-19.08.3.ebuild
deleted file mode 100644
index 0546e955ae94..000000000000
--- a/kde-apps/baloo-widgets/baloo-widgets-19.08.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="forceoptional"
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Widget library for baloo"
-LICENSE="LGPL-2+ LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )"
-SLOT="5"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
- >=kde-frameworks/baloo-${KFMIN}:5
- >=kde-frameworks/kconfig-${KFMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/kfilemetadata-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/kio-${KFMIN}:5
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
-"
-RDEPEND="${DEPEND}"
-
-RESTRICT+=" test"
diff --git a/kde-apps/baloo-widgets/baloo-widgets-19.12.3.ebuild b/kde-apps/baloo-widgets/baloo-widgets-19.12.3.ebuild
index 71c73f3ffa35..2349a69ab80a 100644
--- a/kde-apps/baloo-widgets/baloo-widgets-19.12.3.ebuild
+++ b/kde-apps/baloo-widgets/baloo-widgets-19.12.3.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Widget library for baloo"
LICENSE="LGPL-2+ LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )"
SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
IUSE=""
DEPEND="
diff --git a/kde-apps/blinken/Manifest b/kde-apps/blinken/Manifest
index 2e11e90dbda8..8127b7c1d1f3 100644
--- a/kde-apps/blinken/Manifest
+++ b/kde-apps/blinken/Manifest
@@ -1,2 +1 @@
-DIST blinken-19.08.3.tar.xz 2820600 BLAKE2B cd367cec7664004be89ee242ffc829d4b0e02c76b3c94267af5b3a584012362644917e9dfa051ff9497dc56fc57380a33e0f7a96a09a70fd7cd1784a7cac6037 SHA512 0dd9d9afbaab7365878c4137e520e31cd1809a243598e7d1eb0e51b638306edc7860c9c057326f55f1ba3720f0529b4859cbcfaeef094811af19c07466d65c61
DIST blinken-19.12.3.tar.xz 2821156 BLAKE2B 4830acf962e6a1770175d8ce1e003e9ff6f11aeaf1b30a6f7590974137cab2dd9f4e2e67ca1b1e9c1f042b8a62bad98396693525bd00e78d52086569d1ae2220 SHA512 2903269216465affa06a82bab2e91bc81be98e780ee6005b652a3f08781911d4fff5a441b835780711cda9f765e9b1008c1a38ac5ba379ceb08f424cfa7f3938
diff --git a/kde-apps/blinken/blinken-19.08.3.ebuild b/kde-apps/blinken/blinken-19.08.3.ebuild
deleted file mode 100644
index f21838bda290..000000000000
--- a/kde-apps/blinken/blinken-19.08.3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Memory enhancement game based on KDE Frameworks"
-HOMEPAGE="https://kde.org/applications/education/blinken
-https://edu.kde.org/blinken/"
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
- >=kde-frameworks/kconfig-${KFMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/kcrash-${KFMIN}:5
- >=kde-frameworks/kdbusaddons-${KFMIN}:5
- >=kde-frameworks/kguiaddons-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/kxmlgui-${KFMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtsvg-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- media-libs/phonon[qt5(+)]
-"
-RDEPEND="${DEPEND}"
-
-src_install() {
- ecm_src_install
- rm "${ED}"/usr/share/${PN}/README.packagers || die
-}
diff --git a/kde-apps/blinken/blinken-19.12.3.ebuild b/kde-apps/blinken/blinken-19.12.3.ebuild
index 5605430beaa9..24ede8f20c63 100644
--- a/kde-apps/blinken/blinken-19.12.3.ebuild
+++ b/kde-apps/blinken/blinken-19.12.3.ebuild
@@ -14,7 +14,7 @@ https://edu.kde.org/blinken/"
LICENSE="GPL-2" # TODO: CHECK
SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
IUSE=""
DEPEND="
diff --git a/kde-apps/bomber/Manifest b/kde-apps/bomber/Manifest
index 5e4dfe0642ba..aaa13125ba74 100644
--- a/kde-apps/bomber/Manifest
+++ b/kde-apps/bomber/Manifest
@@ -1,2 +1 @@
-DIST bomber-19.08.3.tar.xz 821164 BLAKE2B f9bd278b6aadd58421b36155de6e4a6a9e94f492314dfa99b6dc13bdbe562cbab01061ef79b8c1029fd037c6f74e5d2e0ca5ddce8ae998d1d0214a6077812c38 SHA512 991e6601fa5c89dafd8e25fb308ad2ebe4253bf0019e1dfc298128e2003ba9d01ceb21160ff44aa8fce46ce39fdb7152185cd89fa7b1a30e65dc9c04d32c4f50
DIST bomber-19.12.3.tar.xz 821352 BLAKE2B e87fbb90a57eeb8c2b724786212959a0247070bc48ce684af4c789faad9b6558ee95c7bedb36bb0745659d0765d4d5fbc5d6f24e4424f24e6cafb02987e842a3 SHA512 09eed297e60bf05aa2197c70deb4b5c67c59a4bef61a78496a90a03241eb379a950f56ac1102d89cba6f4abd15a528f79b5496d90ceab4831f08aa0108ed90fb
diff --git a/kde-apps/bomber/bomber-19.08.3.ebuild b/kde-apps/bomber/bomber-19.08.3.ebuild
deleted file mode 100644
index c2e39119d9f8..000000000000
--- a/kde-apps/bomber/bomber-19.08.3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Single player arcade bombing game"
-HOMEPAGE="https://kde.org/applications/games/bomber/"
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
- >=kde-frameworks/kconfig-${KFMIN}:5
- >=kde-frameworks/kconfigwidgets-${KFMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/kcrash-${KFMIN}:5
- >=kde-frameworks/kdbusaddons-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
- >=kde-frameworks/kxmlgui-${KFMIN}:5
- >=kde-apps/libkdegames-${PVCUT}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
-"
-RDEPEND="${DEPEND}
- !games-action/xbomber
-"
diff --git a/kde-apps/bomber/bomber-19.12.3.ebuild b/kde-apps/bomber/bomber-19.12.3.ebuild
index 21e75617edf0..5a7368d87f6b 100644
--- a/kde-apps/bomber/bomber-19.12.3.ebuild
+++ b/kde-apps/bomber/bomber-19.12.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://kde.org/applications/games/org.kde.bomber"
LICENSE="GPL-2" # TODO: CHECK
SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
IUSE=""
DEPEND="
diff --git a/kde-apps/bovo/Manifest b/kde-apps/bovo/Manifest
index 75bcca069422..b13037fdc469 100644
--- a/kde-apps/bovo/Manifest
+++ b/kde-apps/bovo/Manifest
@@ -1,2 +1 @@
-DIST bovo-19.08.3.tar.xz 200164 BLAKE2B 706ce9e463bdb72c8a6f2f29825e2e0d7c17df8ca7713de0d0705a0bda3455a589441aaa29fd50751bab8403c3a95d5f283f2bcae8600a37c904f671dceabea1 SHA512 f92150ad31b2230810c573c1ee1f5e5d906587823c747bb347ae62a39385f45b62c28a6452ada80c6c3e7b71c1ce87892d62d4bab41f80bf3fe5da09c3c8a349
DIST bovo-19.12.3.tar.xz 200496 BLAKE2B 108096398dfd1cc8d394b8b216f14360d7d58f4eaf62c0a7c1fff8cf72e9ea896ce235d147fb6c374f0870194c0393bfa1e57d9a3f669e4ca01166e4c086ad03 SHA512 a2b13a7e59c39188b642c7c5d43b071a7702cd770497ffef5f0f4b44d8b6117c3aa61e0e7d8db3fcf4c9f8db72d1a57c7cb4afc5831d13eb56aa723b35763855
diff --git a/kde-apps/bovo/bovo-19.08.3.ebuild b/kde-apps/bovo/bovo-19.08.3.ebuild
deleted file mode 100644
index 5d981385e433..000000000000
--- a/kde-apps/bovo/bovo-19.08.3.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Five-in-a-row Board Game"
-HOMEPAGE="https://kde.org/applications/games/bovo/"
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
- >=kde-frameworks/kconfig-${KFMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/kcrash-${KFMIN}:5
- >=kde-frameworks/kdbusaddons-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
- >=kde-frameworks/kxmlgui-${KFMIN}:5
- >=kde-apps/libkdegames-${PVCUT}:5
- >=dev-qt/qtconcurrent-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtsvg-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( AUTHORS HISTORY TODO )
diff --git a/kde-apps/bovo/bovo-19.12.3.ebuild b/kde-apps/bovo/bovo-19.12.3.ebuild
index 61cdf9d8445e..27035ad0e6c9 100644
--- a/kde-apps/bovo/bovo-19.12.3.ebuild
+++ b/kde-apps/bovo/bovo-19.12.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://kde.org/applications/games/org.kde.bovo"
LICENSE="GPL-2" # TODO: CHECK
SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
IUSE=""
DEPEND="
diff --git a/kde-apps/calendarjanitor/Manifest b/kde-apps/calendarjanitor/Manifest
index 3442a181989c..2272920d39ba 100644
--- a/kde-apps/calendarjanitor/Manifest
+++ b/kde-apps/calendarjanitor/Manifest
@@ -1,2 +1 @@
-DIST akonadi-calendar-tools-19.08.3.tar.xz 223564 BLAKE2B e0d9f01659a471307db2c7d8c0906297ec4a880cb0019414520b29a14eee68bf39b02d02dd4e5b3b03c3684022f675f30cdb6efb214adaca64dc27f5eec03c25 SHA512 4cc146da96f6a006749e4c3e0962155fc8bcd788d2ed39adbbe73f1d82bc4264349ce06a9b524ff4fb1a1675e0d66345e5bbad8044360b6fe28d9565672f3922
DIST akonadi-calendar-tools-19.12.3.tar.xz 223340 BLAKE2B b438f392618d919440fddf0ba5d48ab52a0c509507018d7f546b477aa83a34e8f86551c44998337ba2cfba8050d31cde9dc6f672b1a9ce6b558b292bb960d483 SHA512 eac1400ff742199908daf765b5cf14efd12b630a34e6fe0ac6bb17072b05902e746af5740a8e0db82a5ea7535a413140e9b6d4ea029f2abe684aff05098a8b39
diff --git a/kde-apps/calendarjanitor/calendarjanitor-19.08.3.ebuild b/kde-apps/calendarjanitor/calendarjanitor-19.08.3.ebuild
deleted file mode 100644
index c79906f5590e..000000000000
--- a/kde-apps/calendarjanitor/calendarjanitor-19.08.3.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional" # FIXME: Check back for doc in release
-ECM_TEST="false"
-KDE_ORG_NAME="akonadi-calendar-tools"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Tool to scan calendar data for buggy instances"
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-SLOT="5"
-KEYWORDS="amd64 arm64 x86"
-
-IUSE=""
-
-DEPEND="
- >=kde-frameworks/kcalendarcore-${KFMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-apps/akonadi-${PVCUT}:5
- >=kde-apps/akonadi-calendar-${PVCUT}:5
- >=kde-apps/calendarsupport-${PVCUT}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
-"
-RDEPEND="${DEPEND}
- !kde-apps/kdepim-l10n
-"
-
-src_prepare() {
- ecm_src_prepare
-
- cmake_comment_add_subdirectory doc konsolekalendar
- sed -i -e "/console\.categories/ s/^/#DONT/" CMakeLists.txt || die
-
- # delete colliding konsolekalendar translations
- if [[ ${KDE_BUILD_TYPE} = release ]]; then
- rm -f po/*/konsolekalendar.po || die
- rm -rf po/*/docs/konsolekalendar || die
- fi
-}
diff --git a/kde-apps/calendarjanitor/calendarjanitor-19.12.3.ebuild b/kde-apps/calendarjanitor/calendarjanitor-19.12.3.ebuild
index 5894e3ecd9a8..ecb7b0777bf6 100644
--- a/kde-apps/calendarjanitor/calendarjanitor-19.12.3.ebuild
+++ b/kde-apps/calendarjanitor/calendarjanitor-19.12.3.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="Tool to scan calendar data for buggy instances"
LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
IUSE=""
DEPEND="
diff --git a/kde-apps/calendarsupport/Manifest b/kde-apps/calendarsupport/Manifest
index a135d504f10b..43f78c16d089 100644
--- a/kde-apps/calendarsupport/Manifest
+++ b/kde-apps/calendarsupport/Manifest
@@ -1,2 +1 @@
-DIST calendarsupport-19.08.3.tar.xz 646440 BLAKE2B f43f743cf6cbe39601cab39d38565f129f6470099770d60ca9805ab4edc7d9ee8427675d76e5f9b948ee3ee47e119661263519f4121547f5ef6778b7f9d1d7c2 SHA512 a93243c625aab807cf04c57fe60ccdac9d4bb341da4639ceff5aa0c65d569107ebae8a07dc0053f2b83028e9729368a08969dacbebdba8e645fa108b4e1ac567
DIST calendarsupport-19.12.3.tar.xz 648448 BLAKE2B ce0390118e53a2b796c5a99e80c8c58132499e45e0cff96369780059b9bca12a1caf2a4f4a84c2df5bed9bfbce6620fee1857957dcba1f0a42a2aacb59f225a9 SHA512 2f66d9e9f7db1215726bd79255ace156fbad18a0db1a8465e713ac3df7cd39efa104dfbed0e3d84f556a46ba3771124e044430ecbead048d0cff7401d5236dbb
diff --git a/kde-apps/calendarsupport/calendarsupport-19.08.3.ebuild b/kde-apps/calendarsupport/calendarsupport-19.08.3.ebuild
deleted file mode 100644
index 383dadb223a6..000000000000
--- a/kde-apps/calendarsupport/calendarsupport-19.08.3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="false"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Calendar support library"
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="5"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
- >=kde-frameworks/kcalendarcore-${KFMIN}:5
- >=kde-frameworks/kcodecs-${KFMIN}:5
- >=kde-frameworks/kcompletion-${KFMIN}:5
- >=kde-frameworks/kconfig-${KFMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/kguiaddons-${KFMIN}:5
- >=kde-frameworks/kholidays-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/kiconthemes-${KFMIN}:5
- >=kde-frameworks/kio-${KFMIN}:5
- >=kde-frameworks/kjobwidgets-${KFMIN}:5
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
- >=kde-apps/akonadi-${PVCUT}:5
- >=kde-apps/akonadi-calendar-${PVCUT}:5
- >=kde-apps/akonadi-mime-${PVCUT}:5
- >=kde-apps/kcalutils-${PVCUT}:5
- >=kde-apps/kdepim-apps-libs-${PVCUT}:5
- >=kde-apps/kidentitymanagement-${PVCUT}:5
- >=kde-apps/kmime-${PVCUT}:5
- >=kde-apps/libkdepim-${PVCUT}:5
- >=kde-apps/pimcommon-${PVCUT}:5
- >=dev-qt/designer-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtprintsupport-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- dev-libs/libical
-"
-RDEPEND="${DEPEND}
- !kde-apps/kdepim-l10n
-"
diff --git a/kde-apps/calendarsupport/calendarsupport-19.12.3.ebuild b/kde-apps/calendarsupport/calendarsupport-19.12.3.ebuild
index 5da9a8a18de1..54a899c0d13a 100644
--- a/kde-apps/calendarsupport/calendarsupport-19.12.3.ebuild
+++ b/kde-apps/calendarsupport/calendarsupport-19.12.3.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Calendar support library"
LICENSE="GPL-2+ LGPL-2.1+"
SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
IUSE=""
DEPEND="
diff --git a/kde-apps/cantor/Manifest b/kde-apps/cantor/Manifest
index 58a4e0ea012b..16bedc442186 100644
--- a/kde-apps/cantor/Manifest
+++ b/kde-apps/cantor/Manifest
@@ -1,2 +1 @@
-DIST cantor-19.08.3.tar.xz 2538816 BLAKE2B e2445835eb6ffb368b50fab2089642a28ee3548bf572d3265b152696a4d45e1deb984793bae2819361132097f5dd19ea98ddcd7643c3675a8fd7c3f2fe3518a0 SHA512 1dc545c2c122d0303d418c757d7f4079250354e4326f2ec0d4796de343d00beb580ab47945ecc6ea491f4cd893bbfe6fced7eeb0ab8e3122000b4c75912ca807
DIST cantor-19.12.3.tar.xz 9014164 BLAKE2B d88c820a36806facc76197ba2e29fece503fba2e3bafe5d856c64243b6d098babc4ae6da082e7c07f20b499f9ed2373aeccfbb5dcede196214d8a2c582de302a SHA512 83324f7a1702b5ed5d74ecab7664b653b8f318b03b6c856c7a70133b2aaf0927cf8b16a8ba9e27a7224d4d8d5900f1dcdbc89e70f40871f000db29f6f072668a
diff --git a/kde-apps/cantor/cantor-19.08.3.ebuild b/kde-apps/cantor/cantor-19.08.3.ebuild
deleted file mode 100644
index 33ced1b63d6d..000000000000
--- a/kde-apps/cantor/cantor-19.08.3.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="forceoptional"
-PYTHON_COMPAT=( python3_{6,7} )
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit ecm kde.org python-single-r1
-
-DESCRIPTION="Interface for doing mathematics and scientific computing"
-HOMEPAGE="https://kde.org/applications/education/cantor https://edu.kde.org/cantor/"
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 arm64 x86"
-IUSE="+analitza julia lua markdown postscript python qalculate R"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-# TODO Add Sage Mathematics Software backend (http://www.sagemath.org)
-DEPEND="
- >=kde-frameworks/karchive-${KFMIN}:5
- >=kde-frameworks/kcompletion-${KFMIN}:5
- >=kde-frameworks/kconfig-${KFMIN}:5
- >=kde-frameworks/kconfigwidgets-${KFMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/kcrash-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/kiconthemes-${KFMIN}:5
- >=kde-frameworks/kio-${KFMIN}:5
- >=kde-frameworks/knewstuff-${KFMIN}:5
- >=kde-frameworks/kparts-${KFMIN}:5
- >=kde-frameworks/kpty-${KFMIN}:5
- >=kde-frameworks/ktexteditor-${KFMIN}:5
- >=kde-frameworks/ktextwidgets-${KFMIN}:5
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
- >=kde-frameworks/kxmlgui-${KFMIN}:5
- >=kde-frameworks/syntax-highlighting-${KFMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtprintsupport-${QTMIN}:5
- >=dev-qt/qtsvg-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=dev-qt/qtxml-${QTMIN}:5
- >=dev-qt/qtxmlpatterns-${QTMIN}:5
- analitza? ( >=kde-apps/analitza-${PVCUT}:5 )
- julia? ( dev-lang/julia )
- lua? ( dev-lang/luajit:2 )
- markdown? ( >=app-text/discount-2.2.2 )
- qalculate? (
- sci-libs/cln
- sci-libs/libqalculate:=
- )
- postscript? ( app-text/libspectre )
- python? (
- ${PYTHON_DEPS}
- >=dev-qt/qtdbus-${QTMIN}:5
- )
- R? ( dev-lang/R )
-"
-RDEPEND="${DEPEND}"
-
-RESTRICT+=" test"
-
-pkg_pretend() {
- ecm_pkg_pretend
-
- if ! has_version sci-mathematics/maxima && ! has_version sci-mathematics/octave && \
- ! use analitza && ! use julia && ! use lua && ! use python && ! use qalculate && ! use R; then
- elog "You have decided to build ${PN} with no backend."
- elog "To have this application functional, please enable one of the backends via USE flag:"
- elog " analitza, lua, python, qalculate, R"
- elog "Alternatively, install one of these:"
- elog " # emerge sci-mathematics/maxima (bug #619534)"
- elog " # emerge sci-mathematics/octave"
- elog "Experimental available USE flag:"
- elog " julia (not stable, bug #613576)"
- elog
- fi
-
- if ! has_version virtual/latex-base; then
- elog "For LaTeX support:"
- elog " # emerge virtual/latex-base"
- fi
-}
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
- ecm_pkg_setup
-}
-
-src_configure() {
- use julia && addpredict /proc/self/mem # bug 602894
-
- local mycmakeargs=(
- -DCMAKE_DISABLE_FIND_PACKAGE_PythonLibs=ON
- $(cmake_use_find_package analitza Analitza5)
- $(cmake_use_find_package julia Julia)
- $(cmake_use_find_package lua LuaJIT)
- $(cmake_use_find_package markdown Discount)
- $(cmake_use_find_package postscript LibSpectre)
- $(cmake_use_find_package python PythonLibs3)
- $(cmake_use_find_package qalculate Qalculate)
- $(cmake_use_find_package R R)
- )
- ecm_src_configure
-}
diff --git a/kde-apps/cantor/cantor-19.12.3.ebuild b/kde-apps/cantor/cantor-19.12.3.ebuild
index 33a7be46e6a5..8ea8b81d79df 100644
--- a/kde-apps/cantor/cantor-19.12.3.ebuild
+++ b/kde-apps/cantor/cantor-19.12.3.ebuild
@@ -18,7 +18,7 @@ https://edu.kde.org/cantor/"
LICENSE="GPL-2" # TODO: CHECK
SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
IUSE="+analitza julia lua postscript python qalculate R"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/kde-apps/cantor/metadata.xml b/kde-apps/cantor/metadata.xml
index 23b2f303adc2..20e3a5914aa1 100644
--- a/kde-apps/cantor/metadata.xml
+++ b/kde-apps/cantor/metadata.xml
@@ -9,7 +9,6 @@
Enable kde-apps/analitza backend support
Enable dev-lang/julia backend support
Enable sci-libs/libqalculate backend support
- Enable Markdown support via app-text/discount
Enable dev-lang/R backend support
diff --git a/kde-apps/cervisia/Manifest b/kde-apps/cervisia/Manifest
index 1f861bae6d14..a097cfe42840 100644
--- a/kde-apps/cervisia/Manifest
+++ b/kde-apps/cervisia/Manifest
@@ -1,2 +1 @@
-DIST cervisia-19.08.3.tar.xz 1894440 BLAKE2B d5aa3e9404960fca3f241e7c96ce01b5f3f45840d17585d3d3710287e11375d65deabfe21642a26170e9d088743c8acd2bb941ea5ce9484ec1d451202ac74271 SHA512 82253694b67dfdc87f2887d5a2b1866929440439a66b0145b546207786e2509477a5b3766be378e760f3f6f2a224f8c084e8f4280f980e3738ddcdd571dfb0f3
DIST cervisia-19.12.3.tar.xz 1894600 BLAKE2B 6673ad0bf5cfb448ff245bb8c5f6ea00cfec7fe68e74f5f3b3e9b48bd9ab0fce0d902669ce658adfe8f942c495a2afd74e9a1b1e3475a4e4a2dd37656abdd0b1 SHA512 32ce40a39f3f3db1b1b55838209baf676508b6c6ddbb74e4fd50a178d48d1dc68f3ca95962a49035bfd192711ce87a6ea2af48ebb81d9d2ab726e38132fe7749
diff --git a/kde-apps/cervisia/cervisia-19.08.3.ebuild b/kde-apps/cervisia/cervisia-19.08.3.ebuild
deleted file mode 100644
index 806074cb1e72..000000000000
--- a/kde-apps/cervisia/cervisia-19.08.3.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="CVS frontend by KDE"
-HOMEPAGE="https://kde.org/applications/development/cervisia"
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
- >=kde-frameworks/kcompletion-${KFMIN}:5
- >=kde-frameworks/kconfig-${KFMIN}:5
- >=kde-frameworks/kconfigwidgets-${KFMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/kdesu-${KFMIN}:5
- >=kde-frameworks/kiconthemes-${KFMIN}:5
- >=kde-frameworks/kinit-${KFMIN}:5
- >=kde-frameworks/kio-${KFMIN}:5
- >=kde-frameworks/kitemviews-${KFMIN}:5
- >=kde-frameworks/knotifications-${KFMIN}:5
- >=kde-frameworks/kparts-${KFMIN}:5
- >=kde-frameworks/kservice-${KFMIN}:5
- >=kde-frameworks/ktextwidgets-${KFMIN}:5
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
- >=kde-frameworks/kxmlgui-${KFMIN}:5
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
-"
-RDEPEND="${DEPEND}
- dev-vcs/cvs
-"
diff --git a/kde-apps/cervisia/cervisia-19.12.3.ebuild b/kde-apps/cervisia/cervisia-19.12.3.ebuild
index 2ddc0732920b..667a5a06f27a 100644
--- a/kde-apps/cervisia/cervisia-19.12.3.ebuild
+++ b/kde-apps/cervisia/cervisia-19.12.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://kde.org/applications/development/org.kde.cervisia"
LICENSE="GPL-2" # TODO: CHECK
SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
IUSE=""
DEPEND="
diff --git a/kde-apps/dolphin-plugins-bazaar/Manifest b/kde-apps/dolphin-plugins-bazaar/Manifest
index 1fbc933a948b..214e1c28b667 100644
--- a/kde-apps/dolphin-plugins-bazaar/Manifest
+++ b/kde-apps/dolphin-plugins-bazaar/Manifest
@@ -1,2 +1 @@
-DIST dolphin-plugins-19.08.3.tar.xz 192608 BLAKE2B 36ad06761a2e016d23af7fcfd206b7d5bd0e07a26f7268dfa40f8f111555c8f41545751c5255d94cab4c8855f3c5e47dacfe762ec4558abc7620f4c6dea1668c SHA512 a9155d8811eebfdaf0e76636746eca20e065d994a7c9e69672e8ebb9cdede118ce518e012e165d3ea82786ee53d46d044e63f208564d2de91b0c8d8c9daf509e
DIST dolphin-plugins-19.12.3.tar.xz 195464 BLAKE2B b60be81fcb9932f9f645bc614ab74c2e862ef70df6958242dc67de2b9cb570cc8961c2ac593ad99db636f19bec1793316dab21b9cee9a59cf2764b67234c312a SHA512 f6d1ce129095d0ae608b2da4d91f55b93bb8fe94795c09217cc87607bb50cd8dcc5a7dac21b8655f9993da56ef90fa705520c7ac928295edb5254050af9c4a1e
diff --git a/kde-apps/dolphin-plugins-bazaar/dolphin-plugins-bazaar-19.08.3.ebuild b/kde-apps/dolphin-plugins-bazaar/dolphin-plugins-bazaar-19.08.3.ebuild
deleted file mode 100644
index 3ee3fc62e9ec..000000000000
--- a/kde-apps/dolphin-plugins-bazaar/dolphin-plugins-bazaar-19.08.3.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_ORG_NAME="dolphin-plugins"
-ECM_HANDBOOK="false"
-MY_PLUGIN_NAME="bazaar"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Dolphin plugin for Bazaar integration"
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/kio-${KFMIN}:5
- >=kde-frameworks/ktextwidgets-${KFMIN}:5
- >=kde-apps/dolphin-${PVCUT}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
-"
-RDEPEND="${DEPEND}
- !kde-apps/dolphin-plugins:5
- dev-vcs/bzr
-"
-
-src_prepare() {
- ecm_src_prepare
- # kxmlgui, qtnetwork only required by dropbox
- ecm_punt_bogus_dep Qt5 Network
- ecm_punt_bogus_dep KF5 XmlGui
- # delete non-${PN} translations
- if [[ ${KDE_BUILD_TYPE} = release ]]; then
- find po -type f -name "*po" -and -not -name "*${MY_PLUGIN_NAME}plugin" -delete || die
- fi
-}
-
-src_configure() {
- local mycmakeargs=(
- -DBUILD_${MY_PLUGIN_NAME}=ON
- -DBUILD_dropbox=OFF
- -DBUILD_git=OFF
- -DBUILD_hg=OFF
- -DBUILD_svn=OFF
- )
- ecm_src_configure
-}
diff --git a/kde-apps/dolphin-plugins-bazaar/dolphin-plugins-bazaar-19.12.3.ebuild b/kde-apps/dolphin-plugins-bazaar/dolphin-plugins-bazaar-19.12.3.ebuild
index 9c254d28af01..96b189bc158f 100644
--- a/kde-apps/dolphin-plugins-bazaar/dolphin-plugins-bazaar-19.12.3.ebuild
+++ b/kde-apps/dolphin-plugins-bazaar/dolphin-plugins-bazaar-19.12.3.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://kde.org/applications/system/org.kde.dolphin_plugins"
LICENSE="GPL-2" # TODO: CHECK
SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
IUSE=""
DEPEND="
diff --git a/kde-apps/dolphin-plugins-dropbox/Manifest b/kde-apps/dolphin-plugins-dropbox/Manifest
index 1fbc933a948b..214e1c28b667 100644
--- a/kde-apps/dolphin-plugins-dropbox/Manifest
+++ b/kde-apps/dolphin-plugins-dropbox/Manifest
@@ -1,2 +1 @@
-DIST dolphin-plugins-19.08.3.tar.xz 192608 BLAKE2B 36ad06761a2e016d23af7fcfd206b7d5bd0e07a26f7268dfa40f8f111555c8f41545751c5255d94cab4c8855f3c5e47dacfe762ec4558abc7620f4c6dea1668c SHA512 a9155d8811eebfdaf0e76636746eca20e065d994a7c9e69672e8ebb9cdede118ce518e012e165d3ea82786ee53d46d044e63f208564d2de91b0c8d8c9daf509e
DIST dolphin-plugins-19.12.3.tar.xz 195464 BLAKE2B b60be81fcb9932f9f645bc614ab74c2e862ef70df6958242dc67de2b9cb570cc8961c2ac593ad99db636f19bec1793316dab21b9cee9a59cf2764b67234c312a SHA512 f6d1ce129095d0ae608b2da4d91f55b93bb8fe94795c09217cc87607bb50cd8dcc5a7dac21b8655f9993da56ef90fa705520c7ac928295edb5254050af9c4a1e
diff --git a/kde-apps/dolphin-plugins-dropbox/dolphin-plugins-dropbox-19.08.3.ebuild b/kde-apps/dolphin-plugins-dropbox/dolphin-plugins-dropbox-19.08.3.ebuild
deleted file mode 100644
index d5e4234d75ae..000000000000
--- a/kde-apps/dolphin-plugins-dropbox/dolphin-plugins-dropbox-19.08.3.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_ORG_NAME="dolphin-plugins"
-ECM_HANDBOOK="false"
-MY_PLUGIN_NAME="dropbox"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Dolphin plugin for Dropbox service integration"
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/kio-${KFMIN}:5
- >=kde-frameworks/ktextwidgets-${KFMIN}:5
- >=kde-frameworks/kxmlgui-${KFMIN}:5
- >=kde-apps/dolphin-${PVCUT}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtnetwork-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
-"
-RDEPEND="${DEPEND}
- !kde-apps/dolphin-plugins:5
- net-misc/dropbox-cli
-"
-
-src_prepare() {
- ecm_src_prepare
- # delete non-${PN} translations
- if [[ ${KDE_BUILD_TYPE} = release ]]; then
- find po -type f -name "*po" -and -not -name "*${MY_PLUGIN_NAME}plugin" -delete || die
- fi
-}
-
-src_configure() {
- local mycmakeargs=(
- -DBUILD_${MY_PLUGIN_NAME}=ON
- -DBUILD_bazaar=OFF
- -DBUILD_git=OFF
- -DBUILD_hg=OFF
- -DBUILD_svn=OFF
- )
- ecm_src_configure
-}
diff --git a/kde-apps/dolphin-plugins-dropbox/dolphin-plugins-dropbox-19.12.3.ebuild b/kde-apps/dolphin-plugins-dropbox/dolphin-plugins-dropbox-19.12.3.ebuild
index 18e44e35c577..1e05dd1b6f60 100644
--- a/kde-apps/dolphin-plugins-dropbox/dolphin-plugins-dropbox-19.12.3.ebuild
+++ b/kde-apps/dolphin-plugins-dropbox/dolphin-plugins-dropbox-19.12.3.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://kde.org/applications/system/org.kde.dolphin_plugins"
LICENSE="GPL-2" # TODO: CHECK
SLOT="5"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
DEPEND="
diff --git a/kde-apps/dolphin-plugins-git/Manifest b/kde-apps/dolphin-plugins-git/Manifest
index 1fbc933a948b..214e1c28b667 100644
--- a/kde-apps/dolphin-plugins-git/Manifest
+++ b/kde-apps/dolphin-plugins-git/Manifest
@@ -1,2 +1 @@
-DIST dolphin-plugins-19.08.3.tar.xz 192608 BLAKE2B 36ad06761a2e016d23af7fcfd206b7d5bd0e07a26f7268dfa40f8f111555c8f41545751c5255d94cab4c8855f3c5e47dacfe762ec4558abc7620f4c6dea1668c SHA512 a9155d8811eebfdaf0e76636746eca20e065d994a7c9e69672e8ebb9cdede118ce518e012e165d3ea82786ee53d46d044e63f208564d2de91b0c8d8c9daf509e
DIST dolphin-plugins-19.12.3.tar.xz 195464 BLAKE2B b60be81fcb9932f9f645bc614ab74c2e862ef70df6958242dc67de2b9cb570cc8961c2ac593ad99db636f19bec1793316dab21b9cee9a59cf2764b67234c312a SHA512 f6d1ce129095d0ae608b2da4d91f55b93bb8fe94795c09217cc87607bb50cd8dcc5a7dac21b8655f9993da56ef90fa705520c7ac928295edb5254050af9c4a1e
diff --git a/kde-apps/dolphin-plugins-git/dolphin-plugins-git-19.08.3.ebuild b/kde-apps/dolphin-plugins-git/dolphin-plugins-git-19.08.3.ebuild
deleted file mode 100644
index b93a5e4ac2c0..000000000000
--- a/kde-apps/dolphin-plugins-git/dolphin-plugins-git-19.08.3.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_ORG_NAME="dolphin-plugins"
-ECM_HANDBOOK="false"
-MY_PLUGIN_NAME="git"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Dolphin plugin for Git integration"
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
- >=kde-frameworks/kcompletion-${KFMIN}:5
- >=kde-frameworks/kconfig-${KFMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/kio-${KFMIN}:5
- >=kde-frameworks/ktextwidgets-${KFMIN}:5
- >=kde-apps/dolphin-${PVCUT}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
-"
-RDEPEND="${DEPEND}
- !kde-apps/dolphin-plugins:5
- dev-vcs/git
-"
-
-src_prepare() {
- ecm_src_prepare
- # kxmlgui, qtnetwork only required by dropbox
- ecm_punt_bogus_dep Qt5 Network
- ecm_punt_bogus_dep KF5 XmlGui
- # delete non-${PN} translations
- if [[ ${KDE_BUILD_TYPE} = release ]]; then
- find po -type f -name "*po" -and -not -name "*${MY_PLUGIN_NAME}plugin" -delete || die
- fi
-}
-
-src_configure() {
- local mycmakeargs=(
- -DBUILD_${MY_PLUGIN_NAME}=ON
- -DBUILD_bazaar=OFF
- -DBUILD_dropbox=OFF
- -DBUILD_hg=OFF
- -DBUILD_svn=OFF
- )
- ecm_src_configure
-}
diff --git a/kde-apps/dolphin-plugins-git/dolphin-plugins-git-19.12.3.ebuild b/kde-apps/dolphin-plugins-git/dolphin-plugins-git-19.12.3.ebuild
index c489a07f85f9..506633212973 100644
--- a/kde-apps/dolphin-plugins-git/dolphin-plugins-git-19.12.3.ebuild
+++ b/kde-apps/dolphin-plugins-git/dolphin-plugins-git-19.12.3.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://kde.org/applications/system/org.kde.dolphin_plugins"
LICENSE="GPL-2" # TODO: CHECK
SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
IUSE=""
DEPEND="
diff --git a/kde-apps/dolphin-plugins-mercurial/Manifest b/kde-apps/dolphin-plugins-mercurial/Manifest
index 1fbc933a948b..214e1c28b667 100644
--- a/kde-apps/dolphin-plugins-mercurial/Manifest
+++ b/kde-apps/dolphin-plugins-mercurial/Manifest
@@ -1,2 +1 @@
-DIST dolphin-plugins-19.08.3.tar.xz 192608 BLAKE2B 36ad06761a2e016d23af7fcfd206b7d5bd0e07a26f7268dfa40f8f111555c8f41545751c5255d94cab4c8855f3c5e47dacfe762ec4558abc7620f4c6dea1668c SHA512 a9155d8811eebfdaf0e76636746eca20e065d994a7c9e69672e8ebb9cdede118ce518e012e165d3ea82786ee53d46d044e63f208564d2de91b0c8d8c9daf509e
DIST dolphin-plugins-19.12.3.tar.xz 195464 BLAKE2B b60be81fcb9932f9f645bc614ab74c2e862ef70df6958242dc67de2b9cb570cc8961c2ac593ad99db636f19bec1793316dab21b9cee9a59cf2764b67234c312a SHA512 f6d1ce129095d0ae608b2da4d91f55b93bb8fe94795c09217cc87607bb50cd8dcc5a7dac21b8655f9993da56ef90fa705520c7ac928295edb5254050af9c4a1e
diff --git a/kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-19.08.3.ebuild b/kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-19.08.3.ebuild
deleted file mode 100644
index aa9f14c9e97c..000000000000
--- a/kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-19.08.3.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_ORG_NAME="dolphin-plugins"
-ECM_HANDBOOK="false"
-MY_PLUGIN_NAME="hg"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Dolphin plugin for Mercurial integration"
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
- >=kde-frameworks/kcompletion-${KFMIN}:5
- >=kde-frameworks/kconfig-${KFMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/kio-${KFMIN}:5
- >=kde-frameworks/kservice-${KFMIN}:5
- >=kde-frameworks/ktexteditor-${KFMIN}:5
- >=kde-frameworks/ktextwidgets-${KFMIN}:5
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
- >=kde-apps/dolphin-${PVCUT}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
-"
-RDEPEND="${DEPEND}
- !kde-apps/dolphin-plugins:5
- dev-vcs/mercurial
-"
-
-src_prepare() {
- ecm_src_prepare
- # kxmlgui, qtnetwork only required by dropbox
- ecm_punt_bogus_dep Qt5 Network
- ecm_punt_bogus_dep KF5 XmlGui
- # delete non-${PN} translations
- if [[ ${KDE_BUILD_TYPE} = release ]]; then
- find po -type f -name "*po" -and -not -name "*${MY_PLUGIN_NAME}plugin" -delete || die
- fi
-}
-
-src_configure() {
- local mycmakeargs=(
- -DBUILD_${MY_PLUGIN_NAME}=ON
- -DBUILD_bazaar=OFF
- -DBUILD_dropbox=OFF
- -DBUILD_git=OFF
- -DBUILD_svn=OFF
- )
- ecm_src_configure
-}
diff --git a/kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-19.12.3.ebuild b/kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-19.12.3.ebuild
index 7cd6e8a4587a..82a165e54076 100644
--- a/kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-19.12.3.ebuild
+++ b/kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-19.12.3.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://kde.org/applications/system/org.kde.dolphin_plugins"
LICENSE="GPL-2" # TODO: CHECK
SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
IUSE=""
DEPEND="
diff --git a/kde-apps/dolphin-plugins-subversion/Manifest b/kde-apps/dolphin-plugins-subversion/Manifest
index 1fbc933a948b..214e1c28b667 100644
--- a/kde-apps/dolphin-plugins-subversion/Manifest
+++ b/kde-apps/dolphin-plugins-subversion/Manifest
@@ -1,2 +1 @@
-DIST dolphin-plugins-19.08.3.tar.xz 192608 BLAKE2B 36ad06761a2e016d23af7fcfd206b7d5bd0e07a26f7268dfa40f8f111555c8f41545751c5255d94cab4c8855f3c5e47dacfe762ec4558abc7620f4c6dea1668c SHA512 a9155d8811eebfdaf0e76636746eca20e065d994a7c9e69672e8ebb9cdede118ce518e012e165d3ea82786ee53d46d044e63f208564d2de91b0c8d8c9daf509e
DIST dolphin-plugins-19.12.3.tar.xz 195464 BLAKE2B b60be81fcb9932f9f645bc614ab74c2e862ef70df6958242dc67de2b9cb570cc8961c2ac593ad99db636f19bec1793316dab21b9cee9a59cf2764b67234c312a SHA512 f6d1ce129095d0ae608b2da4d91f55b93bb8fe94795c09217cc87607bb50cd8dcc5a7dac21b8655f9993da56ef90fa705520c7ac928295edb5254050af9c4a1e
diff --git a/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-19.08.3.ebuild b/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-19.08.3.ebuild
deleted file mode 100644
index 64720d0bfdf2..000000000000
--- a/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-19.08.3.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_ORG_NAME="dolphin-plugins"
-ECM_HANDBOOK="false"
-MY_PLUGIN_NAME="svn"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Dolphin plugin for Subversion integration"
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/kio-${KFMIN}:5
- >=kde-frameworks/ktextwidgets-${KFMIN}:5
- >=kde-apps/dolphin-${PVCUT}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
-"
-RDEPEND="${DEPEND}
- !kde-apps/dolphin-plugins:5
- >=kde-apps/kompare-${PVCUT}:5
- dev-vcs/subversion
-"
-
-src_prepare() {
- ecm_src_prepare
- # kxmlgui, qtnetwork only required by dropbox
- ecm_punt_bogus_dep Qt5 Network
- ecm_punt_bogus_dep KF5 XmlGui
- # delete non-${PN} translations
- if [[ ${KDE_BUILD_TYPE} = release ]]; then
- find po -type f -name "*po" -and -not -name "*${MY_PLUGIN_NAME}plugin" -delete || die
- fi
-}
-
-src_configure() {
- local mycmakeargs=(
- -DBUILD_${MY_PLUGIN_NAME}=ON
- -DBUILD_bazaar=OFF
- -DBUILD_dropbox=OFF
- -DBUILD_git=OFF
- -DBUILD_hg=OFF
- )
- ecm_src_configure
-}
diff --git a/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-19.12.3.ebuild b/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-19.12.3.ebuild
index cb49ab63ca7f..4d619ca4a11d 100644
--- a/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-19.12.3.ebuild
+++ b/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-19.12.3.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://kde.org/applications/system/org.kde.dolphin_plugins"
LICENSE="GPL-2" # TODO: CHECK
SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
IUSE=""
DEPEND="
diff --git a/kde-apps/dolphin/Manifest b/kde-apps/dolphin/Manifest
index 13a1513630d6..cc955e886d65 100644
--- a/kde-apps/dolphin/Manifest
+++ b/kde-apps/dolphin/Manifest
@@ -1,2 +1 @@
-DIST dolphin-19.08.3.tar.xz 5276344 BLAKE2B f894ab567be12bd3c6194c84897c13201a286064f9b1e10690b88433ae712d4d14870783d729d1d61fde89700709ae75262111684ef592e66c1c3c66bb606e9d SHA512 4390f97398b437b24f0139982e068e32a042a0740790b7dbf19747cd77b41c70dd04f0c6ba3120775f8ce48f43bdd3d2cff4590ba5556773950dd73dd9f7aad0
DIST dolphin-19.12.3.tar.xz 4781456 BLAKE2B 310d0ea5e25b5d934bd501ac0c9bed15a4545b6b16299ad138715b6a33f20edd91675af679bb4249fd523fbf5ffe57c12cc1d7691a167e1783648698a533d584 SHA512 d4922774adea1aa5f68654f5fc0db5e2da653487ffbf8bc519d1b03f141355cedfb4d52aebf6570ab2fb40a0edac2bba42ecece983cbf31dca2ee02fa3b98fb5
diff --git a/kde-apps/dolphin/dolphin-19.08.3.ebuild b/kde-apps/dolphin/dolphin-19.08.3.ebuild
deleted file mode 100644
index 8a4b107a6fa6..000000000000
--- a/kde-apps/dolphin/dolphin-19.08.3.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="true"
-VIRTUALX_REQUIRED="test"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Plasma filemanager focusing on usability"
-HOMEPAGE="https://kde.org/applications/system/dolphin https://userbase.kde.org/Dolphin"
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 arm64 x86"
-IUSE="activities semantic-desktop"
-
-DEPEND="
- >=kde-frameworks/kbookmarks-${KFMIN}:5
- >=kde-frameworks/kcmutils-${KFMIN}:5
- >=kde-frameworks/kcodecs-${KFMIN}:5
- >=kde-frameworks/kcompletion-${KFMIN}:5
- >=kde-frameworks/kconfig-${KFMIN}:5
- >=kde-frameworks/kconfigwidgets-${KFMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/kcrash-${KFMIN}:5
- >=kde-frameworks/kdbusaddons-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/kiconthemes-${KFMIN}:5
- >=kde-frameworks/kinit-${KFMIN}:5
- >=kde-frameworks/kio-${KFMIN}:5
- >=kde-frameworks/kitemviews-${KFMIN}:5
- >=kde-frameworks/kjobwidgets-${KFMIN}:5
- >=kde-frameworks/knewstuff-${KFMIN}:5
- >=kde-frameworks/knotifications-${KFMIN}:5
- >=kde-frameworks/kparts-${KFMIN}:5
- >=kde-frameworks/kservice-${KFMIN}:5
- >=kde-frameworks/ktextwidgets-${KFMIN}:5
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
- >=kde-frameworks/kwindowsystem-${KFMIN}:5
- >=kde-frameworks/kxmlgui-${KFMIN}:5
- >=kde-frameworks/solid-${KFMIN}:5
- >=dev-qt/qtconcurrent-${QTMIN}:5
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=dev-qt/qtxml-${QTMIN}:5
- media-libs/phonon[qt5(+)]
- activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
- semantic-desktop? (
- >=kde-frameworks/baloo-${KFMIN}:5
- >=kde-frameworks/kfilemetadata-${KFMIN}:5
- >=kde-apps/baloo-widgets-${PVCUT}:5
- )
-"
-RDEPEND="${DEPEND}
- >=kde-apps/kio-extras-${PVCUT}:5
-"
-
-RESTRICT+=" test"
-
-src_configure() {
- local mycmakeargs=(
- $(cmake_use_find_package activities KF5Activities)
- $(cmake_use_find_package semantic-desktop KF5Baloo)
- $(cmake_use_find_package semantic-desktop KF5BalooWidgets)
- $(cmake_use_find_package semantic-desktop KF5FileMetaData)
- )
-
- ecm_src_configure
-}
-
-pkg_postinst() {
- ecm_pkg_postinst
-
- if [[ -z "${REPLACING_VERSIONS}" ]]; then
- has_version "kde-apps/ark:${SLOT}" || \
- elog "For compress/extract and other actions install kde-apps/ark:${SLOT}"
-
- has_version "kde-apps/kleopatra:${SLOT}" || \
- elog "For crypto actions install kde-apps/kleopatra:${SLOT}"
-
- has_version "kde-apps/ffmpegthumbs:${SLOT}" || \
- elog "For video file thumbnails install kde-apps/ffmpegthumbs:${SLOT}"
-
- has_version "kde-apps/thumbnailers:${SLOT}" || \
- elog "For graphics file thumbnails install kde-apps/thumbnailers:${SLOT}"
-
- has_version "kde-frameworks/purpose:${SLOT}" || \
- elog "For 'Share' context menu actions install kde-frameworks/purpose:${SLOT}"
- fi
-}
diff --git a/kde-apps/dolphin/dolphin-19.12.3.ebuild b/kde-apps/dolphin/dolphin-19.12.3.ebuild
index 80b4cf11ab02..63563dbe6215 100644
--- a/kde-apps/dolphin/dolphin-19.12.3.ebuild
+++ b/kde-apps/dolphin/dolphin-19.12.3.ebuild
@@ -17,7 +17,7 @@ https://userbase.kde.org/Dolphin"
LICENSE="GPL-2" # TODO: CHECK
SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
IUSE="activities semantic-desktop"
DEPEND="
diff --git a/kde-apps/dragon/Manifest b/kde-apps/dragon/Manifest
index d5d3f7efa3cf..27ce4e948d25 100644
--- a/kde-apps/dragon/Manifest
+++ b/kde-apps/dragon/Manifest
@@ -1,2 +1 @@
-DIST dragon-19.08.3.tar.xz 1350768 BLAKE2B 1650976805f47cf9a405bc24428eb229c9b664d8d98eca17cab9ff4eef1cde68f8972dd675159cd3d256cded58d5b7efa0335a92acd808c2edc766ae9357bb90 SHA512 932a56f236e0fa7b133b667746fa65ea64e4b3f87045ea87712b3bf19f8f32efa3b73090dd72784363918c5d929dc410e20ffd0870bca24f4d7efd0c6fd489f2
DIST dragon-19.12.3.tar.xz 1351808 BLAKE2B 45854afdd7ecad01903745bab18b47e21b69efc1cf3ad5a34d11ae323d6b877539e2145f9cea2414eb22e59578cc2f996b1ddfe59ee9230e03fe807e824b1032 SHA512 29ba89a2292842e47f47dbbe313a6c8d4bfae22d6d7563336f4614f6ea561187e714baf76ac830c65bf5c5ce97077865a04418f905bd6ec902d10631e93a66b8
diff --git a/kde-apps/dragon/dragon-19.08.3.ebuild b/kde-apps/dragon/dragon-19.08.3.ebuild
deleted file mode 100644
index 1c30075c5deb..000000000000
--- a/kde-apps/dragon/dragon-19.08.3.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="A simple video player"
-HOMEPAGE="https://kde.org/applications/multimedia/dragonplayer"
-
-LICENSE="GPL-2+ || ( GPL-2 GPL-3 ) handbook? ( FDL-1.2 )"
-SLOT="5"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-BDEPEND="
- sys-devel/gettext
-"
-DEPEND="
- >=kde-frameworks/kconfig-${KFMIN}:5
- >=kde-frameworks/kconfigwidgets-${KFMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/kcrash-${KFMIN}:5
- >=kde-frameworks/kdbusaddons-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/kio-${KFMIN}:5
- >=kde-frameworks/kjobwidgets-${KFMIN}:5
- >=kde-frameworks/knotifications-${KFMIN}:5
- >=kde-frameworks/kparts-${KFMIN}:5
- >=kde-frameworks/kservice-${KFMIN}:5
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
- >=kde-frameworks/kwindowsystem-${KFMIN}:5
- >=kde-frameworks/kxmlgui-${KFMIN}:5
- >=kde-frameworks/solid-${KFMIN}:5
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- media-libs/phonon[qt5(+)]
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/dragon/dragon-19.12.3.ebuild b/kde-apps/dragon/dragon-19.12.3.ebuild
index e8e2cb4afd8f..1dbc4b6c027e 100644
--- a/kde-apps/dragon/dragon-19.12.3.ebuild
+++ b/kde-apps/dragon/dragon-19.12.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://kde.org/applications/multimedia/org.kde.dragonplayer"
LICENSE="GPL-2+ || ( GPL-2 GPL-3 ) handbook? ( FDL-1.2 )"
SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
IUSE=""
BDEPEND="
diff --git a/kde-apps/eventviews/Manifest b/kde-apps/eventviews/Manifest
index 975282e958fc..e5aa9733dba9 100644
--- a/kde-apps/eventviews/Manifest
+++ b/kde-apps/eventviews/Manifest
@@ -1,2 +1 @@
-DIST eventviews-19.08.3.tar.xz 443148 BLAKE2B 2a59da83d3882fb2b3a59ceefbc723ded681f88c318c0c3e18f82d2963d461429c38fc491165648c7ed0821739323f51695d4e7dd65854704ed3c87a48cb001b SHA512 58636b0614f2df5e8f13b63769685c4f13d1beb2d00f6690cfd99999a428687a1004c8ede0854c3bcfd117cabd1b91ea8a5f739945d6d1d4e79d9bba39046d42
DIST eventviews-19.12.3.tar.xz 444608 BLAKE2B 253e0d9bffc854ec3a8b8b9a9e1c8c4275d24e20d4d4fee418fe08f3f6e62fa245ffb818e306d49042773ec9966e71d9f8311a58abda64f298802fb5265b040a SHA512 1d7f846070c8e55c00f4f4869fb9207a3b23533aead9dc305cea6e970e7de52904ee1e723c726d36d04e03debdea9cf62747cc6283dc1fd1c53ff1bc77b3d128
diff --git a/kde-apps/eventviews/eventviews-19.08.3.ebuild b/kde-apps/eventviews/eventviews-19.08.3.ebuild
deleted file mode 100644
index 55ed079e2acd..000000000000
--- a/kde-apps/eventviews/eventviews-19.08.3.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Calendar viewer for KDE PIM"
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="5"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-# drop qtgui subslot operator when QT_MINIMAL >= 5.14.0
-DEPEND="
- >=kde-frameworks/kcalendarcore-${KFMIN}:5
- >=kde-frameworks/kcodecs-${KFMIN}:5
- >=kde-frameworks/kcompletion-${KFMIN}:5
- >=kde-frameworks/kconfig-${KFMIN}:5
- >=kde-frameworks/kconfigwidgets-${KFMIN}:5
- >=kde-frameworks/kcontacts-${KFMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/kguiaddons-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/kiconthemes-${KFMIN}:5
- >=kde-frameworks/kitemmodels-${KFMIN}:5
- >=kde-frameworks/kservice-${KFMIN}:5
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
- >=kde-apps/akonadi-${PVCUT}:5
- >=kde-apps/akonadi-calendar-${PVCUT}:5
- >=kde-apps/calendarsupport-${PVCUT}:5
- >=kde-apps/kcalutils-${PVCUT}:5
- >=kde-apps/kmime-${PVCUT}:5
- >=kde-apps/libkdepim-${PVCUT}:5
- >=dev-qt/designer-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5=
- >=dev-qt/qtwidgets-${QTMIN}:5
- dev-libs/kdiagram:5
- dev-libs/libical
-"
-RDEPEND="${DEPEND}
- !kde-apps/kdepim-l10n
-"
diff --git a/kde-apps/eventviews/eventviews-19.12.3.ebuild b/kde-apps/eventviews/eventviews-19.12.3.ebuild
index 704597a48e69..88b93fc912ea 100644
--- a/kde-apps/eventviews/eventviews-19.12.3.ebuild
+++ b/kde-apps/eventviews/eventviews-19.12.3.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Calendar viewer for KDE PIM"
LICENSE="GPL-2+ LGPL-2.1+"
SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
IUSE=""
# drop qtgui subslot operator when QT_MINIMAL >= 5.14.0
diff --git a/kde-apps/ffmpegthumbs/Manifest b/kde-apps/ffmpegthumbs/Manifest
index 231e2d4d96bf..024f58c54d97 100644
--- a/kde-apps/ffmpegthumbs/Manifest
+++ b/kde-apps/ffmpegthumbs/Manifest
@@ -1,2 +1 @@
-DIST ffmpegthumbs-19.08.3.tar.xz 25112 BLAKE2B 43ba05e3bf9d731ed599a05b1a1299ae15edc80f01ed5d8be8fa4b1f820632ba9a0b060afb4e04fc672837ce9e46a11d24b21e4c5ede68dff64f6b8dc2540594 SHA512 84e6da40658d4a7963928a509acb982a5cfbe88c3e164096ca946df9e336ab1bbeca8fbd45be1d8f55ee1377645af914561c74ea1da74736cc573a182f385fca
DIST ffmpegthumbs-19.12.3.tar.xz 27108 BLAKE2B ced8612dbabcc4368cc3152d28f49cca3c6f501ca0ea80c6c9542a811f8368d8cbff882d5a63931c096344bad715dbae5541f62956aeff709e2893a48113d693 SHA512 4364902f570dad6d6cbb814e64c31d4a39aebd3a82aeb81598f3484464f5f0ce6da1c16f8a57f3bc6075f0e91ecacf60ffbffc6b76c6582f6859c1a52af35191
diff --git a/kde-apps/ffmpegthumbs/ffmpegthumbs-19.08.3.ebuild b/kde-apps/ffmpegthumbs/ffmpegthumbs-19.08.3.ebuild
deleted file mode 100644
index 5441343aaa9b..000000000000
--- a/kde-apps/ffmpegthumbs/ffmpegthumbs-19.08.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="FFmpeg based thumbnail generator for video files"
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="amd64 arm64 x86"
-IUSE="libav"
-
-BDEPEND="
- virtual/pkgconfig
-"
-DEPEND="
- >=kde-frameworks/kconfig-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/kio-${KFMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- libav? ( media-video/libav:= )
- !libav? ( media-video/ffmpeg:0= )
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/ffmpegthumbs/ffmpegthumbs-19.12.3.ebuild b/kde-apps/ffmpegthumbs/ffmpegthumbs-19.12.3.ebuild
index a8b0a89fa42e..22500c8402d5 100644
--- a/kde-apps/ffmpegthumbs/ffmpegthumbs-19.12.3.ebuild
+++ b/kde-apps/ffmpegthumbs/ffmpegthumbs-19.12.3.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="FFmpeg based thumbnail generator for video files"
LICENSE="GPL-2+"
SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
IUSE="libav"
BDEPEND="
diff --git a/kde-apps/filelight/Manifest b/kde-apps/filelight/Manifest
index 3b7c9b2349b4..a14331f044ea 100644
--- a/kde-apps/filelight/Manifest
+++ b/kde-apps/filelight/Manifest
@@ -1,2 +1 @@
-DIST filelight-19.08.3.tar.xz 660804 BLAKE2B 94186097da1b1ba7e9148d387e4a2d3164a38f406f318e37e36456c3d137625d520e99b0f5c0b0c305ad834c0305c45d4487636a759f8794cc760691a4e9565d SHA512 547affcf9b78ec06ee981d68e847174d8811907b5220249a616298c43af19c1a35d4d3932306903cbae2873afe92a9b6655c754c6bcd55a8447ea0fd311745b4
DIST filelight-19.12.3.tar.xz 661684 BLAKE2B 52c3543a438d860eb29524d8e706a9db1d28a3d10bd17150aba0c4137076ef441f00809cd5239fef25f4661b820baf889bb7056d0d196edd5180d72871a63347 SHA512 4227606a8ac4403876aca89b8f8b57c74bc6911983bd40f68441f6c73efc2d8853c422d15b3cf0089be74bc95b4fe530057a586a9711b74dcd98f1e53bc17e02
diff --git a/kde-apps/filelight/filelight-19.08.3.ebuild b/kde-apps/filelight/filelight-19.08.3.ebuild
deleted file mode 100644
index c238a914166b..000000000000
--- a/kde-apps/filelight/filelight-19.08.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="optional"
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Visualise disk usage with interactive map of concentric, segmented rings"
-HOMEPAGE="https://utils.kde.org/projects/filelight/"
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
- >=kde-frameworks/kcompletion-${KFMIN}:5
- >=kde-frameworks/kconfig-${KFMIN}:5
- >=kde-frameworks/kconfigwidgets-${KFMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/kio-${KFMIN}:5
- >=kde-frameworks/kservice-${KFMIN}:5
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
- >=kde-frameworks/kxmlgui-${KFMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/filelight/filelight-19.12.3.ebuild b/kde-apps/filelight/filelight-19.12.3.ebuild
index 5bf4246f8491..04ff63210086 100644
--- a/kde-apps/filelight/filelight-19.12.3.ebuild
+++ b/kde-apps/filelight/filelight-19.12.3.ebuild
@@ -14,7 +14,7 @@ https://utils.kde.org/projects/filelight/"
LICENSE="GPL-2" # TODO: CHECK
SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
IUSE=""
DEPEND="
diff --git a/kde-apps/granatier/Manifest b/kde-apps/granatier/Manifest
index 045e32ad6c09..f35ccc0510ac 100644
--- a/kde-apps/granatier/Manifest
+++ b/kde-apps/granatier/Manifest
@@ -1,2 +1 @@
-DIST granatier-19.08.3.tar.xz 1945196 BLAKE2B e9617eba2df293a944d1251aaa863762b1a160599800ac91678ea2121c8307d0db8dd17a5ba00d10b5e457de6023505207a1ccaff16266c8915ae0ceccb57e60 SHA512 8407d4e3a7c0f3858301227ac51e9c2d38e54e20b7cc2210ba6e3444e3da8420aa43256218bbc4311277909d32c7faf3a313dffe564bac0bd01dacb8f5c6a0e9
DIST granatier-19.12.3.tar.xz 1943900 BLAKE2B c699dc84f8b56f44130d238618f40d6ec690261b34c6a4ba2fe83481b1208c4b06694ac949d6076065f9c955b579d81dcfe437ce7520a5424baec60e6283414a SHA512 efdc0c67c9b7539add2c8bcf6816b13087e5eb0712e739d97fc0947ec7667b10c9e33b02856d742e41ae73128bef28da225a0d228e39a747a4f76e74eadf5eb5
diff --git a/kde-apps/granatier/granatier-19.08.3.ebuild b/kde-apps/granatier/granatier-19.08.3.ebuild
deleted file mode 100644
index 23e712580386..000000000000
--- a/kde-apps/granatier/granatier-19.08.3.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="KDE Bomberman game"
-HOMEPAGE="https://kde.org/applications/games/granatier/"
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
- >=kde-frameworks/kconfig-${KFMIN}:5
- >=kde-frameworks/kconfigwidgets-${KFMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/kcrash-${KFMIN}:5
- >=kde-frameworks/kdbusaddons-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/knewstuff-${KFMIN}:5
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
- >=kde-frameworks/kxmlgui-${KFMIN}:5
- >=kde-apps/libkdegames-${PVCUT}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtsvg-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=dev-qt/qtxml-${QTMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/granatier/granatier-19.12.3.ebuild b/kde-apps/granatier/granatier-19.12.3.ebuild
index 2dcccf18ed3d..71b08c5eb8e3 100644
--- a/kde-apps/granatier/granatier-19.12.3.ebuild
+++ b/kde-apps/granatier/granatier-19.12.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://kde.org/applications/games/org.kde.granatier"
LICENSE="GPL-2" # TODO: CHECK
SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
IUSE=""
DEPEND="
diff --git a/kde-apps/grantlee-editor/Manifest b/kde-apps/grantlee-editor/Manifest
index 890f1dd127d7..03156c3a229a 100644
--- a/kde-apps/grantlee-editor/Manifest
+++ b/kde-apps/grantlee-editor/Manifest
@@ -1,2 +1 @@
-DIST grantlee-editor-19.08.3.tar.xz 111720 BLAKE2B c12d25138bddd4f80e8a2865854650c6ee856c3f9afd1627bdf3e68e426684985c4f08c5db0a73b1435b4205f4b93e3362c4069f607b698ee21c9c344175d005 SHA512 1be20ad47b04e702eb93aea60c0871d410ecca404c2649fde17f0b0cad423a2845afbd665f065c03ed93136f039cd22bb0327a96a71c7b434b84b050270a7acf
DIST grantlee-editor-19.12.3.tar.xz 111728 BLAKE2B d4902a1feab7970266ce4e9f23bcbbdabea9e5f7a747dec60255925313a842633796f7894e0a4f7b439b135a585873db3e8b64de0f92f7c8a12f43b619190248 SHA512 03279e4bd93a50d09d724baee931ec7f3b6827e44f7408555ac00fff1d04b2a6b60fd8c18d4dc8480b32c878d367b8c012e030b77a127d863280a07039517f29
diff --git a/kde-apps/grantlee-editor/grantlee-editor-19.08.3.ebuild b/kde-apps/grantlee-editor/grantlee-editor-19.08.3.ebuild
deleted file mode 100644
index 5c172ee49933..000000000000
--- a/kde-apps/grantlee-editor/grantlee-editor-19.08.3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Utilities and tools to manage themes in KDE PIM applications"
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-SLOT="5"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
- >=kde-frameworks/karchive-${KFMIN}:5
- >=kde-frameworks/kcompletion-${KFMIN}:5
- >=kde-frameworks/kconfig-${KFMIN}:5
- >=kde-frameworks/kconfigwidgets-${KFMIN}:5
- >=kde-frameworks/kcontacts-${KFMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/kcrash-${KFMIN}:5
- >=kde-frameworks/kdbusaddons-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/kio-${KFMIN}:5
- >=kde-frameworks/knewstuff-${KFMIN}:5
- >=kde-frameworks/ktexteditor-${KFMIN}:5
- >=kde-frameworks/kwallet-${KFMIN}:5
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
- >=kde-frameworks/kxmlgui-${KFMIN}:5
- >=kde-apps/akonadi-contacts-${PVCUT}:5
- >=kde-apps/kmime-${PVCUT}:5
- >=kde-apps/kpimtextedit-${PVCUT}:5
- >=kde-apps/messagelib-${PVCUT}:5
- >=kde-apps/pimcommon-${PVCUT}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtwebengine-${QTMIN}:5[widgets]
- >=dev-qt/qtwidgets-${QTMIN}:5
-"
-RDEPEND="${DEPEND}
- !kde-apps/kaddressbook:4
- !kde-apps/kdepim-common-libs:4
- !kde-apps/kdepim-l10n
- !kde-apps/kmail:4
-"
diff --git a/kde-apps/grantlee-editor/grantlee-editor-19.12.3.ebuild b/kde-apps/grantlee-editor/grantlee-editor-19.12.3.ebuild
index 2b6061881ac5..445d6973d8c3 100644
--- a/kde-apps/grantlee-editor/grantlee-editor-19.12.3.ebuild
+++ b/kde-apps/grantlee-editor/grantlee-editor-19.12.3.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Utilities and tools to manage themes in KDE PIM applications"
LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
IUSE=""
DEPEND="
diff --git a/kde-apps/grantleetheme/Manifest b/kde-apps/grantleetheme/Manifest
index fdff22711518..fe8cc0d48977 100644
--- a/kde-apps/grantleetheme/Manifest
+++ b/kde-apps/grantleetheme/Manifest
@@ -1,2 +1 @@
-DIST grantleetheme-19.08.3.tar.xz 52260 BLAKE2B 7da5238e4ee23ff663c283625bfb3628789cf5b3cd01ff6a15a2811f5bdecdc739c23c58dcad792235dfeeb6ad526efe0c301f077d576560919ba03142813671 SHA512 1e84df335d938963fe1a9c62a0a8909613e63d6fe3279cc7bf149afdcac552078af8c4e0125768556cc216eeb6876f6f1a1c9f8e862aac5da1ec1c55bc3040cf
DIST grantleetheme-19.12.3.tar.xz 55168 BLAKE2B a2b0ea3df4184745b27f90f086e0366df0b279e3f0163f846cccd444725d45b550b19fd30d63ae687ace980accb9eec774ea6994ea0362abb037216e4a4d34c4 SHA512 466e5f32189373ae356a95285fbedffeb97ac759a056aa2fcb87068ada3cd30afbbfa2520b4c91fc6ec4a2408e2cb1adeacd1658ee8b4e1714d42ddd4be011a7
diff --git a/kde-apps/grantleetheme/grantleetheme-19.08.3.ebuild b/kde-apps/grantleetheme/grantleetheme-19.08.3.ebuild
deleted file mode 100644
index 06d1d962bcb8..000000000000
--- a/kde-apps/grantleetheme/grantleetheme-19.08.3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="forceoptional"
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Library for Grantlee plugins"
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="5"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-COMMON_DEPEND="
- >=kde-frameworks/kconfig-${KFMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/kiconthemes-${KFMIN}:5
- >=kde-frameworks/knewstuff-${KFMIN}:5
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
- >=kde-frameworks/kxmlgui-${KFMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- dev-libs/grantlee:5
-"
-DEPEND="${COMMON_DEPEND}
- >=dev-qt/qtnetwork-${QTMIN}:5
-"
-RDEPEND="${COMMON_DEPEND}
- !kde-apps/kdepim-l10n
-"
-
-# fails if package not already installed
-RESTRICT+=" test"
diff --git a/kde-apps/grantleetheme/grantleetheme-19.12.3.ebuild b/kde-apps/grantleetheme/grantleetheme-19.12.3.ebuild
index c6e8d4034a2d..bbb1aa6ddb4c 100644
--- a/kde-apps/grantleetheme/grantleetheme-19.12.3.ebuild
+++ b/kde-apps/grantleetheme/grantleetheme-19.12.3.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Library for Grantlee plugins"
LICENSE="GPL-2+ LGPL-2.1+"
SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
IUSE=""
RDEPEND="
diff --git a/kde-apps/gwenview/Manifest b/kde-apps/gwenview/Manifest
index 28af20b013c9..ea20be37f218 100644
--- a/kde-apps/gwenview/Manifest
+++ b/kde-apps/gwenview/Manifest
@@ -1,2 +1 @@
-DIST gwenview-19.08.3.tar.xz 5723104 BLAKE2B fe369a5be382eb431dde1289bed53cb53dc06a273b99f313b4bb8cfd57f95d85ade5be4799267fc3b6164bef93bb3e5bb8fcde3fccc570eb78ca396d76b944fa SHA512 5db117a5975ee09b8b40fa420cc129fc6cb786a19d67dd391f12a560049134328977f3ed1dbf3f6ba379d46d0d8c00fb2290dda84fb44e90055037818cce84bf
DIST gwenview-19.12.3.tar.xz 5735304 BLAKE2B b962718ce83f33c4f7f4ebe0d3372497495f661670b9ba0e1423e3ee87914af83d5e9221e90e02ba7ef83b007768d088bd6e2ee5f08252c357e88a74ac470bed SHA512 a93cf6a992b76e84d8e33e570aab7bff410404539a8ce4ea55ba86c4487d5d1139dea170c449ac4cfb8755be30bc4fd7903cfa890374231b88d763ae44a29ff0
diff --git a/kde-apps/gwenview/gwenview-19.08.3.ebuild b/kde-apps/gwenview/gwenview-19.08.3.ebuild
deleted file mode 100644
index c5b0e928a0b1..000000000000
--- a/kde-apps/gwenview/gwenview-19.08.3.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Image viewer by KDE"
-HOMEPAGE="
- https://kde.org/applications/graphics/gwenview/
- https://userbase.kde.org/Gwenview
-"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
-SLOT="5"
-KEYWORDS="amd64 arm64 x86"
-IUSE="activities fits kipi +mpris raw semantic-desktop share X"
-
-# requires running environment
-RESTRICT+=" test"
-
-COMMON_DEPEND="
- >=kde-frameworks/kcompletion-${KFMIN}:5
- >=kde-frameworks/kconfig-${KFMIN}:5
- >=kde-frameworks/kconfigwidgets-${KFMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/kiconthemes-${KFMIN}:5
- >=kde-frameworks/kio-${KFMIN}:5
- >=kde-frameworks/kitemmodels-${KFMIN}:5
- >=kde-frameworks/kitemviews-${KFMIN}:5
- >=kde-frameworks/kjobwidgets-${KFMIN}:5
- >=kde-frameworks/knotifications-${KFMIN}:5
- >=kde-frameworks/kparts-${KFMIN}:5
- >=kde-frameworks/kservice-${KFMIN}:5
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
- >=kde-frameworks/kxmlgui-${KFMIN}:5
- >=kde-frameworks/solid-${KFMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtopengl-${QTMIN}:5
- >=dev-qt/qtprintsupport-${QTMIN}:5
- >=dev-qt/qtsvg-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- media-gfx/exiv2:=
- media-libs/lcms:2
- media-libs/libpng:0=
- media-libs/phonon[qt5(+)]
- virtual/jpeg:0
- activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
- fits? ( sci-libs/cfitsio )
- kipi? ( >=kde-apps/libkipi-${PVCUT}:5= )
- mpris? ( >=dev-qt/qtdbus-${QTMIN}:5 )
- raw? ( >=kde-apps/libkdcraw-${PVCUT}:5 )
- semantic-desktop? (
- >=kde-frameworks/baloo-${KFMIN}:5
- >=kde-frameworks/kfilemetadata-${KFMIN}:5
- )
- share? ( >=kde-frameworks/purpose-${KFMIN}:5 )
- X? (
- >=dev-qt/qtx11extras-${QTMIN}:5
- x11-libs/libX11
- )
-"
-DEPEND="${COMMON_DEPEND}
- >=kde-frameworks/kwindowsystem-${KFMIN}:5
- >=dev-qt/qtconcurrent-${QTMIN}:5
-"
-RDEPEND="${COMMON_DEPEND}
- >=kde-frameworks/kimageformats-${KFMIN}:5
- >=dev-qt/qtimageformats-${QTMIN}:5
- kipi? ( >=kde-apps/kipi-plugins-${PVCUT}:5 )
-"
-
-src_prepare() {
- ecm_src_prepare
- if ! use mpris; then
- # FIXME: upstream a better solution
- sed -e "/set(HAVE_QTDBUS/s/\${Qt5DBus_FOUND}/0/" -i CMakeLists.txt || die
- fi
-}
-
-src_configure() {
- local mycmakeargs=(
- $(cmake_use_find_package activities KF5Activities)
- $(cmake_use_find_package fits CFitsio)
- $(cmake_use_find_package kipi KF5Kipi)
- $(cmake_use_find_package raw KF5KDcraw)
- $(cmake_use_find_package share KF5Purpose)
- $(cmake_use_find_package X X11)
- )
-
- if use semantic-desktop; then
- mycmakeargs+=( -DGWENVIEW_SEMANTICINFO_BACKEND=Baloo )
- else
- mycmakeargs+=( -DGWENVIEW_SEMANTICINFO_BACKEND=None )
- fi
-
- ecm_src_configure
-}
-
-pkg_postinst() {
- ecm_pkg_postinst
-
- if [[ -z "${REPLACING_VERSIONS}" ]] && ! has_version kde-apps/svgpart:${SLOT} ; then
- elog "For SVG support, install kde-apps/svgpart:${SLOT}"
- fi
-}
diff --git a/kde-apps/gwenview/gwenview-19.12.3.ebuild b/kde-apps/gwenview/gwenview-19.12.3.ebuild
index fbf112e706ab..5362f4d18be0 100644
--- a/kde-apps/gwenview/gwenview-19.12.3.ebuild
+++ b/kde-apps/gwenview/gwenview-19.12.3.ebuild
@@ -16,7 +16,7 @@ https://userbase.kde.org/Gwenview"
LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
IUSE="activities fits kipi +mpris raw semantic-desktop share X"
# requires running environment
diff --git a/kde-apps/incidenceeditor/Manifest b/kde-apps/incidenceeditor/Manifest
index 2639e2b36e88..2d120bf3ef74 100644
--- a/kde-apps/incidenceeditor/Manifest
+++ b/kde-apps/incidenceeditor/Manifest
@@ -1,2 +1 @@
-DIST incidenceeditor-19.08.3.tar.xz 550144 BLAKE2B 8b0fd36d81d117e640ab272460bb29c1ca3e86916927220ec9aa12469f7111a8c1a9b08613fbc7fee5b3e99e66ee8e96088fbde5a0d79916c7f5bbaa29009053 SHA512 4d2ac2416810cad38e37d15dfbc7f19af7557164d9d2317aca0f6b9d3c072750281942068fb70a42a0aecf307c69a6f876ce5f73f39fe39529320c09f841aa4a
DIST incidenceeditor-19.12.3.tar.xz 548988 BLAKE2B f1bfa216461f2cd479e779314f2fc0bd6f557ec1f198985ec08ad257a7c82a0b57e9259ff047036621dc18e729ab11f90697274f5ea6ed65f1023e62bdc17272 SHA512 c550a48b7ebdf97eb3bce9d962c6401c22ac64065edc61868279aced5d1ef1a99d39857db249d3affa8caf76e8d8a3b0824aa0cb915f3dbfbfce3175fbf97dbe
diff --git a/kde-apps/incidenceeditor/incidenceeditor-19.08.3.ebuild b/kde-apps/incidenceeditor/incidenceeditor-19.08.3.ebuild
deleted file mode 100644
index 3bd2d07ebcf2..000000000000
--- a/kde-apps/incidenceeditor/incidenceeditor-19.08.3.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-VIRTUALX_REQUIRED="test"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Incidence editor for korganizer"
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
- >=kde-frameworks/kcalendarcore-${KFMIN}:5
- >=kde-frameworks/kcodecs-${KFMIN}:5
- >=kde-frameworks/kcompletion-${KFMIN}:5
- >=kde-frameworks/kconfig-${KFMIN}:5
- >=kde-frameworks/kconfigwidgets-${KFMIN}:5
- >=kde-frameworks/kcontacts-${KFMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/kiconthemes-${KFMIN}:5
- >=kde-frameworks/kio-${KFMIN}:5
- >=kde-frameworks/kitemmodels-${KFMIN}:5
- >=kde-frameworks/kjobwidgets-${KFMIN}:5
- >=kde-frameworks/kservice-${KFMIN}:5
- >=kde-frameworks/ktextwidgets-${KFMIN}:5
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
- >=kde-frameworks/kxmlgui-${KFMIN}:5
- >=kde-apps/akonadi-${PVCUT}:5
- >=kde-apps/akonadi-calendar-${PVCUT}:5
- >=kde-apps/akonadi-contacts-${PVCUT}:5
- >=kde-apps/akonadi-mime-${PVCUT}:5
- >=kde-apps/calendarsupport-${PVCUT}:5
- >=kde-apps/eventviews-${PVCUT}:5
- >=kde-apps/kcalutils-${PVCUT}:5
- >=kde-apps/kdepim-apps-libs-${PVCUT}:5
- >=kde-apps/kidentitymanagement-${PVCUT}:5
- >=kde-apps/kldap-${PVCUT}:5
- >=kde-apps/kmailtransport-${PVCUT}:5
- >=kde-apps/kmime-${PVCUT}:5
- >=kde-apps/libkdepim-${PVCUT}:5
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- dev-libs/kdiagram:5
-"
-RDEPEND="${DEPEND}
- !kde-apps/kdepim-common-libs:4
- !kde-apps/kdepim-l10n
-"
diff --git a/kde-apps/incidenceeditor/incidenceeditor-19.12.3.ebuild b/kde-apps/incidenceeditor/incidenceeditor-19.12.3.ebuild
index 4d1d4e7bbb72..9c17c2a4a9fd 100644
--- a/kde-apps/incidenceeditor/incidenceeditor-19.12.3.ebuild
+++ b/kde-apps/incidenceeditor/incidenceeditor-19.12.3.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Incidence editor for korganizer"
LICENSE="GPL-2+"
SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
IUSE=""
DEPEND="
diff --git a/kde-apps/juk/Manifest b/kde-apps/juk/Manifest
index 7f05c635ea9f..444ea462a9b4 100644
--- a/kde-apps/juk/Manifest
+++ b/kde-apps/juk/Manifest
@@ -1,2 +1 @@
-DIST juk-19.08.3.tar.xz 1867552 BLAKE2B c5cccf09fe27a49ed8235289f7f1df253f0621d38a77995161913bcb1f20c7f3a0193f378782f0eeae50ed9d8fc8517d2c98826e76ef988a043259e109e3c2e9 SHA512 a523b85c1049f3f76bba1f3ba4e9d1086e4c02783a0c5d6262f3843e96f336d52f649fdcca000e1b6432324eb6bc2a6681034d2ab43065b9a93542095c3b4931
DIST juk-19.12.3.tar.xz 1867052 BLAKE2B ada5f5591e649cb856d3dadea902c60ef85b16a9cbe38a2080ea61813b556fbfb94fc76e4a31860ac1415f55f02f8bf1b9f483196e6c9acbb467b3c3cf312792 SHA512 39fcfeba4e2616390ac55414bfe9030285765335973fc881b6fc83657ed868e354e0935b00acf669e6bc11e8f6f1daec6c67873d1de71eb14e7f75d1c05ffedb
diff --git a/kde-apps/juk/juk-19.08.3.ebuild b/kde-apps/juk/juk-19.08.3.ebuild
deleted file mode 100644
index af5d56fdebad..000000000000
--- a/kde-apps/juk/juk-19.08.3.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="forceoptional"
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Jukebox and music manager by KDE"
-HOMEPAGE="https://kde.org/applications/multimedia/juk/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
- >=kde-frameworks/kcompletion-${KFMIN}:5
- >=kde-frameworks/kconfig-${KFMIN}:5
- >=kde-frameworks/kconfigwidgets-${KFMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/kcrash-${KFMIN}:5
- >=kde-frameworks/kglobalaccel-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/kiconthemes-${KFMIN}:5
- >=kde-frameworks/kio-${KFMIN}:5
- >=kde-frameworks/kjobwidgets-${KFMIN}:5
- >=kde-frameworks/knotifications-${KFMIN}:5
- >=kde-frameworks/ktextwidgets-${KFMIN}:5
- >=kde-frameworks/kwallet-${KFMIN}:5
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
- >=kde-frameworks/kwindowsystem-${KFMIN}:5
- >=kde-frameworks/kxmlgui-${KFMIN}:5
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtnetwork-${QTMIN}:5
- >=dev-qt/qtsvg-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=dev-qt/qtxml-${QTMIN}:5
- media-libs/phonon[qt5(+)]
- >=media-libs/taglib-1.6
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/juk/juk-19.12.3.ebuild b/kde-apps/juk/juk-19.12.3.ebuild
index 2fad28e3b4bd..16db6d77bb9d 100644
--- a/kde-apps/juk/juk-19.12.3.ebuild
+++ b/kde-apps/juk/juk-19.12.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://kde.org/applications/multimedia/org.kde.juk"
LICENSE="GPL-2" # TODO: CHECK
SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
IUSE=""
DEPEND="
diff --git a/kde-apps/k3b/Manifest b/kde-apps/k3b/Manifest
index 69fc9358614a..84671fe3a32f 100644
--- a/kde-apps/k3b/Manifest
+++ b/kde-apps/k3b/Manifest
@@ -1,2 +1 @@
-DIST k3b-19.08.3.tar.xz 10500940 BLAKE2B 8184e6790a312e66f76d3112084e7ec8cf16b67ee3deb2d1fe88df76680d573b26310544c9c747168708494fca0e0c88db9b3ee8f05d66470622a0c42a491e87 SHA512 6a98100a43ba7b18e7333e4782fc070b6faae480c03a788d80d0051b2a72e8e89eb501ef7ffc1f1fa46b18141a6f53407079778b6c51709282cc43530863cf84
DIST k3b-19.12.3.tar.xz 10518156 BLAKE2B d80b53a23183b1f33aa2cc78f1a60a10210dd017862c244a5f792b68d5f40f00a5fd0906d2468b0f23541a2fc9c498ae877d2def7eac93df5c6f86319a97659b SHA512 732526da1f8ad735d221bd8412e26462ad0a4a8a8bca6a2588d31d58f4345b8dac49b9c07fd464c95ca65f4e901df0bbb1ab404956f5c06c8216a1c6f07bc8d8
diff --git a/kde-apps/k3b/k3b-19.08.3.ebuild b/kde-apps/k3b/k3b-19.08.3.ebuild
deleted file mode 100644
index 7f12742964b4..000000000000
--- a/kde-apps/k3b/k3b-19.08.3.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Full-featured burning and ripping application based on KDE Frameworks"
-HOMEPAGE="https://userbase.kde.org/K3b"
-
-LICENSE="GPL-2 FDL-1.2"
-SLOT="5"
-KEYWORDS="amd64 arm64 x86"
-IUSE="dvd emovix encode ffmpeg flac libav mad mp3 musepack sndfile sox taglib vcd vorbis webkit"
-
-REQUIRED_USE="
- flac? ( taglib )
- mp3? ( encode taglib )
- sox? ( encode taglib )
-"
-
-DEPEND="
- >=kde-frameworks/karchive-${KFMIN}:5
- >=kde-frameworks/kbookmarks-${KFMIN}:5
- >=kde-frameworks/kcmutils-${KFMIN}:5
- >=kde-frameworks/kcompletion-${KFMIN}:5
- >=kde-frameworks/kconfig-${KFMIN}:5
- >=kde-frameworks/kconfigwidgets-${KFMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/kfilemetadata-${KFMIN}:5[taglib?]
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/kiconthemes-${KFMIN}:5
- >=kde-frameworks/kio-${KFMIN}:5
- >=kde-frameworks/kjobwidgets-${KFMIN}:5
- >=kde-frameworks/knewstuff-${KFMIN}:5
- >=kde-frameworks/knotifications-${KFMIN}:5
- >=kde-frameworks/knotifyconfig-${KFMIN}:5
- >=kde-frameworks/kservice-${KFMIN}:5
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
- >=kde-frameworks/kxmlgui-${KFMIN}:5
- >=kde-frameworks/solid-${KFMIN}:5
- >=kde-apps/libkcddb-${PVCUT}:5
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtnetwork-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=dev-qt/qtxml-${QTMIN}:5
- media-libs/libsamplerate
- dvd? ( media-libs/libdvdread:= )
- ffmpeg? (
- libav? ( media-video/libav:= )
- !libav? ( media-video/ffmpeg:0= )
- )
- flac? ( >=media-libs/flac-1.2[cxx] )
- mp3? ( media-sound/lame )
- mad? ( media-libs/libmad )
- musepack? ( >=media-sound/musepack-tools-444 )
- sndfile? ( media-libs/libsndfile )
- taglib? ( >=media-libs/taglib-1.5 )
- vorbis? (
- media-libs/libogg
- media-libs/libvorbis
- )
- webkit? ( >=dev-qt/qtwebkit-5.212.0_pre20180120:5 )
-"
-RDEPEND="${DEPEND}
- app-cdr/cdrdao
- dev-libs/libburn
- media-sound/cdparanoia
- virtual/cdrtools
- dvd? (
- >=app-cdr/dvd+rw-tools-7
- encode? ( media-video/transcode[dvd] )
- )
- emovix? ( media-video/emovix )
- sox? ( media-sound/sox )
- vcd? ( media-video/vcdimager )
-"
-
-DOCS+=( ChangeLog {FAQ,PERMISSIONS,README}.txt )
-
-src_configure() {
- local mycmakeargs=(
- -DK3B_BUILD_API_DOCS=OFF
- -DK3B_BUILD_WAVE_DECODER_PLUGIN=ON
- -DK3B_ENABLE_HAL_SUPPORT=OFF
- -DK3B_ENABLE_MUSICBRAINZ=OFF
- -DK3B_DEBUG=$(usex debug)
- -DK3B_ENABLE_DVD_RIPPING=$(usex dvd)
- -DK3B_BUILD_EXTERNAL_ENCODER_PLUGIN=$(usex encode)
- -DK3B_BUILD_FFMPEG_DECODER_PLUGIN=$(usex ffmpeg)
- -DK3B_BUILD_FLAC_DECODER_PLUGIN=$(usex flac)
- -DK3B_BUILD_LAME_ENCODER_PLUGIN=$(usex mp3)
- -DK3B_BUILD_MAD_DECODER_PLUGIN=$(usex mad)
- -DK3B_BUILD_MUSE_DECODER_PLUGIN=$(usex musepack)
- -DK3B_BUILD_SNDFILE_DECODER_PLUGIN=$(usex sndfile)
- -DK3B_BUILD_SOX_ENCODER_PLUGIN=$(usex sox)
- -DK3B_ENABLE_TAGLIB=$(usex taglib)
- -DK3B_BUILD_OGGVORBIS_DECODER_PLUGIN=$(usex vorbis)
- -DK3B_BUILD_OGGVORBIS_ENCODER_PLUGIN=$(usex vorbis)
- $(cmake_use_find_package webkit Qt5WebKitWidgets)
- )
-
- ecm_src_configure
-}
-
-pkg_postinst() {
- ecm_pkg_postinst
-
- echo
- elog "If you get warnings on start-up, uncheck the \"Check system"
- elog "configuration\" option in the \"Misc\" settings window."
- echo
-
- local group=cdrom
- use kernel_linux || group=operator
- elog "Make sure you have proper read/write permissions on optical device(s)."
- elog "Usually, it is sufficient to be in the ${group} group."
- echo
-}
diff --git a/kde-apps/k3b/k3b-19.12.3.ebuild b/kde-apps/k3b/k3b-19.12.3.ebuild
index 133fad51c62f..154711497a70 100644
--- a/kde-apps/k3b/k3b-19.12.3.ebuild
+++ b/kde-apps/k3b/k3b-19.12.3.ebuild
@@ -16,7 +16,7 @@ https://userbase.kde.org/K3b"
LICENSE="GPL-2 FDL-1.2"
SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
IUSE="dvd encode ffmpeg flac libav mad mp3 musepack sndfile sox taglib vcd vorbis webkit"
REQUIRED_USE="
diff --git a/kde-apps/k3b/metadata.xml b/kde-apps/k3b/metadata.xml
index cc7344ef5c21..2fdbf33d963d 100644
--- a/kde-apps/k3b/metadata.xml
+++ b/kde-apps/k3b/metadata.xml
@@ -5,7 +5,4 @@
kde@gentoo.org
Gentoo KDE Project
-
diff --git a/kde-apps/kaccounts-integration/Manifest b/kde-apps/kaccounts-integration/Manifest
index 22ed98dc77ef..e7b67c51e387 100644
--- a/kde-apps/kaccounts-integration/Manifest
+++ b/kde-apps/kaccounts-integration/Manifest
@@ -1,2 +1 @@
-DIST kaccounts-integration-19.08.3.tar.xz 71924 BLAKE2B b4c6fa383c053843c0b6529d33e8bff7f4fcbbef20287c6f102f696b1ea833e35d889342668d0617fdafc63663ba3bd47ee6178dafe1b76d8e486f8e8c3e92e9 SHA512 f1e7a1c3959b6739aeba3ab8a2bce51116b1b7263951cb55931564f2628f0fbe7eaa876dff9a4b7a4c6846853360293e5949297d4faf5d6a739579bf29245fd6
DIST kaccounts-integration-19.12.3.tar.xz 65792 BLAKE2B f965bfd94b4f5a7270474f7646fae0f5477df9ed9a0e504e9214ba2334dd2ab2ae5fe71a3e6c2d1ae5213f77434ad98ff05fe867bbbce43592e4cbbf05d5c018 SHA512 3bf8850d9d81001c30bf6fb62178501bd45e6e447093fa63f32cba0b17cb83eadc518f439653c6212e80f20be7cb76a912a632a286e94b15fa8d9c2c6ad9e681
diff --git a/kde-apps/kaccounts-integration/kaccounts-integration-19.08.3.ebuild b/kde-apps/kaccounts-integration/kaccounts-integration-19.08.3.ebuild
deleted file mode 100644
index a9b6e2a67330..000000000000
--- a/kde-apps/kaccounts-integration/kaccounts-integration-19.08.3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="forceoptional"
-VIRTUALDBUS_TEST="true"
-KFMIN=5.60.0
-PLASMA_MINIMAL=5.16.5
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Administer web accounts for the sites and services across the Plasma desktop"
-HOMEPAGE="https://community.kde.org/KTp"
-LICENSE="LGPL-2.1"
-
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 x86"
-IUSE=""
-
-BDEPEND="
- sys-devel/gettext
-"
-COMMON_DEPEND="
- >=kde-frameworks/kconfigwidgets-${KFMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/kdbusaddons-${KFMIN}:5
- >=kde-frameworks/kdeclarative-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtdeclarative-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- net-libs/accounts-qt
- >=net-libs/libaccounts-glib-1.21:=
- net-libs/signond
-"
-DEPEND="${COMMON_DEPEND}
- >=kde-frameworks/kcmutils-${KFMIN}:5
- >=kde-plasma/kde-cli-tools-${PLASMA_MINIMAL}:5
-"
-RDEPEND="${COMMON_DEPEND}
- dev-util/intltool
-"
-
-# bug #549444
-RESTRICT+=" test"
diff --git a/kde-apps/kaccounts-integration/kaccounts-integration-19.12.3.ebuild b/kde-apps/kaccounts-integration/kaccounts-integration-19.12.3.ebuild
index 3689671d5225..8ee1bff2775c 100644
--- a/kde-apps/kaccounts-integration/kaccounts-integration-19.12.3.ebuild
+++ b/kde-apps/kaccounts-integration/kaccounts-integration-19.12.3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://community.kde.org/KTp"
LICENSE="LGPL-2.1"
SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
IUSE=""
BDEPEND="
diff --git a/kde-apps/kaccounts-providers/Manifest b/kde-apps/kaccounts-providers/Manifest
index b920fff75ca6..c846485f44bb 100644
--- a/kde-apps/kaccounts-providers/Manifest
+++ b/kde-apps/kaccounts-providers/Manifest
@@ -1,2 +1 @@
-DIST kaccounts-providers-19.08.3.tar.xz 32104 BLAKE2B c8d23fa7a7ae32caef2ac8ace2efeaf20e41a70b424009d2ab6c4604c817f4910d2400b21c3030cf66f17fb27527a3b81de3c801e38e4aa6bc4fc8526a8401fa SHA512 bb8e6a409688ca7a31ac802ab75e796eb161b9f4495d1ba1b9c3c5aa2d836b917f4549e81ce327ea157f5f19d15fcb0c50c079be49e114dff897066ae3fa1e06
DIST kaccounts-providers-19.12.3.tar.xz 31840 BLAKE2B a5731f7d88c1ca5da34ec18380835e8324203d0ce65d259fc0fd6efd3365fd38ddc4396fae595e148628eff9f169f1fb4b8cb57224f6617a6bbdc15bdb87814a SHA512 8eeecde574d7e9c34e0d9d418c198ede558c6b89417ee11d0a623bc5bae113ee1e7255847df4dfd8abd455bb1cd2dd9da68baf2b45afa2d5a54b6da1b2d872a5
diff --git a/kde-apps/kaccounts-providers/kaccounts-providers-19.08.3.ebuild b/kde-apps/kaccounts-providers/kaccounts-providers-19.08.3.ebuild
deleted file mode 100644
index 89d256e2f5fd..000000000000
--- a/kde-apps/kaccounts-providers/kaccounts-providers-19.08.3.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="KDE accounts providers"
-HOMEPAGE="https://community.kde.org/KTp"
-LICENSE="LGPL-2.1"
-
-SLOT="5"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-BDEPEND="
- dev-util/intltool
-"
-DEPEND="
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/kdeclarative-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/kio-${KFMIN}:5
- >=kde-frameworks/kpackage-${KFMIN}:5
- >=kde-apps/kaccounts-integration-${PVCUT}:5
- >=dev-qt/qtdeclarative-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtxml-${QTMIN}:5
-"
-RDEPEND="${DEPEND}
- net-libs/signon-ui
- net-libs/signon-oauth2
-"
diff --git a/kde-apps/kaccounts-providers/kaccounts-providers-19.12.3.ebuild b/kde-apps/kaccounts-providers/kaccounts-providers-19.12.3.ebuild
index 92cc7256d5cf..58176d8d17c8 100644
--- a/kde-apps/kaccounts-providers/kaccounts-providers-19.12.3.ebuild
+++ b/kde-apps/kaccounts-providers/kaccounts-providers-19.12.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://community.kde.org/KTp"
LICENSE="LGPL-2.1"
SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
IUSE=""
BDEPEND="
diff --git a/kde-apps/kaddressbook/Manifest b/kde-apps/kaddressbook/Manifest
index 1a3268dc6f4a..c110f9e79093 100644
--- a/kde-apps/kaddressbook/Manifest
+++ b/kde-apps/kaddressbook/Manifest
@@ -1,2 +1 @@
-DIST kaddressbook-19.08.3.tar.xz 473792 BLAKE2B 3e91dc694f1161efbee03545646cfcf50da42d659fdb15104bc3a348aa37f3390baedca5b74433477b2b1333eabc46434bfc57d299919cf9db8d4fcefda8908f SHA512 82d0f41bf722a24df8db9d040256d69e8818fa5cd52bf42a310e503772b27ee0745476c2ece607bb5acc81dd4f44f85e2a6b5d26e9b4b061772c361520053022
DIST kaddressbook-19.12.3.tar.xz 2418004 BLAKE2B 73932d0ae81bc16715a137ebf8d6464d657a623c9bae1ee0d6066478ade39b2c88b80f52994ee4221a545732970f63f6c524cef65c4d368f6640632f97c2ea16 SHA512 e08cd6ce8b1583431ea2ee79818f82183c9d3109852277b80ea6e1ff84b0ed921eef1b443617128bd67e4240834f63722f8b4a60c4195bb9ac96810fc0bb4719
diff --git a/kde-apps/kaddressbook/kaddressbook-19.08.3.ebuild b/kde-apps/kaddressbook/kaddressbook-19.08.3.ebuild
deleted file mode 100644
index 032d872aeb4e..000000000000
--- a/kde-apps/kaddressbook/kaddressbook-19.08.3.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional" # FIXME: Check back for doc in release
-ECM_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Address book application based on KDE Frameworks"
-HOMEPAGE="https://kde.org/applications/office/kaddressbook/"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-SLOT="5"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
- >=kde-frameworks/kcmutils-${KFMIN}:5
- >=kde-frameworks/kcodecs-${KFMIN}:5
- >=kde-frameworks/kcompletion-${KFMIN}:5
- >=kde-frameworks/kconfig-${KFMIN}:5
- >=kde-frameworks/kconfigwidgets-${KFMIN}:5
- >=kde-frameworks/kcontacts-${KFMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/kcrash-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/kiconthemes-${KFMIN}:5
- >=kde-frameworks/kio-${KFMIN}:5
- >=kde-frameworks/kitemmodels-${KFMIN}:5
- >=kde-frameworks/kjobwidgets-${KFMIN}:5
- >=kde-frameworks/kparts-${KFMIN}:5
- >=kde-frameworks/kservice-${KFMIN}:5
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
- >=kde-frameworks/kxmlgui-${KFMIN}:5
- >=kde-frameworks/prison-${KFMIN}:5
- >=kde-apps/akonadi-${PVCUT}:5
- >=kde-apps/akonadi-contacts-${PVCUT}:5
- >=kde-apps/akonadi-search-${PVCUT}:5
- >=kde-apps/grantleetheme-${PVCUT}:5
- >=kde-apps/kdepim-apps-libs-${PVCUT}:5
- >=kde-apps/kontactinterface-${PVCUT}:5
- >=kde-apps/libgravatar-${PVCUT}:5
- >=kde-apps/libkdepim-${PVCUT}:5
- >=kde-apps/libkleo-${PVCUT}:5
- >=kde-apps/pimcommon-${PVCUT}:5
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtprintsupport-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=app-crypt/gpgme-1.11.1[cxx,qt5]
- dev-libs/grantlee:5
-"
-RDEPEND="${DEPEND}
- !kde-apps/kdepim-l10n
- >=kde-apps/kdepim-runtime-${PVCUT}:5
-"
-
-pkg_postinst() {
- ecm_pkg_postinst
-
- if [[ -z "${REPLACING_VERSIONS}" ]]; then
- has_version "kde-apps/kdepim-addons:${SLOT}" || \
- elog "${PN} is not complete without kde-apps/kdepim-addons:${SLOT}!"
- fi
-}
diff --git a/kde-apps/kaddressbook/kaddressbook-19.12.3.ebuild b/kde-apps/kaddressbook/kaddressbook-19.12.3.ebuild
index d8e7181fac78..67527793251a 100644
--- a/kde-apps/kaddressbook/kaddressbook-19.12.3.ebuild
+++ b/kde-apps/kaddressbook/kaddressbook-19.12.3.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://kde.org/applications/office/org.kde.kaddressbook"
LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
IUSE=""
DEPEND="
diff --git a/kde-apps/kajongg/Manifest b/kde-apps/kajongg/Manifest
index e7a843221678..a0deb90245de 100644
--- a/kde-apps/kajongg/Manifest
+++ b/kde-apps/kajongg/Manifest
@@ -1,2 +1 @@
-DIST kajongg-19.08.3.tar.xz 4463292 BLAKE2B 9dab5915414155806d13695cd91dfa27289da3d236a954becc4c9657d05db8968f1801738106a2c2ee31ed493817c0924947abf69b3ce0e31700a1541a8161db SHA512 49c5877216e9c73ff66e11fa8d14e3a82e08149f92c5cfb54ac7057096b0b53a46bf4a8eb4ca2f3b7bde066249b4a65b81ee42cf8969d06d221cf8c89a2fe97e
DIST kajongg-19.12.3.tar.xz 4464436 BLAKE2B 7ba749f4c1ef538200f5a818762487b4857670a284989f84820130f3a93e758f327e082d98291647675f60ff6efa6c7a1028f66688bc396f984c5d83ae8fc02a SHA512 2529ef77aaa4eee8c3245caecbb48316b797dc517e3a27dfbf2582ca3833c54d3e9b65f89b6bebd6d0565956ef87c130fc5dde338e03e2ed978913841cb981c3
diff --git a/kde-apps/kajongg/kajongg-19.08.3-r1.ebuild b/kde-apps/kajongg/kajongg-19.08.3-r1.ebuild
deleted file mode 100644
index 4beb7921dde9..000000000000
--- a/kde-apps/kajongg/kajongg-19.08.3-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-PYTHON_COMPAT=( python3_{6,7} )
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit python-single-r1 ecm kde.org
-
-DESCRIPTION="Classical Mah Jongg for four players"
-HOMEPAGE="https://kde.org/applications/games/kajongg/"
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
- >=kde-frameworks/kconfig-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-apps/libkdegames-${PVCUT}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtsvg-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- dev-db/sqlite:3
- $(python_gen_cond_dep '
- dev-python/PyQt5[gui,svg,widgets,${PYTHON_MULTI_USEDEP}]
- >=dev-python/twisted-16.6.0[${PYTHON_MULTI_USEDEP}]
- ')
-"
-RDEPEND="${DEPEND}
- >=kde-apps/libkmahjongg-${PVCUT}:5
-"
-
-pkg_setup() {
- python-single-r1_pkg_setup
- ecm_pkg_setup
-}
-
-src_prepare() {
- python_fix_shebang src
- ecm_src_prepare
- sed -i -e "/KDE_ADD_PYTHON_EXECUTABLE/s/^/#DONT/" CMakeLists.txt || die
-}
-
-src_install() {
- ecm_src_install
- dosym ../share/kajongg/kajongg.py /usr/bin/kajongg
- dosym ../share/kajongg/kajonggserver.py /usr/bin/kajonggserver
- fperms a+x /usr/share/kajongg/kajongg{,server}.py
-}
diff --git a/kde-apps/kajongg/kajongg-19.12.3.ebuild b/kde-apps/kajongg/kajongg-19.12.3.ebuild
index 2e18c791a78c..aeb414dfc4c5 100644
--- a/kde-apps/kajongg/kajongg-19.12.3.ebuild
+++ b/kde-apps/kajongg/kajongg-19.12.3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://kde.org/applications/games/org.kde.kajongg"
LICENSE="GPL-2" # TODO: CHECK
SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
IUSE=""
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/kde-apps/kalarm/Manifest b/kde-apps/kalarm/Manifest
index 5204026ada0a..53d91b5d334c 100644
--- a/kde-apps/kalarm/Manifest
+++ b/kde-apps/kalarm/Manifest
@@ -1,2 +1 @@
-DIST kalarm-19.08.3.tar.xz 1823656 BLAKE2B eecb00302fbac54da91a6a4de91da65d503fd64222fd522d330c5ebf115002e1d4eb1baa74054ead486beee701e881291593475dfcc29b2ea094ac9748e817bb SHA512 b1ff5137c4ec1d0067767a7e14a2ce7e2c3c1a621845975140ac538af6aa6dd6bb44f567c2569a8812552379c79f70bfb828ab1b6afa103cabdf07ca492d5dfa
DIST kalarm-19.12.3.tar.xz 1836596 BLAKE2B 118ac7e471d242444d0fb34c5e1ad20556c2d2c433a3fbee2eb781d25a62ccfca0edd22bb3f9a44b67e3dbbf3dbfe2692c507c70f6de4616ad87fbcfa6ae9b2e SHA512 b004d2bf8433589857e9ba25774ccbfe3e1ebe6f3f3e098cba9178db99cc5fa40e32406abde0092fe5c6db979831abe4d78aa10a20156490796ade5c634e3042
diff --git a/kde-apps/kalarm/kalarm-19.08.3.ebuild b/kde-apps/kalarm/kalarm-19.08.3.ebuild
deleted file mode 100644
index 4cd97f1b701a..000000000000
--- a/kde-apps/kalarm/kalarm-19.08.3.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Application to manage alarms and other timer based alerts for the desktop"
-HOMEPAGE+=" https://userbase.kde.org/KAlarm"
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-SLOT="5"
-KEYWORDS="amd64 arm64 x86"
-IUSE="X"
-
-BDEPEND="
- dev-libs/libxslt
-"
-DEPEND="
- >=kde-frameworks/kauth-${KFMIN}:5
- >=kde-frameworks/kcalendarcore-${KFMIN}:5
- >=kde-frameworks/kcmutils-${KFMIN}:5
- >=kde-frameworks/kcodecs-${KFMIN}:5
- >=kde-frameworks/kcompletion-${KFMIN}:5
- >=kde-frameworks/kconfig-${KFMIN}:5
- >=kde-frameworks/kconfigwidgets-${KFMIN}:5
- >=kde-frameworks/kcontacts-${KFMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/kcrash-${KFMIN}:5
- >=kde-frameworks/kdbusaddons-${KFMIN}:5
- >=kde-frameworks/kdelibs4support-${KFMIN}:5
- >=kde-frameworks/kglobalaccel-${KFMIN}:5
- >=kde-frameworks/kguiaddons-${KFMIN}:5
- >=kde-frameworks/kholidays-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/kiconthemes-${KFMIN}:5
- >=kde-frameworks/kio-${KFMIN}:5
- >=kde-frameworks/kitemmodels-${KFMIN}:5
- >=kde-frameworks/kjobwidgets-${KFMIN}:5
- >=kde-frameworks/knotifications-${KFMIN}:5
- >=kde-frameworks/kservice-${KFMIN}:5
- >=kde-frameworks/ktextwidgets-${KFMIN}:5
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
- >=kde-frameworks/kwindowsystem-${KFMIN}:5
- >=kde-frameworks/kxmlgui-${KFMIN}:5
- >=kde-apps/akonadi-${PVCUT}:5
- >=kde-apps/akonadi-contacts-${PVCUT}:5
- >=kde-apps/akonadi-mime-${PVCUT}:5
- >=kde-apps/kalarmcal-${PVCUT}:5
- >=kde-apps/kcalutils-${PVCUT}:5
- >=kde-apps/kdepim-apps-libs-${PVCUT}:5
- >=kde-apps/kidentitymanagement-${PVCUT}:5
- >=kde-apps/kmailtransport-${PVCUT}:5
- >=kde-apps/kmime-${PVCUT}:5
- >=kde-apps/kontactinterface-${PVCUT}:5
- >=kde-apps/kpimtextedit-${PVCUT}:5
- >=kde-apps/libkdepim-${PVCUT}:5
- >=kde-apps/mailcommon-${PVCUT}:5
- >=kde-apps/pimcommon-${PVCUT}:5
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtnetwork-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- media-libs/phonon[qt5(+)]
- X? (
- >=dev-qt/qtx11extras-${QTMIN}:5
- x11-libs/libX11
- )
-"
-RDEPEND="${DEPEND}
- !kde-apps/kdepim-l10n
- >=kde-apps/kdepim-runtime-${PVCUT}:5
-"
-
-src_configure() {
- local mycmakeargs=(
- $(cmake_use_find_package X Qt5X11Extras)
- $(cmake_use_find_package X X11)
- )
-
- ecm_src_configure
-}
diff --git a/kde-apps/kalarm/kalarm-19.12.3.ebuild b/kde-apps/kalarm/kalarm-19.12.3.ebuild
index c0b792daad05..5348bfef5422 100644
--- a/kde-apps/kalarm/kalarm-19.12.3.ebuild
+++ b/kde-apps/kalarm/kalarm-19.12.3.ebuild
@@ -15,7 +15,7 @@ https://userbase.kde.org/KAlarm"
LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
IUSE="X"
BDEPEND="
diff --git a/kde-apps/kalarmcal/Manifest b/kde-apps/kalarmcal/Manifest
index 4573fc85d70f..9160af013281 100644
--- a/kde-apps/kalarmcal/Manifest
+++ b/kde-apps/kalarmcal/Manifest
@@ -1,2 +1 @@
-DIST kalarmcal-19.08.3.tar.xz 573036 BLAKE2B aca3d5bf38744d603661487aa8a705fbd4e664107ca4ef05fa49e1195bb17a9b0997b078a9e01bf1af5e6c40d7fd3f6137152081cff5dd47af89167452b7a5e3 SHA512 18eea0a1629e9491e65d4041cfb14f878521f4a8455129357ee3b831b8de1a54fe5d1909fd30afdead508216d310f7042ccae8f929bbf0fd456833e6e638ceb0
DIST kalarmcal-19.12.3.tar.xz 573860 BLAKE2B 378e037ec062fb44183c8b8edccb3c3eff7a30ddca21b05336a21e51e6119f82c79682de95943fc80bb44c058b7859d5e01ce103e14d45e859e13e22e78153aa SHA512 6af77aab21fdef66132f0a0459ae61a4b81fa7c141bfa3cf062489673ab9bb87326aad05db4810113192c7ca129e3d6ebbfee045b8edea159404823c9aeacd4b
diff --git a/kde-apps/kalarmcal/kalarmcal-19.08.3.ebuild b/kde-apps/kalarmcal/kalarmcal-19.08.3.ebuild
deleted file mode 100644
index 868679a28930..000000000000
--- a/kde-apps/kalarmcal/kalarmcal-19.08.3.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Client library to access and handling of KAlarm calendar data"
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="5"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-COMMON_DEPEND="
- >=kde-frameworks/kcalendarcore-${KFMIN}:5
- >=kde-frameworks/kconfig-${KFMIN}:5
- >=kde-frameworks/kholidays-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-apps/akonadi-${PVCUT}:5
- >=kde-apps/kcalutils-${PVCUT}:5
- >=kde-apps/kidentitymanagement-${PVCUT}:5
- >=dev-qt/qtgui-${QTMIN}:5
-"
-DEPEND="${COMMON_DEPEND}
- test? ( >=dev-qt/qtdbus-${QTMIN}:5 )
-"
-RDEPEND="${COMMON_DEPEND}
- !kde-apps/kdepim-l10n
- !=kde-frameworks/kconfig-${KFMIN}:5
- >=kde-frameworks/kconfigwidgets-${KFMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/kio-${KFMIN}:5
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
- >=kde-frameworks/kxmlgui-${KFMIN}:5
- >=kde-apps/analitza-${PVCUT}:5
- >=dev-qt/qtdeclarative-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtprintsupport-${QTMIN}:5
- >=dev-qt/qtwebengine-${QTMIN}:5[widgets]
- >=dev-qt/qtwidgets-${QTMIN}:5
- readline? ( sys-libs/readline:0= )
-"
-RDEPEND="${DEPEND}
- >=kde-frameworks/kirigami-${KFMIN}:5
- >=dev-qt/qtquickcontrols-${QTMIN}:5
-"
-
-src_configure() {
- local mycmakeargs=(
- $(cmake_use_find_package readline Readline)
- )
-
- ecm_src_configure
-}
diff --git a/kde-apps/kalgebra/kalgebra-19.12.3.ebuild b/kde-apps/kalgebra/kalgebra-19.12.3.ebuild
index 0056530c2e73..f4ea8122e64b 100644
--- a/kde-apps/kalgebra/kalgebra-19.12.3.ebuild
+++ b/kde-apps/kalgebra/kalgebra-19.12.3.ebuild
@@ -15,7 +15,7 @@ https://edu.kde.org/kalgebra/"
LICENSE="GPL-2" # TODO: CHECK
SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
IUSE="readline"
DEPEND="
diff --git a/kde-apps/kalzium/Manifest b/kde-apps/kalzium/Manifest
index 03c01c09fe14..947f64703d58 100644
--- a/kde-apps/kalzium/Manifest
+++ b/kde-apps/kalzium/Manifest
@@ -1,2 +1 @@
-DIST kalzium-19.08.3.tar.xz 26415448 BLAKE2B 8fc50e38201514385dadf7e7f788e90304bde6a82a3c124a55f848d2609d2734a7ea50853c6d9e60103ebc4868cac1ac28d0fea4491828e43d05a28b6372d5db SHA512 a500255222f2e3a7ebfcf580f7afcdb119de0afa2e2a2d06f273c23e518fa9901b528fe9ce6d3343940c93d0eb4a39ebb9a38c6301c347907ab3a54658ed7b53
DIST kalzium-19.12.3.tar.xz 24586760 BLAKE2B a8d09473de9d9036a3096da3c27dc3a7478a85a5bb6f76ee133e5c958703ae004c4620e7a1847c9f7c62fb62843171f20d39c294184463209a6763523467f592 SHA512 fb8389937c605cd681295a16a87795caa317c8362c6704406adc3b67adf1c426019b6d52cc08d71248a9c705971248ed1b93e972741db917757bc479bff1af7b
diff --git a/kde-apps/kalzium/kalzium-19.08.3.ebuild b/kde-apps/kalzium/kalzium-19.08.3.ebuild
deleted file mode 100644
index 6cd9fb113ed0..000000000000
--- a/kde-apps/kalzium/kalzium-19.08.3.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit ecm kde.org flag-o-matic
-
-DESCRIPTION="Periodic table of the elements"
-HOMEPAGE="https://kde.org/applications/education/kalzium https://edu.kde.org/kalzium/"
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 arm64 x86"
-IUSE="editor solver"
-
-DEPEND="
- >=kde-frameworks/kcompletion-${KFMIN}:5
- >=kde-frameworks/kconfig-${KFMIN}:5
- >=kde-frameworks/kconfigwidgets-${KFMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/khtml-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/kio-${KFMIN}:5
- >=kde-frameworks/kitemviews-${KFMIN}:5
- >=kde-frameworks/kplotting-${KFMIN}:5
- >=kde-frameworks/ktextwidgets-${KFMIN}:5
- >=kde-frameworks/kunitconversion-${KFMIN}:5
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
- >=kde-frameworks/kxmlgui-${KFMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtscript-${QTMIN}:5
- >=dev-qt/qtsvg-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=dev-qt/qtxml-${QTMIN}:5
- editor? (
- >=kde-frameworks/knewstuff-${KFMIN}:5
- >=dev-qt/qtopengl-${QTMIN}:5
- dev-cpp/eigen:3
- sci-chemistry/openbabel
- sci-libs/avogadrolibs[qt5]
- )
- solver? ( dev-ml/facile[ocamlopt] )
-"
-RDEPEND="${DEPEND}
- sci-chemistry/chemical-mime-data
-"
-
-src_configure() {
- # Fix missing finite()
- [[ ${CHOST} == *-solaris* ]] && append-cppflags -DHAVE_IEEEFP_H
-
- local mycmakeargs=(
- $(cmake_use_find_package editor Eigen3)
- $(cmake_use_find_package editor AvogadroLibs)
- $(cmake_use_find_package editor OpenBabel2)
- $(cmake_use_find_package solver OCaml)
- $(cmake_use_find_package solver Libfacile)
- )
-
- ecm_src_configure
-}
diff --git a/kde-apps/kalzium/kalzium-19.12.3.ebuild b/kde-apps/kalzium/kalzium-19.12.3.ebuild
index bc2d62f6723e..ae4a1b79fd46 100644
--- a/kde-apps/kalzium/kalzium-19.12.3.ebuild
+++ b/kde-apps/kalzium/kalzium-19.12.3.ebuild
@@ -14,7 +14,7 @@ https://edu.kde.org/kalzium/"
LICENSE="GPL-2" # TODO: CHECK
SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
IUSE="editor solver"
DEPEND="
diff --git a/kde-apps/kamera/Manifest b/kde-apps/kamera/Manifest
index c634c0ce35f8..1db0fb64207c 100644
--- a/kde-apps/kamera/Manifest
+++ b/kde-apps/kamera/Manifest
@@ -1,2 +1 @@
-DIST kamera-19.08.3.tar.xz 100144 BLAKE2B 23e0a242e9c04b9cf93850b7d1df68e6f26a4ede8747d030a07eeeea8b675071317ecff35b3e0a3ad9d0a24d10788ab5482b36885bad55493be55e2f1ef11811 SHA512 a1388abd72f3905a918fc69341e8cd64c37d205530d05e554444c1fdb8d773496d9783e7a26a8b324a8904ad9ef2b1347c77a23f430c0663014e5a66ec63b913
DIST kamera-19.12.3.tar.xz 103760 BLAKE2B d83b59f45249d99edf8c47461b7bfaa74d300fc658a0a8df437baf50d42db4654660cdc1f01e0377dfb7434834788cd094e9bc5c09ccf68fb56cdb15aecb38ec SHA512 9b7783bec9eecaa032adec76452f1a972f03bf97f919c6b354c176c7bf2fb99324e3de9d1928622cd079f4bee089d97d099f201735fa6637188b81dc45a746da
diff --git a/kde-apps/kamera/kamera-19.08.3.ebuild b/kde-apps/kamera/kamera-19.08.3.ebuild
deleted file mode 100644
index cecf9b628a3d..000000000000
--- a/kde-apps/kamera/kamera-19.08.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Plasma integration for gphoto2 cameras"
-LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
-SLOT="5"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-BDEPEND="
- sys-devel/gettext
-"
-DEPEND="
- >=kde-frameworks/kconfig-${KFMIN}:5
- >=kde-frameworks/kconfigwidgets-${KFMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/kxmlgui-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/kio-${KFMIN}:5
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- media-libs/libgphoto2:=
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kamera/kamera-19.12.3.ebuild b/kde-apps/kamera/kamera-19.12.3.ebuild
index 4d46fada09bb..b8bf1322050c 100644
--- a/kde-apps/kamera/kamera-19.12.3.ebuild
+++ b/kde-apps/kamera/kamera-19.12.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://kde.org/applications/utilities/org.kde.kamera"
LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
IUSE=""
BDEPEND="
diff --git a/kde-apps/kamoso/Manifest b/kde-apps/kamoso/Manifest
index cb0558e611d7..51374f421127 100644
--- a/kde-apps/kamoso/Manifest
+++ b/kde-apps/kamoso/Manifest
@@ -1,2 +1 @@
-DIST kamoso-19.08.3.tar.xz 201848 BLAKE2B 3a136931e95faa459bd9f469f33c410932268073fa3e5cbffb2e9e6ec10a3919c7b634cda13487c84117ade141feed7494f51d100e4b43d5249cb74bf0d8af6f SHA512 d6c1212a469a684cfdedf8868c60d97bbb499b73dc8ffd44f17619718d3baf4988007f9cbdcd614194ef4cf19a09f99b4d830dbe4ca7a170c65f2186e2144f5d
DIST kamoso-19.12.3.tar.xz 201284 BLAKE2B 95b5ff07db8cfea912f21a2b8101a5ca93d9156ca18d84903c884c0d2ad8246f451289ee1458a5e4308c23edcf4a72a4570537bc0c29a05d64e3aca0a5a377c5 SHA512 6960c109bd7840a2dbfe901f857b560c67d422accf5d0649e81a31e45b0126133886e71ac558b4718dec639e49050d1f28572c57dfafbd8b2ca4cce6d2c8bd66
diff --git a/kde-apps/kamoso/kamoso-19.08.3.ebuild b/kde-apps/kamoso/kamoso-19.08.3.ebuild
deleted file mode 100644
index 1bf1b0eb5441..000000000000
--- a/kde-apps/kamoso/kamoso-19.08.3.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-VIRTUALX_REQUIRED="test"
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Application to take pictures and videos from your webcam by KDE"
-HOMEPAGE="https://userbase.kde.org/Kamoso"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
- >=kde-frameworks/kconfig-${KFMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/kio-${KFMIN}:5
- >=kde-frameworks/kitemviews-${KFMIN}:5
- >=kde-frameworks/purpose-${KFMIN}:5
- >=dev-qt/qtdeclarative-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- dev-libs/glib:2
- media-libs/gst-plugins-base:1.0
- virtual/opengl
-"
-RDEPEND="${DEPEND}
- >=kde-frameworks/kirigami-${KFMIN}:5
- >=dev-qt/qtquickcontrols2-${QTMIN}:5
- media-plugins/gst-plugins-jpeg:1.0
- media-plugins/gst-plugins-libpng:1.0
- media-plugins/gst-plugins-meta:1.0[alsa,theora,vorbis,v4l]
-"
-
-RESTRICT+=" test" # bug 653674
diff --git a/kde-apps/kamoso/kamoso-19.12.3.ebuild b/kde-apps/kamoso/kamoso-19.12.3.ebuild
index 9523d579ab95..c5380316b96f 100644
--- a/kde-apps/kamoso/kamoso-19.12.3.ebuild
+++ b/kde-apps/kamoso/kamoso-19.12.3.ebuild
@@ -15,7 +15,7 @@ https://userbase.kde.org/Kamoso"
LICENSE="GPL-2+"
SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
IUSE=""
DEPEND="
diff --git a/kde-apps/kanagram/Manifest b/kde-apps/kanagram/Manifest
index 558766cf5e1a..1fad2c8b491d 100644
--- a/kde-apps/kanagram/Manifest
+++ b/kde-apps/kanagram/Manifest
@@ -1,2 +1 @@
-DIST kanagram-19.08.3.tar.xz 8031760 BLAKE2B c6af0c58ead32a0e781f843dfe2e23288e5538a5fa9ed05ba6b81143f1c6981a49d5b987c294302fad016c61e1b80b92c1c12a7071055ded08879e01af3b5341 SHA512 72120d98ff5555ed84fab22716c0871d8bb11bd32529bae62d632aa979668d2ff8166c94b46bff91f77aa88b7a355f1afa13ad769771780a9dd52cb0452f7870
DIST kanagram-19.12.3.tar.xz 8033280 BLAKE2B af86f75c6621a7100f76697a17b8500eb9cc3af0fa8e219277dfe78e67bf86bd1bb13d91ae5949ea50812aa799d527a27ce6f5450040153cec5fdc88d48e53d3 SHA512 cf48cc5ff84a033a9fecef0f2d8fc01de12e8fbed4c8055d6c0fc2bac75166d5044889eed61a32e71639413d336dd69e50878785beede40934f77706125fb6b0
diff --git a/kde-apps/kanagram/kanagram-19.08.3.ebuild b/kde-apps/kanagram/kanagram-19.08.3.ebuild
deleted file mode 100644
index feb5be3ba804..000000000000
--- a/kde-apps/kanagram/kanagram-19.08.3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Game based on anagrams of words"
-HOMEPAGE="https://kde.org/applications/education/kanagram https://edu.kde.org/kanagram/"
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 arm64 x86"
-IUSE="speech"
-
-DEPEND="
- >=kde-frameworks/kconfig-${KFMIN}:5
- >=kde-frameworks/kconfigwidgets-${KFMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/kcrash-${KFMIN}:5
- >=kde-frameworks/kdeclarative-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/knewstuff-${KFMIN}:5
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
- >=kde-frameworks/kxmlgui-${KFMIN}:5
- >=kde-frameworks/sonnet-${KFMIN}:5
- >=kde-apps/libkeduvocdocument-${PVCUT}:5
- >=dev-qt/qtdeclarative-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- media-libs/phonon[qt5(+)]
- speech? ( >=dev-qt/qtspeech-${QTMIN}:5 )
-"
-RDEPEND="${DEPEND}
- >=kde-apps/kdeedu-data-${PVCUT}:5
- >=dev-qt/qtmultimedia-${QTMIN}:5[qml]
- >=dev-qt/qtquickcontrols-${QTMIN}:5
-"
-
-src_configure() {
- local mycmakeargs=(
- $(cmake_use_find_package speech Qt5TextToSpeech)
- )
-
- ecm_src_configure
-}
diff --git a/kde-apps/kanagram/kanagram-19.12.3.ebuild b/kde-apps/kanagram/kanagram-19.12.3.ebuild
index 794b418f1563..dadae083a6ca 100644
--- a/kde-apps/kanagram/kanagram-19.12.3.ebuild
+++ b/kde-apps/kanagram/kanagram-19.12.3.ebuild
@@ -15,7 +15,7 @@ https://edu.kde.org/kanagram/"
LICENSE="GPL-2" # TODO: CHECK
SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
IUSE="speech"
DEPEND="
diff --git a/kde-apps/kapman/Manifest b/kde-apps/kapman/Manifest
index f3430d4205de..82b897977d8f 100644
--- a/kde-apps/kapman/Manifest
+++ b/kde-apps/kapman/Manifest
@@ -1,2 +1 @@
-DIST kapman-19.08.3.tar.xz 2525336 BLAKE2B 7d9b4f846686f212ec11b8b98a66f0a66f5c7c4a72bb2cd8de4a30241e78b51fdfac8e6712585d6ebb55bc28aa67002ad4bfbd132d0ff6b17969fb0e464ea1bc SHA512 8f9054e264017af87d37f11750d803225c498de5e7507bc17be1304e171128bd514e07019ebd8c43bc7604e963bd1596a39ac991ebde0441fa98d22629c1ffce
DIST kapman-19.12.3.tar.xz 2527596 BLAKE2B d89c676e374e57b31b6c39f3ca3cdeee1b60d2077def93b511fce6fc7e94e1f4601dbcc9be8c10167902b68b374f72439e6c494be73317afb7556c2dcf8eda47 SHA512 c29f5398bc930d768ba09035a57d51ea0ec53d265c7f30edeb67d887024918627b635433cce897c4b6b701400101b11ffb5b56b66e4f67c07dd6d4318c13ba34
diff --git a/kde-apps/kapman/kapman-19.08.3.ebuild b/kde-apps/kapman/kapman-19.08.3.ebuild
deleted file mode 100644
index 984ff8e5a215..000000000000
--- a/kde-apps/kapman/kapman-19.08.3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Pac-Man clone by KDE"
-HOMEPAGE="https://kde.org/applications/games/kapman/"
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
- >=kde-frameworks/kconfig-${KFMIN}:5
- >=kde-frameworks/kconfigwidgets-${KFMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/kcrash-${KFMIN}:5
- >=kde-frameworks/kdbusaddons-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
- >=kde-frameworks/kxmlgui-${KFMIN}:5
- >=kde-apps/libkdegames-${PVCUT}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtsvg-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=dev-qt/qtxml-${QTMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kapman/kapman-19.12.3.ebuild b/kde-apps/kapman/kapman-19.12.3.ebuild
index 9fba0e636633..87f3f26d3337 100644
--- a/kde-apps/kapman/kapman-19.12.3.ebuild
+++ b/kde-apps/kapman/kapman-19.12.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://kde.org/applications/games/org.kde.kapman"
LICENSE="GPL-2" # TODO: CHECK
SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
IUSE=""
DEPEND="
diff --git a/kde-apps/kapptemplate/Manifest b/kde-apps/kapptemplate/Manifest
index 2752a6890199..277dcdfdaf7e 100644
--- a/kde-apps/kapptemplate/Manifest
+++ b/kde-apps/kapptemplate/Manifest
@@ -1,2 +1 @@
-DIST kapptemplate-19.08.3.tar.xz 316724 BLAKE2B eaa289f012bc81e4553adf0b424900122287dec681e188da7c97583a8854741f854341ee94b5ac742a360643adc74c627f28a7d51f9e237d656a3f27f9f301d9 SHA512 215b0144c4a6d2743b9f4cb387f9f7eb75de420949a3e835da992cd7e6d241bea54b225932371741bd4cfcc288b9a2bc89dceee66b47fac84cbc7290e5459baf
DIST kapptemplate-19.12.3.tar.xz 316724 BLAKE2B 3fa6322bd1f31e441da5bc87fd89d64641128e6eacb3e139e926ad47091f3decccaa0f665bb6ce64748d1d8615085fb59867cdc93de774bf5f24f10329b3c7e3 SHA512 0054e404e18ce151805ec375a68e66042963ebdcff465b26d46b134cbb495a6d1e232bf9975137cf8db85f96bc74f97e64370acc757bb5e9ad85d8737b8e7b9b
diff --git a/kde-apps/kapptemplate/kapptemplate-19.08.3.ebuild b/kde-apps/kapptemplate/kapptemplate-19.08.3.ebuild
deleted file mode 100644
index 87ec3e087599..000000000000
--- a/kde-apps/kapptemplate/kapptemplate-19.08.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="forceoptional"
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Shell script to create the necessary framework to develop KDE applications"
-HOMEPAGE="https://kde.org/applications/development/kapptemplate"
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
- >=kde-frameworks/karchive-${KFMIN}:5
- >=kde-frameworks/kcompletion-${KFMIN}:5
- >=kde-frameworks/kconfig-${KFMIN}:5
- >=kde-frameworks/kconfigwidgets-${KFMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/kio-${KFMIN}:5
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kapptemplate/kapptemplate-19.12.3.ebuild b/kde-apps/kapptemplate/kapptemplate-19.12.3.ebuild
index cb7207b47cda..4233827adc38 100644
--- a/kde-apps/kapptemplate/kapptemplate-19.12.3.ebuild
+++ b/kde-apps/kapptemplate/kapptemplate-19.12.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://kde.org/applications/development/org.kde.kapptemplate"
LICENSE="GPL-2" # TODO: CHECK
SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
IUSE=""
DEPEND="
diff --git a/kde-apps/kate/Manifest b/kde-apps/kate/Manifest
index ce7966c12562..9f2d1e31d28a 100644
--- a/kde-apps/kate/Manifest
+++ b/kde-apps/kate/Manifest
@@ -1,2 +1 @@
-DIST kate-19.08.3.tar.xz 5844532 BLAKE2B 34aaceab92783a869de616be9290887f75eba5ef6198e93d90a71d62b441a907a7893916c72ac85c46d6156330322d5297c60c8c9b43cbcd615c05b51cdd0000 SHA512 0a0b33858bd4856bdf29d354603d33541b2c0aab134025db3014aa31cf3231fa2bcc244252872c0b51c28b7cd715556966d9049ce85a8ad614e1f552479c1bc8
DIST kate-19.12.3.tar.xz 5795816 BLAKE2B 567b0c37f0b50533eeb19a527f7527ae050b62c8a50d46bbfac06226f109cd024b7626abc7defa32b9a654e231f6f04246a3410ace92f40fc25fb22a6f893c82 SHA512 aa6a2c44a8c5892e61ac80df676da6059e61dd93f5e2934e0547040d89379f9f3ae90f46b8e043edf463228ef5b0ab3f795b8ab3dd6c488d0ba0c55cf20bd817
diff --git a/kde-apps/kate/kate-19.08.3.ebuild b/kde-apps/kate/kate-19.08.3.ebuild
deleted file mode 100644
index b84ab5c95456..000000000000
--- a/kde-apps/kate/kate-19.08.3.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="optional"
-ECM_TEST="true"
-VIRTUALX_REQUIRED="test"
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Multi-document editor with network transparency, Plasma integration and more"
-HOMEPAGE="https://kde.org/applications/utilities/kate https://kate-editor.org/"
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 arm64 x86"
-IUSE="activities +addons"
-
-DEPEND="
- >=kde-frameworks/kcodecs-${KFMIN}:5
- >=kde-frameworks/kcompletion-${KFMIN}:5
- >=kde-frameworks/kconfig-${KFMIN}:5
- >=kde-frameworks/kconfigwidgets-${KFMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/kcrash-${KFMIN}:5
- >=kde-frameworks/kdbusaddons-${KFMIN}:5
- >=kde-frameworks/kguiaddons-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/kiconthemes-${KFMIN}:5
- >=kde-frameworks/kio-${KFMIN}:5
- >=kde-frameworks/kitemmodels-${KFMIN}:5
- >=kde-frameworks/kitemviews-${KFMIN}:5
- >=kde-frameworks/kjobwidgets-${KFMIN}:5
- >=kde-frameworks/kparts-${KFMIN}:5
- >=kde-frameworks/kservice-${KFMIN}:5
- >=kde-frameworks/ktexteditor-${KFMIN}:5
- >=kde-frameworks/ktextwidgets-${KFMIN}:5
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
- >=kde-frameworks/kwindowsystem-${KFMIN}:5
- >=kde-frameworks/kxmlgui-${KFMIN}:5
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=dev-qt/qtxml-${QTMIN}:5
- activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
- addons? (
- >=kde-frameworks/kbookmarks-${KFMIN}:5
- >=kde-frameworks/knewstuff-${KFMIN}:5
- >=kde-frameworks/kwallet-${KFMIN}:5
- >=kde-frameworks/plasma-${KFMIN}:5
- >=kde-frameworks/threadweaver-${KFMIN}:5
- >=dev-qt/qtsql-${QTMIN}:5
- )
-"
-RDEPEND="${DEPEND}
- !kde-misc/ktexteditorpreviewplugin
-"
-
-src_prepare() {
- ecm_src_prepare
-
- # delete colliding kwrite translations
- if [[ ${KDE_BUILD_TYPE} = release ]]; then
- find po -type f -name "*po" -and -name "kwrite*" -delete || die
- rm -rf po/*/docs/kwrite || die
- fi
-}
-
-src_configure() {
- local mycmakeargs=(
- $(cmake_use_find_package activities KF5Activities)
- -DBUILD_addons=$(usex addons)
- -DBUILD_kwrite=FALSE
- )
-
- ecm_src_configure
-}
-
-src_test() {
- # tests hang
- local myctestargs=(
- -E "(session_manager_test|sessions_action_test)"
- )
-
- ecm_src_test
-}
-
-pkg_postinst() {
- ecm_pkg_postinst
-
- if [[ -z "${REPLACING_VERSIONS}" ]] && use addons; then
- elog "The functionality of ktexteditorpreview plugin can be extended with:"
- elog " kde-misc/kmarkdownwebview"
- elog " media-gfx/kgraphviewer"
- fi
-}
diff --git a/kde-apps/kate/kate-19.12.3.ebuild b/kde-apps/kate/kate-19.12.3.ebuild
index 7d82c73d1785..423bc7036763 100644
--- a/kde-apps/kate/kate-19.12.3.ebuild
+++ b/kde-apps/kate/kate-19.12.3.ebuild
@@ -16,7 +16,7 @@ https://kde.org/applications/utilities/org.kde.kate"
LICENSE="GPL-2" # TODO: CHECK
SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
IUSE="activities +filebrowser lspclient +projects plasma +snippets sql"
DEPEND="
diff --git a/kde-apps/kate/metadata.xml b/kde-apps/kate/metadata.xml
index 0a6b46015bed..1c4379fbac89 100644
--- a/kde-apps/kate/metadata.xml
+++ b/kde-apps/kate/metadata.xml
@@ -7,7 +7,6 @@