From fcd403ed19857488ba3454f299bf0b929363e5d1 Mon Sep 17 00:00:00 2001 From: David Roman Date: Thu, 12 Mar 2020 20:38:09 +0100 Subject: [PATCH 01/28] dev-python/python-telegram-bot: new package Package-Manager: Portage-2.3.93, Repoman-2.3.20 Signed-off-by: David Roman --- dev-python/python-telegram-bot/Manifest | 1 + dev-python/python-telegram-bot/metadata.xml | 8 ++++ .../python-telegram-bot-12.4.2.ebuild | 39 +++++++++++++++++++ .../python-telegram-bot-9999.ebuild | 39 +++++++++++++++++++ 4 files changed, 87 insertions(+) create mode 100644 dev-python/python-telegram-bot/Manifest create mode 100644 dev-python/python-telegram-bot/metadata.xml create mode 100644 dev-python/python-telegram-bot/python-telegram-bot-12.4.2.ebuild create mode 100644 dev-python/python-telegram-bot/python-telegram-bot-9999.ebuild diff --git a/dev-python/python-telegram-bot/Manifest b/dev-python/python-telegram-bot/Manifest new file mode 100644 index 0000000000..5f57644921 --- /dev/null +++ b/dev-python/python-telegram-bot/Manifest @@ -0,0 +1 @@ +DIST v12.4.2.tar.gz 1896003 BLAKE2B 2fbf77046da9c25b82682db040967e326bb92be0709f76ce9ebf98d611822d07c60d68d02e241cfbb4cc233be0e198a866f85557790227e7439d2688c5d01651 SHA512 b5c652433c99205e71dee67d1c9e5d3a9b2df40b2d60c1810135ef8b1b72f2b4b27a506682d0522a1bae58d39ba7cd559e262c222fde7dd324df779a00a76e10 diff --git a/dev-python/python-telegram-bot/metadata.xml b/dev-python/python-telegram-bot/metadata.xml new file mode 100644 index 0000000000..01c1fc8487 --- /dev/null +++ b/dev-python/python-telegram-bot/metadata.xml @@ -0,0 +1,8 @@ + + + + + davidroman96@gmail.com + David Roman + + diff --git a/dev-python/python-telegram-bot/python-telegram-bot-12.4.2.ebuild b/dev-python/python-telegram-bot/python-telegram-bot-12.4.2.ebuild new file mode 100644 index 0000000000..aeefe4399c --- /dev/null +++ b/dev-python/python-telegram-bot/python-telegram-bot-12.4.2.ebuild @@ -0,0 +1,39 @@ +# 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 wrapper of telegram bots API" +HOMEPAGE="https://python-telegram-bot.org/" + +if [[ ${PV} == *9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/python-telegram-bot/python-telegram-bot" +else + SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz" + + KEYWORDS="~amd64 ~x86" +fi + +LICENSE="GPL-3" +SLOT="0" +IUSE="test" + +RDEPEND=" + dev-python/certifi[${PYTHON_USEDEP}] + dev-python/cryptography[${PYTHON_USEDEP}] + dev-python/decorator[${PYTHON_USEDEP}] + dev-python/future[${PYTHON_USEDEP}] + dev-python/PySocks[${PYTHON_USEDEP}] + dev-python/ujson[${PYTHON_USEDEP}] + dev-python/urllib3[${PYTHON_USEDEP}] + www-servers/tornado[${PYTHON_USEDEP}] +" + +DEPEND="${RDEPEND}" + +# No tests because require networking access diff --git a/dev-python/python-telegram-bot/python-telegram-bot-9999.ebuild b/dev-python/python-telegram-bot/python-telegram-bot-9999.ebuild new file mode 100644 index 0000000000..aeefe4399c --- /dev/null +++ b/dev-python/python-telegram-bot/python-telegram-bot-9999.ebuild @@ -0,0 +1,39 @@ +# 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 wrapper of telegram bots API" +HOMEPAGE="https://python-telegram-bot.org/" + +if [[ ${PV} == *9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/python-telegram-bot/python-telegram-bot" +else + SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz" + + KEYWORDS="~amd64 ~x86" +fi + +LICENSE="GPL-3" +SLOT="0" +IUSE="test" + +RDEPEND=" + dev-python/certifi[${PYTHON_USEDEP}] + dev-python/cryptography[${PYTHON_USEDEP}] + dev-python/decorator[${PYTHON_USEDEP}] + dev-python/future[${PYTHON_USEDEP}] + dev-python/PySocks[${PYTHON_USEDEP}] + dev-python/ujson[${PYTHON_USEDEP}] + dev-python/urllib3[${PYTHON_USEDEP}] + www-servers/tornado[${PYTHON_USEDEP}] +" + +DEPEND="${RDEPEND}" + +# No tests because require networking access From 68e34dda23f0fb4280796a269e9e927ff52c908e Mon Sep 17 00:00:00 2001 From: David Roman Date: Thu, 12 Mar 2020 20:55:42 +0100 Subject: [PATCH 02/28] app-misc/telegram-send: new package Package-Manager: Portage-2.3.93, Repoman-2.3.20 Signed-off-by: David Roman --- app-misc/telegram-send/Manifest | 1 + app-misc/telegram-send/metadata.xml | 8 +++++++ .../telegram-send/telegram-send-0.25.ebuild | 24 +++++++++++++++++++ 3 files changed, 33 insertions(+) create mode 100644 app-misc/telegram-send/Manifest create mode 100644 app-misc/telegram-send/metadata.xml create mode 100644 app-misc/telegram-send/telegram-send-0.25.ebuild diff --git a/app-misc/telegram-send/Manifest b/app-misc/telegram-send/Manifest new file mode 100644 index 0000000000..29abbd0211 --- /dev/null +++ b/app-misc/telegram-send/Manifest @@ -0,0 +1 @@ +DIST telegram-send-0.25.tar.gz 25006 BLAKE2B 4d6c0b0f80de325dc39dbb8ee0eef04613ba8c5c5fa6725268f1ab758f8f10292972fb2fc98982f3777facefce7951660d021b058667235fc380563d8c3bf69f SHA512 c82a253ea1dff66b547a571c1744a0c322eb77aace1b2d9374497a2df47f5412212dc36b287487f2260113d5aac8b5632607a1342166c8036bb22605a58b5ec2 diff --git a/app-misc/telegram-send/metadata.xml b/app-misc/telegram-send/metadata.xml new file mode 100644 index 0000000000..01c1fc8487 --- /dev/null +++ b/app-misc/telegram-send/metadata.xml @@ -0,0 +1,8 @@ + + + + + davidroman96@gmail.com + David Roman + + diff --git a/app-misc/telegram-send/telegram-send-0.25.ebuild b/app-misc/telegram-send/telegram-send-0.25.ebuild new file mode 100644 index 0000000000..f762d1414d --- /dev/null +++ b/app-misc/telegram-send/telegram-send-0.25.ebuild @@ -0,0 +1,24 @@ +# 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="Send messages and files over Telegram from the command-line." +HOMEPAGE="https://www.rahielkasim.com/telegram-send/" + +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz -> ${P}.tar.gz" +KEYWORDS="~amd64 ~x86" + +LICENSE="GPL-3" +SLOT="0" +IUSE="" + +RDEPEND=" + dev-python/appdirs[${PYTHON_USEDEP}] + dev-python/colorama[${PYTHON_USEDEP}] + dev-python/python-telegram-bot[${PYTHON_USEDEP}] +" From e193e4dd59df161ff4b8082ba95ccc58e1fa1b5a Mon Sep 17 00:00:00 2001 From: Michael Egger Date: Thu, 12 Mar 2020 22:53:16 +0100 Subject: [PATCH 03/28] dev-python/black: new package Package-Manager: Portage-2.3.93, Repoman-2.3.20 Signed-off-by: Michael Egger --- dev-python/black/Manifest | 1 + dev-python/black/black-19.10_beta0.ebuild | 40 +++++++++++++++++++++++ dev-python/black/metadata.xml | 14 ++++++++ 3 files changed, 55 insertions(+) create mode 100644 dev-python/black/Manifest create mode 100644 dev-python/black/black-19.10_beta0.ebuild create mode 100644 dev-python/black/metadata.xml diff --git a/dev-python/black/Manifest b/dev-python/black/Manifest new file mode 100644 index 0000000000..53688b539f --- /dev/null +++ b/dev-python/black/Manifest @@ -0,0 +1 @@ +DIST black-19.10b0.tar.gz 1019740 BLAKE2B 8a604cd79761ff7e4da6edf985d1a876e233fee9025d5066ea012a3bad9abfe0d19c5bbed87d585db8549c82ca60e1c14a9ce9d9eacd9e62ab8a354ab4757e8d SHA512 abc6d2623ab50e59bed01fdb7a6ee7434c2d3e0f779a046d9141087aa6ef46b73b3aacc6bf84ac70b9384817bd2c707a3fa262811f11a2f61a99251d2b84dd02 diff --git a/dev-python/black/black-19.10_beta0.ebuild b/dev-python/black/black-19.10_beta0.ebuild new file mode 100644 index 0000000000..e441029357 --- /dev/null +++ b/dev-python/black/black-19.10_beta0.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python3_{6,7,8} ) + +inherit distutils-r1 + +MY_PV="19.10b0" +DESCRIPTION="The uncompromising Python code formatter" +HOMEPAGE="https://github.com/psf/black https://pypi.org/project/black/" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${PN}-${MY_PV}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="test" + +RDEPEND=" + >=dev-python/appdirs-1.4[${PYTHON_USEDEP}] + >=dev-python/attrs-18.1[${PYTHON_USEDEP}] + >=dev-python/click-6.5[${PYTHON_USEDEP}] + >=dev-python/mypy_extensions-0.4.3[${PYTHON_USEDEP}] + >=dev-python/pathspec-0.6[${PYTHON_USEDEP}] + >=dev-python/regex-2019.11.1[${PYTHON_USEDEP}] + >=dev-python/toml-0.9.4[${PYTHON_USEDEP}] + >=dev-python/typed-ast-1.4.0[${PYTHON_USEDEP}] + >=dev-python/typing-extensions-3.7.4[${PYTHON_USEDEP}] + $(python_gen_cond_dep 'dev-python/dataclasses[${PYTHON_USEDEP}]' python3_6) +" +DEPEND="${RDEPEND} + dev-python/setuptools[${PYTHON_USEDEP}] +" + +S="${WORKDIR}/${PN}-${MY_PV}" + +python_test() { + python -m unittest tests/test_black.py || die "Tests fail with ${EPYTHON}" +} \ No newline at end of file diff --git a/dev-python/black/metadata.xml b/dev-python/black/metadata.xml new file mode 100644 index 0000000000..1a334b89a5 --- /dev/null +++ b/dev-python/black/metadata.xml @@ -0,0 +1,14 @@ + + + + + michael.egger@tsn.at + Michael Egger + + + The uncompromising Python code formatter. + + + psf/black + + From 6b120967376bc269919683fae58c6539548d8f59 Mon Sep 17 00:00:00 2001 From: Michael Egger Date: Thu, 12 Mar 2020 23:06:04 +0100 Subject: [PATCH 04/28] kde-misc/plasma-applet-thermal-monitor: new package Package-Manager: Portage-2.3.93, Repoman-2.3.20 Signed-off-by: Michael Egger --- .../plasma-applet-thermal-monitor/Manifest | 1 + .../files/01-set-correct-qml-type.patch | 25 ++++++++++++++ .../metadata.xml | 15 +++++++++ ...plasma-applet-thermal-monitor-1.2.9.ebuild | 33 +++++++++++++++++++ 4 files changed, 74 insertions(+) create mode 100644 kde-misc/plasma-applet-thermal-monitor/Manifest create mode 100644 kde-misc/plasma-applet-thermal-monitor/files/01-set-correct-qml-type.patch create mode 100644 kde-misc/plasma-applet-thermal-monitor/metadata.xml create mode 100644 kde-misc/plasma-applet-thermal-monitor/plasma-applet-thermal-monitor-1.2.9.ebuild diff --git a/kde-misc/plasma-applet-thermal-monitor/Manifest b/kde-misc/plasma-applet-thermal-monitor/Manifest new file mode 100644 index 0000000000..ed8e382be9 --- /dev/null +++ b/kde-misc/plasma-applet-thermal-monitor/Manifest @@ -0,0 +1 @@ +DIST plasma-applet-thermal-monitor-1.2.9.tar.gz 836399 BLAKE2B 3f21c8443acb6132b7f7d1f2241d985d1143a5fd7d61a787517f4ab13d8ec4451c78e0224103e4feebabff187ec8c8886a62382e4197fd49b0816fd56824af29 SHA512 f07c2cc7349692b4ab71986f0cb1407224540ae89e6fa152c5833a77a869035184ca42b6e213921b65814c7b5d8a9ebc0aa73bbd8fef45e7d0027abd2009671f diff --git a/kde-misc/plasma-applet-thermal-monitor/files/01-set-correct-qml-type.patch b/kde-misc/plasma-applet-thermal-monitor/files/01-set-correct-qml-type.patch new file mode 100644 index 0000000000..b563244baa --- /dev/null +++ b/kde-misc/plasma-applet-thermal-monitor/files/01-set-correct-qml-type.patch @@ -0,0 +1,25 @@ +From b389b886a7ee759d06c9eb0e6a3b6abbea400035 Mon Sep 17 00:00:00 2001 +From: raochsinai +Date: Mon, 21 Jan 2019 11:26:31 +0800 +Subject: [PATCH] let var systemmonitorAvailableSources refer to an empty + array. + +--- + package/contents/ui/main.qml | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/package/contents/ui/main.qml b/package/contents/ui/main.qml +index 67e3f4c..75ae04d 100644 +--- a/package/contents/ui/main.qml ++++ b/package/contents/ui/main.qml +@@ -190,6 +190,10 @@ Item { + + temperatureModel.clear() + ++ if (!systemmonitorAvailableSources) { ++ systemmonitorAvailableSources = [] ++ } ++ + if (!systemmonitorSourcesToAdd) { + systemmonitorSourcesToAdd = [] + } diff --git a/kde-misc/plasma-applet-thermal-monitor/metadata.xml b/kde-misc/plasma-applet-thermal-monitor/metadata.xml new file mode 100644 index 0000000000..355f07fb1f --- /dev/null +++ b/kde-misc/plasma-applet-thermal-monitor/metadata.xml @@ -0,0 +1,15 @@ + + + + + michael.egger@tsn.at + Michael Egger + + + Plasma 5 applet for monitoring CPU, GPU and other available temperature sensors. + + + https://github.com/kotelnik/plasma-applet-thermal-monitor/issues + https://github.com/kotelnik/plasma-applet-thermal-monitor/blob/master/README.md + + diff --git a/kde-misc/plasma-applet-thermal-monitor/plasma-applet-thermal-monitor-1.2.9.ebuild b/kde-misc/plasma-applet-thermal-monitor/plasma-applet-thermal-monitor-1.2.9.ebuild new file mode 100644 index 0000000000..3a4aca4b1d --- /dev/null +++ b/kde-misc/plasma-applet-thermal-monitor/plasma-applet-thermal-monitor-1.2.9.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit kde5 cmake-utils + +DESCRIPTION="Plasma 5 applet for monitoring CPU, GPU and other available temperature sensors" +HOMEPAGE="https://store.kde.org/p/998915/ +https://github.com/kotelnik/plasma-applet-thermal-monitor" + +if [[ ${KDE_BUILD_TYPE} = live ]] ; then + EGIT_REPO_URI="https://github.com/kotelnik/${PN}.git" +else + SRC_URI="https://github.com/kotelnik/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" +fi + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +DEPEND=" + $(add_frameworks_dep plasma) +" +RDEPEND="${DEPEND}" + +DOCS=( README.md ) + +src_prepare() { + local PATCHES=("${FILESDIR}/01-set-correct-qml-type.patch") + cmake-utils_src_prepare +} From 586222744c657829eca0f7cfa055b86b9de0a2fd Mon Sep 17 00:00:00 2001 From: Michael Egger Date: Thu, 12 Mar 2020 23:18:07 +0100 Subject: [PATCH 05/28] x11-themes/arc-kde: new package Package-Manager: Portage-2.3.93, Repoman-2.3.20 Signed-off-by: Michael Egger --- x11-themes/arc-kde/Manifest | 1 + x11-themes/arc-kde/arc-kde-20180614.ebuild | 23 ++++++++++++++++++++++ x11-themes/arc-kde/metadata.xml | 15 ++++++++++++++ 3 files changed, 39 insertions(+) create mode 100644 x11-themes/arc-kde/Manifest create mode 100644 x11-themes/arc-kde/arc-kde-20180614.ebuild create mode 100644 x11-themes/arc-kde/metadata.xml diff --git a/x11-themes/arc-kde/Manifest b/x11-themes/arc-kde/Manifest new file mode 100644 index 0000000000..6c7a55ddc0 --- /dev/null +++ b/x11-themes/arc-kde/Manifest @@ -0,0 +1 @@ +DIST arc-kde-20180614.tar.gz 24686921 BLAKE2B 970d8a27075bd794bee8aed42b25f1000e763aadb1b3e2b7ffa6b5d439aaf856c3e4174aba2f092037721f83e30a6b67ff30a18bbb716a4dc755c086bd3201b0 SHA512 5c12cc5e514e29d8beaf9a1c7a8a235fd9dd1e63cd0aa076bc4956723c07e7e91302477d772c3030fa6cde5452aba93aa6a8ef757f1b6133fd30bb54e0100bc0 diff --git a/x11-themes/arc-kde/arc-kde-20180614.ebuild b/x11-themes/arc-kde/arc-kde-20180614.ebuild new file mode 100644 index 0000000000..5b9b2a09ca --- /dev/null +++ b/x11-themes/arc-kde/arc-kde-20180614.ebuild @@ -0,0 +1,23 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="Port of the popular GTK theme Arc for Plasma 5" +HOMEPAGE="https://github.com/PapirusDevelopmentTeam/arc-kde" +SRC_URI="https://github.com/PapirusDevelopmentTeam/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" +LICENSE="GPL-3" + +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +DEPEND="" +RDEPEND="${DEPEND}" + +pkg_postinst() { + elog "" + elog "This theme optionally supports \"x11-themes/kvantum\"" + elog "See also \"x11-themes/arc-theme\" for gtk support" + elog "" +} diff --git a/x11-themes/arc-kde/metadata.xml b/x11-themes/arc-kde/metadata.xml new file mode 100644 index 0000000000..4752419083 --- /dev/null +++ b/x11-themes/arc-kde/metadata.xml @@ -0,0 +1,15 @@ + + + + + michael.egger@tsn.at + Michael Egger + + + This is a port of the popular GTK theme Arc for Plasma 5 desktop with a few additions and extras. + + + https://github.com/PapirusDevelopmentTeam/arc-kde/issues + https://github.com/PapirusDevelopmentTeam/arc-kde/blob/master/README.md + + From d5e4e44676f7e45190285a796f4a79da02cff5ee Mon Sep 17 00:00:00 2001 From: David Roman Date: Fri, 13 Mar 2020 01:56:48 +0100 Subject: [PATCH 06/28] app-misc/ntfy: new package Package-Manager: Portage-2.3.93, Repoman-2.3.20 Signed-off-by: David Roman --- app-misc/ntfy/Manifest | 1 + app-misc/ntfy/metadata.xml | 12 +++++++++ app-misc/ntfy/ntfy-2.7.0.ebuild | 45 +++++++++++++++++++++++++++++++++ 3 files changed, 58 insertions(+) create mode 100644 app-misc/ntfy/Manifest create mode 100644 app-misc/ntfy/metadata.xml create mode 100644 app-misc/ntfy/ntfy-2.7.0.ebuild diff --git a/app-misc/ntfy/Manifest b/app-misc/ntfy/Manifest new file mode 100644 index 0000000000..69530a5185 --- /dev/null +++ b/app-misc/ntfy/Manifest @@ -0,0 +1 @@ +DIST ntfy-2.7.0.tar.gz 1837670 BLAKE2B 3bff167eb9ede624d5a92170c7d1f36ef075f64126a4080172a5b3cd517d2ed77a2488ee03b102a5b8d67fb37c04b47a42fd3e88b319807d798bb2622afa78ae SHA512 fba9ba15ce3c4667e5f85c0435cb5eb6224e539c10d2d431f3af3c90d6164e3098ddcb5f7881cbaed92ab0b68d9d161b16a00de680e21c3d439429865fa2765a diff --git a/app-misc/ntfy/metadata.xml b/app-misc/ntfy/metadata.xml new file mode 100644 index 0000000000..82eab7b3db --- /dev/null +++ b/app-misc/ntfy/metadata.xml @@ -0,0 +1,12 @@ + + + + + davidroman96@gmail.com + David Roman + + + Support for desktop notifications + Add support for telegram backend + + diff --git a/app-misc/ntfy/ntfy-2.7.0.ebuild b/app-misc/ntfy/ntfy-2.7.0.ebuild new file mode 100644 index 0000000000..9d9c38865c --- /dev/null +++ b/app-misc/ntfy/ntfy-2.7.0.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_6 ) + +inherit distutils-r1 + +DESCRIPTION="A utility for sending notifications, on demand and when commands finish." +HOMEPAGE="https://github.com/dschep/ntfy" +SRC_URI="https://github.com/dschep/ntfy/archive/v${PV}.tar.gz -> ${P}.tar.gz" +KEYWORDS="~amd64" + +LICENSE="GPL-3" +SLOT="0" +IUSE="test telegram dbus" + +RDEPEND=" + dev-python/appdirs[${PYTHON_USEDEP}] + dev-python/requests[${PYTHON_USEDEP}] + dev-python/ruamel-yaml[${PYTHON_USEDEP}] + + dbus? ( + dev-python/dbus-python[${PYTHON_USEDEP}] + virtual/notification-daemon + ) + + telegram? ( + app-misc/telegram-send[${PYTHON_USEDEP}] + ) +" + +DEPEND="${RDEPEND} + test? ( + dev-python/emoji[${PYTHON_USEDEP}] + dev-python/mock[${PYTHON_USEDEP}] + dev-python/psutil[${PYTHON_USEDEP}] + dev-python/sleekxmpp[${PYTHON_USEDEP}] + ) +" + +python_test() { + esetup.py test || die +} From f0ffd2b8fb88a2b7562b255b9322f93059351b54 Mon Sep 17 00:00:00 2001 From: Petrus Zhao Date: Fri, 13 Mar 2020 16:45:27 +0800 Subject: [PATCH 07/28] dev-vcs/git-extras: new package Package-Manager: Portage-2.3.93, Repoman-2.3.20 Signed-off-by: Petrus Zhao --- dev-vcs/git-extras/Manifest | 1 + dev-vcs/git-extras/git-extras-5.1.0.ebuild | 1 + dev-vcs/git-extras/git-extras-9999.ebuild | 36 ++++++++++++++++++++++ dev-vcs/git-extras/metadata.xml | 11 +++++++ 4 files changed, 49 insertions(+) create mode 100644 dev-vcs/git-extras/Manifest create mode 120000 dev-vcs/git-extras/git-extras-5.1.0.ebuild create mode 100644 dev-vcs/git-extras/git-extras-9999.ebuild create mode 100644 dev-vcs/git-extras/metadata.xml diff --git a/dev-vcs/git-extras/Manifest b/dev-vcs/git-extras/Manifest new file mode 100644 index 0000000000..ec5f74661a --- /dev/null +++ b/dev-vcs/git-extras/Manifest @@ -0,0 +1 @@ +DIST git-extras-5.1.0.tar.gz 147104 BLAKE2B 279f0476c2ec6f30531d77d5c348bc6c0a823a622f7ec96ae65b1b2861a7c3ab1bf66eb246d031d0cfb4e1cc5fd3c2bfbf1418bc619dc3b81c6f0d7ffdcccd0a SHA512 c9409444339b1f4cb1ab6cc6dba48facbf9b8ba1f253567749ab84a2c3be39bc6720467f3064de4b4e44083a4cafda6d470dbaf5652515c4cb6fa8b2d691b2dc diff --git a/dev-vcs/git-extras/git-extras-5.1.0.ebuild b/dev-vcs/git-extras/git-extras-5.1.0.ebuild new file mode 120000 index 0000000000..d3040b3a18 --- /dev/null +++ b/dev-vcs/git-extras/git-extras-5.1.0.ebuild @@ -0,0 +1 @@ +git-extras-9999.ebuild \ No newline at end of file diff --git a/dev-vcs/git-extras/git-extras-9999.ebuild b/dev-vcs/git-extras/git-extras-9999.ebuild new file mode 100644 index 0000000000..c43eeb59ff --- /dev/null +++ b/dev-vcs/git-extras/git-extras-9999.ebuild @@ -0,0 +1,36 @@ +# Copyright 2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit bash-completion-r1 + +DESCRIPTION="Little git extras." +HOMEPAGE="https://github.com/tj/git-extras" + +if [[ $PV == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="${HOMEPAGE}" +else + SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64" +fi + +LICENSE="MIT" +SLOT="0" + +RDEPEND="dev-vcs/git" + +src_compile() { :; } + +src_install() { + emake install PREFIX="${EPREIFX}"/usr SYSCONFDIR="${EPREFIX}"/etc DESTDIR="${D}" + + rm -rf "${D}"/etc/bash_completion.d + + newbashcomp etc/bash_completion.sh ${PN} + + insinto /usr/share/zsh/site-functions + newins etc/git-extras-completion.zsh _${PN} + +} diff --git a/dev-vcs/git-extras/metadata.xml b/dev-vcs/git-extras/metadata.xml new file mode 100644 index 0000000000..87ca0f178b --- /dev/null +++ b/dev-vcs/git-extras/metadata.xml @@ -0,0 +1,11 @@ + + + + + petrus.zy.07@gmail.com + Petrus Zhao + + + tj/git-extras + + From 2f151dc5b32040707c6519e1a3d407d49b02ae5b Mon Sep 17 00:00:00 2001 From: Andrew Ammerlaan Date: Fri, 13 Mar 2020 13:06:13 +0100 Subject: [PATCH 08/28] dev-python/black: EAPI bump tried to fix test but still not quite working tried to add docs but fails to build for some reason Package-Manager: Portage-2.3.93, Repoman-2.3.20 Signed-off-by: Andrew Ammerlaan --- dev-python/black/black-19.10_beta0.ebuild | 28 ++++++++++++++++------- 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/dev-python/black/black-19.10_beta0.ebuild b/dev-python/black/black-19.10_beta0.ebuild index e441029357..f62bc49568 100644 --- a/dev-python/black/black-19.10_beta0.ebuild +++ b/dev-python/black/black-19.10_beta0.ebuild @@ -1,13 +1,16 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 PYTHON_COMPAT=( python3_{6,7,8} ) +DISTUTILS_USE_SETUPTOOLS=rdepend + inherit distutils-r1 MY_PV="19.10b0" + DESCRIPTION="The uncompromising Python code formatter" HOMEPAGE="https://github.com/psf/black https://pypi.org/project/black/" SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${PN}-${MY_PV}.tar.gz" @@ -15,7 +18,9 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${PN}-${MY_PV}.tar.gz" LICENSE="MIT" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="test" + +# tests fail: name 'AioHTTPTestCase' is not defined +RESTRICT="test" RDEPEND=" >=dev-python/appdirs-1.4[${PYTHON_USEDEP}] @@ -29,12 +34,19 @@ RDEPEND=" >=dev-python/typing-extensions-3.7.4[${PYTHON_USEDEP}] $(python_gen_cond_dep 'dev-python/dataclasses[${PYTHON_USEDEP}]' python3_6) " -DEPEND="${RDEPEND} - dev-python/setuptools[${PYTHON_USEDEP}] -" S="${WORKDIR}/${PN}-${MY_PV}" -python_test() { - python -m unittest tests/test_black.py || die "Tests fail with ${EPYTHON}" -} \ No newline at end of file +python_prepare_all() { + # cannot get_version() for some reason so we set it here manually + sed -i -e "s/get_version(root=CURRENT_DIR.parent)/${MY_PV::-2}/g" \ + -e '/for sp in "abcfr":/d' \ + -e '/version.split(sp)/d' \ + docs/conf.py || die + + distutils-r1_python_prepare_all +} + +distutils_enable_tests pytest +# docs fail to build:: module 'black' has no attribute 'is_python36' +#distutils_enable_sphinx docs dev-python/recommonmark From 306074bb6b298fbf0a3988372f7f10795b973faf Mon Sep 17 00:00:00 2001 From: alarig Date: Fri, 13 Mar 2020 12:06:48 +0100 Subject: [PATCH 09/28] net-misc/FORT-validator: RPKI validator (new ebuild) Signed-off-by: Alarig Le Lay --- acct-group/fort/fort-0.ebuild | 9 +++ acct-group/fort/metadata.xml | 12 +++ acct-user/fort-0.ebuild | 13 ++++ acct-user/metadata.xml | 12 +++ .../FORT-validator-1.2.0.ebuild | 77 +++++++++++++++++++ net-misc/FORT-validator/Manifest | 1 + net-misc/FORT-validator/files/fort-confd | 15 ++++ .../FORT-validator/files/fort-config.json | 10 +++ net-misc/FORT-validator/files/fort-initd | 26 +++++++ net-misc/FORT-validator/files/fort.service | 35 +++++++++ net-misc/FORT-validator/metadata.xml | 12 +++ 11 files changed, 222 insertions(+) create mode 100644 acct-group/fort/fort-0.ebuild create mode 100644 acct-group/fort/metadata.xml create mode 100644 acct-user/fort-0.ebuild create mode 100644 acct-user/metadata.xml create mode 100644 net-misc/FORT-validator/FORT-validator-1.2.0.ebuild create mode 100644 net-misc/FORT-validator/Manifest create mode 100644 net-misc/FORT-validator/files/fort-confd create mode 100644 net-misc/FORT-validator/files/fort-config.json create mode 100644 net-misc/FORT-validator/files/fort-initd create mode 100644 net-misc/FORT-validator/files/fort.service create mode 100644 net-misc/FORT-validator/metadata.xml diff --git a/acct-group/fort/fort-0.ebuild b/acct-group/fort/fort-0.ebuild new file mode 100644 index 0000000000..2e40814709 --- /dev/null +++ b/acct-group/fort/fort-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 + +# Port 323 +ACCT_GROUP_ID=323 diff --git a/acct-group/fort/metadata.xml b/acct-group/fort/metadata.xml new file mode 100644 index 0000000000..678ca7a116 --- /dev/null +++ b/acct-group/fort/metadata.xml @@ -0,0 +1,12 @@ + + + + + alarig@swordarmor.fr + Alarig Le Lay + + + proxy-maint@gentoo.org + Proxy Maintainers + + diff --git a/acct-user/fort-0.ebuild b/acct-user/fort-0.ebuild new file mode 100644 index 0000000000..9c9fec7cde --- /dev/null +++ b/acct-user/fort-0.ebuild @@ -0,0 +1,13 @@ +# Copyright 2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit acct-user + +DESCRIPTION="User for FORT RPKI validator" +ACCT_USER_ID=323 +ACCT_USER_GROUPS=( fort ) +ACCT_USER_HOME="/usr/share/${PN}/" + +acct-user_add_deps diff --git a/acct-user/metadata.xml b/acct-user/metadata.xml new file mode 100644 index 0000000000..678ca7a116 --- /dev/null +++ b/acct-user/metadata.xml @@ -0,0 +1,12 @@ + + + + + alarig@swordarmor.fr + Alarig Le Lay + + + proxy-maint@gentoo.org + Proxy Maintainers + + diff --git a/net-misc/FORT-validator/FORT-validator-1.2.0.ebuild b/net-misc/FORT-validator/FORT-validator-1.2.0.ebuild new file mode 100644 index 0000000000..9598c51825 --- /dev/null +++ b/net-misc/FORT-validator/FORT-validator-1.2.0.ebuild @@ -0,0 +1,77 @@ +# Copyright 2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools fcaps systemd + +DESCRIPTION="FORT validator is an open source RPKI validator." +HOMEPAGE="https://fortproject.net/validator?2" +SRC_URI="https://github.com/NICMx/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +MY_PN="fort" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="caps libressl" + +DEPEND=" + acct-group/fort + acct-user/fort + caps? ( sys-libs/libcap ) + dev-libs/jansson + libressl? ( dev-libs/libressl:0= ) + !libressl? ( dev-libs/openssl:0= ) +" +RDEPEND=" + ${DEPEND} + net-misc/rsync +" +BDEPEND=" + sys-devel/autoconf + sys-devel/automake +" + +src_prepare() { + default + + eautoreconf +} + +src_install() { + newinitd "${FILESDIR}/${MY_PN}-initd" ${MY_PN} + newconfd "${FILESDIR}/${MY_PN}-confd" ${MY_PN} + + emake DESTDIR="${D}" install + insinto /usr/share/${MY_PN}/ + insopts -m0644 -o "${MY_PN}" + diropts -m0755 -o "${MY_PN}" + doins -r examples/tal/ + + dodoc -r examples/ + + insinto /etc/fort + newins "${FILESDIR}/fort-config.json" config.json + + exeinto "/usr/libexec/${MY_PN}" + doexe fort_setup.sh + + systemd_dounit "${FILESDIR}/${MY_PN}.service" +} + +pkg_postinst() { + fcaps cap_net_bind_service usr/bin/fort + + einfo "" + einfo "ARIN TAL is disabled by default because the ARIN Relying Party" + einfo "Agreement must be accepted beforehead. Start fort, run" + einfo "" + einfo " su -s /bin/sh -c '${EROOT}/usr/libexec/${MY_PN}/fort_setup.sh /usr/share/${MY_PN}/tal/' fort" + einfo "" + einfo "as root and restart fort to enable it." + einfo "The configuration file generation will fail because the script tries" + einfo "to write in your current directory. Plus, there is a configuration" + einfo "file with this ebuild, so you don’t have to use the generated one if" + einfo "you don’t want to." +} diff --git a/net-misc/FORT-validator/Manifest b/net-misc/FORT-validator/Manifest new file mode 100644 index 0000000000..abe9cf951c --- /dev/null +++ b/net-misc/FORT-validator/Manifest @@ -0,0 +1 @@ +DIST FORT-validator-1.2.0.tar.gz 427483 BLAKE2B 05fbec44fb17fa188b6196a2b166f2e112224dcf4071cc875ed1f3a147b28acff94c89b0c0a658aaee197e1820d9f53803e73add81e355f7df07713fcdb0df00 SHA512 e89b1aa7c0cd4036d04a017898e1a6017450f5dab96e57c35b0aa532b212b23f7fab17ca117a9461c9bdacca511ea70341e692a4d5e8f277ae8e277c1d48706e diff --git a/net-misc/FORT-validator/files/fort-confd b/net-misc/FORT-validator/files/fort-confd new file mode 100644 index 0000000000..92936757c3 --- /dev/null +++ b/net-misc/FORT-validator/files/fort-confd @@ -0,0 +1,15 @@ +# /etc/init.d/fort + +# Options to pass to the fort process +# See man fort for options + +# If you want to use commands arguments instead of the configuration file and +# not the default TAL directory, please remove the comment for FORT_BASEDIR as +# well + +#FORT_BASEDIR="/var/lib/fort/" +#FORT_OPTS="--tal /usr/share/fort/tal/ \ +# --local-repository ${FORT_BASEDIR} +# --log.output syslog +# --server.address ::" +FORT_OPTS="--configuration-file /etc/fort/config.json" diff --git a/net-misc/FORT-validator/files/fort-config.json b/net-misc/FORT-validator/files/fort-config.json new file mode 100644 index 0000000000..b3d5fecd78 --- /dev/null +++ b/net-misc/FORT-validator/files/fort-config.json @@ -0,0 +1,10 @@ +{ + "tal": "/usr/share/fort/tal/", + "local-repository": "/var/cache/fort/repository/", + "server": { + "address": "::" + }, + "log": { + "output": "syslog" + } +} diff --git a/net-misc/FORT-validator/files/fort-initd b/net-misc/FORT-validator/files/fort-initd new file mode 100644 index 0000000000..25e6b30965 --- /dev/null +++ b/net-misc/FORT-validator/files/fort-initd @@ -0,0 +1,26 @@ +#!/sbin/openrc-run +# Copyright 2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +name="fort validator daemon" +description="FORT validator is an open source RPKI validator." +command=/usr/bin/fort +command_args="${FORT_OPTS}" +command_user="fort" +pidfile="/run/${RC_SVCNAME}.pid" +command_background=true + +depend() { + need net +} + +start_pre() { + if [ -z "${FORT_BASEDIR}" ]; then + FORT_BASEDIR=$(awk -F '"' '/local-repository/ { print $4 }' \ + /etc/fort/config.json) + FORT_BASEDIR="${FORT_BASEDIR:-/var/cache/fort/repository/}" + fi + + checkpath -d -m 0755 -o fort:fort "$(dirname "${FORT_BASEDIR}")" + checkpath -d -m 0755 -o fort:fort "${FORT_BASEDIR}" +} diff --git a/net-misc/FORT-validator/files/fort.service b/net-misc/FORT-validator/files/fort.service new file mode 100644 index 0000000000..4f24f8d126 --- /dev/null +++ b/net-misc/FORT-validator/files/fort.service @@ -0,0 +1,35 @@ +[Unit] +Description=FORT RPKI validator +Documentation=man:fort(8) +Documentation=https://nicmx.github.io/FORT-validator/ + +[Service] +ExecStart=/usr/bin/fort --configuration-file /etc/fort/config.json +Type=simple +User=fort +AmbientCapabilities=CAP_NET_BIND_SERVICE +CapabilityBoundingSet=CAP_NET_BIND_SERVICE +ProtectSystem=strict +ProtectHome=yes +PrivateDevices=yes +PrivateTmp=yes +ProtectKernelTunables=yes +ProtectControlGroups=yes +ProtectKernelModules=yes +CacheDirectory=fort +ReadWritePaths=/var/lib/fort/ +ConfigurationDirectory=fort +ConfigurationDirectory=tals +StateDirectory=fort +NoNewPrivileges=yes +RestrictAddressFamilies=AF_UNIX AF_INET AF_INET6 +RestrictNamespaces=yes +RestrictRealtime=yes +LockPersonality=yes +MemoryDenyWriteExecute=yes +SystemCallArchitectures=native +SystemCallErrorNumber=EPERM +SystemCallFilter=@system-service + +[Install] +WantedBy=multi-user.target diff --git a/net-misc/FORT-validator/metadata.xml b/net-misc/FORT-validator/metadata.xml new file mode 100644 index 0000000000..678ca7a116 --- /dev/null +++ b/net-misc/FORT-validator/metadata.xml @@ -0,0 +1,12 @@ + + + + + alarig@swordarmor.fr + Alarig Le Lay + + + proxy-maint@gentoo.org + Proxy Maintainers + + From 75d91971e7e41563ea08d07fc064fe098e72e338 Mon Sep 17 00:00:00 2001 From: Andrew Ammerlaan Date: Fri, 13 Mar 2020 13:33:07 +0100 Subject: [PATCH 10/28] dev-python/python-telegram-bot: enable docs flag also added the test deps even though the tests fail anyway, we just use RESTRICT="test" to skip the tests. Package-Manager: Portage-2.3.93, Repoman-2.3.20 Signed-off-by: Andrew Ammerlaan --- dev-python/python-telegram-bot/Manifest | 2 +- .../python-telegram-bot-12.4.2.ebuild | 38 ++++++++++++++++--- .../python-telegram-bot-9999.ebuild | 38 ++++++++++++++++--- 3 files changed, 67 insertions(+), 11 deletions(-) diff --git a/dev-python/python-telegram-bot/Manifest b/dev-python/python-telegram-bot/Manifest index 5f57644921..0a5c14bdb0 100644 --- a/dev-python/python-telegram-bot/Manifest +++ b/dev-python/python-telegram-bot/Manifest @@ -1 +1 @@ -DIST v12.4.2.tar.gz 1896003 BLAKE2B 2fbf77046da9c25b82682db040967e326bb92be0709f76ce9ebf98d611822d07c60d68d02e241cfbb4cc233be0e198a866f85557790227e7439d2688c5d01651 SHA512 b5c652433c99205e71dee67d1c9e5d3a9b2df40b2d60c1810135ef8b1b72f2b4b27a506682d0522a1bae58d39ba7cd559e262c222fde7dd324df779a00a76e10 +DIST python-telegram-bot-12.4.2.tar.gz 1896003 BLAKE2B 2fbf77046da9c25b82682db040967e326bb92be0709f76ce9ebf98d611822d07c60d68d02e241cfbb4cc233be0e198a866f85557790227e7439d2688c5d01651 SHA512 b5c652433c99205e71dee67d1c9e5d3a9b2df40b2d60c1810135ef8b1b72f2b4b27a506682d0522a1bae58d39ba7cd559e262c222fde7dd324df779a00a76e10 diff --git a/dev-python/python-telegram-bot/python-telegram-bot-12.4.2.ebuild b/dev-python/python-telegram-bot/python-telegram-bot-12.4.2.ebuild index aeefe4399c..60046237b7 100644 --- a/dev-python/python-telegram-bot/python-telegram-bot-12.4.2.ebuild +++ b/dev-python/python-telegram-bot/python-telegram-bot-12.4.2.ebuild @@ -8,20 +8,23 @@ PYTHON_COMPAT=( python3_{6,7,8} ) inherit distutils-r1 DESCRIPTION="Python wrapper of telegram bots API" -HOMEPAGE="https://python-telegram-bot.org/" +HOMEPAGE="https://python-telegram-bot.org https://github.com/python-telegram-bot/python-telegram-bot" if [[ ${PV} == *9999 ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/python-telegram-bot/python-telegram-bot" else - SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz" + SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="~amd64 ~x86" fi LICENSE="GPL-3" SLOT="0" -IUSE="test" + +# No tests because require networking access +# Commenting out the test deps so we can add py3_8 +RESTRICT="test" RDEPEND=" dev-python/certifi[${PYTHON_USEDEP}] @@ -34,6 +37,31 @@ RDEPEND=" www-servers/tornado[${PYTHON_USEDEP}] " -DEPEND="${RDEPEND}" +#DEPEND="test? ( +# dev-python/attrs[${PYTHON_USEDEP}] +# dev-python/beautifulsoup:4[${PYTHON_USEDEP}] +# dev-python/flake8[${PYTHON_USEDEP}] +# dev-python/flaky[${PYTHON_USEDEP}] +# dev-python/pylint[${PYTHON_USEDEP}] +# dev-python/pytest-timeout[${PYTHON_USEDEP}] +# dev-python/yapf[${PYTHON_USEDEP}] +#)" -# No tests because require networking access +distutils_enable_tests pytest +distutils_enable_sphinx docs/source dev-python/sphinx_rtd_theme + +python_prepare_all() { + # do not make a test flaky report + sed -i -e '/addopts/d' setup.cfg || die + + # this test fails: Unknown pytest.mark.nocoverage + # likely this requires pytest-cov but that is deprecated + # so we skip the test + rm tests/test_meta.py || die + + # this fails to import urllib3 even though + # it is installed + rm tests/test_official.py || die + + distutils-r1_python_prepare_all +} diff --git a/dev-python/python-telegram-bot/python-telegram-bot-9999.ebuild b/dev-python/python-telegram-bot/python-telegram-bot-9999.ebuild index aeefe4399c..60046237b7 100644 --- a/dev-python/python-telegram-bot/python-telegram-bot-9999.ebuild +++ b/dev-python/python-telegram-bot/python-telegram-bot-9999.ebuild @@ -8,20 +8,23 @@ PYTHON_COMPAT=( python3_{6,7,8} ) inherit distutils-r1 DESCRIPTION="Python wrapper of telegram bots API" -HOMEPAGE="https://python-telegram-bot.org/" +HOMEPAGE="https://python-telegram-bot.org https://github.com/python-telegram-bot/python-telegram-bot" if [[ ${PV} == *9999 ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/python-telegram-bot/python-telegram-bot" else - SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz" + SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="~amd64 ~x86" fi LICENSE="GPL-3" SLOT="0" -IUSE="test" + +# No tests because require networking access +# Commenting out the test deps so we can add py3_8 +RESTRICT="test" RDEPEND=" dev-python/certifi[${PYTHON_USEDEP}] @@ -34,6 +37,31 @@ RDEPEND=" www-servers/tornado[${PYTHON_USEDEP}] " -DEPEND="${RDEPEND}" +#DEPEND="test? ( +# dev-python/attrs[${PYTHON_USEDEP}] +# dev-python/beautifulsoup:4[${PYTHON_USEDEP}] +# dev-python/flake8[${PYTHON_USEDEP}] +# dev-python/flaky[${PYTHON_USEDEP}] +# dev-python/pylint[${PYTHON_USEDEP}] +# dev-python/pytest-timeout[${PYTHON_USEDEP}] +# dev-python/yapf[${PYTHON_USEDEP}] +#)" -# No tests because require networking access +distutils_enable_tests pytest +distutils_enable_sphinx docs/source dev-python/sphinx_rtd_theme + +python_prepare_all() { + # do not make a test flaky report + sed -i -e '/addopts/d' setup.cfg || die + + # this test fails: Unknown pytest.mark.nocoverage + # likely this requires pytest-cov but that is deprecated + # so we skip the test + rm tests/test_meta.py || die + + # this fails to import urllib3 even though + # it is installed + rm tests/test_official.py || die + + distutils-r1_python_prepare_all +} From d7e150c554dcdfec2431a4d52d8d953ef0382e61 Mon Sep 17 00:00:00 2001 From: Andrew Ammerlaan Date: Fri, 13 Mar 2020 13:38:31 +0100 Subject: [PATCH 11/28] app-misc/telegram-send: add DISTUTILS_USE_SETUPTOOLS=rdepend Package-Manager: Portage-2.3.93, Repoman-2.3.20 Signed-off-by: Andrew Ammerlaan --- app-misc/telegram-send/telegram-send-0.25.ebuild | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app-misc/telegram-send/telegram-send-0.25.ebuild b/app-misc/telegram-send/telegram-send-0.25.ebuild index f762d1414d..4fdaa53d1c 100644 --- a/app-misc/telegram-send/telegram-send-0.25.ebuild +++ b/app-misc/telegram-send/telegram-send-0.25.ebuild @@ -5,17 +5,17 @@ EAPI=7 PYTHON_COMPAT=( python3_{6,7,8} ) +DISTUTILS_USE_SETUPTOOLS=rdepend + inherit distutils-r1 -DESCRIPTION="Send messages and files over Telegram from the command-line." -HOMEPAGE="https://www.rahielkasim.com/telegram-send/" - +DESCRIPTION="Send messages and files over Telegram from the command-line" +HOMEPAGE="https://www.rahielkasim.com/telegram-send https://github.com/rahiel/telegram-send" SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz -> ${P}.tar.gz" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 ~x86" LICENSE="GPL-3" SLOT="0" -IUSE="" RDEPEND=" dev-python/appdirs[${PYTHON_USEDEP}] From 0298f917c2e140905fc296a54fe6e560ba927a1d Mon Sep 17 00:00:00 2001 From: Andrew Ammerlaan Date: Fri, 13 Mar 2020 13:45:33 +0100 Subject: [PATCH 12/28] kde-misc/plasma-applet-thermal-monitor: no need to set DOCS README is already in the default DOCS Package-Manager: Portage-2.3.93, Repoman-2.3.20 Signed-off-by: Andrew Ammerlaan --- .../plasma-applet-thermal-monitor-1.2.9.ebuild | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/kde-misc/plasma-applet-thermal-monitor/plasma-applet-thermal-monitor-1.2.9.ebuild b/kde-misc/plasma-applet-thermal-monitor/plasma-applet-thermal-monitor-1.2.9.ebuild index 3a4aca4b1d..ab2b96b69b 100644 --- a/kde-misc/plasma-applet-thermal-monitor/plasma-applet-thermal-monitor-1.2.9.ebuild +++ b/kde-misc/plasma-applet-thermal-monitor/plasma-applet-thermal-monitor-1.2.9.ebuild @@ -7,7 +7,7 @@ inherit kde5 cmake-utils DESCRIPTION="Plasma 5 applet for monitoring CPU, GPU and other available temperature sensors" HOMEPAGE="https://store.kde.org/p/998915/ -https://github.com/kotelnik/plasma-applet-thermal-monitor" + https://github.com/kotelnik/plasma-applet-thermal-monitor" if [[ ${KDE_BUILD_TYPE} = live ]] ; then EGIT_REPO_URI="https://github.com/kotelnik/${PN}.git" @@ -18,15 +18,12 @@ fi LICENSE="GPL-2+" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" DEPEND=" $(add_frameworks_dep plasma) " RDEPEND="${DEPEND}" -DOCS=( README.md ) - src_prepare() { local PATCHES=("${FILESDIR}/01-set-correct-qml-type.patch") cmake-utils_src_prepare From 42249668a129d40ecbd6b2dac0325fd75c17f255 Mon Sep 17 00:00:00 2001 From: Andrew Ammerlaan Date: Fri, 13 Mar 2020 14:01:03 +0100 Subject: [PATCH 13/28] app-misc/ntfy: enable doc use flag also simplified tess using the distutils functions Package-Manager: Portage-2.3.93, Repoman-2.3.20 Signed-off-by: Andrew Ammerlaan --- app-misc/ntfy/ntfy-2.7.0.ebuild | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app-misc/ntfy/ntfy-2.7.0.ebuild b/app-misc/ntfy/ntfy-2.7.0.ebuild index 9d9c38865c..771af3d6df 100644 --- a/app-misc/ntfy/ntfy-2.7.0.ebuild +++ b/app-misc/ntfy/ntfy-2.7.0.ebuild @@ -10,11 +10,12 @@ inherit distutils-r1 DESCRIPTION="A utility for sending notifications, on demand and when commands finish." HOMEPAGE="https://github.com/dschep/ntfy" SRC_URI="https://github.com/dschep/ntfy/archive/v${PV}.tar.gz -> ${P}.tar.gz" -KEYWORDS="~amd64" +KEYWORDS="~amd64" LICENSE="GPL-3" SLOT="0" -IUSE="test telegram dbus" + +IUSE="telegram dbus" RDEPEND=" dev-python/appdirs[${PYTHON_USEDEP}] @@ -40,6 +41,5 @@ DEPEND="${RDEPEND} ) " -python_test() { - esetup.py test || die -} +distutils_enable_tests pytest +distutils_enable_sphinx docs From edeae188d9c7ec083f057164671e92d037f59e01 Mon Sep 17 00:00:00 2001 From: Andrew Ammerlaan Date: Fri, 13 Mar 2020 14:12:09 +0100 Subject: [PATCH 14/28] dev-vcs/git-extras: no symlinks please I understand why you would want to do this, however there are also very good reason to not do this: https://forums.gentoo.org/viewtopic-p-8202534.html?sid=290d68129893b7435e6ecf9c528171a2 Package-Manager: Portage-2.3.93, Repoman-2.3.20 Signed-off-by: Andrew Ammerlaan --- dev-vcs/git-extras/git-extras-5.1.0.ebuild | 37 +++++++++++++++++++++- dev-vcs/git-extras/git-extras-9999.ebuild | 2 +- 2 files changed, 37 insertions(+), 2 deletions(-) mode change 120000 => 100644 dev-vcs/git-extras/git-extras-5.1.0.ebuild diff --git a/dev-vcs/git-extras/git-extras-5.1.0.ebuild b/dev-vcs/git-extras/git-extras-5.1.0.ebuild deleted file mode 120000 index d3040b3a18..0000000000 --- a/dev-vcs/git-extras/git-extras-5.1.0.ebuild +++ /dev/null @@ -1 +0,0 @@ -git-extras-9999.ebuild \ No newline at end of file diff --git a/dev-vcs/git-extras/git-extras-5.1.0.ebuild b/dev-vcs/git-extras/git-extras-5.1.0.ebuild new file mode 100644 index 0000000000..da362616c1 --- /dev/null +++ b/dev-vcs/git-extras/git-extras-5.1.0.ebuild @@ -0,0 +1,36 @@ +# Copyright 2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit bash-completion-r1 + +DESCRIPTION="Little git extras" +HOMEPAGE="https://github.com/tj/git-extras" + +if [[ $PV == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="${HOMEPAGE}" +else + SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64" +fi + +LICENSE="MIT" +SLOT="0" + +RDEPEND="dev-vcs/git" + +src_compile() { :; } + +src_install() { + emake install PREFIX="${EPREIFX}"/usr SYSCONFDIR="${EPREFIX}"/etc DESTDIR="${D}" + + rm -rf "${D}"/etc/bash_completion.d + + newbashcomp etc/bash_completion.sh ${PN} + + insinto /usr/share/zsh/site-functions + newins etc/git-extras-completion.zsh _${PN} + +} diff --git a/dev-vcs/git-extras/git-extras-9999.ebuild b/dev-vcs/git-extras/git-extras-9999.ebuild index c43eeb59ff..da362616c1 100644 --- a/dev-vcs/git-extras/git-extras-9999.ebuild +++ b/dev-vcs/git-extras/git-extras-9999.ebuild @@ -5,7 +5,7 @@ EAPI=7 inherit bash-completion-r1 -DESCRIPTION="Little git extras." +DESCRIPTION="Little git extras" HOMEPAGE="https://github.com/tj/git-extras" if [[ $PV == 9999 ]]; then From b324b7b2fba0f38d851b4ecadfbd838d46996ea3 Mon Sep 17 00:00:00 2001 From: Piotr Staroszczyk Date: Fri, 13 Mar 2020 14:12:09 +0100 Subject: [PATCH 15/28] dev-python/httptools: new package Signed-off-by: Piotr Staroszczyk --- dev-python/httptools/Manifest | 1 + dev-python/httptools/httptools-0.1.1.ebuild | 23 +++++++++++++++++++++ dev-python/httptools/metadata.xml | 9 ++++++++ 3 files changed, 33 insertions(+) create mode 100644 dev-python/httptools/Manifest create mode 100644 dev-python/httptools/httptools-0.1.1.ebuild create mode 100644 dev-python/httptools/metadata.xml diff --git a/dev-python/httptools/Manifest b/dev-python/httptools/Manifest new file mode 100644 index 0000000000..91c3647719 --- /dev/null +++ b/dev-python/httptools/Manifest @@ -0,0 +1 @@ +DIST httptools-0.1.1.tar.gz 106162 BLAKE2B 325ef6d61db86ea2162a10e8cefc809ac233cfe47aceef4df9721a29591df6b70d1124e2a1d35ec6fff353842793ba782c49474435ce0829645f104babd4a49e SHA512 6351c6d9a384a81759b17cb0f0aa7cde410ff8131037186d79a16803e6fe4ba8f7cedc4bb592a519559a59a3bbaa7dfc478e620357d878444c42582741080190 diff --git a/dev-python/httptools/httptools-0.1.1.ebuild b/dev-python/httptools/httptools-0.1.1.ebuild new file mode 100644 index 0000000000..e29bb69bfd --- /dev/null +++ b/dev-python/httptools/httptools-0.1.1.ebuild @@ -0,0 +1,23 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{5,6,7,8} pypy3 ) + +DISTUTILS_USE_SETUPTOOLS=rdepend + +inherit distutils-r1 + +DESCRIPTION="Fast HTTP parser" +HOMEPAGE="https://github.com/MagicStack/httptools" +SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86" +# IUSE="" + +# RDEPEND="" + +BDEPEND="dev-python/cython[${PYTHON_USEDEP}]" diff --git a/dev-python/httptools/metadata.xml b/dev-python/httptools/metadata.xml new file mode 100644 index 0000000000..a507be0a78 --- /dev/null +++ b/dev-python/httptools/metadata.xml @@ -0,0 +1,9 @@ + + + + + + piotr.staroszczyk@get24.org + Piotr Staroszczyk + + From d4e6c976e9da7a5cb64b523d428830085a268a00 Mon Sep 17 00:00:00 2001 From: Piotr Staroszczyk Date: Fri, 13 Mar 2020 14:13:18 +0100 Subject: [PATCH 16/28] dev-python/uvicorn: use flags for optional packages Signed-off-by: Piotr Staroszczyk --- dev-python/uvicorn/metadata.xml | 5 +++++ dev-python/uvicorn/uvicorn-0.11.3.ebuild | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dev-python/uvicorn/metadata.xml b/dev-python/uvicorn/metadata.xml index 628ab20176..f629949955 100644 --- a/dev-python/uvicorn/metadata.xml +++ b/dev-python/uvicorn/metadata.xml @@ -6,4 +6,9 @@ andrewammerlaan@riseup.net Andrew Ammerlaan + + add websockets support using wsproto package + add websockets support using websockets package + use httpstools package for http protocol + diff --git a/dev-python/uvicorn/uvicorn-0.11.3.ebuild b/dev-python/uvicorn/uvicorn-0.11.3.ebuild index e906cfa2fd..64bce77f58 100644 --- a/dev-python/uvicorn/uvicorn-0.11.3.ebuild +++ b/dev-python/uvicorn/uvicorn-0.11.3.ebuild @@ -18,14 +18,16 @@ LICENSE="BSD" KEYWORDS="~amd64 ~x86" SLOT="0" -IUSE="doc" +IUSE="wsproto websockets httptools doc" REQUIRED_USE="x86? ( !doc )" RDEPEND=" dev-python/click[${PYTHON_USEDEP}] dev-python/h11[${PYTHON_USEDEP}] >=dev-python/uvloop-0.14.0[${PYTHON_USEDEP}] - dev-python/wsproto[${PYTHON_USEDEP}]" + wsproto? ( dev-python/wsproto[${PYTHON_USEDEP}] ) + websockets? ( >=dev-python/websockets-6.0[${PYTHON_USEDEP}] ) + httptools? ( >=dev-python/httptools-0.1.1[${PYTHON_USEDEP}] )" BDEPEND="doc? ( !x86? ( dev-python/mkdocs From ceacee44760a5b6305832eb7ce04e26ea14381a3 Mon Sep 17 00:00:00 2001 From: Andrew Ammerlaan Date: Fri, 13 Mar 2020 15:24:03 +0100 Subject: [PATCH 17/28] dev-python/httptools: remove py3_5 py3_5 is slowly being removed from ::gentoo it seems sensible to do the same here also fixed: * DISTUTILS_USE_SETUPTOOLS value is probably incorrect * value: DISTUTILS_USE_SETUPTOOLS=rdepend * expected: DISTUTILS_USE_SETUPTOOLS=bdepend Package-Manager: Portage-2.3.93, Repoman-2.3.20 Signed-off-by: Andrew Ammerlaan --- dev-python/httptools/httptools-0.1.1.ebuild | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/dev-python/httptools/httptools-0.1.1.ebuild b/dev-python/httptools/httptools-0.1.1.ebuild index e29bb69bfd..8ca82f7946 100644 --- a/dev-python/httptools/httptools-0.1.1.ebuild +++ b/dev-python/httptools/httptools-0.1.1.ebuild @@ -3,9 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{5,6,7,8} pypy3 ) - -DISTUTILS_USE_SETUPTOOLS=rdepend +PYTHON_COMPAT=( python3_{6,7,8} pypy3 ) inherit distutils-r1 @@ -16,8 +14,5 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz" LICENSE="BSD" SLOT="0" KEYWORDS="~amd64 ~x86" -# IUSE="" - -# RDEPEND="" BDEPEND="dev-python/cython[${PYTHON_USEDEP}]" From a09f6e3dc7b90c9ec13b3e9e70d1cf1f394587a0 Mon Sep 17 00:00:00 2001 From: Andrew Ammerlaan Date: Fri, 13 Mar 2020 15:29:43 +0100 Subject: [PATCH 18/28] dev-python/dkimpy: removed, this is now in ::gentoo Package-Manager: Portage-2.3.93, Repoman-2.3.20 Signed-off-by: Andrew Ammerlaan --- dev-python/dkimpy/Manifest | 1 - dev-python/dkimpy/dkimpy-0.9.1.ebuild | 20 -------------------- dev-python/dkimpy/metadata.xml | 16 ---------------- 3 files changed, 37 deletions(-) delete mode 100644 dev-python/dkimpy/Manifest delete mode 100644 dev-python/dkimpy/dkimpy-0.9.1.ebuild delete mode 100644 dev-python/dkimpy/metadata.xml diff --git a/dev-python/dkimpy/Manifest b/dev-python/dkimpy/Manifest deleted file mode 100644 index 9d07e6e34d..0000000000 --- a/dev-python/dkimpy/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST dkimpy-0.9.1.tar.gz 49209 BLAKE2B 04a9a301a213a77aa8d5b407b4071eec4e808298927720079bcd6c0f6adb6af84d4dc9f80bddc31e57d66da9d852aa9a0555a6fb8b97713b043ae75e39176369 SHA512 5667c5b7752081f5831c26eebdf5d05bec8ff6c82299506e6ca31603ba0d04aa37b908aa07e97877f298263aeb652fdc0b8d54330a263902033dc0647dc44c3f diff --git a/dev-python/dkimpy/dkimpy-0.9.1.ebuild b/dev-python/dkimpy/dkimpy-0.9.1.ebuild deleted file mode 100644 index 18f8c79377..0000000000 --- a/dev-python/dkimpy/dkimpy-0.9.1.ebuild +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python2_7 python3_{5,6,7} ) - -inherit distutils-r1 - -DESCRIPTION="Python module implementing DKIM email signing and verification." -HOMEPAGE="https://launchpad.net/dkimpy" -SRC_URI="https://launchpad.net/${PN}/0.9/${PV}/+download/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64" -IUSE="" - -python_test() { - "${EPYTHON}" -m unittest discover -v || die -} diff --git a/dev-python/dkimpy/metadata.xml b/dev-python/dkimpy/metadata.xml deleted file mode 100644 index 2715c8d035..0000000000 --- a/dev-python/dkimpy/metadata.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - gentoo@seichter.de - Ralph Seichter - - - Python module that implements DKIM (DomainKeys Identified - Mail) email signing and verification. It also provides helper - scripts for command line signing and verification. - - - dkimpy - - From 0e07c385cc2b735b6b6a292e735de8d4e1f3c183 Mon Sep 17 00:00:00 2001 From: Andrew Ammerlaan Date: Fri, 13 Mar 2020 15:32:56 +0100 Subject: [PATCH 19/28] games-fps/chocolate-doom: remove py2_7 and py3_5 add py3_8 Package-Manager: Portage-2.3.93, Repoman-2.3.20 Signed-off-by: Andrew Ammerlaan --- games-fps/chocolate-doom/chocolate-doom-3.0.0.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/games-fps/chocolate-doom/chocolate-doom-3.0.0.ebuild b/games-fps/chocolate-doom/chocolate-doom-3.0.0.ebuild index 602a40e932..3f931de1f6 100644 --- a/games-fps/chocolate-doom/chocolate-doom-3.0.0.ebuild +++ b/games-fps/chocolate-doom/chocolate-doom-3.0.0.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python2_7 python3_{5,6,7} ) +PYTHON_COMPAT=( python3_{6,7,8} ) inherit python-any-r1 xdg From 75b8db2becbed6c12a6313366d94fabe7afbb4b5 Mon Sep 17 00:00:00 2001 From: Andrew Ammerlaan Date: Fri, 13 Mar 2020 15:33:33 +0100 Subject: [PATCH 20/28] games-fps/crispy-doom: remove py2_7 and py3_5 add py3_8 Package-Manager: Portage-2.3.93, Repoman-2.3.20 Signed-off-by: Andrew Ammerlaan --- games-fps/crispy-doom/crispy-doom-5.5.2.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/games-fps/crispy-doom/crispy-doom-5.5.2.ebuild b/games-fps/crispy-doom/crispy-doom-5.5.2.ebuild index a817f3b88e..d8a3500c04 100644 --- a/games-fps/crispy-doom/crispy-doom-5.5.2.ebuild +++ b/games-fps/crispy-doom/crispy-doom-5.5.2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python2_7 python3_{5,6,7} ) +PYTHON_COMPAT=( python3_{6,7,8} ) inherit autotools python-any-r1 xdg From 5a3bd7dfdf32ecaf847de948f4bae389cc1778ec Mon Sep 17 00:00:00 2001 From: Andrew Ammerlaan Date: Fri, 13 Mar 2020 16:00:32 +0100 Subject: [PATCH 21/28] dev-python/uvicorn: use optfeature instead of flags these are mere runtime dependencies, see the 'when not to use USE flags' https://devmanual.gentoo.org/general-concepts/use-flags/index.html Package-Manager: Portage-2.3.93, Repoman-2.3.20 Signed-off-by: Andrew Ammerlaan --- dev-python/uvicorn/metadata.xml | 5 ---- dev-python/uvicorn/uvicorn-0.11.3.ebuild | 31 +++++++++++++++++------- 2 files changed, 22 insertions(+), 14 deletions(-) diff --git a/dev-python/uvicorn/metadata.xml b/dev-python/uvicorn/metadata.xml index f629949955..628ab20176 100644 --- a/dev-python/uvicorn/metadata.xml +++ b/dev-python/uvicorn/metadata.xml @@ -6,9 +6,4 @@ andrewammerlaan@riseup.net Andrew Ammerlaan - - add websockets support using wsproto package - add websockets support using websockets package - use httpstools package for http protocol - diff --git a/dev-python/uvicorn/uvicorn-0.11.3.ebuild b/dev-python/uvicorn/uvicorn-0.11.3.ebuild index 64bce77f58..04aad2daf3 100644 --- a/dev-python/uvicorn/uvicorn-0.11.3.ebuild +++ b/dev-python/uvicorn/uvicorn-0.11.3.ebuild @@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{6,7} ) DISTUTILS_USE_SETUPTOOLS=rdepend -inherit distutils-r1 +inherit distutils-r1 eutils DESCRIPTION="The lightning-fast ASGI server" HOMEPAGE="https://www.uvicorn.org/ @@ -18,32 +18,38 @@ LICENSE="BSD" KEYWORDS="~amd64 ~x86" SLOT="0" -IUSE="wsproto websockets httptools doc" +IUSE="doc" REQUIRED_USE="x86? ( !doc )" RDEPEND=" dev-python/click[${PYTHON_USEDEP}] - dev-python/h11[${PYTHON_USEDEP}] - >=dev-python/uvloop-0.14.0[${PYTHON_USEDEP}] - wsproto? ( dev-python/wsproto[${PYTHON_USEDEP}] ) - websockets? ( >=dev-python/websockets-6.0[${PYTHON_USEDEP}] ) - httptools? ( >=dev-python/httptools-0.1.1[${PYTHON_USEDEP}] )" + dev-python/h11[${PYTHON_USEDEP}]" BDEPEND="doc? ( !x86? ( dev-python/mkdocs dev-python/mkdocs-material ) )" DEPEND="test? ( + dev-python/black[${PYTHON_USEDEP}] dev-python/isort[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] )" + dev-python/requests[${PYTHON_USEDEP}] + >=dev-python/uvloop-0.14.0[${PYTHON_USEDEP}] + dev-python/wsproto[${PYTHON_USEDEP}] + >=dev-python/websockets-6.0[${PYTHON_USEDEP}] + >=dev-python/httptools-0.1.1[${PYTHON_USEDEP}] )" distutils_enable_tests pytest python_prepare_all() { - # these tests fail, likely because wsproto is out of date + # these tests fail to collect, likely because wsproto is out of date + # ImportError: cannot import name 'ConnectionType' rm tests/protocols/test_websocket.py || die rm tests/protocols/test_http.py || die + # AttributeError: module 'uvicorn.protocols.http' has no attribute 'h11_impl' + sed -i -e 's:test_concrete_http_class:_&:' \ + tests/test_config.py || die + # do not install LICENSE to /usr/ sed -i -e '/data_files/d' setup.py || die @@ -57,3 +63,10 @@ python_compile_all() { HTML_DOCS="site" fi } + +pkg_postinst() { + optfeature "asyncio event loop on top of libuv" dev-python/uvloop + optfeature "websockets support using wsproto" dev-python/wsproto + optfeature "websockets support using websockets" dev-python/websockets + optfeature "httpstools package for http protocol" dev-python/httptools +} From 6df7894fc846d8913b09b050c1f9c2cb3ad98af1 Mon Sep 17 00:00:00 2001 From: alarig Date: Fri, 13 Mar 2020 12:06:48 +0100 Subject: [PATCH 22/28] net-misc/FORT-validator: RPKI validator (new ebuild) Signed-off-by: Alarig Le Lay --- acct-user/fort/fort-0.ebuild | 13 +++++++++++++ acct-user/fort/metadata.xml | 12 ++++++++++++ 2 files changed, 25 insertions(+) create mode 100644 acct-user/fort/fort-0.ebuild create mode 100644 acct-user/fort/metadata.xml diff --git a/acct-user/fort/fort-0.ebuild b/acct-user/fort/fort-0.ebuild new file mode 100644 index 0000000000..9c9fec7cde --- /dev/null +++ b/acct-user/fort/fort-0.ebuild @@ -0,0 +1,13 @@ +# Copyright 2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit acct-user + +DESCRIPTION="User for FORT RPKI validator" +ACCT_USER_ID=323 +ACCT_USER_GROUPS=( fort ) +ACCT_USER_HOME="/usr/share/${PN}/" + +acct-user_add_deps diff --git a/acct-user/fort/metadata.xml b/acct-user/fort/metadata.xml new file mode 100644 index 0000000000..678ca7a116 --- /dev/null +++ b/acct-user/fort/metadata.xml @@ -0,0 +1,12 @@ + + + + + alarig@swordarmor.fr + Alarig Le Lay + + + proxy-maint@gentoo.org + Proxy Maintainers + + From b67d76fc117a049fb5a605f11f9b54d3ad371303 Mon Sep 17 00:00:00 2001 From: Andrew Ammerlaan Date: Fri, 13 Mar 2020 16:52:39 +0100 Subject: [PATCH 23/28] acct-user/fort: clean up misplaced files Signed-off-by: Andrew Ammerlaan --- acct-user/fort-0.ebuild | 13 ------------- acct-user/metadata.xml | 12 ------------ 2 files changed, 25 deletions(-) delete mode 100644 acct-user/fort-0.ebuild delete mode 100644 acct-user/metadata.xml diff --git a/acct-user/fort-0.ebuild b/acct-user/fort-0.ebuild deleted file mode 100644 index 9c9fec7cde..0000000000 --- a/acct-user/fort-0.ebuild +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright 2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit acct-user - -DESCRIPTION="User for FORT RPKI validator" -ACCT_USER_ID=323 -ACCT_USER_GROUPS=( fort ) -ACCT_USER_HOME="/usr/share/${PN}/" - -acct-user_add_deps diff --git a/acct-user/metadata.xml b/acct-user/metadata.xml deleted file mode 100644 index 678ca7a116..0000000000 --- a/acct-user/metadata.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - alarig@swordarmor.fr - Alarig Le Lay - - - proxy-maint@gentoo.org - Proxy Maintainers - - From 31484e3facb06b7fe63163ee2dde9e110777497d Mon Sep 17 00:00:00 2001 From: alarig Date: Fri, 13 Mar 2020 17:26:59 +0100 Subject: [PATCH 24/28] net-misc/FORT-validator: Removing test/http_test.c Signed-off-by: Alarig Le Lay --- net-misc/FORT-validator/FORT-validator-1.2.0.ebuild | 2 ++ 1 file changed, 2 insertions(+) diff --git a/net-misc/FORT-validator/FORT-validator-1.2.0.ebuild b/net-misc/FORT-validator/FORT-validator-1.2.0.ebuild index 9598c51825..8b0695e846 100644 --- a/net-misc/FORT-validator/FORT-validator-1.2.0.ebuild +++ b/net-misc/FORT-validator/FORT-validator-1.2.0.ebuild @@ -36,6 +36,8 @@ BDEPEND=" src_prepare() { default + rm test/http* || die + eautoreconf } From b2ec794f4a4d06d80de3e30dde594764fa30ecc0 Mon Sep 17 00:00:00 2001 From: Andrew Ammerlaan Date: Fri, 13 Mar 2020 18:32:46 +0100 Subject: [PATCH 25/28] net-misc/FORT-validator: patch out online test Package-Manager: Portage-2.3.93, Repoman-2.3.20 Signed-off-by: Andrew Ammerlaan --- .../FORT-validator-1.2.0.ebuild | 4 +-- .../FORT-validator-skip-online-test.patch | 29 +++++++++++++++++++ 2 files changed, 31 insertions(+), 2 deletions(-) create mode 100644 net-misc/FORT-validator/files/FORT-validator-skip-online-test.patch diff --git a/net-misc/FORT-validator/FORT-validator-1.2.0.ebuild b/net-misc/FORT-validator/FORT-validator-1.2.0.ebuild index 8b0695e846..17a3f11b53 100644 --- a/net-misc/FORT-validator/FORT-validator-1.2.0.ebuild +++ b/net-misc/FORT-validator/FORT-validator-1.2.0.ebuild @@ -33,11 +33,11 @@ BDEPEND=" sys-devel/automake " +PATCHES="${FILESDIR}/${PN}-skip-online-test.patch" + src_prepare() { default - rm test/http* || die - eautoreconf } diff --git a/net-misc/FORT-validator/files/FORT-validator-skip-online-test.patch b/net-misc/FORT-validator/files/FORT-validator-skip-online-test.patch new file mode 100644 index 0000000000..91cbe23cec --- /dev/null +++ b/net-misc/FORT-validator/files/FORT-validator-skip-online-test.patch @@ -0,0 +1,29 @@ +diff --git a/test/http_test.c b/test/http_test.c +index 765b722..c904440 100644 +--- a/test/http_test.c ++++ b/test/http_test.c +@@ -57,23 +57,7 @@ local_download(char const *url, long *response_code, struct response *resp) + + START_TEST(http_fetch_normal) + { +- struct response resp; +- long response_code; +- char const *url = "https://rrdp.ripe.net/notification.xml"; +- +- init_response(&resp); +- response_code = 0; +- +- ck_assert_int_eq(http_init(), 0); +- ck_assert_int_eq(local_download(url, &response_code, &resp), 0); +- ck_assert_int_gt(resp.size, 0); +- +- http_cleanup(); +- free(resp.content); +- if (response_code == 0) +- ck_abort_msg("NO response code received"); +- else if (response_code >= HTTP_BAD_REQUEST) +- ck_abort_msg("Received response code %ld", response_code); ++ + } + END_TEST + From 056991a706e3c0d4e5e5c28153fb0e7a3fe128b6 Mon Sep 17 00:00:00 2001 From: David Roman Date: Fri, 13 Mar 2020 18:42:14 +0100 Subject: [PATCH 26/28] dev-python/python-telegram-bot: fix tests Package-Manager: Portage-2.3.93, Repoman-2.3.20 Signed-off-by: David Roman --- .../python-telegram-bot-12.4.2.ebuild | 39 +++++++++---------- .../python-telegram-bot-9999.ebuild | 39 +++++++++---------- 2 files changed, 36 insertions(+), 42 deletions(-) diff --git a/dev-python/python-telegram-bot/python-telegram-bot-12.4.2.ebuild b/dev-python/python-telegram-bot/python-telegram-bot-12.4.2.ebuild index 60046237b7..497474b5bc 100644 --- a/dev-python/python-telegram-bot/python-telegram-bot-12.4.2.ebuild +++ b/dev-python/python-telegram-bot/python-telegram-bot-12.4.2.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{6,7,8} ) +PYTHON_COMPAT=( python3_{6,7} ) inherit distutils-r1 @@ -22,10 +22,6 @@ fi LICENSE="GPL-3" SLOT="0" -# No tests because require networking access -# Commenting out the test deps so we can add py3_8 -RESTRICT="test" - RDEPEND=" dev-python/certifi[${PYTHON_USEDEP}] dev-python/cryptography[${PYTHON_USEDEP}] @@ -37,15 +33,15 @@ RDEPEND=" www-servers/tornado[${PYTHON_USEDEP}] " -#DEPEND="test? ( -# dev-python/attrs[${PYTHON_USEDEP}] -# dev-python/beautifulsoup:4[${PYTHON_USEDEP}] -# dev-python/flake8[${PYTHON_USEDEP}] -# dev-python/flaky[${PYTHON_USEDEP}] -# dev-python/pylint[${PYTHON_USEDEP}] -# dev-python/pytest-timeout[${PYTHON_USEDEP}] -# dev-python/yapf[${PYTHON_USEDEP}] -#)" +DEPEND="test? ( + dev-python/attrs[${PYTHON_USEDEP}] + dev-python/beautifulsoup:4[${PYTHON_USEDEP}] + dev-python/flake8[${PYTHON_USEDEP}] + dev-python/flaky[${PYTHON_USEDEP}] + dev-python/pylint[${PYTHON_USEDEP}] + dev-python/pytest-timeout[${PYTHON_USEDEP}] + dev-python/yapf[${PYTHON_USEDEP}] +)" distutils_enable_tests pytest distutils_enable_sphinx docs/source dev-python/sphinx_rtd_theme @@ -54,14 +50,15 @@ python_prepare_all() { # do not make a test flaky report sed -i -e '/addopts/d' setup.cfg || die - # this test fails: Unknown pytest.mark.nocoverage - # likely this requires pytest-cov but that is deprecated - # so we skip the test - rm tests/test_meta.py || die + sed -i 's/from telegram.vendor.ptb_urllib3 //g' tests/test_*.py + sed -i 's/telegram.vendor.ptb_urllib3.urllib3/urllib3/g' tests/test_*.py - # this fails to import urllib3 even though - # it is installed - rm tests/test_official.py || die + # Remove tests files that require network access + rm tests/test_{animation,audio,bot,commandhandler,constants,conversationhandler}.py || die + rm tests/test_{dispatcher,document,forcereply,inlinekeyboardmarkup,inputmedia}.py || die + rm tests/test_{invoice,jobqueue,official,parsemode,persistence,photo,sticker,updater}.py || die + rm tests/test_replykeyboard{markup,remove}.py || die + rm tests/test_{video,videonote,voice}.py || die distutils-r1_python_prepare_all } diff --git a/dev-python/python-telegram-bot/python-telegram-bot-9999.ebuild b/dev-python/python-telegram-bot/python-telegram-bot-9999.ebuild index 60046237b7..497474b5bc 100644 --- a/dev-python/python-telegram-bot/python-telegram-bot-9999.ebuild +++ b/dev-python/python-telegram-bot/python-telegram-bot-9999.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{6,7,8} ) +PYTHON_COMPAT=( python3_{6,7} ) inherit distutils-r1 @@ -22,10 +22,6 @@ fi LICENSE="GPL-3" SLOT="0" -# No tests because require networking access -# Commenting out the test deps so we can add py3_8 -RESTRICT="test" - RDEPEND=" dev-python/certifi[${PYTHON_USEDEP}] dev-python/cryptography[${PYTHON_USEDEP}] @@ -37,15 +33,15 @@ RDEPEND=" www-servers/tornado[${PYTHON_USEDEP}] " -#DEPEND="test? ( -# dev-python/attrs[${PYTHON_USEDEP}] -# dev-python/beautifulsoup:4[${PYTHON_USEDEP}] -# dev-python/flake8[${PYTHON_USEDEP}] -# dev-python/flaky[${PYTHON_USEDEP}] -# dev-python/pylint[${PYTHON_USEDEP}] -# dev-python/pytest-timeout[${PYTHON_USEDEP}] -# dev-python/yapf[${PYTHON_USEDEP}] -#)" +DEPEND="test? ( + dev-python/attrs[${PYTHON_USEDEP}] + dev-python/beautifulsoup:4[${PYTHON_USEDEP}] + dev-python/flake8[${PYTHON_USEDEP}] + dev-python/flaky[${PYTHON_USEDEP}] + dev-python/pylint[${PYTHON_USEDEP}] + dev-python/pytest-timeout[${PYTHON_USEDEP}] + dev-python/yapf[${PYTHON_USEDEP}] +)" distutils_enable_tests pytest distutils_enable_sphinx docs/source dev-python/sphinx_rtd_theme @@ -54,14 +50,15 @@ python_prepare_all() { # do not make a test flaky report sed -i -e '/addopts/d' setup.cfg || die - # this test fails: Unknown pytest.mark.nocoverage - # likely this requires pytest-cov but that is deprecated - # so we skip the test - rm tests/test_meta.py || die + sed -i 's/from telegram.vendor.ptb_urllib3 //g' tests/test_*.py + sed -i 's/telegram.vendor.ptb_urllib3.urllib3/urllib3/g' tests/test_*.py - # this fails to import urllib3 even though - # it is installed - rm tests/test_official.py || die + # Remove tests files that require network access + rm tests/test_{animation,audio,bot,commandhandler,constants,conversationhandler}.py || die + rm tests/test_{dispatcher,document,forcereply,inlinekeyboardmarkup,inputmedia}.py || die + rm tests/test_{invoice,jobqueue,official,parsemode,persistence,photo,sticker,updater}.py || die + rm tests/test_replykeyboard{markup,remove}.py || die + rm tests/test_{video,videonote,voice}.py || die distutils-r1_python_prepare_all } From 1731c31519388f3e32f1ab148dfc8b478920cdfb Mon Sep 17 00:00:00 2001 From: Andrew Ammerlaan Date: Fri, 13 Mar 2020 18:55:05 +0100 Subject: [PATCH 27/28] dev-python/lyricwikia: pytest-runner should be in BDEPEND Package-Manager: Portage-2.3.93, Repoman-2.3.20 Signed-off-by: Andrew Ammerlaan --- dev-python/lyricwikia/lyricwikia-0.1.11.ebuild | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dev-python/lyricwikia/lyricwikia-0.1.11.ebuild b/dev-python/lyricwikia/lyricwikia-0.1.11.ebuild index f69d71ea91..b7280429c0 100644 --- a/dev-python/lyricwikia/lyricwikia-0.1.11.ebuild +++ b/dev-python/lyricwikia/lyricwikia-0.1.11.ebuild @@ -15,11 +15,12 @@ LICENSE="MIT" SLOT="0" KEYWORDS="~amd64 ~x86" -DEPEND="dev-python/pytest-runner[${PYTHON_USEDEP}] - test? ( dev-python/responses[${PYTHON_USEDEP}] )" +BDEPEND="dev-python/pytest-runner[${PYTHON_USEDEP}]" + +DEPEND="test? ( dev-python/responses[${PYTHON_USEDEP}] )" RDEPEND=" - dev-python/beautifulsoup[${PYTHON_USEDEP}] + dev-python/beautifulsoup:4[${PYTHON_USEDEP}] dev-python/six[${PYTHON_USEDEP}] dev-python/requests[${PYTHON_USEDEP}]" From 6191d2239ae860e23bab2b176fb787a52fdeef79 Mon Sep 17 00:00:00 2001 From: Andrew Ammerlaan Date: Fri, 13 Mar 2020 18:57:59 +0100 Subject: [PATCH 28/28] app-misc/telegram-send: remove py3_8 because we removed py3_8 from python-telegram-bot Package-Manager: Portage-2.3.93, Repoman-2.3.20 Signed-off-by: Andrew Ammerlaan --- app-misc/telegram-send/telegram-send-0.25.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-misc/telegram-send/telegram-send-0.25.ebuild b/app-misc/telegram-send/telegram-send-0.25.ebuild index 4fdaa53d1c..a8c29bf389 100644 --- a/app-misc/telegram-send/telegram-send-0.25.ebuild +++ b/app-misc/telegram-send/telegram-send-0.25.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{6,7,8} ) +PYTHON_COMPAT=( python3_{6,7} ) DISTUTILS_USE_SETUPTOOLS=rdepend