summaryrefslogtreecommitdiff
path: root/dev-cpp
diff options
context:
space:
mode:
Diffstat (limited to 'dev-cpp')
-rw-r--r--dev-cpp/cppgir/Manifest1
-rw-r--r--dev-cpp/cppgir/cppgir-0_p20230606.ebuild43
-rw-r--r--dev-cpp/cppgir/files/cppgir-0_p20230606-fix-install-paths.patch13
-rw-r--r--dev-cpp/cppgir/files/cppgir-0_p20230606-prevent-automagic.patch42
-rw-r--r--dev-cpp/cppgir/files/cppgir-0_p20230606-system-expected-lite.patch37
-rw-r--r--dev-cpp/cppgir/metadata.xml16
-rw-r--r--dev-cpp/expected-lite/Manifest1
-rw-r--r--dev-cpp/expected-lite/expected-lite-0.6.3.ebuild25
-rw-r--r--dev-cpp/expected-lite/metadata.xml17
-rw-r--r--dev-cpp/kokkos/Manifest2
-rw-r--r--dev-cpp/kokkos/kokkos-3.1.01-r1.ebuild54
-rw-r--r--dev-cpp/kokkos/kokkos-3.7.0.ebuild56
-rw-r--r--dev-cpp/magic_enum/magic_enum-0.8.2.ebuild2
-rw-r--r--dev-cpp/sol2/sol2-3.3.0.ebuild4
14 files changed, 198 insertions, 115 deletions
diff --git a/dev-cpp/cppgir/Manifest b/dev-cpp/cppgir/Manifest
new file mode 100644
index 000000000000..74cef3ae99ab
--- /dev/null
+++ b/dev-cpp/cppgir/Manifest
@@ -0,0 +1 @@
+DIST cppgir-0_p20230606.tar.bz2 92576 BLAKE2B 47d43405eee8cebb782a3021e8398ce61ced23094424ced9f1bfaf390bfd83b7fa6e6fe5e0689886857cef3c992f9318de99d9e38362c2777a409cf597b55f7a SHA512 832c99379b0203db9b2cfefa530fc8f68411da5b0f121a37ab1b60dfa39e929a0d95971c4161a744dc5b3ddbb92848f1bbce9b265f9d4d5724084c08ab8fd4f4
diff --git a/dev-cpp/cppgir/cppgir-0_p20230606.ebuild b/dev-cpp/cppgir/cppgir-0_p20230606.ebuild
new file mode 100644
index 000000000000..67237396897c
--- /dev/null
+++ b/dev-cpp/cppgir/cppgir-0_p20230606.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="GObject-Introspection C++ binding wrapper generator"
+HOMEPAGE="https://gitlab.com/mnauw/cppgir"
+
+MY_PV="960fe054ffaab7cf55722fea6094c56a8ee8f18e"
+SRC_URI="https://gitlab.com/mnauw/cppgir/-/archive/${MY_PV}/cppgir-${MY_PV}.tar.bz2 -> ${P}.tar.bz2"
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+ dev-cpp/expected-lite
+ dev-libs/boost:=
+ dev-libs/libfmt:=
+"
+BDEPEND="
+ doc? ( app-text/ronn-ng )
+"
+
+PATCHES=(
+ "${FILESDIR}/cppgir-0_p20230606-system-expected-lite.patch"
+ "${FILESDIR}/cppgir-0_p20230606-fix-install-paths.patch"
+ "${FILESDIR}/cppgir-0_p20230606-prevent-automagic.patch"
+)
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_DOC=$(usex doc)
+ -DBUILD_TESTING=$(usex test)
+ )
+
+ cmake_src_configure
+}
diff --git a/dev-cpp/cppgir/files/cppgir-0_p20230606-fix-install-paths.patch b/dev-cpp/cppgir/files/cppgir-0_p20230606-fix-install-paths.patch
new file mode 100644
index 000000000000..c27d1e9f29b0
--- /dev/null
+++ b/dev-cpp/cppgir/files/cppgir-0_p20230606-fix-install-paths.patch
@@ -0,0 +1,13 @@
+Install cmake targets in correct directory
+
+--- cppgir-960fe054ffaab7cf55722fea6094c56a8ee8f18e.orig/CMakeLists.txt
++++ cppgir-960fe054ffaab7cf55722fea6094c56a8ee8f18e/CMakeLists.txt
+@@ -259,7 +259,7 @@
+ DESTINATION ${GI_IGNORE_FILE_INSTALL_DIR})
+
+ # cmake EXPORTS
+-set(CONFIG_PACKAGE_LOCATION lib/cmake/${PROJECT_NAME})
++set(CONFIG_PACKAGE_LOCATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME})
+ set(CONFIG_VERSION_NAME ${PROJECT_NAME}-config-version.cmake)
+ set(CONFIG_TARGETS_NAME ${PROJECT_NAME}-targets.cmake)
+ set(CONFIG_NAME ${PROJECT_NAME}-config.cmake)
diff --git a/dev-cpp/cppgir/files/cppgir-0_p20230606-prevent-automagic.patch b/dev-cpp/cppgir/files/cppgir-0_p20230606-prevent-automagic.patch
new file mode 100644
index 000000000000..8bb3ab5c4496
--- /dev/null
+++ b/dev-cpp/cppgir/files/cppgir-0_p20230606-prevent-automagic.patch
@@ -0,0 +1,42 @@
+Remove checks for libraries that are completely unnecessary
+
+--- cppgir-960fe054ffaab7cf55722fea6094c56a8ee8f18e.orig/CMakeLists.txt
++++ cppgir-960fe054ffaab7cf55722fea6094c56a8ee8f18e/CMakeLists.txt
+@@ -79,15 +79,14 @@
+ find_package(expected-lite REQUIRED)
+ target_link_libraries(gi PUBLIC expected-lite)
+
+-include(FindPkgConfig)
+-pkg_check_modules(GOBJECT gobject-2.0)
+-pkg_check_modules(GIO gio-2.0 gio-unix-2.0)
+-pkg_check_modules(GST gstreamer-1.0)
+-pkg_check_modules(GTK gtk+-3.0)
++if (BUILD_TESTING)
++ include(FindPkgConfig REQUIRED)
++ pkg_check_modules(GOBJECT gobject-2.0 REQUIRED)
++endif()
+
+ ## TEST ##
+
+-if (BUILD_TESTING AND GOBJECT_FOUND)
++if (BUILD_TESTING)
+ add_executable(gi-test test/main.cpp
+ test/test_object.c test/test_object.h test/test_boxed.c test/test_boxed.h)
+ target_include_directories(gi-test PRIVATE "gi" "override")
+@@ -113,7 +112,7 @@
+ set(EXAMPLE_TARGETS "")
+ set(EXAMPLE_NS "")
+
+-if (GOBJECT_FOUND)
++if (FALSE)
+ add_executable(example-gobject EXCLUDE_FROM_ALL examples/gobject.cpp)
+ target_compile_options(example-gobject PRIVATE ${GOBJECT_CFLAGS})
+ target_link_libraries(example-gobject PRIVATE ${GOBJECT_LDFLAGS})
+@@ -179,7 +178,6 @@
+ endif ()
+
+ # optional Qt example
+-find_package(Qt5Core 5.9)
+ if (Qt5Core_FOUND AND GIO_FOUND)
+ set(CMAKE_INCLUDE_CURRENT_DIR ON)
+ add_executable(example-gio-qt-async EXCLUDE_FROM_ALL examples/gio-qt-async.cpp)
diff --git a/dev-cpp/cppgir/files/cppgir-0_p20230606-system-expected-lite.patch b/dev-cpp/cppgir/files/cppgir-0_p20230606-system-expected-lite.patch
new file mode 100644
index 000000000000..096ed39dc03b
--- /dev/null
+++ b/dev-cpp/cppgir/files/cppgir-0_p20230606-system-expected-lite.patch
@@ -0,0 +1,37 @@
+Use system-wide copy of expected-lite
+
+--- cppgir-960fe054ffaab7cf55722fea6094c56a8ee8f18e.orig/CMakeLists.txt
++++ cppgir-960fe054ffaab7cf55722fea6094c56a8ee8f18e/CMakeLists.txt
+@@ -76,14 +76,8 @@
+ "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}/override>"
+ )
+
+-set(EXPECTED_LITE_INCLUDE "expected-lite/include")
+-if (EXISTS ${CMAKE_CURRENT_LIST_DIR}/${EXPECTED_LITE_INCLUDE}/nonstd/expected.hpp)
+- target_include_directories(gi INTERFACE
+- "$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/${EXPECTED_LITE_INCLUDE}>"
+- )
+-else ()
+- message (FATAL_ERROR "missing submodule expected-lite")
+-endif ()
++find_package(expected-lite REQUIRED)
++target_link_libraries(gi INTERFACE nonstd::expected-lite)
+
+ include(FindPkgConfig)
+ pkg_check_modules(GOBJECT gobject-2.0)
+@@ -241,8 +235,6 @@
+ # headers
+ install(DIRECTORY gi override
+ DESTINATION ${CMAKE_INSTALL_FULL_INCLUDEDIR}/${PROJECT_NAME})
+-install(DIRECTORY ${EXPECTED_LITE_INCLUDE}/nonstd
+- DESTINATION ${CMAKE_INSTALL_FULL_INCLUDEDIR}/${PROJECT_NAME}/gi)
+
+ # doc
+ install(FILES README.md docs/cppgir.md
+--- cppgir-960fe054ffaab7cf55722fea6094c56a8ee8f18e.orig/cmake/cppgir-config.cmake
++++ cppgir-960fe054ffaab7cf55722fea6094c56a8ee8f18e/cmake/cppgir-config.cmake
+@@ -1 +1,4 @@
++include(CMakeFindDependencyMacro)
++find_dependency(expected-lite)
++
+ include("${CMAKE_CURRENT_LIST_DIR}/cppgir-targets.cmake")
diff --git a/dev-cpp/cppgir/metadata.xml b/dev-cpp/cppgir/metadata.xml
new file mode 100644
index 000000000000..a11a5da01220
--- /dev/null
+++ b/dev-cpp/cppgir/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>esteve.varela@gmail.com</email>
+ <name>Esteve Varela Colominas</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <upstream>
+ <bugs-to>https://gitlab.com/mnauw/cppgir/-/issues</bugs-to>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata> \ No newline at end of file
diff --git a/dev-cpp/expected-lite/Manifest b/dev-cpp/expected-lite/Manifest
new file mode 100644
index 000000000000..fb7e7d57e588
--- /dev/null
+++ b/dev-cpp/expected-lite/Manifest
@@ -0,0 +1 @@
+DIST expected-lite-0.6.3.tar.gz 51878 BLAKE2B 7b9eb948d674d4fb4904c6deb4f2c8c2d578d73d8401dc386a49c5f09cc75c6fd70e0c6aa72cd1e1fb9d82cf55917c8a6d60868190ba063340eda4f3191ebc56 SHA512 d6a4f30f90494dda002ad27d227f17ce0201752178418d7dfada26441e853590d46816c88922e7d458dda68ad4414ddfe6b7fa4ed2a5854e4e3b22675b13f92a
diff --git a/dev-cpp/expected-lite/expected-lite-0.6.3.ebuild b/dev-cpp/expected-lite/expected-lite-0.6.3.ebuild
new file mode 100644
index 000000000000..2da5a0c9e12d
--- /dev/null
+++ b/dev-cpp/expected-lite/expected-lite-0.6.3.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Expected objects in C++11 and later in a single-file header-only library"
+HOMEPAGE="https://github.com/martinmoene/expected-lite"
+
+SRC_URI="https://github.com/martinmoene/expected-lite/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Boost-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+src_configure() {
+ local mycmakeargs=(
+ -DEXPECTED_LITE_OPT_BUILD_TESTS=$(usex test)
+ )
+
+ cmake_src_configure
+}
diff --git a/dev-cpp/expected-lite/metadata.xml b/dev-cpp/expected-lite/metadata.xml
new file mode 100644
index 000000000000..cf46ad5e73d5
--- /dev/null
+++ b/dev-cpp/expected-lite/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>esteve.varela@gmail.com</email>
+ <name>Esteve Varela Colominas</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <upstream>
+ <changelog>https://github.com/martinmoene/expected-lite/releases</changelog>
+ <bugs-to>https://github.com/martinmoene/expected-lite/issues</bugs-to>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata> \ No newline at end of file
diff --git a/dev-cpp/kokkos/Manifest b/dev-cpp/kokkos/Manifest
index f3d7d79b8a76..aead5200cb02 100644
--- a/dev-cpp/kokkos/Manifest
+++ b/dev-cpp/kokkos/Manifest
@@ -1,3 +1 @@
-DIST kokkos-3.1.01.tar.gz 1972707 BLAKE2B fe31556ecba6b01ed6e480f0cb4ca4d7dc487d6b2a7e52df94d0e93b864ed5269a752f4fcdbacb55383e9dee3b72236f121b67d2f5eed10f3351219b063e7099 SHA512 4fa428ec33ec207147b3fcc5e0d297bcff4ed772ba6baa24ccaf56b691b72b70c69bd48fdf134f4e78234bf755377fe01a31611a41539c2d211ba9caed24b1f2
-DIST kokkos-3.7.0.tar.gz 2301343 BLAKE2B b63ffc7c70141396986414375143d4df62a4bfffec0f0a346a278819557b42a025cd7f2a0825cd4d2d7c94a5c7c374b58be79dae9c45e012574b4c87c2ae0371 SHA512 f72b43096126cba11129ab44c2ebaeb1ee92b14db45bd451e86f40746e8edbfbe3415dee089080a6664ae4985e5796717c64bb5c508ca5e287b31bac248802f6
DIST kokkos-3.7.1.tar.gz 2305103 BLAKE2B c94493077190c1e5d2681d0e138012fcd82f91a1f7616ea7373f3c12f577a195937d507dd2d64f82902fa6760f63da8b3e2c1ef31a7114b9da21841280e22e33 SHA512 97cb7e05aec145ba9adae30b20ae3138a532db3a56cdd5e092d8f9c1e1788efe7a6f721282e2a5c5bf9c0da4c53d28f30b27fcb546b68aa8eaa589a362eb40c1
diff --git a/dev-cpp/kokkos/kokkos-3.1.01-r1.ebuild b/dev-cpp/kokkos/kokkos-3.1.01-r1.ebuild
deleted file mode 100644
index eaa8cf4e4ec1..000000000000
--- a/dev-cpp/kokkos/kokkos-3.1.01-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake toolchain-funcs
-
-DESCRIPTION="C++ Performance Portability Programming EcoSystem"
-HOMEPAGE="https://github.com/kokkos"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 -x86"
-IUSE="+openmp test"
-RESTRICT="!test? ( test )"
-
-DEPEND="sys-apps/hwloc:="
-RDEPEND="${DEPEND}"
-
-pkg_pretend() {
- [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
- [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-src_configure() {
- local mycmakeargs=(
- -DCMAKE_INSTALL_INCLUDEDIR=include/kokkos
- -DKokkos_ENABLE_TESTS=$(usex test)
- -DKokkos_ENABLE_AGGRESSIVE_VECTORIZATION=ON
- -DKokkos_ENABLE_DEPRECATED_CODE=ON
- -DKokkos_ENABLE_SERIAL=ON
- -DKokkos_ENABLE_HWLOC=ON
- -DKokkos_HWLOC_DIR="${EPREFIX}/usr"
- -DKokkos_ENABLE_OPENMP=$(usex openmp)
- -DBUILD_SHARED_LIBS=ON
- )
-
- cmake_src_configure
-}
-
-src_test() {
- local myctestargs=(
- # Contains "death tests" which are known/expected(?) to fail
- # https://github.com/kokkos/kokkos/issues/3033
- # bug #791514
- -E "(KokkosCore_UnitTest_OpenMP|KokkosCore_UnitTest_Serial)"
- )
-
- cmake_src_test
-}
diff --git a/dev-cpp/kokkos/kokkos-3.7.0.ebuild b/dev-cpp/kokkos/kokkos-3.7.0.ebuild
deleted file mode 100644
index 473cac731fff..000000000000
--- a/dev-cpp/kokkos/kokkos-3.7.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake toolchain-funcs
-
-DESCRIPTION="C++ Performance Portability Programming EcoSystem"
-HOMEPAGE="https://github.com/kokkos"
-MY_PV="${PV}0"
-SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 -x86"
-IUSE="+openmp test"
-RESTRICT="!test? ( test )"
-
-DEPEND="sys-apps/hwloc:="
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-pkg_pretend() {
- [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
- [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-src_configure() {
- local mycmakeargs=(
- -DCMAKE_INSTALL_INCLUDEDIR=include/kokkos
- -DKokkos_ENABLE_TESTS=$(usex test)
- -DKokkos_ENABLE_AGGRESSIVE_VECTORIZATION=ON
- -DKokkos_ENABLE_SERIAL=ON
- -DKokkos_ENABLE_HWLOC=ON
- -DKokkos_HWLOC_DIR="${EPREFIX}/usr"
- -DKokkos_ENABLE_OPENMP=$(usex openmp)
- -DBUILD_SHARED_LIBS=ON
- )
-
- cmake_src_configure
-}
-
-src_test() {
- local myctestargs=(
- # Contains "death tests" which are known/expected(?) to fail
- # https://github.com/kokkos/kokkos/issues/3033
- # bug #791514
- -E "(KokkosCore_UnitTest_OpenMP|KokkosCore_UnitTest_Serial)"
- )
-
- cmake_src_test
-}
diff --git a/dev-cpp/magic_enum/magic_enum-0.8.2.ebuild b/dev-cpp/magic_enum/magic_enum-0.8.2.ebuild
index df1937ee496b..b1ebf251d6c9 100644
--- a/dev-cpp/magic_enum/magic_enum-0.8.2.ebuild
+++ b/dev-cpp/magic_enum/magic_enum-0.8.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/Neargye/magic_enum/archive/refs/tags/v${PV}.tar.gz -
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm64"
IUSE="test"
# Tests fail to compile
RESTRICT="!test? ( test ) test"
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 )"