Merge updates from master

2026-07-18 11:33:15 -04:00 · 2020-05-02 10:34:55 +00:00
parent 3645811dc6 1fbc76282c
commit 5ba758609f
14 changed files with 22 additions and 69 deletions
--- a/dev-python/databases/Manifest
+++ b/dev-python/databases/Manifest
@@ -1 +1 @@
-DIST databases-0.3.1.tar.gz 23956 BLAKE2B 14460db0ea3219daeb9ad07cc342ae7690146af60f76e801c2446f61d67990b27110769e202c22999c04aed1ee951f6bbe2a70ffdc4efa6ecffa76af606b211b SHA512 f6c638f88fab94b046cb164c5ceaa9233a7404c5d3871eb536545c6acaabd3a70fd59edf9a2698bdf789a88fda0f081530732c7060f672ebebc4af29e2e7e735
+DIST databases-0.3.2.tar.gz 24257 BLAKE2B 83d2f35462e4da27e8a4c219dc991de1ae2356cdb1a730d61a52448a2fdbd156df8f685bfa2ae2e61f2b4c4b83143badd25c925cbeb3ab669be47ee217f33ebf SHA512 dc5894e240709ac2f71eca816c1fed745478811bf2c5c2faca5aec7f115af5a15d9acd684816d09d94ff7cd2d4450eca14ff5874cf5ec5d62261f19a6439ba0c
--- a/dev-python/databases/databases-0.3.2.ebuild
+++ b/dev-python/databases/databases-0.3.2.ebuild
@@ -5,7 +5,10 @@ EAPI=7

 PYTHON_COMPAT=( python3_6 )

-inherit distutils-r1 eutils
+DOCBUILDER="mkdocs"
+DOCDEPEND="dev-python/mkdocs-material"
+
+inherit distutils-r1 docs eutils

 DESCRIPTION="Async database support for Python."
 HOMEPAGE="
@@ -31,10 +34,6 @@ RESTRICT="test"
 RDEPEND=">=dev-python/sqlalchemy-1.3.0[${PYTHON_USEDEP}]
 	$(python_gen_cond_dep 'dev-python/aiocontextvars[${PYTHON_USEDEP}]' 'python3_6')"

-BDEPEND="doc? (
-	dev-python/mkdocs
-	dev-python/mkdocs-material )"
-
 # autoflake, codecov also required for tests?
 DEPEND="test? (
 	dev-python/aiomysql[${PYTHON_USEDEP}]
@@ -49,6 +48,8 @@ DEPEND="test? (
 	dev-python/starlette[${PYTHON_USEDEP}]
 	dev-python/requests[${PYTHON_USEDEP}] )"

+distutils_enable_tests pytest
+
 python_prepare_all() {
 	# do not install LICENSE to /usr/
 	sed -i -e '/data_files/d' setup.py || die
@@ -56,19 +57,9 @@ python_prepare_all() {
 	distutils-r1_python_prepare_all
 }

-python_compile_all() {
-	default
-	if use doc; then
-		mkdocs build || die "failed to make docs"
-		HTML_DOCS="site"
-	fi
-}
-
 pkg_postinst() {
 	optfeature "postgresql support" dev-python/asyncpg dev-python/psycopg
 	optfeature "mysql support" dev-python/aiomysql dev-python/pymysql
 	optfeature "sqlite support" dev-python/aiosqlite
 	optfeature "postgresql+aiopg support" dev-python/aiopg
 }
-
-distutils_enable_tests pytest
--- a/dev-python/pytest-sugar/Manifest
+++ b/dev-python/pytest-sugar/Manifest
@@ -1,2 +1 @@
-DIST pytest-sugar-0.9.2.tar.gz 12677 BLAKE2B 9ef5119479ce1333bf86844e8f959d5e50f1f656fff7a871acb9aa5bd7478bafa34819c4db8ad8a8f105807cf444544846bf02049fbd6802636e5a3f123a11ab SHA512 9a1f30e35cb503f1afec6a1e18ad2d013b005627891021171ccc6f94d3aebe45a724db0615ba75e2befc074e7b77dd0627b5ffb8876906d434bd95cf5984b5ad
-DIST pytest-sugar-0.9.2_p20200213.tar.gz 13806 BLAKE2B 7f982bb3bdafb711981ab2f1395fde080d4d3565b4274095770a19aba5a28d687138b9b1118b0c3c7aba1e91fd53864a46c9b9faef103577fbdbf99a901519e8 SHA512 83270c9e529d408bbf65cd515316f931053d3c68134987f8e74efcee515a12a239e242e1c63ce84ea254300ee048e7cf50590e82869cda10b28212de6f38be21
+DIST pytest-sugar-0.9.3.tar.gz 12649 BLAKE2B 75e07c26c7a6ce55a497bb29fdef32134f2872b8f7c23b3941e0dad875d441aa7d1788859d170ffd0ed58ae19a1a9abc67b2b18140cad06380a0efd53337131a SHA512 ac2edb57e0eb453410e2595614093a9e0d4642e8ba1dc738d87eff3a476a57df006a55e480c15ddbd0ffddea219314c810b8385024208090056059e17b201bb8
--- a/dev-python/pytest-sugar/pytest-sugar-0.9.2_p20200213.ebuild
+++ b/dev-python/pytest-sugar/pytest-sugar-0.9.2_p20200213.ebuild
@@ -1,35 +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} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-COMMIT="66f6d9f9311a176ffafdfe00cb8c487d45b6a735"
-
-DESCRIPTION="Plugin for pytest that changes the default look and feel of pytest"
-HOMEPAGE="
-	https://pivotfinland.com/pytest-sugar
-	https://github.com/Teemu/pytest-sugar
-	https://pypi.org/project/pytest-sugar
-"
-SRC_URI="https://github.com/Teemu/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/packaging-14.1[${PYTHON_USEDEP}]
-	<dev-python/pytest-5.4[${PYTHON_USEDEP}]
-	>=dev-python/pytest-xdist-1.14[${PYTHON_USEDEP}]
-	>=dev-python/termcolor-1.1.0[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${PN}-${COMMIT}"
-
-distutils_enable_tests pytest
--- a/dev-python/pytest-sugar/pytest-sugar-0.9.3.ebuild
+++ b/dev-python/pytest-sugar/pytest-sugar-0.9.3.ebuild
@@ -21,8 +21,6 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"

-RESTRICT="test"
-
 RDEPEND="
 	>=dev-python/packaging-14.1[${PYTHON_USEDEP}]
 	<dev-python/pytest-5.4[${PYTHON_USEDEP}]
--- a/dev-python/python-vlc/Manifest
+++ b/dev-python/python-vlc/Manifest
@@ -1 +1 @@
-DIST python-vlc-3.0.7110.tar.gz 224455 BLAKE2B b550cae3d3975e71610ca91b92d16278032da9a90efb8b753da80823028b67cd674613f682b565b830b098940fbd8cd91420cb56494dd46aaf9fe3037374d11b SHA512 c02fa5e66ce17520228a1f2058c468399aa56ff791be2b456bd836eb8db58909890830fe56942d2ffc0c4a565d5fa97cad2dea705152e6c8be406c801a872a4e
+DIST python-vlc-3.0.9113.tar.gz 146300 BLAKE2B 4bff60bab31b0b9df6ea9d187772700f3f8a7bb0173a77435a7297b45a86c04dbae763c5b23853306a0f93d2a6c49d1608eda420ac1ed1d44e9b6489b26f3ff7 SHA512 0fef0190238695d7fb9217857c4e70b2c61be91409506e9fa175ca76af1b52d8e620126c6e8f67c8672e1bab00a9d9dd673701ff31059db7ff742881ec2f278c
--- a/dev-python/python-vlc/python-vlc-3.0.9113.ebuild
+++ b/dev-python/python-vlc/python-vlc-3.0.9113.ebuild
--- a/dev-python/starlette/Manifest
+++ b/dev-python/starlette/Manifest
@@ -1 +1 @@
-DIST starlette-0.13.3.tar.gz 431202 BLAKE2B a05c91104a1be1837486447551477388db657e1a52fe504796132ec87aae99738862254d284a0dca3fc78843070f31ec6b2ff82ea9a4454986ec9616845bf662 SHA512 00359e9cf2400c9cc5ef5fa7ce6e9e82a3360c680defe3268bb15a21b96894be36c67c55b5caf9bedcb814ef213876d44b5ae2209d54594477b72f2c979429cc
+DIST starlette-0.13.4.tar.gz 433353 BLAKE2B 4859132906cc28807171fe72ccb725621f77b502b8fe285663bd494efdb2c44e65079d5fabb37b5ee34a6808d2d66232bf66a5f519a6f0c38b4f734867aa17a2 SHA512 ca986f60f1735b73844648c92aec6f4b3695923c806fcab9321912a38c8e53c6c9cd1373ee4912d7bbfe0052666507ad625ae1d16dbf80459534c066aaec828b
--- a/dev-python/starlette/starlette-0.13.4.ebuild
+++ b/dev-python/starlette/starlette-0.13.4.ebuild
--- a/dev-python/ufoLib2/Manifest
+++ b/dev-python/ufoLib2/Manifest
@@ -1 +1 @@
-DIST ufoLib2-0.6.3a1.zip 63774 BLAKE2B 1452ae99547f820f431b8cebf820ecfaf6f7160838b6e06f8724963517d98dc6d002d4cb254285dd3474254c6d423b0622e6ed6cdf54005d54e5904e26af1114 SHA512 898389183748c6405a4d0f78197f47d51d28d42f95ba2872dc4c175dd9c5fb617c172ea87ef88aea88daeea44f6a4fc0a76081f7e2c6457a1d25edfa93a36607
+DIST ufoLib2-0.7.0.zip 81135 BLAKE2B 448d31fa8532c6433fa0fdf790179edae916e13dcbc9bce2636aaa25a9c323ada932fe77255c3ff3765926fed481b79f7281855b2c7f1f6d8f0eca127a33812c SHA512 741b5d4485f26cf5f520be1bd7992ddea67048fd88b3176dd61e6d36ec33a6b978f59e602c79417e3e2a535e506fb954de41f129fbe6a6ce72a40d4ab436efdc
--- a/dev-python/ufoLib2/ufoLib2-0.6.3a_p1.ebuild
+++ b/dev-python/ufoLib2/ufoLib2-0.6.3a_p1.ebuild
@@ -7,9 +7,7 @@ PYTHON_COMPAT=( python3_{6,7} )

 inherit distutils-r1

-MYP="${P/_p/}"
-
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MYP}.zip"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
 KEYWORDS="~amd64 ~x86"

 DESCRIPTION="A UFO font library"
@@ -28,12 +26,14 @@ RDEPEND="
 DEPEND="
 	${RDEPEND}
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+	)
 "
 BDEPEND="app-arch/unzip"

-S="${WORKDIR}/${MYP}"
-
 distutils_enable_tests pytest
+distutils_enable_sphinx docs/source dev-python/typing-extensions dev-python/sphinx_rtd_theme

 python_prepare_all() {
 	sed -e '/\<wheel\>/d' -i setup.cfg || die
--- a/media-tv/droidcam/Manifest
+++ b/media-tv/droidcam/Manifest
@@ -1 +1 @@
-DIST droidcam-0_pre20200416.tar.gz 47695 BLAKE2B 98970a8b0d530a414017757fe09457ded56993511af067ea10d6588191807117db94aaa704bad301339d05a59b61ab23f92d48a551df7d398c39a8c4cd1e2bfb SHA512 22357880edbcee4ef1d247dffc0fcc95c7c121befd43d53594cdabe9770fa167bffb887c719a2fb924b81e6beceecb66a25c6ed31eac930af6000802efb83c00
+DIST droidcam-6.7.7_pre20200502.tar.gz 50633 BLAKE2B 5bbbbaf8ef8b84652a5100381ce9a6d4cd6fa57773676a8c0a22f3d28329e2891e3145a436e0330bc9b242987c48b451a9445c896aa7f84a349464e10e5238d9 SHA512 6259e07abd0c139ae0c7951222921817f508e44b4504b074f2656dda78ac6be71279d9ae15e85f82bee5b556543ca0adcb14ed3c80dca910e9af2af51b918e77
--- a/media-tv/droidcam/droidcam-6.7.7_pre20200502.ebuild
+++ b/media-tv/droidcam/droidcam-6.7.7_pre20200502.ebuild
@@ -3,7 +3,7 @@

 EAPI=7

-COMMIT="fee087c7f699cb38fba7934c77c588d246355372"
+COMMIT="6cc7cb6266f4ac089cf3bbef2d2ae8fe590f1750"

 inherit desktop linux-mod xdg

@@ -25,7 +25,7 @@ RDEPEND="x11-libs/gtk+:2"

 S="${WORKDIR}/${PN}-${COMMIT}/linux"

-PATCHES="${FILESDIR}/${PN}-0-libjpeg-location.patch"
+PATCHES="${FILESDIR}/${PN}-libjpeg-location.patch"

 CONFIG_CHECK="VIDEO_DEV"
 MODULE_NAMES="v4l2loopback-dc(video:${S}/v4l2loopback:${S}/v4l2loopback)"
--- a/media-tv/droidcam/files/droidcam-0-libjpeg-location.patch
+++ b/media-tv/droidcam/files/droidcam-0-libjpeg-location.patch
@@ -1,11 +1,11 @@
 diff --git a/Makefile b/Makefile
-index 134f723..44e2c2f 100644
+index 6995c18..41f56b6 100644
 --- a/Makefile
 +++ b/Makefile
@@ -9,7 +9,7 @@
 CC    = -no-pie
- GTK   = `pkg-config --libs --cflags gtk+-2.0`
- LIBS  = `pkg-config --libs libswscale libavutil`
+ GTK   = `pkg-config --libs --cflags gtk+-2.0` `pkg-config --libs x11`
+ LIBS  = `pkg-config --libs --cflags libswscale libavutil`
 -JPEG  = -I/opt/libjpeg-turbo/include /opt/libjpeg-turbo/lib`getconf LONG_BIT`/libturbojpeg.a
 +JPEG  = -I/usr/include /usr/lib`getconf LONG_BIT`/libturbojpeg.a
 SRC      = src/connection.c src/decoder.c