Updating liguros repo

10 files changed, 170 insertions, 74 deletions

diff --git a/dev-python/ipywidgets/Manifest b/dev-python/ipywidgets/Manifest
index deb0abea9c2f..15dd654437bb 100644
--- a/dev-python/ipywidgets/Manifest
+++ b/dev-python/ipywidgets/Manifest
@@ -1,2 +1,3 @@
 DIST ipywidgets-7.5.1.tar.gz 5656334 BLAKE2B 8bd98f523b619bea02e01ae5faffb08040dc5011905dd69510728b02736e66444b3c3cdf1e7272884c1df97f610aff790063f783e1d0939786669ef39cd1fc94 SHA512 856b3e4dad331766eff6e5f1fd31984a4b6ede5c678ffd51a4896f6448dac53ba181ccec2821f10e07e0f1095318427affe19f1420d0337bc3d37ef1e0a9ea0d
 DIST ipywidgets-7.6.0.tar.gz 4066107 BLAKE2B 5e5f9f6fca1e554ef2b6157a493435148a9832c7f69ec1245e24828363e2a9a1edea804236beaff1f0870d3c7aa028d329e18bc7b1aade7b212110dda3be018a SHA512 eee04406d90f8cadab0208923d51679677b6f630417b69acd0382fcb69cf3d727e47e5abde071939f0b5f45b8b0e72d0bf9316e41508c2c0df7518bfb322db51
+DIST ipywidgets-7.6.1.tar.gz 4066110 BLAKE2B 81f46c91352c8c490c588263489e5e6b2de07df4a0ed8a94e620abd16d064a0776330bb4e3cacf610e99c5528deeca18fe019c9f573d67de212b8271bae29210 SHA512 7a69f57d378c76b0c4aea1878e5a5f19adfca0acf3ec362ebddad5b05513c3bb078321c3c700f91da78dace2adb468d6182cd650da6ae299cd7022329368e538
diff --git a/dev-python/ipywidgets/ipywidgets-7.6.1.ebuild b/dev-python/ipywidgets/ipywidgets-7.6.1.ebuild
new file mode 100644
index 000000000000..0f13295bd61a
--- /dev/null
+++ b/dev-python/ipywidgets/ipywidgets-7.6.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="IPython HTML widgets for Jupyter"
+HOMEPAGE="https://ipywidgets.readthedocs.io/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/ipykernel-4.5.1[${PYTHON_USEDEP}]
+	>=dev-python/nbformat-4.2.0[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-4.3.1[${PYTHON_USEDEP}]
+	>=dev-python/widgetsnbextension-3.5.0[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/jeepney/jeepney-0.6.0.ebuild b/dev-python/jeepney/jeepney-0.6.0.ebuild
index 3fec84e8f710..1ed4edd8aa28 100644
--- a/dev-python/jeepney/jeepney-0.6.0.ebuild
+++ b/dev-python/jeepney/jeepney-0.6.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
 IUSE="examples"
 
 BDEPEND="
diff --git a/dev-python/lz4/lz4-3.1.1.ebuild b/dev-python/lz4/lz4-3.1.1.ebuild
index 492d73dbaee3..5022354adedf 100644
--- a/dev-python/lz4/lz4-3.1.1.ebuild
+++ b/dev-python/lz4/lz4-3.1.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="app-arch/lz4"
 DEPEND="
diff --git a/dev-python/pyside2-tools/Manifest b/dev-python/pyside2-tools/Manifest
new file mode 100644
index 000000000000..0d5e684462d4
--- /dev/null
+++ b/dev-python/pyside2-tools/Manifest
@@ -0,0 +1 @@
+DIST pyside-setup-opensource-src-5.15.1.tar.xz 3454052 BLAKE2B c7190dff493434064976a4604fb5858d2e20c1b98098ccd6e5c4c69d0b67ae9f4bf970e2ab42b634208ea96aab31b21f3dfb5f18fddd0bdaab655bba729e4449 SHA512 f14c7037367799005fff73d9fc8e7998db1895700911adf34dfabdeb4db486c7b28ba2afb3eaee37c58f4099b00e4a86917b8f7d85f274026bddfc090658b306
diff --git a/dev-python/pyside2-tools/metadata.xml b/dev-python/pyside2-tools/metadata.xml
new file mode 100644
index 000000000000..b1bc0972e8bc
--- /dev/null
+++ b/dev-python/pyside2-tools/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>fordfrog@gentoo.org</email>
+		<name>Miroslav Šulc</name>
+	</maintainer>
+	<use>
+		<flag name="tools">Install supplementary tools (rcc, uic, designer)</flag>
+	</use>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/dev-python/pyside2-tools/pyside2-tools-5.15.1.ebuild b/dev-python/pyside2-tools/pyside2-tools-5.15.1.ebuild
new file mode 100644
index 000000000000..8eb9086917ac
--- /dev/null
+++ b/dev-python/pyside2-tools/pyside2-tools-5.15.1.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# TODO: Add PyPy once officially supported. See also:
+#     https://bugreports.qt.io/browse/PYSIDE-535
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+CMAKE_IN_SOURCE_BUILD=1
+
+inherit cmake python-r1 virtualx
+
+MY_P=pyside-setup-opensource-src-${PV}
+
+DESCRIPTION="PySide development tools (lupdate, rcc, uic)"
+HOMEPAGE="https://wiki.qt.io/PySide2"
+SRC_URI="https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${PV}-src/${MY_P}.tar.xz"
+
+# Though "LICENSE-uic" suggests the "pyside2uic" directory to be dual-licensed
+# under the BSD 3-clause and GPL v2 licenses, this appears to be an oversight;
+# all files in this (and every) directory are licensed only under the GPL v2.
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test tools"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# Note that:
+# * "pyside2uic" imports the "PySide2.QtGui" and "PySide2.QtWidgets" C
+#   extensions and hence requires "widgets", which includes "gui" as well.
+# * "dev-qt/qtchooser" installs binaries conflicting with the "tools" USE flag.
+COMMON_DEPEND="${PYTHON_DEPS}
+	>=dev-python/pyside2-${PV}[widgets,${PYTHON_USEDEP}]
+"
+RDEPEND="${COMMON_DEPEND}
+	tools? ( !dev-qt/qtchooser )
+"
+DEPEND="${COMMON_DEPEND}
+	test? ( virtual/pkgconfig )
+"
+
+S=${WORKDIR}/${MY_P}/sources/${PN}
+DOCS=( README.md )
+
+src_prepare() {
+	cmake_src_prepare
+
+	python_copy_sources
+
+	pyside-tools_prepare() {
+		pushd "${BUILD_DIR}" >/dev/null || die
+
+		if python_is_python3; then
+			# Remove Python 2-specific paths.
+			rm -rf pyside2uic/port_v2 || die
+
+			# Generate proper Python 3 test interfaces with the "-py3" option.
+			sed -i -e \
+				's~${PYSIDERCC_EXECUTABLE}~"${PYSIDERCC_EXECUTABLE} -py3"~' \
+				tests/rcc/CMakeLists.txt || die
+		else
+			# Remove Python 3-specific paths.
+			rm -rf pyside2uic/port_v3 || die
+		fi
+
+		# Force testing against the current Python version.
+		sed -i -e "/pkg-config/ s:shiboken2:&-${EPYTHON}:" \
+			tests/rcc/run_test.sh || die
+
+		popd >/dev/null || die
+	}
+
+	python_foreach_impl pyside-tools_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTS=$(usex test)
+	)
+
+	pyside-tools_configure() {
+		local mycmakeargs=(
+			"${mycmakeargs[@]}"
+			-DPYTHON_CONFIG_SUFFIX="-${EPYTHON}"
+		)
+		CMAKE_USE_DIR="${BUILD_DIR}" cmake_src_configure
+	}
+
+	python_foreach_impl pyside-tools_configure
+}
+
+src_compile() {
+	pyside-tools_compile() {
+		CMAKE_USE_DIR="${BUILD_DIR}" cmake_src_compile
+	}
+
+	python_foreach_impl pyside-tools_compile
+}
+
+src_test() {
+	# tests work only if tools USE flag enabled
+	if [ use tools ]; then
+		pyside-tools_test() {
+			local -x PYTHONDONTWRITEBYTECODE
+			CMAKE_USE_DIR="${BUILD_DIR}" virtx cmake_src_test
+		}
+
+		python_foreach_impl pyside-tools_test
+	fi
+}
+
+src_install() {
+	pyside-tools_install() {
+		CMAKE_USE_DIR="${BUILD_DIR}" cmake_src_install
+	}
+
+	python_foreach_impl pyside-tools_install
+
+	use tools || rm "${ED}"/usr/bin/{rcc,uic,designer} || die
+
+	# Remove the broken "pyside_tool.py" script. By inspection, this script
+	# reduces to a noop. Moreover, this script raises the following exception:
+	#     FileNotFoundError: [Errno 2] No such file or directory: '/usr/bin/../pyside_tool.py': '/usr/bin/../pyside_tool.py'
+	rm "${ED}"/usr/bin/pyside_tool.py
+}
diff --git a/dev-python/setproctitle/setproctitle-1.2.ebuild b/dev-python/setproctitle/setproctitle-1.2.ebuild
index c7a6bcababdf..471c9cbe59ae 100644
--- a/dev-python/setproctitle/setproctitle-1.2.ebuild
+++ b/dev-python/setproctitle/setproctitle-1.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/tox/tox-3.20.1-r1.ebuild b/dev-python/tox/tox-3.20.1-r1.ebuild
index 2853d4da7c1b..c42936e38830 100644
--- a/dev-python/tox/tox-3.20.1-r1.ebuild
+++ b/dev-python/tox/tox-3.20.1-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/tox-dev/tox/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86"
 # doc disabled because of missing deps in tree
 IUSE="test"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/tox/tox-3.20.1.ebuild b/dev-python/tox/tox-3.20.1.ebuild
deleted file mode 100644
index 0864dbf75286..000000000000
--- a/dev-python/tox/tox-3.20.1.ebuild
+++ /dev/null
@@ -1,70 +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,9,10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="virtualenv-based automation of test activities"
-HOMEPAGE="https://tox.readthedocs.io https://github.com/tox-dev/tox https://pypi.org/project/tox/"
-SRC_URI="https://github.com/tox-dev/tox/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86"
-# doc disabled because of missing deps in tree
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/filelock[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_metadata-1.1[${PYTHON_USEDEP}]
-	' python3_{5,6,7} pypy3)
-	dev-python/packaging[${PYTHON_USEDEP}]
-	>=dev-python/pluggy-0.12[${PYTHON_USEDEP}]
-	dev-python/pip[${PYTHON_USEDEP}]
-	dev-python/py[${PYTHON_USEDEP}]
-	>=dev-python/six-1.14[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]
-	>=dev-python/virtualenv-16.0.0[${PYTHON_USEDEP}]"
-# TODO: figure out how to make tests work without the package being
-# installed first.
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		>=dev-python/flaky-3.4.0[${PYTHON_USEDEP}]
-		>=dev-python/freezegun-0.3.11[${PYTHON_USEDEP}]
-		dev-python/pathlib2[${PYTHON_USEDEP}]
-		>=dev-python/pytest-4.0.0[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		=dev-python/tox-${PV}-${PR}[${PYTHON_USEDEP}]
-	)"
-
-src_prepare() {
-	distutils-r1_src_prepare
-
-	# broken without internet
-	sed -i -e 's:test_provision_non_canonical_dep:_&:' \
-		tests/unit/session/test_provision.py || die
-	sed -i -e 's:test_provision_interrupt_child:_&:' \
-		tests/integration/test_provision_int.py || die
-	# broken with our mock version (?)
-	sed -i -e 's:test_create_KeyboardInterrupt:_&:' \
-		tests/unit/test_venv.py || die
-	# broken with Gentoo Python layout
-	sed -i -e 's:test_tox_get_python_executable:_&:' \
-		-e 's:test_find_alias_on_path:_&:' \
-		tests/unit/interpreters/test_interpreters.py || die
-
-	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-}
-
-python_test() {
-	distutils_install_for_testing
-	pytest -vv --no-network || die "Testsuite failed under ${EPYTHON}"
-}