From 7b7dd45540a591358f0d65b12d343d1906fd3d2a Mon Sep 17 00:00:00 2001 From: Michael Egger Date: Thu, 4 Jun 2020 14:56:19 +0200 Subject: [PATCH 01/10] dev-python/black: Package has been added to gentoo overlay Signed-off-by: Michael Egger --- dev-python/black/Manifest | 1 - dev-python/black/black-19.10_beta0-r1.ebuild | 57 ------------------- dev-python/black/black-19.10_beta0-r2.ebuild | 59 -------------------- dev-python/black/metadata.xml | 18 ------ 4 files changed, 135 deletions(-) delete mode 100644 dev-python/black/Manifest delete mode 100644 dev-python/black/black-19.10_beta0-r1.ebuild delete mode 100644 dev-python/black/black-19.10_beta0-r2.ebuild delete mode 100644 dev-python/black/metadata.xml diff --git a/dev-python/black/Manifest b/dev-python/black/Manifest deleted file mode 100644 index 53688b539f..0000000000 --- a/dev-python/black/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST black-19.10b0.tar.gz 1019740 BLAKE2B 8a604cd79761ff7e4da6edf985d1a876e233fee9025d5066ea012a3bad9abfe0d19c5bbed87d585db8549c82ca60e1c14a9ce9d9eacd9e62ab8a354ab4757e8d SHA512 abc6d2623ab50e59bed01fdb7a6ee7434c2d3e0f779a046d9141087aa6ef46b73b3aacc6bf84ac70b9384817bd2c707a3fa262811f11a2f61a99251d2b84dd02 diff --git a/dev-python/black/black-19.10_beta0-r1.ebuild b/dev-python/black/black-19.10_beta0-r1.ebuild deleted file mode 100644 index 11229b7fea..0000000000 --- a/dev-python/black/black-19.10_beta0-r1.ebuild +++ /dev/null @@ -1,57 +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} ) - -DISTUTILS_USE_SETUPTOOLS=rdepend - -inherit distutils-r1 - -MY_PV="19.10b0" - -DESCRIPTION="The uncompromising Python code formatter" -HOMEPAGE="https://github.com/psf/black https://pypi.org/project/black/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${PN}-${MY_PV}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -DEPEND=" - test? ( - >=dev-python/aiohttp-3.3.2[${PYTHON_USEDEP}] - dev-python/aiohttp-cors[${PYTHON_USEDEP}] - ) -" - -RDEPEND=" - >=dev-python/appdirs-1.4[${PYTHON_USEDEP}] - >=dev-python/attrs-18.1[${PYTHON_USEDEP}] - >=dev-python/click-6.5[${PYTHON_USEDEP}] - >=dev-python/mypy_extensions-0.4.3[${PYTHON_USEDEP}] - >=dev-python/pathspec-0.6[${PYTHON_USEDEP}] - >=dev-python/regex-2019.11.1[${PYTHON_USEDEP}] - >=dev-python/toml-0.9.4[${PYTHON_USEDEP}] - >=dev-python/typed-ast-1.4.0[${PYTHON_USEDEP}] - >=dev-python/typing-extensions-3.7.4[${PYTHON_USEDEP}] - $(python_gen_cond_dep 'dev-python/dataclasses[${PYTHON_USEDEP}]' python3_6) -" - -S="${WORKDIR}/${PN}-${MY_PV}" - -python_prepare_all() { - # cannot get_version() for some reason so we set it here manually - sed -i -e "s/get_version(root=CURRENT_DIR.parent)/${MY_PV::-2}/g" \ - -e '/for sp in "abcfr":/d' \ - -e '/version.split(sp)/d' \ - docs/conf.py || die - - distutils-r1_python_prepare_all -} - -distutils_enable_tests pytest -# docs fail to build:: module 'black' has no attribute 'is_python36' -# 'release': return_codes_re.sub('', self.config.release), -#distutils_enable_sphinx docs dev-python/recommonmark diff --git a/dev-python/black/black-19.10_beta0-r2.ebuild b/dev-python/black/black-19.10_beta0-r2.ebuild deleted file mode 100644 index 6b38d0d1db..0000000000 --- a/dev-python/black/black-19.10_beta0-r2.ebuild +++ /dev/null @@ -1,59 +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 - -MY_PV="19.10b0" - -DESCRIPTION="The uncompromising Python code formatter" -HOMEPAGE=" - https://github.com/psf/black - https://pypi.org/project/black -" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${PN}-${MY_PV}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -DEPEND=" - test? ( - >=dev-python/aiohttp-3.3.2[${PYTHON_USEDEP}] - dev-python/aiohttp-cors[${PYTHON_USEDEP}] - ) -" -RDEPEND=" - >=dev-python/appdirs-1.4[${PYTHON_USEDEP}] - >=dev-python/attrs-18.1[${PYTHON_USEDEP}] - >=dev-python/click-6.5[${PYTHON_USEDEP}] - >=dev-python/mypy_extensions-0.4.3[${PYTHON_USEDEP}] - >=dev-python/pathspec-0.6[${PYTHON_USEDEP}] - >=dev-python/regex-2019.11.1[${PYTHON_USEDEP}] - >=dev-python/toml-0.9.4[${PYTHON_USEDEP}] - >=dev-python/typed-ast-1.4.0[${PYTHON_USEDEP}] - >=dev-python/typing-extensions-3.7.4[${PYTHON_USEDEP}] - $(python_gen_cond_dep 'dev-python/dataclasses[${PYTHON_USEDEP}]' python3_6) -" - -S="${WORKDIR}/${PN}-${MY_PV}" - -python_prepare_all() { - # cannot get_version() for some reason so we set it here manually - sed -i -e "s/get_version(root=CURRENT_DIR.parent)/${MY_PV::-2}/g" \ - -e '/for sp in "abcfr":/d' \ - -e '/version.split(sp)/d' \ - docs/conf.py || die - - distutils-r1_python_prepare_all -} - -distutils_enable_tests pytest -# docs fail to build:: module 'black' has no attribute 'is_python36' -# 'release': return_codes_re.sub('', self.config.release), -#distutils_enable_sphinx docs dev-python/recommonmark diff --git a/dev-python/black/metadata.xml b/dev-python/black/metadata.xml deleted file mode 100644 index 8754f137b0..0000000000 --- a/dev-python/black/metadata.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - michael.egger@tsn.at - Michael Egger - - -Black is the uncompromising Python code formatter. By using it, you agree to cede control over minutiae of hand-formatting. In return, Black gives you speed, determinism, and freedom from pycodestyle nagging about formatting. You will save time and mental energy for more important matters. - -Blackened code looks the same regardless of the project you're reading. Formatting becomes transparent after a while and you can focus on the content instead. - -Black makes code review faster by producing the smallest diffs possible. - - - psf/black - - From a7b1b2d10c50f149b44d588c2eaf47eb439cc50c Mon Sep 17 00:00:00 2001 From: "Volkmar W. Pogatzki" Date: Thu, 4 Jun 2020 21:13:19 +0200 Subject: [PATCH 02/10] net-wireless/eiwd: add docutils for 9999 Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Volkmar W. Pogatzki --- net-wireless/eiwd/eiwd-9999.ebuild | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/net-wireless/eiwd/eiwd-9999.ebuild b/net-wireless/eiwd/eiwd-9999.ebuild index 1e60ef4728..12c7868b4b 100644 --- a/net-wireless/eiwd/eiwd-9999.ebuild +++ b/net-wireless/eiwd/eiwd-9999.ebuild @@ -17,7 +17,8 @@ SLOT="0" KEYWORDS="" IUSE="+system-ell" -DEPEND="system-ell? ( >=dev-libs/ell-0.31 )" +DEPEND="system-ell? ( >=dev-libs/ell-0.31 ) + dev-python/docutils" RDEPEND="${DEPEND} !net-wireless/iwd net-wireless/wireless-regdb" From a80f4cf247b4c617b4b604688e8d3c7ec4c518ed Mon Sep 17 00:00:00 2001 From: Petrus Zhao Date: Fri, 5 Jun 2020 11:44:12 +0800 Subject: [PATCH 03/10] sys-kernel/xow: version bump to 0.5, drop 0.4 Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Petrus Zhao --- sys-kernel/xow/Manifest | 2 +- sys-kernel/xow/{xow-0.4.ebuild => xow-0.5.ebuild} | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) rename sys-kernel/xow/{xow-0.4.ebuild => xow-0.5.ebuild} (92%) diff --git a/sys-kernel/xow/Manifest b/sys-kernel/xow/Manifest index 09ea85e8ec..c07f72327c 100644 --- a/sys-kernel/xow/Manifest +++ b/sys-kernel/xow/Manifest @@ -1,2 +1,2 @@ -DIST xow-0.4.tar.gz 862021 BLAKE2B 129999689e014ebeaa1f1eabc1a83743d7513d02b356d0a274202e104b0ac12621d06cb628043eac2ea779e7140166297030278d400d1b0090e953324634cb46 SHA512 2878a837de80b857b5b8be0f86804d9d7274277ea643d8f5327b90b24177815245bc283311c43b013c69afadb0892b75eb8730bf73e26e7b7d5c77d51ca3725c +DIST xow-0.5.tar.gz 1035489 BLAKE2B d33950e77596a3c37a0acf35646a5c5a71dd292cfcd51d54e28ba5fcf8d455eb3bb54e30d6cb774b847d160decb26a49c7f35ea29e72240f5f78fe0393c32f9c SHA512 90bfccf3ec3e08789514b0f8a156716161f422c18466af93aaa5d8a9f18dc958072f6eebab0a146e1027d1bff9f19086711ee0c708578e79503a4e2411e48e64 DIST xow-firmware.cab 199891 BLAKE2B f531a9f4b8220ee4501431b308ee6e29a8dea26467020df25b7fa22228543cc560e1170d13b1cb3490c64c48bf610e3fb7ddfb743e4a2028f5980e02d0c36790 SHA512 0906debd6c1f4706348ec1b1cbf233ea2c45bbc0b8882593740964036808722f5bb701f43da803320609e02072cd16dada572d337fd4c05cc1cf6dde6fd38908 diff --git a/sys-kernel/xow/xow-0.4.ebuild b/sys-kernel/xow/xow-0.5.ebuild similarity index 92% rename from sys-kernel/xow/xow-0.4.ebuild rename to sys-kernel/xow/xow-0.5.ebuild index dc955700fc..b4f31ad278 100644 --- a/sys-kernel/xow/xow-0.4.ebuild +++ b/sys-kernel/xow/xow-0.5.ebuild @@ -22,6 +22,7 @@ QA_EXECSTACK="bin/xow" src_prepare() { cp "${DISTDIR}"/xow-firmware.cab "${S}"/driver.cab sed -i '/curl/d' "${S}"/Makefile || die + sed -i 's#/etc/udev/rules.d#/lib/udev/rules.d#g' Makefile || die default } From 51550ef61d04c18e703ecc40370f8dc97f8c44a0 Mon Sep 17 00:00:00 2001 From: "Volkmar W. Pogatzki" Date: Fri, 5 Jun 2020 08:33:49 +0200 Subject: [PATCH 04/10] net-wireless/eiwd: make netmount happy Without 'provide net' openrc throws messages "iService 'netmount' needs non existant service 'net'" Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Volkmar W. Pogatzki --- net-wireless/eiwd/files/iwd.initd | 1 + 1 file changed, 1 insertion(+) diff --git a/net-wireless/eiwd/files/iwd.initd b/net-wireless/eiwd/files/iwd.initd index e2b1040076..673bc47dda 100644 --- a/net-wireless/eiwd/files/iwd.initd +++ b/net-wireless/eiwd/files/iwd.initd @@ -7,6 +7,7 @@ pidfile="/run/iwd.pid" command_background="yes" depend() { + provide net after bootmisc modules before dns dhcpcd net keyword -shutdown From e37b712f6876fa04379c0cb5c88d76b816e379f7 Mon Sep 17 00:00:00 2001 From: Kurt Kanzenbach Date: Fri, 5 Jun 2020 19:32:12 +0200 Subject: [PATCH 05/10] dev-libs/open62541: Bump version to v1.1-rc1 Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Kurt Kanzenbach --- dev-libs/open62541/Manifest | 1 + .../files/open62541-1.1_rc1-tests.patch | 104 ++++++++++++++++++ dev-libs/open62541/metadata.xml | 14 ++- dev-libs/open62541/open62541-1.1_rc1.ebuild | 98 +++++++++++++++++ 4 files changed, 216 insertions(+), 1 deletion(-) create mode 100644 dev-libs/open62541/files/open62541-1.1_rc1-tests.patch create mode 100644 dev-libs/open62541/open62541-1.1_rc1.ebuild diff --git a/dev-libs/open62541/Manifest b/dev-libs/open62541/Manifest index 1805c907e5..c631ff4e72 100644 --- a/dev-libs/open62541/Manifest +++ b/dev-libs/open62541/Manifest @@ -1 +1,2 @@ DIST open62541-1.0.1.tar.gz 2689199 BLAKE2B ad2932a9e42cda5a5ef29904e740ff1cfb0d3e3d481f1d15ba0b1e67c8b42fae11774f28f9b8d8abf8b78400d1c3aea5dfe75a32fb70a303f5378ab5915bc337 SHA512 9fb0af8befba4d7c376ecd98dfab9033439e0a0594e7e3f48b6df54749af482a4e70a7aa077c49202fd704520bb433a7598fc9f9297a5ff12cb7a019176c4031 +DIST open62541-1.1-rc1.tar.gz 2913287 BLAKE2B c4b46f2dc040549f64befa7b0717cebb6048d28c167c89291301b774c78c9d0b7a1520f0b81319e3837da0f4ca21ec999ca02be20ca92a2f271984773112b8f8 SHA512 fd700b2ccb878f01775aad18b2549f3bb138bb769a1b1c608194294a1dbb806c6902caded42b7a21416d97ee4d59917ff4e114e34bcab3a3cf8c829b866227cb diff --git a/dev-libs/open62541/files/open62541-1.1_rc1-tests.patch b/dev-libs/open62541/files/open62541-1.1_rc1-tests.patch new file mode 100644 index 0000000000..1b14eb2505 --- /dev/null +++ b/dev-libs/open62541/files/open62541-1.1_rc1-tests.patch @@ -0,0 +1,104 @@ +From 42c70a47ac3a2acfbc9ef0ab153192f132d905ed Mon Sep 17 00:00:00 2001 +From: Kurt Kanzenbach +Date: Fri, 5 Jun 2020 19:22:15 +0200 +Subject: [PATCH] cmake: pubsub: Disable failing tests within portage + +The Pub/Sub tests won't work within portage. Disable them. + +Signed-off-by: Kurt Kanzenbach +--- + tests/CMakeLists.txt | 78 -------------------------------------------- + 1 file changed, 78 deletions(-) + +diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt +index 19ec2d8c44f9..fb21fb856ba4 100644 +--- a/tests/CMakeLists.txt ++++ b/tests/CMakeLists.txt +@@ -331,84 +331,6 @@ if(UA_ENABLE_DISCOVERY) + add_test_valgrind(discovery ${TESTS_BINARY_DIR}/check_discovery) + endif() + +-if(UA_ENABLE_PUBSUB) +- add_executable(check_pubsub_encoding pubsub/check_pubsub_encoding.c $ $) +- target_link_libraries(check_pubsub_encoding ${LIBS}) +- add_test_valgrind(pubsub_encoding ${TESTS_BINARY_DIR}/check_pubsub_encoding) +- add_executable(check_pubsub_pds pubsub/check_pubsub_pds.c $ $) +- target_link_libraries(check_pubsub_pds ${LIBS}) +- add_test_valgrind(pubsub_pds ${TESTS_BINARY_DIR}/check_pubsub_pds) +- add_executable(check_pubsub_connection_udp pubsub/check_pubsub_connection_udp.c $ $) +- target_link_libraries(check_pubsub_connection_udp ${LIBS}) +- add_test_valgrind(pubsub_connection_udp ${TESTS_BINARY_DIR}/check_pubsub_connection_udp) +- add_executable(check_pubsub_publish pubsub/check_pubsub_publish.c $ $) +- target_link_libraries(check_pubsub_publish ${LIBS}) +- add_test_valgrind(pubsub_publish ${TESTS_BINARY_DIR}/check_pubsub_publish) +- add_executable(check_pubsub_publish_uadp pubsub/check_pubsub_publish_uadp.c $ $) +- target_link_libraries(check_pubsub_publish_uadp ${LIBS}) +- add_test_valgrind(pubsub_publish ${TESTS_BINARY_DIR}/check_pubsub_publish_uadp) +- +- #Link libraries for executing subscriber unit test +- add_executable(check_pubsub_subscribe pubsub/check_pubsub_subscribe.c $ $) +- target_link_libraries(check_pubsub_subscribe ${LIBS}) +- add_executable(check_pubsub_publishspeed pubsub/check_pubsub_publishspeed.c $ $) +- target_link_libraries(check_pubsub_publishspeed ${LIBS}) +- add_test_valgrind(pubsub_publishspeed ${TESTS_BINARY_DIR}/check_pubsub_publish) +- add_executable(check_pubsub_config_freeze pubsub/check_pubsub_config_freeze.c $ $) +- target_link_libraries(check_pubsub_config_freeze ${LIBS}) +- add_test_valgrind(check_pubsub_config_freeze ${TESTS_BINARY_DIR}/check_pubsub_config_freeze) +- add_executable(check_pubsub_publish_rt_levels pubsub/check_pubsub_publish_rt_levels.c $ $) +- target_link_libraries(check_pubsub_publish_rt_levels ${LIBS}) +- add_test_valgrind(check_pubsub_publish_rt_levels ${TESTS_BINARY_DIR}/check_pubsub_publish_rt_levels) +- +- add_executable(check_pubsub_multiple_layer pubsub/check_pubsub_multiple_layer.c $ $) +- target_link_libraries(check_pubsub_multiple_layer ${LIBS}) +- add_test_valgrind(pubsub_multiple_layer ${TESTS_BINARY_DIR}/check_pubsub_multiple_layer) +- +- if(UA_ENABLE_PUBSUB_ETH_UADP) +- if(NOT UA_ENABLE_PUBSUB_ETH_UADP_ETF) +- add_executable(check_pubsub_connection_ethernet pubsub/check_pubsub_connection_ethernet.c $ $) +- target_link_libraries(check_pubsub_connection_ethernet ${LIBS}) +- add_test_valgrind(pubsub_connection_ethernet ${TESTS_BINARY_DIR}/check_pubsub_connection_ethernet) +- add_executable(check_pubsub_publish_ethernet pubsub/check_pubsub_publish_ethernet.c $ $) +- target_link_libraries(check_pubsub_publish_ethernet ${LIBS}) +- add_test_valgrind(pubsub_publish_ethernet ${TESTS_BINARY_DIR}/check_pubsub_publish_ethernet) +- endif() +- if(UA_ENABLE_PUBSUB_ETH_UADP_XDP) +- add_executable(check_pubsub_connection_xdp pubsub/check_pubsub_connection_xdp.c $ $) +- target_link_libraries(check_pubsub_connection_xdp ${LIBS}) +- add_test_valgrind(pubsub_connection_xdp ${TESTS_BINARY_DIR}/check_pubsub_connection_xdp) +- endif() +- endif() +- if(UA_ENABLE_PUBSUB_ETH_UADP_ETF) +- add_executable(check_pubsub_connection_ethernet_etf pubsub/check_pubsub_connection_ethernet_etf.c $ $) +- target_link_libraries(check_pubsub_connection_ethernet_etf ${LIBS}) +- add_test_valgrind(pubsub_connection_ethernet_etf ${TESTS_BINARY_DIR}/check_pubsub_connection_ethernet_etf) +- add_executable(check_pubsub_publish_ethernet_etf pubsub/check_pubsub_publish_ethernet_etf.c $ $) +- target_link_libraries(check_pubsub_publish_ethernet_etf ${LIBS}) +- add_test_valgrind(pubsub_publish_ethernet_etf ${TESTS_BINARY_DIR}/check_pubsub_publish_ethernet_etf) +- endif() +- +- if(UA_ENABLE_PUBSUB_INFORMATIONMODEL) +- add_executable(check_pubsub_informationmodel pubsub/check_pubsub_informationmodel.c $ $) +- target_link_libraries(check_pubsub_informationmodel ${LIBS}) +- add_test(check_pubsub_informationmodel ${TESTS_BINARY_DIR}/check_pubsub_informationmodel) +- if(UA_ENABLE_PUBSUB_INFORMATIONMODEL_METHODS) +- add_executable(check_pubsub_informationmodel_methods pubsub/check_pubsub_informationmodel_methods.c $ $) +- target_link_libraries(check_pubsub_informationmodel_methods ${LIBS}) +- add_test(check_pubsub_informationmodel_methods ${TESTS_BINARY_DIR}/check_pubsub_informationmodel_methods) +- +- endif() +- endif() +- if(UA_ENABLE_PUBSUB_MQTT) +- if(NOT WIN32) +- add_executable(check_pubsub_connection_mqtt pubsub/check_pubsub_connection_mqtt.c $ $) +- target_link_libraries(check_pubsub_connection_mqtt ${LIBS}) +- add_test_valgrind(pubsub_connection_mqtt ${TESTS_BINARY_DIR}/check_pubsub_connection_mqtt) +- endif() +- endif() +-endif() +- + add_executable(check_server_readspeed server/check_server_readspeed.c $ $) + target_link_libraries(check_server_readspeed ${LIBS}) + add_test_no_valgrind(server_readspeed ${TESTS_BINARY_DIR}/check_server_readspeed) +-- +2.26.2 + diff --git a/dev-libs/open62541/metadata.xml b/dev-libs/open62541/metadata.xml index eda98544f0..67d1ce55fb 100644 --- a/dev-libs/open62541/metadata.xml +++ b/dev-libs/open62541/metadata.xml @@ -17,15 +17,27 @@ systems. - + Enable encryption support + + Enable pub/sub using Earliest TxTime First Qdisc + + + Use mbedtls for encryption + Enable OPC/UA Pub/Sub extensions + + Use openssl for encryption + Build additional shell tools + + Enable pub/sub with eXpress Data Path (XDP) + open62541/open62541 diff --git a/dev-libs/open62541/open62541-1.1_rc1.ebuild b/dev-libs/open62541/open62541-1.1_rc1.ebuild new file mode 100644 index 0000000000..48b25d97d2 --- /dev/null +++ b/dev-libs/open62541/open62541-1.1_rc1.ebuild @@ -0,0 +1,98 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6..8} ) + +inherit cmake python-single-r1 + +MY_PV=${PV/_/-} +MY_P=${PN}-${MY_PV} + +DESCRIPTION="Open source C implementation of OPC UA" +HOMEPAGE="https://open62541.org/" +SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${MY_P}.tar.gz" + +S=${WORKDIR}/${MY_P} + +LICENSE="MPL-2.0" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~x86" +IUSE="doc encryption examples etf mbedtls pubsub openssl test tools xdp" +RESTRICT="!test? ( test )" + +REQUIRED_USE=" + ${PYTHON_REQUIRED_USE} + encryption? ( || ( mbedtls openssl ) ) + etf? ( pubsub ) + xdp? ( pubsub ) +" + +BDEPEND=" + ${PYTHON_DEPS} + virtual/pkgconfig + doc? ( + media-gfx/graphviz + $(python_gen_cond_dep ' + dev-python/sphinx[${PYTHON_MULTI_USEDEP}] + dev-python/sphinx_rtd_theme[${PYTHON_MULTI_USEDEP}] + ') + ) + test? ( + dev-libs/check + dev-util/valgrind + $(python_gen_cond_dep ' + dev-python/subunit[${PYTHON_MULTI_USEDEP}] + ') + ) +" +DEPEND=" + mbedtls? ( net-libs/mbedtls:= ) + openssl? ( dev-libs/openssl:0= ) +" +RDEPEND=" + ${PYTHON_DEPS} + ${DEPEND} +" + +PATCHES=( "${FILESDIR}/${P}-tests.patch" ) + +src_configure() { + local mycmakeargs=( + -DBUILD_SHARED_LIBS=ON + -DOPEN62541_VERSION=v${MY_PV} + -DUA_BUILD_EXAMPLES=OFF + -DUA_BUILD_TOOLS=$(usex tools) + -DUA_BUILD_UNIT_TESTS=$(usex test) + -DUA_ENABLE_ENCRYPTION=$(usex encryption) + -DUA_ENABLE_ENCRYPTION_MBEDTLS=$(usex mbedtls) + -DUA_ENABLE_ENCRYPTION_OPENSSL=$(usex openssl) + -DUA_ENABLE_PUBSUB=$(usex pubsub) + -DUA_ENABLE_PUBSUB_ETH_UADP_ETF=$(usex etf) + -DUA_ENABLE_PUBSUB_ETH_UADP_XDP=$(usex xdp) + ) + + cmake_src_configure +} + +src_compile() { + cmake_src_compile + use doc && cmake_build doc +} + +src_install() { + use doc && local HTML_DOCS=( "${WORKDIR}"/${P}_build/doc/. ) + cmake_src_install + + if use examples; then + docompress -x /usr/share/doc/${PF}/examples + dodoc -r examples/ + fi + + python_fix_shebang "${ED}" +} + +src_test() { + cmake_src_test -j1 +} From 234f3f973865a0fc0786ac1f63de9303a548f8d9 Mon Sep 17 00:00:00 2001 From: Kurt Kanzenbach Date: Fri, 5 Jun 2020 19:34:13 +0200 Subject: [PATCH 06/10] dev-embedded/rauc: Add ~arm64 keyword Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Kurt Kanzenbach --- dev-embedded/rauc/rauc-1.3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-embedded/rauc/rauc-1.3.ebuild b/dev-embedded/rauc/rauc-1.3.ebuild index 030f7f49d1..817248224f 100644 --- a/dev-embedded/rauc/rauc-1.3.ebuild +++ b/dev-embedded/rauc/rauc-1.3.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz" SLOT="0" LICENSE="LGPL-2.1" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 ~arm64 ~x86" IUSE="json network service test" RESTRICT="!test? ( test )" From 189392c38d640f59abd261cb985bfd2b315729f7 Mon Sep 17 00:00:00 2001 From: Huang Rui Date: Sat, 6 Jun 2020 14:38:08 +0800 Subject: [PATCH 07/10] x11-themes/obsidian-icon-theme: bump version to 4.12 update to latest version Package-Manager: Portage-2.3.100, Repoman-2.3.22 Signed-off-by: Huang Rui --- x11-themes/obsidian-icon-theme/Manifest | 1 + .../obsidian-icon-theme-4.12.ebuild | 40 +++++++++++++++++++ 2 files changed, 41 insertions(+) create mode 100644 x11-themes/obsidian-icon-theme/obsidian-icon-theme-4.12.ebuild diff --git a/x11-themes/obsidian-icon-theme/Manifest b/x11-themes/obsidian-icon-theme/Manifest index 31bac64bf4..f554d8f820 100644 --- a/x11-themes/obsidian-icon-theme/Manifest +++ b/x11-themes/obsidian-icon-theme/Manifest @@ -1 +1,2 @@ DIST obsidian-icon-theme-4.11.tar.gz 70016310 BLAKE2B 138824ee333eb225eaa7d22cd3e8cb05d374b78f3dd0ce194fe489fb34f16b8e4eb9f752006ff5c73c8467db6edf4bbb662adfbe1a4ed5296af4d1484c70321c SHA512 e0dcf1085a293d2ec64fe649e7e6fd9f705da8b0559f4ca4da14ef58809c21a8c21346fcafeb9717c7f45e566aee0ed6422b4edf4687bbabf62cd0ad69985eaf +DIST obsidian-icon-theme-4.12.tar.gz 70303616 BLAKE2B e10370c09364d3d2784fa55811189f2ef3969ee1e633bea213461f5d4387ea26a9978c2b7956d02ed472e849a45a16e4346f81b6c65de2a9e1a860d82baffb7c SHA512 b041e688cbd1a247c81251f58494f701ded5cf5adaebb9f76383330fbc8a82d9a50ca67497c4743f6e95739c995c447913e9384a8dde1a72fb39ee20aa355b8a diff --git a/x11-themes/obsidian-icon-theme/obsidian-icon-theme-4.12.ebuild b/x11-themes/obsidian-icon-theme/obsidian-icon-theme-4.12.ebuild new file mode 100644 index 0000000000..63e6ecff60 --- /dev/null +++ b/x11-themes/obsidian-icon-theme/obsidian-icon-theme-4.12.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +GIT_PN="iconpack-obsidian" + +inherit xdg + +DESCRIPTION="Obsidian Icon Theme is intuitive Faenza-like icon theme" + +HOMEPAGE="https://github.com/madmaxms/iconpack-obsidian" + +if [[ "${PV}" == "9999" ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/madmaxms/${GIT_PN}.git" +else + SRC_URI="https://github.com/madmaxms/${GIT_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + S="${WORKDIR}/${GIT_PN}-${PV}" +fi + +LICENSE="GPL-3" +SLOT="0" + +RDEPEND=" + x11-themes/adwaita-icon-theme +" + +DEPEND="${RDEPEND}" + +DOCS=( README.md ) + +src_install() { + # Remove dead links to fix symbolic link does not exist QA. + find . -xtype l -exec rm {} + || die + # Install the icons + insinto /usr/share/icons + doins -r Obsidian* +} From 209698e5836737a78b7cb3af8e699c1eebe694b0 Mon Sep 17 00:00:00 2001 From: Huang Rui Date: Sat, 6 Jun 2020 14:40:14 +0800 Subject: [PATCH 08/10] x11-themes/obsidian-icon-theme: drop 4.11 remove old package Package-Manager: Portage-2.3.100, Repoman-2.3.22 Signed-off-by: Huang Rui --- x11-themes/obsidian-icon-theme/Manifest | 1 - .../obsidian-icon-theme-4.11-r1.ebuild | 40 ------------------- 2 files changed, 41 deletions(-) delete mode 100644 x11-themes/obsidian-icon-theme/obsidian-icon-theme-4.11-r1.ebuild diff --git a/x11-themes/obsidian-icon-theme/Manifest b/x11-themes/obsidian-icon-theme/Manifest index f554d8f820..d191a2cbcf 100644 --- a/x11-themes/obsidian-icon-theme/Manifest +++ b/x11-themes/obsidian-icon-theme/Manifest @@ -1,2 +1 @@ -DIST obsidian-icon-theme-4.11.tar.gz 70016310 BLAKE2B 138824ee333eb225eaa7d22cd3e8cb05d374b78f3dd0ce194fe489fb34f16b8e4eb9f752006ff5c73c8467db6edf4bbb662adfbe1a4ed5296af4d1484c70321c SHA512 e0dcf1085a293d2ec64fe649e7e6fd9f705da8b0559f4ca4da14ef58809c21a8c21346fcafeb9717c7f45e566aee0ed6422b4edf4687bbabf62cd0ad69985eaf DIST obsidian-icon-theme-4.12.tar.gz 70303616 BLAKE2B e10370c09364d3d2784fa55811189f2ef3969ee1e633bea213461f5d4387ea26a9978c2b7956d02ed472e849a45a16e4346f81b6c65de2a9e1a860d82baffb7c SHA512 b041e688cbd1a247c81251f58494f701ded5cf5adaebb9f76383330fbc8a82d9a50ca67497c4743f6e95739c995c447913e9384a8dde1a72fb39ee20aa355b8a diff --git a/x11-themes/obsidian-icon-theme/obsidian-icon-theme-4.11-r1.ebuild b/x11-themes/obsidian-icon-theme/obsidian-icon-theme-4.11-r1.ebuild deleted file mode 100644 index 63e6ecff60..0000000000 --- a/x11-themes/obsidian-icon-theme/obsidian-icon-theme-4.11-r1.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -GIT_PN="iconpack-obsidian" - -inherit xdg - -DESCRIPTION="Obsidian Icon Theme is intuitive Faenza-like icon theme" - -HOMEPAGE="https://github.com/madmaxms/iconpack-obsidian" - -if [[ "${PV}" == "9999" ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/madmaxms/${GIT_PN}.git" -else - SRC_URI="https://github.com/madmaxms/${GIT_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" - S="${WORKDIR}/${GIT_PN}-${PV}" -fi - -LICENSE="GPL-3" -SLOT="0" - -RDEPEND=" - x11-themes/adwaita-icon-theme -" - -DEPEND="${RDEPEND}" - -DOCS=( README.md ) - -src_install() { - # Remove dead links to fix symbolic link does not exist QA. - find . -xtype l -exec rm {} + || die - # Install the icons - insinto /usr/share/icons - doins -r Obsidian* -} From 1fd01c26b6ce5ae14850f5df99973b2a51856b01 Mon Sep 17 00:00:00 2001 From: "Volkmar W. Pogatzki" Date: Sat, 6 Jun 2020 11:25:38 +0200 Subject: [PATCH 09/10] net-wireless/eiwd: Add resolvconf to RDEPEND See https://github.com/kisslinux/repo/blob/master/extra/eiwd/post-install Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Volkmar W. Pogatzki --- net-wireless/eiwd/eiwd-1.6.1.ebuild | 9 +++++++-- net-wireless/eiwd/eiwd-9999.ebuild | 12 ++++++++---- net-wireless/eiwd/files/iwd.initd | 2 +- net-wireless/eiwd/files/main.conf | 4 ++++ net-wireless/eiwd/metadata.xml | 3 +++ 5 files changed, 23 insertions(+), 7 deletions(-) create mode 100644 net-wireless/eiwd/files/main.conf diff --git a/net-wireless/eiwd/eiwd-1.6.1.ebuild b/net-wireless/eiwd/eiwd-1.6.1.ebuild index 3880b77a8e..89de5dd7fa 100644 --- a/net-wireless/eiwd/eiwd-1.6.1.ebuild +++ b/net-wireless/eiwd/eiwd-1.6.1.ebuild @@ -15,10 +15,11 @@ SRC_URI="https://github.com/dylanaraps/eiwd/releases/download/${MY_PV}/${MY_P}.t LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="+system-ell" +IUSE="+resolvconf +system-ell" DEPEND="system-ell? ( >=dev-libs/ell-0.31 )" RDEPEND="${DEPEND} + resolvconf? ( || ( net-dns/openresolv net-misc/dhcpcd ) ) !net-wireless/iwd net-wireless/wireless-regdb" BDEPEND="virtual/pkgconfig" @@ -38,5 +39,9 @@ src_configure() { src_install() { default keepdir /var/lib/iwd - newinitd "${FILESDIR}/iwd.initd" iwd + newinitd "${FILESDIR}"/iwd.initd iwd + if use resolvconf ; then + insinto /etc/iwd/ + doins "${FILESDIR}"/main.conf + fi } diff --git a/net-wireless/eiwd/eiwd-9999.ebuild b/net-wireless/eiwd/eiwd-9999.ebuild index 12c7868b4b..78157c427b 100644 --- a/net-wireless/eiwd/eiwd-9999.ebuild +++ b/net-wireless/eiwd/eiwd-9999.ebuild @@ -15,11 +15,11 @@ EGIT_REPO_URI="https://github.com/dylanaraps/eiwd.git" LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="" -IUSE="+system-ell" +IUSE="+resolvconf +system-ell" -DEPEND="system-ell? ( >=dev-libs/ell-0.31 ) - dev-python/docutils" +DEPEND="system-ell? ( >=dev-libs/ell-0.31 )" RDEPEND="${DEPEND} + resolvconf? ( || ( net-dns/openresolv net-misc/dhcpcd ) ) !net-wireless/iwd net-wireless/wireless-regdb" BDEPEND="virtual/pkgconfig" @@ -44,5 +44,9 @@ src_configure() { src_install() { default keepdir /var/lib/iwd - newinitd "${FILESDIR}/iwd.initd" iwd + newinitd "${FILESDIR}"/iwd.initd iwd + if use resolvconf ; then + insinto /etc/iwd/ + doins "${FILESDIR}"/main.conf + fi } diff --git a/net-wireless/eiwd/files/iwd.initd b/net-wireless/eiwd/files/iwd.initd index 673bc47dda..6a1e0862bb 100644 --- a/net-wireless/eiwd/files/iwd.initd +++ b/net-wireless/eiwd/files/iwd.initd @@ -9,6 +9,6 @@ command_background="yes" depend() { provide net after bootmisc modules - before dns dhcpcd net + before dns dhcpcd keyword -shutdown } diff --git a/net-wireless/eiwd/files/main.conf b/net-wireless/eiwd/files/main.conf new file mode 100644 index 0000000000..72ec4fbeab --- /dev/null +++ b/net-wireless/eiwd/files/main.conf @@ -0,0 +1,4 @@ +[General] +EnableNetworkConfiguration=true +[Network] +NameResolvingService=resolvconf diff --git a/net-wireless/eiwd/metadata.xml b/net-wireless/eiwd/metadata.xml index 12f4ea9d03..31efe3fa5e 100644 --- a/net-wireless/eiwd/metadata.xml +++ b/net-wireless/eiwd/metadata.xml @@ -9,5 +9,8 @@ Use the system-wide dev-libs/ellinstead of bundled. + + Use resolvconf to handle /etc/resolv.conf updates + From 015502701a1d11cf95b728517eea0534725cc22e Mon Sep 17 00:00:00 2001 From: Steffen Christgau Date: Sat, 6 Jun 2020 11:29:10 +0200 Subject: [PATCH 10/10] net-misc/wsdd: Version bump to 0.6, add Python 3.8 support Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Steffen Christgau --- net-misc/wsdd/Manifest | 1 + net-misc/wsdd/wsdd-0.6.ebuild | 45 +++++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+) create mode 100644 net-misc/wsdd/wsdd-0.6.ebuild diff --git a/net-misc/wsdd/Manifest b/net-misc/wsdd/Manifest index 3453a18f23..6c514c6abd 100644 --- a/net-misc/wsdd/Manifest +++ b/net-misc/wsdd/Manifest @@ -1 +1,2 @@ DIST wsdd-0.5.tar.gz 16820 BLAKE2B 3744cf45812a54d1857d75adb9ad24868f6a29520cda3de5c69877196ffafea242e3c68f54a7849c6399fb038366825c6e42a3e1e98d37c893b7c4cde7cd49c2 SHA512 fe300de7d900f34b43c81358506b2e62ecbf980e6c65b377f87e3a9618afeef9dff2ed041b660b58bce0944d221ca26b2fc1c1ff7e0155edef615ed6d5ec5cd5 +DIST wsdd-0.6.tar.gz 27067 BLAKE2B ea8ca4235d7a8dc32ed6cdf04f3ceeb0b41114c8fdc38beb783d839e7771d4557af0c411b1568809d1ba6a3dcdc94436a3990852b6b7f0d47eb6c0e4261a8f89 SHA512 a57a7d75118e73b63269f7de44da22ee571c922455e1be2820595209c7eabeb4c95ba6b54a56d35c5a4bf0210e05ed8578f967170728edff854cc7d40c19ef48 diff --git a/net-misc/wsdd/wsdd-0.6.ebuild b/net-misc/wsdd/wsdd-0.6.ebuild new file mode 100644 index 0000000000..9ad926c968 --- /dev/null +++ b/net-misc/wsdd/wsdd-0.6.ebuild @@ -0,0 +1,45 @@ +# Copyright 2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python3_{6,7,8} ) +PYTHON_REQ_USE="xml(+)" + +inherit python-r1 systemd + +DESCRIPTION="A Web Service Discovery host daemon." +HOMEPAGE="https://github.com/christgau/wsdd" +SRC_URI="https://github.com/christgau/wsdd/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="samba" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +DEPEND="${PYTHON_DEPS}" +# Samba is technically no requiredment of wsdd, but depend on it if the use flags is set. +RDEPEND="${DEPEND} samba? ( net-fs/samba )" +BDEPEND="" + +src_install() { + python_foreach_impl python_newscript src/wsdd.py wsdd + + # remove dependency on samba from init.d script if samba is not in use flags + if ! use samba ; then + sed -i -e '/need samba/d' etc/openrc/init.d/wsdd + fi + + doinitd etc/openrc/init.d/wsdd + doconfd etc/openrc/conf.d/wsdd + + # install systemd unit file with wsdd user and dependency on samba service if use flag is set + sed -i -e 's/=nobody/=daemon/' etc/systemd/wsdd.service + if use samba; then + sed -i -e 's/;Wants=smb.service/Wants=samba.service/' etc/systemd/wsdd.service + fi + systemd_dounit etc/systemd/wsdd.service + + dodoc README.md + doman man/wsdd.1 +}