gentoo resync : 31.05.2021

15 files changed, 32 insertions, 35 deletions

diff --git a/sci-astronomy/Manifest.gz b/sci-astronomy/Manifest.gz
index 1702f3c494a0..3776eb267926 100644
--- a/sci-astronomy/Manifest.gz
+++ b/sci-astronomy/Manifest.gz
diff --git a/sci-astronomy/aatm/Manifest b/sci-astronomy/aatm/Manifest
index b970b2f7abf4..5391dfc6c380 100644
--- a/sci-astronomy/aatm/Manifest
+++ b/sci-astronomy/aatm/Manifest
@@ -1,3 +1,3 @@
 DIST aatm-0.6.tar.gz 613800 BLAKE2B 234d6db5c38b45182d525347357458d791d9fe11650391eab4694cb4271c823c0ec86b0e99c50d7b85624e9aafc79f8c9213954675878596f1219810f80614c8 SHA512 aef2d0fccc83a8a5817bd414b60c5167f7e378b434f9a3e9ce2bc2eeceec1cc1fb1b141cec07d78cb325dbfceac2804c07866291b2863f6839dfb6143ed9188a
-EBUILD aatm-0.6.ebuild 844 BLAKE2B 62f12147951004478e92e5ed40598c5371bf2eeb34217e094af8af8963879336c6a8b5bc84ed18fb9e4895113ae161d3353eb5678a27bda7cfc15a85bf28bc72 SHA512 596a841f089f72076f1ccb51b675bab043b43584d127a76ad8f533157a199f1a7b2f60e0ae3272bf58e6ae01d97d7a79e7d5060aebd76a5f9541f25f7849b0cb
+EBUILD aatm-0.6.ebuild 858 BLAKE2B bdedccef1b4a71efa15412e4d91c866cc2c7dcd7460c0f63cc69c5261a8baaa9024f3e17a1611c9a6ef02e3b02d31393f2fce80d204afcf774eb1767c1b459f2 SHA512 0fce9b312db14ec669388e4febdbf143d0967047be627e6b873eed7f8d851b5ede00dc644283e06fec3b0a016ec3a5d3d4983ddc4f20a8fe995dec956d17f4ce
 MISC metadata.xml 712 BLAKE2B 1266f6918af23a53374e6caacd2d0d9af47d8e6f9f6a694eb7463f6313cee0f5b2eb6c0325f3a7e30e05429d8cbc4bd523024a5c785e30bdd4f79314bb197235 SHA512 8c8a2c82a2355eb3c2370381a9964ddcf2e80ee367f4c02925f9ef96f6ca4e93bb0650c42d94ef28ddcf52f1a1d8a4902d688c1f183e0ac1d648fb99274a8735
diff --git a/sci-astronomy/aatm/aatm-0.6.ebuild b/sci-astronomy/aatm/aatm-0.6.ebuild
index 4d88214c7971..7c9effae287a 100644
--- a/sci-astronomy/aatm/aatm-0.6.ebuild
+++ b/sci-astronomy/aatm/aatm-0.6.ebuild
@@ -3,8 +3,6 @@
 
 EAPI=6
 
-inherit ltprune
-
 DESCRIPTION="Atmospheric Modelling for ALMA Observatory"
 HOMEPAGE="https://svn.cv.nrao.edu/view/aatm/devel/casa/"
 # tar ball is made from the HOMEPAGE and running ./configure && make dist
@@ -31,7 +29,11 @@ src_compile() {
 
 src_install() {
 	default
-	use static-libs || prune_libtool_files --all
+
+	if ! use static-libs; then
+		find "${ED}" -name '*.la' -delete || die
+	fi
+
 	if use doc; then
 		insinto /usr/share/doc/${PF}
 		doins -r developer/html
diff --git a/sci-astronomy/casa-data/Manifest b/sci-astronomy/casa-data/Manifest
index 16c79b754198..de74675bd023 100644
--- a/sci-astronomy/casa-data/Manifest
+++ b/sci-astronomy/casa-data/Manifest
@@ -1,3 +1,3 @@
 DIST casa-data-20170703.tar.Z 12421015 BLAKE2B 324dd4174f80bdf192de0ec8c12125304a9dd85b6bf64b4386053ec65bab4aa98417bf69f38eae64e4bfacfa4a6479cc6fded13fd0c8edfcbd3eb8aec537c815 SHA512 dc0de856da4146ed356fbfcb522b427bb6a66fb08affdf0bfe803b21305ac37eff9b1790ede58acc993df2f22d620982f10b42f631457258d1620702c10d87b1
-EBUILD casa-data-20170703.ebuild 514 BLAKE2B ce77f91231ce6c8f35dd22ac1bda371bcc3856a3872ac3183d6fa8f1c39784869d612a5736e26d459bfb981681b3fc293c428aad8e4bc532bf87da4dec43ef34 SHA512 5a792afbfd5d7e2429ab5fdc639b46916f4f09039ce6161194d350ebb941f02ce1da94e7ed50fb7926c99aee547712510fae938a1d4ceace9795a9dd67e0672c
+EBUILD casa-data-20170703.ebuild 472 BLAKE2B b09fd244df7853166418d196eeb393f1c093c6c5f69c515ed6f901406619d6d1611625a9ca7abc470cec62836ab21b8fce4ca6f60d173a68f71cfaa37ba10136 SHA512 52f64922d5cb4174f21979c2790f29aee9e7de963b3ebd3b2d7deb227d9c4230576cbf220a08629425ed423020fd0e2885e3f2372deb0f6251284116623911fb
 MISC metadata.xml 524 BLAKE2B 2adff14c67dbaf70f078c08e8cb3a4c2236e80063d023b1ab5df15577e2bd2c33d1c3a6b6c29019a76b426a31e55a573bff07c26fb8a261244a1084f9f2a4aef SHA512 fca5391c7f86dbbbaafdb03a23218b36d039603e66f68f9b3c7da2e51782ca9855c7784f8ea87729bd8de7eeb7cf901893becae8335159e76154b88aa289457e
diff --git a/sci-astronomy/casa-data/casa-data-20170703.ebuild b/sci-astronomy/casa-data/casa-data-20170703.ebuild
index 78279ca3163b..b4d8eb48b3c2 100644
--- a/sci-astronomy/casa-data/casa-data-20170703.ebuild
+++ b/sci-astronomy/casa-data/casa-data-20170703.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,17 +8,11 @@ MYPN=WSRT_Measures
 DESCRIPTION="Data and tables for the CASA software"
 HOMEPAGE="https://github.com/casacore/casacore/"
 SRC_URI="ftp://ftp.astron.nl/outgoing/Measures/${MYPN}_${PV}-000001.ztar -> ${P}.tar.Z"
-
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+S="${WORKDIR}"
 
 LICENSE="LGPL-3"
 SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 
 src_install() {
 	insinto /usr/share/casa/data
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.ebuild b/sci-astronomy/cpl/cpl-7.0-r1.ebuild
index eaafe47a267c..c93a0ca4831f 100644
--- a/sci-astronomy/cpl/cpl-7.0.ebuild
+++ b/sci-astronomy/cpl/cpl-7.0-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# 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 ltprune
+inherit autotools java-pkg-opt-2
 
 DESCRIPTION="ESO common pipeline library for astronomical data reduction"
 HOMEPAGE="http://www.eso.org/sci/software/cpl/"
@@ -18,6 +18,7 @@ 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=
@@ -71,6 +72,6 @@ src_compile() {
 
 src_install() {
 	default
-	prune_libtool_files --all
+	find "${ED}" -name '*.la' -delete || die
 	use doc && emake install-html
 }
diff --git a/sci-astronomy/fitsh/Manifest b/sci-astronomy/fitsh/Manifest
index 80a796324e15..eac266fe9747 100644
--- a/sci-astronomy/fitsh/Manifest
+++ b/sci-astronomy/fitsh/Manifest
@@ -1,3 +1,3 @@
 DIST fitsh-0.9.2.tar.gz 596395 BLAKE2B c1b4354dbbeb7a49483bafc7fd2af6e02d9d0dbe3a55c0f2ef68a012a015163fb7fa3d0ecec0f0bdd47363ad233d1e81b9b2db2e7b15c5885b397a81237c5e79 SHA512 2a6e48b7dc684bf533b541d94dc5ead86166992763b7d0b78ec63916454a5aa515281babfab73c94bbc73b19c3de82e0f387548a4f01974f3593bbc8ddb15c61
-EBUILD fitsh-0.9.2.ebuild 380 BLAKE2B ed89784f28f9c56c1b7c0577d9b6e77ea6edbdcc745188c7adf8e50341341f4b9e192ee62d325c20a52ee725e85e48e688945a7d59f7ff951ca20ed6cb58c2b6 SHA512 caee694f28f052e7ca95a210fb7233a8b7d5bd7d6e8f155d86e6e7b7422df511c4b1f516ecde557719833d8ccf91cd8b5f1f02e96868ec9556fd18de50ec91b1
+EBUILD fitsh-0.9.2.ebuild 336 BLAKE2B d6328ebc0cf4b311f7b13056c92c30ff146d8d24ca5c708561456ef52bf19b7f78d1564a5ea9be269c79979f7876cb823f0cc87b8b72b2ae6d9d58b412f8b8d8 SHA512 92531e66ab88b5641c7bf2f331afe1813cad9de8eb78e09c77911f0cce87630651e0a958de9c0f311aa887f6abc4db6ddc03e48a7dc143959c587d822b1633ed
 MISC metadata.xml 701 BLAKE2B 19e0743fd367a897fbd598cca928eee34a692d1e5944aa156fe823ca5846631e37795d7195686e2d1b2b0d5ac6de29d9ebe9c1cd3383bd09f51fd6a53c035e79 SHA512 9b1dd5aa1da2bb55080f61c97d2ed445a89c15f8233be6388c0273e886393874548d16eab72619ae89f5fd6c8f22158af9d143c76a24f0b67fa3de9634477079
diff --git a/sci-astronomy/fitsh/fitsh-0.9.2.ebuild b/sci-astronomy/fitsh/fitsh-0.9.2.ebuild
index 86640da85703..c32d7fc69cc1 100644
--- a/sci-astronomy/fitsh/fitsh-0.9.2.ebuild
+++ b/sci-astronomy/fitsh/fitsh-0.9.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,8 +10,3 @@ SRC_URI="https://fitsh.net/download/fitsh/${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/sci-astronomy/gnuastro/Manifest b/sci-astronomy/gnuastro/Manifest
index 5ddf744d861f..0b5244ebdc81 100644
--- a/sci-astronomy/gnuastro/Manifest
+++ b/sci-astronomy/gnuastro/Manifest
@@ -1,3 +1,3 @@
 DIST gnuastro-0.3.tar.gz 4525361 BLAKE2B 432078bf330fc8e6886246e4aec767c86b9c19c0c438a3c37b1912e3433e82c68db1090351b0e2e8e4fbb8a7906aa3ac031db8abd5e8c15380e1e8c349b9ebe5 SHA512 08556fd0de196c331cfd68e4b385fbef5c130fa9c914889367f4e3637b8dc6270a2424ef92c6641ec803c355d0577cebf3ace5ad76a7024f0414bb516338beac
-EBUILD gnuastro-0.3.ebuild 927 BLAKE2B b4e55ea351ca87584ca7c8e246a25f1affacc665680868b98c9b841f8beee6f224203daa43203641d2da9ad049a1dcc17ead925499ca96695d8843c9ea826c99 SHA512 892bb34e53e19a6857ed527258802d6d98531e6f759226dae56b68d1aafa9081b7e455e5304a0b12a73c040f8684053ad246f158e1129c9570658fc15ccf33dd
+EBUILD gnuastro-0.3.ebuild 949 BLAKE2B 8f71ad2a919b593733eefe87e5b0a45db1ccdb6f3da396ebdd679c91af9d686c79a47601aa278fa30569f979ac97311eeff075b1eb57025e6a8b04a9fa0c144e SHA512 bb517dad64778f4a94f64d5aa505cf4d48b2af727044318865f6101434bcb6536e3fce61cdc8a6c2933220d0f73b60cac49ffd8d0fb920a82534db83a67a072b
 MISC metadata.xml 988 BLAKE2B e79ac35010cd4f12dfaefadaf92f9e48a6f3a67530fd20795af7cac8c304b3d88f6163c4357350adad61f2de6d4053d2273f34e89256efdd82fbd741b2ea22a4 SHA512 208e0ea993adb14966523de6b012b6c2a97c6373e9a7bf03039dd50d32b03cd07a1a5da5196081a18b39b93d7d7d5d078b283a949b8b258f3f966cc2df00d00f
diff --git a/sci-astronomy/gnuastro/gnuastro-0.3.ebuild b/sci-astronomy/gnuastro/gnuastro-0.3.ebuild
index 75df93e24129..fe896068c87c 100644
--- a/sci-astronomy/gnuastro/gnuastro-0.3.ebuild
+++ b/sci-astronomy/gnuastro/gnuastro-0.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit autotools ltprune
+inherit autotools
 
 DESCRIPTION="GNU Astronomy Utilities"
 HOMEPAGE="https://www.gnu.org/software/gnuastro"
@@ -45,5 +45,8 @@ src_configure() {
 
 src_install() {
 	default
-	use static-libs || prune_libtool_files --all
+
+	if ! use static-libs; then
+		find "${ED}" -name '*.la' -delete || die
+	fi
 }
diff --git a/sci-astronomy/healpix/Manifest b/sci-astronomy/healpix/Manifest
index eb78d4d59e60..95bf3ea1fc1c 100644
--- a/sci-astronomy/healpix/Manifest
+++ b/sci-astronomy/healpix/Manifest
@@ -1,3 +1,3 @@
 DIST Healpix_3.31_2016Aug26.tar.gz 23834899 BLAKE2B a9e3b6567e851eb941e81d45145848a8daede260454dee29e056857f98ea643a0a438a5cc763651f4156ae975be41c601b8664f8bebbcf13b0fb23822c36ae40 SHA512 fd80e9ed80d19e438134f63c3d13802f63c4cd1b9f3596807e67d4ba5ff814e652a130d038449269d6ead271085eb0ab74884b2d768d8531066727377c457f9c
-EBUILD healpix-3.31.ebuild 3158 BLAKE2B 7dc88ac551d3584da93348450938dbac2d0b2ca5c3698c697b4f5c015c14576f6f2fec6b13bc2f7199c0b6b5d5105a3c73177a414e9ca5a424be143b41382fb8 SHA512 928e61b4a9e69994103bc040fd790ca4bed5617b9249d7436e40f77f6158c497d46b74a9f68c4f28151a846ccd1786bf27dc1bb6baed83087131a3306b63961e
+EBUILD healpix-3.31.ebuild 3165 BLAKE2B 72e7048c84ab276d94ee8bce0673da848579474474cbc81122fd9eeeeb7f5e932ec8e4d3fd03f78fc4469270b89f3478dff3f1f24f9aaa701422c317ed882fac SHA512 9a7e0b4fd0ff0614dba1684b7b4029a97aaeab360758bedb844773deef9f5617ffefa46102d33fb9aefb6a36d1c5c0cf14908aa527f6511699dd42be397e6051
 MISC metadata.xml 736 BLAKE2B fdd21741b7c0321c12cc49a894f493b63299be259d02f40c8475a7f2c270b1a4c57e80d1ecbc468d6dd571a5eb51443a711ff95a8be6aaa8d9aee8ac380063e3 SHA512 1c1b23603bf390ebf8258f75a0867f2a0eb640099c2fbba9db5377449945aff71df8eac9c4c83391e838f1785fca1ce64b7acacd112f7a3b1ddde61a8923f1d5
diff --git a/sci-astronomy/healpix/healpix-3.31.ebuild b/sci-astronomy/healpix/healpix-3.31.ebuild
index 164e0eb80841..d96d3c91b57e 100644
--- a/sci-astronomy/healpix/healpix-3.31.ebuild
+++ b/sci-astronomy/healpix/healpix-3.31.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit autotools toolchain-funcs java-pkg-opt-2 java-ant-2 ltprune
+inherit autotools toolchain-funcs java-pkg-opt-2 java-ant-2
 
 MYP="Healpix_${PV}"
 MYPF=${MYP}_2016Aug26
@@ -120,7 +120,7 @@ src_install() {
 		dodoc ../CHANGES
 		popd > /dev/null
 	fi
-	use static-libs || prune_libtool_files --all
+	use static-libs || find "${ED}" -name '*.la' -delete || die
 	if use idl; then
 		pushd src/idl > /dev/null
 		insinto /usr/share/gnudatalanguage/healpix
diff --git a/sci-astronomy/pal/Manifest b/sci-astronomy/pal/Manifest
index 8e8ac1e79fa9..5b37a06ff4b6 100644
--- a/sci-astronomy/pal/Manifest
+++ b/sci-astronomy/pal/Manifest
@@ -1,3 +1,3 @@
 DIST pal-0.9.7.tar.gz 1220443 BLAKE2B 99ffccf0eff340f21ea99bfa219d651d0773957152bdc840b2cc7596f14c0389846128947fb63607856e76ba6a98bd113fd04eddf819f71eaa5f16b957ebc78c SHA512 d3f13e7ff321500acc71198240392fe9a3304c4142cf5b1f1c3950ddb1351dddac8565ef27b1c724d608cc1053d15647c777c4d0dc466a99a1b08b64e62ec37b
-EBUILD pal-0.9.7.ebuild 768 BLAKE2B 2f2d574ccd6f929fdfb6b73f1105bed4b81578a5168ad32301fd6b48a83d0fd66e2090e5bffdf48478dfeb4b29b4eb104c03975667bba6b1ef48178f77d6f1a2 SHA512 8f39d7d89a3fbc187d47b2a78f6041ebd2ef85707837c94e1c5ae23e3490649b3f283c775e30c82a72b6519e587c46c0b36b8698f3499e6c781822fa01c3d1e3
+EBUILD pal-0.9.7.ebuild 782 BLAKE2B 80b0d33feba8de8f71542bbd23172985ecd5a2fde98599a2dd33515dbb30674bf92dbe21352ba1298222a09df8079abf7f826e24a04fcff1c062464c66bbf6e6 SHA512 fd140421ae2b94d5423555f86716f629222e2d0445c74fab572fabf944d1b6ec554cf2e011c75f27e7cf8616d95796da7f018e0f72099e31662b779ef82dc6ff
 MISC metadata.xml 641 BLAKE2B a918c7a0568ae8bda81a618bef8b69f27fac7c4b8c34383c6436843e77b5f532327e9955beb2d2a2ab0829d92a4e46c20f4c7f1f21d03eafbb88e5614102801e SHA512 30901b566b997f270d805e251b2beae284261ff30e8d0725abe6233ce082dc8723d59aa72157073636837573621db4823c9504c0caf8e8ae6084a03b0c3d9561
diff --git a/sci-astronomy/pal/pal-0.9.7.ebuild b/sci-astronomy/pal/pal-0.9.7.ebuild
index 5ddae8ed01fa..3ab899f976be 100644
--- a/sci-astronomy/pal/pal-0.9.7.ebuild
+++ b/sci-astronomy/pal/pal-0.9.7.ebuild
@@ -3,8 +3,6 @@
 
 EAPI=6
 
-inherit ltprune
-
 DESCRIPTION="Positional Astronomy Library"
 HOMEPAGE="https://github.com/Starlink/pal"
 SRC_URI="https://github.com/Starlink/${PN}/releases/download/v${PV}/${P}.tar.gz"
@@ -25,8 +23,12 @@ src_configure() {
 
 src_install() {
 	default
+
 	# remove cruft from non-fhs compliant
 	rm -r "${ED}"usr/share/pal || die
 	rm -r "${ED}"usr/{docs,manifests,news} || die
-	use static-libs || prune_libtool_files --all
+
+	if ! use static-libs; then
+		find "${ED}" -name '*.la' -delete || die
+	fi
 }