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/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
+
+
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
+
+
+
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..771af3d6df
--- /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="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}]
+ )
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs
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..a8c29bf389
--- /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} )
+
+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 https://github.com/rahiel/telegram-send"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz -> ${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="GPL-3"
+SLOT="0"
+
+RDEPEND="
+ dev-python/appdirs[${PYTHON_USEDEP}]
+ dev-python/colorama[${PYTHON_USEDEP}]
+ dev-python/python-telegram-bot[${PYTHON_USEDEP}]
+"
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..f62bc49568
--- /dev/null
+++ b/dev-python/black/black-19.10_beta0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,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"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# tests fail: name 'AioHTTPTestCase' is not defined
+RESTRICT="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)
+"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+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
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
+
+
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
-
-
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..8ca82f7946
--- /dev/null
+++ b/dev-python/httptools/httptools-0.1.1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
+
+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"
+
+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
+
+
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}]"
diff --git a/dev-python/python-telegram-bot/Manifest b/dev-python/python-telegram-bot/Manifest
new file mode 100644
index 0000000000..0a5c14bdb0
--- /dev/null
+++ b/dev-python/python-telegram-bot/Manifest
@@ -0,0 +1 @@
+DIST python-telegram-bot-12.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..497474b5bc
--- /dev/null
+++ b/dev-python/python-telegram-bot/python-telegram-bot-12.4.2.ebuild
@@ -0,0 +1,64 @@
+# 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
+
+DESCRIPTION="Python wrapper of telegram bots API"
+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 -> ${P}.tar.gz"
+
+ KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+
+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="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
+
+python_prepare_all() {
+ # do not make a test flaky report
+ sed -i -e '/addopts/d' setup.cfg || 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
+
+ # 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
new file mode 100644
index 0000000000..497474b5bc
--- /dev/null
+++ b/dev-python/python-telegram-bot/python-telegram-bot-9999.ebuild
@@ -0,0 +1,64 @@
+# 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
+
+DESCRIPTION="Python wrapper of telegram bots API"
+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 -> ${P}.tar.gz"
+
+ KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+
+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="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
+
+python_prepare_all() {
+ # do not make a test flaky report
+ sed -i -e '/addopts/d' setup.cfg || 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
+
+ # 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/uvicorn/uvicorn-0.11.3.ebuild b/dev-python/uvicorn/uvicorn-0.11.3.ebuild
index e906cfa2fd..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/
@@ -23,25 +23,33 @@ 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}]"
+ 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
@@ -55,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
+}
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 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
new file mode 100644
index 0000000000..da362616c1
--- /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
+
+
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
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
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..ab2b96b69b
--- /dev/null
+++ b/kde-misc/plasma-applet-thermal-monitor/plasma-applet-thermal-monitor-1.2.9.ebuild
@@ -0,0 +1,30 @@
+# 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"
+
+DEPEND="
+ $(add_frameworks_dep plasma)
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ local PATCHES=("${FILESDIR}/01-set-correct-qml-type.patch")
+ cmake-utils_src_prepare
+}
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..17a3f11b53
--- /dev/null
+++ b/net-misc/FORT-validator/FORT-validator-1.2.0.ebuild
@@ -0,0 +1,79 @@
+# 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
+"
+
+PATCHES="${FILESDIR}/${PN}-skip-online-test.patch"
+
+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-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
+
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
+
+
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
+
+