[gentoo-commits] repo/gentoo:master commit in: www-servers/h2o/, www-servers/h2o/files/

[Akinori Hattori]

commit:     682558ec1532a39401d0f08b508bf9712194d10c
Author:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 16 13:53:57 2024 +0000
Commit:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Sat Nov 16 14:01:30 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=682558ec

www-servers/h2o: tidy

Signed-off-by: Akinori Hattori <hattya <AT> gentoo.org>

 www-servers/h2o/files/h2o-2.3-mruby.patch | 4 ++--
 www-servers/h2o/h2o-9999.ebuild           | 7 +++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/www-servers/h2o/files/h2o-2.3-mruby.patch 
b/www-servers/h2o/files/h2o-2.3-mruby.patch
index 353af46a3af7..a0e9f12b935b 100644
--- a/www-servers/h2o/files/h2o-2.3-mruby.patch
+++ b/www-servers/h2o/files/h2o-2.3-mruby.patch
@@ -7,7 +7,7 @@
 +IF (PKG_CONFIG_FOUND)
 +    PKG_CHECK_MODULES(ONIG onigmo)
 +    IF (NOT ONIG_FOUND)
-+      PKG_CHECK_MODULES(ONIG oniguruma)
++        PKG_CHECK_MODULES(ONIG oniguruma)
 +    ENDIF (NOT ONIG_FOUND)
 +    IF (ONIG_FOUND)
 +        LINK_DIRECTORIES(${ONIG_LIBRARY_DIRS})
@@ -25,7 +25,7 @@
          # deps/mruby/tasks/toolchains/clang.rake looks for CC, CXX and LD.
          # There are no C++ files in deps/mruby, use the C compiler for 
linking.
 -        MRUBY_TOOLCHAIN=${MRUBY_TOOLCHAIN} CC=${CMAKE_C_COMPILER} 
CXX=${CMAKE_CXX_COMPILER} LD=${CMAKE_C_COMPILER} 
MRUBY_CONFIG=${CMAKE_CURRENT_SOURCE_DIR}/misc/mruby_config.rb 
MRUBY_BUILD_DIR=${CMAKE_CURRENT_BINARY_DIR}/mruby 
MRUBY_ADDITIONAL_CONFIG=${MRUBY_ADDITIONAL_CONFIG} 
INSTALL_DIR=${CMAKE_CURRENT_BINARY_DIR}/mruby-bin ruby minirake
-+      MRUBY_TOOLCHAIN=${MRUBY_TOOLCHAIN} CC=${CMAKE_C_COMPILER} 
CXX=${CMAKE_CXX_COMPILER} LD=${CMAKE_C_COMPILER} 
MRUBY_CONFIG=${CMAKE_CURRENT_SOURCE_DIR}/misc/mruby_config.rb 
MRUBY_BUILD_DIR=${CMAKE_CURRENT_BINARY_DIR}/mruby 
MRUBY_ADDITIONAL_CONFIG=${MRUBY_ADDITIONAL_CONFIG} 
INSTALL_DIR=${CMAKE_CURRENT_BINARY_DIR}/mruby-bin ruby minirake -v
++        MRUBY_TOOLCHAIN=${MRUBY_TOOLCHAIN} CC=${CMAKE_C_COMPILER} 
CXX=${CMAKE_CXX_COMPILER} LD=${CMAKE_C_COMPILER} 
MRUBY_CONFIG=${CMAKE_CURRENT_SOURCE_DIR}/misc/mruby_config.rb 
MRUBY_BUILD_DIR=${CMAKE_CURRENT_BINARY_DIR}/mruby 
MRUBY_ADDITIONAL_CONFIG=${MRUBY_ADDITIONAL_CONFIG} 
INSTALL_DIR=${CMAKE_CURRENT_BINARY_DIR}/mruby-bin ruby minirake -v
          WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/deps/mruby
          BYPRODUCTS "${CMAKE_CURRENT_BINARY_DIR}/mruby/host/lib/libmruby.a"
                     
"${CMAKE_CURRENT_BINARY_DIR}/mruby/host/mrbgems/mruby-onig-regexp/onigmo-6.2.0/.libs/libonigmo.a"

diff --git a/www-servers/h2o/h2o-9999.ebuild b/www-servers/h2o/h2o-9999.ebuild
index d23c024f17a0..c2052d1e15e2 100644
--- a/www-servers/h2o/h2o-9999.ebuild
+++ b/www-servers/h2o/h2o-9999.ebuild
@@ -34,10 +34,9 @@ DEPEND="${RDEPEND}
                        dev-libs/onigmo
                        dev-libs/oniguruma
                )
-               app-alternatives/yacc
-       )
-"
-BDEPEND="virtual/pkgconfig"
+       )"
+BDEPEND="virtual/pkgconfig
+       mruby? ( app-alternatives/yacc )"
 
 PATCHES=( "${FILESDIR}"/${PN}-2.3-mruby.patch )