From 4d461beb17e2237a8d31401bf8aae0e613dad9cf Mon Sep 17 00:00:00 2001 From: Paul Zander Date: Sun, 5 May 2024 15:58:13 +0200 Subject: [PATCH 01/12] dev-debug/lldb-mi: new package Used by dev-util/kdevelop. Bug: https://bugs.gentoo.org/730304 Signed-off-by: Paul Zander --- dev-debug/lldb-mi/Manifest | 1 + .../lldb-mi-0.0.1-find_packages_GTest.patch | 37 +++++++++++++ dev-debug/lldb-mi/lldb-mi-0.0.1.ebuild | 52 +++++++++++++++++++ dev-debug/lldb-mi/lldb-mi-9999.ebuild | 52 +++++++++++++++++++ dev-debug/lldb-mi/metadata.xml | 10 ++++ 5 files changed, 152 insertions(+) create mode 100644 dev-debug/lldb-mi/Manifest create mode 100644 dev-debug/lldb-mi/files/lldb-mi-0.0.1-find_packages_GTest.patch create mode 100644 dev-debug/lldb-mi/lldb-mi-0.0.1.ebuild create mode 100644 dev-debug/lldb-mi/lldb-mi-9999.ebuild create mode 100644 dev-debug/lldb-mi/metadata.xml diff --git a/dev-debug/lldb-mi/Manifest b/dev-debug/lldb-mi/Manifest new file mode 100644 index 0000000000..aad3f02c3a --- /dev/null +++ b/dev-debug/lldb-mi/Manifest @@ -0,0 +1 @@ +DIST lldb-mi-0.0.1.tar.gz 190715 BLAKE2B c658f8a6943d0cc165dbdc5f4acb38081d0b1fc4a213795cb948a934be6558ad3dfb38a1d20611b60d9396aba23337f665839615c26a5029ddf48c977a12add8 SHA512 33488d254cd294f7f565f2c571ed399d63189f26f1d0567bf3a0a8a44bbb20a9e0690b190d3409a8678ecf237e33ff4dacd1c80ea671a3931b50ab91d690b147 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 new file mode 100644 index 0000000000..8a5d5a7732 --- /dev/null +++ b/dev-debug/lldb-mi/files/lldb-mi-0.0.1-find_packages_GTest.patch @@ -0,0 +1,37 @@ +diff --git a/test/unittests/CMakeLists.txt b/test/unittests/CMakeLists.txt +index 4d07cdb..976b8e5 100644 +--- a/test/unittests/CMakeLists.txt ++++ b/test/unittests/CMakeLists.txt +@@ -1,10 +1,7 @@ + cmake_minimum_required(VERSION 3.11) + +-include(FetchContent) +-FetchContent_Declare(gtest +- QUIET +- URL https://github.com/google/googletest/archive/refs/tags/release-1.11.0.zip +-) ++enable_testing() ++find_package(GTest REQUIRED) + + # Prevent overriding the parent project's linker settings, for Windows. + set(gtest_force_shared_crt ON CACHE BOOL "" FORCE) +@@ -15,10 +12,6 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "Clang") + add_compile_options("-Wno-error=covered-switch-default") + endif() + +-FetchContent_MakeAvailable(gtest) +- +-include(GoogleTest) +- + include_directories(../../src) + + set(UNITTESTS_ROOT ${CMAKE_CURRENT_LIST_DIR}) +@@ -39,7 +32,7 @@ function(add_lldb_mi_test NAME TEST) + endforeach(SRC) + + add_executable(${NAME} ${TEST} ${SOURCES_RELATIVE}) +- target_link_libraries(${NAME} gtest_main) ++ target_link_libraries(${NAME} GTest::gtest GTest::gtest_main) + set_target_properties(${NAME} PROPERTIES FOLDER "unittests") + + gtest_discover_tests(${NAME}) diff --git a/dev-debug/lldb-mi/lldb-mi-0.0.1.ebuild b/dev-debug/lldb-mi/lldb-mi-0.0.1.ebuild new file mode 100644 index 0000000000..5dc5173bbf --- /dev/null +++ b/dev-debug/lldb-mi/lldb-mi-0.0.1.ebuild @@ -0,0 +1,52 @@ +# Copyright 2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LLVM_COMPAT=( {15..19} ) + +inherit cmake llvm-r1 + +DESCRIPTION="LLDB Machine Interface Driver" +HOMEPAGE="https://github.com/lldb-tools/lldb-mi" + +if [[ ${PV} = 9999* ]]; then + EGIT_REPO_URI="https://github.com/lldb-tools/lldb-mi.git" + EGIT_BRANCH="main" + inherit git-r3 +else + SRC_URI=" + https://github.com/lldb-tools/lldb-mi/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz + " + KEYWORDS="~amd64 ~x86" +fi + +LICENSE="Apache-2.0-with-LLVM-exceptions" +SLOT="0" + +IUSE="test" + +RESTRICT="!test? ( test )" + +RDEPEND=" + dev-debug/lldb:= + $(llvm_gen_dep ' + sys-devel/llvm:${LLVM_SLOT} + ') +" +DEPEND="${RDEPEND} + test? ( + dev-cpp/gtest + ) +" + +PATCHES=( + "${FILESDIR}/${PN}-0.0.1-find_packages_GTest.patch" +) + +src_configure() { + local mycmakeargs=( + -DINCLUDE_TESTS="$(usex test)" + ) + cmake_src_configure +} diff --git a/dev-debug/lldb-mi/lldb-mi-9999.ebuild b/dev-debug/lldb-mi/lldb-mi-9999.ebuild new file mode 100644 index 0000000000..5dc5173bbf --- /dev/null +++ b/dev-debug/lldb-mi/lldb-mi-9999.ebuild @@ -0,0 +1,52 @@ +# Copyright 2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LLVM_COMPAT=( {15..19} ) + +inherit cmake llvm-r1 + +DESCRIPTION="LLDB Machine Interface Driver" +HOMEPAGE="https://github.com/lldb-tools/lldb-mi" + +if [[ ${PV} = 9999* ]]; then + EGIT_REPO_URI="https://github.com/lldb-tools/lldb-mi.git" + EGIT_BRANCH="main" + inherit git-r3 +else + SRC_URI=" + https://github.com/lldb-tools/lldb-mi/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz + " + KEYWORDS="~amd64 ~x86" +fi + +LICENSE="Apache-2.0-with-LLVM-exceptions" +SLOT="0" + +IUSE="test" + +RESTRICT="!test? ( test )" + +RDEPEND=" + dev-debug/lldb:= + $(llvm_gen_dep ' + sys-devel/llvm:${LLVM_SLOT} + ') +" +DEPEND="${RDEPEND} + test? ( + dev-cpp/gtest + ) +" + +PATCHES=( + "${FILESDIR}/${PN}-0.0.1-find_packages_GTest.patch" +) + +src_configure() { + local mycmakeargs=( + -DINCLUDE_TESTS="$(usex test)" + ) + cmake_src_configure +} diff --git a/dev-debug/lldb-mi/metadata.xml b/dev-debug/lldb-mi/metadata.xml new file mode 100644 index 0000000000..33dba739e4 --- /dev/null +++ b/dev-debug/lldb-mi/metadata.xml @@ -0,0 +1,10 @@ + + + + + negril.nx+gentoo@gmail.com + + + lldb-tools/lldb-mi + + From 227cf753c9505f201e83a144c1a243adedd407b9 Mon Sep 17 00:00:00 2001 From: Sergey Torokhov Date: Sun, 5 May 2024 17:48:16 +0300 Subject: [PATCH 02/12] x11-libs/gtk-fortran: drop old 4.3.0, 4.4.0 Signed-off-by: Sergey Torokhov --- x11-libs/gtk-fortran/Manifest | 2 - x11-libs/gtk-fortran/gtk-fortran-4.3.0.ebuild | 71 ------------------- x11-libs/gtk-fortran/gtk-fortran-4.4.0.ebuild | 71 ------------------- 3 files changed, 144 deletions(-) delete mode 100644 x11-libs/gtk-fortran/gtk-fortran-4.3.0.ebuild delete mode 100644 x11-libs/gtk-fortran/gtk-fortran-4.4.0.ebuild diff --git a/x11-libs/gtk-fortran/Manifest b/x11-libs/gtk-fortran/Manifest index dd71f485fc..b8ae265fa1 100644 --- a/x11-libs/gtk-fortran/Manifest +++ b/x11-libs/gtk-fortran/Manifest @@ -1,4 +1,2 @@ DIST gtk-fortran-3.24.31.tar.gz 4287676 BLAKE2B 9fe3f83158ea504d492978ddd0b3a6d4aad5f5325df7c6ebbeb6d11ecb48d1097ee3c7b213c8824a5e4adb15da9af1da64c72b9089746dd0bb5d1d91dc76c766 SHA512 3d1a62837f4750b5c284a1548ede0ecfe8ad2f2619ca7ee2eb75e4cb7fcc739de90d67ff61d406b1f13fe0a2a9f1e23a1baa50afdc8caaaf1b3866e5640cb3f1 -DIST gtk-fortran-4.3.0.tar.gz 4270611 BLAKE2B 6ba22a45864dda40b14ab443fd3025f320e887c5d00158d790b5fcb6c6f4c5c74dca2ad5d147f931d459ab610102222c5440e668f623fc6ec88a590ccb83ff32 SHA512 0bd957c02956f74452c52a5e0fe9eadda997b88241fa69e6ee50ef58bd0d6156d73c9db49ff4eef384ff9b9a7e1824cfb26016e4d912002a7f3f92c69508369c -DIST gtk-fortran-4.4.0.tar.gz 4442859 BLAKE2B de24779cc457d92fdcc5e7cc3e37dc3dd9f557b799e4186e6e03b1c39ce3520d3cc0896817810936644839491a9b0886ed77b60ba22cc30f1b31c4d66adcfe23 SHA512 c597875fe6163e82348b5464ad08fb11bfc9c4e64d04b49d47ccd9ef58ba0771db1ea201f1fc6265967b1689e29bc3bec1f089032b5111148ebe07a88a5f3c1b DIST gtk-fortran-4.4.1.tar.gz 4443829 BLAKE2B 23a03649943f30dcf25002168deb3e9b5be018574cba3bcff393d2439a9ca2aabb4c8461481d66280c9a6629c0b6d084e1bc8c18abf76b6a4340da9a6031ec7d SHA512 4ea107f3040536fe44d479045005dda96c51f0c7aebaf09153890a511947ef66979d7a61d37b6b9d1e743195b1d09c8b1e4ed3a33334001ac26c04453e15c345 diff --git a/x11-libs/gtk-fortran/gtk-fortran-4.3.0.ebuild b/x11-libs/gtk-fortran/gtk-fortran-4.3.0.ebuild deleted file mode 100644 index 01663bcd6d..0000000000 --- a/x11-libs/gtk-fortran/gtk-fortran-4.3.0.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -CMAKE_MAKEFILE_GENERATOR="emake" -FORTRAN_STANDARD=2003 -VIRTUALX_REQUIRED="test" - -inherit cmake fortran-2 virtualx - -DESCRIPTION="A GTK+ binding to build Graphical User Interfaces in Fortran" -HOMEPAGE="https://github.com/vmagnin/gtk-fortran" -SRC_URI="https://github.com/vmagnin/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="4" -KEYWORDS="~amd64 ~x86" - -IUSE="examples high-level plplot static-libs test" -REQUIRED_USE="plplot? ( high-level )" -RESTRICT="!test? ( test )" - -RDEPEND=" - gui-libs/gtk:4 - plplot? ( >=sci-libs/plplot-5.15.0[cairo,fortran] ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - virtual/fortran - virtual/pkgconfig -" - -DOCS=( "README.md" "README-high-level.md" "CHANGELOG.md" ) - -pkg_setup() { - fortran-2_pkg_setup -} - -src_prepare() { - default - # Fix library installation path, disable 'sketcher' build, pass LDFLAGS - sed -i -e "s:CMAKE_INSTALL_LIBDIR lib:CMAKE_INSTALL_LIBDIR $(get_libdir):" \ - -e "s: add_subdirectory(sketcher)::" \ - -e 's:"-rdynamic":"-rdynamic '"${LDFLAGS}"'":' CMakeLists.txt || die - - cmake_src_prepare -} - -src_configure() { - mycmakeargs+=( - -DEXCLUDE_PLPLOT=$(usex plplot false true) - -DNO_BUILD_HL=$(usex high-level false true) - -DINSTALL_EXAMPLES=$(usex examples) - -DNO_BUILD_EXAMPLES=true - ) - cmake_src_configure -} - -src_test() { - virtx cmake_src_test -} - -src_install() { - cmake_src_install - - # Remove static library here as it's used to build additional tools - if use !static-libs ; then - rm "${ED}/usr/$(get_libdir)/libgtk-${SLOT}-fortran.a" || die - fi -} diff --git a/x11-libs/gtk-fortran/gtk-fortran-4.4.0.ebuild b/x11-libs/gtk-fortran/gtk-fortran-4.4.0.ebuild deleted file mode 100644 index 7a016cdfc7..0000000000 --- a/x11-libs/gtk-fortran/gtk-fortran-4.4.0.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -CMAKE_MAKEFILE_GENERATOR="emake" -FORTRAN_STANDARD=2003 -VIRTUALX_REQUIRED="test" - -inherit cmake fortran-2 virtualx - -DESCRIPTION="A GTK+ binding to build Graphical User Interfaces in Fortran" -HOMEPAGE="https://github.com/vmagnin/gtk-fortran" -SRC_URI="https://github.com/vmagnin/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="4" -KEYWORDS="~amd64 ~x86" - -IUSE="examples high-level plplot static-libs test" -REQUIRED_USE="plplot? ( high-level )" -RESTRICT="!test? ( test )" - -RDEPEND=" - gui-libs/gtk:4 - plplot? ( >=sci-libs/plplot-5.15.0[cairo,fortran] ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - virtual/fortran - virtual/pkgconfig -" - -DOCS=( "README.md" "README-high-level.md" "CHANGELOG.md" ) - -pkg_setup() { - fortran-2_pkg_setup -} - -src_prepare() { - default - # Fix library installation path, disable 'sketcher' build, pass LDFLAGS - sed -i -e "s:CMAKE_INSTALL_LIBDIR lib:CMAKE_INSTALL_LIBDIR $(get_libdir):" \ - -e "s: add_subdirectory(sketcher)::" \ - -e 's:"-rdynamic":"-rdynamic '"${LDFLAGS}"'":' CMakeLists.txt || die - - cmake_src_prepare -} - -src_configure() { - mycmakeargs+=( - -DEXCLUDE_PLPLOT=$(usex plplot false true) - -DNO_BUILD_HL=$(usex high-level false true) - -DINSTALL_EXAMPLES=$(usex examples) - -DNO_BUILD_EXAMPLES=true - ) - cmake_src_configure -} - -src_test() { - virtx cmake_src_test -} - -src_install() { - cmake_src_install - - # Remove static library here as it's used to build additional tools - if use !static-libs ; then - rm "${ED}/usr/$(get_libdir)/libgtk-${SLOT}-fortran.a" || die - fi -} From d43712eb2aa69cf1085ca185109df832141e0913 Mon Sep 17 00:00:00 2001 From: Sergey Torokhov Date: Sun, 5 May 2024 17:50:53 +0300 Subject: [PATCH 03/12] x11-libs/gtk-fortran: 4.5.0 version bump Signed-off-by: Sergey Torokhov --- x11-libs/gtk-fortran/Manifest | 1 + x11-libs/gtk-fortran/gtk-fortran-4.5.0.ebuild | 71 +++++++++++++++++++ 2 files changed, 72 insertions(+) create mode 100644 x11-libs/gtk-fortran/gtk-fortran-4.5.0.ebuild diff --git a/x11-libs/gtk-fortran/Manifest b/x11-libs/gtk-fortran/Manifest index b8ae265fa1..4f59aa219c 100644 --- a/x11-libs/gtk-fortran/Manifest +++ b/x11-libs/gtk-fortran/Manifest @@ -1,2 +1,3 @@ DIST gtk-fortran-3.24.31.tar.gz 4287676 BLAKE2B 9fe3f83158ea504d492978ddd0b3a6d4aad5f5325df7c6ebbeb6d11ecb48d1097ee3c7b213c8824a5e4adb15da9af1da64c72b9089746dd0bb5d1d91dc76c766 SHA512 3d1a62837f4750b5c284a1548ede0ecfe8ad2f2619ca7ee2eb75e4cb7fcc739de90d67ff61d406b1f13fe0a2a9f1e23a1baa50afdc8caaaf1b3866e5640cb3f1 DIST gtk-fortran-4.4.1.tar.gz 4443829 BLAKE2B 23a03649943f30dcf25002168deb3e9b5be018574cba3bcff393d2439a9ca2aabb4c8461481d66280c9a6629c0b6d084e1bc8c18abf76b6a4340da9a6031ec7d SHA512 4ea107f3040536fe44d479045005dda96c51f0c7aebaf09153890a511947ef66979d7a61d37b6b9d1e743195b1d09c8b1e4ed3a33334001ac26c04453e15c345 +DIST gtk-fortran-4.5.0.tar.gz 4450701 BLAKE2B af34b2ce5b9d91dd61121580dd1ec84e29411269f131fc6df4b95012fae30555a8d08bf147e07ad459bba11c5b3b92fd6d3925f92a318ca47822e86ad2a57b29 SHA512 2fa0957c6367fbcc29050a540700e975ca9356530047c229b6302cf3017d352dce57f4f06fcc52471fce9d7ffdc260ff7ee1cf662e6f2cc029245010d6e9084a diff --git a/x11-libs/gtk-fortran/gtk-fortran-4.5.0.ebuild b/x11-libs/gtk-fortran/gtk-fortran-4.5.0.ebuild new file mode 100644 index 0000000000..a1b763fb8f --- /dev/null +++ b/x11-libs/gtk-fortran/gtk-fortran-4.5.0.ebuild @@ -0,0 +1,71 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +CMAKE_MAKEFILE_GENERATOR="emake" +FORTRAN_STANDARD=2003 +VIRTUALX_REQUIRED="test" + +inherit cmake fortran-2 virtualx + +DESCRIPTION="A GTK+ binding to build Graphical User Interfaces in Fortran" +HOMEPAGE="https://github.com/vmagnin/gtk-fortran" +SRC_URI="https://github.com/vmagnin/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="4" +KEYWORDS="~amd64 ~x86" + +IUSE="examples high-level plplot static-libs test" +REQUIRED_USE="plplot? ( high-level )" +RESTRICT="!test? ( test )" + +RDEPEND=" + gui-libs/gtk:4 + plplot? ( >=sci-libs/plplot-5.15.0[cairo,fortran] ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + virtual/fortran + virtual/pkgconfig +" + +DOCS=( "README.md" "README-high-level.md" "CHANGELOG.md" ) + +pkg_setup() { + fortran-2_pkg_setup +} + +src_prepare() { + default + # Fix library installation path, disable 'sketcher' build, pass LDFLAGS + sed -i -e "s:CMAKE_INSTALL_LIBDIR lib:CMAKE_INSTALL_LIBDIR $(get_libdir):" \ + -e "s: add_subdirectory(sketcher)::" \ + -e 's:"-rdynamic":"-rdynamic '"${LDFLAGS}"'":' CMakeLists.txt || die + + cmake_src_prepare +} + +src_configure() { + mycmakeargs+=( + -DEXCLUDE_PLPLOT=$(usex plplot false true) + -DNO_BUILD_HL=$(usex high-level false true) + -DINSTALL_EXAMPLES=$(usex examples) + -DNO_BUILD_EXAMPLES=true + ) + cmake_src_configure +} + +src_test() { + virtx cmake_src_test +} + +src_install() { + cmake_src_install + + # Remove static library here as it's used to build additional tools + if use !static-libs ; then + rm "${ED}/usr/$(get_libdir)/libgtk-${SLOT}-fortran.a" || die + fi +} From abe2f26c921004879121f87521dc992bef5b3451 Mon Sep 17 00:00:00 2001 From: Sergey Torokhov Date: Sun, 5 May 2024 17:51:38 +0300 Subject: [PATCH 04/12] x11-libs/gtk-fortran: 4.6.0 version bump Signed-off-by: Sergey Torokhov --- x11-libs/gtk-fortran/Manifest | 1 + x11-libs/gtk-fortran/gtk-fortran-4.6.0.ebuild | 71 +++++++++++++++++++ 2 files changed, 72 insertions(+) create mode 100644 x11-libs/gtk-fortran/gtk-fortran-4.6.0.ebuild diff --git a/x11-libs/gtk-fortran/Manifest b/x11-libs/gtk-fortran/Manifest index 4f59aa219c..4fa033d11a 100644 --- a/x11-libs/gtk-fortran/Manifest +++ b/x11-libs/gtk-fortran/Manifest @@ -1,3 +1,4 @@ DIST gtk-fortran-3.24.31.tar.gz 4287676 BLAKE2B 9fe3f83158ea504d492978ddd0b3a6d4aad5f5325df7c6ebbeb6d11ecb48d1097ee3c7b213c8824a5e4adb15da9af1da64c72b9089746dd0bb5d1d91dc76c766 SHA512 3d1a62837f4750b5c284a1548ede0ecfe8ad2f2619ca7ee2eb75e4cb7fcc739de90d67ff61d406b1f13fe0a2a9f1e23a1baa50afdc8caaaf1b3866e5640cb3f1 DIST gtk-fortran-4.4.1.tar.gz 4443829 BLAKE2B 23a03649943f30dcf25002168deb3e9b5be018574cba3bcff393d2439a9ca2aabb4c8461481d66280c9a6629c0b6d084e1bc8c18abf76b6a4340da9a6031ec7d SHA512 4ea107f3040536fe44d479045005dda96c51f0c7aebaf09153890a511947ef66979d7a61d37b6b9d1e743195b1d09c8b1e4ed3a33334001ac26c04453e15c345 DIST gtk-fortran-4.5.0.tar.gz 4450701 BLAKE2B af34b2ce5b9d91dd61121580dd1ec84e29411269f131fc6df4b95012fae30555a8d08bf147e07ad459bba11c5b3b92fd6d3925f92a318ca47822e86ad2a57b29 SHA512 2fa0957c6367fbcc29050a540700e975ca9356530047c229b6302cf3017d352dce57f4f06fcc52471fce9d7ffdc260ff7ee1cf662e6f2cc029245010d6e9084a +DIST gtk-fortran-4.6.0.tar.gz 4697411 BLAKE2B c72b00407979e40e77ebd622d019e872d17c1e42b77b085556e283c203b89b25fc02a516bfe5785891ae39c757c562d2ead18df8d71a795f9472fbca840dde7b SHA512 64d33fccb2867ef56ff9cbf4cf407b82f862e0c4bb7fb4dbdbaa0fd5d77bfcbee787f5030f62016687cf83e067c1dd4d8f25fef2e77c23d3b67f80ff8cbf0103 diff --git a/x11-libs/gtk-fortran/gtk-fortran-4.6.0.ebuild b/x11-libs/gtk-fortran/gtk-fortran-4.6.0.ebuild new file mode 100644 index 0000000000..a1b763fb8f --- /dev/null +++ b/x11-libs/gtk-fortran/gtk-fortran-4.6.0.ebuild @@ -0,0 +1,71 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +CMAKE_MAKEFILE_GENERATOR="emake" +FORTRAN_STANDARD=2003 +VIRTUALX_REQUIRED="test" + +inherit cmake fortran-2 virtualx + +DESCRIPTION="A GTK+ binding to build Graphical User Interfaces in Fortran" +HOMEPAGE="https://github.com/vmagnin/gtk-fortran" +SRC_URI="https://github.com/vmagnin/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="4" +KEYWORDS="~amd64 ~x86" + +IUSE="examples high-level plplot static-libs test" +REQUIRED_USE="plplot? ( high-level )" +RESTRICT="!test? ( test )" + +RDEPEND=" + gui-libs/gtk:4 + plplot? ( >=sci-libs/plplot-5.15.0[cairo,fortran] ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + virtual/fortran + virtual/pkgconfig +" + +DOCS=( "README.md" "README-high-level.md" "CHANGELOG.md" ) + +pkg_setup() { + fortran-2_pkg_setup +} + +src_prepare() { + default + # Fix library installation path, disable 'sketcher' build, pass LDFLAGS + sed -i -e "s:CMAKE_INSTALL_LIBDIR lib:CMAKE_INSTALL_LIBDIR $(get_libdir):" \ + -e "s: add_subdirectory(sketcher)::" \ + -e 's:"-rdynamic":"-rdynamic '"${LDFLAGS}"'":' CMakeLists.txt || die + + cmake_src_prepare +} + +src_configure() { + mycmakeargs+=( + -DEXCLUDE_PLPLOT=$(usex plplot false true) + -DNO_BUILD_HL=$(usex high-level false true) + -DINSTALL_EXAMPLES=$(usex examples) + -DNO_BUILD_EXAMPLES=true + ) + cmake_src_configure +} + +src_test() { + virtx cmake_src_test +} + +src_install() { + cmake_src_install + + # Remove static library here as it's used to build additional tools + if use !static-libs ; then + rm "${ED}/usr/$(get_libdir)/libgtk-${SLOT}-fortran.a" || die + fi +} From 41dde7ea2fd1e15e8475009704b538888ef4df45 Mon Sep 17 00:00:00 2001 From: Sergey Torokhov Date: Sun, 5 May 2024 17:53:49 +0300 Subject: [PATCH 05/12] dev-util/eclipse-paralell-bin: drop old 4.27 Signed-off-by: Sergey Torokhov --- dev-util/eclipse-parallel-bin/Manifest | 2 - .../eclipse-parallel-bin-4.27.ebuild | 48 ------------------- 2 files changed, 50 deletions(-) delete mode 100644 dev-util/eclipse-parallel-bin/eclipse-parallel-bin-4.27.ebuild diff --git a/dev-util/eclipse-parallel-bin/Manifest b/dev-util/eclipse-parallel-bin/Manifest index fab48704d0..11487c49c5 100644 --- a/dev-util/eclipse-parallel-bin/Manifest +++ b/dev-util/eclipse-parallel-bin/Manifest @@ -1,4 +1,2 @@ -DIST eclipse-parallel-2023-03-R-linux-gtk-aarch64.tar.gz 453078962 BLAKE2B b5ccf1b8937c970c8db38b351412d46c63c893734ecdd9c02518f9e1d5925b4ff33cc5621161e831ced5d9762e635aa0323686f28792ace640426925704d9395 SHA512 733d5fe2c46fb083714964cf66091cdc52dbc30d763e22e0f6c4eb506b50e7ddc7c0ae33e3dfd4ab2a33b3e9e00513d8c5d826770afd940d02f540884eb37381 -DIST eclipse-parallel-2023-03-R-linux-gtk-x86_64.tar.gz 453309496 BLAKE2B 531776eb8ab0befbaf3bdef79e99d0c8db656e35452ea893c9b76405a538473abbe7a4f9161fd81b157d030404ea002e8146a61d98ea68f5893c4e467a48fa36 SHA512 8c7b5584a6b28a40269280e371a42dcaa8f12873d05506fab4a4f0c7a764f918b281ef7524c55cd2abfd9d2bdff49de0e9e8496a1ba811f6b9008f494f8601ad DIST eclipse-parallel-2023-06-R-linux-gtk-aarch64.tar.gz 475847442 BLAKE2B 5fddc8b30a4862fd92bb01ab4183194d19f5d9ffd3762d57e37c12ef373e92b0426d8691432a992d68d338bea0de9a24dc30e5c56de09ace2a42513d7ba8da63 SHA512 1cafc666fdbc9d2f90c35bffa7f798d60a8a9ef1a04444b93eef9619eee6d916a98685b0dc2f379351edacfd9f0710aa87c23067f4b8de52106b41fc473aefc6 DIST eclipse-parallel-2023-06-R-linux-gtk-x86_64.tar.gz 476084495 BLAKE2B 1cb769efa32b56f0f294dce3fd3dddc2c8c9259e53d836ae88f7ebf98d68337f9809faacc29db68a0b68e12d9a3b84df7dbb0715014b43201c64102499bd997c SHA512 43b86008840bf79aa092537d99da2e13596a346a6a098a4b67b89dbadeb1c2389b8384768ad1227b9d3d7713b27e814627354cc1142cbe8c8886ca6e3cc72624 diff --git a/dev-util/eclipse-parallel-bin/eclipse-parallel-bin-4.27.ebuild b/dev-util/eclipse-parallel-bin/eclipse-parallel-bin-4.27.ebuild deleted file mode 100644 index ed79a80180..0000000000 --- a/dev-util/eclipse-parallel-bin/eclipse-parallel-bin-4.27.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit desktop wrapper xdg - -MY_PN="eclipse" -MY_PV="2023-03" -SRC_BASE="https://www.eclipse.org/downloads/download.php?r=1&file=/technology/epp/downloads/release/${MY_PV}/R/eclipse-parallel-${MY_PV}-R-linux-gtk" - -DESCRIPTION="Eclipse IDE for Scientific Computing (C, C++, Fortran)" -HOMEPAGE="https://www.eclipse.org/" -SRC_URI=" - amd64? ( ${SRC_BASE}-x86_64.tar.gz ) - arm64? ( ${SRC_BASE}-aarch64.tar.gz ) -" - -S="${WORKDIR}/${MY_PN}" - -LICENSE="EPL-2.0" -SLOT="0" -KEYWORDS="-* ~amd64 ~arm64" -RESTRICT="mirror" - -RDEPEND=" - || ( - dev-java/openjdk:11 dev-java/openjdk:17 - dev-java/openjdk-bin:11 dev-java/openjdk-bin:17 - dev-java/openjdk-jre-bin:11 - ) - x11-libs/gtk+:3 -" - -QA_FLAGS_IGNORED=".*" - -src_install() { - insinto "/opt/${PN}" - doins -r "${S}/." - - exeinto "/opt/${PN}" - doexe "${S}/${MY_PN}" - make_wrapper ${PN%-*} "/opt/${PN}/${MY_PN} -vm /opt/openjdk*/bin/java" "" "/opt/${PN}" "/opt/bin" - - doicon -s 48 plugins/org.eclipse.platform_4.27.0.v20230302-0300/eclipse48.png - make_desktop_entry eclipse-parallel "Eclipse IDE Parallel ${MY_PV}" eclipse48 "Development;" \ - || die "Failed making desktop entry!" -} From 97a6a2508f8aa749c281edeb94b8ba8d3b1ee516 Mon Sep 17 00:00:00 2001 From: Theo Donacik Date: Sun, 5 May 2024 11:14:49 -0400 Subject: [PATCH 06/12] gui-wm/scenefx: new package, add 0.1 Signed-off-by: Theo Donacik --- gui-wm/scenefx/Manifest | 1 + gui-wm/scenefx/scenefx-0.1.ebuild | 86 +++++++++++++++++++++++++++++++ 2 files changed, 87 insertions(+) create mode 100644 gui-wm/scenefx/Manifest create mode 100644 gui-wm/scenefx/scenefx-0.1.ebuild diff --git a/gui-wm/scenefx/Manifest b/gui-wm/scenefx/Manifest new file mode 100644 index 0000000000..add0c70f53 --- /dev/null +++ b/gui-wm/scenefx/Manifest @@ -0,0 +1 @@ +DIST scenefx-0.1.tar.gz 107137 BLAKE2B 980ccc3040584f83e3c911975f194abb50e05474ab73e1fef8ca2884a1f4a89436ec8838931ce7e1a1ca4d4df2bf746c9141fef45baad9f602e1327a70ac6ba3 SHA512 6f145ff44c799e61501d63306e3df97bb8376a8cab12ff77cdd743de3784f65c584a297f056008d88e7cd514849a750662023ce53959b9d005a1417f3a5ca1dc diff --git a/gui-wm/scenefx/scenefx-0.1.ebuild b/gui-wm/scenefx/scenefx-0.1.ebuild new file mode 100644 index 0000000000..3af25dbdff --- /dev/null +++ b/gui-wm/scenefx/scenefx-0.1.ebuild @@ -0,0 +1,86 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU Public License v2 + +EAPI=8 + +inherit meson optfeature + +DESCRIPTION="A replacement for the wlroots scene API with eye-candy effects." +HOMEPAGE="https://github.com/wlrfx/scenefx" + +SRC_URI="https://github.com/wlrfx/scenefx/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN}-${PV}" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm64" +IUSE="examples liftoff +libinput +drm vulkan x11-backend xcb-errors X" +REQUIRED_USE=" + xcb-errors? ( || ( x11-backend X ) ) +" + +DEPEND=" + >=dev-libs/wayland-1.22.0 + >=x11-libs/libdrm-2.4.114 + media-libs/mesa[egl(+),gles2(+)] + >=x11-libs/pixman-0.42.0 + media-libs/libglvnd + x11-libs/libxkbcommon + drm? ( + media-libs/libdisplay-info + sys-apps/hwdata + liftoff? ( >=dev-libs/libliftoff-0.4 ) + ) + libinput? ( >=dev-libs/libinput-1.14.0:= ) + x11-backend? ( + x11-libs/libxcb:= + x11-libs/xcb-util-renderutil + ) + vulkan? ( + dev-util/glslang:= + dev-util/vulkan-headers + media-libs/vulkan-loader + ) + xcb-errors? ( x11-libs/xcb-util-errors ) + X? ( + x11-libs/libxcb:= + x11-libs/xcb-util-wm + x11-base/xwayland + ) +" +DEPEND+=" + >=gui-libs/wlroots-0.17:=[X?] + Date: Sun, 5 May 2024 11:21:20 -0400 Subject: [PATCH 07/12] gui-wm/swayfx: add 0.4 Signed-off-by: Theo Donacik --- gui-wm/swayfx/Manifest | 1 + gui-wm/swayfx/files/sway-portals.conf | 6 ++ gui-wm/swayfx/swayfx-0.4.ebuild | 93 +++++++++++++++++++++++++++ 3 files changed, 100 insertions(+) create mode 100644 gui-wm/swayfx/files/sway-portals.conf create mode 100644 gui-wm/swayfx/swayfx-0.4.ebuild diff --git a/gui-wm/swayfx/Manifest b/gui-wm/swayfx/Manifest index f48afef3e0..c3c1fd0744 100644 --- a/gui-wm/swayfx/Manifest +++ b/gui-wm/swayfx/Manifest @@ -1,3 +1,4 @@ DIST swayfx-0.2.tar.gz 5534158 BLAKE2B e01ac28ea24743d5fe937d953114c8316f3de27b7813f83cce0f6f76bf524f079357be810845791c4431db7e315f096411e6d7a0e2174673e4247d16e3e44bc1 SHA512 0884513a0851b19546f2cc647d8590c7d82494604028ed71b2e6fefbac7f3fff141be26e783ccc504b8da84bbed6c1e12a2194f0713c920e1cc34a6360ac318c DIST swayfx-0.3.2.tar.gz 5684837 BLAKE2B ffe2a5d4a756f30007fb65824471196b6c51034a4e205558a82f547211714be8b0ae03763f32203c9d99fab4d3d69320f2244975a7c279d813091b8629d0c20a SHA512 0cffa25fc4b4d40621b14d9dc430f1aa9956ad935124cfda7dd1a63cbf997f0d506922b1168c7ad13250fa909cc1328526818f75ec936aa8d6cc40152dfbb358 DIST swayfx-0.3.tar.gz 5746551 BLAKE2B 6455416f54d9e36d33f2f17146c3f2c41ff77a154fcb49f12906c5ba5b2ced3eecb9f052423ad5916885a9e6602160a404bd9fe351272c34cc5b375656b75604 SHA512 a6054d167c9d41a6e3fe9247683267c40ac55637a565649724fad0d7caf340d8aa51ab65767a7f8becc0480eced1eb42a5c851dfc5d815a73c3ae99eb1c39572 +DIST swayfx-0.4.tar.gz 17603249 BLAKE2B eda975a0598ba9363066f015d0f5e1a5574775b5cb75a9cf9e7020d04ab16c236b5472b726c40ccd765bf743b6cd659323334915064ac887164b07b798cd58c5 SHA512 a6b30d5b466eb20ca1090daf442377f4f911a97e3089e2966420352c98a8e5b3384abb128118889b9b214f50e6bd65bb744ad941acb05ae105331e60a5e67293 diff --git a/gui-wm/swayfx/files/sway-portals.conf b/gui-wm/swayfx/files/sway-portals.conf new file mode 100644 index 0000000000..aa046f63c4 --- /dev/null +++ b/gui-wm/swayfx/files/sway-portals.conf @@ -0,0 +1,6 @@ +[preferred] +# Use xdg-desktop-portal-gtk for every portal interface... +default=gtk +# ... except for the ScreenCast and Screenshot +org.freedesktop.impl.portal.ScreenCast=wlr +org.freedesktop.impl.portal.Screenshot=wlr diff --git a/gui-wm/swayfx/swayfx-0.4.ebuild b/gui-wm/swayfx/swayfx-0.4.ebuild new file mode 100644 index 0000000000..19fd36a726 --- /dev/null +++ b/gui-wm/swayfx/swayfx-0.4.ebuild @@ -0,0 +1,93 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU Public License v2 + +EAPI=8 + +inherit meson optfeature + +DESCRIPTION="SwayFX: Sway, but with eye candy!" +HOMEPAGE="https://github.com/WillPower3309/swayfx" + +SRC_URI="https://github.com/WillPower3309/swayfx/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN}-${PV}" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm64" +IUSE="+man +swaybar +swaynag tray wallpapers X" + +DEPEND=" + >=dev-libs/json-c-0.13:0= + >=dev-libs/libinput-1.21.0:0= + sys-auth/seatd:= + dev-libs/libpcre2 + >=dev-libs/wayland-1.21.0 + x11-libs/cairo + >=x11-libs/libxkbcommon-1.5.0 + x11-libs/pango + x11-libs/pixman + gui-wm/scenefx + media-libs/mesa[gles2,libglvnd(+)] + swaybar? ( x11-libs/gdk-pixbuf:2 ) + tray? ( || ( + sys-apps/systemd + sys-auth/elogind + sys-libs/basu + ) ) + wallpapers? ( gui-apps/swaybg[gdk-pixbuf(+)] ) + X? ( x11-libs/libxcb:0= + x11-libs/xcb-util-wm + ) +" +DEPEND+=" + >=gui-libs/wlroots-0.17:=[X?] + Date: Sun, 5 May 2024 10:54:13 -0500 Subject: [PATCH 08/12] sys-kernel/ugrd: Add 1.2.4 Signed-off-by: Zen --- sys-kernel/ugrd/Manifest | 1 + sys-kernel/ugrd/ugrd-1.2.4.ebuild | 45 +++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+) create mode 100644 sys-kernel/ugrd/ugrd-1.2.4.ebuild diff --git a/sys-kernel/ugrd/Manifest b/sys-kernel/ugrd/Manifest index cbac703133..c84493b4c3 100644 --- a/sys-kernel/ugrd/Manifest +++ b/sys-kernel/ugrd/Manifest @@ -8,3 +8,4 @@ DIST ugrd-1.0.0.tar.gz 46125 BLAKE2B 8f941f8cadcbfb92ad4be02ca5763779bcd57bdd354 DIST ugrd-1.1.5.tar.gz 47005 BLAKE2B 278831157c3f8b5d731f3acbdf41c19b1c6485b46acf7d2b75df40a9d9f542365514e814d1972a03bd4b53dad2d39a27098e4cfc97d526afdf4d45ccf5778691 SHA512 c198c592af40d2f126a333a03c74c638260ea8125f4a4da6f97d3489d2ddcf7edb5dce785eb236d309853dac6a3e7993186e4c6b775c4eccc121e95d308641dc DIST ugrd-1.2.0.tar.gz 48323 BLAKE2B 8df44c91dd56da6d27eaf2c769b40ad7a008a71a87f2f33d1ab91d96e16cf680bb046af27d0b50ae79d48ad8d5b046d899e246ca44c18e62dae8f54fff9cace6 SHA512 a3ddd95abd30441013c9a11074052629dfdbcd2cfffd6a754c6d9c3b719b1861abcd613228fa613b6f566ca1cdca5fa881c9a302391c594b53096428d35e37bf DIST ugrd-1.2.2.tar.gz 49312 BLAKE2B 819457ae44cb278b93ef24af5e0aa2e23bf2d31d07fccec86e597f658a5cb13aad7838b08df644090417719402673b63087d27b6edbdb46dea04b98b48d26fb0 SHA512 6348458708406408973534ac5f15f8f9f6d9427bbac48443f7ff362bb97627be6288ba2d138355f92fc1c79a4eb5e51081485adb051cadf523a58f1ef618667e +DIST ugrd-1.2.4.tar.gz 49341 BLAKE2B fc52d17e95391eee4ce53444977ac52d4980c855c1165222e83993c4d8a1a221a834188c1aa037f2a6f712b7571b6d43bc8e30575af008e409be2a1f97d6e272 SHA512 2a3ea8640e276be28f53446e2d209b301e91cc02a83ef77abab46b68daec42fb9d41ae77d56ba0eac0eb3395b100299ea06c1c195acd39d2065cd93842f6a2fe diff --git a/sys-kernel/ugrd/ugrd-1.2.4.ebuild b/sys-kernel/ugrd/ugrd-1.2.4.ebuild new file mode 100644 index 0000000000..669bae5227 --- /dev/null +++ b/sys-kernel/ugrd/ugrd-1.2.4.ebuild @@ -0,0 +1,45 @@ +# Copyright 2023-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{11..12} ) +inherit distutils-r1 optfeature + +DESCRIPTION="Python based initramfs generator with TOML defintions" +HOMEPAGE="https://github.com/desultory/ugrd" +SRC_URI="https://github.com/desultory/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64" + +RDEPEND=" + app-misc/pax-utils + >=dev-python/zenlib-2.0.4[${PYTHON_USEDEP}] + >=dev-python/pycpio-1.0.0[${PYTHON_USEDEP}] + sys-apps/pciutils +" + +src_install() { + # Call the distutils-r1_src_install function to install the package + distutils-r1_src_install + # Create the ugrd config directory + keepdir /etc/ugrd + # Install the example config into /etc/ugrd/config.toml + # Do not overwrite an existing config + insinto /etc/ugrd + newins examples/example.toml config.toml + # Create the kernel preinst.d directory if it doesn't exist + # Install the kernel preinst.d hook + keepdir /etc/kernel/preinst.d + exeinto /etc/kernel/preinst.d + doexe hooks/51-ugrd.install +} + +pkg_postinst() { + optfeature "ugrd.crypto.cryptsetup support" sys-fs/cryptsetup + optfeature "ugrd.fs.btrfs support" sys-fs/btrfs-progs + optfeature "ugrd.crypto.gpg support" app-crypt/gnupg +} From b02820917240dcc7606e0eeb50b5a08e4086b195 Mon Sep 17 00:00:00 2001 From: Okamura Kazuya Date: Mon, 6 May 2024 01:27:45 +0900 Subject: [PATCH 09/12] www-servers/openlitespeed: new package, add 1.8.1 Openlitespeed cannot work because there is no php that supports litespeed. We are requesting additional support using the ticket below. dev-lang/php: add litespeed support. See also https://bugs.gentoo.org/908876 app-eselect/eselect-php: add openlitespeed. See also https://bugs.gentoo.org/908996 Signed-off-by: Okamura Kazuya --- acct-group/lsadm/lsadm-0.ebuild | 10 ++ acct-group/lsadm/metadata.xml | 8 + acct-user/lsadm/lsadm-0.ebuild | 13 ++ acct-user/lsadm/metadata.xml | 8 + profiles/package.mask | 9 ++ www-servers/openlitespeed/Manifest | 2 + .../openlitespeed-add-install-files.patch | 84 ++++++++++ ...penlitespeed-disable-build-deps-libs.patch | 153 ++++++++++++++++++ ...litespeed-link-boringssl-static-libs.patch | 46 ++++++ www-servers/openlitespeed/metadata.xml | 11 ++ .../openlitespeed/openlitespeed-1.8.1.ebuild | 76 +++++++++ 11 files changed, 420 insertions(+) create mode 100644 acct-group/lsadm/lsadm-0.ebuild create mode 100644 acct-group/lsadm/metadata.xml create mode 100644 acct-user/lsadm/lsadm-0.ebuild create mode 100644 acct-user/lsadm/metadata.xml create mode 100644 www-servers/openlitespeed/Manifest create mode 100644 www-servers/openlitespeed/files/openlitespeed-add-install-files.patch create mode 100644 www-servers/openlitespeed/files/openlitespeed-disable-build-deps-libs.patch create mode 100644 www-servers/openlitespeed/files/openlitespeed-link-boringssl-static-libs.patch create mode 100644 www-servers/openlitespeed/metadata.xml create mode 100644 www-servers/openlitespeed/openlitespeed-1.8.1.ebuild diff --git a/acct-group/lsadm/lsadm-0.ebuild b/acct-group/lsadm/lsadm-0.ebuild new file mode 100644 index 0000000000..cc9fe3ce8c --- /dev/null +++ b/acct-group/lsadm/lsadm-0.ebuild @@ -0,0 +1,10 @@ +# Copyright 2019-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit acct-group + +DESCRIPTION="A group for www-servers/openlitespeed" + +ACCT_GROUP_ID=-1 diff --git a/acct-group/lsadm/metadata.xml b/acct-group/lsadm/metadata.xml new file mode 100644 index 0000000000..1be2559aee --- /dev/null +++ b/acct-group/lsadm/metadata.xml @@ -0,0 +1,8 @@ + + + + + trakrailysurely@danceylove.net + Okamura Kazuya + + diff --git a/acct-user/lsadm/lsadm-0.ebuild b/acct-user/lsadm/lsadm-0.ebuild new file mode 100644 index 0000000000..d43547b348 --- /dev/null +++ b/acct-user/lsadm/lsadm-0.ebuild @@ -0,0 +1,13 @@ +# Copyright 2022-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit acct-user + +DESCRIPTION="A group for www-servers/openlitespeed" + +ACCT_USER_ID=-1 +ACCT_USER_GROUPS=( ${PN} ) + +acct-user_add_deps diff --git a/acct-user/lsadm/metadata.xml b/acct-user/lsadm/metadata.xml new file mode 100644 index 0000000000..1be2559aee --- /dev/null +++ b/acct-user/lsadm/metadata.xml @@ -0,0 +1,8 @@ + + + + + trakrailysurely@danceylove.net + Okamura Kazuya + + diff --git a/profiles/package.mask b/profiles/package.mask index 8661e8dbe0..216d4a97db 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -189,3 +189,12 @@ net-im/mautrix-facebook # (See also top comment) # Sorry for the inconvenience. app-office/lotus123r3 + +# Okamura Kazuya (2024-05-06) +# Openlitespeed cannot work because there is no php that supports litespeed. +# We are requesting additional support using the ticket below. +# dev-lang/php: add litespeed support. See also https://bugs.gentoo.org/908876 +# app-eselect/eselect-php: add openlitespeed. See also https://bugs.gentoo.org/908996 +www-servers/openlitespeed +acct-user/lsadm +acct-group/lsadm diff --git a/www-servers/openlitespeed/Manifest b/www-servers/openlitespeed/Manifest new file mode 100644 index 0000000000..2d35fa8157 --- /dev/null +++ b/www-servers/openlitespeed/Manifest @@ -0,0 +1,2 @@ +DIST boringssl-fips-20230428.tar.gz 32288205 BLAKE2B 50588024cfd985b23be6f780197d092beae4b97bb2b5e01a6aca1477b0f5f0ffd0b6ac9558bd42fb5b4de4898a8987326afbe28422bb6dafbfc2104660958a83 SHA512 afdf94a4bbf4e92082ddcdb798c7b13e489f63ad50d9a79ee0f7222c0c830dd75a313cb8e3220816f1dc6872fe7493522938797c18c728e41a7c8f77bd597fc1 +DIST openlitespeed-1.8.1.tar.gz 8246228 BLAKE2B c1f4606160bb659fc2107e18cfdf3f63208369d6182210bbb419b34f588d3863baff4d9ffb2c60c6bb7d7ee021535d080d6c9d5172aa3f1d9ea8e0b550e37723 SHA512 6c5116d34199e201060795c960bd0ecfc7af499ac16c65d570cbefcee396b2f5156bb9478dfa08a66961682a3da857b34d983c39bf05e3471b1f4ad0ec8518c7 diff --git a/www-servers/openlitespeed/files/openlitespeed-add-install-files.patch b/www-servers/openlitespeed/files/openlitespeed-add-install-files.patch new file mode 100644 index 0000000000..aacbee975b --- /dev/null +++ b/www-servers/openlitespeed/files/openlitespeed-add-install-files.patch @@ -0,0 +1,84 @@ +I plan to eventually change the patch to install openlitespeed in the appropriate location instead of installing it in /usr/local/lsws/. +diff --git a/dist/bin/lswsctrl b/dist/bin/lswsctrl +index 0da2490e..6c294b35 100755 +--- a/dist/bin/lswsctrl ++++ b/dist/bin/lswsctrl +@@ -7,7 +7,7 @@ PROG="$0" + # WSWATCH=1 + #fi + +-EXECUTABLE=litespeed ++EXECUTABLE=openlitespeed + DESC="litespeed" + BASE_DIR=`dirname "$PROG"` + cd "$BASE_DIR" +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 34df52ff..90145c9a 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -178,6 +178,64 @@ target_link_libraries(ls_shmhashstat lsshm log4cxx edio util lsr pthread rt ) + # target_link_libraries(shmlru_test ${litespeedlib} ) + + ++file(MAKE_DIRECTORY ../dist/logs/) ++file(TOUCH ../dist/logs/lsrestart.log) ++install(FILES ++ ../dist/GPL.txt ++ ../dist/VERSION DESTINATION local/lsws ++) ++install(FILES ../dist/conf/httpd_config.conf DESTINATION local/lsws/conf) ++install(FILES ++ ../dist/conf/templates/rails.conf ++ ../dist/conf/templates/ccl.conf DESTINATION local/lsws/conf/templates ++) ++install(FILES ++ ../dist/conf/vhosts/Example/vhconf.conf ++ ../dist/conf/vhosts/Example/htgroup ++ ../dist/conf/vhosts/Example/htpasswd DESTINATION local/lsws/conf/vhosts/Example ++) ++install(FILES ++ ../dist/conf/mime.properties DESTINATION local/lsws/conf ++) ++install(FILES ++ ../dist/admin/conf/php.ini ++ ../dist/admin/conf/admin_config.conf DESTINATION local/lsws/admin/conf/ ++) ++install(FILES ++ ../dist/admin/misc/convertxml.php ++ ../dist/admin/misc/gdb-bt ++ ../dist/admin/misc/genjCryptionKeyPair.php ++ ../dist/admin/misc/htpasswd.php ++ ../dist/admin/misc/lshttpd.service ++ ../dist/admin/misc/php.ini DESTINATION local/lsws/admin/misc ++) ++install(FILES ++ ../dist/admin/misc/admpass.sh ++ ../dist/admin/misc/build_admin_php.sh ++ ../dist/admin/misc/create_admin_keypair.sh ++ ../dist/admin/misc/convertxml.sh ++ ../dist/admin/misc/enable_phpa.sh ++ ../dist/admin/misc/gzipStatic.sh ++ ../dist/admin/misc/lscmctl ++ ../dist/admin/misc/lsup.sh ++ ../dist/admin/misc/lsws.rc ++ ../dist/admin/misc/lsws.rc.gentoo ++ ../dist/admin/misc/rc-inst.sh ++ ../dist/admin/misc/rc-uninst.sh ++ ../dist/admin/misc/testbeta.sh ++ ../dist/admin/misc/uninstall.sh DESTINATION local/lsws/admin/misc PERMISSIONS OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE ++) ++install(FILES ../dist/bin/lswsctrl DESTINATION local/lsws/bin PERMISSIONS OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) ++install(DIRECTORY ++ ../dist/fcgi-bin ++ ../dist/add-ons ++ ../dist/lsrecaptcha ++ ../dist/docs ++ ../dist/logs ++ ../dist/Example ++ ../dist/share DESTINATION local/lsws ++) ++install(DIRECTORY ../dist/admin/html.open DESTINATION local/lsws/admin/html.open) + +-install(TARGETS openlitespeed DESTINATION bin) ++install(TARGETS openlitespeed DESTINATION local/lsws/bin) + diff --git a/www-servers/openlitespeed/files/openlitespeed-disable-build-deps-libs.patch b/www-servers/openlitespeed/files/openlitespeed-disable-build-deps-libs.patch new file mode 100644 index 0000000000..8d21955871 --- /dev/null +++ b/www-servers/openlitespeed/files/openlitespeed-disable-build-deps-libs.patch @@ -0,0 +1,153 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 52f933f3..49dcb853 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -16,30 +16,15 @@ set(CMAKE_SKIP_BUILD_RPATH TRUE) + + SET(LSQUIC_SERVER_MODE 1) + +-if (CMAKE_HOST_SYSTEM_NAME MATCHES "Linux" AND +- CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64") +- if (${ALPINE}) +- message("Alpine X64") +- else() +- message("Set LINUX_X64") +- set (LINUX_X64 ON) +- endif() +-endif() +-if (CMAKE_HOST_SYSTEM_NAME MATCHES "Darwin") +- set (NOT_MACOS OFF) +-else() +- set (NOT_MACOS ON) +-endif() +-OPTION(MOD_PAGESPEED "Whether pagespeed should be built" ${LINUX_X64}) +-OPTION(MOD_SECURITY "Whether mod_security should be built" ${NOT_MACOS}) +-OPTION(MOD_LUA "Whether Lua should be built" ${LINUX_X64}) ++OPTION(MOD_PAGESPEED "Whether pagespeed should be built" OFF) ++OPTION(MOD_SECURITY "Whether mod_security should be built" OFF) ++OPTION(MOD_LUA "Whether Lua should be built" OFF) + OPTION(MOD_REQPARSER "Whether modreqparser should be built" OFF) + OPTION(MOD_INSPECTOR "Whether modinspector should be built" OFF) + OPTION(MOD_UPLOADPROGRESS "Whether uploadprogress should be built" OFF) + OPTION(MOD_LSPHP "Whether mod_lsphp should be built" OFF) + +-include_directories( BEFORE include src/lshpack src/liblsquic/ls-qpack ${PROJECT_SOURCE_DIR}/../third-party/include/) +-link_directories( ${PROJECT_SOURCE_DIR}/../third-party/lib/) ++include_directories( BEFORE include /usr/include/lsquic src/boringssl/include) + + #SET (CMAKE_C_COMPILER "/usr/bin/clang") + #SET (CMAKE_CXX_COMPILER "/usr/bin/clang++") +@@ -174,11 +159,11 @@ SET(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/CMakeModules) + set(BSSL_ADD_LIB decrepit) + ########################################################################################## + #If you want to use Brotli Compression, just un-comment out the following commands +-set(BROTLI_ADD_LIB libbrotlidec-static.a libbrotlienc-static.a libbrotlicommon-static.a) ++set(BROTLI_ADD_LIB brotlidec brotlienc brotlicommon) + add_definitions(-DUSE_BROTLI) + ########################################################################################## + #If you want to use IP2Location, just un-comment out the following commands +-set(IP2LOC_ADD_LIB libIP2Location.a) ++set(IP2LOC_ADD_LIB IP2Location) + add_definitions(-DUSE_IP2LOCATION) + ########################################################################################## + #If you want to use IPTOGEO2, just un-comment out the following commands +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 34df52ff..60e65b72 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -2,12 +2,10 @@ cmake_minimum_required(VERSION 3.0) + + link_directories("/usr/lib64") + +- + add_subdirectory(adns) + add_subdirectory(edio) + add_subdirectory(extensions) + add_subdirectory(http) +-add_subdirectory(liblsquic) + add_subdirectory(log4cxx) + add_subdirectory(lsiapi) + add_subdirectory(lsr) +@@ -22,6 +20,7 @@ add_subdirectory(ssi) + add_subdirectory(thread) + add_subdirectory(util) + add_subdirectory(h2) ++add_subdirectory(boringssl) + + ########### next target ############### + +@@ -158,8 +157,8 @@ SET( litespeedlib + registry cgi fcgi jk extensions lsapi proxy + socket sslpp lsshm thread log4cxx adns + quic h2 lsquic -Wl,--whole-archive util lsr -Wl,--no-whole-archive ${MMDB_LIB} +- edio libssl.a libcrypto.a ${BSSL_ADD_LIB} ${libUnitTest} +- libz.a libpcre.a libexpat.a libxml2.a ++ edio ssl crypto ls-qpack ls-hpack ${BSSL_ADD_LIB} ${libUnitTest} ++ z pcre expat xml2 + ${IP2LOC_ADD_LIB} ${BROTLI_ADD_LIB} udns ${LINUX_AIO_LIB} + -nodefaultlibs pthread rt ${LIBSAN} ${LIBATOMIC} + ${CMAKE_DL_LIBS} ${STDCXX} crypt bcrypt m gcc_eh c c_nonshared gcc +diff --git a/src/h2/CMakeLists.txt b/src/h2/CMakeLists.txt +index 43372886..c73c835e 100644 +--- a/src/h2/CMakeLists.txt ++++ b/src/h2/CMakeLists.txt +@@ -10,7 +10,6 @@ h2streampool.cpp + unpackedheaders.cpp + h2connbase.cpp + h2streambase.cpp +-../lshpack/lshpack.c + ) + + add_library(h2 STATIC ${h2_STAT_SRCS}) +diff --git a/src/h2/unpackedheaders.cpp b/src/h2/unpackedheaders.cpp +index 1b803c07..a58e2c18 100644 +--- a/src/h2/unpackedheaders.cpp ++++ b/src/h2/unpackedheaders.cpp +@@ -4,7 +4,7 @@ + #include + #include + #include +-#include ++#include + #include + + +diff --git a/src/http/httprespheaders.cpp b/src/http/httprespheaders.cpp +index e18762ee..6e2be6af 100644 +--- a/src/http/httprespheaders.cpp ++++ b/src/http/httprespheaders.cpp +@@ -20,7 +20,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include +diff --git a/src/http/userdir.cpp b/src/http/userdir.cpp +index 99ab0a35..65d14e87 100644 +--- a/src/http/userdir.cpp ++++ b/src/http/userdir.cpp +@@ -33,7 +33,7 @@ + #include + #include + #include +-#include ++#include + + + UserDir::~UserDir() +diff --git a/src/modules/modsecurity-ls/CMakeLists.txt b/src/modules/modsecurity-ls/CMakeLists.txt +index c091ad9a..6effd30f 100644 +--- a/src/modules/modsecurity-ls/CMakeLists.txt ++++ b/src/modules/modsecurity-ls/CMakeLists.txt +@@ -28,7 +28,7 @@ add_library(mod_security SHARED + ) + + +-target_link_libraries(mod_security libmodsecurity.a ++target_link_libraries(mod_security modsecurity + -nodefaultlibs libstdc++.a + pthread rt -llmdb -lxml2 -lcurl -lssl -lcrypto -lz -lpcre -lyajl + ${LIBSAN} crypt m gcc_eh c c_nonshared gcc) diff --git a/www-servers/openlitespeed/files/openlitespeed-link-boringssl-static-libs.patch b/www-servers/openlitespeed/files/openlitespeed-link-boringssl-static-libs.patch new file mode 100644 index 0000000000..4ca7a46da3 --- /dev/null +++ b/www-servers/openlitespeed/files/openlitespeed-link-boringssl-static-libs.patch @@ -0,0 +1,46 @@ +Modify the BoringSSL library to be included internally during OpenLiteSpeed construction, so that the BoringSSL library does not need to be installed by itself on the system. +BoringSSL must always be built as static, so we intentionally removed the code that builds it as shared. +diff --git a/src/boringssl/CMakeLists.txt b/src/boringssl/CMakeLists.txt +index aac5f0d..37cbfa3 100644 +--- a/src/boringssl/CMakeLists.txt ++++ b/src/boringssl/CMakeLists.txt +@@ -3,6 +3,8 @@ cmake_minimum_required(VERSION 3.10) + # Defer enabling C and CXX languages. + project(BoringSSL NONE) + ++set(BUILD_SHARED_LIBS OFF) ++ + # Don't install BoringSSL to system directories by default; it has no stable + # ABI. Instead, default to an "install" directory under the source. + if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) +@@ -36,7 +38,7 @@ if(CMAKE_VERSION VERSION_LESS "3.14") + endif() + + # Wrap the CMake install function so we can disable it. +-set(INSTALL_ENABLED 1) ++set(INSTALL_ENABLED 0) + function(install_if_enabled) + if(INSTALL_ENABLED) + install(${ARGV}) +@@ -139,7 +141,7 @@ set(CMAKE_C_STANDARD_REQUIRED ON) + if(CMAKE_COMPILER_IS_GNUCXX OR CLANG) + # Note clang-cl is odd and sets both CLANG and MSVC. We base our configuration + # primarily on our normal Clang one. +- set(C_CXX_FLAGS "-Werror -Wformat=2 -Wsign-compare -Wmissing-field-initializers -Wwrite-strings -Wvla -Wshadow -Wtype-limits") ++ set(C_CXX_FLAGS "-Wformat=2 -Wsign-compare -Wmissing-field-initializers -Wwrite-strings -Wvla -Wshadow -Wtype-limits -fPIC") + if(MSVC) + # clang-cl sets different default warnings than clang. It also treats -Wall + # as -Weverything, to match MSVC. Instead -W3 is the alias for -Wall. +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 52f933f3..6df38490 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -174,7 +174,7 @@ SET(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/CMakeModules) + #If you want to use BoringSSL, just un-comment out the following commands + #AND YOU NEED TO HAVE THE files ready in openlitespeed/ssl + #You can run the dlbssl.sh to make them ready +-set(BSSL_ADD_LIB libdecrepit.a) ++set(BSSL_ADD_LIB decrepit) + ########################################################################################## + #If you want to use Brotli Compression, just un-comment out the following commands + set(BROTLI_ADD_LIB libbrotlidec-static.a libbrotlienc-static.a libbrotlicommon-static.a) diff --git a/www-servers/openlitespeed/metadata.xml b/www-servers/openlitespeed/metadata.xml new file mode 100644 index 0000000000..149e6b2e33 --- /dev/null +++ b/www-servers/openlitespeed/metadata.xml @@ -0,0 +1,11 @@ + + + + + trakrailysurely@danceylove.net + Okamura Kazuya + + + litespeedtech/openlitespeed + + diff --git a/www-servers/openlitespeed/openlitespeed-1.8.1.ebuild b/www-servers/openlitespeed/openlitespeed-1.8.1.ebuild new file mode 100644 index 0000000000..1970fef0d1 --- /dev/null +++ b/www-servers/openlitespeed/openlitespeed-1.8.1.ebuild @@ -0,0 +1,76 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +BORINGSSL_COMMIT="15655052e8701f908937204785eaa8cd4363099f" + +DESCRIPTION="LiteSpeed QUIC (LSQUIC) Library" +HOMEPAGE="https://github.com/litespeedtech/lsquic/" +SRC_URI=" + https://github.com/litespeedtech/openlitespeed/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz + https://github.com/google/boringssl/archive/${BORINGSSL_COMMIT}.tar.gz -> boringssl-fips-20230428.tar.gz +" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm64" + +IUSE="static-libs ruby" +RESTRICT="" + +DEPEND=" + dev-lang/go + dev-libs/modsecurity + app-arch/brotli + dev-libs/yajl + virtual/libcrypt + ruby? ( dev-lang/ruby ) + dev-libs/lsquic:=[static-libs=] + dev-libs/ls-qpack:=[static-libs=] + dev-libs/ls-hpack:=[static-libs=] +" + +RDEPEND=" + acct-user/lsadm + acct-group/lsadm" + +PATCHES=( + "${FILESDIR}"/${PN}-link-boringssl-static-libs.patch + "${FILESDIR}"/${PN}-disable-build-deps-libs.patch + "${FILESDIR}"/${PN}-add-install-files.patch +) + +src_unpack() { + default + unpack boringssl-fips-20230428.tar.gz + mv boringssl-${BORINGSSL_COMMIT} "${S}"/src/boringssl || die +} + +src_configure() { + # LSWS variables + SERVERROOT=/usr/local/lsws + OPENLSWS_USER=nobody + OPENLSWS_GROUP=nobody + OPENLSWS_EMAIL=root@localhost + OPENLSWS_ADMINPORT=7080 + DEFAULT_TMP_DIR=/tmp/lshttpd + if use ruby ; then + RUBY_PATH=/usr/bin/ruby + else + RUBY_PATH= + fi + OPENLSWS_EXAMPLEPORT=8088 + + sed -e "s/%ADMIN_PORT%/$OPENLSWS_ADMINPORT/" "${S}/dist/admin/conf/admin_config.conf.in" > "${S}/dist/admin/conf/admin_config.conf" + sed -e "s/%USER%/$OPENLSWS_USER/" -e "s/%GROUP%/$OPENLSWS_GROUP/" -e "s#%DEFAULT_TMP_DIR%#$DEFAULT_TMP_DIR#" -e "s/%ADMIN_EMAIL%/$OPENLSWS_EMAIL/" -e "s/%HTTP_PORT%/$OPENLSWS_EXAMPLEPORT/" -e "s/%RUBY_BIN%/$RUBY_PATH/" "${S}/dist/conf/httpd_config.conf.in" > "${S}/dist/conf/httpd_config.conf" + sed "s:%LSWS_CTRL%:$SERVERROOT/bin/lswsctrl:" "${S}/dist/admin/misc/lsws.rc.in" > "${S}/dist/admin/misc/lsws.rc" + sed "s:%LSWS_CTRL%:$SERVERROOT/bin/lswsctrl:" "${S}/dist/admin/misc/lsws.rc.gentoo.in" > "${S}/dist/admin/misc/lsws.rc.gentoo" + sed "s:%LSWS_CTRL%:$SERVERROOT/bin/lswsctrl:" "${S}/dist/admin/misc/lshttpd.service.in" > "${S}/dist/admin/misc/lshttpd.service" + + local mycmakeargs=( + ) + cmake_src_configure +} From fd74104d2611ea04ec2c8ee89079d449efbabe60 Mon Sep 17 00:00:00 2001 From: Julien Roy Date: Sun, 5 May 2024 14:48:13 -0400 Subject: [PATCH 10/12] gui-wm/scenefx: move to gui-libs simply SRC_URI drop unused optfeature eclass remove redundant src_install Signed-off-by: Julien Roy --- {gui-wm => gui-libs}/scenefx/Manifest | 0 {gui-wm => gui-libs}/scenefx/scenefx-0.1.ebuild | 8 ++------ 2 files changed, 2 insertions(+), 6 deletions(-) rename {gui-wm => gui-libs}/scenefx/Manifest (100%) rename {gui-wm => gui-libs}/scenefx/scenefx-0.1.ebuild (91%) diff --git a/gui-wm/scenefx/Manifest b/gui-libs/scenefx/Manifest similarity index 100% rename from gui-wm/scenefx/Manifest rename to gui-libs/scenefx/Manifest diff --git a/gui-wm/scenefx/scenefx-0.1.ebuild b/gui-libs/scenefx/scenefx-0.1.ebuild similarity index 91% rename from gui-wm/scenefx/scenefx-0.1.ebuild rename to gui-libs/scenefx/scenefx-0.1.ebuild index 3af25dbdff..c82e0605dd 100644 --- a/gui-wm/scenefx/scenefx-0.1.ebuild +++ b/gui-libs/scenefx/scenefx-0.1.ebuild @@ -3,12 +3,12 @@ EAPI=8 -inherit meson optfeature +inherit meson DESCRIPTION="A replacement for the wlroots scene API with eye-candy effects." HOMEPAGE="https://github.com/wlrfx/scenefx" -SRC_URI="https://github.com/wlrfx/scenefx/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI="https://github.com/wlrfx/scenefx/archive/${PV}.tar.gz -> ${P}.tar.gz" S="${WORKDIR}/${PN}-${PV}" LICENSE="MIT" @@ -80,7 +80,3 @@ src_configure() { meson_src_configure } - -src_install() { - meson_src_install -} From f72b554103dd36b3f3fb04b26dddb57c6ba63397 Mon Sep 17 00:00:00 2001 From: Julien Roy Date: Sun, 5 May 2024 14:59:40 -0400 Subject: [PATCH 11/12] gui-wm/swayfx: gui-wm/scenefx -> gui-libs/scenefx Signed-off-by: Julien Roy --- gui-wm/swayfx/swayfx-0.4.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gui-wm/swayfx/swayfx-0.4.ebuild b/gui-wm/swayfx/swayfx-0.4.ebuild index 19fd36a726..8c71f91b0b 100644 --- a/gui-wm/swayfx/swayfx-0.4.ebuild +++ b/gui-wm/swayfx/swayfx-0.4.ebuild @@ -26,7 +26,7 @@ DEPEND=" >=x11-libs/libxkbcommon-1.5.0 x11-libs/pango x11-libs/pixman - gui-wm/scenefx + gui-libs/scenefx media-libs/mesa[gles2,libglvnd(+)] swaybar? ( x11-libs/gdk-pixbuf:2 ) tray? ( || ( From 7c9c9aa0513ac610b7725cc472cdef5e6dcc5d73 Mon Sep 17 00:00:00 2001 From: Julien Roy Date: Sun, 5 May 2024 15:00:09 -0400 Subject: [PATCH 12/12] Revert "www-servers/openlitespeed: new package, add 1.8.1" This reverts commit b02820917240dcc7606e0eeb50b5a08e4086b195. Please do not add a knowingly broken new package in GURU, even if it's masked. If you want to share this ebuild to work on the bug(s), please upload it directly on the bug(s). Signed-off-by: Julien Roy --- acct-group/lsadm/lsadm-0.ebuild | 10 -- acct-group/lsadm/metadata.xml | 8 - acct-user/lsadm/lsadm-0.ebuild | 13 -- acct-user/lsadm/metadata.xml | 8 - profiles/package.mask | 9 -- www-servers/openlitespeed/Manifest | 2 - .../openlitespeed-add-install-files.patch | 84 ---------- ...penlitespeed-disable-build-deps-libs.patch | 153 ------------------ ...litespeed-link-boringssl-static-libs.patch | 46 ------ www-servers/openlitespeed/metadata.xml | 11 -- .../openlitespeed/openlitespeed-1.8.1.ebuild | 76 --------- 11 files changed, 420 deletions(-) delete mode 100644 acct-group/lsadm/lsadm-0.ebuild delete mode 100644 acct-group/lsadm/metadata.xml delete mode 100644 acct-user/lsadm/lsadm-0.ebuild delete mode 100644 acct-user/lsadm/metadata.xml delete mode 100644 www-servers/openlitespeed/Manifest delete mode 100644 www-servers/openlitespeed/files/openlitespeed-add-install-files.patch delete mode 100644 www-servers/openlitespeed/files/openlitespeed-disable-build-deps-libs.patch delete mode 100644 www-servers/openlitespeed/files/openlitespeed-link-boringssl-static-libs.patch delete mode 100644 www-servers/openlitespeed/metadata.xml delete mode 100644 www-servers/openlitespeed/openlitespeed-1.8.1.ebuild diff --git a/acct-group/lsadm/lsadm-0.ebuild b/acct-group/lsadm/lsadm-0.ebuild deleted file mode 100644 index cc9fe3ce8c..0000000000 --- a/acct-group/lsadm/lsadm-0.ebuild +++ /dev/null @@ -1,10 +0,0 @@ -# Copyright 2019-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit acct-group - -DESCRIPTION="A group for www-servers/openlitespeed" - -ACCT_GROUP_ID=-1 diff --git a/acct-group/lsadm/metadata.xml b/acct-group/lsadm/metadata.xml deleted file mode 100644 index 1be2559aee..0000000000 --- a/acct-group/lsadm/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - trakrailysurely@danceylove.net - Okamura Kazuya - - diff --git a/acct-user/lsadm/lsadm-0.ebuild b/acct-user/lsadm/lsadm-0.ebuild deleted file mode 100644 index d43547b348..0000000000 --- a/acct-user/lsadm/lsadm-0.ebuild +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright 2022-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit acct-user - -DESCRIPTION="A group for www-servers/openlitespeed" - -ACCT_USER_ID=-1 -ACCT_USER_GROUPS=( ${PN} ) - -acct-user_add_deps diff --git a/acct-user/lsadm/metadata.xml b/acct-user/lsadm/metadata.xml deleted file mode 100644 index 1be2559aee..0000000000 --- a/acct-user/lsadm/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - trakrailysurely@danceylove.net - Okamura Kazuya - - diff --git a/profiles/package.mask b/profiles/package.mask index 216d4a97db..8661e8dbe0 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -189,12 +189,3 @@ net-im/mautrix-facebook # (See also top comment) # Sorry for the inconvenience. app-office/lotus123r3 - -# Okamura Kazuya (2024-05-06) -# Openlitespeed cannot work because there is no php that supports litespeed. -# We are requesting additional support using the ticket below. -# dev-lang/php: add litespeed support. See also https://bugs.gentoo.org/908876 -# app-eselect/eselect-php: add openlitespeed. See also https://bugs.gentoo.org/908996 -www-servers/openlitespeed -acct-user/lsadm -acct-group/lsadm diff --git a/www-servers/openlitespeed/Manifest b/www-servers/openlitespeed/Manifest deleted file mode 100644 index 2d35fa8157..0000000000 --- a/www-servers/openlitespeed/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST boringssl-fips-20230428.tar.gz 32288205 BLAKE2B 50588024cfd985b23be6f780197d092beae4b97bb2b5e01a6aca1477b0f5f0ffd0b6ac9558bd42fb5b4de4898a8987326afbe28422bb6dafbfc2104660958a83 SHA512 afdf94a4bbf4e92082ddcdb798c7b13e489f63ad50d9a79ee0f7222c0c830dd75a313cb8e3220816f1dc6872fe7493522938797c18c728e41a7c8f77bd597fc1 -DIST openlitespeed-1.8.1.tar.gz 8246228 BLAKE2B c1f4606160bb659fc2107e18cfdf3f63208369d6182210bbb419b34f588d3863baff4d9ffb2c60c6bb7d7ee021535d080d6c9d5172aa3f1d9ea8e0b550e37723 SHA512 6c5116d34199e201060795c960bd0ecfc7af499ac16c65d570cbefcee396b2f5156bb9478dfa08a66961682a3da857b34d983c39bf05e3471b1f4ad0ec8518c7 diff --git a/www-servers/openlitespeed/files/openlitespeed-add-install-files.patch b/www-servers/openlitespeed/files/openlitespeed-add-install-files.patch deleted file mode 100644 index aacbee975b..0000000000 --- a/www-servers/openlitespeed/files/openlitespeed-add-install-files.patch +++ /dev/null @@ -1,84 +0,0 @@ -I plan to eventually change the patch to install openlitespeed in the appropriate location instead of installing it in /usr/local/lsws/. -diff --git a/dist/bin/lswsctrl b/dist/bin/lswsctrl -index 0da2490e..6c294b35 100755 ---- a/dist/bin/lswsctrl -+++ b/dist/bin/lswsctrl -@@ -7,7 +7,7 @@ PROG="$0" - # WSWATCH=1 - #fi - --EXECUTABLE=litespeed -+EXECUTABLE=openlitespeed - DESC="litespeed" - BASE_DIR=`dirname "$PROG"` - cd "$BASE_DIR" -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 34df52ff..90145c9a 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -178,6 +178,64 @@ target_link_libraries(ls_shmhashstat lsshm log4cxx edio util lsr pthread rt ) - # target_link_libraries(shmlru_test ${litespeedlib} ) - - -+file(MAKE_DIRECTORY ../dist/logs/) -+file(TOUCH ../dist/logs/lsrestart.log) -+install(FILES -+ ../dist/GPL.txt -+ ../dist/VERSION DESTINATION local/lsws -+) -+install(FILES ../dist/conf/httpd_config.conf DESTINATION local/lsws/conf) -+install(FILES -+ ../dist/conf/templates/rails.conf -+ ../dist/conf/templates/ccl.conf DESTINATION local/lsws/conf/templates -+) -+install(FILES -+ ../dist/conf/vhosts/Example/vhconf.conf -+ ../dist/conf/vhosts/Example/htgroup -+ ../dist/conf/vhosts/Example/htpasswd DESTINATION local/lsws/conf/vhosts/Example -+) -+install(FILES -+ ../dist/conf/mime.properties DESTINATION local/lsws/conf -+) -+install(FILES -+ ../dist/admin/conf/php.ini -+ ../dist/admin/conf/admin_config.conf DESTINATION local/lsws/admin/conf/ -+) -+install(FILES -+ ../dist/admin/misc/convertxml.php -+ ../dist/admin/misc/gdb-bt -+ ../dist/admin/misc/genjCryptionKeyPair.php -+ ../dist/admin/misc/htpasswd.php -+ ../dist/admin/misc/lshttpd.service -+ ../dist/admin/misc/php.ini DESTINATION local/lsws/admin/misc -+) -+install(FILES -+ ../dist/admin/misc/admpass.sh -+ ../dist/admin/misc/build_admin_php.sh -+ ../dist/admin/misc/create_admin_keypair.sh -+ ../dist/admin/misc/convertxml.sh -+ ../dist/admin/misc/enable_phpa.sh -+ ../dist/admin/misc/gzipStatic.sh -+ ../dist/admin/misc/lscmctl -+ ../dist/admin/misc/lsup.sh -+ ../dist/admin/misc/lsws.rc -+ ../dist/admin/misc/lsws.rc.gentoo -+ ../dist/admin/misc/rc-inst.sh -+ ../dist/admin/misc/rc-uninst.sh -+ ../dist/admin/misc/testbeta.sh -+ ../dist/admin/misc/uninstall.sh DESTINATION local/lsws/admin/misc PERMISSIONS OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE -+) -+install(FILES ../dist/bin/lswsctrl DESTINATION local/lsws/bin PERMISSIONS OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) -+install(DIRECTORY -+ ../dist/fcgi-bin -+ ../dist/add-ons -+ ../dist/lsrecaptcha -+ ../dist/docs -+ ../dist/logs -+ ../dist/Example -+ ../dist/share DESTINATION local/lsws -+) -+install(DIRECTORY ../dist/admin/html.open DESTINATION local/lsws/admin/html.open) - --install(TARGETS openlitespeed DESTINATION bin) -+install(TARGETS openlitespeed DESTINATION local/lsws/bin) - diff --git a/www-servers/openlitespeed/files/openlitespeed-disable-build-deps-libs.patch b/www-servers/openlitespeed/files/openlitespeed-disable-build-deps-libs.patch deleted file mode 100644 index 8d21955871..0000000000 --- a/www-servers/openlitespeed/files/openlitespeed-disable-build-deps-libs.patch +++ /dev/null @@ -1,153 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 52f933f3..49dcb853 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -16,30 +16,15 @@ set(CMAKE_SKIP_BUILD_RPATH TRUE) - - SET(LSQUIC_SERVER_MODE 1) - --if (CMAKE_HOST_SYSTEM_NAME MATCHES "Linux" AND -- CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64") -- if (${ALPINE}) -- message("Alpine X64") -- else() -- message("Set LINUX_X64") -- set (LINUX_X64 ON) -- endif() --endif() --if (CMAKE_HOST_SYSTEM_NAME MATCHES "Darwin") -- set (NOT_MACOS OFF) --else() -- set (NOT_MACOS ON) --endif() --OPTION(MOD_PAGESPEED "Whether pagespeed should be built" ${LINUX_X64}) --OPTION(MOD_SECURITY "Whether mod_security should be built" ${NOT_MACOS}) --OPTION(MOD_LUA "Whether Lua should be built" ${LINUX_X64}) -+OPTION(MOD_PAGESPEED "Whether pagespeed should be built" OFF) -+OPTION(MOD_SECURITY "Whether mod_security should be built" OFF) -+OPTION(MOD_LUA "Whether Lua should be built" OFF) - OPTION(MOD_REQPARSER "Whether modreqparser should be built" OFF) - OPTION(MOD_INSPECTOR "Whether modinspector should be built" OFF) - OPTION(MOD_UPLOADPROGRESS "Whether uploadprogress should be built" OFF) - OPTION(MOD_LSPHP "Whether mod_lsphp should be built" OFF) - --include_directories( BEFORE include src/lshpack src/liblsquic/ls-qpack ${PROJECT_SOURCE_DIR}/../third-party/include/) --link_directories( ${PROJECT_SOURCE_DIR}/../third-party/lib/) -+include_directories( BEFORE include /usr/include/lsquic src/boringssl/include) - - #SET (CMAKE_C_COMPILER "/usr/bin/clang") - #SET (CMAKE_CXX_COMPILER "/usr/bin/clang++") -@@ -174,11 +159,11 @@ SET(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/CMakeModules) - set(BSSL_ADD_LIB decrepit) - ########################################################################################## - #If you want to use Brotli Compression, just un-comment out the following commands --set(BROTLI_ADD_LIB libbrotlidec-static.a libbrotlienc-static.a libbrotlicommon-static.a) -+set(BROTLI_ADD_LIB brotlidec brotlienc brotlicommon) - add_definitions(-DUSE_BROTLI) - ########################################################################################## - #If you want to use IP2Location, just un-comment out the following commands --set(IP2LOC_ADD_LIB libIP2Location.a) -+set(IP2LOC_ADD_LIB IP2Location) - add_definitions(-DUSE_IP2LOCATION) - ########################################################################################## - #If you want to use IPTOGEO2, just un-comment out the following commands -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 34df52ff..60e65b72 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -2,12 +2,10 @@ cmake_minimum_required(VERSION 3.0) - - link_directories("/usr/lib64") - -- - add_subdirectory(adns) - add_subdirectory(edio) - add_subdirectory(extensions) - add_subdirectory(http) --add_subdirectory(liblsquic) - add_subdirectory(log4cxx) - add_subdirectory(lsiapi) - add_subdirectory(lsr) -@@ -22,6 +20,7 @@ add_subdirectory(ssi) - add_subdirectory(thread) - add_subdirectory(util) - add_subdirectory(h2) -+add_subdirectory(boringssl) - - ########### next target ############### - -@@ -158,8 +157,8 @@ SET( litespeedlib - registry cgi fcgi jk extensions lsapi proxy - socket sslpp lsshm thread log4cxx adns - quic h2 lsquic -Wl,--whole-archive util lsr -Wl,--no-whole-archive ${MMDB_LIB} -- edio libssl.a libcrypto.a ${BSSL_ADD_LIB} ${libUnitTest} -- libz.a libpcre.a libexpat.a libxml2.a -+ edio ssl crypto ls-qpack ls-hpack ${BSSL_ADD_LIB} ${libUnitTest} -+ z pcre expat xml2 - ${IP2LOC_ADD_LIB} ${BROTLI_ADD_LIB} udns ${LINUX_AIO_LIB} - -nodefaultlibs pthread rt ${LIBSAN} ${LIBATOMIC} - ${CMAKE_DL_LIBS} ${STDCXX} crypt bcrypt m gcc_eh c c_nonshared gcc -diff --git a/src/h2/CMakeLists.txt b/src/h2/CMakeLists.txt -index 43372886..c73c835e 100644 ---- a/src/h2/CMakeLists.txt -+++ b/src/h2/CMakeLists.txt -@@ -10,7 +10,6 @@ h2streampool.cpp - unpackedheaders.cpp - h2connbase.cpp - h2streambase.cpp --../lshpack/lshpack.c - ) - - add_library(h2 STATIC ${h2_STAT_SRCS}) -diff --git a/src/h2/unpackedheaders.cpp b/src/h2/unpackedheaders.cpp -index 1b803c07..a58e2c18 100644 ---- a/src/h2/unpackedheaders.cpp -+++ b/src/h2/unpackedheaders.cpp -@@ -4,7 +4,7 @@ - #include - #include - #include --#include -+#include - #include - - -diff --git a/src/http/httprespheaders.cpp b/src/http/httprespheaders.cpp -index e18762ee..6e2be6af 100644 ---- a/src/http/httprespheaders.cpp -+++ b/src/http/httprespheaders.cpp -@@ -20,7 +20,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include -diff --git a/src/http/userdir.cpp b/src/http/userdir.cpp -index 99ab0a35..65d14e87 100644 ---- a/src/http/userdir.cpp -+++ b/src/http/userdir.cpp -@@ -33,7 +33,7 @@ - #include - #include - #include --#include -+#include - - - UserDir::~UserDir() -diff --git a/src/modules/modsecurity-ls/CMakeLists.txt b/src/modules/modsecurity-ls/CMakeLists.txt -index c091ad9a..6effd30f 100644 ---- a/src/modules/modsecurity-ls/CMakeLists.txt -+++ b/src/modules/modsecurity-ls/CMakeLists.txt -@@ -28,7 +28,7 @@ add_library(mod_security SHARED - ) - - --target_link_libraries(mod_security libmodsecurity.a -+target_link_libraries(mod_security modsecurity - -nodefaultlibs libstdc++.a - pthread rt -llmdb -lxml2 -lcurl -lssl -lcrypto -lz -lpcre -lyajl - ${LIBSAN} crypt m gcc_eh c c_nonshared gcc) diff --git a/www-servers/openlitespeed/files/openlitespeed-link-boringssl-static-libs.patch b/www-servers/openlitespeed/files/openlitespeed-link-boringssl-static-libs.patch deleted file mode 100644 index 4ca7a46da3..0000000000 --- a/www-servers/openlitespeed/files/openlitespeed-link-boringssl-static-libs.patch +++ /dev/null @@ -1,46 +0,0 @@ -Modify the BoringSSL library to be included internally during OpenLiteSpeed construction, so that the BoringSSL library does not need to be installed by itself on the system. -BoringSSL must always be built as static, so we intentionally removed the code that builds it as shared. -diff --git a/src/boringssl/CMakeLists.txt b/src/boringssl/CMakeLists.txt -index aac5f0d..37cbfa3 100644 ---- a/src/boringssl/CMakeLists.txt -+++ b/src/boringssl/CMakeLists.txt -@@ -3,6 +3,8 @@ cmake_minimum_required(VERSION 3.10) - # Defer enabling C and CXX languages. - project(BoringSSL NONE) - -+set(BUILD_SHARED_LIBS OFF) -+ - # Don't install BoringSSL to system directories by default; it has no stable - # ABI. Instead, default to an "install" directory under the source. - if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) -@@ -36,7 +38,7 @@ if(CMAKE_VERSION VERSION_LESS "3.14") - endif() - - # Wrap the CMake install function so we can disable it. --set(INSTALL_ENABLED 1) -+set(INSTALL_ENABLED 0) - function(install_if_enabled) - if(INSTALL_ENABLED) - install(${ARGV}) -@@ -139,7 +141,7 @@ set(CMAKE_C_STANDARD_REQUIRED ON) - if(CMAKE_COMPILER_IS_GNUCXX OR CLANG) - # Note clang-cl is odd and sets both CLANG and MSVC. We base our configuration - # primarily on our normal Clang one. -- set(C_CXX_FLAGS "-Werror -Wformat=2 -Wsign-compare -Wmissing-field-initializers -Wwrite-strings -Wvla -Wshadow -Wtype-limits") -+ set(C_CXX_FLAGS "-Wformat=2 -Wsign-compare -Wmissing-field-initializers -Wwrite-strings -Wvla -Wshadow -Wtype-limits -fPIC") - if(MSVC) - # clang-cl sets different default warnings than clang. It also treats -Wall - # as -Weverything, to match MSVC. Instead -W3 is the alias for -Wall. -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 52f933f3..6df38490 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -174,7 +174,7 @@ SET(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/CMakeModules) - #If you want to use BoringSSL, just un-comment out the following commands - #AND YOU NEED TO HAVE THE files ready in openlitespeed/ssl - #You can run the dlbssl.sh to make them ready --set(BSSL_ADD_LIB libdecrepit.a) -+set(BSSL_ADD_LIB decrepit) - ########################################################################################## - #If you want to use Brotli Compression, just un-comment out the following commands - set(BROTLI_ADD_LIB libbrotlidec-static.a libbrotlienc-static.a libbrotlicommon-static.a) diff --git a/www-servers/openlitespeed/metadata.xml b/www-servers/openlitespeed/metadata.xml deleted file mode 100644 index 149e6b2e33..0000000000 --- a/www-servers/openlitespeed/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - trakrailysurely@danceylove.net - Okamura Kazuya - - - litespeedtech/openlitespeed - - diff --git a/www-servers/openlitespeed/openlitespeed-1.8.1.ebuild b/www-servers/openlitespeed/openlitespeed-1.8.1.ebuild deleted file mode 100644 index 1970fef0d1..0000000000 --- a/www-servers/openlitespeed/openlitespeed-1.8.1.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake - -BORINGSSL_COMMIT="15655052e8701f908937204785eaa8cd4363099f" - -DESCRIPTION="LiteSpeed QUIC (LSQUIC) Library" -HOMEPAGE="https://github.com/litespeedtech/lsquic/" -SRC_URI=" - https://github.com/litespeedtech/openlitespeed/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz - https://github.com/google/boringssl/archive/${BORINGSSL_COMMIT}.tar.gz -> boringssl-fips-20230428.tar.gz -" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~arm64" - -IUSE="static-libs ruby" -RESTRICT="" - -DEPEND=" - dev-lang/go - dev-libs/modsecurity - app-arch/brotli - dev-libs/yajl - virtual/libcrypt - ruby? ( dev-lang/ruby ) - dev-libs/lsquic:=[static-libs=] - dev-libs/ls-qpack:=[static-libs=] - dev-libs/ls-hpack:=[static-libs=] -" - -RDEPEND=" - acct-user/lsadm - acct-group/lsadm" - -PATCHES=( - "${FILESDIR}"/${PN}-link-boringssl-static-libs.patch - "${FILESDIR}"/${PN}-disable-build-deps-libs.patch - "${FILESDIR}"/${PN}-add-install-files.patch -) - -src_unpack() { - default - unpack boringssl-fips-20230428.tar.gz - mv boringssl-${BORINGSSL_COMMIT} "${S}"/src/boringssl || die -} - -src_configure() { - # LSWS variables - SERVERROOT=/usr/local/lsws - OPENLSWS_USER=nobody - OPENLSWS_GROUP=nobody - OPENLSWS_EMAIL=root@localhost - OPENLSWS_ADMINPORT=7080 - DEFAULT_TMP_DIR=/tmp/lshttpd - if use ruby ; then - RUBY_PATH=/usr/bin/ruby - else - RUBY_PATH= - fi - OPENLSWS_EXAMPLEPORT=8088 - - sed -e "s/%ADMIN_PORT%/$OPENLSWS_ADMINPORT/" "${S}/dist/admin/conf/admin_config.conf.in" > "${S}/dist/admin/conf/admin_config.conf" - sed -e "s/%USER%/$OPENLSWS_USER/" -e "s/%GROUP%/$OPENLSWS_GROUP/" -e "s#%DEFAULT_TMP_DIR%#$DEFAULT_TMP_DIR#" -e "s/%ADMIN_EMAIL%/$OPENLSWS_EMAIL/" -e "s/%HTTP_PORT%/$OPENLSWS_EXAMPLEPORT/" -e "s/%RUBY_BIN%/$RUBY_PATH/" "${S}/dist/conf/httpd_config.conf.in" > "${S}/dist/conf/httpd_config.conf" - sed "s:%LSWS_CTRL%:$SERVERROOT/bin/lswsctrl:" "${S}/dist/admin/misc/lsws.rc.in" > "${S}/dist/admin/misc/lsws.rc" - sed "s:%LSWS_CTRL%:$SERVERROOT/bin/lswsctrl:" "${S}/dist/admin/misc/lsws.rc.gentoo.in" > "${S}/dist/admin/misc/lsws.rc.gentoo" - sed "s:%LSWS_CTRL%:$SERVERROOT/bin/lswsctrl:" "${S}/dist/admin/misc/lshttpd.service.in" > "${S}/dist/admin/misc/lshttpd.service" - - local mycmakeargs=( - ) - cmake_src_configure -}