gentoo auto-resync : 18:12:2022 - 09:41:22

3 files changed, 0 insertions, 250 deletions

diff --git a/dev-lang/gdl/Manifest b/dev-lang/gdl/Manifest
index 6b0c826a315c..bd84ef51521a 100644
--- a/dev-lang/gdl/Manifest
+++ b/dev-lang/gdl/Manifest
@@ -1,7 +1,4 @@
-AUX gdl-1.0.0_rc3-cmake.patch 3673 BLAKE2B 81ede9a3b1fc6147ab528f49efabb140ff505a687ac6a4c1c3f91f0d652b9d13b866ecaefc9d4106011207379afbf390ab1e395a45da63954fd25b0e80bc86f6 SHA512 b4407bf99154ad8e6ad5d7635273b51df6a49b62e06aa18ce420e046380bc27fda74c37e4559fa136d28b5b4723b23d325bfce1b3340208f4b79ee5e0ee6e9d1
 AUX gdl-1.0.1-cmake.patch 4639 BLAKE2B 53e8093ab8f3d33fdd4db3441060400c02418e1543c5a975129ba6097e25861823f51f0e923b989a8e94fa6780fe065eae4e8a753abac3b580c22a132bf11af5 SHA512 f6df405084ecfe0a8ac96431ac8a28501e68cb6d3d6619f86825f70910df14d47b0d2da8901d0436a4dfd1c7625beabdc297cfa898346d3f6cd65d2f4f6d4dfa
-DIST gdl-1.0.0_rc3.tar.gz 32650313 BLAKE2B cdecfe0646e2271e2389e0a04f8da1e8de4534faf743f233169bccf326198025eff7fd7a7b62ed8bd05fa4a0222c6fd30f9469e3edf0f5b2991ef3ef545e616b SHA512 3fde22c7e709b9cdc72a23d2317c043037379c7903418211a699c7e5caa2ed17e78e32e6d2f9b4aa89200e729fc21555821140dfdd58a5a636a858e2841f6335
 DIST gdl-1.0.1.tar.gz 32775655 BLAKE2B 3428f33300403c98ae1f8f88cfa0e2346abe53d53b9f00c82ee5bf7f09f1f2f7d3021fa81173221ddd41ec29c94c2757cd1dc39b6e4d919c29d70af2e5045e6a SHA512 9d15f114d26d03c34dce6177a5d5115e81c128ec21752c01d171f8427e6cb21b9d0b69a44e29891b5e8fc2bd4d0b89d1a8dcd189f362a13c6e59182528b5842d
-EBUILD gdl-1.0.0_rc3-r3.ebuild 3728 BLAKE2B b58fac48832dae953cda5f5b322636929e400ac2fb3997d1630bf6212544833106eed4e09c9bd768dea8b81bd166923bf8939d89bda13f9e0528166af92db017 SHA512 18eb3e81cf4ed57fd7bba2806bffc848f2b70b10a8283f8a2390f230447db109982088c93142afebd86dc4120942cbb5e700088d6b7fe1b37c6d8f02e5418e90
 EBUILD gdl-1.0.1-r1.ebuild 3303 BLAKE2B a700aaa393fedefe1bf0080d954f9f41c55b3e99e9fbe31064fa1b781a611840c272f67ff3b3152c2bbc1085d7c103314536e359c891515a097f0af04ca4be2b SHA512 a975a25ded7dfd2983c059ce05c4dcd3287c0203761037c5d9b6ef48c442bae5d48c2a9235ff4466d106591fc1a76753260ed8472d81476f18a69e2dc5d98f94
 MISC metadata.xml 1229 BLAKE2B 63a2756fcb9cb9b2f59502a692e2c5c6852a765c9c97f4ac5e23e9630d516150fa9fa1890c1a0821794a3057323ede1c17405285428496dbed85d89c8995618d SHA512 d70b1c5187d7452c3a8e0f93803b01afada76bbde14966dbf9334a38a97eb3fbd8df41746fa300954e17f2845031517ddafebb5fec54c1a9bf13a88e47fa8285
diff --git a/dev-lang/gdl/files/gdl-1.0.0_rc3-cmake.patch b/dev-lang/gdl/files/gdl-1.0.0_rc3-cmake.patch
deleted file mode 100644
index dd7abcc54d90..000000000000
--- a/dev-lang/gdl/files/gdl-1.0.0_rc3-cmake.patch
+++ /dev/null
@@ -1,94 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -206,10 +206,6 @@
- # mpi
- check_include_file(mpi.h HAVE_MPI_H)
- 
--# SA: whithout it compilation of antlr fails if there's a conflicting 
--#     version of antlr in system-wide directories
--include_directories(src)
--
- if (NOT WIN32)
-     # Ncurses MANDATORY for readline on POSIX
-     # -DNCURSESDIR=DIR
-@@ -399,8 +395,10 @@
- 
- # PLplot MANDATORY
- # -DPLPLOTDIR=DIR
--set(CMAKE_PREFIX_PATH ${PLPLOTDIR})
--find_package(Plplot QUIET)
-+
-+find_package(PkgConfig REQUIRED)
-+pkg_check_modules(PLPLOT REQUIRED plplot plplot-c++)
-+
- set(HAVE_LIBPLPLOTCXXD ${PLPLOT_FOUND})
- if(PLPLOT_FOUND)
-     set(LIBRARIES ${LIBRARIES} ${PLPLOT_LIBRARIES})
-@@ -490,33 +488,16 @@
- # -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})
--  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})     
--    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})
--    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)
- 
- # if GM or IM activated, we check whether Plplot is OK for that
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -186,9 +186,9 @@
- )
- endif(USE_EXPAT)
- 
--add_subdirectory(antlr)
-+find_library(ANTLR_LIBRARY NAMES antlr)
- 
--include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/src/antlr ${CMAKE_BINARY_DIR})
-+include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR})
- link_directories(${LINK_DIRECTORIES})
- 
- if(PYTHON_MODULE) #GDL.so
-@@ -203,8 +203,7 @@
- 	add_executable(gdl ${SOURCES})
- endif(PYTHON_MODULE)
- 
--add_dependencies(gdl antlr) # be sure that antlr is built before gdl
--target_link_libraries(gdl antlr) # link antlr against gdl
-+target_link_libraries(gdl ${ANTLR_LIBRARY}) # link antlr against gdl
- if (MINGW)
- target_link_libraries(gdl ws2_32)
- endif (MINGW)
diff --git a/dev-lang/gdl/gdl-1.0.0_rc3-r3.ebuild b/dev-lang/gdl/gdl-1.0.0_rc3-r3.ebuild
deleted file mode 100644
index 1ff72195bd1c..000000000000
--- a/dev-lang/gdl/gdl-1.0.0_rc3-r3.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-WX_GTK_VER="3.0-gtk3"
-PYTHON_COMPAT=( python3_{7..9} )
-
-# gdl's build system is a travesty, and actually calls
-# itself in the testsuite, which is something that ninja
-# obviously doesn't support.
-CMAKE_MAKEFILE_GENERATOR=emake
-
-inherit cmake python-r1 toolchain-funcs virtualx wxwidgets
-
-DESCRIPTION="GNU Data Language"
-HOMEPAGE="https://github.com/gnudatalanguage/gdl"
-SRC_URI="https://github.com/gnudatalanguage/gdl/archive/v$(ver_cut 1-3)-rc.$(ver_cut 5).tar.gz -> ${P}.tar.gz"
-
-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 tiff udunits wxwidgets"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	dev-cpp/antlr-cpp:2=
-	dev-libs/expat
-	sci-libs/gsl:=
-	sci-libs/plplot:=[X,cxx,-dynamic]
-	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}
-		dev-python/numpy[${PYTHON_USEDEP}]
-	)
-	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="
-	dev-util/intltool
-	virtual/pkgconfig
-	python? ( app-admin/chrpath )"
-
-S="${WORKDIR}/${PN}-$(ver_cut 1-3)-rc.$(ver_cut 5)"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.0.0_rc3-cmake.patch )
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-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
-		-DEIGEN3=$(usex eigen)
-		-DFFTW=$(usex fftw)
-		-DGRIB=OFF
-		-DGLPK=$(usex glpk)
-		-DHDF=$(usex hdf)
-		-DHDF5=$(usex hdf5)
-		-DLIBPROJ4=$(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)
-		-DSHAPELIB=OFF
-		-DPLPLOTDIR="${EPREFIX}"/usr/$(get_libdir)
-	)
-
-	configuration() {
-		mycmakeargs+=( "$@" )
-		cmake_src_configure
-	}
-	configuration -DPYTHON_MODULE=OFF -DPYTHON=OFF
-	use python && python_foreach_impl configuration -DPYTHON_MODULE=ON -DPYTHON=ON
-}
-
-src_compile() {
-	cmake_src_compile
-	use python && python_foreach_impl cmake_src_compile
-}
-
-src_test() {
-	# there is check target instead of the ctest to define some LDPATH
-	virtx cmake_build check
-}
-
-src_install() {
-	cmake_src_install
-	if use python; then
-		installation() {
-			chrpath -d src/GDL.so || die
-			python_domodule src/GDL.so
-		}
-		python_foreach_impl run_in_build_dir installation
-		dodoc PYTHON.txt
-	fi
-
-	newenvd - 50gdl <<-_EOF_
-		GDL_PATH="+${EPREFIX}/usr/share/gnudatalanguage"
-	_EOF_
-}