diff --git a/app-misc/liquidctl/Manifest b/app-misc/liquidctl/Manifest
new file mode 100644
index 0000000000..373b6da804
--- /dev/null
+++ b/app-misc/liquidctl/Manifest
@@ -0,0 +1 @@
+DIST liquidctl-1.4.1.tar.gz 149114 BLAKE2B eee91d82cd31021aa8a290844c74ff117024383f85eaa83ef89bf4f1d3e9d1af29b6b530497c356fb51aaca6f686522768eb1df0c7fb85ecdc34b630109a1db9 SHA512 f5f1e1e9f4f03ab2bc1252a65a118a1cfd2203f4cbde7e7ddb45667b20ec7757d35eff9f69922395efb1461d660b104531230942f4d537428f30ae3e59ed2594
diff --git a/app-misc/liquidctl/liquidctl-1.4.1.ebuild b/app-misc/liquidctl/liquidctl-1.4.1.ebuild
new file mode 100644
index 0000000000..b4d2acfa1b
--- /dev/null
+++ b/app-misc/liquidctl/liquidctl-1.4.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1 udev
+
+DESCRIPTION="Cross-platform tool and drivers for liquid coolers and other devices"
+HOMEPAGE="https://github.com/jonasmalacofilho/liquidctl"
+SRC_URI="https://github.com/jonasmalacofilho/liquidctl/releases/download/v${PV}/${P}.tar.gz"
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+ dev-python/docopt[${PYTHON_USEDEP}]
+ dev-python/hidapi[${PYTHON_USEDEP}]
+ dev-python/pyusb[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+src_test() {
+ # Without this variable, it attempts to write to /var/run and fails
+ XDG_RUNTIME_DIR="${T}/xdg" distutils-r1_src_test || die
+}
+
+python_install_all() {
+ distutils-r1_python_install_all
+ dodoc docs/*.md || die
+ dodoc -r docs/linux/
+ udev_dorules extra/linux/71-liquidctl.rules
+}
diff --git a/app-misc/liquidctl/metadata.xml b/app-misc/liquidctl/metadata.xml
new file mode 100644
index 0000000000..8e9aedf815
--- /dev/null
+++ b/app-misc/liquidctl/metadata.xml
@@ -0,0 +1,11 @@
+
+
+
+
+ alexey+gentoo@asokolov.org
+ Alexey Sokolov
+
+
+ jonasmalacofilho/liquidctl
+
+
diff --git a/dev-python/factory_boy/Manifest b/dev-python/factory_boy/Manifest
index 5516a43763..17b2aaf345 100644
--- a/dev-python/factory_boy/Manifest
+++ b/dev-python/factory_boy/Manifest
@@ -1 +1,2 @@
DIST factory_boy-2.12.0.tar.gz 142758 BLAKE2B ce5ebae106fd57ce5292ad4713e20e5a83a818675746dd3bb241ad3592da83975b87659547740a3cddb646795889605260ce24d6f1878994418eec35c9b7b8da SHA512 33236bc02d5331998bb210af498bea46fc9540e66af32db8fdab563193b7ae8870e7cc01c93c24a03ee23ba64bac6ca27a72bb51a264d1c7b6bf9b098c65d5d2
+DIST factory_boy-3.0.1.tar.gz 143652 BLAKE2B 38b21722e9fa5dc248342f7fb3f03126f05aefda052d6e65f7f932c68655aad108bbe0a7f2d643825f475b1ccd33406e1c1b4946413e5ae050a78ba5617decd4 SHA512 8e1611e04b40a14d333a33e0f3a938cdf43895fc0559618d06b9acec903829db59c62c34c01f3c8a79e7419bbe347147e1d6a0f106928a334eab505dd04b1890
diff --git a/dev-python/factory_boy/factory_boy-2.12.0-r1.ebuild b/dev-python/factory_boy/factory_boy-2.12.0-r1.ebuild
index 6c902da6f1..500cc2cde4 100644
--- a/dev-python/factory_boy/factory_boy-2.12.0-r1.ebuild
+++ b/dev-python/factory_boy/factory_boy-2.12.0-r1.ebuild
@@ -3,7 +3,7 @@
EAPI="7"
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{7,8} )
inherit distutils-r1
diff --git a/dev-python/factory_boy/factory_boy-2.12.0.ebuild b/dev-python/factory_boy/factory_boy-3.0.1.ebuild
similarity index 75%
rename from dev-python/factory_boy/factory_boy-2.12.0.ebuild
rename to dev-python/factory_boy/factory_boy-3.0.1.ebuild
index f91189398f..91f2687ff1 100644
--- a/dev-python/factory_boy/factory_boy-2.12.0.ebuild
+++ b/dev-python/factory_boy/factory_boy-3.0.1.ebuild
@@ -3,7 +3,7 @@
EAPI="7"
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{7,8} )
inherit distutils-r1
@@ -16,31 +16,31 @@ SLOT="0"
KEYWORDS="~amd64 ~x86"
RDEPEND="dev-python/faker[${PYTHON_USEDEP}]"
-DEPEND="
- ${RDEPEND}
+BDEPEND="
test? (
$(python_gen_impl_dep sqlite)
dev-python/django[${PYTHON_USEDEP}]
- dev-python/isort[${PYTHON_USEDEP}]
dev-python/mongoengine[${PYTHON_USEDEP}]
dev-python/pillow[jpeg,${PYTHON_USEDEP}]
dev-python/sqlalchemy[${PYTHON_USEDEP}]
)
+ doc? (
+ dev-python/factory_boy[${PYTHON_USEDEP}]
+ )
"
-# Disable tests which require running mongod
-PATCHES=( "${FILESDIR}/${PN}-2.11.1-test.patch" )
python_prepare_all() {
# Fix symbolic link QA
rm ChangeLog || die "remove failed"
cp docs/changelog.rst ChangeLog || die "copy failed"
+ # Disable online tests
+ sed -i -e 's:tearDownClass:_&:' \
+ -e 's:test_creation:_&:' \
+ tests/test_mongoengine.py || die
+
distutils-r1_python_prepare_all
}
-#python_test() {
-# "${EPYTHON}" -m unittest discover -v || die "tests failed with ${EPYTHON}"
-#}
-
distutils_enable_tests unittest
distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
diff --git a/dev-python/faker/Manifest b/dev-python/faker/Manifest
index c3f1157993..544f9d3a0f 100644
--- a/dev-python/faker/Manifest
+++ b/dev-python/faker/Manifest
@@ -1,2 +1 @@
-DIST faker-4.0.3.tar.gz 996987 BLAKE2B cc8fa1ae039d1a753efde2a43404681fe53124fb2a92724a81384cd10dd8008833c6c4468012f3cfaef83ca6e6a50813ef00036b180df2f1752a79064507c770 SHA512 08d7a4fc3a65f4f31467e0aa91525ce92042ef7e471992a63c3fef2efa14ab894bda1f0fa1e6b651f78ceadee7c3683079001db904147739628457a44adef615
-DIST faker-4.1.0.tar.gz 1005246 BLAKE2B 07a4d93875ed67f6e8e34fec7d4015eddc47cdb80e4e5b60f33e5ab93105f14b95f1ff9073debd530e04d71c4c5d22e1db805753151842a6b896095376eb1304 SHA512 da8e6df52c53788af323d92a0feaafcc215bd00ae5a95bb2d829852bbf04f89f9216c7e226b3b89966c053dd891db33acf2e2ee2ac5a981745976325c0cf2d2e
+DIST faker-4.1.2.tar.gz 1022640 BLAKE2B 6aee2cd581b1acb344d88f2e38da2fb5fb26e09ecec8bfc0c7febdff4c24758af60327c3e7efd7ad1d489705beaf75e5d11ad572f9bb0c03bc52f8d17b8e1238 SHA512 194bd8537d6288a0e6f5bbae721fc350e829ae18d1d76c3092d08d2576027dd99778fe50e8c7a293e69672d9904d7b7ea457b40baa89fae0402bd1355e430c07
diff --git a/dev-python/faker/faker-4.0.3.ebuild b/dev-python/faker/faker-4.0.3.ebuild
deleted file mode 100644
index 530758121e..0000000000
--- a/dev-python/faker/faker-4.0.3.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python package that generates fake data"
-HOMEPAGE="
- https://github.com/joke2k/faker
- https://pypi.org/project/Faker
-"
-SRC_URI="https://github.com/joke2k/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
- >=dev-python/python-dateutil-2.4[${PYTHON_USEDEP}]
- dev-python/six[${PYTHON_USEDEP}]
- >=dev-python/text-unidecode-1.3[${PYTHON_USEDEP}]
-"
-DEPEND="
- ${RDEPEND}
- >=dev-python/sphinx-2.4[${PYTHON_USEDEP}]
- =dev-python/pytest-5.4.0[${PYTHON_USEDEP}]
- =dev-python/ukpostcodeparser-1.1.1[${PYTHON_USEDEP}]
- >=dev-python/validators-0.13.0[${PYTHON_USEDEP}]
- )
-"
-
-distutils_enable_tests pytest
-#TODO: make docs working
-#distutils_enable_sphinx docs --no-autodoc
diff --git a/dev-python/faker/faker-4.1.0.ebuild b/dev-python/faker/faker-4.1.2.ebuild
similarity index 93%
rename from dev-python/faker/faker-4.1.0.ebuild
rename to dev-python/faker/faker-4.1.2.ebuild
index 2fb03ec39d..3f3f0907c3 100644
--- a/dev-python/faker/faker-4.1.0.ebuild
+++ b/dev-python/faker/faker-4.1.2.ebuild
@@ -4,7 +4,7 @@
EAPI="7"
DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{7,8} )
inherit distutils-r1
@@ -14,11 +14,11 @@ HOMEPAGE="
https://pypi.org/project/Faker
"
SRC_URI="https://github.com/joke2k/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
LICENSE="MIT"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
+
RDEPEND="
>=dev-python/python-dateutil-2.4[${PYTHON_USEDEP}]
dev-python/six[${PYTHON_USEDEP}]
@@ -29,6 +29,7 @@ DEPEND="
>=dev-python/sphinx-2.4[${PYTHON_USEDEP}]
=dev-python/pytest-5.4.0[${PYTHON_USEDEP}]
@@ -52,6 +53,7 @@ python_test() {
pytest -vv || die "Testsuite failed under ${EPYTHON}"
}
+distutils_enable_tests pytest
#TODO: make docs working
#FileNotFoundError: [Errno 2] No such file or directory: '/var/tmp/portage/dev-python/faker-4.1.0/work/docs/providers.rst'
#distutils_enable_sphinx docs --no-autodoc
diff --git a/dev-python/pytest-randomly/Manifest b/dev-python/pytest-randomly/Manifest
index 8c9c3779f1..03807ea58f 100644
--- a/dev-python/pytest-randomly/Manifest
+++ b/dev-python/pytest-randomly/Manifest
@@ -1 +1 @@
-DIST pytest-randomly-3.3.1.tar.gz 31404 BLAKE2B 28a77b2c7043ece3305e1971957b23a7188bf1889483c9747f2fe925bfe72e872d8e8f4a52e3dc372f9934dd81c3e88bbc9be52bc574605faed80e57fa852d3c SHA512 242274b1e9fcbb03278766ddd46e8d3dca2374f09db0d111feb0bebdabab4d46ecc63d17f17e692cf4adf662dd3b450f87fe14e248488acb4d3c629567d54458
+DIST pytest-randomly-3.4.1.tar.gz 32468 BLAKE2B 6aaddfca7434a8b7060aa32d69f84ff5e03e5f43bcfdfacc56f792ba6e1a1f5f49dca641a0100ed4ddf0f6947017aa354ab4fcc2ad837bb5b072aab8142f07b6 SHA512 3f1006ce67478221fb57369f6b0dcbb41bdd38798059112cff2e113ab101a4d07e72e5f302ffdf6159cc8600999f691f0f665fda4c0fcf58bba3c4fe5a12c039
diff --git a/dev-python/pytest-randomly/pytest-randomly-3.3.1-r1.ebuild b/dev-python/pytest-randomly/pytest-randomly-3.3.1-r1.ebuild
deleted file mode 100644
index 89096d8747..0000000000
--- a/dev-python/pytest-randomly/pytest-randomly-3.3.1-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Pytest plugin to randomly order tests and control random.seed"
-HOMEPAGE="
- https://pypi.python.org/pypi/pytest-randomly
- https://github.com/pytest-dev/pytest-randomly
-"
-SRC_URI="https://github.com/pytest-dev/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-# many failures, both with pytest-5 and 4
-RESTRICT="test"
-
-RDEPEND="
- dev-python/docutils[${PYTHON_USEDEP}]
- dev-python/factory_boy[${PYTHON_USEDEP}]
- dev-python/faker[${PYTHON_USEDEP}]
- dev-python/numpy[${PYTHON_USEDEP}]
- dev-python/pygments[${PYTHON_USEDEP}]
- dev-python/pytest[${PYTHON_USEDEP}]
-
- $(python_gen_cond_dep 'dev-python/importlib_metadata[${PYTHON_USEDEP}]' python3_6 python3_7)
-"
-#not really needed
-# dev-python/isort[${PYTHON_USEDEP}]
-# $(python_gen_cond_dep 'dev-python/black[${PYTHON_USEDEP}]' python3_8)
-# dev-python/secretstorage[${PYTHON_USEDEP}]
-# dev-python/twine[${PYTHON_USEDEP}]
-
-DEPEND="
- test? (
- dev-python/pytest-xdist[${PYTHON_USEDEP}]
- )
-"
-#not really needed
-# $(python_gen_cond_dep 'dev-python/check-manifest[${PYTHON_USEDEP}]' python3_8)
-# dev-python/multilint[${PYTHON_USEDEP}]
-
-distutils_enable_tests pytest
-
-python_test() {
- distutils_install_for_testing
- pytest -vv || die "Testsuite failed under ${EPYTHON}"
-}
diff --git a/dev-python/pytest-randomly/pytest-randomly-3.3.1-r2.ebuild b/dev-python/pytest-randomly/pytest-randomly-3.4.1.ebuild
similarity index 71%
rename from dev-python/pytest-randomly/pytest-randomly-3.3.1-r2.ebuild
rename to dev-python/pytest-randomly/pytest-randomly-3.4.1.ebuild
index 1e902ac9b0..ba4a52f47b 100644
--- a/dev-python/pytest-randomly/pytest-randomly-3.3.1-r2.ebuild
+++ b/dev-python/pytest-randomly/pytest-randomly-3.4.1.ebuild
@@ -4,7 +4,7 @@
EAPI="7"
DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{7,8} )
inherit distutils-r1
@@ -19,6 +19,11 @@ LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~x86"
+# No clue what's going on here
+# AssertionError: assert ['collecting ... collected 4 items',\n '',\n 'test_one.py::test_d PASSED',\n 'test_one.py::test_c PASSED'] ==
+# ['test_one.py::test_d PASSED',\n 'test_one.py::test_c PASSED',\n 'test_one.py::test_a PASSED',\n 'test_one.py::test_b PASSED']
+RESTRICT="test"
+
RDEPEND="
dev-python/docutils[${PYTHON_USEDEP}]
dev-python/factory_boy[${PYTHON_USEDEP}]
@@ -27,22 +32,14 @@ RDEPEND="
dev-python/pygments[${PYTHON_USEDEP}]
dev-python/pytest[${PYTHON_USEDEP}]
- $(python_gen_cond_dep 'dev-python/importlib_metadata[${PYTHON_USEDEP}]' python3_6 python3_7)
+ $(python_gen_cond_dep 'dev-python/importlib_metadata[${PYTHON_USEDEP}]' python3_7)
"
-#not really needed
-# dev-python/isort[${PYTHON_USEDEP}]
-# $(python_gen_cond_dep 'dev-python/black[${PYTHON_USEDEP}]' python3_8)
-# dev-python/secretstorage[${PYTHON_USEDEP}]
-# dev-python/twine[${PYTHON_USEDEP}]
DEPEND="
test? (
dev-python/pytest-xdist[${PYTHON_USEDEP}]
)
"
-#not really needed
-# $(python_gen_cond_dep 'dev-python/check-manifest[${PYTHON_USEDEP}]' python3_8)
-# dev-python/multilint[${PYTHON_USEDEP}]
distutils_enable_tests pytest
diff --git a/dev-python/pytest-travis-fold/Manifest b/dev-python/pytest-travis-fold/Manifest
deleted file mode 100644
index e078951d96..0000000000
--- a/dev-python/pytest-travis-fold/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST pytest-travis-fold-1.3.0.tar.gz 7787 BLAKE2B 1ccecca18312d85b4bec0fcd6398a4b8aa19053c18799eb5bd4bb59a1e33e5eaa45bb952e4f3b356ba985cb81ef4753c474ebbfd901d57bce8e8521f16541768 SHA512 18b551690a526330a7ed3846c4ecb123e5ecbd6edb91ba145525b48391c5226b6e5ff44ba4e5c46487ca3716120a2d0d0518c2ef4cab5ee3419496124a5f2ffa
diff --git a/dev-python/pytest-travis-fold/metadata.xml b/dev-python/pytest-travis-fold/metadata.xml
deleted file mode 100644
index ec09803fab..0000000000
--- a/dev-python/pytest-travis-fold/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
- lssndrbarbieri@gmail.com
- Alessandro Barbieri
-
-
- abusalimov/pytest-travis-fold
- pytest-travis-fold
-
-
diff --git a/dev-python/pytest-travis-fold/pytest-travis-fold-1.3.0-r1.ebuild b/dev-python/pytest-travis-fold/pytest-travis-fold-1.3.0-r1.ebuild
deleted file mode 100644
index bdad14845c..0000000000
--- a/dev-python/pytest-travis-fold/pytest-travis-fold-1.3.0-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( pypy3 python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Pytest plugin that folds captured output sections in Travis CI build log"
-HOMEPAGE="
- https://github.com/abusalimov/pytest-travis-fold
- https://pypi.org/project/pytest-travis-fold
-"
-SRC_URI="https://github.com/abusalimov/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
- >=dev-python/pytest-2.6.0[${PYTHON_USEDEP}]
- ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
- >=dev-python/pytest-2.6.0[${PYTHON_USEDEP}]
- ==
+ sed -i -e 's:test_transform:_&:' \
+ tests/pathops_test.py || die
+
distutils-r1_python_prepare_all
}
diff --git a/dev-python/validators/Manifest b/dev-python/validators/Manifest
index 604b1fa6fb..ba3ccbb609 100644
--- a/dev-python/validators/Manifest
+++ b/dev-python/validators/Manifest
@@ -1,3 +1 @@
-DIST validators-0.14.0.tar.gz 25442 BLAKE2B e4c159afd24b33bd91ea59ca00254712cf69f9a4d180dd794f9b142a372bfd1695cebe7b49585a6b7eb8ea8290499e0138151a3e7a5693db187d8ad2bb520c9e SHA512 ec9153cb817f25e40221502484cdbdb9cf1566fe8445f7b822d4a80325154aca5a665be452f6251351682d36167c5a6bb02c3259d6067f4f51fa1d01aaa44a4e
-DIST validators-0.14.3.tar.gz 25893 BLAKE2B 2114d74912457032506eb850e5da856044439f5e02ac707cddcca23b6a59b7725d4253cbb7ce815f6944076a54f686edcbf52d387d2f27b53ca6bccbbdaa4140 SHA512 ea2fc81a63f24d64d2933220ed7674ae9733673c208906d3090bc10bf2119965834759015deedfea218306b1b29e8ff6937698e3b5de73494236516656a16096
-DIST validators-0.15.0.tar.gz 27333 BLAKE2B d8c683bf8a79e1e0c5a9d59b0a23f9f1aaae3a90f358f9810a8aae2a98a144e8c1f6a2c16df5c1fe0d354c779869ae118269b11df6bfcaac5e19c5689d4e9e1b SHA512 333b88621133416acf7e9c9746a92f1ae795b579ccc57fd514414ba87eb51ce8eaf496955b91c7d0c2046a52a05afb05c5452f7c1e5f035ea747c28b7d1aea73
+DIST validators-0.18.0.tar.gz 29394 BLAKE2B 28c6b38207cc8accf70f921b866d04db7e5b81c3cb11f62b649698f759e910c604c76d7633805676e01986677011b7505981b80e6b6a0266cd6554fc30866216 SHA512 f735798a81b817bc1277acdc694d8259dc518fec3dea5f8edbe35bc7f0e919f595ab3757bc07eddf01523217ad2e5039b7fe5833b2306dbba90261e46d8cc3e0
diff --git a/dev-python/validators/validators-0.14.0-r1.ebuild b/dev-python/validators/validators-0.14.0-r1.ebuild
deleted file mode 100644
index 47c4fba1fc..0000000000
--- a/dev-python/validators/validators-0.14.0-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python Data Validation for Humans"
-HOMEPAGE="https://github.com/kvesteri/validators"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-KEYWORDS="~amd64 ~x86"
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND="
- >=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
- >=dev-python/six-1.4.0[${PYTHON_USEDEP}]
-"
-DEPEND="
- ${RDEPEND}
-"
-#not really required
-# test? (
-# >=dev-python/isort-4.2.2[${PYTHON_USEDEP}]
-# )
-
-distutils_enable_tests pytest
-
-#issues with sphinx.ext.pngmath https://github.com/kvesteri/validators/issues/156
-distutils_enable_sphinx docs "=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
- >=dev-python/six-1.4.0[${PYTHON_USEDEP}]
-"
-DEPEND="
- ${RDEPEND}
-"
-#not really required
-# test? (
-# >=dev-python/isort-4.2.2[${PYTHON_USEDEP}]
-# )
-
-distutils_enable_tests pytest
-
-#issues with sphinx.ext.pngmath https://github.com/kvesteri/validators/issues/156
-distutils_enable_sphinx docs "=dev-python/isort-4.2.2[${PYTHON_USEDEP}]
-# )
+
+python_prepare_all() {
+ # sphinx.ext.pngmath has been replace in sphinx>2
+ sed -i -e 's/sphinx.ext.pngmath/sphinx.ext.imgmath/g' docs/conf.py || die
+
+ distutils-r1_python_prepare_all
+}
distutils_enable_tests pytest
-
-#issues with sphinx.ext.pngmath https://github.com/kvesteri/validators/issues/156
-distutils_enable_sphinx docs " ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc"
+
+DEPEND=( sys-libs/glibc )
+RDEPEND=(
+ ${DEPEND}
+ dev-vcs/git
+)
+
+DOCS=( src/${EGO_PN}/{CONTRIBUTING,README}.md )
+
+src_compile() {
+ GOPATH="${S}" go build -v -o bin/lazygit src/${EGO_PN}/main.go || die
+}
+
+src_install() {
+ dobin bin/lazygit
+
+ use doc && dodoc -r "src/${EGO_PN}/docs/."
+ einstalldocs
+}
diff --git a/gui-apps/nwg-launchers/Manifest b/gui-apps/nwg-launchers/Manifest
index 7099b274bc..f0b00a8f8f 100644
--- a/gui-apps/nwg-launchers/Manifest
+++ b/gui-apps/nwg-launchers/Manifest
@@ -1,3 +1,3 @@
-DIST nwg-launchers-0.2.0.tar.gz 43240 BLAKE2B e026faaa272d2c0b71a4140d3a0dd6bad9b40a528a3d49819197ad93a833a2263048c56287058f70fa50a7c0de503b8b3d84fa1a0271b3c906d107c582d61d3c SHA512 4f04c8bae4a3cf8869d66b833d9528fffb65f27a04e254c38133f2cd3b046b2db3cdc61dec90c958f009ea79e68313741f71b29bc15a04f4905f0853b3b55553
DIST nwg-launchers-0.3.0.tar.gz 42750 BLAKE2B ef745b20b884d5bb9281017d2cf6f19f3dc3125489e5d1c1c0e4909209119902f0da1982f09154111ad4a269948d2f2a4e851efaa8ae5dfe992a4c30c601fb64 SHA512 3dc1a49d72dfa2d5cfd8254b6e0d48af4b86dce86171a44813c2d89f9a450bed0ab88bd2afbc2152a3608c89ab27d434a62f21589ef7f9519b5f5e669f78e324
DIST nwg-launchers-0.3.1.tar.gz 43257 BLAKE2B ef033fe253099eaa8b7151ebccec81a6a3a1ed8cc90dce48a7c236c305ece1fac2c47b615e40366d877878494af9924d83369a655199b85fcf26aea3feaa46de SHA512 91e72c24899d01172075141102e714a0c0264a1dc68a550a6b64eb66201f85605781c0beaa631d8bc7f40bc93cf9dea26d6eab698077941ac3f8120f666f85f7
+DIST nwg-launchers-0.3.2.tar.gz 44880 BLAKE2B f4050fd4bcbe26fe5c8cd533654cd8d9b40a02265510fe06da93232eeeb4566ca5c9ca4c0267b4b5447d35ea7fbba432ce3103cd78065f87bdb4e9973fd9ad7f SHA512 c5acfe0977e771a251d074a1185039991034354d5f5f5a9e49a8f1349397a87ac072d8b4510685f022bfd9f28f02cb81b08d62557c36cde482798a1cb244ea46
diff --git a/gui-apps/nwg-launchers/nwg-launchers-0.2.0.ebuild b/gui-apps/nwg-launchers/nwg-launchers-0.3.2.ebuild
similarity index 100%
rename from gui-apps/nwg-launchers/nwg-launchers-0.2.0.ebuild
rename to gui-apps/nwg-launchers/nwg-launchers-0.3.2.ebuild
diff --git a/sys-process/iotop-c/Manifest b/sys-process/iotop-c/Manifest
index e6c55cc058..0610756c0b 100644
--- a/sys-process/iotop-c/Manifest
+++ b/sys-process/iotop-c/Manifest
@@ -1 +1,2 @@
DIST iotop-c-0_pre20140824.tar.gz 16154 BLAKE2B ccd5a1d0901ce7d6c554f9b4a2102e7eab9f9bb456f7f2289b0c7b158c8f220339bc018aeb9295f89b717a711b69cb7f1c144d0c84dce093309e6897ac22a67d SHA512 3dac84abff82f1ec6c14a0dae14c11a2260ebe0a6ec112cda06ecfe2cf8535536c92f432fc03cc2baee6b7326eb4dda4fc2fe08a15c41a78641822daea5726d0
+DIST iotop-c-1.9.tar.gz 28680 BLAKE2B 7e30ca3cec2694afeb2bead7f97eb7ee0dcb3066cf4d1643771b04b724789b9b09836998f6f693bc0a3332b4bb06fb36c46c6ae9b37f0b8088c212136d5bd9f3 SHA512 99a1b9bcae13dbcead1e1c9df8618164be0f9c81e7220d2d4b1e0b8d1528b6a4f6845763a6c04a38510a4174bcaf21abb216f582f49729820cd579e0ca2856f9
diff --git a/sys-process/iotop-c/iotop-c-1.9.ebuild b/sys-process/iotop-c/iotop-c-1.9.ebuild
new file mode 100644
index 0000000000..7fef5de54c
--- /dev/null
+++ b/sys-process/iotop-c/iotop-c-1.9.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="top utility for IO (C port)"
+HOMEPAGE="https://github.com/Tomas-M/iotop"
+SRC_URI="https://github.com/Tomas-M/iotop/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="sys-libs/ncurses:=
+ !sys-process/iotop"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}/iotop-${PV}"
+
+src_prepare() {
+ default
+ sed -i Makefile -e "s/-lncursesw/$(pkg-config --libs ncursesw)/"
+}
+
+src_install() {
+ dobin iotop
+ dodoc README.md
+}