[gentoo-commits] repo/gentoo:master commit in: dev-cpp/sol2/

2023-10-16 Thread Yixun Lan 
commit: e3bee1aa5da83d36e9c193e974bd0c4b17048e75
Author: Alexey Sokolov  asokolov  org>
AuthorDate: Wed Sep 27 23:00:45 2023 +
Commit: Yixun Lan  gentoo  org>
CommitDate: Tue Oct 17 05:23:27 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3bee1aa

dev-cpp/sol2: drop 3.3.0

Signed-off-by: Alexey Sokolov  asokolov.org>
Signed-off-by: Yixun Lan  gentoo.org>

 dev-cpp/sol2/Manifest  |  1 -
 dev-cpp/sol2/sol2-3.3.0.ebuild | 67 --
 2 files changed, 68 deletions(-)

diff --git a/dev-cpp/sol2/Manifest b/dev-cpp/sol2/Manifest
index 4ed316b4b6cf..ca4b7ec7ad33 100644
--- a/dev-cpp/sol2/Manifest
+++ b/dev-cpp/sol2/Manifest
@@ -1,2 +1 @@
-DIST sol2-3.3.0.tar.gz 8453838 BLAKE2B 
dd4ae6471913a8e5de51c248d22b2b30a0ef29a597c5181026ac175d789836b9ea4c278db6860a360b1b2d59a2063a7538dfb06044cd89cfdf6612a7f60ecd63
 SHA512 
f1eba8f9ea270a3a3fff9c7a036d130ec848d065e54a8aefd2a19ad7f17dcb6b5744d979fac54c765e8317a4cdcf72e1b9d622d114f48c6502cf2db900c8d4a3
 DIST sol2-3.3.1.tar.gz 8453954 BLAKE2B 
f9fced4f001a5f681598e45bf74cdf064f655c950be5b91789d2bf66c0180b5048610d3d4416c024a07db11d41fceaee786800c5ca1412811cbc1a449a894a9e
 SHA512 
4404b124a4f331d77459c01a92cd73895301e7d3ef829a0285980f0138b9cc66782de3713d54f017d5aad7d8a11d23eeffbc5f3b39ccb4d4306a955711d385dd

diff --git a/dev-cpp/sol2/sol2-3.3.0.ebuild b/dev-cpp/sol2/sol2-3.3.0.ebuild
deleted file mode 100644
index 585aae692d6f..
--- a/dev-cpp/sol2/sol2-3.3.0.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-{1,3,4} luajit )
-inherit cmake lua
-
-DESCRIPTION="Header-only C++ <-> Lua API wrapper"
-HOMEPAGE="https://github.com/ThePhD/sol2;
-SRC_URI="https://github.com/ThePhD/sol2/archive/refs/tags/v${PV}.tar.gz -> 
${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="test"
-REQUIRED_USE="${LUA_REQUIRED_USE}"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-   ${LUA_DEPS}
-   test? (
-   >=dev-cpp/catch-3
-   )
-"
-BDEPEND="
-   virtual/pkgconfig
-"
-
-PATCHES=(
-   "${FILESDIR}"/sol2-3.3.0-werror.patch
-   "${FILESDIR}"/sol2-3.2.2-luajit-pkgconf.patch
-   "${FILESDIR}"/sol2-3.3.0-catch-depend.patch
-   "${FILESDIR}"/sol2-3.3.0-cmake-dir.patch
-   "${FILESDIR}"/sol2-3.3.0-dont-install-tests.patch
-)
-
-src_configure() {
-   sol2_configure_wrapper() {
-   local mycmakeargs=(
-   -DSOL2_BUILD_LUA=no
-   -DSOL2_TESTS=$(usex test)
-   -DSOL2_LUA_VERSION="${ELUA}"
-   )
-   cmake_src_configure
-   }
-   lua_foreach_impl sol2_configure_wrapper
-}
-
-src_compile() {
-   lua_foreach_impl cmake_src_compile
-}
-
-src_test() {
-   sol2_test_wrapper() {
-   if [[ ${ELUA} == luajit ]]; then
-   einfo "Skipping test due to 
https://github.com/ThePhD/sol2/issues/1221;
-   else
-   cmake_src_test
-   fi
-   }
-   lua_foreach_impl sol2_test_wrapper
-}
-
-src_install() {
-   lua_foreach_impl cmake_src_install
-}

[gentoo-commits] repo/gentoo:master commit in: dev-cpp/sol2/

2023-10-16 Thread Yixun Lan 
commit: 32b4c28c71ca38af0d9ad9f19364e60836210be0
Author: Alexey Sokolov  asokolov  org>
AuthorDate: Wed Sep 27 23:00:33 2023 +
Commit: Yixun Lan  gentoo  org>
CommitDate: Tue Oct 17 05:23:23 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32b4c28c

dev-cpp/sol2: add 3.3.1

Signed-off-by: Alexey Sokolov  asokolov.org>
Signed-off-by: Yixun Lan  gentoo.org>

 dev-cpp/sol2/Manifest  |  1 +
 dev-cpp/sol2/sol2-3.3.1.ebuild | 67 ++
 2 files changed, 68 insertions(+)

diff --git a/dev-cpp/sol2/Manifest b/dev-cpp/sol2/Manifest
index a869853e1dd1..4ed316b4b6cf 100644
--- a/dev-cpp/sol2/Manifest
+++ b/dev-cpp/sol2/Manifest
@@ -1 +1,2 @@
 DIST sol2-3.3.0.tar.gz 8453838 BLAKE2B 
dd4ae6471913a8e5de51c248d22b2b30a0ef29a597c5181026ac175d789836b9ea4c278db6860a360b1b2d59a2063a7538dfb06044cd89cfdf6612a7f60ecd63
 SHA512 
f1eba8f9ea270a3a3fff9c7a036d130ec848d065e54a8aefd2a19ad7f17dcb6b5744d979fac54c765e8317a4cdcf72e1b9d622d114f48c6502cf2db900c8d4a3
+DIST sol2-3.3.1.tar.gz 8453954 BLAKE2B 
f9fced4f001a5f681598e45bf74cdf064f655c950be5b91789d2bf66c0180b5048610d3d4416c024a07db11d41fceaee786800c5ca1412811cbc1a449a894a9e
 SHA512 
4404b124a4f331d77459c01a92cd73895301e7d3ef829a0285980f0138b9cc66782de3713d54f017d5aad7d8a11d23eeffbc5f3b39ccb4d4306a955711d385dd

diff --git a/dev-cpp/sol2/sol2-3.3.1.ebuild b/dev-cpp/sol2/sol2-3.3.1.ebuild
new file mode 100644
index ..585aae692d6f
--- /dev/null
+++ b/dev-cpp/sol2/sol2-3.3.1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{1,3,4} luajit )
+inherit cmake lua
+
+DESCRIPTION="Header-only C++ <-> Lua API wrapper"
+HOMEPAGE="https://github.com/ThePhD/sol2;
+SRC_URI="https://github.com/ThePhD/sol2/archive/refs/tags/v${PV}.tar.gz -> 
${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="test"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+   ${LUA_DEPS}
+   test? (
+   >=dev-cpp/catch-3
+   )
+"
+BDEPEND="
+   virtual/pkgconfig
+"
+
+PATCHES=(
+   "${FILESDIR}"/sol2-3.3.0-werror.patch
+   "${FILESDIR}"/sol2-3.2.2-luajit-pkgconf.patch
+   "${FILESDIR}"/sol2-3.3.0-catch-depend.patch
+   "${FILESDIR}"/sol2-3.3.0-cmake-dir.patch
+   "${FILESDIR}"/sol2-3.3.0-dont-install-tests.patch
+)
+
+src_configure() {
+   sol2_configure_wrapper() {
+   local mycmakeargs=(
+   -DSOL2_BUILD_LUA=no
+   -DSOL2_TESTS=$(usex test)
+   -DSOL2_LUA_VERSION="${ELUA}"
+   )
+   cmake_src_configure
+   }
+   lua_foreach_impl sol2_configure_wrapper
+}
+
+src_compile() {
+   lua_foreach_impl cmake_src_compile
+}
+
+src_test() {
+   sol2_test_wrapper() {
+   if [[ ${ELUA} == luajit ]]; then
+   einfo "Skipping test due to 
https://github.com/ThePhD/sol2/issues/1221;
+   else
+   cmake_src_test
+   fi
+   }
+   lua_foreach_impl sol2_test_wrapper
+}
+
+src_install() {
+   lua_foreach_impl cmake_src_install
+}

[gentoo-commits] repo/gentoo:master commit in: dev-cpp/sol2/

2023-07-28 Thread Arthur Zamarin 
commit: 1f81442064b7654bd3867e8ecb97e50fe8dcc092
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Jul 28 17:56:08 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Jul 28 17:56:08 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f814420

dev-cpp/sol2: Keyword 3.3.0 ppc64, #908285

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-cpp/sol2/sol2-3.3.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-cpp/sol2/sol2-3.3.0.ebuild b/dev-cpp/sol2/sol2-3.3.0.ebuild
index 7f9c9351ad92..585aae692d6f 100644
--- a/dev-cpp/sol2/sol2-3.3.0.ebuild
+++ b/dev-cpp/sol2/sol2-3.3.0.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://github.com/ThePhD/sol2/archive/refs/tags/v${PV}.tar.gz -> ${P}.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE="test"
 REQUIRED_USE="${LUA_REQUIRED_USE}"
 RESTRICT="!test? ( test )"

[gentoo-commits] repo/gentoo:master commit in: dev-cpp/sol2/

2023-06-10 Thread Sam James 
commit: 123a42b0c1a42017916c30eb02b2041e2bc4ec2b
Author: Sam James  gentoo  org>
AuthorDate: Sat Jun 10 22:34:40 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jun 10 22:34:40 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=123a42b0

dev-cpp/sol2: Keyword 3.3.0 arm64, #908285

Signed-off-by: Sam James  gentoo.org>

 dev-cpp/sol2/sol2-3.3.0.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-cpp/sol2/sol2-3.3.0.ebuild b/dev-cpp/sol2/sol2-3.3.0.ebuild
index 50d295903f95..7f9c9351ad92 100644
--- a/dev-cpp/sol2/sol2-3.3.0.ebuild
+++ b/dev-cpp/sol2/sol2-3.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021-2022 Gentoo Authors
+# Copyright 2021-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ 
SRC_URI="https://github.com/ThePhD/sol2/archive/refs/tags/v${PV}.tar.gz -> ${P}.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="test"
 REQUIRED_USE="${LUA_REQUIRED_USE}"
 RESTRICT="!test? ( test )"

[gentoo-commits] repo/gentoo:master commit in: dev-cpp/sol2/, dev-cpp/sol2/files/

2022-11-19 Thread David Seifert 
commit: b8bd80dea895c761a826d6757e1b64f0a947426a
Author: Alexey Sokolov  asokolov  org>
AuthorDate: Sat Nov 19 20:30:27 2022 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Nov 19 20:30:27 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8bd80de

dev-cpp/sol2: drop 3.2.2

Signed-off-by: Alexey Sokolov  asokolov.org>
Signed-off-by: David Seifert  gentoo.org>

 dev-cpp/sol2/Manifest|  1 -
 dev-cpp/sol2/files/sol2-3.2.2-catch-depend.patch | 27 
 dev-cpp/sol2/files/sol2-3.2.2-gcc11.patch| 10 ---
 dev-cpp/sol2/sol2-3.2.2.ebuild   | 80 
 4 files changed, 118 deletions(-)

diff --git a/dev-cpp/sol2/Manifest b/dev-cpp/sol2/Manifest
index 1c68bf805c6d..a869853e1dd1 100644
--- a/dev-cpp/sol2/Manifest
+++ b/dev-cpp/sol2/Manifest
@@ -1,2 +1 @@
-DIST sol2-3.2.2.tar.gz 8531029 BLAKE2B 
65fd220f5109e4917d06d5ef906ceccb7e292276f69bd49dfd826089a77e566af1811fdf660ffbfbd2437dca4b86ef5c4790dace9029805926e1ee0445b2e965
 SHA512 
e5a739b37aea7150f141f6a003c2689dd33155feed5bb3cf2569abbfe9f0062eacdaaf346be523d627f0e491b35e68822c80e1117fa09ece8c9d8d5af09fdbec
 DIST sol2-3.3.0.tar.gz 8453838 BLAKE2B 
dd4ae6471913a8e5de51c248d22b2b30a0ef29a597c5181026ac175d789836b9ea4c278db6860a360b1b2d59a2063a7538dfb06044cd89cfdf6612a7f60ecd63
 SHA512 
f1eba8f9ea270a3a3fff9c7a036d130ec848d065e54a8aefd2a19ad7f17dcb6b5744d979fac54c765e8317a4cdcf72e1b9d622d114f48c6502cf2db900c8d4a3

diff --git a/dev-cpp/sol2/files/sol2-3.2.2-catch-depend.patch 
b/dev-cpp/sol2/files/sol2-3.2.2-catch-depend.patch
deleted file mode 100644
index 2da3c00c1612..
--- a/dev-cpp/sol2/files/sol2-3.2.2-catch-depend.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Use catch library from system
-
 a/tests/runtime_tests/CMakeLists.txt
-+++ b/tests/runtime_tests/CMakeLists.txt
-@@ -22,12 +22,6 @@
- 
- # # # # sol3 tests - runtime tests
- 
--if (CMAKE_GENERATOR MATCHES "Visual Studio 14 2015")
--  find_package(Catch 1.12.1 REQUIRED)
--else()
--  find_package(Catch REQUIRED)
--endif()
--
- file(GLOB SOL2_RUNTIME_TEST_SOURCES source/*.cpp)
- source_group(test_sources FILES ${SOL2_RUNTIME_TEST_SOURCES})
- 
-@@ -38,7 +32,8 @@ function(CREATE_TEST test_target_name test_name target_sol)
-   OUTPUT_NAME ${test_name}
-   EXPORT_NAME sol2::${test_name})
-   target_link_libraries(${test_target_name} 
--  PUBLIC Threads::Threads ${LUA_LIBRARIES} ${CATCH_LIBRARIES} 
${target_sol})
-+  PUBLIC Threads::Threads ${LUA_LIBRARIES} ${target_sol})
-+  target_include_directories(${test_target_name} PRIVATE ${CATCH_INC_DIR})
-   
-   if (MSVC)
-   if (NOT CMAKE_COMPILER_ID MATCHES "Clang")

diff --git a/dev-cpp/sol2/files/sol2-3.2.2-gcc11.patch 
b/dev-cpp/sol2/files/sol2-3.2.2-gcc11.patch
deleted file mode 100644
index cc8c6bb1b4f7..
--- a/dev-cpp/sol2/files/sol2-3.2.2-gcc11.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-Add missing include needed for tests (and possibly consumers) with gcc11.
-
-Fixed upstream in:
-https://github.com/ThePhD/sol2/commit/e5e6466e09b632677d24a8f204d6a0ea0a8862b1
 a/include/sol/stack_core.hpp
-+++ b/include/sol/stack_core.hpp
-@@ -42,2 +42,3 @@
- #include 
-+#include 
- #include 

diff --git a/dev-cpp/sol2/sol2-3.2.2.ebuild b/dev-cpp/sol2/sol2-3.2.2.ebuild
deleted file mode 100644
index 8af75c6deec7..
--- a/dev-cpp/sol2/sol2-3.2.2.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1,3,4} luajit )
-inherit cmake lua
-
-DESCRIPTION="Header-only C++ <-> Lua API wrapper"
-HOMEPAGE="https://github.com/ThePhD/sol2;
-SRC_URI="https://github.com/ThePhD/sol2/archive/refs/tags/v${PV}.tar.gz -> 
${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-REQUIRED_USE="test? ( ${LUA_REQUIRED_USE} )"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-   test? (
-   ${LUA_DEPS}
-   dev-cpp/catch:0
-   )
-"
-BDEPEND="
-   test? (
-   virtual/pkgconfig
-   )
-"
-
-PATCHES=(
-   "${FILESDIR}"/${P}-gcc11.patch
-   "${FILESDIR}"/${P}-luajit-pkgconf.patch
-   "${FILESDIR}"/${P}-catch-depend.patch
-)
-
-src_prepare() {
-   # TODO: remove this sed on next bump
-   sed -i -e 's/-Werror//' \
-   tests/runtime_tests/CMakeLists.txt \
-   tests/regression_tests/1011/CMakeLists.txt \
-   tests/config_tests/function_pointers/CMakeLists.txt \
-   examples/customization/CMakeLists.txt \
-   examples/CMakeLists.txt || die
-
-   cmake_src_prepare
-}
-
-src_configure() {
-   cmake_src_configure
-
-   if use test; then
-   sol2_configure_wrapper() {
-   local mycmakeargs=(
-   -DSOL2_BUILD_LUA=no
-   -DSOL2_TESTS=yes
-

[gentoo-commits] repo/gentoo:master commit in: dev-cpp/sol2/, dev-cpp/sol2/files/

2022-09-26 Thread Ionen Wolkens 
commit: 9a6d9c1ece3205412ae0e6f3f36777ce7e203138
Author: Alexey Sokolov  asokolov  org>
AuthorDate: Sun Sep 25 21:30:27 2022 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Mon Sep 26 09:34:09 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a6d9c1e

dev-cpp/sol2: add 3.3.0

Signed-off-by: Alexey Sokolov  asokolov.org>
Closes: https://bugs.gentoo.org/864169
Closes: https://github.com/gentoo/gentoo/pull/27456
Signed-off-by: Ionen Wolkens  gentoo.org>

 dev-cpp/sol2/Manifest  |  1 +
 dev-cpp/sol2/files/sol2-3.3.0-catch-depend.patch   | 16 +
 dev-cpp/sol2/files/sol2-3.3.0-cmake-dir.patch  | 31 ++
 .../sol2/files/sol2-3.3.0-dont-install-tests.patch | 10 +++
 dev-cpp/sol2/files/sol2-3.3.0-werror.patch | 21 +++
 dev-cpp/sol2/sol2-3.3.0.ebuild | 71 ++
 6 files changed, 150 insertions(+)

diff --git a/dev-cpp/sol2/Manifest b/dev-cpp/sol2/Manifest
index 88055ed75b0e..1c68bf805c6d 100644
--- a/dev-cpp/sol2/Manifest
+++ b/dev-cpp/sol2/Manifest
@@ -1 +1,2 @@
 DIST sol2-3.2.2.tar.gz 8531029 BLAKE2B 
65fd220f5109e4917d06d5ef906ceccb7e292276f69bd49dfd826089a77e566af1811fdf660ffbfbd2437dca4b86ef5c4790dace9029805926e1ee0445b2e965
 SHA512 
e5a739b37aea7150f141f6a003c2689dd33155feed5bb3cf2569abbfe9f0062eacdaaf346be523d627f0e491b35e68822c80e1117fa09ece8c9d8d5af09fdbec
+DIST sol2-3.3.0.tar.gz 8453838 BLAKE2B 
dd4ae6471913a8e5de51c248d22b2b30a0ef29a597c5181026ac175d789836b9ea4c278db6860a360b1b2d59a2063a7538dfb06044cd89cfdf6612a7f60ecd63
 SHA512 
f1eba8f9ea270a3a3fff9c7a036d130ec848d065e54a8aefd2a19ad7f17dcb6b5744d979fac54c765e8317a4cdcf72e1b9d622d114f48c6502cf2db900c8d4a3

diff --git a/dev-cpp/sol2/files/sol2-3.3.0-catch-depend.patch 
b/dev-cpp/sol2/files/sol2-3.3.0-catch-depend.patch
new file mode 100644
index ..8f53144ad37c
--- /dev/null
+++ b/dev-cpp/sol2/files/sol2-3.3.0-catch-depend.patch
@@ -0,0 +1,16 @@
+--- a/tests/CMakeLists.txt
 b/tests/CMakeLists.txt
+@@ -23,12 +23,7 @@
+ # # # # sol2 tests
+ 
+ # # Dependencies
+-FetchContent_Declare(
+-  catch2
+-  GIT_REPOSITORY https://github.com/catchorg/Catch2.git
+-  GIT_TAG devel
+-)
+-FetchContent_MakeAvailable(catch2)
++find_package(Catch2 REQUIRED)
+ 
+ function(sol2_add_test_properties target-name)
+   target_link_libraries(${target-name}

diff --git a/dev-cpp/sol2/files/sol2-3.3.0-cmake-dir.patch 
b/dev-cpp/sol2/files/sol2-3.3.0-cmake-dir.patch
new file mode 100644
index ..6782b05abf78
--- /dev/null
+++ b/dev-cpp/sol2/files/sol2-3.3.0-cmake-dir.patch
@@ -0,0 +1,31 @@
+Install to share, it's header-only
+
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -105,7 +105,7 @@ target_include_directories(sol2 ${sol2-system-include}
+ configure_package_config_file(
+   cmake/sol2-config.cmake.in
+   "${CMAKE_CURRENT_BINARY_DIR}/cmake/sol2-config.cmake"
+-  INSTALL_DESTINATION lib/cmake/sol2
++  INSTALL_DESTINATION ${CMAKE_INSTALL_DATADIR}/cmake/sol2
+   NO_CHECK_REQUIRED_COMPONENTS_MACRO)
+ 
+ write_basic_package_version_file(
+@@ -121,7 +121,7 @@ if(SOL2_ENABLE_INSTALL)
+ 
+   install(EXPORT sol2
+   FILE sol2-targets.cmake
+-  DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/sol2")
++  DESTINATION "${CMAKE_INSTALL_DATADIR}/cmake/sol2")
+ 
+   install(DIRECTORY include/sol
+   DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
+@@ -129,7 +129,7 @@ if(SOL2_ENABLE_INSTALL)
+   install(FILES
+   "${CMAKE_CURRENT_BINARY_DIR}/cmake/sol2-config.cmake"
+   "${CMAKE_CURRENT_BINARY_DIR}/cmake/sol2-config-version.cmake"
+-  DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/sol2")
++  DESTINATION "${CMAKE_INSTALL_DATADIR}/cmake/sol2")
+ endif()
+ 
+ # # # sol2 Library - Single header target

diff --git a/dev-cpp/sol2/files/sol2-3.3.0-dont-install-tests.patch 
b/dev-cpp/sol2/files/sol2-3.3.0-dont-install-tests.patch
new file mode 100644
index ..e1186958973a
--- /dev/null
+++ b/dev-cpp/sol2/files/sol2-3.3.0-dont-install-tests.patch
@@ -0,0 +1,10 @@
+--- a/tests/CMakeLists.txt
 b/tests/CMakeLists.txt
+@@ -60,7 +60,6 @@ function(sol2_add_test_properties target-name)
+   
+   add_test(NAME ${target-name} COMMAND ${target-name})
+   if(SOL2_ENABLE_INSTALL)
+-  install(TARGETS ${target-name} RUNTIME DESTINATION bin)
+   endif()
+ endfunction()
+ 

diff --git a/dev-cpp/sol2/files/sol2-3.3.0-werror.patch 
b/dev-cpp/sol2/files/sol2-3.3.0-werror.patch
new file mode 100644
index ..27118f38cafd
--- /dev/null
+++ b/dev-cpp/sol2/files/sol2-3.3.0-werror.patch
@@ -0,0 +1,21 @@
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -208,7 +208,6 @@ if (sol2-is-top-level-project)
+   check_compiler_flag(warn-pedantic GCC -Wpedantic)
+   check_compiler_flag(warn-all MSVC /W4 GCC -Wall)
+   check_compiler_flag(warn-extra GCC -Wextra)
+-

[gentoo-commits] repo/gentoo:master commit in: dev-cpp/sol2/

2022-09-26 Thread Ionen Wolkens 
commit: f1f51d320499d055f887d4d83647d02b4c44ad6a
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Mon Sep 26 09:38:55 2022 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Mon Sep 26 09:41:08 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1f51d32

dev-cpp/sol2: remove unnecessary src_prepare

Formerly used for a sed but obsolete now.

Signed-off-by: Ionen Wolkens  gentoo.org>

 dev-cpp/sol2/sol2-3.3.0.ebuild | 4 
 1 file changed, 4 deletions(-)

diff --git a/dev-cpp/sol2/sol2-3.3.0.ebuild b/dev-cpp/sol2/sol2-3.3.0.ebuild
index 7ee94fefcfe3..50d295903f95 100644
--- a/dev-cpp/sol2/sol2-3.3.0.ebuild
+++ b/dev-cpp/sol2/sol2-3.3.0.ebuild
@@ -35,10 +35,6 @@ PATCHES=(
"${FILESDIR}"/sol2-3.3.0-dont-install-tests.patch
 )
 
-src_prepare() {
-   cmake_src_prepare
-}
-
 src_configure() {
sol2_configure_wrapper() {
local mycmakeargs=(

[gentoo-commits] repo/gentoo:master commit in: dev-cpp/sol2/, dev-cpp/sol2/files/

2021-07-13 Thread Ionen Wolkens 
commit: 35da96df067a8a2cb5f983830b0f63f744000820
Author: Alexey Sokolov  asokolov  org>
AuthorDate: Sun Jul 11 23:29:46 2021 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Wed Jul 14 05:46:17 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35da96df

dev-cpp/sol2: new package 3.2.2

games-engines/openmw-0.48 will depend on it

Package-Manager: Portage-3.0.20, Repoman-3.0.2
Signed-off-by: Alexey Sokolov  asokolov.org>
Signed-off-by: Ionen Wolkens  gentoo.org>

 dev-cpp/sol2/Manifest  |  2 +
 dev-cpp/sol2/files/sol2-3.2.2-catch-depend.patch   | 27 +++
 dev-cpp/sol2/files/sol2-3.2.2-luajit-pkgconf.patch | 17 +
 dev-cpp/sol2/metadata.xml  | 19 +
 dev-cpp/sol2/sol2-3.2.2.ebuild | 83 ++
 5 files changed, 148 insertions(+)

diff --git a/dev-cpp/sol2/Manifest b/dev-cpp/sol2/Manifest
new file mode 100644
index 000..b298932cab9
--- /dev/null
+++ b/dev-cpp/sol2/Manifest
@@ -0,0 +1,2 @@
+DIST sol2-3.2.2-gcc11.patch 24788 BLAKE2B 
bc50d638c6414d86af7a744c26c3eae05400d593caeca725d3d15e81a76bcb22817994cdbb884c795aaa157e8c3de0753e38c6352e57dc081e001e8e245aa9a7
 SHA512 
98bb29cf7e89306ed7e9d350dc924b5fa10d51cb7ff4eb3ac873775d17c3b8849a37d6c1566fe9eb18222b524d648b4268d513fb0a2e7d272a4a6032eda10930
+DIST sol2-3.2.2.tar.gz 8531029 BLAKE2B 
65fd220f5109e4917d06d5ef906ceccb7e292276f69bd49dfd826089a77e566af1811fdf660ffbfbd2437dca4b86ef5c4790dace9029805926e1ee0445b2e965
 SHA512 
e5a739b37aea7150f141f6a003c2689dd33155feed5bb3cf2569abbfe9f0062eacdaaf346be523d627f0e491b35e68822c80e1117fa09ece8c9d8d5af09fdbec

diff --git a/dev-cpp/sol2/files/sol2-3.2.2-catch-depend.patch 
b/dev-cpp/sol2/files/sol2-3.2.2-catch-depend.patch
new file mode 100644
index 000..2da3c00c161
--- /dev/null
+++ b/dev-cpp/sol2/files/sol2-3.2.2-catch-depend.patch
@@ -0,0 +1,27 @@
+Use catch library from system
+
+--- a/tests/runtime_tests/CMakeLists.txt
 b/tests/runtime_tests/CMakeLists.txt
+@@ -22,12 +22,6 @@
+ 
+ # # # # sol3 tests - runtime tests
+ 
+-if (CMAKE_GENERATOR MATCHES "Visual Studio 14 2015")
+-  find_package(Catch 1.12.1 REQUIRED)
+-else()
+-  find_package(Catch REQUIRED)
+-endif()
+-
+ file(GLOB SOL2_RUNTIME_TEST_SOURCES source/*.cpp)
+ source_group(test_sources FILES ${SOL2_RUNTIME_TEST_SOURCES})
+ 
+@@ -38,7 +32,8 @@ function(CREATE_TEST test_target_name test_name target_sol)
+   OUTPUT_NAME ${test_name}
+   EXPORT_NAME sol2::${test_name})
+   target_link_libraries(${test_target_name} 
+-  PUBLIC Threads::Threads ${LUA_LIBRARIES} ${CATCH_LIBRARIES} 
${target_sol})
++  PUBLIC Threads::Threads ${LUA_LIBRARIES} ${target_sol})
++  target_include_directories(${test_target_name} PRIVATE ${CATCH_INC_DIR})
+   
+   if (MSVC)
+   if (NOT CMAKE_COMPILER_ID MATCHES "Clang")

diff --git a/dev-cpp/sol2/files/sol2-3.2.2-luajit-pkgconf.patch 
b/dev-cpp/sol2/files/sol2-3.2.2-luajit-pkgconf.patch
new file mode 100644
index 000..9b9c9f10176
--- /dev/null
+++ b/dev-cpp/sol2/files/sol2-3.2.2-luajit-pkgconf.patch
@@ -0,0 +1,17 @@
+Use the lua version selected by lua eclass
+
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -188,7 +188,11 @@ if (SOL2_IS_TOP_LEVEL AND (SOL2_DO_TESTS OR 
SOL2_DO_EXAMPLES))
+ 
+   string(TOLOWER ${SOL2_LUA_VERSION} NORMALIZED_LUA_VERSION)
+   # Find way to get Lua: build if requested, or attempt to build if no 
matching version is found
+-  if (SOL2_BUILD_LUA)
++  if (TRUE)
++  find_package(PkgConfig REQUIRED)
++  pkg_check_modules(LUA REQUIRED lua IMPORTED_TARGET)
++  set(LUA_LIBRARIES PkgConfig::LUA)
++  elseif (SOL2_BUILD_LUA)
+   find_package(LuaBuild REQUIRED COMPONENTS ${SOL2_LUA_VERSION})
+   elseif (NOT SOL2_LUA_VERSION)
+   find_package(LuaBuild REQUIRED)

diff --git a/dev-cpp/sol2/metadata.xml b/dev-cpp/sol2/metadata.xml
new file mode 100644
index 000..4376dd4a461
--- /dev/null
+++ b/dev-cpp/sol2/metadata.xml
@@ -0,0 +1,19 @@
+
+http://www.gentoo.org/dtd/metadata.dtd;>
+
+   
+   alexey+gen...@asokolov.org
+   Alexey Sokolov
+   
+   
+   proxy-ma...@gentoo.org
+   Proxy Maintainers
+   
+   
+   ga...@gentoo.org
+   Gentoo Games Project
+   
+   
+   ThePhD/sol2
+   
+

diff --git a/dev-cpp/sol2/sol2-3.2.2.ebuild b/dev-cpp/sol2/sol2-3.2.2.ebuild
new file mode 100644
index 000..4a8b270ac71
--- /dev/null
+++ b/dev-cpp/sol2/sol2-3.2.2.ebuild
@@ -0,0 +1,83 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1,3,4} luajit )
+inherit cmake lua
+
+DESCRIPTION="Header-only C++ <-> Lua API wrapper"
+HOMEPAGE="https://github.com/ThePhD/sol2;
+SRC_URI="
+

[gentoo-commits] repo/gentoo:master commit in: dev-cpp/sol2/files/, dev-cpp/sol2/

2021-07-13 Thread Ionen Wolkens 
commit: 16dbaad166c01dc830f0d42c4d915c1f5b18f775
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Wed Jul 14 03:22:56 2021 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Wed Jul 14 05:46:21 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16dbaad1

dev-cpp/sol2: use smaller gcc11 patch

Upstream's commit that fixes this has too many unrelated changes.

Signed-off-by: Ionen Wolkens  gentoo.org>

 dev-cpp/sol2/Manifest |  1 -
 dev-cpp/sol2/files/sol2-3.2.2-gcc11.patch | 10 ++
 dev-cpp/sol2/sol2-3.2.2.ebuild|  7 ++-
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/dev-cpp/sol2/Manifest b/dev-cpp/sol2/Manifest
index b298932cab9..88055ed75b0 100644
--- a/dev-cpp/sol2/Manifest
+++ b/dev-cpp/sol2/Manifest
@@ -1,2 +1 @@
-DIST sol2-3.2.2-gcc11.patch 24788 BLAKE2B 
bc50d638c6414d86af7a744c26c3eae05400d593caeca725d3d15e81a76bcb22817994cdbb884c795aaa157e8c3de0753e38c6352e57dc081e001e8e245aa9a7
 SHA512 
98bb29cf7e89306ed7e9d350dc924b5fa10d51cb7ff4eb3ac873775d17c3b8849a37d6c1566fe9eb18222b524d648b4268d513fb0a2e7d272a4a6032eda10930
 DIST sol2-3.2.2.tar.gz 8531029 BLAKE2B 
65fd220f5109e4917d06d5ef906ceccb7e292276f69bd49dfd826089a77e566af1811fdf660ffbfbd2437dca4b86ef5c4790dace9029805926e1ee0445b2e965
 SHA512 
e5a739b37aea7150f141f6a003c2689dd33155feed5bb3cf2569abbfe9f0062eacdaaf346be523d627f0e491b35e68822c80e1117fa09ece8c9d8d5af09fdbec

diff --git a/dev-cpp/sol2/files/sol2-3.2.2-gcc11.patch 
b/dev-cpp/sol2/files/sol2-3.2.2-gcc11.patch
new file mode 100644
index 000..cc8c6bb1b4f
--- /dev/null
+++ b/dev-cpp/sol2/files/sol2-3.2.2-gcc11.patch
@@ -0,0 +1,10 @@
+Add missing include needed for tests (and possibly consumers) with gcc11.
+
+Fixed upstream in:
+https://github.com/ThePhD/sol2/commit/e5e6466e09b632677d24a8f204d6a0ea0a8862b1
+--- a/include/sol/stack_core.hpp
 b/include/sol/stack_core.hpp
+@@ -42,2 +42,3 @@
+ #include 
++#include 
+ #include 

diff --git a/dev-cpp/sol2/sol2-3.2.2.ebuild b/dev-cpp/sol2/sol2-3.2.2.ebuild
index 4a8b270ac71..8af75c6deec 100644
--- a/dev-cpp/sol2/sol2-3.2.2.ebuild
+++ b/dev-cpp/sol2/sol2-3.2.2.ebuild
@@ -8,10 +8,7 @@ inherit cmake lua
 
 DESCRIPTION="Header-only C++ <-> Lua API wrapper"
 HOMEPAGE="https://github.com/ThePhD/sol2;
-SRC_URI="
-   https://github.com/ThePhD/sol2/archive/refs/tags/v${PV}.tar.gz -> 
${P}.tar.gz
-   
https://github.com/ThePhD/sol2/commit/e5e6466e09b632677d24a8f204d6a0ea0a8862b1.patch
 -> ${P}-gcc11.patch
-"
+SRC_URI="https://github.com/ThePhD/sol2/archive/refs/tags/v${PV}.tar.gz -> 
${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
@@ -33,7 +30,7 @@ BDEPEND="
 "
 
 PATCHES=(
-   "${DISTDIR}"/${P}-gcc11.patch
+   "${FILESDIR}"/${P}-gcc11.patch
"${FILESDIR}"/${P}-luajit-pkgconf.patch
"${FILESDIR}"/${P}-catch-depend.patch
 )