Merge updates from master

2026-07-18 11:33:15 -04:00 · 2020-05-01 16:05:43 +00:00
parent e6a861dfce 85a36850c3
commit 219684960b
18 changed files with 78 additions and 22 deletions
--- a/dev-embedded/rauc/files/rauc-1.3-tests.patch
+++ b/dev-embedded/rauc/files/rauc-1.3-tests.patch
@@ -0,0 +1,56 @@
+From 2c5300478b288ef8aa627280cca691312ac75a9e Mon Sep 17 00:00:00 2001
+From: Kurt Kanzenbach <kurt@kmk-computers.de>
+Date: Fri, 1 May 2020 13:25:51 +0200
+Subject: [PATCH] tests: Disable failing tests
+
+Some tests are failing inside portage. Disable them.
+
+Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de>
+---
+ Makefile.am | 12 ------------
+ 1 file changed, 12 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 4d9a0687aec2..7ddc38e836a1 100644
+--- a/Makefile.am
+++ b/Makefile.am
+@@ -139,15 +139,10 @@ check_PROGRAMS = \
+ 	test/update_handler.test \
+ 	test/utils.test \
+ 	test/install.test \
+-	test/service.test \
+ 	test/bundle.test \
+ 	test/progress.test \
+ 	test/slot.test
+ 
+-if WANT_NETWORK
+-check_PROGRAMS += test/network.test
+-endif
+-
+ noinst_PROGRAMS = test/fakerand
+ 
+ test_fakerand_SOURCES = test/fakerand.c
+@@ -201,10 +196,6 @@ test_context_test_LDADD = librauctest.la
+ test_manifest_test_SOURCES = test/manifest.c
+ test_manifest_test_LDADD = librauctest.la
+ 
+-test_service_test_CFLAGS = $(AM_CFLAGS) -DTEST_SERVICES=\""$(abs_top_builddir)"\"
+-test_service_test_SOURCES = test/service.c rauc-installer-generated.h
+-test_service_test_LDADD = librauctest.la
+-
+ test_signature_test_SOURCES = test/signature.c
+ test_signature_test_LDADD = librauctest.la
+ 
+@@ -217,9 +208,6 @@ test_utils_test_LDADD = librauctest.la
+ test_install_test_SOURCES = test/install.c
+ test_install_test_LDADD = librauctest.la
+ 
+-test_network_test_SOURCES = test/network.c
+-test_network_test_LDADD = librauctest.la
+-
+ test_progress_test_SOURCES = test/progress.c
+ test_progress_test_LDADD = librauctest.la
+ 
+-- 
+2.26.2
+
--- a/dev-embedded/rauc/rauc-1.3.ebuild
+++ b/dev-embedded/rauc/rauc-1.3.ebuild
@@ -3,6 +3,11 @@

 EAPI=7

+DOCBUILDER="sphinx"
+DOCDIR="${S}/docs"
+
+inherit docs
+
 DESCRIPTION="Lightweight update client that runs on your Embedded Linux device"
 HOMEPAGE="https://rauc.io/"
 SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz"
@@ -10,11 +15,13 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz"
 SLOT="0"
 LICENSE="LGPL-2.1"
 KEYWORDS="~amd64 ~x86"
-IUSE="doc json network service"
+IUSE="json network service test"
+
+RESTRICT="!test? ( test )"

 BDEPEND="
 	virtual/pkgconfig
-	doc? ( dev-python/sphinx )
+	test? ( sys-fs/squashfs-tools )
 "
 RDEPEND="
 	dev-libs/glib:2
@@ -27,6 +34,8 @@ DEPEND="
 	${RDEPEND}
 "

+PATCHES=( "${FILESDIR}/${P}-tests.patch" )
+
 src_configure() {
 	local myconf=(
 		$(use_enable json)
@@ -35,13 +44,3 @@ src_configure() {
 	)
 	econf "${myconf[@]}"
 }
-
-src_compile() {
-	default
-	use doc && emake doc
-}
-
-src_install() {
-	use doc && local HTML_DOCS=( docs/build/html/. )
-	default
-}
--- a/dev-python/aiofiles/Manifest
+++ b/dev-python/aiofiles/Manifest
@@ -1 +1 @@
-DIST aiofiles-0.4.0.tar.gz 12942 BLAKE2B c8e6570f0759cf97b642a8feec4a572dc40a86906c9f7e749fa5b20346b61000d62d72c1ef8316e03adc1352021ec622fe9c670e916fdf84f41845ce37f1de51 SHA512 9e1f8b2beb3ca2996b35de9281ceafbb8ccdeab4b213f9605cb5908558c5f495d1cf4481ac229ca44bb236ad99826d89d137ec6ac4386c23b6e056b657a6bf4a
+DIST aiofiles-0.5.0.tar.gz 13332 BLAKE2B ccd044ce9fcd74b2a6419b4f0e9e3977086c9685741dbb734a7f9222ab96dca58b5330ad0d0cd9f10fce03ee123add7101825f047451344fc451c40a4352674e SHA512 89eb1af506bdf5f3f2e9c3afe90f17d521ada1cdeb449dcdc800d4faa4edc1c9ca93811915aa059d8c5a1b0a3aaa40231a46b3d041ca745e071628293bddf1b7
--- a/dev-python/aiofiles/aiofiles-0.5.0.ebuild
+++ b/dev-python/aiofiles/aiofiles-0.5.0.ebuild
--- a/dev-python/databases/Manifest
+++ b/dev-python/databases/Manifest
@@ -1 +1 @@
-DIST databases-0.3.0.tar.gz 23741 BLAKE2B 7bd8bb90fea8d86409b060ed8d5bf54b7fcbdcea4b6e8bae5a447d85f392cb5b49951da082f87e71d2cf6918284556121d0ef602a1ca91f4d21f630019457b84 SHA512 8857d376f3a11a3c0ff28e810d9f79dde726762a4d36995ae95110ac66ed9304dd4e96c11ec897e11c95db0312f3da749ae0f5eb8fd6a4a6550d8429b61b6339
+DIST databases-0.3.1.tar.gz 23956 BLAKE2B 14460db0ea3219daeb9ad07cc342ae7690146af60f76e801c2446f61d67990b27110769e202c22999c04aed1ee951f6bbe2a70ffdc4efa6ecffa76af606b211b SHA512 f6c638f88fab94b046cb164c5ceaa9233a7404c5d3871eb536545c6acaabd3a70fd59edf9a2698bdf789a88fda0f081530732c7060f672ebebc4af29e2e7e735
--- a/dev-python/databases/databases-0.3.1.ebuild
+++ b/dev-python/databases/databases-0.3.1.ebuild
--- a/dev-python/email-validator/Manifest
+++ b/dev-python/email-validator/Manifest
@@ -1 +1 @@
-DIST email-validator-1.0.5.tar.gz 14109 BLAKE2B b67425913baecd1629120dc2b17eadd904d20b99bf2a2b2650efed873961323a15f843b6024c09f83bf51b46ab363f0c3ffc31a8ce5a4af8b930f0e352ee90a9 SHA512 e9dd0ee8dfc603e40591eb8cd4e58c32331c1b9450feb4ae0ff27e1d655d0abb2c8a46b7d0cb43d7e037964f0c120dbad6bf32a60dfe297fb552058733ffd173
+DIST email-validator-1.1.0.tar.gz 18205 BLAKE2B 5cbf360cb8181c33b4876b4380da704e4a4f7525ce864e503b7793ad80a8a6725aaa145ccfc9ac94865572d05668bbed2fc1741c69b1fa24411158a64b716c6e SHA512 9eb3636298dcfc71aa2dada3e10044966181d1a6e5f7cd397a3143c82a855760cf69b129b573f01d75702b96f78da9a9799350bdf6eb8f12cfd7daa013e71604
--- a/dev-python/email-validator/email-validator-1.1.0.ebuild
+++ b/dev-python/email-validator/email-validator-1.1.0.ebuild
--- a/dev-python/hstspreload/Manifest
+++ b/dev-python/hstspreload/Manifest
@@ -1 +1 @@
-DIST hstspreload-2020.4.24.tar.gz 870224 BLAKE2B 6dbff2550de735536eede51911663e0bc44ab68614e59c3891938355fac316d8a30d1b79e4e801f0f05ba97e045c82c1084cb70db12a43307dcf81763c019365 SHA512 002cfed355d4e88a9a3c66d6b571e1c54c938d306f227ac937e6117f9679802efd3f57a1dc9509298b05c3745275ab224207b68c43008576718010f97a25118f
+DIST hstspreload-2020.4.28.tar.gz 870112 BLAKE2B 245113240415cd26b0faa72bef5df699e0f4727fc4f36fa8c6334303ef8928cd3c73312c39ef6f1010667cc7524f2cd13635f5f02827b815f0abe080abefba39 SHA512 f99907e90a4d3594c2ee14acb71d494d1850e301cc4111e008fcb6d97523a26c061106179802bbd2215b3601d2fcf8df6c2890f91a2467ec8134dbe940fd1fb8
--- a/dev-python/hstspreload/hstspreload-2020.4.28.ebuild
+++ b/dev-python/hstspreload/hstspreload-2020.4.28.ebuild
--- a/dev-python/pytest-isort/Manifest
+++ b/dev-python/pytest-isort/Manifest
@@ -1 +1 @@
-DIST pytest-isort-0.3.1.tar.gz 6429 BLAKE2B cf68cfe061be097c576c9cb7ad0a808729aa03f031128d2d1064bc960c7aa27e0d94fc18c238d95ac2074f056ecb8fb33064f6f0311756c73ce8379d1b8317f9 SHA512 2fd39108a6acacf18ce68bb537d2adeb4ff7cd8ea4c9611e5312edea5a0bc4841111ffb544318aa7b3bebe38e9f4744f07a45b2ebcbf872f79003b249ee115ca
+DIST pytest-isort-1.0.0.tar.gz 6880 BLAKE2B d7157206504210a18e355aeccbcd51ec025dfa8dcd2f438bd47193edd269b4fc55fb1807ef6bbedfa1bc95b15724d7534dbd05867c17a9d3d61bcc649f205342 SHA512 e28a5c184c014b24131e02d9786c77f55281333a30a0a27c0b9227495929f216dfbacaf59e11b027ea8bb4b8be665058659cd454098facf978687fbc0580a2d8
--- a/dev-python/pytest-isort/pytest-isort-1.0.0.ebuild
+++ b/dev-python/pytest-isort/pytest-isort-1.0.0.ebuild
--- a/dev-util/quilttools/quilttools-0.3.ebuild
+++ b/dev-util/quilttools/quilttools-0.3.ebuild
@@ -21,6 +21,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 BDEPEND="dev-python/sphinx"
 RDEPEND="${PYTHON_DEPS}
 	$(python_gen_cond_dep '
+		dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]
 		net-mail/notmuch[python,${PYTHON_MULTI_USEDEP}]
 	')"

--- a/eclass/docs.eclass
+++ b/eclass/docs.eclass
@@ -21,7 +21,7 @@
 # The aim of this eclass is to make it easy to add additional
 # doc builders. To do this, add a <DOCBUILDER>-setup and
 # <DOCBUILDER>-build function for your doc builder.
-# For python based doc builders you can use the 
+# For python based doc builders you can use the
 # python_append_deps function to append [${PYTHON_USEDEP}]
 # automatically to additional dependencies.

@@ -201,7 +201,7 @@ sphinx_compile() {
 			die "${FUNCNAME}: sphinx.ext.autodoc not found in ${confpy}, set AUTODOC=0"
 		fi
 	fi
-	
+
 	sed -i -e 's:^intersphinx_mapping:disabled_&:' \
 		"${DOCDIR}"/conf.py || die
 	# not all packages include the Makefile in pypi tarball
--- a/sys-apps/procs/Manifest
+++ b/sys-apps/procs/Manifest
@@ -93,7 +93,7 @@ DIST proc-macro-error-attr-0.4.11.crate 6924 BLAKE2B 155d14ce647f9f9fc30255132cd
 DIST proc-macro2-1.0.9.crate 35576 BLAKE2B 16c687cfd21bc3b97113f32293c1e06ca5811df6c8f279e1c5661a501c230b430f1e8bc983a2ba30d097acd01df8701a5a90ed02a93feff83a1f6f33ffa1e8d6 SHA512 005d1d31ec62a25fcf3cb0e62063d5fb53a3b15fce8fa597ab09cac5ac404a7eb441ae44c2d3acc295e24e814a413d0664a3d142155495674c4713f489ec79dc
 DIST process_path-0.1.1.crate 6610 BLAKE2B feb951c128ff7bbc680af6401e77a86abc45761f068745e61a8bdc564196f3d6afa7c3e0f62b78465c3aef9434c87811c015476308931efa0d51c806b9a07b88 SHA512 605a016a71cd5063880f8f0b7a5cfc5aa0eb6e03a4073f13fbdb6e2ceefbb619d333fc31cdc75433009ab7e7c3cd6bc16da2e04c301a2bc7922129ff8c598934
 DIST procfs-0.7.7.crate 72116 BLAKE2B cc31da94e8eafa149ba20a7e0ab63ff13c68a0d5ed5ae501127ef2ca98b89b0ba062af48efeb8fa363de75af151a5e0f231790ea76078967f79dad5563a05da2 SHA512 79b43ed56b8d848686b804b8b34c83fdbadbdef8d08e497d8c2332a458fec4e07db08166fbe357205127d2079aa40b94679380fbae3fb6a2211a1d16c5316269
-DIST procs-0.9.20.crate 57670 BLAKE2B 4d6e9bcc1dbec51600360deae09f399f20e2e4f18aa7c9b48aac30cabb137125b2a1b0c463c2c523b739966874d88bc3fbc40ccd2dca64cbbb4df2c41571b91d SHA512 3ed79740d944db8bb4a5bf8cacdd06ad7bd18c690705413514bfab0a028e41bd389ecbab49da9a6e83e25d35ed25565f3b51914cdd662225adac03ba7295f580
+DIST procs-0.10.1.crate 58110 BLAKE2B 93833651fbe997374a57c8fc1bccdc740f9f0517571f4ac8d3eaa185be24104669cff400c911c1e833f7c10b43b3df3ac8f7e937f818b3f19d1d90c4e39fc564 SHA512 daa2dec9649a40eab6c099716c807364da715137915097ed4d67876c87b409dc51829d2d2905e79d5bc29ca08eb332e195282a1a132110bc6228c8943c451f58
 DIST quote-1.0.3.crate 22939 BLAKE2B c50e47b647fe1ac1930544d20b2b78ad98e6398a32c98460701d93f93fa1437c6d12c632386ab9eb733cbe64cad57e02dd201686885d0a951cb013fc10a95a9c SHA512 b4867554b86d119251db67f9d0949bf8c3cd7c64f006c76531398ebb7478cb93805b9bcafe159d921ba1a32e92773853b56685cff0e1ebdc6aadaefd3b932ef3
 DIST redox_syscall-0.1.56.crate 17117 BLAKE2B 57b1b01ef3cbc6f55def6c9a0dcde16bd98e83badcef993e26ae3ce849abcd1b1c10f4da931c605970d77f92471734764a537e7329291a221343fde23f3591eb SHA512 17a3044327aa733c830dd74e210d6bda32622617d1c5af9d70d7647232d8569ad0b04ccb14042cbabb5d97ad98e3f1f5a9968a75387354ffb4d175e9577115a1
 DIST redox_users-0.3.4.crate 12526 BLAKE2B cae43317cc63f129bec8d4da5959e5b00a17c4ecb35d5a18a410f12b70a9f72c235afcdbf9bf5de71a94cfe02f46d7e2d6988b536d02ff1b333c6025a5ab906d SHA512 7a42f4b6ced1b8ee53f2c35446154fea6646bd1634133738a281788e69121bfcbc02d4aeb88d25729382429945c0e89b6de4b6b63831e645c6197ff4ad022831
--- a/sys-apps/procs/procs-0.10.1.ebuild
+++ b/sys-apps/procs/procs-0.10.1.ebuild
@@ -101,7 +101,7 @@ proc-macro-error-attr-0.4.11
 proc-macro2-1.0.9
 process_path-0.1.1
 procfs-0.7.7
-procs-0.9.20
+procs-0.10.1
 quote-1.0.3
 redox_syscall-0.1.56
 redox_users-0.3.4
--- a/sys-process/gotop/Manifest
+++ b/sys-process/gotop/Manifest
@@ -124,6 +124,6 @@ DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod 95 BLAKE2B adb3684980f1d8e6c23444e9102
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.5.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.5.zip 80253 BLAKE2B 175e08dfe0913765b5a913c23cf2803dbbdfa007430caaaa5a8e46cd9df8e1c48e3b84ffe248800422b963ad2d5db8031c86df926cc6f413b0ce05fa21326113 SHA512 371da5f4c32800cadd40127a78d4ae29918f4477ca87e42c414bdb7adfb9e9ab22e5f22e821d76f543204b0be8b9297dfe1b4e20814ab8015088492309676e0a
-DIST gotop-3.5.1.tar.gz 992843 BLAKE2B c7ee3c166df1a7dbae470af89f3f7f0d34919ba07572466e4d4ef51e8f6200774ffdbd6a8fa18ddaf7ccb58a24c8e999e4195cab4fd44882384a4762c137571d SHA512 d6c7abed54426d0c526d002fe7b2386a35b5e7ed84d6cfc61ca14fc89570a4808a3acdfde3396133a1bd35352a2445a99a7ff4f625ae9fef11eafb20bf49f074
+DIST gotop-3.5.2.tar.gz 992891 BLAKE2B 6cb2617345b4dda7148a56e74ca9eb456e5d314186382cf684af4ff02047f75343ffe828e45c5447df6363bb6a15a2b21a8f60eddc021bc7facecc36b92d32e5 SHA512 5dd3f978edf4edd3975eddf72562489c443cbba3985f7c2c323762a656b5e8d401d75e4e07696559b4560993b26723e69b1c9b1411a7a6ea71ffeae86ca7d096
 DIST howett.net%2Fplist%2F@v%2Fv0.0.0-20181124034731-591f970eefbb.mod 222 BLAKE2B feaacfa0991b48030344f0b3a95e5bbc2c536db23b42dd54e29a5018bee927bfc2b9eb9473732d983d1aae47d98d5cc1d16ebdfb2cb6718479b66156b8fa5ca3 SHA512 d21a325b837cb099226a68404f6976318a7f0b8af68c023b1eb85436bfc9dd9c877c9ffba87d0f27d5e9aac606121688c069989a0c2f3ba6d2895baa0759d022
 DIST howett.net%2Fplist%2F@v%2Fv0.0.0-20181124034731-591f970eefbb.zip 69738 BLAKE2B d22c39eb97f4f1f591a5de1caf1b3098abe2a904a89dd851fffe170bfd1ed78411113bd3f2f75b547fd32d661cb34133f652449f18e13050d2df9e594ab3484f SHA512 42edffcf1da65083864d4ad866a4bf09bb184f52888e3ae7c2e47e6ff1967916cfe6e777de231a5e5a46f25b658b1c633429b6793584886373b2f8ebef8c5cef
--- a/sys-process/gotop/gotop-3.5.2.ebuild
+++ b/sys-process/gotop/gotop-3.5.2.ebuild