gentoo resync : 22.01.2021

6 files changed, 101 insertions, 155 deletions

diff --git a/x11-misc/albert/Manifest b/x11-misc/albert/Manifest
index 64ab71744ec9..7457dcb79506 100644
--- a/x11-misc/albert/Manifest
+++ b/x11-misc/albert/Manifest
@@ -1,8 +1,8 @@
-AUX albert-0.14.22-qt-5.11.patch 703 BLAKE2B bac316c4a75d1bed79517f4e25c7844c5e3671f85051a9654c31a1337dbb692c6f52b2adee38c0ede081b0230db0c1cb4e963e875cfae717fc98839180dfd42c SHA512 e27bff9359ae9b3c7ee1be0ab1098073ccbaef65eca316351c63c616a4772be73cefabb9ee62f9b79238eb039520d89f4aecc79eca5f0bda7490e231000490eb
-DIST albert-0.14.22-plugins.tar.gz 540446 BLAKE2B 22cf69698614a1b0e97fd1f5e3224b9097141c4a32c7999b9468c3c59b6af0d7a753de59a7abeb07f9ef9655abc05b8cb5e5079c9b41eb9f51dc09291b89b635 SHA512 4cce6ad717991a6a2293b491f17838a01ba51e4222deb78d5b793ab3390692131f4938027b96863c6cd61ec7a764fa6d52b3c3ef33cadd3183b2fe1498b6d344
-DIST albert-0.14.22.tar.gz 84925 BLAKE2B b009bd0420f2e5894e2e71e526361c6b177ceb0ed9339efd276228e3cb8aed52eba811b8f2f6ade8f39357017458f2cbfddec25f0df4de8d12397451bd98cb57 SHA512 91c131140f666dda665e07e617ce0d2af5c776233f9cf1430aedfc18299dcc22c6dcdec4d82f15fc2d81fa44679f9d3608a47128d33bfbddeb97481b430608c8
-DIST albert-0.16.1-plugins.tar.gz 534401 BLAKE2B e0713ee446b0c98a44489d8a45d60a1124cd45dd06af207ca8b8aeae4b6872a8705c3fa58e1636a4e0f95b4885253be4fd6f8376c12dc6b5110cbf2923af4d09 SHA512 3501efae9feeaf1090c1a1a3de9ed9e5788c8029dca76e06891683b43b69e5711f3c62187c273b11c418f824e9e0c0530bc5d248b37b96553fc5846c93c21224
-DIST albert-0.16.1.tar.gz 68739 BLAKE2B 4794c8aa4d2997ccf4c2d88a36c1e578ac3daa84fdd7dfebfa08941f692815a085ea2140aec9b3944c6ff8e71a4628510f9b28857137e39396be278606812640 SHA512 49dae5722982ba3fd4a25fcf5f398d8fe8d4bf66d15e2783a699174ff7196538c11ec9dde4201174c7fc7ac0852f2491b5b68abc196077305c89e22d8e1387ab
-EBUILD albert-0.14.22.ebuild 1407 BLAKE2B ee85919ed2a532f8498530daa20e748d2aa2327bade782b97d126e221c2211913584f787ebb653e136f70daf1a1911220daa987f73106a8fb3c1835fda543817 SHA512 fc71f4c8e139e1e0dc86fcd60dbba8f911a54eb989ab60957fb1fc9fba7314d5319cff2515c8b0ad246a8cda917a14b9a798e2493161db49f531c78c0892138f
-EBUILD albert-0.16.1.ebuild 1372 BLAKE2B 9283b51acf6d42fa4f19514edaf8b430f8ba157e8652551457fdc036563bcdc11c59a28e865bee8bef56ae73d28e1e211b16f564b5d0cfa23b31e26711d72c36 SHA512 ec4c97675af1e9e9668e91c60f32dbd705640228177f010acb5245a80da321074eb52a5755b4bad8a281feaeafaff275ad9cb511a444f989cec5815021f35392
-MISC metadata.xml 454 BLAKE2B 3640b6c158e08d6f93e89aafcd7533da8b0f40a086aa26b2fac8b739f12813cbb73eaab0aac0ea93c43929c40a0e14f9d395357abb5a409a2f140ac3f86ab618 SHA512 2b069b93be5c8c623fb93891818c610282b35bbf15be9b296a167d80ccb570141d8f0844e46abad8f8f860e89bee422dd5fca41a85fbad207843c2d1024a861d
+DIST albert-0.17.2-jetbrains-python-extension.tar.gz 17062 BLAKE2B fa5da8a7df5e1bb337af75a30b7fbb2584eaa49745d14e88eeea18037d70c55e9885fdbeaeab8aaaa94531e73286c69e14b4864011875d59dcb790a10fd91e88 SHA512 53b9a0d9f972dd495648dd563df8d3b1c973aa02dce99ce7bb8a9da3bcf43174094d5a03035fbaf132072d834ccf918b17076d4f522265bea77c4220140b31de
+DIST albert-0.17.2-plugins.tar.gz 548312 BLAKE2B b8911953eb40b0985eb67108249487e589910d1701d609cc9ad305db915c2c69f794a6bdd7e6453f856874ef11dfb4657e7a527abfe746dffb8952309f1aeffd SHA512 ff6a22f1ffd39c73061baaf2ae9b1b2243673ebed56cfac7bd639a262fceadea1cbea4a7534ebe2937576d22fc9a4bc1f4d1cf05262d1fb08b9230460fd7811e
+DIST albert-0.17.2-pybind11-2.6.1.tar.gz 634179 BLAKE2B 33f057e88e45985a0475783b8931ec669a16efcad5d66ecb265744155e9941b2d618391a36bff1d8c1c2d74a7e0b41de50b26eae689215d4585542fbd4282cc1 SHA512 8730efec82eef8dc09a58ca3e3b28fca45880cef85d32aa5524a8fe64e23d5f6dff4ca1b48b3034a287199bd56f4db4d6806c5358bef66fde84ed0fbf80ec264
+DIST albert-0.17.2-python-extensions.tar.gz 483617 BLAKE2B 34a1b8626c17d0297294be5cd77fe3f9b4abd985541bd995d1665e5e4a3a9dd64b393c5aba6f00347e0a4c031df2a04672246caff1038858df286c271dd33975 SHA512 13e14ce180787cde9abd0c06970109d9217f67e0b4596d73768efb1a183f6493552766e89bea6fc83703a4c0cc1b4961459cbbf5953c530d2c09d53e686ccc53
+DIST albert-0.17.2-xkcd-python-extension.tar.gz 729219 BLAKE2B f3c571bf2bf97f43a5aee7d8201f16732e12b589c8f7bfd58fe1ce138d728ba7416fed7eb203813922a5be5b3066f0c1d4bff136c61d480146fcf5da87dceb35 SHA512 0cdedb94bc82c2db8f3006efe43a084c098414aa711ebd88a011db6f1ef892f8114a73761d8b2f2a1d1be4603177f957eeb41ee642e1c31460d1507bca6fd402
+DIST albert-0.17.2.tar.gz 72652 BLAKE2B af5398307bf4dce928cfe92766551c761c407d9d98cc0a4b730cc8e95509d15c5b8ccfaef6e19d3dd2ded5e56403b14c3ac08fce90845abdfdb74ce7b3ff8b71 SHA512 ce2e32fa0018b210196e09cda8a3cce0a2cafecfdef5edae4610c621c39b66e3b4b039449d1900deb9689b5fa14178d079f7f0a7917cc1019d26b48a0a3ca415
+EBUILD albert-0.17.2.ebuild 2730 BLAKE2B 92a1744717025de8f2a198ba2da7587a61d619642bec5300df737d24978fdf0c650096939830466afd067c88346c295f77e3bf59f0a87fd83fbd78754287da62 SHA512 f6608ffa18cf6be400c7bf36c38860d105a52340d16bdfed257108d31c4466ec4547d9dbd8a9c226fb844244f7fa60e42e6f0037b1dde102e30016410ad9c2a8
+MISC metadata.xml 745 BLAKE2B 7b15716f944a6712c6aa1afe34307ca1bfa8587150df5e71d2af0b8fa96b95cea669c8e1b6c7af75667f44035869e8f8f7674837660c094bbd6e1e710940a095 SHA512 573c724bcc935bedca3beba49c89b214d54f690f4d56df73d90f9dae1a2f80f72cad75d4dc4a9166e33c71ececa571db016aa17170d3c6b864288eec9bc85a43
diff --git a/x11-misc/albert/albert-0.14.22.ebuild b/x11-misc/albert/albert-0.14.22.ebuild
deleted file mode 100644
index dddced7dd4ba..000000000000
--- a/x11-misc/albert/albert-0.14.22.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PLUGINS_HASH="5dc169ce81002b4472cc55c0341f6ac52fe130f5"
-inherit cmake-utils gnome2-utils
-
-DESCRIPTION="Desktop agnostic launcher"
-HOMEPAGE="https://albertlauncher.github.io/"
-# plugins is a git submodule. the hash is taken from the submodule reference in the ${PV} tag.
-SRC_URI="https://github.com/albertlauncher/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-https://github.com/albertlauncher/plugins/archive/${PLUGINS_HASH}.tar.gz -> ${P}-plugins.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="debug"
-
-RDEPEND="
-	dev-cpp/muParser
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtsql:5[sqlite]
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	x11-libs/libX11
-	x11-libs/libXext
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" )
-
-src_prepare() {
-	mv "${WORKDIR}"/plugins-${PLUGINS_HASH}/* "${S}"/plugins/ || die
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_DEBUG=$(usex debug)
-		-DBUILD_PYTHON=OFF #plugin directory is empty causing build failure
-		-DBUILD_VIRTUALBOX=OFF #plugin needs virtualbox installed to build, untested
-	)
-
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/x11-misc/albert/albert-0.16.1.ebuild b/x11-misc/albert/albert-0.16.1.ebuild
deleted file mode 100644
index c04869d05ca7..000000000000
--- a/x11-misc/albert/albert-0.16.1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PLUGINS_HASH="029bd8ccb58c4452bd82ab42be8739f1639e42d4"
-inherit cmake-utils xdg-utils
-
-DESCRIPTION="Desktop agnostic launcher"
-HOMEPAGE="https://albertlauncher.github.io/"
-# plugins is a git submodule. the hash is taken from the submodule reference in the ${PV} tag.
-SRC_URI="https://github.com/albertlauncher/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-https://github.com/albertlauncher/plugins/archive/${PLUGINS_HASH}.tar.gz -> ${P}-plugins.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="debug"
-
-RDEPEND="
-	dev-cpp/muParser
-	dev-qt/qtcharts:5
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtsql:5[sqlite]
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	x11-libs/libX11
-	x11-libs/libXext
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	mv "${WORKDIR}"/plugins-${PLUGINS_HASH}/* "${S}"/plugins/ || die
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_DEBUG=$(usex debug)
-		-DBUILD_PYTHON=OFF #plugin directory is empty causing build failure
-		-DBUILD_VIRTUALBOX=OFF #plugin needs virtualbox installed to build, untested
-	)
-
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/x11-misc/albert/albert-0.17.2.ebuild b/x11-misc/albert/albert-0.17.2.ebuild
new file mode 100644
index 000000000000..58b5b30d0b47
--- /dev/null
+++ b/x11-misc/albert/albert-0.17.2.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake xdg-utils
+
+DESCRIPTION="A fast and flexible keyboard launcher"
+HOMEPAGE="https://albertlauncher.github.io/"
+
+PLUGINS_HASH="b4cac28be7b265027b00279baba14086d97c4d07"
+PYBIND11_VERSION="2.6.1"
+PYTHON_EXTENSIONS_COMMIT="7f571aceaf8e60eee8bb21e1ec4efa0e95523d13"
+JETBRAINS_PYTHON_EXTENSION_COMMIT="b7157473cc923fe4f15023c85a032eeab3627652"
+XKCD_PYTHON_EXTENSION_COMMIT="bf88a964473d65b39c9e09eb48dabb847206f06f"
+
+SRC_URI="
+	https://github.com/albertlauncher/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/albertlauncher/plugins/archive/${PLUGINS_HASH}.tar.gz -> ${P}-plugins.tar.gz
+	python? (
+		https://github.com/pybind/pybind11/archive/v${PYBIND11_VERSION}.tar.gz -> ${P}-pybind11-${PYBIND11_VERSION}.tar.gz
+	)
+	python-extensions? (
+		https://github.com/albertlauncher/python/archive/${PYTHON_EXTENSIONS_COMMIT}.tar.gz -> ${P}-python-extensions.tar.gz
+		https://github.com/mqus/jetbrains-albert-plugin/archive/${JETBRAINS_PYTHON_EXTENSION_COMMIT}.tar.gz -> ${P}-jetbrains-python-extension.tar.gz
+		https://github.com/bergercookie/xkcd-albert-plugin/archive/${XKCD_PYTHON_EXTENSION_COMMIT}.tar.gz -> ${P}-xkcd-python-extension.tar.gz
+	)
+"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="debug +python +python-extensions +statistics virtualbox"
+
+REQUIRED_USE="python-extensions? ( python )"
+
+RDEPEND="
+	dev-cpp/muParser
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsql:5[sqlite]
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	statistics? ( dev-qt/qtcharts:5 )
+	virtualbox? ( app-emulation/virtualbox[sdk] )
+	x11-libs/libX11
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	mv "${WORKDIR}"/plugins-${PLUGINS_HASH}/* "${S}"/plugins || die
+	if $(use python); then
+		mv "${WORKDIR}"/pybind11-${PYBIND11_VERSION}/* "${S}"/plugins/python/pybind11 || die
+	fi
+	if $(use python-extensions); then
+		mv "${WORKDIR}"/python-${PYTHON_EXTENSIONS_COMMIT}/* "${S}"/plugins/python/share/modules || die
+		mv "${WORKDIR}"/jetbrains-albert-plugin-${JETBRAINS_PYTHON_EXTENSION_COMMIT}/* "${S}"/plugins/python/share/modules/jetbrains_projects || die
+		mv "${WORKDIR}"/xkcd-albert-plugin-${XKCD_PYTHON_EXTENSION_COMMIT}/* "${S}"/plugins/python/share/modules/xkcd || die
+	fi
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_DEBUG=$(usex debug)
+		-DBUILD_PYTHON=$(usex python)
+		-DBUILD_VIRTUALBOX=$(usex virtualbox)
+		-DBUILD_WITH_QTCHARTS=$(usex statistics)
+	)
+
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/x11-misc/albert/files/albert-0.14.22-qt-5.11.patch b/x11-misc/albert/files/albert-0.14.22-qt-5.11.patch
deleted file mode 100644
index 1fa8a2fa7126..000000000000
--- a/x11-misc/albert/files/albert-0.14.22-qt-5.11.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Bug: https://bugs.gentoo.org/666998
-
-From 97fdca06dc7f82c92e5bb71e05f4fd7e74bbc616 Mon Sep 17 00:00:00 2001
-From: Michael Palimaka <kensington@gentoo.org>
-Date: Thu, 11 Oct 2018 23:09:51 +1100
-Subject: [PATCH] Add missing include.
-
----
- lib/albertcore/src/core/telemetry.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/lib/albertcore/src/core/telemetry.cpp b/lib/albertcore/src/core/telemetry.cpp
-index 1fd6b06..09b7713 100644
---- a/lib/albertcore/src/core/telemetry.cpp
-+++ b/lib/albertcore/src/core/telemetry.cpp
-@@ -2,6 +2,7 @@
- 
- #include <QApplication>
- #include <QDateTime>
-+#include <QDebug>
- #include <QJsonDocument>
- #include <QMessageBox>
- #include <QNetworkAccessManager>
--- 
-2.18.1
-
diff --git a/x11-misc/albert/metadata.xml b/x11-misc/albert/metadata.xml
index 9790aca21da3..4afe47b2ac84 100644
--- a/x11-misc/albert/metadata.xml
+++ b/x11-misc/albert/metadata.xml
@@ -12,4 +12,10 @@
 	<upstream>
 		<remote-id type="github">albertlauncher/albert</remote-id>
 	</upstream>
+	<use>
+		<flag name="debug">Enable debugging informations</flag>
+		<flag name="python-extensions">Install default python extensions system-wide</flag>
+		<flag name="statistics">Enable local statistics</flag>
+		<flag name="virtualbox">Enable app-emulation/virtualbox extension</flag>
+	</use>
 </pkgmetadata>