From a961c4c8c2bfa16ca50fd163322fe9c8d6f018fd Mon Sep 17 00:00:00 2001 From: Kurt Kanzenbach Date: Sat, 17 Apr 2021 22:26:30 +0200 Subject: [PATCH 01/29] dev-libs/open62541: Bump version to v1.2.1 Package-Manager: Portage-3.0.17, Repoman-3.0.2 Signed-off-by: Kurt Kanzenbach --- dev-libs/open62541/Manifest | 1 + .../files/open62541-1.2.1-headers.patch | 33 +++++ .../files/open62541-1.2.1-tests.patch | 126 ++++++++++++++++++ dev-libs/open62541/open62541-1.2.1.ebuild | 104 +++++++++++++++ 4 files changed, 264 insertions(+) create mode 100644 dev-libs/open62541/files/open62541-1.2.1-headers.patch create mode 100644 dev-libs/open62541/files/open62541-1.2.1-tests.patch create mode 100644 dev-libs/open62541/open62541-1.2.1.ebuild diff --git a/dev-libs/open62541/Manifest b/dev-libs/open62541/Manifest index 43c70fd575..6e02db299d 100644 --- a/dev-libs/open62541/Manifest +++ b/dev-libs/open62541/Manifest @@ -1,2 +1,3 @@ DIST open62541-1.0.6.tar.gz 2691627 BLAKE2B 72a0eb5870bf4233ac6f3911c1a7ad95d4cfa1c26be581815e99189206e188beedc1c2c81ea4cbd038ef545b9548949735353a550bb54ca6a7fb6a6fd60ffa65 SHA512 f317476e19fd2cc1cbd9155e2fe8bcac6499758f35a2f4eb59403add7d66ef94d45bae06bc8ece79eedceef1d0a364565d567b97e94da6b333591f4347961955 +DIST open62541-1.2.1.tar.gz 3643976 BLAKE2B e075231bf8220bc7d597cd02fe754cc30dd4dbb47c2be440487abfd63a84f251ad5a565b340e2c342d42fcf45ad2104ca708e89f87945dc8a5746e9601e1c422 SHA512 2b260a06455aa963c3c7ec3b39df43d5df63f022f664bf70b38481239bf6f9b48ef853398eb9621875b862b8536c79c9cf05d7d92cc9fb0668009ddea96bf8d9 DIST open62541-1.2.tar.gz 3640972 BLAKE2B 0b27837ba953338923651919accfb30356d1ecd83c911586720c803bb5cfce193361111e962c79b0e1739e804bb2de25a74e6b105b80eb58b497d7f5fa7ed469 SHA512 f492db2fe1569cf831f67e55d633af13bac1026e4ab8a30c2e1c36ada9b635e0086f176cb8f53665b2254ca9ba8c8f46ea850b1a0430045b71502f166645613a diff --git a/dev-libs/open62541/files/open62541-1.2.1-headers.patch b/dev-libs/open62541/files/open62541-1.2.1-headers.patch new file mode 100644 index 0000000000..4a33c03b66 --- /dev/null +++ b/dev-libs/open62541/files/open62541-1.2.1-headers.patch @@ -0,0 +1,33 @@ +From a5697f1eb69822e172bc31d1549222c8ca718844 Mon Sep 17 00:00:00 2001 +From: Kurt Kanzenbach +Date: Sun, 12 Jul 2020 10:39:31 +0200 +Subject: [PATCH 2/3] cmake: Install ETF and XDP plugin headers + +When the corresponding features are enabled, the headers should be installed as +well. + +Signed-off-by: Kurt Kanzenbach +--- + CMakeLists.txt | 2 ++ + 1 file changed, 2 insertions(+) + +Index: open62541/CMakeLists.txt +=================================================================== +--- open62541.orig/CMakeLists.txt ++++ open62541/CMakeLists.txt +@@ -907,6 +907,7 @@ if(UA_ENABLE_PUBSUB) + list(APPEND default_plugin_headers ${PROJECT_SOURCE_DIR}/plugins/include/open62541/plugin/pubsub_udp.h) + list(APPEND default_plugin_sources ${PROJECT_SOURCE_DIR}/plugins/ua_pubsub_udp.c) + if(UA_ENABLE_PUBSUB_ETH_UADP_ETF) ++ list(APPEND default_plugin_headers ${PROJECT_SOURCE_DIR}/plugins/include/open62541/plugin/pubsub_ethernet_etf.h) + list(APPEND default_plugin_sources ${PROJECT_SOURCE_DIR}/plugins/ua_pubsub_ethernet_etf.c) + endif() + if(UA_ENABLE_PUBSUB_ETH_UADP) +@@ -916,6 +917,7 @@ if(UA_ENABLE_PUBSUB) + if(UA_ENABLE_PUBSUB_ETH_UADP_XDP) + if(EXISTS "${XDP_LIBRARY}") + list(APPEND open62541_LIBRARIES ${XDP_LIBRARY}) ++ list(APPEND default_plugin_headers ${PROJECT_SOURCE_DIR}/plugins/include/open62541/plugin/pubsub_ethernet_xdp.h) + list(APPEND default_plugin_sources ${PROJECT_SOURCE_DIR}/plugins/ua_pubsub_ethernet_xdp.c) + else() + MESSAGE(WARNING "samples in bpf-next directory were not built. Build the bpf-next to use XDP") diff --git a/dev-libs/open62541/files/open62541-1.2.1-tests.patch b/dev-libs/open62541/files/open62541-1.2.1-tests.patch new file mode 100644 index 0000000000..d5cf4d4041 --- /dev/null +++ b/dev-libs/open62541/files/open62541-1.2.1-tests.patch @@ -0,0 +1,126 @@ +From ab9a4a1c826bb662816f71020054ba2558afefc7 Mon Sep 17 00:00:00 2001 +From: Kurt Kanzenbach +Date: Sat, 20 Jun 2020 14:28:57 +0200 +Subject: [PATCH 1/3] 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(-) + +Index: open62541/tests/CMakeLists.txt +=================================================================== +--- open62541.orig/tests/CMakeLists.txt ++++ open62541/tests/CMakeLists.txt +@@ -341,109 +341,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) +- add_executable(check_pubsub_get_state pubsub/check_pubsub_get_state.c $ $) +- target_link_libraries(check_pubsub_get_state ${LIBS}) +- add_test_valgrind(check_pubsub_get_state ${TESTS_BINARY_DIR}/check_pubsub_get_state) +- +- #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_subscribe_config_freeze pubsub/check_pubsub_subscribe_config_freeze.c $ $) +- target_link_libraries(check_pubsub_subscribe_config_freeze ${LIBS}) +- add_test_valgrind(check_pubsub_subscribe_config_freeze ${TESTS_BINARY_DIR}/check_pubsub_subscribe_config_freeze) +- add_executable(check_pubsub_subscribe_rt_levels pubsub/check_pubsub_subscribe_rt_levels.c $ $) +- target_link_libraries(check_pubsub_subscribe_rt_levels ${LIBS}) +- add_test_valgrind(check_pubsub_subscribe_rt_levels ${TESTS_BINARY_DIR}/check_pubsub_subscribe_rt_levels) +- add_executable(check_pubsub_multiple_subscribe_rt_levels pubsub/check_pubsub_multiple_subscribe_rt_levels.c $ $) +- target_link_libraries(check_pubsub_multiple_subscribe_rt_levels ${LIBS}) +- add_test_valgrind(check_pubsub_multiple_subscribe_rt_levels ${TESTS_BINARY_DIR}/check_pubsub_multiple_subscribe_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_MONITORING) +- add_executable(check_pubsub_subscribe_msgrcvtimeout pubsub/check_pubsub_subscribe_msgrcvtimeout.c +- $ +- $) +- target_link_libraries(check_pubsub_subscribe_msgrcvtimeout ${LIBS}) +- add_test_valgrind(check_pubsub_subscribe_msgrcvtimeout ${TESTS_BINARY_DIR}/check_pubsub_subscribe_msgrcvtimeout) +- endif() +- +- 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_valgrind(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_valgrind(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() +- if(UA_ENABLE_PUBSUB_FILE_CONFIG) +- add_executable(check_pubsub_configuration pubsub/check_pubsub_configuration.c $ $) +- target_link_libraries(check_pubsub_configuration ${LIBS}) +- add_test_valgrind(pubsub_configuration ${TESTS_BINARY_DIR}/check_pubsub_configuration) +- 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) diff --git a/dev-libs/open62541/open62541-1.2.1.ebuild b/dev-libs/open62541/open62541-1.2.1.ebuild new file mode 100644 index 0000000000..7665253c86 --- /dev/null +++ b/dev-libs/open62541/open62541-1.2.1.ebuild @@ -0,0 +1,104 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7..9} ) + +inherit cmake python-single-r1 + +DESCRIPTION="Open source C implementation of OPC UA" +HOMEPAGE="https://open62541.org/" +SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +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}-headers.patch" + "${FILESDIR}/${P}-tests.patch" +) + +src_prepare() { + # bug 780912 + sed -i -e 's/check_add_cc_flag("-Werror")//g' CMakeLists.txt || die + + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DBUILD_SHARED_LIBS=ON + -DOPEN62541_VERSION=v${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=$(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 b97a9981d29b0fee285846759daf65ac530e7eb5 Mon Sep 17 00:00:00 2001 From: Kurt Kanzenbach Date: Sat, 17 Apr 2021 22:29:32 +0200 Subject: [PATCH 02/29] dev-libs/open62541: Drop old Package-Manager: Portage-3.0.17, Repoman-3.0.2 Signed-off-by: Kurt Kanzenbach --- dev-libs/open62541/Manifest | 2 - .../files/open62541-1.0.6-tests.patch | 57 -------- .../files/open62541-1.2-headers.patch | 33 ----- .../open62541/files/open62541-1.2-tests.patch | 126 ------------------ dev-libs/open62541/open62541-1.0.6.ebuild | 83 ------------ dev-libs/open62541/open62541-1.2.ebuild | 104 --------------- 6 files changed, 405 deletions(-) delete mode 100644 dev-libs/open62541/files/open62541-1.0.6-tests.patch delete mode 100644 dev-libs/open62541/files/open62541-1.2-headers.patch delete mode 100644 dev-libs/open62541/files/open62541-1.2-tests.patch delete mode 100644 dev-libs/open62541/open62541-1.0.6.ebuild delete mode 100644 dev-libs/open62541/open62541-1.2.ebuild diff --git a/dev-libs/open62541/Manifest b/dev-libs/open62541/Manifest index 6e02db299d..148c8fa9d5 100644 --- a/dev-libs/open62541/Manifest +++ b/dev-libs/open62541/Manifest @@ -1,3 +1 @@ -DIST open62541-1.0.6.tar.gz 2691627 BLAKE2B 72a0eb5870bf4233ac6f3911c1a7ad95d4cfa1c26be581815e99189206e188beedc1c2c81ea4cbd038ef545b9548949735353a550bb54ca6a7fb6a6fd60ffa65 SHA512 f317476e19fd2cc1cbd9155e2fe8bcac6499758f35a2f4eb59403add7d66ef94d45bae06bc8ece79eedceef1d0a364565d567b97e94da6b333591f4347961955 DIST open62541-1.2.1.tar.gz 3643976 BLAKE2B e075231bf8220bc7d597cd02fe754cc30dd4dbb47c2be440487abfd63a84f251ad5a565b340e2c342d42fcf45ad2104ca708e89f87945dc8a5746e9601e1c422 SHA512 2b260a06455aa963c3c7ec3b39df43d5df63f022f664bf70b38481239bf6f9b48ef853398eb9621875b862b8536c79c9cf05d7d92cc9fb0668009ddea96bf8d9 -DIST open62541-1.2.tar.gz 3640972 BLAKE2B 0b27837ba953338923651919accfb30356d1ecd83c911586720c803bb5cfce193361111e962c79b0e1739e804bb2de25a74e6b105b80eb58b497d7f5fa7ed469 SHA512 f492db2fe1569cf831f67e55d633af13bac1026e4ab8a30c2e1c36ada9b635e0086f176cb8f53665b2254ca9ba8c8f46ea850b1a0430045b71502f166645613a diff --git a/dev-libs/open62541/files/open62541-1.0.6-tests.patch b/dev-libs/open62541/files/open62541-1.0.6-tests.patch deleted file mode 100644 index 774b6adec2..0000000000 --- a/dev-libs/open62541/files/open62541-1.0.6-tests.patch +++ /dev/null @@ -1,57 +0,0 @@ -From f1f120389c345c3f45a6da5b6793cdfb78a0ce61 Mon Sep 17 00:00:00 2001 -From: Kurt Kanzenbach -Date: Sat, 4 Apr 2020 11:59:16 +0200 -Subject: [PATCH] tests: Disable failing tests - -Disable failing tests: - -|95% tests passed, 2 tests failed out of 41 -| -|Total Test time (real) = 78.09 sec -| -|The following tests FAILED: -| 29 - pubsub_publish (Failed) -| 30 - check_pubsub_subscribe (SEGFAULT) - -Signed-off-by: Kurt Kanzenbach ---- - tests/CMakeLists.txt | 24 ++++++++++++------------ - 1 file changed, 12 insertions(+), 12 deletions(-) - -Index: open62541/tests/CMakeLists.txt -=================================================================== ---- open62541.orig/tests/CMakeLists.txt -+++ open62541/tests/CMakeLists.txt -@@ -255,20 +255,20 @@ if(UA_ENABLE_PUBSUB) - 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) -+ # 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_test_valgrind(check_pubsub_subscribe ${TESTS_BINARY_DIR}/check_pubsub_subscribe) -- 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_subscribe pubsub/check_pubsub_subscribe.c $ $) -+ # target_link_libraries(check_pubsub_subscribe ${LIBS}) -+ # add_test_valgrind(check_pubsub_subscribe ${TESTS_BINARY_DIR}/check_pubsub_subscribe) -+ # 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_multiple_layer pubsub/check_pubsub_multiple_layer.c $ $) - target_link_libraries(check_pubsub_multiple_layer ${LIBS}) diff --git a/dev-libs/open62541/files/open62541-1.2-headers.patch b/dev-libs/open62541/files/open62541-1.2-headers.patch deleted file mode 100644 index 4a33c03b66..0000000000 --- a/dev-libs/open62541/files/open62541-1.2-headers.patch +++ /dev/null @@ -1,33 +0,0 @@ -From a5697f1eb69822e172bc31d1549222c8ca718844 Mon Sep 17 00:00:00 2001 -From: Kurt Kanzenbach -Date: Sun, 12 Jul 2020 10:39:31 +0200 -Subject: [PATCH 2/3] cmake: Install ETF and XDP plugin headers - -When the corresponding features are enabled, the headers should be installed as -well. - -Signed-off-by: Kurt Kanzenbach ---- - CMakeLists.txt | 2 ++ - 1 file changed, 2 insertions(+) - -Index: open62541/CMakeLists.txt -=================================================================== ---- open62541.orig/CMakeLists.txt -+++ open62541/CMakeLists.txt -@@ -907,6 +907,7 @@ if(UA_ENABLE_PUBSUB) - list(APPEND default_plugin_headers ${PROJECT_SOURCE_DIR}/plugins/include/open62541/plugin/pubsub_udp.h) - list(APPEND default_plugin_sources ${PROJECT_SOURCE_DIR}/plugins/ua_pubsub_udp.c) - if(UA_ENABLE_PUBSUB_ETH_UADP_ETF) -+ list(APPEND default_plugin_headers ${PROJECT_SOURCE_DIR}/plugins/include/open62541/plugin/pubsub_ethernet_etf.h) - list(APPEND default_plugin_sources ${PROJECT_SOURCE_DIR}/plugins/ua_pubsub_ethernet_etf.c) - endif() - if(UA_ENABLE_PUBSUB_ETH_UADP) -@@ -916,6 +917,7 @@ if(UA_ENABLE_PUBSUB) - if(UA_ENABLE_PUBSUB_ETH_UADP_XDP) - if(EXISTS "${XDP_LIBRARY}") - list(APPEND open62541_LIBRARIES ${XDP_LIBRARY}) -+ list(APPEND default_plugin_headers ${PROJECT_SOURCE_DIR}/plugins/include/open62541/plugin/pubsub_ethernet_xdp.h) - list(APPEND default_plugin_sources ${PROJECT_SOURCE_DIR}/plugins/ua_pubsub_ethernet_xdp.c) - else() - MESSAGE(WARNING "samples in bpf-next directory were not built. Build the bpf-next to use XDP") diff --git a/dev-libs/open62541/files/open62541-1.2-tests.patch b/dev-libs/open62541/files/open62541-1.2-tests.patch deleted file mode 100644 index d5cf4d4041..0000000000 --- a/dev-libs/open62541/files/open62541-1.2-tests.patch +++ /dev/null @@ -1,126 +0,0 @@ -From ab9a4a1c826bb662816f71020054ba2558afefc7 Mon Sep 17 00:00:00 2001 -From: Kurt Kanzenbach -Date: Sat, 20 Jun 2020 14:28:57 +0200 -Subject: [PATCH 1/3] 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(-) - -Index: open62541/tests/CMakeLists.txt -=================================================================== ---- open62541.orig/tests/CMakeLists.txt -+++ open62541/tests/CMakeLists.txt -@@ -341,109 +341,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) -- add_executable(check_pubsub_get_state pubsub/check_pubsub_get_state.c $ $) -- target_link_libraries(check_pubsub_get_state ${LIBS}) -- add_test_valgrind(check_pubsub_get_state ${TESTS_BINARY_DIR}/check_pubsub_get_state) -- -- #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_subscribe_config_freeze pubsub/check_pubsub_subscribe_config_freeze.c $ $) -- target_link_libraries(check_pubsub_subscribe_config_freeze ${LIBS}) -- add_test_valgrind(check_pubsub_subscribe_config_freeze ${TESTS_BINARY_DIR}/check_pubsub_subscribe_config_freeze) -- add_executable(check_pubsub_subscribe_rt_levels pubsub/check_pubsub_subscribe_rt_levels.c $ $) -- target_link_libraries(check_pubsub_subscribe_rt_levels ${LIBS}) -- add_test_valgrind(check_pubsub_subscribe_rt_levels ${TESTS_BINARY_DIR}/check_pubsub_subscribe_rt_levels) -- add_executable(check_pubsub_multiple_subscribe_rt_levels pubsub/check_pubsub_multiple_subscribe_rt_levels.c $ $) -- target_link_libraries(check_pubsub_multiple_subscribe_rt_levels ${LIBS}) -- add_test_valgrind(check_pubsub_multiple_subscribe_rt_levels ${TESTS_BINARY_DIR}/check_pubsub_multiple_subscribe_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_MONITORING) -- add_executable(check_pubsub_subscribe_msgrcvtimeout pubsub/check_pubsub_subscribe_msgrcvtimeout.c -- $ -- $) -- target_link_libraries(check_pubsub_subscribe_msgrcvtimeout ${LIBS}) -- add_test_valgrind(check_pubsub_subscribe_msgrcvtimeout ${TESTS_BINARY_DIR}/check_pubsub_subscribe_msgrcvtimeout) -- endif() -- -- 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_valgrind(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_valgrind(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() -- if(UA_ENABLE_PUBSUB_FILE_CONFIG) -- add_executable(check_pubsub_configuration pubsub/check_pubsub_configuration.c $ $) -- target_link_libraries(check_pubsub_configuration ${LIBS}) -- add_test_valgrind(pubsub_configuration ${TESTS_BINARY_DIR}/check_pubsub_configuration) -- 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) diff --git a/dev-libs/open62541/open62541-1.0.6.ebuild b/dev-libs/open62541/open62541-1.0.6.ebuild deleted file mode 100644 index 8885df9208..0000000000 --- a/dev-libs/open62541/open62541-1.0.6.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7..9} ) - -inherit cmake python-single-r1 - -DESCRIPTION="Open source C implementation of OPC UA" -HOMEPAGE="https://open62541.org/" -SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MPL-2.0" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" -IUSE="doc examples mbedtls pubsub test tools" -RESTRICT="!test? ( test )" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -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:= ) -" -RDEPEND=" - ${PYTHON_DEPS} - ${DEPEND} -" - -PATCHES=( "${FILESDIR}/${P}-tests.patch" ) - -src_configure() { - local mycmakeargs=( - -DBUILD_SHARED_LIBS=ON - -DOPEN62541_VERSION=v${PV} - -DUA_BUILD_EXAMPLES=OFF - -DUA_BUILD_TOOLS=$(usex tools) - -DUA_BUILD_UNIT_TESTS=$(usex test) - -DUA_ENABLE_ENCRYPTION=$(usex mbedtls) - -DUA_ENABLE_PUBSUB=$(usex pubsub) - ) - - 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 -} diff --git a/dev-libs/open62541/open62541-1.2.ebuild b/dev-libs/open62541/open62541-1.2.ebuild deleted file mode 100644 index 7665253c86..0000000000 --- a/dev-libs/open62541/open62541-1.2.ebuild +++ /dev/null @@ -1,104 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7..9} ) - -inherit cmake python-single-r1 - -DESCRIPTION="Open source C implementation of OPC UA" -HOMEPAGE="https://open62541.org/" -SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -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}-headers.patch" - "${FILESDIR}/${P}-tests.patch" -) - -src_prepare() { - # bug 780912 - sed -i -e 's/check_add_cc_flag("-Werror")//g' CMakeLists.txt || die - - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DBUILD_SHARED_LIBS=ON - -DOPEN62541_VERSION=v${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=$(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 eea58fcab46b6a8d85290a09cf23b01cb9fb81d0 Mon Sep 17 00:00:00 2001 From: tiotags Date: Sun, 18 Apr 2021 00:06:49 +0300 Subject: [PATCH 03/29] www-servers/hinsightd: missing punctuation Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Alexandru Campeanu --- www-servers/hinsightd/hinsightd-9999.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/www-servers/hinsightd/hinsightd-9999.ebuild b/www-servers/hinsightd/hinsightd-9999.ebuild index e76ea720c7..571f67b24d 100644 --- a/www-servers/hinsightd/hinsightd-9999.ebuild +++ b/www-servers/hinsightd/hinsightd-9999.ebuild @@ -45,7 +45,7 @@ src_compile() { } src_install() { - newbin "${S}/build/hin9 hinsightd" + newbin "${S}/build/hin9" hinsightd newinitd "${FILESDIR}/init.d.sh" hinsightd insinto /etc/hinsightd From 61f9a5724531c7593d38444d261e8fd92c83e7b9 Mon Sep 17 00:00:00 2001 From: Theo Anderson Date: Sun, 18 Apr 2021 10:52:03 +1200 Subject: [PATCH 04/29] dev-lang/fennel: fix VariableScope ED Signed-off-by: Theo Anderson --- dev-lang/fennel/fennel-0.9.1.ebuild | 23 +++++++---------------- dev-lang/fennel/fennel-9999.ebuild | 23 +++++++---------------- 2 files changed, 14 insertions(+), 32 deletions(-) diff --git a/dev-lang/fennel/fennel-0.9.1.ebuild b/dev-lang/fennel/fennel-0.9.1.ebuild index 6b904151fa..62871fa600 100644 --- a/dev-lang/fennel/fennel-0.9.1.ebuild +++ b/dev-lang/fennel/fennel-0.9.1.ebuild @@ -10,7 +10,7 @@ inherit lua-single DESCRIPTION="Fennel is a lisp that compiles to Lua" HOMEPAGE="https://fennel-lang.org/" -if [[ "${PV}" == *9999* ]]; then +if [[ ${PV} == 9999 ]]; then inherit git-r3 EGIT_REPO_URI="https://git.sr.ht/~technomancy/fennel" else @@ -22,24 +22,15 @@ LICENSE="MIT" SLOT="0" REQUIRED_USE="${LUA_REQUIRED_USE}" -BDEPEND="${LUA_DEPS}" -RDEPEND="${BDEPEND}" +RDEPEND="${LUA_DEPS}" DEPEND="${RDEPEND}" - -pkg_setup() { - lua-single_pkg_setup -} - -src_compile() { - emake LUA_VERSION="$(lua_get_version)" \ - LUA_LIB_DIR="${ED}/$(lua_get_lmod_dir)" \ - PREFIX="${ED}/usr" -} +BDEPEND="${RDEPEND}" src_install() { - emake LUA_VERSION="$(lua_get_version)" \ - LUA_LIB_DIR="${ED}/$(lua_get_lmod_dir)" \ - PREFIX="${ED}/usr" install + emake \ + LUA_LIB_DIR="${ED}/$(lua_get_lmod_dir)" \ + PREFIX="${ED}/usr" \ + install doman "${PN}.1" dodoc *.md } diff --git a/dev-lang/fennel/fennel-9999.ebuild b/dev-lang/fennel/fennel-9999.ebuild index 6b904151fa..62871fa600 100644 --- a/dev-lang/fennel/fennel-9999.ebuild +++ b/dev-lang/fennel/fennel-9999.ebuild @@ -10,7 +10,7 @@ inherit lua-single DESCRIPTION="Fennel is a lisp that compiles to Lua" HOMEPAGE="https://fennel-lang.org/" -if [[ "${PV}" == *9999* ]]; then +if [[ ${PV} == 9999 ]]; then inherit git-r3 EGIT_REPO_URI="https://git.sr.ht/~technomancy/fennel" else @@ -22,24 +22,15 @@ LICENSE="MIT" SLOT="0" REQUIRED_USE="${LUA_REQUIRED_USE}" -BDEPEND="${LUA_DEPS}" -RDEPEND="${BDEPEND}" +RDEPEND="${LUA_DEPS}" DEPEND="${RDEPEND}" - -pkg_setup() { - lua-single_pkg_setup -} - -src_compile() { - emake LUA_VERSION="$(lua_get_version)" \ - LUA_LIB_DIR="${ED}/$(lua_get_lmod_dir)" \ - PREFIX="${ED}/usr" -} +BDEPEND="${RDEPEND}" src_install() { - emake LUA_VERSION="$(lua_get_version)" \ - LUA_LIB_DIR="${ED}/$(lua_get_lmod_dir)" \ - PREFIX="${ED}/usr" install + emake \ + LUA_LIB_DIR="${ED}/$(lua_get_lmod_dir)" \ + PREFIX="${ED}/usr" \ + install doman "${PN}.1" dodoc *.md } From 9334174f4579ea52f03270d1e480e0b4c6ba9f4e Mon Sep 17 00:00:00 2001 From: Alessandro Barbieri Date: Sun, 18 Apr 2021 01:34:48 +0200 Subject: [PATCH 05/29] app-crypt/tomb: install translations still unsure about that mime xml file Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Alessandro Barbieri --- ...{tomb-2.9-r3.ebuild => tomb-2.9-r4.ebuild} | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) rename app-crypt/tomb/{tomb-2.9-r3.ebuild => tomb-2.9-r4.ebuild} (88%) diff --git a/app-crypt/tomb/tomb-2.9-r3.ebuild b/app-crypt/tomb/tomb-2.9-r4.ebuild similarity index 88% rename from app-crypt/tomb/tomb-2.9-r3.ebuild rename to app-crypt/tomb/tomb-2.9-r4.ebuild index 58f6cb53aa..6d6005f784 100644 --- a/app-crypt/tomb/tomb-2.9-r3.ebuild +++ b/app-crypt/tomb/tomb-2.9-r4.ebuild @@ -3,6 +3,7 @@ EAPI="7" +XDG_ECLASS_MIMEINFOFILES="${S}/extras/desktop/dyne-tomb.xml" inherit desktop qmake-utils xdg MYP="${P^}" @@ -18,7 +19,6 @@ LICENSE=" " SLOT="0" KEYWORDS="~amd64" -#todo extras/desktop IUSE="gui test tray" #test require sudo, can't be done non interactively RESTRICT="test" @@ -40,9 +40,11 @@ DOCS=( S="${WORKDIR}/${MYP}" CDEPEND=" dev-libs/libgcrypt - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 + tray? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + ) " RDEPEND=" ${CDEPEND} @@ -91,7 +93,7 @@ src_install() { #translations export PREFIX="${ED}/usr" pushd extras/translations || die - emake + emake install popd || die #zenity gui @@ -116,13 +118,13 @@ src_install() { #is there an eclass for this? #pixmap - doicon extras/gtk-tray/monmort.xpm + pushd extras/gtk-tray + doicon monmort.xpm + newicon --context mimetypes --size 32 monmort.xpm monmort + newicon --size 32 monmort.xpm dyne-monmort + popd pushd extras/desktop #copied from install.zsh - #mime types - xdg-mime install dyne-tomb.xml - xdg-icon-resource install --context mimetypes --size 32 monmort.xpm monmort - xdg-icon-resource install --size 32 monmort.xpm dyne-monmort #desktop domenu tomb.desktop #menu From 26866f651871e5cb0b69c6725b20c7ad33b8b88b Mon Sep 17 00:00:00 2001 From: Alessandro Barbieri Date: Sun, 18 Apr 2021 01:56:10 +0200 Subject: [PATCH 06/29] app-crypt/tomb: install an icon and mime xml Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Alessandro Barbieri --- app-crypt/tomb/{tomb-2.9-r4.ebuild => tomb-2.9-r5.ebuild} | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) rename app-crypt/tomb/{tomb-2.9-r4.ebuild => tomb-2.9-r5.ebuild} (96%) diff --git a/app-crypt/tomb/tomb-2.9-r4.ebuild b/app-crypt/tomb/tomb-2.9-r5.ebuild similarity index 96% rename from app-crypt/tomb/tomb-2.9-r4.ebuild rename to app-crypt/tomb/tomb-2.9-r5.ebuild index 6d6005f784..93bcdbae93 100644 --- a/app-crypt/tomb/tomb-2.9-r4.ebuild +++ b/app-crypt/tomb/tomb-2.9-r5.ebuild @@ -3,7 +3,6 @@ EAPI="7" -XDG_ECLASS_MIMEINFOFILES="${S}/extras/desktop/dyne-tomb.xml" inherit desktop qmake-utils xdg MYP="${P^}" @@ -108,6 +107,7 @@ src_install() { if use tray ; then pushd extras/qt-tray || die dobin tomb-qt-tray + doicon pixmaps/tomb_icon.png popd || die fi @@ -125,6 +125,9 @@ src_install() { popd pushd extras/desktop #copied from install.zsh + #mime types + insinto /usr/share/mime/packages + doins dyne-tomb.xml #desktop domenu tomb.desktop #menu From b15c2f379321d89e3b19760344008f9831ffcd5b Mon Sep 17 00:00:00 2001 From: Alessandro Barbieri Date: Sun, 18 Apr 2021 02:07:45 +0200 Subject: [PATCH 07/29] media-fonts/3270font: move to python-single-r1 Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Alessandro Barbieri --- media-fonts/3270font/3270font-2.2.1-r1.ebuild | 10 +++-- media-fonts/3270font/3270font-2.2.1.ebuild | 43 ------------------- 2 files changed, 7 insertions(+), 46 deletions(-) delete mode 100644 media-fonts/3270font/3270font-2.2.1.ebuild diff --git a/media-fonts/3270font/3270font-2.2.1-r1.ebuild b/media-fonts/3270font/3270font-2.2.1-r1.ebuild index 540fd1c48b..da7ce9a467 100644 --- a/media-fonts/3270font/3270font-2.2.1-r1.ebuild +++ b/media-fonts/3270font/3270font-2.2.1-r1.ebuild @@ -4,7 +4,7 @@ EAPI="7" PYTHON_COMPAT=( python3_{7,8} ) -inherit font python-any-r1 +inherit font python-single-r1 DESCRIPTION="A IBM 3270 Terminal font in a modern format" HOMEPAGE="https://github.com/rbanffy/3270font" @@ -22,16 +22,20 @@ HTML_DOCS=( "DESCRIPTION.en_us.html" ) PATCHES=( "${FILESDIR}/remove-useless-tests.patch" ) RDEPEND=" + ${PYTHON_DEPS} media-gfx/fontforge " DEPEND=" ${PYTHON_DEPS} ${RDEPEND} test? ( - dev-python/ipdb - dev-python/pillow + $(python_gen_cond_dep ' + dev-python/ipdb[${PYTHON_USEDEP}] + dev-python/pillow[${PYTHON_USEDEP}] + ') ) " +REQUIRED_USE="${PYTHON_REQUIRED_USE}" FONT_S="${S}/build" FONT_SUFFIX="otf ttf pfm woff" diff --git a/media-fonts/3270font/3270font-2.2.1.ebuild b/media-fonts/3270font/3270font-2.2.1.ebuild deleted file mode 100644 index eaa42e814c..0000000000 --- a/media-fonts/3270font/3270font-2.2.1.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -PYTHON_COMPAT=( python3_{7,8} ) -inherit font python-any-r1 - -DESCRIPTION="A IBM 3270 Terminal font in a modern format" -HOMEPAGE="https://github.com/rbanffy/3270font" -SRC_URI="https://github.com/rbanffy/3270font/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD CC-BY-SA-3.0 GPL-3 OFL" -SLOT="0" -KEYWORDS="~amd64" -IUSE="test" -DOCS=( CHANGELOG.md README.md ) -HTML_DOCS=( "DESCRIPTION.en_us.html" ) -#test need network -RESTRICT="test" -RDEPEND=" - media-gfx/fontforge -" -DEPEND=" - ${PYTHON_DEPS} - ${RDEPEND} - test? ( - dev-python/black - dev-python/ipdb - dev-python/pillow - ) -" - -FONT_S="${S}/build" -FONT_SUFFIX="otf ttf pfm woff" - -src_compile() { - emake font -} - -src_test() { - emake test -} From f518b2af305b931df4533dbea276f13279d74d60 Mon Sep 17 00:00:00 2001 From: Oliver Freyermuth Date: Sun, 18 Apr 2021 02:53:34 +0200 Subject: [PATCH 08/29] games-arcade/taisei: Migrate from xdg-utils to xdg eclass. Allows to drop the pkg_* phases. Package-Manager: Portage-3.0.17, Repoman-3.0.2 Signed-off-by: Oliver Freyermuth --- games-arcade/taisei/taisei-1.3.1-r1.ebuild | 14 +------------- games-arcade/taisei/taisei-9999.ebuild | 14 +------------- 2 files changed, 2 insertions(+), 26 deletions(-) diff --git a/games-arcade/taisei/taisei-1.3.1-r1.ebuild b/games-arcade/taisei/taisei-1.3.1-r1.ebuild index 381361ff3c..8ec848b137 100644 --- a/games-arcade/taisei/taisei-1.3.1-r1.ebuild +++ b/games-arcade/taisei/taisei-1.3.1-r1.ebuild @@ -5,7 +5,7 @@ EAPI=7 PYTHON_COMPAT=( python3_{7,8,9} ) -inherit meson python-any-r1 xdg-utils +inherit meson python-any-r1 xdg if [[ ${PV} == *9999* ]]; then inherit git-r3 @@ -54,15 +54,3 @@ src_configure() { ) meson_src_configure } - -pkg_postinst() { - xdg_icon_cache_update - xdg_desktop_database_update - xdg_mimeinfo_database_update -} - -pkg_postrm() { - xdg_icon_cache_update - xdg_desktop_database_update - xdg_mimeinfo_database_update -} diff --git a/games-arcade/taisei/taisei-9999.ebuild b/games-arcade/taisei/taisei-9999.ebuild index a50bcba075..a1029653d8 100644 --- a/games-arcade/taisei/taisei-9999.ebuild +++ b/games-arcade/taisei/taisei-9999.ebuild @@ -5,7 +5,7 @@ EAPI=7 PYTHON_COMPAT=( python3_{7,8,9} ) -inherit meson python-any-r1 xdg-utils +inherit meson python-any-r1 xdg if [[ ${PV} == *9999* ]]; then inherit git-r3 @@ -55,15 +55,3 @@ src_configure() { ) meson_src_configure } - -pkg_postinst() { - xdg_icon_cache_update - xdg_desktop_database_update - xdg_mimeinfo_database_update -} - -pkg_postrm() { - xdg_icon_cache_update - xdg_desktop_database_update - xdg_mimeinfo_database_update -} From bd6435b38205ed218dd03da6ebcca5107293c45d Mon Sep 17 00:00:00 2001 From: Alessandro Barbieri Date: Sun, 18 Apr 2021 03:20:30 +0200 Subject: [PATCH 09/29] dev-libs/libdwarf: new package Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Alessandro Barbieri --- dev-libs/libdwarf/Manifest | 1 + dev-libs/libdwarf/libdwarf-20210305.ebuild | 54 ++++++++++++++++++++++ dev-libs/libdwarf/metadata.xml | 14 ++++++ 3 files changed, 69 insertions(+) create mode 100644 dev-libs/libdwarf/Manifest create mode 100644 dev-libs/libdwarf/libdwarf-20210305.ebuild create mode 100644 dev-libs/libdwarf/metadata.xml diff --git a/dev-libs/libdwarf/Manifest b/dev-libs/libdwarf/Manifest new file mode 100644 index 0000000000..edbfc9d7d2 --- /dev/null +++ b/dev-libs/libdwarf/Manifest @@ -0,0 +1 @@ +DIST libdwarf-20210305.tar.gz 2872089 BLAKE2B 2ce8f29846486ca3b45db606b23fa1aae83af77ce95473b6f55678e930e3f25a81e44db64700dc41969b42a6d1d6086f30d45bd6e30341e1a557aedcda970846 SHA512 6fa05cf88125a95ebe38673d62e944701fdd28ba5c50f7695037acbc386f29b41d6551d9d08283b7d24fba02f3c0d6c8f5d424ee75989b6aef54f8dc2340d0f5 diff --git a/dev-libs/libdwarf/libdwarf-20210305.ebuild b/dev-libs/libdwarf/libdwarf-20210305.ebuild new file mode 100644 index 0000000000..7f5d3eb0d7 --- /dev/null +++ b/dev-libs/libdwarf/libdwarf-20210305.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="The DWARF Debugging Information Format" +HOMEPAGE=" + https://www.prevanders.net/dwarf.html + http://www.dwarfstd.org +" +SRC_URI="https://www.prevanders.net/${P}.tar.gz" + +LICENSE="LGPL-2.1 GPL-2 BSD" +SLOT="0" +KEYWORDS="~amd64" +IUSE="dwarfexample dwarfgen +elf global-alloc-sums namestable nonstandardprintf oldframecol sanitize" +DOCS=( AUTHORS README README.md ChangeLog ChangeLog2018 NEWS ) + +DEPEND=" + sys-libs/zlib + elf? ( virtual/libelf ) +" +RDEPEND="${DEPEND}" + +src_configure() { + + local myconf=( + --disable-static + --disable-windowspath + --enable-shared + --includedir="${EPREFIX}/usr/include/${PN}" + ) + + #this configure is so bad it enables when passing --disable + use dwarfexample && myconf+=(--enable-dwarfexample) + use dwarfgen && myconf+=(--enable-dwarfgen) + use elf && myconf+=(--enable-libelf) + use global-alloc-sums && myconf+=(--enable-global-alloc-csums) + use namestable && myconf+=(--enable-namestable) + use nonstandardprintf && myconf+=(--enable-nonstandardprintf) + use oldframecol && myconf+=(--enable-oldframecol) + use sanitize && myconf+=(--enable-sanitize) + + econf "${myconf[@]}" +} + +src_install(){ + emake DESTDIR="${D}" install + einstalldocs + + #--disable-static get ignored ... + find "${D}" -name '*.a' -delete || die + find "${D}" -name '*.la' -delete || die +} diff --git a/dev-libs/libdwarf/metadata.xml b/dev-libs/libdwarf/metadata.xml new file mode 100644 index 0000000000..002ff950cb --- /dev/null +++ b/dev-libs/libdwarf/metadata.xml @@ -0,0 +1,14 @@ + + + + + enable dwarfexample compilation + enable dwarfgen compilation + Enables some allocation counting in dwarf_alloc.c + enable use of virtual/libelf + enable name string functions implemented as binary search">default is with C switch) + Use a special printf format for 64bit + enable old frame columns + build with sanitizers + + From 8aba1f47b1800120c85b6556df8b246ed7458057 Mon Sep 17 00:00:00 2001 From: Alessandro Barbieri Date: Sun, 18 Apr 2021 04:05:53 +0200 Subject: [PATCH 10/29] dev-libs/libdwarf: delete from ED Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Alessandro Barbieri --- dev-libs/libdwarf/libdwarf-20210305.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-libs/libdwarf/libdwarf-20210305.ebuild b/dev-libs/libdwarf/libdwarf-20210305.ebuild index 7f5d3eb0d7..f1b035beff 100644 --- a/dev-libs/libdwarf/libdwarf-20210305.ebuild +++ b/dev-libs/libdwarf/libdwarf-20210305.ebuild @@ -49,6 +49,6 @@ src_install(){ einstalldocs #--disable-static get ignored ... - find "${D}" -name '*.a' -delete || die - find "${D}" -name '*.la' -delete || die + find "${ED}" -name '*.a' -delete || die + find "${ED}" -name '*.la' -delete || die } From c9a48e09c3cdc0db2f1eeff6a7d195294ff3396d Mon Sep 17 00:00:00 2001 From: Theo Anderson Date: Sun, 18 Apr 2021 14:52:05 +1200 Subject: [PATCH 11/29] app-editors/visual-studio-code-bin: eutils-- Signed-off-by: Theo Anderson --- .../visual-studio-code-bin/visual-studio-code-bin-1.54.2.ebuild | 2 +- .../visual-studio-code-bin/visual-studio-code-bin-1.55.0.ebuild | 2 +- .../visual-studio-code-bin/visual-studio-code-bin-1.55.2.ebuild | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app-editors/visual-studio-code-bin/visual-studio-code-bin-1.54.2.ebuild b/app-editors/visual-studio-code-bin/visual-studio-code-bin-1.54.2.ebuild index df36d0b559..0caa517383 100644 --- a/app-editors/visual-studio-code-bin/visual-studio-code-bin-1.54.2.ebuild +++ b/app-editors/visual-studio-code-bin/visual-studio-code-bin-1.54.2.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit desktop eutils pax-utils xdg +inherit desktop pax-utils xdg DESCRIPTION="Multiplatform Visual Studio Code from Microsoft" HOMEPAGE="https://code.visualstudio.com" diff --git a/app-editors/visual-studio-code-bin/visual-studio-code-bin-1.55.0.ebuild b/app-editors/visual-studio-code-bin/visual-studio-code-bin-1.55.0.ebuild index 5bb09beecd..eb1833a9bd 100644 --- a/app-editors/visual-studio-code-bin/visual-studio-code-bin-1.55.0.ebuild +++ b/app-editors/visual-studio-code-bin/visual-studio-code-bin-1.55.0.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit desktop eutils pax-utils xdg +inherit desktop pax-utils xdg DESCRIPTION="Multiplatform Visual Studio Code from Microsoft" HOMEPAGE="https://code.visualstudio.com" diff --git a/app-editors/visual-studio-code-bin/visual-studio-code-bin-1.55.2.ebuild b/app-editors/visual-studio-code-bin/visual-studio-code-bin-1.55.2.ebuild index 5bb09beecd..eb1833a9bd 100644 --- a/app-editors/visual-studio-code-bin/visual-studio-code-bin-1.55.2.ebuild +++ b/app-editors/visual-studio-code-bin/visual-studio-code-bin-1.55.2.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit desktop eutils pax-utils xdg +inherit desktop pax-utils xdg DESCRIPTION="Multiplatform Visual Studio Code from Microsoft" HOMEPAGE="https://code.visualstudio.com" From 8af65c5b9e1582cba0821ff4856d230dec474c88 Mon Sep 17 00:00:00 2001 From: Theo Anderson Date: Sun, 18 Apr 2021 14:52:12 +1200 Subject: [PATCH 12/29] app-misc/doublecmd-bin: eutils-- Signed-off-by: Theo Anderson --- app-misc/doublecmd-bin/doublecmd-bin-0.9.10.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-misc/doublecmd-bin/doublecmd-bin-0.9.10.ebuild b/app-misc/doublecmd-bin/doublecmd-bin-0.9.10.ebuild index 17d66bd82e..4b161faf35 100644 --- a/app-misc/doublecmd-bin/doublecmd-bin-0.9.10.ebuild +++ b/app-misc/doublecmd-bin/doublecmd-bin-0.9.10.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit desktop eutils xdg +inherit desktop xdg MY_PN="doublecmd" DESCRIPTION="Free cross platform open source file manager with two panels side by side." From 58f7411979d91bc88a73ec6adb3dfd099e4acb87 Mon Sep 17 00:00:00 2001 From: Theo Anderson Date: Sun, 18 Apr 2021 14:52:20 +1200 Subject: [PATCH 13/29] app-misc/tealdeer: eutils-- Signed-off-by: Theo Anderson --- app-misc/tealdeer/tealdeer-1.4.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-misc/tealdeer/tealdeer-1.4.1.ebuild b/app-misc/tealdeer/tealdeer-1.4.1.ebuild index 7d3ee2f5b2..f221356b26 100644 --- a/app-misc/tealdeer/tealdeer-1.4.1.ebuild +++ b/app-misc/tealdeer/tealdeer-1.4.1.ebuild @@ -185,7 +185,7 @@ xattr-0.2.2 xdg-2.2.0 " -inherit eutils cargo bash-completion-r1 +inherit cargo bash-completion-r1 DESCRIPTION="A very fast implementation of tldr in Rust." HOMEPAGE="https://github.com/tldr-pages/tldr From b140f90542c9c0ba07141e80494ba951608ae1fe Mon Sep 17 00:00:00 2001 From: Theo Anderson Date: Sun, 18 Apr 2021 14:52:26 +1200 Subject: [PATCH 14/29] app-office/pyspread: eutils-- Signed-off-by: Theo Anderson --- app-office/pyspread/pyspread-1.99.4.ebuild | 2 +- app-office/pyspread/pyspread-1.99.5.ebuild | 2 +- app-office/pyspread/pyspread-9999.ebuild | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app-office/pyspread/pyspread-1.99.4.ebuild b/app-office/pyspread/pyspread-1.99.4.ebuild index ca66082948..59d4215a3a 100644 --- a/app-office/pyspread/pyspread-1.99.4.ebuild +++ b/app-office/pyspread/pyspread-1.99.4.ebuild @@ -5,7 +5,7 @@ EAPI=7 PYTHON_COMPAT=( python3_{7..9} ) -inherit eutils xdg desktop distutils-r1 +inherit xdg desktop distutils-r1 DESCRIPTION="Pyspread is a non-traditional spreadsheet written in Python" HOMEPAGE="https://pyspread.gitlab.io" diff --git a/app-office/pyspread/pyspread-1.99.5.ebuild b/app-office/pyspread/pyspread-1.99.5.ebuild index ca66082948..59d4215a3a 100644 --- a/app-office/pyspread/pyspread-1.99.5.ebuild +++ b/app-office/pyspread/pyspread-1.99.5.ebuild @@ -5,7 +5,7 @@ EAPI=7 PYTHON_COMPAT=( python3_{7..9} ) -inherit eutils xdg desktop distutils-r1 +inherit xdg desktop distutils-r1 DESCRIPTION="Pyspread is a non-traditional spreadsheet written in Python" HOMEPAGE="https://pyspread.gitlab.io" diff --git a/app-office/pyspread/pyspread-9999.ebuild b/app-office/pyspread/pyspread-9999.ebuild index ca66082948..59d4215a3a 100644 --- a/app-office/pyspread/pyspread-9999.ebuild +++ b/app-office/pyspread/pyspread-9999.ebuild @@ -5,7 +5,7 @@ EAPI=7 PYTHON_COMPAT=( python3_{7..9} ) -inherit eutils xdg desktop distutils-r1 +inherit xdg desktop distutils-r1 DESCRIPTION="Pyspread is a non-traditional spreadsheet written in Python" HOMEPAGE="https://pyspread.gitlab.io" From 1d494c9d5f98a1bbdc38de261b181486e1253dc0 Mon Sep 17 00:00:00 2001 From: Theo Anderson Date: Sun, 18 Apr 2021 14:52:31 +1200 Subject: [PATCH 15/29] app-text/noweb: eutils-- Signed-off-by: Theo Anderson --- app-text/noweb/noweb-2.12.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-text/noweb/noweb-2.12.ebuild b/app-text/noweb/noweb-2.12.ebuild index e62e7dd59e..29fc8cd5ae 100644 --- a/app-text/noweb/noweb-2.12.ebuild +++ b/app-text/noweb/noweb-2.12.ebuild @@ -3,7 +3,7 @@ EAPI="7" -inherit eutils toolchain-funcs elisp-common +inherit toolchain-funcs elisp-common MYPV="$(ver_rs 1 _)" From b9189de1b77f0787fe19f877223b50ae1a8e4935 Mon Sep 17 00:00:00 2001 From: Theo Anderson Date: Sun, 18 Apr 2021 14:52:35 +1200 Subject: [PATCH 16/29] sys-kernel/dkms: eutils-- Signed-off-by: Theo Anderson --- sys-kernel/dkms/dkms-2.8.4.ebuild | 2 -- 1 file changed, 2 deletions(-) diff --git a/sys-kernel/dkms/dkms-2.8.4.ebuild b/sys-kernel/dkms/dkms-2.8.4.ebuild index 79440da5a0..dc1f758159 100644 --- a/sys-kernel/dkms/dkms-2.8.4.ebuild +++ b/sys-kernel/dkms/dkms-2.8.4.ebuild @@ -3,8 +3,6 @@ EAPI=7 -inherit eutils - DESCRIPTION="Dynamic Kernel Module Support" HOMEPAGE="https://github.com/dell/dkms" LICENSE="GPL-2" From c4817d52358a0d1d8df0e65fd58206ea63098848 Mon Sep 17 00:00:00 2001 From: Theo Anderson Date: Sun, 18 Apr 2021 14:52:40 +1200 Subject: [PATCH 17/29] media-tv/droidcam: eutils-- Signed-off-by: Theo Anderson --- media-tv/droidcam/droidcam-1.7.2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-tv/droidcam/droidcam-1.7.2.ebuild b/media-tv/droidcam/droidcam-1.7.2.ebuild index 19ab175580..69067567d1 100644 --- a/media-tv/droidcam/droidcam-1.7.2.ebuild +++ b/media-tv/droidcam/droidcam-1.7.2.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit desktop eutils linux-mod readme.gentoo-r1 xdg +inherit desktop linux-mod readme.gentoo-r1 xdg DESCRIPTION="Use android phone as webcam, using a v4l device driver and app" HOMEPAGE="https://www.dev47apps.com/droidcam/linux/ From fb662e43eb49eb281cbb43517cd7d67caf5decb4 Mon Sep 17 00:00:00 2001 From: Theo Anderson Date: Sun, 18 Apr 2021 14:52:45 +1200 Subject: [PATCH 18/29] x11-misc/gammy: eutils-- Signed-off-by: Theo Anderson --- x11-misc/gammy/gammy-0.9.58a.ebuild | 2 +- x11-misc/gammy/gammy-0.9.59.ebuild | 2 +- x11-misc/gammy/gammy-0.9.60.ebuild | 2 +- x11-misc/gammy/gammy-9999.ebuild | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/x11-misc/gammy/gammy-0.9.58a.ebuild b/x11-misc/gammy/gammy-0.9.58a.ebuild index a636e31a00..d3d2d51abc 100644 --- a/x11-misc/gammy/gammy-0.9.58a.ebuild +++ b/x11-misc/gammy/gammy-0.9.58a.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit desktop eutils qmake-utils xdg +inherit desktop qmake-utils xdg DESCRIPTION="Adaptive screen brightness/temperature" HOMEPAGE="https://getgammy.com/" diff --git a/x11-misc/gammy/gammy-0.9.59.ebuild b/x11-misc/gammy/gammy-0.9.59.ebuild index a636e31a00..d3d2d51abc 100644 --- a/x11-misc/gammy/gammy-0.9.59.ebuild +++ b/x11-misc/gammy/gammy-0.9.59.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit desktop eutils qmake-utils xdg +inherit desktop qmake-utils xdg DESCRIPTION="Adaptive screen brightness/temperature" HOMEPAGE="https://getgammy.com/" diff --git a/x11-misc/gammy/gammy-0.9.60.ebuild b/x11-misc/gammy/gammy-0.9.60.ebuild index a636e31a00..d3d2d51abc 100644 --- a/x11-misc/gammy/gammy-0.9.60.ebuild +++ b/x11-misc/gammy/gammy-0.9.60.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit desktop eutils qmake-utils xdg +inherit desktop qmake-utils xdg DESCRIPTION="Adaptive screen brightness/temperature" HOMEPAGE="https://getgammy.com/" diff --git a/x11-misc/gammy/gammy-9999.ebuild b/x11-misc/gammy/gammy-9999.ebuild index a636e31a00..d3d2d51abc 100644 --- a/x11-misc/gammy/gammy-9999.ebuild +++ b/x11-misc/gammy/gammy-9999.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit desktop eutils qmake-utils xdg +inherit desktop qmake-utils xdg DESCRIPTION="Adaptive screen brightness/temperature" HOMEPAGE="https://getgammy.com/" From f2264635c5710746eedf914c759f07ef8c026da8 Mon Sep 17 00:00:00 2001 From: Theo Anderson Date: Sun, 18 Apr 2021 14:53:35 +1200 Subject: [PATCH 19/29] gui-apps/foot: xdg-utils -> xdg Signed-off-by: Theo Anderson --- gui-apps/foot/foot-1.7.1.ebuild | 10 +--------- gui-apps/foot/foot-9999.ebuild | 10 +--------- 2 files changed, 2 insertions(+), 18 deletions(-) diff --git a/gui-apps/foot/foot-1.7.1.ebuild b/gui-apps/foot/foot-1.7.1.ebuild index 82f13a5e6c..737ae37f15 100644 --- a/gui-apps/foot/foot-1.7.1.ebuild +++ b/gui-apps/foot/foot-1.7.1.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit meson xdg-utils +inherit meson xdg if [[ ${PV} != *9999* ]]; then SRC_URI="https://codeberg.org/dnkl/foot/archive/${PV}.tar.gz -> ${P}.tar.gz" @@ -51,11 +51,3 @@ src_install() { meson_src_install mv "${D}/usr/share/doc/${PN}" "${D}/usr/share/doc/${PF}" } - -pkg_postinst() { - xdg_icon_cache_update -} - -pkg_postrm() { - xdg_icon_cache_update -} diff --git a/gui-apps/foot/foot-9999.ebuild b/gui-apps/foot/foot-9999.ebuild index 82f13a5e6c..737ae37f15 100644 --- a/gui-apps/foot/foot-9999.ebuild +++ b/gui-apps/foot/foot-9999.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit meson xdg-utils +inherit meson xdg if [[ ${PV} != *9999* ]]; then SRC_URI="https://codeberg.org/dnkl/foot/archive/${PV}.tar.gz -> ${P}.tar.gz" @@ -51,11 +51,3 @@ src_install() { meson_src_install mv "${D}/usr/share/doc/${PN}" "${D}/usr/share/doc/${PF}" } - -pkg_postinst() { - xdg_icon_cache_update -} - -pkg_postrm() { - xdg_icon_cache_update -} From fa4173872ce239d06ff1e5676de926d74ca6eaf4 Mon Sep 17 00:00:00 2001 From: Marco Sirabella Date: Sat, 17 Apr 2021 23:15:32 -0700 Subject: [PATCH 20/29] sys-process/nq: Move from sys-apps I didn't realize sys-process was a group, this is a better place for it. Comparisons to nq are the likes of `at`, which are also found in this group Signed-off-by: Marco Sirabella --- {sys-apps => sys-process}/nq/Manifest | 0 {sys-apps => sys-process}/nq/metadata.xml | 0 {sys-apps => sys-process}/nq/nq-0.4.ebuild | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename {sys-apps => sys-process}/nq/Manifest (100%) rename {sys-apps => sys-process}/nq/metadata.xml (100%) rename {sys-apps => sys-process}/nq/nq-0.4.ebuild (100%) diff --git a/sys-apps/nq/Manifest b/sys-process/nq/Manifest similarity index 100% rename from sys-apps/nq/Manifest rename to sys-process/nq/Manifest diff --git a/sys-apps/nq/metadata.xml b/sys-process/nq/metadata.xml similarity index 100% rename from sys-apps/nq/metadata.xml rename to sys-process/nq/metadata.xml diff --git a/sys-apps/nq/nq-0.4.ebuild b/sys-process/nq/nq-0.4.ebuild similarity index 100% rename from sys-apps/nq/nq-0.4.ebuild rename to sys-process/nq/nq-0.4.ebuild From 14c2b81ed8adabb353a273ca2772a1e19e98cbef Mon Sep 17 00:00:00 2001 From: Marco Sirabella Date: Sat, 17 Apr 2021 23:19:05 -0700 Subject: [PATCH 21/29] sys-process/nq: Install zsh completion script Untested since I don't use zsh Signed-off-by: Marco Sirabella --- sys-process/nq/nq-0.4.ebuild | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys-process/nq/nq-0.4.ebuild b/sys-process/nq/nq-0.4.ebuild index 64666b61b8..380bc4da9b 100644 --- a/sys-process/nq/nq-0.4.ebuild +++ b/sys-process/nq/nq-0.4.ebuild @@ -35,4 +35,6 @@ src_compile() { src_install() { emake DESTDIR="${D}" PREFIX=/usr ALL="nq fq $(usev tq)" install einstalldocs + insinto /usr/share/zsh/site-functions + doins _nq } From a31b227e08533b24be26b476dd7994c2de6da713 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20Wo=C5=BAniak?= Date: Sun, 18 Apr 2021 08:43:08 +0200 Subject: [PATCH 22/29] mail-client/heirloom-mailx: Changed licence and fix problem with QA MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Like in the bug I tried to add hide the error from QA. I simply added LDFLAGS in the emake. I think it should be help. EDIT: I tried with src_configure but the mailx do not have configure file. Bug: https://bugs.gentoo.org/782961 Closes: https://bugs.gentoo.org/782961 Signed-off-by: Marcin Woźniak --- mail-client/heirloom-mailx/heirloom-mailx-12.5.ebuild | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/mail-client/heirloom-mailx/heirloom-mailx-12.5.ebuild b/mail-client/heirloom-mailx/heirloom-mailx-12.5.ebuild index fe87daf09b..1fbbcf75e6 100644 --- a/mail-client/heirloom-mailx/heirloom-mailx-12.5.ebuild +++ b/mail-client/heirloom-mailx/heirloom-mailx-12.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 2020 Gentoo Authors +# Copyright 2001-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -12,7 +12,8 @@ KEYWORDS="~amd64" DEPEND="net-libs/liblockfile dev-libs/libbsd virtual/mta - mail-client/mailx-support" + mail-client/mailx-support + dev-libs/openssl" RDEPEND="${DEPEND} !virtual/mailx @@ -29,7 +30,7 @@ src_prepare() { src_compile(){ sed 's@ Date: Sun, 18 Apr 2021 10:06:04 +0300 Subject: [PATCH 23/29] www-servers/hinsightd: better description Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Alexandru Campeanu --- www-servers/hinsightd/metadata.xml | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/www-servers/hinsightd/metadata.xml b/www-servers/hinsightd/metadata.xml index 3e7b7f452a..50c6ba674e 100644 --- a/www-servers/hinsightd/metadata.xml +++ b/www-servers/hinsightd/metadata.xml @@ -1,8 +1,18 @@ - - - - + + + hinsightd is a http/1.1 webserver with a focus on simple code and + reliable behaviour. + Notable features: reverse proxying, output caching, ssl, pipelining, + cgi, output compression with deflate, graceful restart, 304 status, + etag, range requests and a very customizable config file using lua. + Virtual hosts can be implemented in lua. + Logging is entirely controled by lua. + Full debug information can be toggled per request and outputted to console or a log file. + + + + From 20966d8bb891ad6da7355fb63f897d39a8ded541 Mon Sep 17 00:00:00 2001 From: Marco Sirabella Date: Sun, 18 Apr 2021 01:13:15 -0700 Subject: [PATCH 24/29] fixup! sys-process/nq: Move from sys-apps Thanks to @telans for flagging this! Signed-off-by: Marco Sirabella --- profiles/updates/2Q-2021 | 1 + 1 file changed, 1 insertion(+) create mode 100644 profiles/updates/2Q-2021 diff --git a/profiles/updates/2Q-2021 b/profiles/updates/2Q-2021 new file mode 100644 index 0000000000..8728662654 --- /dev/null +++ b/profiles/updates/2Q-2021 @@ -0,0 +1 @@ +move sys-apps/nq sys-process/nq From 572679236dad27a112e28ea4387976105cba0db6 Mon Sep 17 00:00:00 2001 From: Marco Scardovi Date: Sun, 18 Apr 2021 10:57:12 +0200 Subject: [PATCH 25/29] media-sound/nuclear-bin: add xdg_icon_cache_update Closes: https://bugs.gentoo.org/783699 Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Marco Scardovi --- ...nuclear-bin-0.6.11-r1.ebuild => nuclear-bin-0.6.11-r2.ebuild} | 1 + 1 file changed, 1 insertion(+) rename media-sound/nuclear-bin/{nuclear-bin-0.6.11-r1.ebuild => nuclear-bin-0.6.11-r2.ebuild} (98%) diff --git a/media-sound/nuclear-bin/nuclear-bin-0.6.11-r1.ebuild b/media-sound/nuclear-bin/nuclear-bin-0.6.11-r2.ebuild similarity index 98% rename from media-sound/nuclear-bin/nuclear-bin-0.6.11-r1.ebuild rename to media-sound/nuclear-bin/nuclear-bin-0.6.11-r2.ebuild index 214c7d9422..d448ce97a6 100644 --- a/media-sound/nuclear-bin/nuclear-bin-0.6.11-r1.ebuild +++ b/media-sound/nuclear-bin/nuclear-bin-0.6.11-r2.ebuild @@ -73,4 +73,5 @@ src_install(){ pkg_postinst(){ xdg_desktop_database_update + xdg_icon_cache_update } From 765fa21e6dfd433b86b11e61589d009938831996 Mon Sep 17 00:00:00 2001 From: Andrew Ammerlaan Date: Sun, 18 Apr 2021 10:57:27 +0200 Subject: [PATCH 26/29] media-libs/fcft: add missing dep Closes: https://bugs.gentoo.org/783678 Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Andrew Ammerlaan --- media-libs/fcft/fcft-2.3.3.ebuild | 2 +- media-libs/fcft/fcft-9999.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/media-libs/fcft/fcft-2.3.3.ebuild b/media-libs/fcft/fcft-2.3.3.ebuild index 6315f733f0..f6cac526ff 100644 --- a/media-libs/fcft/fcft-2.3.3.ebuild +++ b/media-libs/fcft/fcft-2.3.3.ebuild @@ -28,7 +28,7 @@ DEPEND=" x11-libs/pixman " RDEPEND="${DEPEND}" -BDEPEND="" +BDEPEND="app-text/scdoc" src_configure() { local emesonargs=( diff --git a/media-libs/fcft/fcft-9999.ebuild b/media-libs/fcft/fcft-9999.ebuild index 6315f733f0..f6cac526ff 100644 --- a/media-libs/fcft/fcft-9999.ebuild +++ b/media-libs/fcft/fcft-9999.ebuild @@ -28,7 +28,7 @@ DEPEND=" x11-libs/pixman " RDEPEND="${DEPEND}" -BDEPEND="" +BDEPEND="app-text/scdoc" src_configure() { local emesonargs=( From 766a645275b4cbc1a15f3bd102cd1b5860b6c081 Mon Sep 17 00:00:00 2001 From: Andrew Ammerlaan Date: Sun, 18 Apr 2021 10:59:05 +0200 Subject: [PATCH 27/29] media-gfx/bonzomatic: add missing dep Closes: https://bugs.gentoo.org/783681 Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Andrew Ammerlaan --- media-gfx/bonzomatic/bonzomatic-2021.03.07.ebuild | 1 + media-gfx/bonzomatic/bonzomatic-9999.ebuild | 1 + 2 files changed, 2 insertions(+) diff --git a/media-gfx/bonzomatic/bonzomatic-2021.03.07.ebuild b/media-gfx/bonzomatic/bonzomatic-2021.03.07.ebuild index c142dd2850..a18af24589 100644 --- a/media-gfx/bonzomatic/bonzomatic-2021.03.07.ebuild +++ b/media-gfx/bonzomatic/bonzomatic-2021.03.07.ebuild @@ -31,6 +31,7 @@ DEPEND=" virtual/opengl media-libs/alsa-lib media-libs/fontconfig + x11-libs/libXi x11-libs/libXinerama x11-libs/libXcursor " diff --git a/media-gfx/bonzomatic/bonzomatic-9999.ebuild b/media-gfx/bonzomatic/bonzomatic-9999.ebuild index c142dd2850..a18af24589 100644 --- a/media-gfx/bonzomatic/bonzomatic-9999.ebuild +++ b/media-gfx/bonzomatic/bonzomatic-9999.ebuild @@ -31,6 +31,7 @@ DEPEND=" virtual/opengl media-libs/alsa-lib media-libs/fontconfig + x11-libs/libXi x11-libs/libXinerama x11-libs/libXcursor " From 8ea2c59d39b759d01db70f6e7df632b413eb7ea3 Mon Sep 17 00:00:00 2001 From: Andrew Ammerlaan Date: Sun, 18 Apr 2021 11:01:27 +0200 Subject: [PATCH 28/29] mail-client/mailspring-bin: add missing deps Closes: https://bugs.gentoo.org/783696 Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Andrew Ammerlaan --- mail-client/mailspring-bin/mailspring-bin-1.8.0.ebuild | 1 + mail-client/mailspring-bin/mailspring-bin-1.9.0.ebuild | 1 + mail-client/mailspring-bin/mailspring-bin-1.9.1.ebuild | 1 + 3 files changed, 3 insertions(+) diff --git a/mail-client/mailspring-bin/mailspring-bin-1.8.0.ebuild b/mail-client/mailspring-bin/mailspring-bin-1.8.0.ebuild index a544d22bcc..7222538373 100644 --- a/mail-client/mailspring-bin/mailspring-bin-1.8.0.ebuild +++ b/mail-client/mailspring-bin/mailspring-bin-1.8.0.ebuild @@ -19,6 +19,7 @@ RDEPEND=" app-crypt/mit-krb5 app-text/tidy-html5 dev-cpp/ctemplate + dev-libs/cyrus-sasl dev-libs/libgcrypt dev-libs/nss dev-libs/openssl diff --git a/mail-client/mailspring-bin/mailspring-bin-1.9.0.ebuild b/mail-client/mailspring-bin/mailspring-bin-1.9.0.ebuild index a544d22bcc..7222538373 100644 --- a/mail-client/mailspring-bin/mailspring-bin-1.9.0.ebuild +++ b/mail-client/mailspring-bin/mailspring-bin-1.9.0.ebuild @@ -19,6 +19,7 @@ RDEPEND=" app-crypt/mit-krb5 app-text/tidy-html5 dev-cpp/ctemplate + dev-libs/cyrus-sasl dev-libs/libgcrypt dev-libs/nss dev-libs/openssl diff --git a/mail-client/mailspring-bin/mailspring-bin-1.9.1.ebuild b/mail-client/mailspring-bin/mailspring-bin-1.9.1.ebuild index a544d22bcc..7222538373 100644 --- a/mail-client/mailspring-bin/mailspring-bin-1.9.1.ebuild +++ b/mail-client/mailspring-bin/mailspring-bin-1.9.1.ebuild @@ -19,6 +19,7 @@ RDEPEND=" app-crypt/mit-krb5 app-text/tidy-html5 dev-cpp/ctemplate + dev-libs/cyrus-sasl dev-libs/libgcrypt dev-libs/nss dev-libs/openssl From 03fac4b36f11417da25f3ce044b7f5ce63a47145 Mon Sep 17 00:00:00 2001 From: Andrew Ammerlaan Date: Sun, 18 Apr 2021 11:03:58 +0200 Subject: [PATCH 29/29] net-im/rocketchat-desktop-bin: add missing deps Closes: https://bugs.gentoo.org/783702 Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Andrew Ammerlaan --- .../rocketchat-desktop-bin/rocketchat-desktop-bin-3.1.1.ebuild | 2 ++ 1 file changed, 2 insertions(+) diff --git a/net-im/rocketchat-desktop-bin/rocketchat-desktop-bin-3.1.1.ebuild b/net-im/rocketchat-desktop-bin/rocketchat-desktop-bin-3.1.1.ebuild index ed80565945..0c6ba72c36 100644 --- a/net-im/rocketchat-desktop-bin/rocketchat-desktop-bin-3.1.1.ebuild +++ b/net-im/rocketchat-desktop-bin/rocketchat-desktop-bin-3.1.1.ebuild @@ -21,6 +21,8 @@ RDEPEND=" dev-libs/nspr dev-libs/nss media-fonts/noto-emoji + media-libs/alsa-lib + net-print/cups x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3