From 37d2597558c8f9f8077574fe27bac34b59de1cdf Mon Sep 17 00:00:00 2001 From: David Roman Date: Mon, 6 May 2024 12:32:06 +0200 Subject: [PATCH 1/9] media-sound/lms: add 3.53.0 Signed-off-by: David Roman --- media-sound/lms/Manifest | 1 + media-sound/lms/lms-3.53.0.ebuild | 72 +++++++++++++++++++++++++++++++ 2 files changed, 73 insertions(+) create mode 100644 media-sound/lms/lms-3.53.0.ebuild diff --git a/media-sound/lms/Manifest b/media-sound/lms/Manifest index 2a992936cd..1b714381e4 100644 --- a/media-sound/lms/Manifest +++ b/media-sound/lms/Manifest @@ -1,2 +1,3 @@ DIST lms-3.51.1.tar.gz 427958 BLAKE2B 88e7afc4fa3c28761d0ce6fa9c5d98ab9c9525f2138ef0523e9bae45511c74c9417b8717de56b054f5ec15c444fcbc00336795f3bdcbbb906ddde97bc54ad6cd SHA512 f53907e0bbf9f6a26d9231e7eca01fd92f981e1271879bcbb960829b1416d1d73e980f50b4a5a12d1b0e48b7b9d1680b53fedce8e015eee33edc3c890625c34b DIST lms-3.52.0.tar.gz 422542 BLAKE2B 6da2ce9f3ad1be103acaf694498a422be41690a2f0976081d1bde41b4a5860f4e33b604be3879d2d0cd3c24d9a41da185a990255035af322cc8c0bd2f87071f3 SHA512 f9ad2a6011960c7db74e2a9df2e1a48d7f14886165fea5b37d20b467c69effda5ad8c61d59c6d74b7a08b5862efb1c73ddb3be7743e905350e78127f7681da38 +DIST lms-3.53.0.tar.gz 423679 BLAKE2B 4b6c5ac28f10674209242c11593de999e50a8ae975f44bec3f277fbe9c4aeb3968bb4bce135540c1df0d6014e805d7617e2203bc5fcf56a64dedb1562df0cdbc SHA512 19e90135049097a814ef9c0d760c5ff7ca061d7a2e27720f1ee645d2781026be233dcb7105034ac291e416e990b0a91b6df4f9c235f5ef18e733e07f8dfe2ead diff --git a/media-sound/lms/lms-3.53.0.ebuild b/media-sound/lms/lms-3.53.0.ebuild new file mode 100644 index 0000000000..2b015ca02d --- /dev/null +++ b/media-sound/lms/lms-3.53.0.ebuild @@ -0,0 +1,72 @@ +# Copyright 2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake flag-o-matic pam systemd + +DESCRIPTION="Lightweight Music Server." +HOMEPAGE="http://lms-demo.poupon.dev/ https://github.com/epoupon/lms" +SRC_URI="https://github.com/epoupon/lms/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64" +IUSE="test stb" +RESTRICT="!test? ( test )" + +RDEPEND=" + acct-user/lms + dev-cpp/wt + dev-libs/boost + dev-libs/libconfig[cxx] + media-libs/taglib + media-video/ffmpeg[mp3,opus] + + !stb? ( media-gfx/graphicsmagick ) + +" + +DEPEND=" + ${RDEPEND} + + stb? ( dev-libs/stb ) +" + +BDEPEND=" + test? ( dev-cpp/gtest ) +" + +PATCHES=( + "${FILESDIR}/${PN}-respect-ldflags.patch" +) + +src_configure() { + append-flags -I/usr/include/stb/deprecated + + local mycmakeargs=( + -DIMAGE_LIBRARY=$(usex stb STB GraphicsMagick++) + -DENABLE_TESTS=$(usex test) + ) + + cmake_src_configure +} + +src_install() { + cmake_src_install + + systemd_newunit conf/systemd/default.service lms.service + newinitd "${FILESDIR}/lms.init" lms + dopamd conf/pam/lms + mv "${ED}/usr/share/lms/lms.conf" "${ED}/etc/lms.conf" || die + + # Already installed in the proper directory + rm "${ED}/usr/share/lms/default.service" || die + rm "${ED}/usr/share/lms/lms" || die + + keepdir /var/log/lms + fowners -R lms:lms /var/log/lms + + keepdir /var/lms + fowners lms:lms /var/lms +} From 42c64ae58a15c8f719c4b60521d7a97238d287b9 Mon Sep 17 00:00:00 2001 From: David Roman Date: Mon, 6 May 2024 12:33:02 +0200 Subject: [PATCH 2/9] media-sound/lms/files: clean unused patches Signed-off-by: David Roman --- media-sound/lms/files/lms-fix-lib-dir.patch | 150 ------------------ .../lms/files/lms-optional-tests.patch | 23 --- 2 files changed, 173 deletions(-) delete mode 100644 media-sound/lms/files/lms-fix-lib-dir.patch delete mode 100644 media-sound/lms/files/lms-optional-tests.patch diff --git a/media-sound/lms/files/lms-fix-lib-dir.patch b/media-sound/lms/files/lms-fix-lib-dir.patch deleted file mode 100644 index f539b9e890..0000000000 --- a/media-sound/lms/files/lms-fix-lib-dir.patch +++ /dev/null @@ -1,150 +0,0 @@ -diff --git a/src/libs/av/CMakeLists.txt b/src/libs/av/CMakeLists.txt -index fee1201e..e616260d 100644 ---- a/src/libs/av/CMakeLists.txt -+++ b/src/libs/av/CMakeLists.txt -@@ -26,5 +26,5 @@ target_link_libraries(lmsav PRIVATE - PkgConfig::LIBAV - ) - --install(TARGETS lmsav DESTINATION lib) -+install(TARGETS lmsav DESTINATION ${CMAKE_INSTALL_LIBDIR}) - -diff --git a/src/libs/database/CMakeLists.txt b/src/libs/database/CMakeLists.txt -index 7188f977..0b1eb84e 100644 ---- a/src/libs/database/CMakeLists.txt -+++ b/src/libs/database/CMakeLists.txt -@@ -42,7 +42,7 @@ target_link_libraries(lmsdatabase PUBLIC - Wt::Dbo - ) - --install(TARGETS lmsdatabase DESTINATION lib) -+install(TARGETS lmsdatabase DESTINATION ${CMAKE_INSTALL_LIBDIR}) - - if(BUILD_TESTING) - add_subdirectory(test) -diff --git a/src/libs/image/CMakeLists.txt b/src/libs/image/CMakeLists.txt -index cb855563..eb48565e 100644 ---- a/src/libs/image/CMakeLists.txt -+++ b/src/libs/image/CMakeLists.txt -@@ -34,5 +34,5 @@ else () - message(FATAL_ERROR "Invalid IMAGE_LIBRARY provided") - endif() - --install(TARGETS lmsimage DESTINATION lib) -+install(TARGETS lmsimage DESTINATION ${CMAKE_INSTALL_LIBDIR}) - -diff --git a/src/libs/metadata/CMakeLists.txt b/src/libs/metadata/CMakeLists.txt -index b2502aa3..c6c26521 100644 ---- a/src/libs/metadata/CMakeLists.txt -+++ b/src/libs/metadata/CMakeLists.txt -@@ -28,5 +28,5 @@ target_link_libraries(lmsmetadata PUBLIC - std::filesystem - ) - --install(TARGETS lmsmetadata DESTINATION lib) -+install(TARGETS lmsmetadata DESTINATION ${CMAKE_INSTALL_LIBDIR}) - -diff --git a/src/libs/services/auth/CMakeLists.txt b/src/libs/services/auth/CMakeLists.txt -index 0a2eb6a5..edb9c4c2 100644 ---- a/src/libs/services/auth/CMakeLists.txt -+++ b/src/libs/services/auth/CMakeLists.txt -@@ -35,5 +35,5 @@ if (USE_PAM) - target_link_libraries(lmsauth PRIVATE ${PAM_LIBRARIES}) - endif (USE_PAM) - --install(TARGETS lmsauth DESTINATION lib) -+install(TARGETS lmsauth DESTINATION ${CMAKE_INSTALL_LIBDIR}) - -diff --git a/src/libs/services/cover/CMakeLists.txt b/src/libs/services/cover/CMakeLists.txt -index 41169c5d..6dc17262 100644 ---- a/src/libs/services/cover/CMakeLists.txt -+++ b/src/libs/services/cover/CMakeLists.txt -@@ -24,5 +24,5 @@ target_link_libraries(lmsservice-cover PUBLIC - std::filesystem - ) - --install(TARGETS lmsservice-cover DESTINATION lib) -+install(TARGETS lmsservice-cover DESTINATION ${CMAKE_INSTALL_LIBDIR}) - -diff --git a/src/libs/services/feedback/CMakeLists.txt b/src/libs/services/feedback/CMakeLists.txt -index 02e63624..b7634e77 100644 ---- a/src/libs/services/feedback/CMakeLists.txt -+++ b/src/libs/services/feedback/CMakeLists.txt -@@ -26,4 +26,4 @@ target_link_libraries(lmsfeedback PUBLIC - lmsdatabase - ) - --install(TARGETS lmsfeedback DESTINATION lib) -+install(TARGETS lmsfeedback DESTINATION ${CMAKE_INSTALL_LIBDIR}) -diff --git a/src/libs/services/recommendation/CMakeLists.txt b/src/libs/services/recommendation/CMakeLists.txt -index 8244679b..603a66b0 100644 ---- a/src/libs/services/recommendation/CMakeLists.txt -+++ b/src/libs/services/recommendation/CMakeLists.txt -@@ -26,5 +26,5 @@ target_link_libraries(lmsrecommendation PRIVATE - std::filesystem - ) - --install(TARGETS lmsrecommendation DESTINATION lib) -+install(TARGETS lmsrecommendation DESTINATION ${CMAKE_INSTALL_LIBDIR}) - -diff --git a/src/libs/services/scanner/CMakeLists.txt b/src/libs/services/scanner/CMakeLists.txt -index 8a0508e9..78d49e73 100644 ---- a/src/libs/services/scanner/CMakeLists.txt -+++ b/src/libs/services/scanner/CMakeLists.txt -@@ -29,5 +29,5 @@ target_link_libraries(lmsscanner PUBLIC - Wt::Wt - ) - --install(TARGETS lmsscanner DESTINATION lib) -+install(TARGETS lmsscanner DESTINATION ${CMAKE_INSTALL_LIBDIR}) - -diff --git a/src/libs/services/scrobbling/CMakeLists.txt b/src/libs/services/scrobbling/CMakeLists.txt -index 2f78000a..db065828 100644 ---- a/src/libs/services/scrobbling/CMakeLists.txt -+++ b/src/libs/services/scrobbling/CMakeLists.txt -@@ -26,7 +26,7 @@ target_link_libraries(lmsscrobbling PUBLIC - lmsdatabase - ) - --install(TARGETS lmsscrobbling DESTINATION lib) -+install(TARGETS lmsscrobbling DESTINATION ${CMAKE_INSTALL_LIBDIR}) - - if(BUILD_TESTING) - add_subdirectory(test) -diff --git a/src/libs/som/CMakeLists.txt b/src/libs/som/CMakeLists.txt -index 87a2d53f..eeb971d6 100644 ---- a/src/libs/som/CMakeLists.txt -+++ b/src/libs/som/CMakeLists.txt -@@ -17,7 +17,7 @@ target_link_libraries(lmssom PUBLIC - - set_property(TARGET lmssom PROPERTY POSITION_INDEPENDENT_CODE ON) - --install(TARGETS lmssom DESTINATION lib) -+install(TARGETS lmssom DESTINATION ${CMAKE_INSTALL_LIBDIR}) - - if(BUILD_TESTING) - add_subdirectory(test) -diff --git a/src/libs/subsonic/CMakeLists.txt b/src/libs/subsonic/CMakeLists.txt -index 07394e94..41afbbb8 100644 ---- a/src/libs/subsonic/CMakeLists.txt -+++ b/src/libs/subsonic/CMakeLists.txt -@@ -56,5 +56,5 @@ target_link_libraries(lmssubsonic PUBLIC - Wt::Wt - ) - --install(TARGETS lmssubsonic DESTINATION lib) -+install(TARGETS lmssubsonic DESTINATION ${CMAKE_INSTALL_LIBDIR}) - -diff --git a/src/libs/utils/CMakeLists.txt b/src/libs/utils/CMakeLists.txt -index a1f3590d..a12202f9 100644 ---- a/src/libs/utils/CMakeLists.txt -+++ b/src/libs/utils/CMakeLists.txt -@@ -37,7 +37,7 @@ target_link_libraries(lmsutils PUBLIC - Wt::Wt - ) - --install(TARGETS lmsutils DESTINATION lib) -+install(TARGETS lmsutils DESTINATION ${CMAKE_INSTALL_LIBDIR}) - - if(BUILD_TESTING) - add_subdirectory(test) diff --git a/media-sound/lms/files/lms-optional-tests.patch b/media-sound/lms/files/lms-optional-tests.patch deleted file mode 100644 index b01dd4ec7b..0000000000 --- a/media-sound/lms/files/lms-optional-tests.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 369ef896..0da122b0 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -10,11 +10,16 @@ if (UNIX) - set(CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-undefined") - endif () - --include(CTest) -+option(ENABLE_TESTS "Enable tests" ON) -+ -+if(ENABLE_TESTS) -+ include(CTest) -+ find_package(GTest REQUIRED) -+endif() -+ - find_package(PkgConfig REQUIRED) - find_package(Threads REQUIRED) - find_package(Filesystem REQUIRED) --find_package(GTest REQUIRED) - find_package(Boost REQUIRED COMPONENTS system program_options) - find_package(Wt REQUIRED COMPONENTS Wt Dbo DboSqlite3 HTTP) - pkg_check_modules(Taglib REQUIRED IMPORTED_TARGET taglib) From acd586be403bbff8486f5800ee2bec0523a9fc79 Mon Sep 17 00:00:00 2001 From: David Roman Date: Mon, 6 May 2024 12:33:21 +0200 Subject: [PATCH 3/9] media-sound/lms: drop 3.51.1-r1 Signed-off-by: David Roman --- media-sound/lms/Manifest | 1 - media-sound/lms/lms-3.51.1-r1.ebuild | 72 ---------------------------- 2 files changed, 73 deletions(-) delete mode 100644 media-sound/lms/lms-3.51.1-r1.ebuild diff --git a/media-sound/lms/Manifest b/media-sound/lms/Manifest index 1b714381e4..82dd38f65f 100644 --- a/media-sound/lms/Manifest +++ b/media-sound/lms/Manifest @@ -1,3 +1,2 @@ -DIST lms-3.51.1.tar.gz 427958 BLAKE2B 88e7afc4fa3c28761d0ce6fa9c5d98ab9c9525f2138ef0523e9bae45511c74c9417b8717de56b054f5ec15c444fcbc00336795f3bdcbbb906ddde97bc54ad6cd SHA512 f53907e0bbf9f6a26d9231e7eca01fd92f981e1271879bcbb960829b1416d1d73e980f50b4a5a12d1b0e48b7b9d1680b53fedce8e015eee33edc3c890625c34b DIST lms-3.52.0.tar.gz 422542 BLAKE2B 6da2ce9f3ad1be103acaf694498a422be41690a2f0976081d1bde41b4a5860f4e33b604be3879d2d0cd3c24d9a41da185a990255035af322cc8c0bd2f87071f3 SHA512 f9ad2a6011960c7db74e2a9df2e1a48d7f14886165fea5b37d20b467c69effda5ad8c61d59c6d74b7a08b5862efb1c73ddb3be7743e905350e78127f7681da38 DIST lms-3.53.0.tar.gz 423679 BLAKE2B 4b6c5ac28f10674209242c11593de999e50a8ae975f44bec3f277fbe9c4aeb3968bb4bce135540c1df0d6014e805d7617e2203bc5fcf56a64dedb1562df0cdbc SHA512 19e90135049097a814ef9c0d760c5ff7ca061d7a2e27720f1ee645d2781026be233dcb7105034ac291e416e990b0a91b6df4f9c235f5ef18e733e07f8dfe2ead diff --git a/media-sound/lms/lms-3.51.1-r1.ebuild b/media-sound/lms/lms-3.51.1-r1.ebuild deleted file mode 100644 index 2b015ca02d..0000000000 --- a/media-sound/lms/lms-3.51.1-r1.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake flag-o-matic pam systemd - -DESCRIPTION="Lightweight Music Server." -HOMEPAGE="http://lms-demo.poupon.dev/ https://github.com/epoupon/lms" -SRC_URI="https://github.com/epoupon/lms/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64" -IUSE="test stb" -RESTRICT="!test? ( test )" - -RDEPEND=" - acct-user/lms - dev-cpp/wt - dev-libs/boost - dev-libs/libconfig[cxx] - media-libs/taglib - media-video/ffmpeg[mp3,opus] - - !stb? ( media-gfx/graphicsmagick ) - -" - -DEPEND=" - ${RDEPEND} - - stb? ( dev-libs/stb ) -" - -BDEPEND=" - test? ( dev-cpp/gtest ) -" - -PATCHES=( - "${FILESDIR}/${PN}-respect-ldflags.patch" -) - -src_configure() { - append-flags -I/usr/include/stb/deprecated - - local mycmakeargs=( - -DIMAGE_LIBRARY=$(usex stb STB GraphicsMagick++) - -DENABLE_TESTS=$(usex test) - ) - - cmake_src_configure -} - -src_install() { - cmake_src_install - - systemd_newunit conf/systemd/default.service lms.service - newinitd "${FILESDIR}/lms.init" lms - dopamd conf/pam/lms - mv "${ED}/usr/share/lms/lms.conf" "${ED}/etc/lms.conf" || die - - # Already installed in the proper directory - rm "${ED}/usr/share/lms/default.service" || die - rm "${ED}/usr/share/lms/lms" || die - - keepdir /var/log/lms - fowners -R lms:lms /var/log/lms - - keepdir /var/lms - fowners lms:lms /var/lms -} From abf1283d4e95346ade4ce8e0bd9b2065e2ba9bf9 Mon Sep 17 00:00:00 2001 From: Paul Zander Date: Mon, 6 May 2024 12:42:49 +0200 Subject: [PATCH 4/9] dev-debug/lldb-mi: document gtest patch Signed-off-by: Paul Zander --- .../lldb-mi/files/lldb-mi-0.0.1-find_packages_GTest.patch | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dev-debug/lldb-mi/files/lldb-mi-0.0.1-find_packages_GTest.patch b/dev-debug/lldb-mi/files/lldb-mi-0.0.1-find_packages_GTest.patch index 8a5d5a7732..7d18c7f712 100644 --- a/dev-debug/lldb-mi/files/lldb-mi-0.0.1-find_packages_GTest.patch +++ b/dev-debug/lldb-mi/files/lldb-mi-0.0.1-find_packages_GTest.patch @@ -1,3 +1,6 @@ +From: Paul Zander +Subject: [PATCH] CMake: use system gtest instead of fetching it + diff --git a/test/unittests/CMakeLists.txt b/test/unittests/CMakeLists.txt index 4d07cdb..976b8e5 100644 --- a/test/unittests/CMakeLists.txt From 326dfe4e8b879e2b0d4d8c577a75b12e9d503cbe Mon Sep 17 00:00:00 2001 From: DMLhope <605811524@qq.com> Date: Tue, 30 Apr 2024 11:09:24 +0800 Subject: [PATCH 5/9] gui-apps/lan-mouse: Install desktop,icon,service files Signed-off-by: DMLhope <605811524@qq.com> Closes: https://github.com/gentoo/guru/pull/173 Signed-off-by: David Roman --- gui-apps/lan-mouse/lan-mouse-0.7.3.ebuild | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/gui-apps/lan-mouse/lan-mouse-0.7.3.ebuild b/gui-apps/lan-mouse/lan-mouse-0.7.3.ebuild index ab370364a8..6b1b354952 100644 --- a/gui-apps/lan-mouse/lan-mouse-0.7.3.ebuild +++ b/gui-apps/lan-mouse/lan-mouse-0.7.3.ebuild @@ -270,7 +270,14 @@ CRATES=" zvariant_utils@1.1.0 " -inherit cargo +inherit cargo desktop systemd xdg + +DEPEND=" + gui-libs/libadwaita + gui-libs/gtk + x11-themes/hicolor-icon-theme +" +RDEPEND="${DEPEND}" DESCRIPTION="Software KVM Switch / mouse & keyboard sharing software for Local Area Networks" HOMEPAGE="https://github.com/feschber/lan-mouse" @@ -287,3 +294,10 @@ LICENSE+=" " SLOT="0" KEYWORDS="~amd64" + +src_install() { + cargo_src_install + doicon -s scalable resources/de.feschber.LanMouse.svg + domenu de.feschber.LanMouse.desktop + systemd_douserunit service/lan-mouse.service +} From c6a46f007bafd02166809617b399c3aad6189eba Mon Sep 17 00:00:00 2001 From: David Roman Date: Mon, 6 May 2024 13:46:10 +0200 Subject: [PATCH 6/9] media-sound/lms: update CMake option name Signed-off-by: David Roman --- media-sound/lms/lms-3.53.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-sound/lms/lms-3.53.0.ebuild b/media-sound/lms/lms-3.53.0.ebuild index 2b015ca02d..39d6e350f5 100644 --- a/media-sound/lms/lms-3.53.0.ebuild +++ b/media-sound/lms/lms-3.53.0.ebuild @@ -45,7 +45,7 @@ src_configure() { append-flags -I/usr/include/stb/deprecated local mycmakeargs=( - -DIMAGE_LIBRARY=$(usex stb STB GraphicsMagick++) + -DLMS_IMAGE_BACKEND=$(usex stb stb graphicsmagick) -DENABLE_TESTS=$(usex test) ) From 3084dd9e2ca71b77f8c816bb862d9c9c93fddf03 Mon Sep 17 00:00:00 2001 From: Xin Yang Date: Mon, 6 May 2024 08:44:15 +0800 Subject: [PATCH 7/9] net-misc/sshx: add missing dependency: dev-libs/protobuf Closes: https://bugs.gentoo.org/931000 Signed-off-by: Xin Yang Signed-off-by: David Roman --- net-misc/sshx/sshx-0.2.3.ebuild | 2 ++ 1 file changed, 2 insertions(+) diff --git a/net-misc/sshx/sshx-0.2.3.ebuild b/net-misc/sshx/sshx-0.2.3.ebuild index 312adc32e3..335c4d6481 100644 --- a/net-misc/sshx/sshx-0.2.3.ebuild +++ b/net-misc/sshx/sshx-0.2.3.ebuild @@ -271,6 +271,8 @@ LICENSE+=" Apache-2.0 BSD ISC MIT MPL-2.0 Unicode-DFS-2016" SLOT="0" KEYWORDS="~amd64 ~arm64" +BDEPEND="dev-libs/protobuf" + src_install() { dobin target/release/sshx dobin target/release/sshx-server From caed7ebf3bf980f0b2b5018b6b3615553fc264ed Mon Sep 17 00:00:00 2001 From: Xin Yang Date: Mon, 6 May 2024 15:55:11 +0800 Subject: [PATCH 8/9] net-misc/sshx: add 0.2.4, drop 0.2.3 Signed-off-by: Xin Yang Closes: https://github.com/gentoo/guru/pull/181 Signed-off-by: David Roman --- net-misc/sshx/Manifest | 5 ++++- net-misc/sshx/{sshx-0.2.3.ebuild => sshx-0.2.4.ebuild} | 3 +++ 2 files changed, 7 insertions(+), 1 deletion(-) rename net-misc/sshx/{sshx-0.2.3.ebuild => sshx-0.2.4.ebuild} (99%) diff --git a/net-misc/sshx/Manifest b/net-misc/sshx/Manifest index 84602c13ea..638d61297d 100644 --- a/net-misc/sshx/Manifest +++ b/net-misc/sshx/Manifest @@ -140,6 +140,7 @@ DIST rand_chacha-0.3.1.crate 15251 BLAKE2B 645771b2c3e274f085e0837a20306b1d59f6e DIST rand_core-0.6.4.crate 22666 BLAKE2B 8b6b66d50aade877f2779c006f8038db450f808c66d73d79efa66c4178dc03db06f12201bf0e7930181c4b0f4030c49b20cce6eb7839763cf2217cad9710789a SHA512 36c67eb845aa2ccca49d6d680f28d418229bbc5a050729e487fe6b9f9f384fdd7b8d67fc6508b90b79ffb3c26688e72feceb3ecae57d3d7f59338aeb62296f79 DIST redis-0.23.3.crate 184669 BLAKE2B 18522035e676dd4c058a00b5715391e0093b454ea1c113e98f36ab11f3cf3e331bcb8e89fe111959f6d0effdf2a371b05c476be696ba3b6f755de5df7927f573 SHA512 cf6e1cbde9b84193389108305ac3ba136356320e3631f4343d37cc17128ca577776e8616ae8156b4491036ebdeba026416fc1c2c3f5cff171e02613a4e752efc DIST redox_syscall-0.3.5.crate 23404 BLAKE2B 85aa4299d9816666bf576f523da5cdeae87b3c8fbb2af103e82258d23f73303c068a4b6c3ef4117ad67958cb31e41f836a9f59f2ce1bc52c23605e34399afcf1 SHA512 16f8f4766932bb54e4740cfdb4f0802f76246c0bf88c1d76c69c115949b124b625d8c3b85d8947073c2e9544f425aa16c10f71fabe3c03d29e424c47fe4ccdde +DIST redox_syscall-0.4.1.crate 24858 BLAKE2B c3301137a0b84e03b09d28dfa377ab3bea74d574a08cee21d35713b278d8b5b30ca2a1d73a0981baeb4644cbb88c86c8eb15ab3bb2692e38b93e6b35fab4e0da SHA512 073ed9d96090cf46eab9877742277a013c62d8da86d9caf2310b4fa868af306511936553579e01309f27067d344226cc8dc5e3aef01d9b900da2febd33848f8d DIST regex-1.9.5.crate 253883 BLAKE2B aeb05371251aaa0fd11dce1f22ea095345b3b1e68d9d5e083b4b8b0b938d0d901b3bade66015bec830db3ee71d0d2ccac09b842ff9919e08b0e98112ea1897be SHA512 79b921edc977dc98bd07e89dc17873c8a1088473ddf941504973259bb8c46ad11bbe3818fb88a7ed07b86841206c322a9555033d0a5dfebb18fcae45e07ea53e DIST regex-automata-0.1.10.crate 114533 BLAKE2B 0e357229f6825f14339b1d7c40730b83e62bba12115d01ed20313320766e769a653a2fcd2c9d19af51a82c38e9e42c1a31d005e1f44f5b6fbb3ead7c9c74027f SHA512 56d64da361afce82c6cb49e70b99ce1fca3e1969c54bba5f9971db135f8544c65f49feb8827789947b3d1dcefc9c49a7a434a7ffe0d09c5900345a1733723c5f DIST regex-automata-0.3.8.crate 610113 BLAKE2B 1aebbca26e76e85b42b035fa9ba02f98425b75fdeeec0f12c1c08e8f4a320c64d36c129c692e622256d7f8772052041c47df1aff165d8337d55d61770963a777 SHA512 47ad01be2c51fd510576e14f399b7f30d379a2cce2dbef3af4ee3e609859451082885132ae703c810e2b19bb3716976356e057a1a592ed507146aff9e7138dac @@ -176,7 +177,7 @@ DIST smallvec-1.11.0.crate 34680 BLAKE2B e54d56f6bbffbfa7ce5fe5f04e325b2e5cf19d2 DIST socket2-0.4.9.crate 45421 BLAKE2B 19c296b1b42839086793a29234f604a6c94ed1b9d30c4eb1ec695a76acfa266840f482e64b4ee2d5b4520f70849fbaf88984020ac25ec393918b89b2682d2541 SHA512 6cb2aabc409fc7d9942afc2073a36ad8730c06dcdab1866b9d3d72dc55afc643be6a2ca1f38c2e19fbfe782ae584512a1ab357c0f4974f98967a4f489e65331f DIST socket2-0.5.3.crate 52588 BLAKE2B 03692b67f27530670048db0920e26da4d95373a3aaa81ffe840b09e73a5730e2cec4fa43c25e63db0a6164c67d6fe555b0fcf1c9f7ce6a231d2972f5224a4d50 SHA512 63cb78d66b057587e4b3b50b9c618db1a202102c72b52b79c2e9f9a401dc1c28fe4523a0f6483b38ca8a3d24d1e2fca0b7176d96fef6ec1b922ae7c4afacc324 DIST spin-0.5.2.crate 12004 BLAKE2B d67d9156ca6dbcf4022711cce797cd423a4977115abac4cafaa507aa2e1071b637275637a20934d4d0d6d2bf82c98c74a4506720326d1804952aa0fd5fc4895c SHA512 fc57f7906da2b7a298c5f89215e881e8827b4d9f934dbf138338e0ee30122d8459483be566268fa374b41d63d8dbf65d42e0b322535ba35c827d7edb2176f267 -DIST sshx-0.2.3.tar.gz 368846 BLAKE2B 419b03741cb8e0ddfeef6a2de0ef0d1f6242cbabb59dbfd6c5b994178f34ef1b88722c01dd224d7dde058c04ff82549e4faba2f967df2b3bdce0434a4ede9500 SHA512 4b3d8455514e12efd6b0003c47e9d95a1ed53ee80e4d652af1c1cc1ca7d1a18aeb54b531d447d1ddf73f0cee2ce0ff67b7803d6a708a897ff36f62cd5bd6157e +DIST sshx-0.2.4.tar.gz 369414 BLAKE2B ce94864ac62b87c61f33cb77b216d2904524dae283ba1283dda56334f317b1fe3cbc150ebbb05dac451278b96d7fe26a38d76cc139d63ba6ca32fcefaf3f7d9f SHA512 e08745007f71802a5c3bf7d868607aa282e79d1661631a8fa6c2e9039e2187a33b074409c363782964b0ffa887feb4dca8c7537355645b405b0ee33a0ad51a4a DIST strsim-0.10.0.crate 11355 BLAKE2B bcb25ad0a7284e24e4f17ebe0ccb621bdc4118e499b50b094d98aa7e8fcc0b96716c9953c3516ce7ea78309d41d424892ded595259696a5bbffdcb07802b5c2f SHA512 78b318532addfcf5c1ccc1e14539e258aab9d3cd893cc45d82342549bde838c177d90f13c560671f8f32929af47d0b467db35e6876bd7697d8b3f9e055aeeac1 DIST subtle-2.5.0.crate 13909 BLAKE2B 660c3a472ca54c9843ce3feea74b802e27fd7f62dd37a30e2a4ba82e4b3a71df63562e8865d5fc675d31d0900998a8730503f91a61450884446a3bdd6af0041b SHA512 f150b1e2037554f8cd3213a54ddbc258f8f670cc4f39e7084cdea4b47538dbc58b834bc93b443d58a4b9087224efc003234042aaf366687dbd32b1e7174082a0 DIST syn-2.0.31.crate 242369 BLAKE2B 5bdd346c0dcc8eea96b3c10dcf6e713e7fb3508a21d1d98f3e0cbecd01558c91d54c816bd0f75725cc8b3f071bed105583bba57ce0abf4fea2d05d8029f19393 SHA512 0bee1285083c5eb97eac82d170924d95e782d4a7fef1381160b449f66c9513b7ba434ea6f77fd67068c6b6a2810ebd44ad03506f0f0692f43237d7eebac34efd @@ -221,6 +222,7 @@ DIST valuable-0.1.0.crate 27718 BLAKE2B ef5ded994c9a6dd302bed27f0d757447b0c86dfe DIST version_check-0.9.4.crate 14895 BLAKE2B fa1fa4008af165bfc1fdbe560488afd9d232cfafee94104fbcc4cbc52f234849bff9ddfa88109a1ac682f6d9c1d86b0459893d223f64e65adc08966aaf93dc89 SHA512 b172dc9a3759a4a683ffc39b9a40b03b9974b626a088217de87090466cef695226557c226cf3e469b2b25ee7297b7eb0d7719878cab42457f80146a81943c0c8 DIST want-0.3.1.crate 6398 BLAKE2B bcc1384bbb86db27b5e082b29a8dd4d89c37b40f6cdec4df8a86c8d205b418468b6cd42a78bd14ebaba057b28e151c00b474c098d7596f49a823ce33510c13b9 SHA512 f93f765113f035e134b967e8eb3f4511b8e03e793a47899b614d826afac02348fc02865c298a10410ecec4eb64f35f66c22bcbdbe36ed0c4c1665dca1db4d526 DIST wasi-0.11.0+wasi-snapshot-preview1.crate 28131 BLAKE2B fe501889f25d65e2d032f885cc50c4f8bf7dd70fd5cbc438de349838370d8699e9627b0a4fc76030ea9fe6d508f41d0c9928a875fdbc47e73bfb17241cf7b155 SHA512 043500ab28cd9cb779475255da5d109ebab7fccca72b64873dc28d77bc5a157ba8d96b9e8f05223b5b36c7089bb7b4ba87657fc69bac16b78972f897294a865f +DIST wasite-0.1.0.crate 2346 BLAKE2B a5a03d04135e3e32354d298386f132f9aa3b5c3806186f0c1eb75138038001d07f3bb5a3c6f8f938c9bba7c84b97b06b5304be3c9f86255d2d00f46a134ccd3e SHA512 06be2f7a2d289136740cc7b9ef9c4addbbf85210312759a7c99f977aa52285e2c3e4e3dade82d454a266ae42aaeeda7e767140b0bcdc1208ecc86aa18afc1384 DIST wasm-bindgen-0.2.87.crate 175052 BLAKE2B bf8cf4aa1786ac5c2ba76e80500b5c54313adf9690ef370e60b894401bd1b81416da7bb46b90c014412c96f30f995bd1e52cf7f3a6be1111aea40866e8178396 SHA512 0c3099155ef079d2b91d2d5b135243d687bf865cdd9ae9d97d8cc2eb4c9bf7439b66b28d5b1d7e95048e53be63ed4909b6b3f2427951348de25ca7abb7a03705 DIST wasm-bindgen-backend-0.2.87.crate 26821 BLAKE2B e230aa256a1f681ab3ffd2c83c3f6a810c305bb79a5e1d806b8b2b9f54ef0babc83809f6153b9ca511faa4b122f80bd1cc9eb97e7ae3cb4cba9e2dc1c6bd0b51 SHA512 317ee2bdf85067cb7f4b4ed6ff475ff9e5063143e9b7c8a28572211c09025935815227c4afa8c92823ac92102562d4d34531aa4891d8c922048d37e27377ee94 DIST wasm-bindgen-futures-0.4.37.crate 15193 BLAKE2B 06844bb1ef1b492461e245ac16ed13024c7f3acedd0355aeab11b8e8f32d8b607c5642ac5a41432e72a7d3fc84b6c842929a6609b8e77d7482e273a561506ef8 SHA512 144d321ac7c9f55d94e8a0a6803c2994be763141a757f33c27513fac45b0193d4e4429c899bf1fad25039d56054a0fa381f0171df09c06260532cb06d5407448 @@ -231,6 +233,7 @@ DIST web-sys-0.3.64.crate 725584 BLAKE2B f650eecc22ca53b75fff06c4117439d8fe9efa4 DIST webpki-roots-0.23.1.crate 245626 BLAKE2B 06937586fd4c34f4d2ec6f1bd0318b282cb98eddf52c2408d74cd677a343fc9ae1b17091f703a82b2b99605fb1e44a29a8339cf9a7a4509ad6ea1dd7deeef0ad SHA512 0fc144a385c92cc641f8683e935ccc3c30678404094f75b1b4396adbdaa40a2a758cc196c3df6f550a3e617bc780bf5d1448b752a3a1cd626605e28dbf307fb6 DIST webpki-roots-0.25.2.crate 250405 BLAKE2B e603f95c1d05a7191b00abff160f52063945ca7cb8159b40da3b6934703ac5cdd5a2ffc36a6437e62c9bcba871331bdd32e2cab606b56617027bce8f66722c10 SHA512 7988580df398bad3d62e6ce9d19afc9af7c7ad9d374533c2c67fccce930243a2712c667da9bf02a7624e88dfb94cd5ea04fcf58eda006976ca27e5c87fcb1002 DIST which-4.4.2.crate 15953 BLAKE2B 40ca22cd2f625cb035a1d919ed457a300b482c7751dcee4441974c53d56ce13f1f502535e1f7c0746a01981f4de2e2f761c3a255902d6353db1a4c3c62637448 SHA512 2d12aa1d4c2dbc140e39c8f15bd4ee1eeb8e8de71bcdf579479ef4be860fb0839eaf4cdb818addba242d50420f6e08acaf2bfc979a889e092c83644819246fd5 +DIST whoami-1.5.1.crate 24026 BLAKE2B 50a438f171c220aa19a4db7bb1a2ba6871f02bd47fe98e3d66bdf7662ea096a6bb612459b47178bc3aae85d1b58457a1ce5143a1176b23433b6cc4fa1da1c2c2 SHA512 b2cf3e2b8d1a12590055c3bb69c4a11448c846b837e44fb0041f030c31d6faa9ee55830a3fb07915adb8767936c06c7447718a4de46f3eda7ecc0f53a8140804 DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513 diff --git a/net-misc/sshx/sshx-0.2.3.ebuild b/net-misc/sshx/sshx-0.2.4.ebuild similarity index 99% rename from net-misc/sshx/sshx-0.2.3.ebuild rename to net-misc/sshx/sshx-0.2.4.ebuild index 335c4d6481..cfd669ce0b 100644 --- a/net-misc/sshx/sshx-0.2.3.ebuild +++ b/net-misc/sshx/sshx-0.2.4.ebuild @@ -148,6 +148,7 @@ CRATES=" rand_core@0.6.4 redis@0.23.3 redox_syscall@0.3.5 + redox_syscall@0.4.1 regex-automata@0.1.10 regex-automata@0.3.8 regex-syntax@0.6.29 @@ -228,6 +229,7 @@ CRATES=" version_check@0.9.4 want@0.3.1 wasi@0.11.0+wasi-snapshot-preview1 + wasite@0.1.0 wasm-bindgen-backend@0.2.87 wasm-bindgen-futures@0.4.37 wasm-bindgen-macro-support@0.2.87 @@ -238,6 +240,7 @@ CRATES=" webpki-roots@0.23.1 webpki-roots@0.25.2 which@4.4.2 + whoami@1.5.1 winapi-i686-pc-windows-gnu@0.4.0 winapi-x86_64-pc-windows-gnu@0.4.0 winapi@0.3.9 From 9f49332671334528f1805ff0836d22cf93073339 Mon Sep 17 00:00:00 2001 From: Xin Yang Date: Mon, 6 May 2024 08:57:30 +0800 Subject: [PATCH 9/9] net-vpn/candy: add 5.8, drop 5.6; libcandy removed by upstream Signed-off-by: Xin Yang Closes: https://github.com/gentoo/guru/pull/182 Signed-off-by: David Roman --- net-vpn/candy/Manifest | 2 +- net-vpn/candy/{candy-5.6.ebuild => candy-5.8.ebuild} | 8 -------- net-vpn/candy/metadata.xml | 3 --- 3 files changed, 1 insertion(+), 12 deletions(-) rename net-vpn/candy/{candy-5.6.ebuild => candy-5.8.ebuild} (84%) diff --git a/net-vpn/candy/Manifest b/net-vpn/candy/Manifest index 8af88aa010..6b908c6c58 100644 --- a/net-vpn/candy/Manifest +++ b/net-vpn/candy/Manifest @@ -1 +1 @@ -DIST candy-5.6.tar.gz 50318 BLAKE2B 3347af11fbc22af0f4c0d2b77804cf9882ccb8473d40208da808bba82895c239461dfa0098788a01b900495dddae5293baefa4b646dc8ef5ca04215aaa4bc6e3 SHA512 a50292b60eb7125e5b2e6802a0e02fe88b1da3a2a1c9503b95f95833edc5565589d0cdfe08ac09e07d0d6d62e0b8ba8bb80da027cd023a768f2841826d70d86e +DIST candy-5.8.tar.gz 50886 BLAKE2B 37b843b1c0827261e5a885555a1aeb8b74245934b426bf8beaa9a0f35c188049385ff65572cfa757180d0abe879a7baf4d356a2c492159bf4fef7724bc195074 SHA512 316257e80e235db92092ebef150597fa6b7f162c71c2140e001a1c0675af816c2d6e8c03815ae4f7f71d6233dc97a089d25a614b78d99cc8949355b3b99e00e1 diff --git a/net-vpn/candy/candy-5.6.ebuild b/net-vpn/candy/candy-5.8.ebuild similarity index 84% rename from net-vpn/candy/candy-5.6.ebuild rename to net-vpn/candy/candy-5.8.ebuild index 250e9d667e..e9317cc7e9 100644 --- a/net-vpn/candy/candy-5.6.ebuild +++ b/net-vpn/candy/candy-5.8.ebuild @@ -12,7 +12,6 @@ SRC_URI="https://github.com/lanthora/candy/archive/refs/tags/v${PV}.tar.gz -> ${ LICENSE="MIT" SLOT="0" KEYWORDS="~amd64" -IUSE="+libcandy" DEPEND=" dev-libs/uriparser @@ -23,13 +22,6 @@ DEPEND=" " RDEPEND="${DEPEND}" -src_configure(){ - local mycmakeargs=( - -DCANDY_DEVEL=$(usex libcandy true false) - ) - cmake_src_configure -} - src_install(){ cmake_src_install default diff --git a/net-vpn/candy/metadata.xml b/net-vpn/candy/metadata.xml index 75b80f1ece..67deff1aff 100644 --- a/net-vpn/candy/metadata.xml +++ b/net-vpn/candy/metadata.xml @@ -5,9 +5,6 @@ yangmame@icloud.com Xin Yang - - Install development libraries and header files for candy - lanthora/candy