diff options
22 files changed, 452 insertions, 141 deletions
diff --git a/dev-libs/poco/poco-1.10.1.ebuild b/dev-libs/poco/poco-1.10.1.ebuild index 47a8c8a18c4c..45c67056b20f 100644 --- a/dev-libs/poco/poco-1.10.1.ebuild +++ b/dev-libs/poco/poco-1.10.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}-${P}-release" LICENSE="Boost-1.0" SLOT="0" -KEYWORDS="amd64 arm x86" +KEYWORDS="amd64 arm ~ppc64 x86" IUSE="7z cppparser +crypto +data examples +file2pagecompiler iodbc +json mariadb +mongodb mysql +net odbc +pagecompiler pdf pocodoc sqlite +ssl test +util +xml +zip" RESTRICT="!test? ( test )" REQUIRED_USE=" diff --git a/gui-libs/egl-gbm/egl-gbm-1.1.0.ebuild b/gui-libs/egl-gbm/egl-gbm-1.1.0.ebuild index 97fb97952455..78535326e897 100644 --- a/gui-libs/egl-gbm/egl-gbm-1.1.0.ebuild +++ b/gui-libs/egl-gbm/egl-gbm-1.1.0.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/NVIDIA/egl-gbm/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="amd64" +KEYWORDS="amd64 ~arm64" RDEPEND=" >=media-libs/mesa-21.2[gbm(+)] diff --git a/gui-libs/egl-wayland/egl-wayland-1.1.7-r1.ebuild b/gui-libs/egl-wayland/egl-wayland-1.1.7-r1.ebuild index 088724525cf1..be21463cf525 100644 --- a/gui-libs/egl-wayland/egl-wayland-1.1.7-r1.ebuild +++ b/gui-libs/egl-wayland/egl-wayland-1.1.7-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="https://github.com/NVIDIA/egl-wayland/archive/${PV}.tar.gz -> ${P}.tar. LICENSE="MIT" SLOT="0" -KEYWORDS="amd64" +KEYWORDS="amd64 ~arm64" RDEPEND=" dev-libs/wayland diff --git a/gui-libs/egl-wayland/egl-wayland-1.1.9_p20211123.ebuild b/gui-libs/egl-wayland/egl-wayland-1.1.9_p20211123.ebuild index 797eb2b76f76..62302305e3f4 100644 --- a/gui-libs/egl-wayland/egl-wayland-1.1.9_p20211123.ebuild +++ b/gui-libs/egl-wayland/egl-wayland-1.1.9_p20211123.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-${MY_COMMIT}" LICENSE="MIT" SLOT="0" -KEYWORDS="amd64" +KEYWORDS="amd64 ~arm64" RDEPEND=" dev-libs/wayland diff --git a/gui-libs/eglexternalplatform/eglexternalplatform-1.1.ebuild b/gui-libs/eglexternalplatform/eglexternalplatform-1.1.ebuild index 5bb7ad87229a..f08b0f1981d0 100644 --- a/gui-libs/eglexternalplatform/eglexternalplatform-1.1.ebuild +++ b/gui-libs/eglexternalplatform/eglexternalplatform-1.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 2021 Gentoo Authors +# Copyright 2021-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -9,7 +9,7 @@ SRC_URI="https://github.com/NVIDIA/eglexternalplatform/archive/${PV}.tar.gz -> $ LICENSE="MIT" SLOT="0" -KEYWORDS="amd64" +KEYWORDS="amd64 ~arm64" src_prepare() { default diff --git a/media-sound/mumble/mumble-1.4.230.ebuild b/media-sound/mumble/mumble-1.4.230.ebuild index ac5308d30777..15aaa4b74c3d 100644 --- a/media-sound/mumble/mumble-1.4.230.ebuild +++ b/media-sound/mumble/mumble-1.4.230.ebuild @@ -20,7 +20,7 @@ else SRC_URI="https://github.com/mumble-voip/mumble/releases/download/v${MY_PV}/${MY_P}.tar.gz" S="${WORKDIR}/${P/_*}.src" fi - KEYWORDS="~amd64 ~x86" + KEYWORDS="~amd64 ~ppc64 ~x86" fi LICENSE="BSD MIT" diff --git a/sci-libs/gsl/gsl-2.7.1-r1.ebuild b/sci-libs/gsl/gsl-2.7.1-r1.ebuild index 67492e626ad0..2533db1b2bf1 100644 --- a/sci-libs/gsl/gsl-2.7.1-r1.ebuild +++ b/sci-libs/gsl/gsl-2.7.1-r1.ebuild @@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz LICENSE="GPL-3" # Usually 0/${PV} but check SLOT="0/27" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris" IUSE="cblas-external +deprecated static-libs" RDEPEND="cblas-external? ( virtual/cblas:= )" diff --git a/sci-libs/libsc/Manifest b/sci-libs/libsc/Manifest index f5ddaed8843d..05ef5652e9e8 100644 --- a/sci-libs/libsc/Manifest +++ b/sci-libs/libsc/Manifest @@ -1,2 +1,3 @@ DIST libsc-2.3.1.tar.gz 344456 BLAKE2B cee44d07372162aecc8104257d1c5d4935d60030ceae4041ae4c5110f491b48b7709c55af0286b2a1fc5df2d7883b2ab4499c3884162b779fb9aaa86fbc5822c SHA512 02e160ad6fb4e674a9de2a41cfef6727d470a17c184e7b0310fe3e39f1112f4c643ca35a62377562caf1e8cc753cd5c0f5f996fba24b115498b01d16c140080a DIST libsc-2.3.3.tar.gz 345177 BLAKE2B c9077cfe7af3eb8bfb34cf655fa8e49658f1ce0b866b58398fc7bae305ac276b002c83d930a20df1bdf52a22645ebb1698d51a937ce56db993d36ef68d640e8a SHA512 b51d08a987d7c8a83eaae0be98a078a4a9160b9141b482015110534ddac075337c81f54f3efa4f8a8bce54e31565a6323aad37e35674c1d40686d4ab3747ed6b +DIST libsc-2.8.3.tar.gz 360755 BLAKE2B 2d7e3a16b97de551678ebb33f362e1ef7ebb0bcbf8d00b1a5317bfbf6732cf7bb9be2d215c79395809f3c616c23da5236c4f0f436a7b8bb07171141aaf08bbb3 SHA512 9def8850898f2d7d7a6ffaffd0872bc18af28026407356a1fe10f2b4f6d4a32ae6febe59c91cfa8817969624f995d48f64e0d5424b475e3a4c501338f4de70de diff --git a/sci-libs/libsc/files/libsc-2.8.3-fix_build_system.patch b/sci-libs/libsc/files/libsc-2.8.3-fix_build_system.patch new file mode 100644 index 000000000000..b5bdc734ab55 --- /dev/null +++ b/sci-libs/libsc/files/libsc-2.8.3-fix_build_system.patch @@ -0,0 +1,41 @@ +https://github.com/cburstedde/libsc/pull/54 +https://github.com/cburstedde/libsc/pull/55 + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 2ce08e2..a588beb 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -8,6 +8,8 @@ HOMEPAGE_URL https://www.p4est.org/ + DESCRIPTION "The SC library supports parallel scientific applications." + VERSION ${PROJECT_VERSION}) + ++set(CMAKE_POSITION_INDEPENDENT_CODE ON) ++ + include(CTest) + + include(cmake/options.cmake) +@@ -28,8 +30,7 @@ if(MPI_FOUND) + endif() + + # --- libb64 +-add_library(libb64 OBJECT libb64/cencode.c libb64/cdecode.c +- libb64/b64dec.c libb64/b64enc.c) ++add_library(libb64 OBJECT libb64/cencode.c libb64/cdecode.c) + target_include_directories(libb64 PRIVATE libb64) + + # --- sc +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a588beb..aff0eca 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -64,8 +64,8 @@ install(DIRECTORY ${PROJECT_SOURCE_DIR}/src/ ${PROJECT_SOURCE_DIR}/src/sc_builti + + install(TARGETS sc + EXPORT ${PROJECT_NAME}Targets +- ARCHIVE DESTINATION lib +- LIBRARY DESTINATION lib) ++ ARCHIVE DESTINATION ${library_reldir} ++ LIBRARY DESTINATION ${library_reldir}) + + add_subdirectory(src) + diff --git a/sci-libs/libsc/files/libsc-2.8.3-set_version.patch b/sci-libs/libsc/files/libsc-2.8.3-set_version.patch new file mode 100644 index 000000000000..dcd63994cc67 --- /dev/null +++ b/sci-libs/libsc/files/libsc-2.8.3-set_version.patch @@ -0,0 +1,44 @@ +diff --git a/cmake/git.cmake b/cmake/git.cmake +index dd6009e..7c5c8f3 100644 +--- a/cmake/git.cmake ++++ b/cmake/git.cmake +@@ -1,36 +1,3 @@ + # --- extract version from Git + +-set(PROJECT_VERSION 0.0.0) +-find_program(GIT_VERSION_GEN NAMES git-version-gen +- PATHS ${CMAKE_SOURCE_DIR}/build-aux NO_DEFAULT_PATH) +-if(GIT_VERSION_GEN) +- execute_process(COMMAND ${GIT_VERSION_GEN} .tarball_version +- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} +- RESULT_VARIABLE _err +- OUTPUT_VARIABLE git_version +- OUTPUT_STRIP_TRAILING_WHITESPACE) +-endif() +-if(_err EQUAL 0) +- if(git_version MATCHES +- "^(0|[1-9][0-9]*)[.](0|[1-9][0-9]*)[.](0|[1-9][0-9]*)[.].*") +- set(_major "${CMAKE_MATCH_1}") +- set(_minor "${CMAKE_MATCH_2}") +- set(_patch "${CMAKE_MATCH_3}") +- set(PROJECT_VERSION ${_major}.${_minor}.${_patch}.999) +- elseif(git_version MATCHES +- "^(0|[1-9][0-9]*)[.](0|[1-9][0-9]*)[.](0|[1-9][0-9]*)") +- set(_major "${CMAKE_MATCH_1}") +- set(_minor "${CMAKE_MATCH_2}") +- set(_patch "${CMAKE_MATCH_3}") +- set(PROJECT_VERSION ${_major}.${_minor}.${_patch}) +- elseif(git_version MATCHES +- "^(0|[1-9][0-9]*)[.](0|[1-9][0-9]*)") +- set(_major "${CMAKE_MATCH_1}") +- set(_minor "${CMAKE_MATCH_2}") +- set(PROJECT_VERSION ${_major}.${_minor}) +- elseif(git_version MATCHES +- "^(0|[1-9][0-9]*)") +- set(_major "${CMAKE_MATCH_1}") +- set(PROJECT_VERSION ${_major}) +- endif() +-endif() ++set(PROJECT_VERSION 2.8.3) + + diff --git a/sci-libs/libsc/files/libsc-9999-set_version.patch b/sci-libs/libsc/files/libsc-9999-set_version.patch new file mode 100644 index 000000000000..0820b001d8cd --- /dev/null +++ b/sci-libs/libsc/files/libsc-9999-set_version.patch @@ -0,0 +1,44 @@ +diff --git a/cmake/git.cmake b/cmake/git.cmake +index dd6009e..7c5c8f3 100644 +--- a/cmake/git.cmake ++++ b/cmake/git.cmake +@@ -1,36 +1,3 @@ + # --- extract version from Git + +-set(PROJECT_VERSION 0.0.0) +-find_program(GIT_VERSION_GEN NAMES git-version-gen +- PATHS ${CMAKE_SOURCE_DIR}/build-aux NO_DEFAULT_PATH) +-if(GIT_VERSION_GEN) +- execute_process(COMMAND ${GIT_VERSION_GEN} .tarball_version +- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} +- RESULT_VARIABLE _err +- OUTPUT_VARIABLE git_version +- OUTPUT_STRIP_TRAILING_WHITESPACE) +-endif() +-if(_err EQUAL 0) +- if(git_version MATCHES +- "^(0|[1-9][0-9]*)[.](0|[1-9][0-9]*)[.](0|[1-9][0-9]*)[.].*") +- set(_major "${CMAKE_MATCH_1}") +- set(_minor "${CMAKE_MATCH_2}") +- set(_patch "${CMAKE_MATCH_3}") +- set(PROJECT_VERSION ${_major}.${_minor}.${_patch}.999) +- elseif(git_version MATCHES +- "^(0|[1-9][0-9]*)[.](0|[1-9][0-9]*)[.](0|[1-9][0-9]*)") +- set(_major "${CMAKE_MATCH_1}") +- set(_minor "${CMAKE_MATCH_2}") +- set(_patch "${CMAKE_MATCH_3}") +- set(PROJECT_VERSION ${_major}.${_minor}.${_patch}) +- elseif(git_version MATCHES +- "^(0|[1-9][0-9]*)[.](0|[1-9][0-9]*)") +- set(_major "${CMAKE_MATCH_1}") +- set(_minor "${CMAKE_MATCH_2}") +- set(PROJECT_VERSION ${_major}.${_minor}) +- elseif(git_version MATCHES +- "^(0|[1-9][0-9]*)") +- set(_major "${CMAKE_MATCH_1}") +- set(PROJECT_VERSION ${_major}) +- endif() +-endif() ++set(PROJECT_VERSION 9999.0.0) + + diff --git a/sci-libs/libsc/libsc-2.8.3.ebuild b/sci-libs/libsc/libsc-2.8.3.ebuild new file mode 100644 index 000000000000..9ed5ecf5c58f --- /dev/null +++ b/sci-libs/libsc/libsc-2.8.3.ebuild @@ -0,0 +1,65 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake toolchain-funcs + +DESCRIPTION="Support for parallel scientific applications" +HOMEPAGE="http://www.p4est.org/" + +if [[ ${PV} == *9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/cburstedde/${PN}.git" + EGIT_BRANCH="develop" +else + SRC_URI="https://github.com/cburstedde/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" +fi + +LICENSE="LGPL-2.1+" +SLOT="0" +IUSE="debug examples mpi openmp threads" + +RDEPEND=" + sys-apps/util-linux + sys-libs/zlib + virtual/blas + virtual/lapack + mpi? ( virtual/mpi[romio] )" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/${P}-set_version.patch + "${FILESDIR}"/${P}-fix_build_system.patch +) + +pkg_pretend() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +pkg_setup() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +src_configure() { + local mycmakeargs=( + -Dmpi="$(usex mpi)" + -Dopenmp="$(usex openmp)" + -Dlibrary_reldir="$(get_libdir)" + ) + + cmake_src_configure +} + +src_install() { + cmake_src_install + + rm -r "${ED}"/usr/include/getopt.h \ + "${ED}"/usr/include/getopt_int.h \ + "${ED}"/usr/include/sc_builtin || die "rm failed" + + mv "${ED}"/usr/share/docs/SC/* "${ED}"/usr/share/doc/${P}/ || die "mv failed" + rm -r "${ED}"/usr/share/docs || die "rm failed" +} diff --git a/sci-libs/libsc/libsc-9999.ebuild b/sci-libs/libsc/libsc-9999.ebuild index 00143eccd873..8d6bdbb8314c 100644 --- a/sci-libs/libsc/libsc-9999.ebuild +++ b/sci-libs/libsc/libsc-9999.ebuild @@ -1,11 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -LUA_COMPAT=( lua5-{1..3} ) - -inherit autotools lua-single toolchain-funcs +inherit cmake toolchain-funcs DESCRIPTION="Support for parallel scientific applications" HOMEPAGE="http://www.p4est.org/" @@ -21,22 +19,20 @@ fi LICENSE="LGPL-2.1+" SLOT="0" -IUSE="debug examples mpi openmp romio threads" -REQUIRED_USE=" - ${LUA_REQUIRED_USE} - romio? ( mpi )" +IUSE="debug examples mpi openmp threads" RDEPEND=" - ${LUA_DEPS} sys-apps/util-linux + sys-libs/zlib virtual/blas virtual/lapack - mpi? ( virtual/mpi[romio?] )" + mpi? ( virtual/mpi[romio] )" DEPEND="${RDEPEND}" BDEPEND="virtual/pkgconfig" PATCHES=( - "${FILESDIR}"/${PN}-9999_20201220-autoconf_lua_version.patch + "${FILESDIR}"/${PN}-2.8.3-fix_build_system.patch + "${FILESDIR}"/${P}-set_version.patch ) pkg_pretend() { @@ -45,55 +41,25 @@ pkg_pretend() { pkg_setup() { [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp - lua-single_pkg_setup -} - -src_prepare() { - default - - sed -i -e "s/@LUA_IMPL@/${ELUA}/" "${S}"/src/sc_lua.h || die - - # Inject a version number into the build system - echo "${PV}" > ${S}/.tarball-version || die - eautoreconf } src_configure() { - local myeconfargs=( - --disable-static - $(use_enable debug) - $(use_enable mpi) - $(use_enable openmp openmp) - $(use_enable romio mpiio) - $(use_enable threads pthread) - --with-blas="$($(tc-getPKG_CONFIG) --libs blas)" - --with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)" + local mycmakeargs=( + -Dmpi="$(usex mpi)" + -Dopenmp="$(usex openmp)" + -Dlibrary_reldir="$(get_libdir)" ) - econf LUA_IMPL="${ELUA}" "${myeconfargs[@]}" + + cmake_src_configure } src_install() { - default - - if use examples; then - docinto examples - dodoc -r example/* - docompress -x /usr/share/doc/${PF}/examples - else - # Remove compiled example binaries in case of -examples: - rm -r "${ED}"/usr/bin || die "rm failed" - fi - - # Remove ac files, bug #619806 - rm -r "${ED}"/usr/share/aclocal || die "rm failed" + cmake_src_install - # Fix wrong installation paths: - dodir /usr/share/libsc - mv "${ED}"/etc/* "${ED}"/usr/share/libsc || die "mv failed" - rmdir "${ED}"/etc/ || die "rmdir failed" - mv "${ED}"/usr/share/ini/* "${ED}"/usr/share/libsc || die "mv failed" - rmdir "${ED}"/usr/share/ini || die "rmdir failed" + rm -r "${ED}"/usr/include/getopt.h \ + "${ED}"/usr/include/getopt_int.h \ + "${ED}"/usr/include/sc_builtin || die "rm failed" - # no static archives - find "${ED}" -name '*.la' -delete || die + mv "${ED}"/usr/share/docs/SC/* "${ED}"/usr/share/doc/${P}/ || die "mv failed" + rm -r "${ED}"/usr/share/docs || die "rm failed" } diff --git a/sci-libs/p4est/Manifest b/sci-libs/p4est/Manifest index bdfcb44058da..13b4e1e65938 100644 --- a/sci-libs/p4est/Manifest +++ b/sci-libs/p4est/Manifest @@ -2,3 +2,4 @@ DIST libsc-2.3.1.tar.gz 344456 BLAKE2B cee44d07372162aecc8104257d1c5d4935d60030c DIST libsc-2.3.3.tar.gz 345177 BLAKE2B c9077cfe7af3eb8bfb34cf655fa8e49658f1ce0b866b58398fc7bae305ac276b002c83d930a20df1bdf52a22645ebb1698d51a937ce56db993d36ef68d640e8a SHA512 b51d08a987d7c8a83eaae0be98a078a4a9160b9141b482015110534ddac075337c81f54f3efa4f8a8bce54e31565a6323aad37e35674c1d40686d4ab3747ed6b DIST p4est-2.3.1.tar.gz 2623681 BLAKE2B 426f15d27dd376b918e197adc46a8ef5555bd4765f53d7c98bc8f9b58e0a27125d38808503fd1c545e428e845635e2499ba27df22a989ed619ce264417d02908 SHA512 c691b39d140c2714a813dc45f721cf21a1e0f5d1a264a3d5733b09ec90cc3f8bcc9e5d799e41e91d2b994490c811287f8177bf6d7890ea4cd1cdfecb95cdbf23 DIST p4est-2.3.3.tar.gz 2644849 BLAKE2B f39546d0583c4671f32814c3c1d297d903a4f7466f27049ef4e38d1138c83f57e991f6a702d0109e438337f98be13e8554a4dfef3e1c129f3d2690e0b4a54bbb SHA512 7f528a942438073c9f43242eae5383cdc1f64f0f26f96eccd01afc053e0454691160e7210dda2ad2bdd621fd3c17551dd205af417dd244642b1358cbe4aaa2fd +DIST p4est-2.8.tar.gz 2655761 BLAKE2B 0637045bca3525d5d737010865c06d1273c6ecf848ab5ca55d1f19156550b7d7676c4f8d7c7a71b1fc70381dc7912cdca1e5405bb0af948180f75da1a3b1f343 SHA512 599faad177ce21f917e4ddfd969d6ef8c1f08b1e701cbdb9d4a1aa6dfd927176468afe757d018b9b7ded6a9ce165cd6fe78e0688b22cf6b9975cbd85d6f45d3c diff --git a/sci-libs/p4est/files/p4est-2.8-fix_build_system.patch b/sci-libs/p4est/files/p4est-2.8-fix_build_system.patch new file mode 100644 index 000000000000..e1f86165d5f9 --- /dev/null +++ b/sci-libs/p4est/files/p4est-2.8-fix_build_system.patch @@ -0,0 +1,24 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 3226f2e..8bc5074 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -8,6 +8,8 @@ HOMEPAGE_URL https://www.p4est.org/ + DESCRIPTION "p4est manages a collection---a forest---of octrees in parallel." + VERSION ${PROJECT_VERSION}) + ++set(CMAKE_POSITION_INDEPENDENT_CODE ON) ++ + include(CTest) + + list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/Modules) +@@ -76,8 +78,8 @@ install(DIRECTORY ${PROJECT_SOURCE_DIR}/src/ ${PROJECT_BINARY_DIR}/include/ + + install(TARGETS p4est + EXPORT ${PROJECT_NAME}Targets +- ARCHIVE DESTINATION lib +- LIBRARY DESTINATION lib) ++ ARCHIVE DESTINATION ${library_reldir} ++ LIBRARY DESTINATION ${library_reldir}) + + #--- p8est + diff --git a/sci-libs/p4est/files/p4est-2.8-set_version.patch b/sci-libs/p4est/files/p4est-2.8-set_version.patch new file mode 100644 index 000000000000..dcd63994cc67 --- /dev/null +++ b/sci-libs/p4est/files/p4est-2.8-set_version.patch @@ -0,0 +1,44 @@ +diff --git a/cmake/git.cmake b/cmake/git.cmake +index dd6009e..7c5c8f3 100644 +--- a/cmake/git.cmake ++++ b/cmake/git.cmake +@@ -1,36 +1,3 @@ + # --- extract version from Git + +-set(PROJECT_VERSION 0.0.0) +-find_program(GIT_VERSION_GEN NAMES git-version-gen +- PATHS ${CMAKE_SOURCE_DIR}/build-aux NO_DEFAULT_PATH) +-if(GIT_VERSION_GEN) +- execute_process(COMMAND ${GIT_VERSION_GEN} .tarball_version +- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} +- RESULT_VARIABLE _err +- OUTPUT_VARIABLE git_version +- OUTPUT_STRIP_TRAILING_WHITESPACE) +-endif() +-if(_err EQUAL 0) +- if(git_version MATCHES +- "^(0|[1-9][0-9]*)[.](0|[1-9][0-9]*)[.](0|[1-9][0-9]*)[.].*") +- set(_major "${CMAKE_MATCH_1}") +- set(_minor "${CMAKE_MATCH_2}") +- set(_patch "${CMAKE_MATCH_3}") +- set(PROJECT_VERSION ${_major}.${_minor}.${_patch}.999) +- elseif(git_version MATCHES +- "^(0|[1-9][0-9]*)[.](0|[1-9][0-9]*)[.](0|[1-9][0-9]*)") +- set(_major "${CMAKE_MATCH_1}") +- set(_minor "${CMAKE_MATCH_2}") +- set(_patch "${CMAKE_MATCH_3}") +- set(PROJECT_VERSION ${_major}.${_minor}.${_patch}) +- elseif(git_version MATCHES +- "^(0|[1-9][0-9]*)[.](0|[1-9][0-9]*)") +- set(_major "${CMAKE_MATCH_1}") +- set(_minor "${CMAKE_MATCH_2}") +- set(PROJECT_VERSION ${_major}.${_minor}) +- elseif(git_version MATCHES +- "^(0|[1-9][0-9]*)") +- set(_major "${CMAKE_MATCH_1}") +- set(PROJECT_VERSION ${_major}) +- endif() +-endif() ++set(PROJECT_VERSION 2.8.3) + + diff --git a/sci-libs/p4est/files/p4est-9999-set_version.patch b/sci-libs/p4est/files/p4est-9999-set_version.patch new file mode 100644 index 000000000000..0820b001d8cd --- /dev/null +++ b/sci-libs/p4est/files/p4est-9999-set_version.patch @@ -0,0 +1,44 @@ +diff --git a/cmake/git.cmake b/cmake/git.cmake +index dd6009e..7c5c8f3 100644 +--- a/cmake/git.cmake ++++ b/cmake/git.cmake +@@ -1,36 +1,3 @@ + # --- extract version from Git + +-set(PROJECT_VERSION 0.0.0) +-find_program(GIT_VERSION_GEN NAMES git-version-gen +- PATHS ${CMAKE_SOURCE_DIR}/build-aux NO_DEFAULT_PATH) +-if(GIT_VERSION_GEN) +- execute_process(COMMAND ${GIT_VERSION_GEN} .tarball_version +- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} +- RESULT_VARIABLE _err +- OUTPUT_VARIABLE git_version +- OUTPUT_STRIP_TRAILING_WHITESPACE) +-endif() +-if(_err EQUAL 0) +- if(git_version MATCHES +- "^(0|[1-9][0-9]*)[.](0|[1-9][0-9]*)[.](0|[1-9][0-9]*)[.].*") +- set(_major "${CMAKE_MATCH_1}") +- set(_minor "${CMAKE_MATCH_2}") +- set(_patch "${CMAKE_MATCH_3}") +- set(PROJECT_VERSION ${_major}.${_minor}.${_patch}.999) +- elseif(git_version MATCHES +- "^(0|[1-9][0-9]*)[.](0|[1-9][0-9]*)[.](0|[1-9][0-9]*)") +- set(_major "${CMAKE_MATCH_1}") +- set(_minor "${CMAKE_MATCH_2}") +- set(_patch "${CMAKE_MATCH_3}") +- set(PROJECT_VERSION ${_major}.${_minor}.${_patch}) +- elseif(git_version MATCHES +- "^(0|[1-9][0-9]*)[.](0|[1-9][0-9]*)") +- set(_major "${CMAKE_MATCH_1}") +- set(_minor "${CMAKE_MATCH_2}") +- set(PROJECT_VERSION ${_major}.${_minor}) +- elseif(git_version MATCHES +- "^(0|[1-9][0-9]*)") +- set(_major "${CMAKE_MATCH_1}") +- set(PROJECT_VERSION ${_major}) +- endif() +-endif() ++set(PROJECT_VERSION 9999.0.0) + + diff --git a/sci-libs/p4est/p4est-2.8.ebuild b/sci-libs/p4est/p4est-2.8.ebuild new file mode 100644 index 000000000000..16a26d9d18e6 --- /dev/null +++ b/sci-libs/p4est/p4est-2.8.ebuild @@ -0,0 +1,67 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake flag-o-matic toolchain-funcs + +DESCRIPTION="Scalable Algorithms for Parallel Adaptive Mesh Refinement on Forests of Octrees" +HOMEPAGE="http://www.p4est.org/" + +LIBSC_VERSION="2.8.3" + +if [[ ${PV} = *9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/cburstedde/${PN}.git" + EGIT_BRANCH="develop" + SRC_URI="" +else + SRC_URI="https://github.com/cburstedde/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" +fi + +LICENSE="GPL-2+" +SLOT="0" + +# TODO petsc +IUSE="debug doc examples mpi openmp threads +vtk-binary" + +RDEPEND=" + ~sci-libs/libsc-${LIBSC_VERSION}[mpi=,openmp=,threads=] + sys-apps/util-linux + virtual/blas + virtual/lapack + mpi? ( virtual/mpi[romio] )" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/${P}-fix_build_system.patch + "${FILESDIR}"/${P}-set_version.patch +) + +pkg_pretend() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +pkg_setup() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +src_configure() { + local mycmakeargs=( + -Dmpi="$(usex mpi)" + -Dopenmp="$(usex openmp)" + -Dlibrary_reldir="$(get_libdir)" + ) + + cmake_src_configure +} + +src_install() { + cmake_src_install + + rm "${ED}"/usr/lib/cmake/Modules/FindSC.cmake || die "rm failed" + mv "${ED}"/usr/share/docs/P4EST/* "${ED}"/usr/share/doc/${P}/ || die "mv failed" + rm -r "${ED}"/usr/share/docs || die "rm failed" +} diff --git a/sci-libs/p4est/p4est-9999.ebuild b/sci-libs/p4est/p4est-9999.ebuild index c7756fee11c5..d27a0814359b 100644 --- a/sci-libs/p4est/p4est-9999.ebuild +++ b/sci-libs/p4est/p4est-9999.ebuild @@ -1,24 +1,22 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -LUA_COMPAT=( lua5-{1..3} ) - -inherit autotools flag-o-matic lua-single toolchain-funcs +inherit cmake flag-o-matic toolchain-funcs DESCRIPTION="Scalable Algorithms for Parallel Adaptive Mesh Refinement on Forests of Octrees" HOMEPAGE="http://www.p4est.org/" +LIBSC_VERSION="2.8.3" + if [[ ${PV} = *9999* ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/cburstedde/${PN}.git" EGIT_BRANCH="develop" SRC_URI="" else - SRC_URI=" - https://github.com/cburstedde/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz - https://github.com/cburstedde/libsc/archive/v${PV}.tar.gz -> libsc-${PV}.tar.gz" + SRC_URI="https://github.com/cburstedde/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="~amd64 ~x86" fi @@ -26,22 +24,20 @@ LICENSE="GPL-2+" SLOT="0" # TODO petsc -IUSE="debug doc examples mpi openmp romio threads +vtk-binary" -REQUIRED_USE="${LUA_REQUIRED_USE} - romio? ( mpi )" +IUSE="debug doc examples mpi openmp threads +vtk-binary" -RDEPEND="${LUA_DEPS} - ~sci-libs/libsc-${PV}[${LUA_SINGLE_USEDEP},mpi=,openmp=,romio=,threads=] +RDEPEND=" + ~sci-libs/libsc-${LIBSC_VERSION}[mpi=,openmp=,threads=] sys-apps/util-linux virtual/blas virtual/lapack - mpi? ( virtual/mpi[romio=] )" + mpi? ( virtual/mpi[romio] )" DEPEND="${RDEPEND}" BDEPEND="virtual/pkgconfig" PATCHES=( - "${FILESDIR}"/${PN}-2.3-fix_aclocal.patch - "${FILESDIR}"/${PN}-2.3-add_soname.patch + "${FILESDIR}"/${PN}-2.8-fix_build_system.patch + "${FILESDIR}"/${P}-set_version.patch ) pkg_pretend() { @@ -50,73 +46,22 @@ pkg_pretend() { pkg_setup() { [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp - lua-single_pkg_setup -} - -src_prepare() { - default - - # Inject libsc to get all parts of the build system... - if ! [[ ${PV} = *9999* ]]; then - rmdir "${S}/sc" || die "rmdir failed" - mv "${WORKDIR}/libsc-${PV}" "${S}/sc" || die "mv failed" - fi - - # Inject a version number into the build system - echo "${PV}" > ${S}/.tarball-version - - AT_M4DIR="${WORKDIR}/${P}/config ${WORKDIR}/${P}/sc/config" - eautoreconf - - sed -i \ - "s/P4EST_SC_DIR\/etc/P4EST_SC_DIR\/share\/libsc/" \ - "${S}"/configure || die "sed failed" - - sed -i \ - "s#lib/libsc\.la#$(get_libdir)/libsc\.so#" \ - "${S}"/configure || die "sed failed" } src_configure() { - # avoid underlinkage - append-libs -lsc - - local myeconfargs=( - --disable-static - $(use_enable debug) - $(use_enable mpi) - $(use_enable openmp) - $(use_enable romio mpiio) - $(use_enable threads pthread) - $(use_enable vtk-binary) - --with-blas="$($(tc-getPKG_CONFIG) --libs blas)" - --with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)" - --with-sc="${ESYSROOT}/usr" + local mycmakeargs=( + -Dmpi="$(usex mpi)" + -Dopenmp="$(usex openmp)" + -Dlibrary_reldir="$(get_libdir)" ) - econf "${myeconfargs[@]}" + + cmake_src_configure } src_install() { - default - - use doc && dodoc -r doc/* - - if use examples - then - docinto examples - dodoc -r example/* - docompress -x /usr/share/doc/${PF}/examples - else - # Remove compiled example binaries in case of -examples: - rm -r "${ED}"/usr/bin || die "rm failed" - fi - - # Fix wrong installation paths: - dodir /usr/share/p4est - mv "${ED}"/usr/share/data "${ED}"/usr/share/p4est/data || die "mv failed" - mv "${ED}"/etc/* "${ED}"/usr/share/p4est || die "mv failed" - rmdir "${ED}"/etc/ || die "rmdir failed" + cmake_src_install - # no static archives - find "${ED}" -name '*.la' -delete || die + rm "${ED}"/usr/lib/cmake/Modules/FindSC.cmake || die "rm failed" + mv "${ED}"/usr/share/docs/P4EST/* "${ED}"/usr/share/doc/${P}/ || die "mv failed" + rm -r "${ED}"/usr/share/docs || die "rm failed" } diff --git a/sys-apps/smc-sum/files/makefile b/sys-apps/smc-sum/files/makefile new file mode 100644 index 000000000000..35564dcc8fec --- /dev/null +++ b/sys-apps/smc-sum/files/makefile @@ -0,0 +1,15 @@ +obj-m := sum_bios.o + +KVERSION := $(shell uname -r) +KDIR := /lib/modules/$(KVERSION)/build +PWD := $(shell pwd) + +EXTRA_CFLAGS = $(CFLAGS) -Wno-incompatible-pointer-types +EXTRA_LDFLAGS = $(LDFLAGS) + +default: + $(MAKE) -C $(KDIR) M=$(PWD) modules + +install: + $(MAKE) -C $(KDIR) M=$(PWD) modules_install + diff --git a/sys-apps/smc-sum/files/smc-sum-2.7.0.20210903-missing-include.patch b/sys-apps/smc-sum/files/smc-sum-2.7.0.20210903-missing-include.patch new file mode 100644 index 000000000000..6e392e433173 --- /dev/null +++ b/sys-apps/smc-sum/files/smc-sum-2.7.0.20210903-missing-include.patch @@ -0,0 +1,10 @@ +--- a/driver/Source/Linux/sum_bios.c ++++ b/driver/Source/Linux/sum_bios.c +@@ -12,6 +12,7 @@ + #include <linux/fs.h> + #include <linux/gfp.h> + #include <linux/init.h> ++#include <linux/io.h> + #include <linux/major.h> + #include <linux/module.h> + #include <linux/smp.h> diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-510.47.03.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-510.47.03.ebuild index 37d5558b2928..c5844cac1d48 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-510.47.03.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-510.47.03.ebuild @@ -22,7 +22,7 @@ S="${WORKDIR}" LICENSE="NVIDIA-r2 BSD BSD-2 GPL-2 MIT ZLIB curl openssl" SLOT="0/${PV%%.*}" -KEYWORDS="-* ~amd64" +KEYWORDS="-* ~amd64 ~arm64" IUSE="+X abi_x86_32 abi_x86_64 +driver persistenced static-libs +tools wayland" COMMON_DEPEND=" |