From 013635213f8032704e1ec9ae01e9303e63a2efbb Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 10 Mar 2024 00:44:50 +0000 Subject: gentoo auto-resync : 10:03:2024 - 00:44:50 --- dev-lang/Manifest.gz | Bin 21857 -> 21847 bytes dev-lang/gdl/Manifest | 3 + dev-lang/gdl/files/gdl-1.0.4-cmake.patch | 100 +++++++++++++++++++++ dev-lang/gdl/gdl-1.0.4.ebuild | 149 +++++++++++++++++++++++++++++++ dev-lang/ispc/Manifest | 2 +- dev-lang/ispc/ispc-1.23.0.ebuild | 2 +- 6 files changed, 254 insertions(+), 2 deletions(-) create mode 100644 dev-lang/gdl/files/gdl-1.0.4-cmake.patch create mode 100644 dev-lang/gdl/gdl-1.0.4.ebuild (limited to 'dev-lang') diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz index e08569f26846..29f8b3c476ec 100644 Binary files a/dev-lang/Manifest.gz and b/dev-lang/Manifest.gz differ diff --git a/dev-lang/gdl/Manifest b/dev-lang/gdl/Manifest index 905b63995b5e..1f91d34e398d 100644 --- a/dev-lang/gdl/Manifest +++ b/dev-lang/gdl/Manifest @@ -1,4 +1,7 @@ AUX gdl-1.0.1-cmake.patch 4639 BLAKE2B 53e8093ab8f3d33fdd4db3441060400c02418e1543c5a975129ba6097e25861823f51f0e923b989a8e94fa6780fe065eae4e8a753abac3b580c22a132bf11af5 SHA512 f6df405084ecfe0a8ac96431ac8a28501e68cb6d3d6619f86825f70910df14d47b0d2da8901d0436a4dfd1c7625beabdc297cfa898346d3f6cd65d2f4f6d4dfa +AUX gdl-1.0.4-cmake.patch 4739 BLAKE2B 954ec16e3bdd803ad842cce7d3389bd1a6137176a4be129027fd2b5075fbac89f45a3cfacc1f04cc7aec73f519f5a25d36b75c8790490ebef41f9b462fed0b5a SHA512 aeaf09b6eadbe89f98cccb003dbea510e8ec66659d7c290dc7e5315db073592ad215fab4a8feb9ac2af5ef7be9822c5fa0e92ab4bf64394b6fae6caa0277a279 DIST gdl-1.0.1.tar.gz 32775655 BLAKE2B 3428f33300403c98ae1f8f88cfa0e2346abe53d53b9f00c82ee5bf7f09f1f2f7d3021fa81173221ddd41ec29c94c2757cd1dc39b6e4d919c29d70af2e5045e6a SHA512 9d15f114d26d03c34dce6177a5d5115e81c128ec21752c01d171f8427e6cb21b9d0b69a44e29891b5e8fc2bd4d0b89d1a8dcd189f362a13c6e59182528b5842d +DIST gdl-1.0.4.tar.gz 33219638 BLAKE2B db0e843cf2e3f07d6f53d3a8b46cb95303cd0ae199c98099f45bbdfe5d206f325a8f9814935e876a3dfee3a46da0144766b18fa54b38a653567a429a88f06250 SHA512 3206bdd88b0478493221c0552e62620f1c9acbfec6f1900d73d932caae12401bf825e8893c81f844965f79e332bedb6ea99e6ea6f2b21427022efa60d1326eb0 EBUILD gdl-1.0.1-r2.ebuild 3284 BLAKE2B 8e9ee4863ebff32c32e85531d116f0ce612c00cff222f7541251b570f9c72d173f0de8d5fc682435f269038c51a6e64eb1b1ed4a897509ec7536d56995edcb72 SHA512 9ec0abdcda91fa49a96da5f0bfbc58bc3cb56d2ed1250feab9ca2183a8efa3d0a9a2f3300ef657993f2076e8e013471cea2059521ac5c9f6b30b8221f134bbb7 +EBUILD gdl-1.0.4.ebuild 3387 BLAKE2B 68a5e72619ddfe90a52d46d55e90bea4a184f785333ab02615c46c2e1ba98ca4a599dcaa5019c6c5d811a80649e5eef64ef2ee558b332875a8e2ad5592744080 SHA512 bfaedc8aa79ada186297c955b5eb69a84b80c143de56c2c27705ade7cca763941fec7e6b0e0f336f858610b48a1ca637f5ffbd1bcf77c8f035918c2162193eef MISC metadata.xml 1288 BLAKE2B c2e9dd75d0e8a9d59470fb1c9eee3e8b6f9378bfcb11dfd7f1e37d6294f3830af40d1693ab306e656cc830e5f924738f8db015fdf710318529635b3197abfa1b SHA512 927178c2c284e7a273cd289a3c828094b5a5cfd7fc4eeb8479ba6fa6b56bd5a0ed240161edbad1c1ad6c8189844cff8ccbaf9c1ff57842ea439fb82677e0b4bf diff --git a/dev-lang/gdl/files/gdl-1.0.4-cmake.patch b/dev-lang/gdl/files/gdl-1.0.4-cmake.patch new file mode 100644 index 000000000000..93d0e38f50a0 --- /dev/null +++ b/dev-lang/gdl/files/gdl-1.0.4-cmake.patch @@ -0,0 +1,100 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f7b8801d..8281aee1 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -596,36 +598,16 @@ endif(GRAPHICSMAGICK_FOUND) + # -DMAGICK=ON|OFF + # -DMAGICKDIR=DIR + if(MAGICK) +- set(CMAKE_PREFIX_PATH ${MAGICKDIR}) +- find_package(ImageMagick QUIET COMPONENTS Magick++ MagickWand MagickCore) +- mark_as_advanced(ImageMagick_EXECUTABLE_DIR ImageMagick_Magick++_INCLUDE_DIR ImageMagick_Magick++_LIBRARY +- ImageMagick_MagickCore_INCLUDE_DIR ImageMagick_MagickCore_LIBRARY ImageMagick_MagickWand_INCLUDE_DIR ImageMagick_MagickWand_LIBRARY) +- set(USE_MAGICK ${ImageMagick_FOUND}) +- set(HAS_IMAGEMAGICK ${ImageMagick_FOUND}) +- if(ImageMagick_FOUND) +- find_program(MAGICKXXCONFIG Magick++-config) +- if(MAGICKXXCONFIG) +- execute_process(COMMAND ${MAGICKXXCONFIG} "--libs" OUTPUT_VARIABLE MAGICKXXCONFIGLIBS OUTPUT_STRIP_TRAILING_WHITESPACE) +- set(LIBRARIES ${LIBRARIES} ${MAGICKXXCONFIGLIBS}) +- execute_process(COMMAND ${MAGICKXXCONFIG} "--cxxflags" OUTPUT_VARIABLE MAGICKXXCONFIGCXXFLAGS OUTPUT_STRIP_TRAILING_WHITESPACE) +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${MAGICKXXCONFIGCXXFLAGS}") +- else(MAGICKXXCONFIG) +- message(FATAL_ERROR "ImageMagick is required but was not found (Magick++-config).\n" +- "Use -DMAGICKDIR=DIR to specify the ImageMagick directory.\n" +- "Use -DMAGICK=OFF to not use it.\n" +- "(suitable Debian/Ubuntu package: libmagick++-dev)\n" +- "(suitable Fedora/CentOS package: ImageMagick-c++-devel)") +- endif(MAGICKXXCONFIG) +- set(LIBRARIES ${LIBRARIES} ${ImageMagick_LIBRARIES}) +- include_directories(${ImageMagick_INCLUDE_DIRS} ${ImageMagick_MagickCore_INCLUDE_DIRS}) +- set(MAGICK_LIBRARIES ${ImageMagick_LIBRARIES}) +- else(ImageMagick_FOUND) +- message(FATAL_ERROR "ImageMagick is required but was not found.\n" +- "Use -DMAGICKDIR=DIR to specify the ImageMagick directory.\n" +- "Use -DMAGICK=OFF to not use it.\n" +- "(suitable Debian/Ubuntu package: libmagick++-dev)\n" +- "(suitable Fedora/CentOS package: ImageMagick-c++-devel)") +- endif(ImageMagick_FOUND) ++ find_package(PkgConfig REQUIRED) ++ pkg_check_modules(Magick++ REQUIRED Magick++) ++ pkg_check_modules(MagickWand REQUIRED MagickWand) ++ pkg_check_modules(MagickCore REQUIRED MagickCore) ++ ++ set(MAGICK_LIBRARIES ${Magick++_LIBRARIES} ${MagickWand_LIBRARIES} ${MagickCore_LIBRARIES}) ++ set(LIBRARIES ${LIBRARIES} ${MAGICK_LIBRARIES}) ++ include_directories(${Magick++_INCLUDE_DIRS}) ++ include_directories(${MagickWand_INCLUDE_DIRS}) ++ include_directories(${MagickCore_INCLUDE_DIRS}) + endif(MAGICK) + + # libtiff +@@ -994,20 +976,8 @@ endif(GLPK) + # -DSHAPELIB=ON|OFF + # -DSHAPELIBDIR=DIR + if(SHAPELIB) +- set(CMAKE_PREFIX_PATH ${SHAPELIBDIR}) +- find_package(SHAPELIB QUIET) +- set(USE_SHAPELIB ${SHAPELIB_FOUND}) +- if(SHAPELIB_FOUND) +- set(LIBRARIES ${LIBRARIES} ${SHAPELIB_LIBRARIES}) +- include_directories(${SHAPELIB_INCLUDE_DIR}) +- else(SHAPELIB_FOUND) +- message(FATAL_ERROR "SHAPELIB (http://shapelib.maptools.org/) is required but was not found.\n" +- "Use -DSHAPELIBDIR=DIR to specify the SHAPELIB-devel directory tree.\n" +- "Use -DSHAPELIB=OFF to not use it.\n" +- "shapelib is often in package libshp-devel.\n" +- "(suitable Debian/Ubuntu package: libshp-dev)\n" +- "(suitable Fedora/CentOS package: shapelib-devel)\n") +- endif(SHAPELIB_FOUND) ++ find_package(PkgConfig REQUIRED) ++ pkg_check_modules(shapelib REQUIRED shapelib) + endif(SHAPELIB) + # EXPAT for IDLffXMLSAX and IDLffXMLDOM + # -DEXPAT=ON|OFF +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 968ead9d..b0623de4 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -200,9 +200,9 @@ add_subdirectory(plplotdriver) + #whereami + add_library(whereami STATIC ${CMAKE_SOURCE_DIR}/src/whereami/src/whereami.c) + +-add_subdirectory(antlr) ++find_library(ANTLR_LIBRARY NAMES antlr) + +-include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/src/antlr ${CMAKE_SOURCE_DIR}/src/plplotdriver ${CMAKE_SOURCE_DIR}/src/whereami/src ${CMAKE_BINARY_DIR}) ++include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/src/plplotdriver ${CMAKE_SOURCE_DIR}/src/whereami/src ${CMAKE_BINARY_DIR}) + link_directories(${LINK_DIRECTORIES}) + + if(PYTHON_MODULE) #GDL.so +@@ -220,8 +220,7 @@ if(USE_OPENMP) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}") + endif(USE_OPENMP) + +-add_dependencies(gdl antlr whereami) # be sure that antlr is built before gdl +-target_link_libraries(gdl antlr whereami) # link antlr against gdl ++target_link_libraries(gdl ${ANTLR_LIBRARY} whereami) # link antlr against gdl + if (MINGW) + target_link_libraries(gdl ws2_32) + endif (MINGW) diff --git a/dev-lang/gdl/gdl-1.0.4.ebuild b/dev-lang/gdl/gdl-1.0.4.ebuild new file mode 100644 index 000000000000..95e4cdaec158 --- /dev/null +++ b/dev-lang/gdl/gdl-1.0.4.ebuild @@ -0,0 +1,149 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +WX_GTK_VER="3.0-gtk3" +PYTHON_COMPAT=( python3_{10..12} ) + +inherit cmake python-single-r1 toolchain-funcs virtualx wxwidgets + +DESCRIPTION="GNU Data Language" +HOMEPAGE="https://github.com/gnudatalanguage/gdl" +SRC_URI="https://github.com/gnudatalanguage/${PN}/releases/download/v${PV}/${PN}-v${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN}-v${PV}" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +IUSE=" + +eigen fftw glpk graphicsmagick gshhs hdf hdf5 +imagemagick netcdf + openmp png proj postscript python shapelib tiff udunits wxwidgets +" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +RDEPEND=" + dev-cpp/antlr-cpp:2= + dev-libs/expat + media-libs/libpng:= + net-libs/libtirpc:= + sci-libs/gsl:= + sci-libs/plplot:=[X,cxx,-dynamic,wxwidgets?] + sys-libs/ncurses:= + sys-libs/readline:= + sys-libs/zlib + x11-libs/libX11 + fftw? ( sci-libs/fftw:3.0= ) + glpk? ( sci-mathematics/glpk:= ) + gshhs? ( + sci-geosciences/gshhs-data + sci-geosciences/gshhs:= + ) + hdf? ( sci-libs/hdf:= ) + hdf5? ( sci-libs/hdf5:= ) + imagemagick? ( + !graphicsmagick? ( media-gfx/imagemagick:=[cxx] ) + graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] ) + ) + netcdf? ( sci-libs/netcdf:= ) + proj? ( sci-libs/proj:= ) + postscript? ( dev-libs/pslib ) + python? ( + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-python/numpy[${PYTHON_USEDEP}] + ') + ) + shapelib? ( sci-libs/shapelib:= ) + tiff? ( + media-libs/tiff:= + sci-libs/libgeotiff:= + ) + udunits? ( sci-libs/udunits ) + wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] ) +" +DEPEND="${RDEPEND} + eigen? ( dev-cpp/eigen:3 ) +" +BDEPEND=" + virtual/pkgconfig +" + +PATCHES=( "${FILESDIR}"/${PN}-1.0.4-cmake.patch ) +DOCS=( AUTHORS HACKING NEWS PYTHON.txt README README.md ) + +pkg_pretend() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +pkg_setup() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp + use python && python-single-r1_pkg_setup +} + +src_prepare() { + use wxwidgets && setup-wxwidgets unicode + use hdf5 && has_version sci-libs/hdf5[mpi] && export CXX=mpicxx + + # remove bundled antlr + rm -r src/antlr || die + + # gentoo: avoid install files in datadir directory + # and manually install them in src_install + sed -e '/AUTHORS/d' -i CMakeLists.txt || die + + cmake_src_prepare +} + +src_configure() { + # MPI is still very buggy + # x11=off does not compile + local mycmakeargs=( + -DMPI=OFF + -DREADLINE=ON + -DX11=ON + -DEXPAT=ON + -DPNGLIB=ON + -DEIGEN3=$(usex eigen) + -DFFTW=$(usex fftw) + -DGRIB=OFF + -DGLPK=$(usex glpk) + -DHDF=$(usex hdf) + -DHDF5=$(usex hdf5) + -DLIBPROJ=$(usex proj) + -DNETCDF=$(usex netcdf) + -DOPENMP=$(usex openmp) + -DPNGLIB=$(usex png) + -DUDUNITS2=$(usex udunits) + -DWXWIDGETS=$(usex wxwidgets) + -DGRAPHICSMAGICK=$(usex imagemagick $(usex graphicsmagick)) + -DMAGICK=$(usex imagemagick $(usex !graphicsmagick)) + -DTIFF=$(usex tiff) + -DGEOTIFF=$(usex tiff) + -DPYTHON_MODULE=$(usex python) + -DPYTHON=$(usex python) + -DSHAPELIB=$(usex shapelib) + -DQHULL=OFF + ) + + if use python; then + # automatically selection ignores EPYTHON + mycmakeargs+=( + -DPYTHONVERSION="${EPYTHON#python}" + ) + fi + + cmake_src_configure +} + +src_test() { + virtx cmake_src_test +} + +src_install() { + cmake_src_install + + newenvd - 50gdl <<-_EOF_ + GDL_PATH="+${EPREFIX}/usr/share/gnudatalanguage" + _EOF_ +} diff --git a/dev-lang/ispc/Manifest b/dev-lang/ispc/Manifest index 436d9cd84273..fd42123fc576 100644 --- a/dev-lang/ispc/Manifest +++ b/dev-lang/ispc/Manifest @@ -1,5 +1,5 @@ DIST ispc-1.22.0.gh.tar.gz 19618494 BLAKE2B 0dae95d792e4d629b38a9775c2c600131374c69dfa086d6a67100e40e5005ef054b9a651f418e0452a19ee4e64ffd830bfaa787b14e706473e8fab1d2380f0fd SHA512 4436ea37003b4cbfefcbf4c18212d0e98536243ae8f01053817d579e04205a4dcd4ab7b2b282fec99fc617009fdbea340b348cf4a2134240d2fcfc6bcaf6b60c DIST ispc-1.23.0.gh.tar.gz 19624959 BLAKE2B 08cf817bdd4cd76121dd6c9586ef5f3f9296e7a3b509c51db6413fb62aee0b462ae8baa9fd9497b20c67d4df90149eba16a48b61dd8793c5b64c95a21b13e5d8 SHA512 34cd2572cdaf38f7911ffe52dfb7346f1607de1f81635bdf94e365dee810b30ddeb090eee4a592d9331bb051498172bfd868cd8de9c38bed388d7207a30ac0d8 EBUILD ispc-1.22.0-r1.ebuild 2290 BLAKE2B 7cf8a43e70237407bc7fb99e44c8b53ea0bb4ce63d2f4e6e21f5dc5a42d7e47f3cd02b5bbf1fbe80c55204573c5906899628bc9c3ecea9ccf1bc9d1316a7faf8 SHA512 bc67aab886b423087fd4c271d561c2c0f6b6b4f3517ee9bb2a06e1351d86b680b04b76e26692ba3172727d8a82506578105c8739ef3d0b35fe9a2043eba9374f -EBUILD ispc-1.23.0.ebuild 2306 BLAKE2B a6dae4da1b616ed5dea9697f4ff1790aedfd2cdc5baa395453d84e161851da93b5e9e5eb53b28e0e37e5a53734c20618f7dde26df7171531e47ceb76c13d28c2 SHA512 4e10b8c3ed65044d23f29c4f27a89e4ef1f74a3840597e272d56be256b75d5afa33537541aeb67bee6f4a66c4ef6acbe83d3923adb48e5aaec5cefd046c5c7d9 +EBUILD ispc-1.23.0.ebuild 2305 BLAKE2B 522905c18bb87d34e244f1e5a956291ac2fafc1d8d5331fca62c2152d60d6458a0932079b3576d69ab6e23822520d8c0a62212ecd93e1341e99eac8dc5838498 SHA512 5aafda25901eaacc4706e23b2ca05db4f4debaa6b64076be1df1b0ef54111f935aaeb2db7056934e1281f979e70683a3c2bbe00696a7f8164ca97015d28d9b8c MISC metadata.xml 509 BLAKE2B b605dfbff352fab4fcc58ad46f89f97d5db8522de237a0623021c521231798ad00b2b8cd82ce6840d86cfebbe185e6e767e8d0ec276b03a68554ecad20e6b96d SHA512 eae5fcfb0d56190f969ac83012624965b00bd757d8be0bbafce74ab1ea119dc4ee0c33076dd447fabf0a6a6d5f1e2783b54f6c59ebd7aa0a35a4a27df7db01f9 diff --git a/dev-lang/ispc/ispc-1.23.0.ebuild b/dev-lang/ispc/ispc-1.23.0.ebuild index d0bde1e3bc6d..0bf8808f4f97 100644 --- a/dev-lang/ispc/ispc-1.23.0.ebuild +++ b/dev-lang/ispc/ispc-1.23.0.ebuild @@ -20,7 +20,7 @@ SRC_URI=" LICENSE="BSD BSD-2 UoI-NCSA" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86" IUSE="examples gpu openmp test" RESTRICT="!test? ( test )" -- cgit v1.2.3