From d2d54c8223043e136df186dafad0e4c954ae2bb7 Mon Sep 17 00:00:00 2001 From: Jakov Smolic Date: Mon, 18 Jan 2021 11:13:58 +0100 Subject: sci-astronomy/cpl: Remove old Signed-off-by: Jakov Smolic Signed-off-by: David Seifert --- sci-astronomy/cpl/Manifest | 2 - sci-astronomy/cpl/cpl-6.4.2.ebuild | 73 --------------------- sci-astronomy/cpl/cpl-6.6.1.ebuild | 76 ---------------------- .../cpl/files/cpl-6.1.1-check-shared-libs.patch | 35 ---------- .../cpl/files/cpl-6.1.1-use-system-ltdl.patch | 46 ------------- 5 files changed, 232 deletions(-) delete mode 100644 sci-astronomy/cpl/cpl-6.4.2.ebuild delete mode 100644 sci-astronomy/cpl/cpl-6.6.1.ebuild delete mode 100644 sci-astronomy/cpl/files/cpl-6.1.1-check-shared-libs.patch delete mode 100644 sci-astronomy/cpl/files/cpl-6.1.1-use-system-ltdl.patch diff --git a/sci-astronomy/cpl/Manifest b/sci-astronomy/cpl/Manifest index aaf9792c8f4d..6390d6e12c57 100644 --- a/sci-astronomy/cpl/Manifest +++ b/sci-astronomy/cpl/Manifest @@ -1,3 +1 @@ -DIST cpl-6.4.2.tar.gz 3165143 BLAKE2B aaf36e15e88ece67cff74fb086054281bf283b7bbd9bfe163a73be6fe60c16cf1cde030f3d0cfd0d088de02b8e6f0ee182c8c809d3072e0680421a57797c5dbb SHA512 636ce549f23862a111fd88e97878eff8b86c88e8e2e800533b2f34f219f6b6ea3f03bd9de6ce9606c3787d0a61fb66a6bd92087d24c57c47e5a26e31eb362a11 -DIST cpl-6.6.1.tar.gz 3082051 BLAKE2B 748b6336021141451f520a27c295f9df6d23eaa1008b9325b74dedcd844d586869bccaa70c9663549c5cf9d498e6d326d1ad8fc9a2e53b05f975c037ebdfbd84 SHA512 261cd092b3d0f1865f2e1aca0760232497cfe85b92f61601b22d81619147cad17c427791adad5a863acb3febcfe78590c8f8d10de1d626f4b90302326f936064 DIST cpl-7.0.tar.gz 3090767 BLAKE2B bb1f6dcc35c1e2f574a6e008af2461a3832cfbd742bcef7ce9ff151d7fd7157ecc34b6efb75dcf3fc77e41ae20d7d14f229da05351712c3214f9da4814e0f5e5 SHA512 d79eb37a5f29740edc1736815bde6ec31bc4e1f648552cad48ab70626170ff6195d226de0c198e0287dee3bfe815ee7302b6882395d710c534fabe0c5353aaa6 diff --git a/sci-astronomy/cpl/cpl-6.4.2.ebuild b/sci-astronomy/cpl/cpl-6.4.2.ebuild deleted file mode 100644 index aba6a36645b2..000000000000 --- a/sci-astronomy/cpl/cpl-6.4.2.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -JAVA_PKG_OPT_USE=gasgano -AUTOTOOLS_AUTORECONF=1 - -inherit eutils java-pkg-opt-2 autotools-utils - -DESCRIPTION="ESO common pipeline library for astronomical data reduction" -HOMEPAGE="http://www.eso.org/sci/software/cpl/" -SRC_URI="ftp://ftp.eso.org/pub/dfs/pipelines/libraries/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0/20" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" - -IUSE="doc gasgano static-libs threads" - -RDEPEND=" - sci-astronomy/wcslib:0= - >=sci-libs/cfitsio-3.310:0= - sci-libs/fftw:3.0= - gasgano? ( sci-astronomy/gasgano )" -DEPEND="${RDEPEND} - doc? ( app-doc/doxygen )" - -PATCHES=( - "${FILESDIR}"/${PN}-6.1.1-check-shared-libs.patch - "${FILESDIR}"/${PN}-6.1.1-use-system-ltdl.patch -) - -src_prepare() { - # bug 422455 and remove cpu chcking - sed -i \ - -e '/AM_C_PROTOTYPES/d' \ - -e '/CPL_CHECK_CPU/d' \ - configure.ac libcext/configure.ac || die - autotools-utils_src_prepare -} - -src_configure() { - local myeconfargs=( - --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" - --disable-ltdl-install - --without-included-ltdl - --with-cfitsio="${EPREFIX}/usr" - --with-wcs="${EPREFIX}/usr" - --with-fftw="${EPREFIX}/usr" - $(use_enable doc maintainer-mode) - $(use_enable threads) - ) - if use gasgano; then - myeconfargs+=( - --enable-gasgano - --with-gasgano="${EPREFIX}/usr" - --with-gasgano-classpath="${EPREFIX}/usr/share/gasgano/lib" - --with-java="$(java-config -O)" - ) - else - myeconfargs+=( --disable-gasgano ) - fi - autotools-utils_src_configure -} - -src_compile() { - autotools-utils_src_compile all $(use doc && echo html) -} - -src_install() { - autotools-utils_src_install all $(use doc && echo install-html) -} diff --git a/sci-astronomy/cpl/cpl-6.6.1.ebuild b/sci-astronomy/cpl/cpl-6.6.1.ebuild deleted file mode 100644 index cd2588164670..000000000000 --- a/sci-astronomy/cpl/cpl-6.6.1.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -JAVA_PKG_OPT_USE=gasgano - -inherit autotools java-pkg-opt-2 ltprune - -DESCRIPTION="ESO common pipeline library for astronomical data reduction" -HOMEPAGE="http://www.eso.org/sci/software/cpl/" -SRC_URI="ftp://ftp.eso.org/pub/dfs/pipelines/libraries/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0/20" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" - -IUSE="doc gasgano static-libs threads" - -RDEPEND=" - sci-astronomy/wcslib:0= - sci-libs/cfitsio:0= - sci-libs/fftw:3.0= - gasgano? ( sci-astronomy/gasgano )" -DEPEND="${RDEPEND} - doc? ( app-doc/doxygen )" - -PATCHES=( - "${FILESDIR}"/${PN}-6.6.1-use-system-ltdl.patch -) - -src_prepare() { - default - # remove cpu chcking - sed -e '/CPL_CHECK_CPU/d' \ - -i configure.ac libcext/configure.ac || die - # search for shared libs, not static - sed -e 's/\.a/\.so/g' \ - -i m4/cpl.m4 || die - eautoreconf -} - -src_configure() { - local myeconfargs=( - --disable-ltdl-install - --without-included-ltdl - --with-cfitsio="${EPREFIX}/usr" - --with-wcs="${EPREFIX}/usr" - --with-fftw="${EPREFIX}/usr" - $(use_enable doc maintainer-mode) - $(use_enable static-libs static) - $(use_enable threads) - ) - if use gasgano; then - myeconfargs+=( - --enable-gasgano - --with-gasgano="${EPREFIX}/usr" - --with-gasgano-classpath="${EPREFIX}/usr/share/gasgano/lib" - --with-java="$(java-config -O)" - ) - else - myeconfargs+=( --disable-gasgano ) - fi - econf ${myeconfargs[@]} -} - -src_compile() { - default - use doc && emake html -} - -src_install() { - default - prune_libtool_files --all - use doc && emake install-html -} diff --git a/sci-astronomy/cpl/files/cpl-6.1.1-check-shared-libs.patch b/sci-astronomy/cpl/files/cpl-6.1.1-check-shared-libs.patch deleted file mode 100644 index 658f2eaefb9e..000000000000 --- a/sci-astronomy/cpl/files/cpl-6.1.1-check-shared-libs.patch +++ /dev/null @@ -1,35 +0,0 @@ -Check shared library instead of static ones. -bicatali@gentoo.org - -diff -Nur cpl-6.1.1.orig/m4/cpl.m4 cpl-6.1.1/m4/cpl.m4 ---- cpl-6.1.1.orig/m4/cpl.m4 2012-06-04 18:38:01.000000000 +0100 -+++ cpl-6.1.1/m4/cpl.m4 2012-06-04 18:46:37.000000000 +0100 -@@ -8,7 +8,7 @@ - - cpl_cfitsio_check_version="$1" - cpl_cfitsio_check_header="fitsio.h" -- cpl_cfitsio_check_lib="libcfitsio.a" -+ cpl_cfitsio_check_lib="libcfitsio.so" - - cpl_cfitsio_incdirs="" - cpl_cfitsio_libdirs="" -@@ -668,7 +668,7 @@ - - cpl_wcs_check_version="$1" - cpl_wcs_check_header="wcslib/wcslib.h" -- cpl_wcs_check_lib="libwcs.a" -+ cpl_wcs_check_lib="libwcs.so" - - cpl_wcs_includes="" - cpl_wcs_libraries="" -@@ -900,8 +900,8 @@ - - cpl_fftw_check_version="$1" - cpl_fftw_check_header="fftw3.h" -- cpl_fftw_check_lib="libfftw3.a" -- cpl_fftwf_check_lib="libfftw3f.a" -+ cpl_fftw_check_lib="libfftw3.so" -+ cpl_fftwf_check_lib="libfftw3f.so" - - cpl_fftw_includes="" - cpl_fftw_libraries="" diff --git a/sci-astronomy/cpl/files/cpl-6.1.1-use-system-ltdl.patch b/sci-astronomy/cpl/files/cpl-6.1.1-use-system-ltdl.patch deleted file mode 100644 index a0c23a75d38c..000000000000 --- a/sci-astronomy/cpl/files/cpl-6.1.1-use-system-ltdl.patch +++ /dev/null @@ -1,46 +0,0 @@ -use system libtdl from libtool instead of bundled one -see http://www.flameeyes.eu/autotools-mythbuster/libtool/plugins.html -bicatali@gentoo.org - -diff -Nur cpl-6.1.1.orig/configure.ac cpl-6.1.1/configure.ac ---- cpl-6.1.1.orig/configure.ac 2012-06-04 18:38:01.000000000 +0100 -+++ cpl-6.1.1/configure.ac 2012-06-04 22:14:23.000000000 +0100 -@@ -60,8 +60,12 @@ - AC_ENABLE_STATIC(yes) - AC_ENABLE_SHARED(yes) - --AC_LIBLTDL_CONVENIENCE --AC_PROG_LIBTOOL -+LT_INIT([dlopen]) -+AC_CHECK_HEADER([ltdl.h], -+ [AC_CHECK_LIB([ltdl], [lt_dladvise_init], -+ [LIBLTDL=-lltdl], [LIBLTDL=])], -+ [LIBLTDL=]) -+ - AC_SUBST(INCLTDL) - AC_SUBST(LIBLTDL) - AC_SUBST(LIBTOOL_DEPS) -@@ -131,7 +135,6 @@ - CPL_CONFIG_FUNC - - # Configure subpackages --AC_CONFIG_SUBDIRS(libltdl) - - if test ! x$"cpl_cv_with_system_cext" = xyes; then - AC_CONFIG_SUBDIRS([libcext]) -diff -Nur cpl-6.1.1.orig/Makefile.am cpl-6.1.1/Makefile.am ---- cpl-6.1.1.orig/Makefile.am 2012-06-04 18:38:01.000000000 +0100 -+++ cpl-6.1.1/Makefile.am 2012-06-04 19:07:41.000000000 +0100 -@@ -25,11 +25,10 @@ - DISTCLEANFILES = *~ - - if GASGANO_SUPPORT --libltdl = libltdl - cpljava = cpljava - endif - --SUBDIRS = $(libltdl) $(libcext) cplcore cplui cpldrs cpldfs $(cpljava) -+SUBDIRS = $(libcext) cplcore cplui cpldrs cpldfs $(cpljava) - - HTML_SUBDIRS = - -- cgit v1.2.3-65-gdbad