Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--dev-python/pyte/Manifest2
-rw-r--r--dev-python/pyte/pyte-0.5.2-r1.ebuild32
-rw-r--r--dev-python/pyte/pyte-0.8.0-r1.ebuild (renamed from dev-python/pyte/pyte-0.8.0.ebuild)16
-rw-r--r--dev-python/pytest-runner/Manifest1
-rw-r--r--dev-python/pytest-runner/pytest-runner-4.2.ebuild42
-rw-r--r--dev-python/svgwrite/Manifest1
-rw-r--r--dev-python/svgwrite/svgwrite-1.2.1.ebuild24
-rw-r--r--eclass/systemd.eclass4
-rw-r--r--media-gfx/termtosvg/Manifest1
-rw-r--r--media-gfx/termtosvg/termtosvg-0.7.0.ebuild25
-rw-r--r--net-analyzer/speedtest-cli/Manifest2
-rw-r--r--net-analyzer/speedtest-cli/speedtest-cli-1.0.7.ebuild27
-rw-r--r--net-analyzer/speedtest-cli/speedtest-cli-2.0.0.ebuild27
-rw-r--r--net-analyzer/speedtest-cli/speedtest-cli-2.0.2.ebuild6
-rw-r--r--sys-apps/systemd/systemd-240.ebuild2
-rw-r--r--sys-apps/systemd/systemd-9999.ebuild2
16 files changed, 112 insertions, 102 deletions
diff --git a/dev-python/pyte/Manifest b/dev-python/pyte/Manifest
index f9b730c9b521..da77e9b99cca 100644
--- a/dev-python/pyte/Manifest
+++ b/dev-python/pyte/Manifest
@@ -1,2 +1,2 @@
DIST pyte-0.5.2.tar.gz 42719 BLAKE2B 00995c8427ade8a44dbc6dea4bea058431adb1409fbddc90b70ecd3cf4968632d66e4f21140ca5c071ea927208d40ed55606cf2d604f931970f99128c2b2dba8 SHA512 da903b31bb67e60bc8271c162f3429871d0def039cec5f63f07764fce1994236063876eb069a88783a4c7d8b0eac0646549c00f2a51ab8630287d852f05f4b0d
-DIST pyte-0.8.0.tar.gz 50415 BLAKE2B 8e707d8dd598d4b76b281de1481d238448f6ed07daa962647e61e7f5ad62da67a08112db7e21cb3522e5719514975a9b01ec06ff1cf2222590e02d9ff434369e SHA512 b1c23206f32c49ab509ac9bd4e042b043478cae35594c52c8389f5a5ba15cd0895315c42be5a0f2992b3aaa918ae282e43e88e72798a0b600307860f6df06465
+DIST pyte-0.8.0.tar.gz 91320 BLAKE2B b973050912c7d3b67393208a5b17f382705fe78964528e003b71addc12586353a3a9c7eeb68c224dfb945b5f9d3b52823cd254885dd5ac6901be119583a71a2e SHA512 c488fd0a61c1dc34b27e12ed9ba1109bb2c331626c982da06e7540bdd168008cb5106a17c71e60e38c493f2dd9f21ba3cf05118928744dfa192d62e511b4c4e8
diff --git a/dev-python/pyte/pyte-0.5.2-r1.ebuild b/dev-python/pyte/pyte-0.5.2-r1.ebuild
deleted file mode 100644
index 4148f4ac2f8e..000000000000
--- a/dev-python/pyte/pyte-0.5.2-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
-
-inherit distutils-r1
-
-DESCRIPTION="Simple VTXXX-compatible terminal emulator"
-HOMEPAGE="https://pypi.org/project/pyte/ https://github.com/selectel/pyte"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="LGPL-3"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="dev-python/wcwidth[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
- dev-python/pytest-runner[${PYTHON_USEDEP}]
- dev-python/setuptools_scm[${PYTHON_USEDEP}]
- test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-"
-
-python_prepare_all() {
- distutils-r1_python_prepare_all
-}
-
-python_test() {
- esetup.py test --verbose
-}
diff --git a/dev-python/pyte/pyte-0.8.0.ebuild b/dev-python/pyte/pyte-0.8.0-r1.ebuild
index 7de14fd4a96d..9c9700af2e52 100644
--- a/dev-python/pyte/pyte-0.8.0.ebuild
+++ b/dev-python/pyte/pyte-0.8.0-r1.ebuild
@@ -1,15 +1,17 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
inherit distutils-r1
DESCRIPTION="Simple VTXXX-compatible terminal emulator"
HOMEPAGE="https://pypi.org/project/pyte/ https://github.com/selectel/pyte"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+#SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+# use github tarball as pypi is missing test data
+SRC_URI="https://github.com/selectel/pyte/archive/${PV}.tar.gz -> ${P}.tar.gz"
SLOT="0"
LICENSE="LGPL-3"
@@ -18,15 +20,17 @@ IUSE="test"
RDEPEND="dev-python/wcwidth[${PYTHON_USEDEP}]"
DEPEND="${RDEPEND}
- dev-python/pytest-runner[${PYTHON_USEDEP}]
dev-python/setuptools_scm[${PYTHON_USEDEP}]
test? ( dev-python/pytest[${PYTHON_USEDEP}] )
"
python_prepare_all() {
+ # run pytest directly for tests
+ sed -i '/setup_requires=\["pytest-runner"\]/d' setup.py || die
+
distutils-r1_python_prepare_all
}
python_test() {
- esetup.py test --verbose
+ py.test -v || die "tests failed with ${EPYTHON}"
}
diff --git a/dev-python/pytest-runner/Manifest b/dev-python/pytest-runner/Manifest
index ead06770abd0..c9065c2f3808 100644
--- a/dev-python/pytest-runner/Manifest
+++ b/dev-python/pytest-runner/Manifest
@@ -1,3 +1,4 @@
DIST pytest-runner-2.11.1.tar.gz 9661 BLAKE2B 300b63de61ef36c299a95c60af469b071c27ae483f641c7cad594f7b6f582d9e1e076192f9fd5019850cf9227af183e9f80b4049719d074a180e72c25521bc14 SHA512 5249e0a368bab21bb034a9b0121edbcda635f559cc22ba79c87565dcbc070056bfed47a69c16f4733403f61ea5b73adfd1ccf945700116043cbf3940d37d4067
DIST pytest-runner-2.6.2.tar.gz 6379 BLAKE2B 4f676a4cd59309cdd0e6462c83718482622817781d302ed95a2b7cb9d92a0b0f38b411c1172ecce9003f5781cdb168338bce6f446b1c91069a2024fb75574bfc SHA512 6a993e8729d5e203986f2526d46e96b7ac19e65fc26493a55a98e858304ecde0c47576476864a0ee1817ea1a7b02cfda952fc03f79b84fff249021f140f3d00d
DIST pytest-runner-4.0.tar.gz 11401 BLAKE2B 3be4527e68b8c1ae7e1bb5bad111367e459a07cf20de1f3b2d8ab993a7e016f9656618075bf515f576fef457aa86f99990f7dcc4c20a04166703bf9272c395c1 SHA512 a7f3defcc698f43b3b6ceec3f59dbd0e00c651167ddc76a9d1a093d722a013c9ffd2bad3438e49170688d503166cb6d8bf55bbaf7bc6f9e6d80eff049c202b08
+DIST pytest-runner-4.2.tar.gz 11947 BLAKE2B 97495bead800a81d879659f1ee522822f76fe8ac80579537d43e21e663323d7c10be8d2da7d05ffdb0931145149d8c10ef7c72b3ab4da2ce856d44d3f00a724e SHA512 278da7add27f77134e63470747ffd9fe663d93ab8e7cebfbae98902bb1d5ffba45277574107f958255251cb9e499b85a0db3e8173f9f10fb31d1561ca709a379
diff --git a/dev-python/pytest-runner/pytest-runner-4.2.ebuild b/dev-python/pytest-runner/pytest-runner-4.2.ebuild
new file mode 100644
index 000000000000..07a5f1fde57b
--- /dev/null
+++ b/dev-python/pytest-runner/pytest-runner-4.2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy{,3} )
+
+inherit distutils-r1
+
+DESCRIPTION="Adds support for tests during installation of setup.py files"
+HOMEPAGE="https://pypi.org/project/pytest-runner/ https://github.com/pytest-dev/pytest-runner"
+SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd"
+SLOT="0"
+IUSE="doc test"
+
+RDEPEND="dev-python/pytest[${PYTHON_USEDEP}]"
+DEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ dev-python/setuptools_scm[${PYTHON_USEDEP}]
+ doc? (
+ dev-python/rst-linker[${PYTHON_USEDEP}]
+ dev-python/sphinx[${PYTHON_USEDEP}]
+ )
+ test? ( ${RDEPEND} )
+"
+
+# Tests require network access to download packages
+RESTRICT="test"
+
+python_compile_all() {
+ if use doc; then
+ esetup.py build_sphinx
+ HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
+ fi
+}
+
+python_test() {
+ esetup.py pytest
+}
diff --git a/dev-python/svgwrite/Manifest b/dev-python/svgwrite/Manifest
index 8b9eaa089053..a084815d7413 100644
--- a/dev-python/svgwrite/Manifest
+++ b/dev-python/svgwrite/Manifest
@@ -1 +1,2 @@
DIST svgwrite-1.1.12.tar.gz 202920 BLAKE2B a2b60f3c3829203342919bc75d01f64515f13ba305f357fa788c3754679451e21a7ab97eb517413d4e882e7271d063e7034a10bb70a1946d84734e23e838bdd1 SHA512 326fcc0dd0749925c0c35793a91ffdb25be1fd724d7d87bd6491a6396a6ab65fce073a387faac4f3d034ceadcf24ef73e3838cd249c4e1c19e20b1e82769cf1a
+DIST svgwrite-1.2.1.tar.gz 207371 BLAKE2B 8d6198dbfbc9230eb1592651bde3daaf3f14570aa57fb5b0a3e0989b36b76181bfeac9ee96ee7dcf0ad6e53d1e4ec7035e66d2d1f45ef92de59fa0305f391923 SHA512 8874a25ce5418dc86b0f7034555aca46619c415ec6c51243d713f168f9255ddec8d17ecde13cbfe1a4ffcfbad5b160db62d226b5b0106725dd263763d43abdc2
diff --git a/dev-python/svgwrite/svgwrite-1.2.1.ebuild b/dev-python/svgwrite/svgwrite-1.2.1.ebuild
new file mode 100644
index 000000000000..aa6acd5719f2
--- /dev/null
+++ b/dev-python/svgwrite/svgwrite-1.2.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 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 Package to write SVG files"
+HOMEPAGE="https://github.com/mozman/svgwrite"
+SRC_URI="https://github.com/mozman/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND=">=dev-python/pyparsing-2.0.1[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+ test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+python_test() {
+ py.test -v || die "tests failed with ${EPYTHON}"
+}
diff --git a/eclass/systemd.eclass b/eclass/systemd.eclass
index 9a5abfeac900..04f277e94d64 100644
--- a/eclass/systemd.eclass
+++ b/eclass/systemd.eclass
@@ -468,8 +468,8 @@ systemd_reenable() {
type systemctl &>/dev/null || return 0
local x
for x; do
- if systemctl --quiet --root="${ROOT}" is-enabled "${x}"; then
- systemctl --root="${ROOT}" reenable "${x}"
+ if systemctl --quiet --root="${ROOT:-/}" is-enabled "${x}"; then
+ systemctl --root="${ROOT:-/}" reenable "${x}"
fi
done
}
diff --git a/media-gfx/termtosvg/Manifest b/media-gfx/termtosvg/Manifest
index b2e867a39b85..30a9b15b857e 100644
--- a/media-gfx/termtosvg/Manifest
+++ b/media-gfx/termtosvg/Manifest
@@ -1 +1,2 @@
DIST termtosvg-0.4.0.tar.gz 88543 BLAKE2B a45e15e7d681bb649670d4c73cf09306fa09276b2a34f762db66f4cf2d640d2163f4e98b16dc609e92b4145978e76a00e80950634d1599ee0766c4f08afb15a5 SHA512 c0c90fc9e74c892ebe6b7fcd25ff2757a7a8b9ee4da459fc608c96295d0f9b40bf6c98a0ac56f42c3e2a60cb60e9404a9b50863bdf74335d2b4758b124c04fcb
+DIST termtosvg-0.7.0.tar.gz 276936 BLAKE2B 530bd3ef17aa19cbc23e46e7aea4716dda9369979ae97609ac6f976fecd4f75652b23f47ccf4da8035175f281d1a80b340acc714391882365c01764a92e4588b SHA512 085f6b9728cc641b058c8a060420e8221659a9447119d2c1211cfcd6452c63a187c5dc1e4f98fc7aca2018161ae49a9a71b2264108c5e06167eaaaf18f5aa291
diff --git a/media-gfx/termtosvg/termtosvg-0.7.0.ebuild b/media-gfx/termtosvg/termtosvg-0.7.0.ebuild
new file mode 100644
index 000000000000..d7e0741c4112
--- /dev/null
+++ b/media-gfx/termtosvg/termtosvg-0.7.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6,7} )
+inherit distutils-r1
+
+DESCRIPTION="Record terminal sessions as SVG animations"
+HOMEPAGE="https://github.com/nbedos/termtosvg"
+SRC_URI="https://github.com/nbedos/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="${PYTHON_DEPS}
+ >=dev-python/pyte-0.8.0[${PYTHON_USEDEP}]
+ dev-python/lxml[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+python_test() {
+ "${PYTHON}" -m unittest discover -v || die "tests failed with ${EPYTHON}"
+}
diff --git a/net-analyzer/speedtest-cli/Manifest b/net-analyzer/speedtest-cli/Manifest
index d061f7634750..1b249e12211d 100644
--- a/net-analyzer/speedtest-cli/Manifest
+++ b/net-analyzer/speedtest-cli/Manifest
@@ -1,3 +1 @@
-DIST speedtest-cli-1.0.7.tar.gz 21077 BLAKE2B 8bbb9b73f21f9252763461230053bac5d890d19d3f80a81f616bb4535c5e386b70b43c6ee0688ca813fab21f8387fd93df65b1b0254613efbdec93b1807d3caa SHA512 c06c0e80ec00adebc04fb2bdab5b45ec84a32d9dbf2e4fbe7b0461f4b3b1fdcf29048b8c7a906c03dcea0771417317394243bdc6f1bc8fb763e13eafae31a42b
-DIST speedtest-cli-2.0.0.tar.gz 23642 BLAKE2B 042b5c24d084400663548d3110dd28a4c4bad780d46f9f4182ab8d1a323a087970e0ebdff04dee2ecd1bed9b488dd72f4799992c762f631d3cad59aedc6452e5 SHA512 60bde263a06589c609a10e1a881a1b02f7c7426b95778d7729b1388e545713094501914c24ee08f0857c4f445354539b5508825ab1a51df284215ba681dd7888
DIST speedtest-cli-2.0.2.tar.gz 23915 BLAKE2B 95b88e1666d7bc50c525ae7eb587e1b53babe02549e3b6b81f59451166fdbfb5561daa29e1de308d3ca7340989bcb6e7b43edd84bf371716284c034cdeb21fd8 SHA512 12fa9a5dd8bcb7a7ee68ecc9075dc5c18f089cecf003e7e643dbb6b1c3663f17c2aba48d1e84aa27bff6b66e207d39ecaf874aebad1d71cac772c58b62191723
diff --git a/net-analyzer/speedtest-cli/speedtest-cli-1.0.7.ebuild b/net-analyzer/speedtest-cli/speedtest-cli-1.0.7.ebuild
deleted file mode 100644
index 5d55575fd650..000000000000
--- a/net-analyzer/speedtest-cli/speedtest-cli-1.0.7.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Command line interface for testing internet bandwidth using speedtest.net"
-HOMEPAGE="https://github.com/sivel/speedtest-cli"
-SRC_URI="https://github.com/sivel/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-DOCS=( CONTRIBUTING.md README.rst )
-
-python_install_all() {
- doman ${PN}.1
- distutils-r1_python_install_all
-}
diff --git a/net-analyzer/speedtest-cli/speedtest-cli-2.0.0.ebuild b/net-analyzer/speedtest-cli/speedtest-cli-2.0.0.ebuild
deleted file mode 100644
index 0bf6c921ff5b..000000000000
--- a/net-analyzer/speedtest-cli/speedtest-cli-2.0.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Command line interface for testing internet bandwidth using speedtest.net"
-HOMEPAGE="https://github.com/sivel/speedtest-cli"
-SRC_URI="https://github.com/sivel/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-DOCS=( CONTRIBUTING.md README.rst )
-
-python_install_all() {
- doman ${PN}.1
- distutils-r1_python_install_all
-}
diff --git a/net-analyzer/speedtest-cli/speedtest-cli-2.0.2.ebuild b/net-analyzer/speedtest-cli/speedtest-cli-2.0.2.ebuild
index 0bf6c921ff5b..5ac123e2be42 100644
--- a/net-analyzer/speedtest-cli/speedtest-cli-2.0.2.ebuild
+++ b/net-analyzer/speedtest-cli/speedtest-cli-2.0.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
inherit distutils-r1
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/sivel/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
IUSE=""
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/sys-apps/systemd/systemd-240.ebuild b/sys-apps/systemd/systemd-240.ebuild
index 84248ba4f3a3..df6e7a98ecda 100644
--- a/sys-apps/systemd/systemd-240.ebuild
+++ b/sys-apps/systemd/systemd-240.ebuild
@@ -436,7 +436,7 @@ pkg_postinst() {
if [[ -z ${ROOT} && -d /run/systemd/system ]]; then
ebegin "Reexecuting system manager"
- systemctl daemon-reexec || FAIL=1
+ systemctl daemon-reexec
eend $?
fi
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index 84248ba4f3a3..df6e7a98ecda 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -436,7 +436,7 @@ pkg_postinst() {
if [[ -z ${ROOT} && -d /run/systemd/system ]]; then
ebegin "Reexecuting system manager"
- systemctl daemon-reexec || FAIL=1
+ systemctl daemon-reexec
eend $?
fi