From e748ba9741f6540f4675c23e3e37b73e822c13a4 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Mon, 31 May 2021 20:59:14 +0100
Subject: gentoo resync : 31.05.2021

---
 sci-astronomy/cpl/Manifest          |  2 +-
 sci-astronomy/cpl/cpl-7.0-r1.ebuild | 77 +++++++++++++++++++++++++++++++++++++
 sci-astronomy/cpl/cpl-7.0.ebuild    | 76 ------------------------------------
 3 files changed, 78 insertions(+), 77 deletions(-)
 create mode 100644 sci-astronomy/cpl/cpl-7.0-r1.ebuild
 delete mode 100644 sci-astronomy/cpl/cpl-7.0.ebuild

(limited to 'sci-astronomy/cpl')

diff --git a/sci-astronomy/cpl/Manifest b/sci-astronomy/cpl/Manifest
index 73922635d31c..68f86b3927dd 100644
--- a/sci-astronomy/cpl/Manifest
+++ b/sci-astronomy/cpl/Manifest
@@ -1,4 +1,4 @@
 AUX cpl-6.6.1-use-system-ltdl.patch 1005 BLAKE2B e5c6024e98b9c8fcded2b1d3a40b7ba89b11dc74fb125e5d13bb3926f39cf32b3d5bcb15d5df06a68843bcef36ae827bf512ba957e2923a738e7b82d0b36568a SHA512 bd3c517245f8d2fb29cc68bcc1f4bad3d0fd5d8c2b3673b0ddbcec5b12b171527109ba3ad2bb2961d37c921ddb11876d49e698199c7360ad907c0ed28245404a
 DIST cpl-7.0.tar.gz 3090767 BLAKE2B bb1f6dcc35c1e2f574a6e008af2461a3832cfbd742bcef7ce9ff151d7fd7157ecc34b6efb75dcf3fc77e41ae20d7d14f229da05351712c3214f9da4814e0f5e5 SHA512 d79eb37a5f29740edc1736815bde6ec31bc4e1f648552cad48ab70626170ff6195d226de0c198e0287dee3bfe815ee7302b6882395d710c534fabe0c5353aaa6
-EBUILD cpl-7.0.ebuild 1629 BLAKE2B 0f3c374760b6db5c87c4769bfae4191b515ca76ef03f81b611a303380f80184f3ed20440da242e149bb44fd51aa01cf52392648f8a14e6c7b02e54ad7e3d6492 SHA512 542689f9aba4e49a9d3d50eca6150a0a08ae8f494454683a8a99ad49c5a511239ed955c7823ee76f2f8dc73d9ecd1d945c86a43f2c98ca4833cc0f062d8893e1
+EBUILD cpl-7.0-r1.ebuild 1654 BLAKE2B b64c73da3794404387bfd33e29a90f58a854bec694cf6c8c03ba4446fbe93af9125a3512c3bc9e5a90cafded0edb58f5f4d1620899eb4b60ac6288ab9d2a127b SHA512 d821422d6312a752ee711bbfb3c0f93e079d45df6572129707d5aa5d52e39626429b111e9ad91b08d00bd4b49c304ecaec572944a7be18df48d14cb42a9b2585
 MISC metadata.xml 1076 BLAKE2B e69663d74885ae7197c12777a4f200b1727c165739883c66134ba88c9a6e137b482028160b6daa6421ec3e36315ff793893d7d2f57568569d9c774764bed3df5 SHA512 5c4f45f0c1ee32b01b5f04ec5cd7ae1721f9dc21e9b9027a5001f0f034a04efed71dbf4a3f30a1b6070f45c9b0f08f71926f63aaf3ce4c38c9b2a53fb50b9278
diff --git a/sci-astronomy/cpl/cpl-7.0-r1.ebuild b/sci-astronomy/cpl/cpl-7.0-r1.ebuild
new file mode 100644
index 000000000000..c93a0ca4831f
--- /dev/null
+++ b/sci-astronomy/cpl/cpl-7.0-r1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2021 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
+
+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/26"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+IUSE="doc gasgano static-libs threads"
+
+RDEPEND="
+	dev-libs/libltdl
+	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
+	find "${ED}" -name '*.la' -delete || die
+	use doc && emake install-html
+}
diff --git a/sci-astronomy/cpl/cpl-7.0.ebuild b/sci-astronomy/cpl/cpl-7.0.ebuild
deleted file mode 100644
index eaafe47a267c..000000000000
--- a/sci-astronomy/cpl/cpl-7.0.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/26"
-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
-}
-- 
cgit v1.2.3