commit: 92bc800b268109f70d32020de8cb7a3af53090bb Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Thu Sep 26 14:46:49 2019 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Thu Sep 26 14:49:21 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92bc800b
sci-libs/grib_api: Remove last-rited pkg Closes: https://bugs.gentoo.org/628746 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> profiles/base/package.use.mask | 1 - profiles/package.mask | 9 -- sci-libs/grib_api/Manifest | 3 - .../grib_api-1.14.5-add-missing-destdir.patch | 19 ----- .../grib_api-1.14.5-disable-failing-test.patch | 15 ---- sci-libs/grib_api/grib_api-1.11.0.ebuild | 88 -------------------- sci-libs/grib_api/grib_api-1.14.5.ebuild | 95 ---------------------- sci-libs/grib_api/metadata.xml | 18 ---- 8 files changed, 248 deletions(-) diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask index 34da891f5c1..7e5b325f1e6 100644 --- a/profiles/base/package.use.mask +++ b/profiles/base/package.use.mask @@ -78,7 +78,6 @@ media-libs/netpbm jpeg2k media-libs/opencv jpeg2k media-libs/simage jpeg2k net-proxy/ziproxy jpeg2k -sci-libs/grib_api jasper jpeg2k x11-libs/gdk-pixbuf jpeg2k # James Le Cuirot <[email protected]> (2019-05-21) diff --git a/profiles/package.mask b/profiles/package.mask index e1f5fa49963..5b44b3f053c 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -1113,15 +1113,6 @@ mail-filter/sid-milter # in Jan 2019. Removal in 30 days. Bug #674800. app-crypt/af_alg -# Michał Górny <[email protected]> (2019-08-27) -# Our version is seriously outdated and has numerous bugs reported, -# including multilib-strict failures preventing it from being installed -# on any modern system. It has not been touched since 2016, and is -# many releases behind upstream. Furthermore, upstream has discontinued -# it in favor of eeCodes. -# Removal in 30 days. Bug #628746. -sci-libs/grib_api - # Miroslav Šulc <[email protected]> (2019-08-19) # Depends on >=virtual/{jdk,jre}-11 which is masked =www-servers/tomcat-9.0.24 diff --git a/sci-libs/grib_api/Manifest b/sci-libs/grib_api/Manifest deleted file mode 100644 index 5c86dbe7a24..00000000000 --- a/sci-libs/grib_api/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST grib_api-1.11.0.tar.gz 14412684 BLAKE2B 72375400f74f3edba62e781b9dac4c40f3944c676cd90221ad57b0d6690a3a8958ef9d77c414ccb45b60ff2fd2c93923628e0ac3d0f10cfb4c393fb91eaf3001 SHA512 09c50d194049d2d19686139fb7150bd7399fc05bb5b7e40e8d91ce0301698263c40357b8524f925642ae6f78d9bc61218be26bef7f2dfeb326ccc9e8bc3a49e3 -DIST grib_api-1.14.5-Source.tar.gz 4530071 BLAKE2B 7d9660e0c244ace011ef53e5a77c8ddc1f9435b210df407d6e90ef111c501cd589db1b34739937d5c78d6e1050b12d7c334b215122467a25b9a513e817a0eb7b SHA512 ad31dc27adcdeeded1aa3c3620181c0d4a5250734724c242443d19332b84f2297b4dea2aa02027627321fa35822c94865a41f24d03eb1143756621da14a59322 -DIST grib_api_test_data.tar.gz 131042849 BLAKE2B 9036d4363b86ae0ad948026dd8ea7371232723942dea9eb6d8cceec466d8e37ebbe6a8e4eadb4cd413ab40601d8ea01c91bef0265310aac9ea3773a9bc252868 SHA512 25b37c3e725f7a2c18979d96e7d512111ba54f4e448c57e6a8ae913b7f13be25d9e643edb45ebc714daf6de51d85e9a7d252e735299affc562b9911e53a95058 diff --git a/sci-libs/grib_api/files/grib_api-1.14.5-add-missing-destdir.patch b/sci-libs/grib_api/files/grib_api-1.14.5-add-missing-destdir.patch deleted file mode 100644 index 6bd6fb53f6e..00000000000 --- a/sci-libs/grib_api/files/grib_api-1.14.5-add-missing-destdir.patch +++ /dev/null @@ -1,19 +0,0 @@ -From: Sébastien Fabbro <[email protected]> -Subject: add missing DESTDIR to respect sandbox install - ---- grib_api-1.14.5-Source.orig/fortran/CMakeLists.txt 2016-03-14 22:53:44.310678929 +0000 -+++ grib_api-1.14.5-Source/fortran/CMakeLists.txt 2016-03-14 22:55:42.479193350 +0000 -@@ -55,11 +55,11 @@ - install( CODE - " - if( EXISTS ${CMAKE_Fortran_MODULE_DIRECTORY}/${CMAKE_CFG_INTDIR}/GRIB_API.mod ) -- execute_process( COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_Fortran_MODULE_DIRECTORY}/${CMAKE_CFG_INTDIR}/GRIB_API.mod ${CMAKE_INSTALL_PREFIX}/${INSTALL_INCLUDE_DIR}/grib_api.mod ) -+ execute_process( COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_Fortran_MODULE_DIRECTORY}/${CMAKE_CFG_INTDIR}/GRIB_API.mod \$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${INSTALL_INCLUDE_DIR}/grib_api.mod ) - endif() - - if( EXISTS ${CMAKE_Fortran_MODULE_DIRECTORY}/${CMAKE_CFG_INTDIR}/grib_api.mod ) -- execute_process( COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_Fortran_MODULE_DIRECTORY}/${CMAKE_CFG_INTDIR}/grib_api.mod ${CMAKE_INSTALL_PREFIX}/${INSTALL_INCLUDE_DIR}/GRIB_API.mod ) -+ execute_process( COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_Fortran_MODULE_DIRECTORY}/${CMAKE_CFG_INTDIR}/grib_api.mod \$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${INSTALL_INCLUDE_DIR}/GRIB_API.mod ) - endif() - " ) - diff --git a/sci-libs/grib_api/files/grib_api-1.14.5-disable-failing-test.patch b/sci-libs/grib_api/files/grib_api-1.14.5-disable-failing-test.patch deleted file mode 100644 index 0615edc1542..00000000000 --- a/sci-libs/grib_api/files/grib_api-1.14.5-disable-failing-test.patch +++ /dev/null @@ -1,15 +0,0 @@ -From: Sébastien Fabbro <[email protected]> -Subject: comment out failing test -https://software.ecmwf.int/issues/browse/SUP-521 ---- grib_api-1.14.5-Source.orig/tests/ls.sh 2016-03-14 21:56:28.933867464 +0000 -+++ grib_api-1.14.5-Source/tests/ls.sh 2016-03-14 21:56:57.103513324 +0000 -@@ -62,7 +62,8 @@ - - # Test for bug GRIB-56 - ${tools_dir}grib_set -s typeOfLevel=depthBelowLandLayer,topLevel=missing regular_latlon_surface.grib1 tmp_rlls.grib1 --${tools_dir}grib_ls -plevels tmp_rlls.grib1 | grep MISSING>/dev/null -+# disabling because MISSING is not there and fails the test -+#${tools_dir}grib_ls -plevels tmp_rlls.grib1 | grep MISSING>/dev/null - - ${tools_dir}grib_set -s typeOfLevel=depthBelowLandLayer,bottomLevel=missing regular_latlon_surface.grib1 tmp_rlls.grib1 - ${tools_dir}grib_ls -plevels tmp_rlls.grib1 | grep MISSING>/dev/null diff --git a/sci-libs/grib_api/grib_api-1.11.0.ebuild b/sci-libs/grib_api/grib_api-1.11.0.ebuild deleted file mode 100644 index e1476a9132a..00000000000 --- a/sci-libs/grib_api/grib_api-1.11.0.ebuild +++ /dev/null @@ -1,88 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -AUTOTOOLS_IN_SOURCE_BUILD=1 - -FORTRAN_NEEDED=fortran -FORTRAN_STANDARD="77 90" -PYTHON_COMPAT=( python2_7 ) - -inherit autotools-utils toolchain-funcs fortran-2 python-single-r1 - -PID=3473437 - -DESCRIPTION="Library for decoding WMO FM-92 GRIB messages" -HOMEPAGE="https://software.ecmwf.int/wiki/display/GRIB/Home"; -SRC_URI="https://software.ecmwf.int/wiki/download/attachments/${PID}/${P}.tar.gz"; - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" - -IUSE="doc examples fortran jpeg2k netcdf openmp png python static-libs threads perl" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -RDEPEND=" - jpeg2k? ( - media-libs/openjpeg:0 - !!media-libs/jasper - ) - netcdf? ( sci-libs/netcdf ) - png? ( media-libs/libpng:0= ) - python? ( - ${PYTHON_DEPS} - dev-python/numpy[${PYTHON_USEDEP}] - )" -DEPEND="${RDEPEND} - python? ( dev-lang/swig )" - -pkg_setup() { - if use openmp; then - if [[ $(tc-getCC) == *gcc ]] && ! tc-has-openmp; then - ewarn "OpenMP is not available in your current selected gcc" - die "need openmp capable gcc" - fi - fi - fortran-2_pkg_setup - use python && python-single-r1_pkg_setup -} - -src_prepare() { - # failing test - sed -i \ - -e 's/\(${tools_dir}grib_ls -plevels tmp_rlls.grib1 | grep MISSING\)/#\1/' \ - tests/ls.sh -} - -src_configure() { - # perl module needs serious packaging work from upstream - local myeconfargs=( - --without-perl - $(use_enable jpeg2k jpeg) - $(use_enable fortran) - $(use_enable openmp omp-packing) - $(use_enable python) - $(use_enable python numpy) - $(use_enable threads pthread) - $( - use netcdf && \ - echo --with-netcdf="${EPREFIX}"/usr || \ - echo --with-netcdf=none - ) - $(use_with png png-support) - ) - autotools-utils_src_configure -} - -src_install() { - autotools-utils_src_install - use doc && dohtml -r html/* - if use examples; then - insinto /usr/share/doc/${PF}/examples - emake clean - doins -r * - fi - use python && python_optimize -} diff --git a/sci-libs/grib_api/grib_api-1.14.5.ebuild b/sci-libs/grib_api/grib_api-1.14.5.ebuild deleted file mode 100644 index 40b5406dc0f..00000000000 --- a/sci-libs/grib_api/grib_api-1.14.5.ebuild +++ /dev/null @@ -1,95 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -FORTRAN_NEEDED=fortran -FORTRAN_STANDARD="77 90" -PYTHON_COMPAT=( python{2_7,3_5,3_6} ) - -inherit cmake-utils toolchain-funcs fortran-2 python-single-r1 - -PID=3473437 - -DESCRIPTION="Library for encoding and decoding WMO FM-92 GRIB messages" -HOMEPAGE="https://software.ecmwf.int/wiki/display/GRIB/Home"; -SRC_URI="https://software.ecmwf.int/wiki/download/attachments/${PID}/${P}-Source.tar.gz - test? ( http://download.ecmwf.org/test-data/grib_api/grib_api_test_data.tar.gz )" - -S="${WORKDIR}/${P}-Source" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" - -IUSE="aec doc examples fortran netcdf png python static-libs test threads" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -RDEPEND=" - aec? ( sci-libs/libaec:= ) - netcdf? ( sci-libs/netcdf:= ) - png? ( media-libs/libpng:= ) - python? ( - ${PYTHON_DEPS} - dev-python/numpy[${PYTHON_USEDEP}] - )" - -DEPEND="${RDEPEND} - python? ( dev-lang/swig ) - test? ( dev-libs/boost )" - -PATCHES=( - "${FILESDIR}"/${P}-disable-failing-test.patch - "${FILESDIR}"/${P}-add-missing-destdir.patch -) - -pkg_setup() { - use fortran && fortran-2_pkg_setup - use python && python-single-r1_pkg_setup -} - -src_unpack() { - # only unpack the source and not the test data at this stage - unpack ${P}-Source.tar.gz -} - -src_prepare() { - # remove package build type to allow gentoo one - sed -i -e '/include(ecbuild_define_build_types)/d' cmake/ecbuild_system.cmake || die - cmake-utils_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DDISABLE_OS_CHECK=ON - -DENABLE_EXAMPLES=OFF - -DENABLE_ALIGN_MEMORY=ON - -DENABLE_MEMORY_MANAGEMENT=ON - -DENABLE_GRIB_TIMER=ON - -DENABLE_RELATIVE_RPATHS=OFF - -DENABLE_RPATHS=OFF - -DENABLE_AEC="$(usex aec)" - -DENABLE_FORTRAN="$(usex fortran)" - -DENABLE_GRIB_THREADS="$(usex threads)" - -DENABLE_JPG=OFF - -DENABLE_NETCDF="$(usex netcdf)" - -DENABLE_PNG="$(usex png)" - -DENABLE_PYTHON="$(usex python)" - -DENABLE_TESTS="$(usex test)" - ) - use static-libs && mycmakeargs+=( -DBUILD_SHARED_LIBS=BOTH ) - cmake-utils_src_configure -} - -src_test() { - # unpack here because subdirectory tree - use test && cd "${BUILD_DIR}" && unpack grib_api_test_data.tar.gz || die - cmake-utils_src_test -} - -src_install() { - cmake-utils_src_install - insinto /usr/share/doc/${PF} - use examples && doins -r examples - use doc && doins -r html -} diff --git a/sci-libs/grib_api/metadata.xml b/sci-libs/grib_api/metadata.xml deleted file mode 100644 index 9a5952fcb79..00000000000 --- a/sci-libs/grib_api/metadata.xml +++ /dev/null @@ -1,18 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> -<maintainer type="project"> - <email>[email protected]</email> - <name>Gentoo Science Project</name> -</maintainer> -<longdescription lang="en"> - The European Centre for Medium-Range Weather Forecasts GRIdded - Binary (GRIB) API is an application program interface accessible - from C and FORTRAN programs developed for encoding and decoding WMO - FM-92 GRIB edition 1 and edition 2 messages. A useful set of command - line tools is also provided to give quick access to grib messages. -</longdescription> -<use> - <flag name="aec">Build with Adaptive Entropy Coding compression, needs <pkg>sci-libs/libaec</pkg></flag> -</use> -</pkgmetadata>
