gentoo resync : 18.12.2020

6 files changed, 16 insertions, 138 deletions

diff --git a/sci-libs/adolc/Manifest b/sci-libs/adolc/Manifest
index eb7cb16b829d..77b53be5d459 100644
--- a/sci-libs/adolc/Manifest
+++ b/sci-libs/adolc/Manifest
@@ -1,13 +1,8 @@
-AUX adolc-2.4.0-no-colpack.patch 580 BLAKE2B 95247622f68b6e5c4f45eb6eef7cd99f7596705712346aab2a79233d2dda936c9a25cc65437e9b7082672fa7c0cd023a9281871498e1a3133eea770bb5ce48d7 SHA512 974e538343c377ce286c63b5206a5c3c33d9b5995addac07860ca52f6e1d3ca42d1fe8c1384b6d5d0ac39c062d8dc1f984262172b347f273c0e4c7d43fd120a2
 AUX adolc-2.5.0-no-colpack.patch 1424 BLAKE2B ea11eed8f816daaa9809b8f6a6f20e87a22acbf2d210f60000b93635f68d5f362530bac5a46c173ffbd33aec31769c6e5dadf9f638779bbdc0e17483b1a0f5c4 SHA512 826023e0066620a1885a462c31cb5be80d880f917df26c007564e327b8be8513621e56b601b6f9bfcec0fc617a15eea5016436aa08bebb0346254089a5d850ec
 AUX adolc-2.5.0-pkgconfig-no-ldflags.patch 364 BLAKE2B a35ab92ca491110c390a4d0f90c7cb12f417891762571ec91ce64fb81d84c4a7e3249971302e3801f721e7791725e37e3f4d241160ec80c5c633af096cad9107 SHA512 914bd01428fc07f50985afc076722778029835048883eade3730878c2d103cd29c288656d524ad3895416e94b50b5db2f53e35fdab0ed2a0f364669bf304af41
 AUX adolc-2.6.2-dash.patch 4516 BLAKE2B 8db052472bd3051ed0b8b1a180aac4098862695cefeed0f0f94600d447b2ef5b888ba072613ea101ac1435569eb9d5bcba1aa64b23a0bc7cf01a4ef20d3f760b SHA512 9b904d8c0ab3c286af27b293b5ffe516b9c1da53169702f94a9213496b6626e1a587e8ab8d9d25b983872c1a97620a8d5386d9053ba1a4c973ef5e145f655bc5
 AUX adolc-2.7.2-swig-python-configure.patch 15544 BLAKE2B 83a31d310e6ae4245085af960ef8440983defd75fa04fac63c24171640886c17a093f44a868c397db8f4189db61f523aa98b75bcab2238ab4931d6b94290f5c7 SHA512 661c4a939d58b7593dc4fbce5874c4e0e918ea54ca1163ae2984aeef528fe4a2c67128070d4f6fc3e33aab2d1e7b7d5e2ae244cea34111c69c72478e5949755f
-DIST ADOL-C-2.4.1.tgz 2210414 BLAKE2B f9b1fd7f0e619d811b29e077e436697dc8b5a388568d73b2db602e57f97cbb690a5b47a55c722ae45cc28698dd19949eddb9d02e11c87383191e217f012519bb SHA512 5e5135ca587d159510bf77338fdff3d324f4d32c4ec6f8cf64ddc92253b427b8ee26a30bc1d83fe18121bbfdc7454c3536f58849c0c335e1b240e39d46acdccc
-DIST ADOL-C-2.6.3.tgz 2416928 BLAKE2B 74e575a1a919bc2787be0c29deaac4b503c077cb06efdba3f2382f21abf1ed53e8cb5f41729dc39f9188e44460fa137a09cffdb296b5f92131153795f36fa83a SHA512 e3c44b1f8ab5211a8a3c3163124e35b6d1e9551672ab4944d983dd3117f609d512c1b08c61e535dc4d50089295ee565bec07aaca67aa88b57b17bc3906573262
 DIST adolc-2.7.2.tar.gz 2447479 BLAKE2B 0f871ce1dcb50bb14684e45e265cf45807f514dd3ca0dbaaedede2c7117d34cc5a34b0096a34c8ec37023e50aec7fd4be6561819d6297771e7f7fcaa7ba0e507 SHA512 b896650077367fd7388a6c5a40e5d8bb3f19af9e3bc5b067fd1d9a769809b77ccdfb5ef11ef481ab791c0f040401aaed0053cba55d4c2a3383c0d056122280f6
-EBUILD adolc-2.4.1.ebuild 863 BLAKE2B e3455061dfd93d3fd14ae07051da5e3a99576d8e20d7ec5f28aad0daae9f0ef37dc0f4ba2565cf4edb96ffb7d07ad6055f06335302a787bd7e88e8c84fdebea1 SHA512 c409dd49db0d5c1043a50aae33d6dfd07e24c1f62f18abd4906ea7468944ec46f89d1e80be97af6c166b0cf1d00a2a38383555e7d1e76e062a136b32ab98006d
-EBUILD adolc-2.6.3-r1.ebuild 1215 BLAKE2B 3ae1cf484b9f241225703e0da2202ff1e95e8cc850cd3bfd7278bc73e568cd65d39ad48a77a311cac7c21e06af7508305702dde33aa9bc10d516e2b5af4de2ba SHA512 b84eef882252394bbb6253b707e45bb8779dbe3066b6b2d64db032d0be06d9866ba63554ff78f620887b83b91d101c722e2268d21e7222e7e61e5dc486410c63
-EBUILD adolc-2.7.2.ebuild 1660 BLAKE2B 5187dffa6f999861d6c65ce07493b55a15338b606a522179ab4c4c36cfa51137c64e042210fe8aea3b674482e3b3c13860fa6155159cfb17cc4946f551f12749 SHA512 903bfe1a229fcd15cdd434fae1caf6ae9574536d18714f29db11d706f4fdf11be5fa3ab0c95f5095445b0150685a4fc31f5b3144dbd91f0425fd0c44676b91d5
-EBUILD adolc-9999.ebuild 1366 BLAKE2B 9d56381152f11b278f5bcbb150aab07d5cb1b8539223da53a6ff3526d813b0d7a1b0726cc78aa2f74f2df44c784ac8a801339f9b4c8b9e3e68353456da691b19 SHA512 e5098c625210d6fe7aadde93a92c79e1c9c2748ea97303c9d3acb176ce67be8d6f9ef1976821320bdea070ea43f00e24571ef13d1aa3bee4cbd694133a8bbde4
+EBUILD adolc-2.7.2.ebuild 1606 BLAKE2B de92e105f686f16a783c647d96bdefb30c3c6b71fd28397d5a16491f4f564df361d7361719a378ac1716822cba472705fc6b599e8f151f5feab81a92dd6d0221 SHA512 2a2457fc2493b3187d4ab4b1e712ea33e1a7c4a11192abc4c121acd6e6ddc4d943e7e60de95f03d5b2a401d57847b9a538aa1bb56cd20b20ef3d6a2dac126966
+EBUILD adolc-9999.ebuild 1395 BLAKE2B 3b2710b10396198d359317d216ef5c96d9f5d5d4a4c441feb6fa78f58f4486c279f3535f44c0a4c53d526fd21fb4a4fba74629b17de7e4b71e0bed263b9e9d59 SHA512 73c8e2de97ce8572e2a4d51ee60f9c6413bd373d2156812ac902c964260ec3de34129526dda755acdf6f082ce357b75eb3fa2b0b80b76db5588539e2076a477b
 MISC metadata.xml 736 BLAKE2B ddc9935966f95c209568fca01f222894812328b0411a75ee3ff369220860c274d52280c39f916dfdf9fd30ee3a67134a1bdab19feba1bf35b0e2695fa4577a97 SHA512 00cb5d1b587dc4220507a52f2e979fbbeed9035e59e1de26781e33b16d6a16474ad4aeae45ea7a1b8de9193fbe0671ffdd19a07431c33e22ff5586c7216b0522
diff --git a/sci-libs/adolc/adolc-2.4.1.ebuild b/sci-libs/adolc/adolc-2.4.1.ebuild
deleted file mode 100644
index d8eda2e65133..000000000000
--- a/sci-libs/adolc/adolc-2.4.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=yes
-AUTOTOOLS_IN_SOURCE_BUILD=yes
-inherit autotools-utils toolchain-funcs
-
-MYPN=ADOL-C
-
-DESCRIPTION="Automatic differentiation system for C/C++"
-HOMEPAGE="https://projects.coin-or.org/ADOL-C/"
-SRC_URI="http://www.coin-or.org/download/source/${MYPN}/${MYPN}-${PV}.tgz"
-
-LICENSE="|| ( EPL-1.0 GPL-2 )"
-SLOT="0/1"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="sparse static-libs"
-
-RDEPEND="sparse? ( sci-libs/colpack )"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MYPN}-${PV}"
-
-PATCHES=( "${FILESDIR}"/${PN}-2.4.0-no-colpack.patch )
-
-src_configure() {
-	 local myeconfargs=(
-		 $(use_enable sparse)
-		 $(use_with sparse colpack "${EPREFIX}"/usr)
-	 )
-	 autotools-utils_src_configure
-}
-
-src_test() {
-	autotools-utils_src_test test
-}
diff --git a/sci-libs/adolc/adolc-2.6.3-r1.ebuild b/sci-libs/adolc/adolc-2.6.3-r1.ebuild
deleted file mode 100644
index f2f0193878e4..000000000000
--- a/sci-libs/adolc/adolc-2.6.3-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools toolchain-funcs eutils ltprune
-
-MYPN=ADOL-C
-
-DESCRIPTION="Automatic differentiation system for C/C++"
-HOMEPAGE="https://projects.coin-or.org/ADOL-C/"
-SRC_URI="http://www.coin-or.org/download/source/${MYPN}/${MYPN}-${PV}.tgz"
-
-LICENSE="|| ( EPL-1.0 GPL-2 )"
-SLOT="0/2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+boost mpi sparse static-libs"
-
-RDEPEND="
-	boost? ( dev-libs/boost:0= )
-	mpi? ( sys-cluster/ampi:0= )
-	sparse? ( sci-libs/colpack:0= )"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MYPN}-${PV}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.5.0-no-colpack.patch
-	"${FILESDIR}"/${PN}-2.5.0-pkgconfig-no-ldflags.patch
-	"${FILESDIR}"/${PN}-2.6.2-dash.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--enable-advanced-branching \
-		--enable-atrig-erf \
-		$(use_enable mpi ampi) \
-		$(use_enable sparse) \
-		$(use_enable static-libs static) \
-		$(use_with boost) \
-		$(use_with sparse colpack "${EPREFIX}"/usr)
-}
-
-src_test() {
-	emake test
-}
-
-src_install() {
-	default
-	use static-libs || prune_libtool_files --all
-}
diff --git a/sci-libs/adolc/adolc-2.7.2.ebuild b/sci-libs/adolc/adolc-2.7.2.ebuild
index 52d83ebbf38a..e395d9b86954 100644
--- a/sci-libs/adolc/adolc-2.7.2.ebuild
+++ b/sci-libs/adolc/adolc-2.7.2.ebuild
@@ -8,7 +8,7 @@ inherit autotools toolchain-funcs
 DESCRIPTION="Automatic differentiation system for C/C++"
 HOMEPAGE="https://projects.coin-or.org/ADOL-C/"
 
-if [[ ${PV} = *9999* ]]; then
+if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/coin-or/ADOL-C"
 else
@@ -19,7 +19,7 @@ fi
 
 LICENSE="|| ( EPL-1.0 GPL-2 )"
 SLOT="0/2"
-IUSE="+boost mpi sparse static-libs"
+IUSE="+boost mpi sparse"
 
 RDEPEND="
 	boost? ( dev-libs/boost:0= )
@@ -45,12 +45,12 @@ src_configure() {
 	# https://bugs.gentoo.org/730750
 	# https://github.com/coin-or/ADOL-C/issues/20
 	econf \
+		--disable-python \
+		--disable-static \
 		--enable-advanced-branching \
 		--enable-atrig-erf \
-		--disable-python \
 		$(use_enable mpi ampi) \
 		$(use_enable sparse) \
-		$(use_enable static-libs static) \
 		$(use_with boost) \
 		$(use_with sparse colpack "${EPREFIX}"/usr)
 }
@@ -63,5 +63,5 @@ src_test() {
 
 src_install() {
 	default
-	use static-libs || find "${D}" -name '*.la' -type f -delete || die
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/sci-libs/adolc/adolc-9999.ebuild b/sci-libs/adolc/adolc-9999.ebuild
index dc6d88c74f35..eeaa03bdcee1 100644
--- a/sci-libs/adolc/adolc-9999.ebuild
+++ b/sci-libs/adolc/adolc-9999.ebuild
@@ -3,25 +3,23 @@
 
 EAPI=7
 
-inherit autotools toolchain-funcs eutils
+inherit autotools toolchain-funcs
 
 DESCRIPTION="Automatic differentiation system for C/C++"
 HOMEPAGE="https://projects.coin-or.org/ADOL-C/"
 
-if [[ ${PV} = *9999* ]]; then
+if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/coin-or/ADOL-C"
-	SRC_URI=""
-	KEYWORDS=""
 else
 	SRC_URI="https://github.com/coin-or/ADOL-C/archive/releases/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 	S="${WORKDIR}/ADOL-C-releases-${PV}"
 fi
 
 LICENSE="|| ( EPL-1.0 GPL-2 )"
 SLOT="0/2"
-IUSE="+boost mpi sparse static-libs"
+IUSE="+boost mpi sparse"
 
 RDEPEND="
 	boost? ( dev-libs/boost:0= )
@@ -42,20 +40,23 @@ src_prepare() {
 
 src_configure() {
 	econf \
+		--disable-python \
+		--disable-static \
 		--enable-advanced-branching \
 		--enable-atrig-erf \
 		$(use_enable mpi ampi) \
 		$(use_enable sparse) \
-		$(use_enable static-libs static) \
 		$(use_with boost) \
 		$(use_with sparse colpack "${EPREFIX}"/usr)
 }
 
 src_test() {
+	# 'check' target is unrelated to checking lib works
+	# ('check' is more like distcheck)
 	emake test
 }
 
 src_install() {
 	default
-	use static-libs || find "${D}" -name '*.la' -type f -delete || die
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/sci-libs/adolc/files/adolc-2.4.0-no-colpack.patch b/sci-libs/adolc/files/adolc-2.4.0-no-colpack.patch
deleted file mode 100644
index e3b5a4a2ca5f..000000000000
--- a/sci-libs/adolc/files/adolc-2.4.0-no-colpack.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-do not test colpack when user says no even when it is installed
-
---- configure.ac.orig	2012-07-19 13:04:37.426461811 -0700
-+++ configure.ac	2012-07-19 13:06:06.477916144 -0700
-@@ -281,7 +281,7 @@
- COLPACK_LIBDIR=""
- COLPACK_LIBS="-lColPack"
- ])
--
-+if test x$colpack != xno; then
- AC_LANG_PUSH([C++])
- save_CPPFLAGS="$CPPFLAGS"
- save_LIBS="$LIBS"
-@@ -301,7 +301,9 @@
- CPPFLAGS="$save_CPPFLAGS"
- LIBS="$save_LIBS"
- AC_LANG_POP([C++])
--
-+else
-+    have_colpack=no
-+fi
- AM_CONDITIONAL(HAVE_LIBCOLPACK,[test x$have_colpack = xyes])
- if test x$have_colpack = xyes; then 
-    sparse=yes