From 37e16f64f8bb38f72a2271c8a01229cfdb746dfe Mon Sep 17 00:00:00 2001 From: "Haelwenn (lanodan) Monnier" Date: Tue, 4 Oct 2022 04:23:02 +0200 Subject: [PATCH 1/8] dev-lang/wabt: Remove *.wasm blobs from $S Signed-off-by: Haelwenn (lanodan) Monnier --- .../files/wabt-1.0.29-wasm-blob-tests.patch | 58 +++++++++++++++++++ dev-lang/wabt/wabt-1.0.29.ebuild | 7 +++ 2 files changed, 65 insertions(+) create mode 100644 dev-lang/wabt/files/wabt-1.0.29-wasm-blob-tests.patch diff --git a/dev-lang/wabt/files/wabt-1.0.29-wasm-blob-tests.patch b/dev-lang/wabt/files/wabt-1.0.29-wasm-blob-tests.patch new file mode 100644 index 0000000000..aacce18fd1 --- /dev/null +++ b/dev-lang/wabt/files/wabt-1.0.29-wasm-blob-tests.patch @@ -0,0 +1,58 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1fe79b8d..5ebf8f87 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -632,52 +632,7 @@ if (BUILD_TESTS) + ${USES_TERMINAL} + ) + +- add_custom_target(run-c-api-tests +- COMMAND ${PYTHON_EXECUTABLE} ${WABT_SOURCE_DIR}/test/run-c-api-examples.py --bindir $ +- WORKING_DIRECTORY ${WABT_SOURCE_DIR} +- ${USES_TERMINAL} +- ) +- +- add_custom_target(check DEPENDS run-unittests run-tests run-c-api-tests) +- +- function(c_api_example NAME) +- set(EXENAME wasm-c-api-${NAME}) +- add_executable(${EXENAME} third_party/wasm-c-api/example/${NAME}.c) +- if (COMPILER_IS_MSVC) +- set_target_properties(${EXENAME} PROPERTIES COMPILE_FLAGS "-wd4311") +- else () +- set_target_properties(${EXENAME} PROPERTIES COMPILE_FLAGS "-std=gnu11 -Wno-pointer-to-int-cast") +- endif () +- +- target_link_libraries(${EXENAME} wasm Threads::Threads) +- add_custom_target(${EXENAME}-copy-to-bin ALL +- COMMAND ${CMAKE_COMMAND} -E make_directory ${WABT_SOURCE_DIR}/bin +- COMMAND ${CMAKE_COMMAND} -E copy $ ${WABT_SOURCE_DIR}/bin/ +- COMMAND ${CMAKE_COMMAND} -E copy ${WABT_SOURCE_DIR}/third_party/wasm-c-api/example/${NAME}.wasm $/ +- COMMAND ${CMAKE_COMMAND} -E copy ${WABT_SOURCE_DIR}/third_party/wasm-c-api/example/${NAME}.wasm ${WABT_SOURCE_DIR}/bin/ +- DEPENDS ${EXENAME} +- ) +- add_dependencies(run-c-api-tests ${EXENAME}) +- endfunction() +- +- c_api_example(callback) +- c_api_example(finalize) +- c_api_example(global) +- c_api_example(hello) +- c_api_example(hostref) +- c_api_example(multi) +- c_api_example(memory) +- c_api_example(reflect) +- c_api_example(serialize) +- c_api_example(start) +- c_api_example(table) +- c_api_example(trap) +- if (NOT WIN32) +- # depends on pthreads +- set(THREADS_PREFER_PTHREAD_FLAG ON) +- find_package(Threads REQUIRED) +- c_api_example(threads) +- endif () ++ add_custom_target(check DEPENDS run-unittests run-tests) + endif () + + # install diff --git a/dev-lang/wabt/wabt-1.0.29.ebuild b/dev-lang/wabt/wabt-1.0.29.ebuild index 18e045454d..ffbff44c8d 100644 --- a/dev-lang/wabt/wabt-1.0.29.ebuild +++ b/dev-lang/wabt/wabt-1.0.29.ebuild @@ -20,12 +20,19 @@ RESTRICT="!test? ( test )" DEPEND="test? ( dev-cpp/gtest )" BDEPEND="${PYTHON_DEPS}" +PATCHES=( + # Disable tests depending on third_party/wasm-c-api/example/*.wasm + "${FILESDIR}/wabt-1.0.29-wasm-blob-tests.patch" +) + src_prepare() { cmake_src_prepare # Submodules kept: third_party/testsuite third_party/wasm-c-api rm -r third_party/gtest third_party/ply third_party/uvwasi || die + rm third_party/wasm-c-api/example/*.wasm fuzz-in/wasm/stuff.wasm wasm2c/examples/fac/fac.wasm || die + sed -i 's;default_compiler =.*;default_compiler = os.getenv("CC", "cc");' test/run-spec-wasm2c.py || die } From 5a54af1b12bd8e378c08fa34d3cc96301fd06a8d Mon Sep 17 00:00:00 2001 From: "Haelwenn (lanodan) Monnier" Date: Tue, 4 Oct 2022 04:29:04 +0200 Subject: [PATCH 2/8] dev-lang/wabt: Add dev-python/ply as BDEPEND Closes: https://bugs.gentoo.org/874663 Signed-off-by: Haelwenn (lanodan) Monnier --- dev-lang/wabt/wabt-1.0.29.ebuild | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dev-lang/wabt/wabt-1.0.29.ebuild b/dev-lang/wabt/wabt-1.0.29.ebuild index ffbff44c8d..a9544f2175 100644 --- a/dev-lang/wabt/wabt-1.0.29.ebuild +++ b/dev-lang/wabt/wabt-1.0.29.ebuild @@ -18,13 +18,20 @@ IUSE="test" RESTRICT="!test? ( test )" DEPEND="test? ( dev-cpp/gtest )" -BDEPEND="${PYTHON_DEPS}" +BDEPEND=" + ${PYTHON_DEPS} + $(python_gen_any_dep 'dev-python/ply[${PYTHON_USEDEP}]') +" PATCHES=( # Disable tests depending on third_party/wasm-c-api/example/*.wasm "${FILESDIR}/wabt-1.0.29-wasm-blob-tests.patch" ) +python_check_deps() { + python_has_version "dev-python/ply[${PYTHON_USEDEP}]" +} + src_prepare() { cmake_src_prepare From 4c1ed292be49648493cb6998c03157e345925e38 Mon Sep 17 00:00:00 2001 From: "Haelwenn (lanodan) Monnier" Date: Tue, 4 Oct 2022 04:37:03 +0200 Subject: [PATCH 3/8] dev-lang/wabt: drop 1.0.29, add 1.0.30 Signed-off-by: Haelwenn (lanodan) Monnier --- dev-lang/wabt/Manifest | 2 +- ...ests.patch => wabt-1.0.30-wasm-blob-tests.patch} | 13 +++++-------- .../wabt/{wabt-1.0.29.ebuild => wabt-1.0.30.ebuild} | 2 +- 3 files changed, 7 insertions(+), 10 deletions(-) rename dev-lang/wabt/files/{wabt-1.0.29-wasm-blob-tests.patch => wabt-1.0.30-wasm-blob-tests.patch} (88%) rename dev-lang/wabt/{wabt-1.0.29.ebuild => wabt-1.0.30.ebuild} (96%) diff --git a/dev-lang/wabt/Manifest b/dev-lang/wabt/Manifest index 34c549d923..a0603a36c6 100644 --- a/dev-lang/wabt/Manifest +++ b/dev-lang/wabt/Manifest @@ -1 +1 @@ -DIST wabt-1.0.29.tar.xz 1977856 BLAKE2B 08ad2cf96ba743dd094a05f51ab86341fb0403737b35ff8f4e5d5041dfd27994af0215565085f1a1818d847f4587c93e91cebc9f63df6b401f4f295101f6d760 SHA512 fa791c29ecc4e8795d5afa6ffd8fcb0b3e39b89f4b936611e86759aafcb77b91c7b02e899d07c8e9ee871ac66e40f44579ec788e2d18a87d4f48dbf795c6c045 +DIST wabt-1.0.30.tar.xz 2020572 BLAKE2B eda0074b0839908bb837921ed451aa0c022dc1fe8ee594f64294115dc020edc92e59d259d033d3290c843f501be0bb87e3e9b44e31ba6f6b427898db25a65380 SHA512 d7a76d6c96c1a6098111ebfb1a252a0dbd7952a014300015ee39808afcc2243fdb0794a8e2fb7fb26b11c1ecca7923c2fe6210aa6a85d7f6b001c11fe451a816 diff --git a/dev-lang/wabt/files/wabt-1.0.29-wasm-blob-tests.patch b/dev-lang/wabt/files/wabt-1.0.30-wasm-blob-tests.patch similarity index 88% rename from dev-lang/wabt/files/wabt-1.0.29-wasm-blob-tests.patch rename to dev-lang/wabt/files/wabt-1.0.30-wasm-blob-tests.patch index aacce18fd1..df9188e91e 100644 --- a/dev-lang/wabt/files/wabt-1.0.29-wasm-blob-tests.patch +++ b/dev-lang/wabt/files/wabt-1.0.30-wasm-blob-tests.patch @@ -1,15 +1,15 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1fe79b8d..5ebf8f87 100644 +index 2935e9e5..949e4e38 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -632,52 +632,7 @@ if (BUILD_TESTS) - ${USES_TERMINAL} +@@ -658,49 +658,7 @@ if (BUILD_TESTS) + USES_TERMINAL ) - add_custom_target(run-c-api-tests - COMMAND ${PYTHON_EXECUTABLE} ${WABT_SOURCE_DIR}/test/run-c-api-examples.py --bindir $ - WORKING_DIRECTORY ${WABT_SOURCE_DIR} -- ${USES_TERMINAL} +- USES_TERMINAL - ) - - add_custom_target(check DEPENDS run-unittests run-tests run-c-api-tests) @@ -46,10 +46,7 @@ index 1fe79b8d..5ebf8f87 100644 - c_api_example(start) - c_api_example(table) - c_api_example(trap) -- if (NOT WIN32) -- # depends on pthreads -- set(THREADS_PREFER_PTHREAD_FLAG ON) -- find_package(Threads REQUIRED) +- if (CMAKE_USE_PTHREADS_INIT) - c_api_example(threads) - endif () + add_custom_target(check DEPENDS run-unittests run-tests) diff --git a/dev-lang/wabt/wabt-1.0.29.ebuild b/dev-lang/wabt/wabt-1.0.30.ebuild similarity index 96% rename from dev-lang/wabt/wabt-1.0.29.ebuild rename to dev-lang/wabt/wabt-1.0.30.ebuild index a9544f2175..da332c8fe4 100644 --- a/dev-lang/wabt/wabt-1.0.29.ebuild +++ b/dev-lang/wabt/wabt-1.0.30.ebuild @@ -25,7 +25,7 @@ BDEPEND=" PATCHES=( # Disable tests depending on third_party/wasm-c-api/example/*.wasm - "${FILESDIR}/wabt-1.0.29-wasm-blob-tests.patch" + "${FILESDIR}/wabt-1.0.30-wasm-blob-tests.patch" ) python_check_deps() { From 2054b8dd37f77abce8d3602c81ecbdba34c30732 Mon Sep 17 00:00:00 2001 From: "Haelwenn (lanodan) Monnier" Date: Tue, 4 Oct 2022 04:51:10 +0200 Subject: [PATCH 4/8] license_groups: Add Saleae in @EULA Seems to require explicit approuval and tries to take away more rights than all-rights-reserved does. Signed-off-by: Haelwenn (lanodan) Monnier --- profiles/license_groups | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/profiles/license_groups b/profiles/license_groups index c704a85dee..bb1a72535e 100644 --- a/profiles/license_groups +++ b/profiles/license_groups @@ -5,5 +5,5 @@ OPEN-DEFINITION @OPEN-CONTENT FDL-1.1 FDL-1.1+ FDL-1.2 FDL-1.2+ FDL-1.3 FDL-1.3+ FREE @FREE-SOFTWARE @OPEN-DEFINITION DFSG @FREE lablgtk-examples meschach shion VOSTROM BINARY-REDISTRIBUTABLE PGP-2 RSAREF -EULA Enpass-EULA RTCW-ETEULA technic Typora-EULA Warframe-EULA +EULA Enpass-EULA RTCW-ETEULA technic Typora-EULA Warframe-EULA Saleae COPYFREE 0BSD BEER-WARE BSL-1.1 BSD BSD-2 CC0-1.0 Clear-BSD HPND MIT OPENLDAP POSTGRESQL tcltk Unlicense WTFPL ZSH From 7556940b447cf93f31daad7a82b78ddaec45f187 Mon Sep 17 00:00:00 2001 From: Joe Kappus Date: Tue, 4 Oct 2022 03:50:43 -0400 Subject: [PATCH 5/8] sys-fs/ufiformat: new package, add 0.9.9 Signed-off-by: Joe Kappus --- sys-fs/ufiformat/ChangeLog | 26 +++++++++++++++++++++++++ sys-fs/ufiformat/Manifest | 4 ++++ sys-fs/ufiformat/metadata.xml | 7 +++++++ sys-fs/ufiformat/ufiformat-0.9.9.ebuild | 17 ++++++++++++++++ 4 files changed, 54 insertions(+) create mode 100644 sys-fs/ufiformat/ChangeLog create mode 100644 sys-fs/ufiformat/Manifest create mode 100644 sys-fs/ufiformat/metadata.xml create mode 100644 sys-fs/ufiformat/ufiformat-0.9.9.ebuild diff --git a/sys-fs/ufiformat/ChangeLog b/sys-fs/ufiformat/ChangeLog new file mode 100644 index 0000000000..e1f983227e --- /dev/null +++ b/sys-fs/ufiformat/ChangeLog @@ -0,0 +1,26 @@ +# ChangeLog for sys-fs/ufiformat +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# : $ + + 01 Jun 2014; Thomas Sachau (Tommy[D]) + ufiformat-0.9.9.ebuild: + Drop unneeded DOCS array + +*ufiformat-0.9.9 (26 Mar 2014) + + 26 Mar 2014; Michael Palimaka + -ufiformat-0.9.4.ebuild, +ufiformat-0.9.9.ebuild: + Version bump. + + 22 Jan 2009; Christian Ruppert (idl0r) + ufiformat-0.9.4.ebuild: + added missing die statements + + 22 Jan 2009; Christian Schmidt (twnqx) + -ufiformat-0.9.3.ebuild, +ufiformat-0.9.4.ebuild: + Version bump + + 29 Jul 2007; Christian Schmidt (twnqx) +metadata.xml, + +ufiformat-0.9.3.ebuild: + New Ebuild as requested in bug 156300 + diff --git a/sys-fs/ufiformat/Manifest b/sys-fs/ufiformat/Manifest new file mode 100644 index 0000000000..375cdc655f --- /dev/null +++ b/sys-fs/ufiformat/Manifest @@ -0,0 +1,4 @@ +DIST ufiformat-0.9.9.tar.gz 98000 SHA256 e2f795bee9c0015d68d15ee1fc454c8dda6abac8465a84b34d7345f4b1313709 SHA512 7cb519e8ee8f9b159c5e13daeaff9d68dd8f27df6c4ca00fbb726fd5882358bef8685b7116e8ca5c3661120c2cb6ef80a6ed3c19fd2103bbffd2dfe240cccc8d WHIRLPOOL eb699c50bcf555bffab82c2aae58e4c9a497a907eacc649fd13fdb2277a0fdf6f813587e3e5f14870f7cc91aa00b97fe4f366603611eef761fef509689ad8405 +EBUILD ufiformat-0.9.9.ebuild 403 SHA256 389998255785f27231b3dd243008f5b0e625c809a63dbd0fc10cc93b6b4d67ea SHA512 6166f6a5e6b90e1aa745176854331316083bc80b4f585a16001cbc5db94407854ad77b65a1a359c6425615232944c9ee07960b8970e2d46346bc63c3fb8b68eb WHIRLPOOL b8065ae1ddb5b60ab36a93041cceb4e1e04e327a0099a531d4bdb4569795571e8c012b878d43dbc9b3307b633f99f74c64de05e38322a91dbd7bebcbb42558a4 +MISC ChangeLog 771 SHA256 344853cd99bb50b28afcfd098c501624b16f934ea1c536b884efa41751188b81 SHA512 202b0c24b24db8e31de948d2a54fdb32a447103bde5c322bede2aa8e73342081a62586a958271964c622b7208876bbe21d2b7a0d427e4aadee171bdd41e76b82 WHIRLPOOL 56af2d28292c08ae03bc4260dfd270ebb9f661a52d9bffce184ee350a1a0043894f5b106397d3fcecf97c8825f4c8a141376b77000afa96ccee1a75fd62c09b4 +MISC metadata.xml 218 SHA256 233939b895af8b57950632a105694c27dd29610443ed092ef127e48cfa6e39b1 SHA512 51f16738272cb5341713e71dd89853ff3435f3d00d1e94745a097e5a2153ac204c742ac9ef199afb9f50a301bd5ca0b11e63e34a50d9cca897142d0c8f8d7e57 WHIRLPOOL 8cd3a75f4bb8dcaef40fc9644c2c7b3a86019d6f63526f067a12cb3fd171dcfe3d8958fd11b2cdd8b41de6fcc869c8ec84dd0b8bffd9f9400be50e5788b0b3c9 diff --git a/sys-fs/ufiformat/metadata.xml b/sys-fs/ufiformat/metadata.xml new file mode 100644 index 0000000000..b2c9106038 --- /dev/null +++ b/sys-fs/ufiformat/metadata.xml @@ -0,0 +1,7 @@ + + + + +Formatter for USB floppy drives + + diff --git a/sys-fs/ufiformat/ufiformat-0.9.9.ebuild b/sys-fs/ufiformat/ufiformat-0.9.9.ebuild new file mode 100644 index 0000000000..e0bf3984aa --- /dev/null +++ b/sys-fs/ufiformat/ufiformat-0.9.9.ebuild @@ -0,0 +1,17 @@ +# Copyright 1999-2022 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# : $ + +EAPI=8 + +DESCRIPTION="USB Floppy Disk formatting tool" +HOMEPAGE="https://github.com/tedigh/ufiformat" +SRC_URI="https://github.com/tedigh/$PN/archive/refs/tags/v$PV.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND="sys-fs/e2fsprogs" +DEPEND=${RDEPEND} From 13343f28aa024bf010087bbeea754a62d69e3876 Mon Sep 17 00:00:00 2001 From: Joe Kappus Date: Tue, 4 Oct 2022 04:06:25 -0400 Subject: [PATCH 6/8] sys-fs/ufiformat: cleanup Manifest/metadata Signed-off-by: Joe Kappus --- sys-fs/ufiformat/ChangeLog | 26 -------------------------- sys-fs/ufiformat/Manifest | 5 +---- sys-fs/ufiformat/metadata.xml | 3 ++- 3 files changed, 3 insertions(+), 31 deletions(-) delete mode 100644 sys-fs/ufiformat/ChangeLog diff --git a/sys-fs/ufiformat/ChangeLog b/sys-fs/ufiformat/ChangeLog deleted file mode 100644 index e1f983227e..0000000000 --- a/sys-fs/ufiformat/ChangeLog +++ /dev/null @@ -1,26 +0,0 @@ -# ChangeLog for sys-fs/ufiformat -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# : $ - - 01 Jun 2014; Thomas Sachau (Tommy[D]) - ufiformat-0.9.9.ebuild: - Drop unneeded DOCS array - -*ufiformat-0.9.9 (26 Mar 2014) - - 26 Mar 2014; Michael Palimaka - -ufiformat-0.9.4.ebuild, +ufiformat-0.9.9.ebuild: - Version bump. - - 22 Jan 2009; Christian Ruppert (idl0r) - ufiformat-0.9.4.ebuild: - added missing die statements - - 22 Jan 2009; Christian Schmidt (twnqx) - -ufiformat-0.9.3.ebuild, +ufiformat-0.9.4.ebuild: - Version bump - - 29 Jul 2007; Christian Schmidt (twnqx) +metadata.xml, - +ufiformat-0.9.3.ebuild: - New Ebuild as requested in bug 156300 - diff --git a/sys-fs/ufiformat/Manifest b/sys-fs/ufiformat/Manifest index 375cdc655f..42e43c941b 100644 --- a/sys-fs/ufiformat/Manifest +++ b/sys-fs/ufiformat/Manifest @@ -1,4 +1 @@ -DIST ufiformat-0.9.9.tar.gz 98000 SHA256 e2f795bee9c0015d68d15ee1fc454c8dda6abac8465a84b34d7345f4b1313709 SHA512 7cb519e8ee8f9b159c5e13daeaff9d68dd8f27df6c4ca00fbb726fd5882358bef8685b7116e8ca5c3661120c2cb6ef80a6ed3c19fd2103bbffd2dfe240cccc8d WHIRLPOOL eb699c50bcf555bffab82c2aae58e4c9a497a907eacc649fd13fdb2277a0fdf6f813587e3e5f14870f7cc91aa00b97fe4f366603611eef761fef509689ad8405 -EBUILD ufiformat-0.9.9.ebuild 403 SHA256 389998255785f27231b3dd243008f5b0e625c809a63dbd0fc10cc93b6b4d67ea SHA512 6166f6a5e6b90e1aa745176854331316083bc80b4f585a16001cbc5db94407854ad77b65a1a359c6425615232944c9ee07960b8970e2d46346bc63c3fb8b68eb WHIRLPOOL b8065ae1ddb5b60ab36a93041cceb4e1e04e327a0099a531d4bdb4569795571e8c012b878d43dbc9b3307b633f99f74c64de05e38322a91dbd7bebcbb42558a4 -MISC ChangeLog 771 SHA256 344853cd99bb50b28afcfd098c501624b16f934ea1c536b884efa41751188b81 SHA512 202b0c24b24db8e31de948d2a54fdb32a447103bde5c322bede2aa8e73342081a62586a958271964c622b7208876bbe21d2b7a0d427e4aadee171bdd41e76b82 WHIRLPOOL 56af2d28292c08ae03bc4260dfd270ebb9f661a52d9bffce184ee350a1a0043894f5b106397d3fcecf97c8825f4c8a141376b77000afa96ccee1a75fd62c09b4 -MISC metadata.xml 218 SHA256 233939b895af8b57950632a105694c27dd29610443ed092ef127e48cfa6e39b1 SHA512 51f16738272cb5341713e71dd89853ff3435f3d00d1e94745a097e5a2153ac204c742ac9ef199afb9f50a301bd5ca0b11e63e34a50d9cca897142d0c8f8d7e57 WHIRLPOOL 8cd3a75f4bb8dcaef40fc9644c2c7b3a86019d6f63526f067a12cb3fd171dcfe3d8958fd11b2cdd8b41de6fcc869c8ec84dd0b8bffd9f9400be50e5788b0b3c9 +DIST ufiformat-0.9.9.tar.gz 98000 BLAKE2B ebfa3fedc39df583aa0535cd8945a6c856d90a25b0bb5b38e7208e9903c8146fc5fb1b2ad224f27e57e36d11ad0f729ad024822bd8ec047a32cc7f63f17117f9 SHA512 7cb519e8ee8f9b159c5e13daeaff9d68dd8f27df6c4ca00fbb726fd5882358bef8685b7116e8ca5c3661120c2cb6ef80a6ed3c19fd2103bbffd2dfe240cccc8d diff --git a/sys-fs/ufiformat/metadata.xml b/sys-fs/ufiformat/metadata.xml index b2c9106038..5ff2df21a9 100644 --- a/sys-fs/ufiformat/metadata.xml +++ b/sys-fs/ufiformat/metadata.xml @@ -2,6 +2,7 @@ -Formatter for USB floppy drives +Low-level formatter for USB floppy drives. Provides similar functionality +that fdformat did for internal floppy drives. From c10f20555d11a5fc7efdc12ae0e6a8c9bed098e2 Mon Sep 17 00:00:00 2001 From: "Haelwenn (lanodan) Monnier" Date: Tue, 4 Oct 2022 13:52:17 +0200 Subject: [PATCH 7/8] dev-util/go-deblob: treeclean Signed-off-by: Haelwenn (lanodan) Monnier --- dev-util/go-deblob/Manifest | 10 ------ dev-util/go-deblob/go-deblob-1.0.0.ebuild | 39 ----------------------- dev-util/go-deblob/metadata.xml | 8 ----- 3 files changed, 57 deletions(-) delete mode 100644 dev-util/go-deblob/Manifest delete mode 100644 dev-util/go-deblob/go-deblob-1.0.0.ebuild delete mode 100644 dev-util/go-deblob/metadata.xml diff --git a/dev-util/go-deblob/Manifest b/dev-util/go-deblob/Manifest deleted file mode 100644 index b260428f0a..0000000000 --- a/dev-util/go-deblob/Manifest +++ /dev/null @@ -1,10 +0,0 @@ -DIST git.sr.ht%2F~sircmpwn%2Fgetopt%2F@v%2Fv0.0.0-20190808004552-daaf1274538b.mod 78 BLAKE2B 01c5d4bbdb9ddf4d3e7435a993e873bde3241c4136c6988358dce0d2ec79a4850dadd8e13ea99e35996c3082a54b9a13409f2a85f7a2ba118f9c20e074d797f3 SHA512 c521cf971e4d6882a73b0596d1ab31ad59292672b263a1554ce9e32a57e3c1ecafa8e758b8c9b4efef31a875b74e147cb84f59b0479de2d85184b8d9252a9fbd -DIST git.sr.ht%2F~sircmpwn%2Fgetopt%2F@v%2Fv0.0.0-20190808004552-daaf1274538b.zip 15118 BLAKE2B 57c55c5eab998bfa60ee82dbb17668186b0235ce1a6f2b2ff27e92b33a9b0592d31aa9fa767b6d6ecabcaecbe309680fcf2b0c717422629d409356fcb78a1cde SHA512 5d05c9eb7b235155e33a1cac0b422f48727df06e96e08b03a507a04fcb376b090e713d2dbe8603804520cddd4b1a02f26691c1ebb49ae34294e834a1afaf3a1d -DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod 34 BLAKE2B 7e09c2779bf7a84a9271e31522ebbe600a1c11b107d651d91f58c8373e4336332a3a881f3e12b382543d75f20398af66085fcb3e780eed341e870e9c30f29267 SHA512 5e079462f7e0dff0efda71f580aa185700cfa936b718a19d0e2a8c63212e47a07022dca0c282832d48e5165aae8e82aeeeb2ac3664268f1148fc772010fb860e -DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.zip 60546 BLAKE2B e775860f49c6ee09a6c48902d38fdf5d2d77af4cd405d8d303902170e46493301d4aa873a48b4d12a16d92dafaa65290de1fd3a42545025fbfc82f15a3881e8d SHA512 53dc5484f488ae1f8d0eb672c3431bbf9fce33dfcee83dda7929103e3650559cf703f601716984a640422f01cc640860dba0b47e16aef04d0d2452a266fefbf9 -DIST github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod 37 BLAKE2B 94636062c94f8ff68cdcab7593a3acae7b9ffff616cad7b1d5c9cd147a4a1042d33666cbeed6fd816d6793113abfb595183097dcc46de7a3dfadc1423ed43e79 SHA512 c3d5c48cdb8ba6af7071a07cfede06e0ab67e3726d9de592a952fad40167dcbdd9621dc2c4df1bd3c28eb99d70b1b6d8d812441237c35bf492e5b7f07bd33902 -DIST github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip 12433 BLAKE2B 0c911c9d173080abd8edbbab1f47222343801d8eeae36b4add24773e3282fc2a39283fdf519a3d4483e39cdb7d9509b8570d151f46841ac1a616f312dc4cb0ba SHA512 3b85697185ba85cdef6202444ab6cabeabfad8a03d66b3839a852586b1f91ddae7897a57c8c138d5647022aa44906c7ef3c5339d520f90eeea0742a935da8cf2 -DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod 32 BLAKE2B d698910da1ef00a70a1673b8c74105de195020ccd95d1e70c5dd1e1615210886ff9acbc9cfd03f46e99f5223b60b04695b8d362b9e0edd4e485480f802bd229a SHA512 4e366e5a60559a8863cb2a50280deb307d8bf885ca5440cce1b49a084b4cc4583b3481240125f35f161226592a43f2c0a426152f117d79b68c92c72a93f751d5 -DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod 154 BLAKE2B 60cd7801e7cd33746305cd636b048b25a86270ec3b29a21c3c078c7e95b769bce7e80c2c7c5474113786bd788c7f88f3719e34f02141038e0d161b36e32f39b9 SHA512 bb808fad059f5abd0171e4bdc724411eff2c7e8d303a4ffb3608a00e21bb3cfafe9e83b4b4e9bccd42c9a4331f67ddc6043e3dd5eaa9a122c86626eed43a8383 -DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.zip 83537 BLAKE2B 6d6de57cc5e393aaef1cdc7e2140143eb7fa324bb2ea3b9f63bfe1e8652c02d24eb441fc3b435c6b287f165c5540a008a7c21ab4070d8bc77c77e6fb608f7e46 SHA512 c5cd06f825bbfdcf2ae58ea21edbeea03c110de3fc20fcf69db07aae26c9ae67a8ac57a9ffedec9b3b4f1f3b016089935049d75d92a9a03e45ce6345b4c9c611 -DIST go-deblob-1.0.0.tar.gz 5781 BLAKE2B d4d3822cbb9267bf9c8b8c82259f8160e7e65d9537e3c5eaecbbcffa22fc28f48a3ea98eaf6d30ce6290fe82b6b9cf0b3dbff386a2559fb21fcff8a4454bc6cc SHA512 8352e667ef3fa29ded0f073e783ff66fea32e3cc77e5fba4b4b5135434db38fbdfe8b48b0a7c4c98a3ed854f5a655366816cd825262a43a912ba155709af83ed diff --git a/dev-util/go-deblob/go-deblob-1.0.0.ebuild b/dev-util/go-deblob/go-deblob-1.0.0.ebuild deleted file mode 100644 index 86c8c13812..0000000000 --- a/dev-util/go-deblob/go-deblob-1.0.0.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -EGO_PN="hacktivis.me/git/go-deblob" - -inherit go-module - -DESCRIPTION="remove binary blobs from a directory" -HOMEPAGE="https://hacktivis.me/git/go-deblob/" -# BSD: hacktivis.me/git/go-deblob, git.sr.ht/~sircmpwn/getopt, github.com/pmezard/go-difflib -# ISC: github.com/davecgh/go-spew -# MIT: github.com/stretchr/objx, github.com/stretchr/testify -LICENSE="BSD ISC MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -EGO_SUM=( - "git.sr.ht/~sircmpwn/getopt v0.0.0-20190808004552-daaf1274538b h1:da5JBQ6dcW14aWnEf/pFRIMV2PsqTQEWmR+V2sw5oxU=" - "git.sr.ht/~sircmpwn/getopt v0.0.0-20190808004552-daaf1274538b/go.mod h1:wMEGFFFNuPos7vHmWXfszqImLppbc0wEhh6JBfJIUgw=" - "github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=" - "github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=" - "github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=" - "github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=" - "github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=" - "github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q=" - "github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=" -) - -go-module_set_globals - -SRC_URI="https://hacktivis.me/releases/${P}.tar.gz - ${EGO_SUM_SRC_URI}" - -src_install() { - emake DESTDIR="${D}" PREFIX="/usr" install - einstalldocs -} diff --git a/dev-util/go-deblob/metadata.xml b/dev-util/go-deblob/metadata.xml deleted file mode 100644 index c698af2344..0000000000 --- a/dev-util/go-deblob/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - contact@hacktivis.me - Haelwenn (lanodan) Monnier - - From e31cef37c3c3b4115c690f248a864854e2bfb64a Mon Sep 17 00:00:00 2001 From: Andrew Ammerlaan Date: Tue, 4 Oct 2022 14:28:11 +0200 Subject: [PATCH 8/8] dev-python/libcst: restrict tests, testdep black not available Signed-off-by: Andrew Ammerlaan --- .../libcst/libcst-0.4.3_p20220607.ebuild | 21 +++++++++---------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/dev-python/libcst/libcst-0.4.3_p20220607.ebuild b/dev-python/libcst/libcst-0.4.3_p20220607.ebuild index 25668e4896..ce93cd18bf 100644 --- a/dev-python/libcst/libcst-0.4.3_p20220607.ebuild +++ b/dev-python/libcst/libcst-0.4.3_p20220607.ebuild @@ -126,7 +126,7 @@ LICENSE="MIT Apache-2.0 PSF-2 BSD Boost-1.0 Unlicense" SLOT="0" KEYWORDS="~amd64" IUSE="test" -RESTRICT="!test? ( test )" +RESTRICT="test" RDEPEND=" >=dev-python/pyyaml-5.2[${PYTHON_USEDEP}] @@ -134,16 +134,15 @@ RDEPEND=" >=dev-python/typing-extensions-3.7.4.2[${PYTHON_USEDEP}] >=dev-python/typing_inspect-0.4.0[${PYTHON_USEDEP}] " -DEPEND=" - ${RDEPEND} - test? ( - ~dev-python/black-22.3.0[${PYTHON_USEDEP}] - >=dev-python/hypothesis-4.36.0[${PYTHON_USEDEP}] - >=dev-python/hypothesmith-0.0.4[${PYTHON_USEDEP}] - >=dev-python/prompt_toolkit-2.0.9[${PYTHON_USEDEP}] - ) -" -BDEPEND="test? ( dev-python/ufmt[${PYTHON_USEDEP}] )" +DEPEND="${RDEPEND}" +# test? ( +# ~dev-python/black-22.3.0[${PYTHON_USEDEP}] +# >=dev-python/hypothesis-4.36.0[${PYTHON_USEDEP}] +# >=dev-python/hypothesmith-0.0.4[${PYTHON_USEDEP}] +# >=dev-python/prompt_toolkit-2.0.9[${PYTHON_USEDEP}] +# ) +# " +# BDEPEND="test? ( dev-python/ufmt[${PYTHON_USEDEP}] )" distutils_enable_tests --install pytest