gentoo resync : 25.08.2020

3 files changed, 2 insertions, 108 deletions

diff --git a/dev-python/cvxopt/Manifest b/dev-python/cvxopt/Manifest
index 62f622f2841e..88fc0b453144 100644
--- a/dev-python/cvxopt/Manifest
+++ b/dev-python/cvxopt/Manifest
@@ -1,4 +1,3 @@
 DIST cvxopt-1.2.5.tar.gz 6742389 BLAKE2B 32e872d13624250610e7eecf2a5755b7b2adbf98dd9b7d1b0d6e236d62677fcdef7c08a2365d7b511f755a38b34a29ff78b280fb7e92ec6256a71c63e022e003 SHA512 d21d9977941140e76d1619a1239fab5d93a3467c4cbeacca2003168c96e1bbec9698563dba07107f6e0a84a0af92124d5c868af599bd049b64f47a3cd3753afc
-EBUILD cvxopt-1.2.5-r1.ebuild 5534 BLAKE2B c2a6da2d4ed13e71233cc759d27e33306577c0c52e6b439e02d790529ad22a95b5f06e685891c7c36306dd014809868d068151d6f957d5766b7c6a889889f07e SHA512 c83625f8a004cec9068815363b1e47b2ee93a5cd1d4cbb65b1737c143a65d2061ffe50bd7c86a71394bda45f807763a645e76bc2389f772e4b8c55f7e0809238
-EBUILD cvxopt-1.2.5.ebuild 2963 BLAKE2B 449a65f303b77cb5c92e0819b49bfec7c828bcf46601a280dde0ec708c783fead5a05ee597a2579ef01660b41d51d75ab7bf34b0186e01a37042dcb98274c1eb SHA512 05433f0bffe2e55a9fb547f5a176886a10f4e8797dc292d1ad84bebf85153772df80c236f131fa3b38324760e5742c135d2e5ada4ddefcf5a53000bb4c93468d
+EBUILD cvxopt-1.2.5-r1.ebuild 5535 BLAKE2B 328b146d857bfe5e294c7c3e0baf101e2a78f70700f272d2edbbf4142285e73fa55e2022032089bf398e2ba7457e3a1150fa7a6e9ab2d9a563c37510f025bf95 SHA512 6577efae0032bc3c3abb9c7304c9baf48366e2d26c787ba1a2ceb76b53b197bd2dc1161b2f520d320248fdc2e482ff159a1c35f8df0785ad0ea4721f2678b034
 MISC metadata.xml 805 BLAKE2B cfeb4a97635e28a1fe93b26897950dfe13268aef349647c5ca7455597e679ab7e79d21daf1b54f4c8855624abb8286676aff2da381782dd3b42b0a587f9396b2 SHA512 52bdd0bdc12807d7a3d2d820af3167b0768225167377bdf42e5f7218d5154deab2bee8bbcfdd173301e4b1d87f268bfb4bf6c1f884113c2d1f3fbf7fa1dc2ab6
diff --git a/dev-python/cvxopt/cvxopt-1.2.5-r1.ebuild b/dev-python/cvxopt/cvxopt-1.2.5-r1.ebuild
index c4670120832c..df93cd110d8f 100644
--- a/dev-python/cvxopt/cvxopt-1.2.5-r1.ebuild
+++ b/dev-python/cvxopt/cvxopt-1.2.5-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_6 python3_7 python3_8 )
 inherit distutils-r1 toolchain-funcs
 
 DESCRIPTION="Python package for convex optimization"
-HOMEPAGE="http://cvxopt.org/ https://github.com/cvxopt/cvxopt"
+HOMEPAGE="https://cvxopt.org/ https://github.com/cvxopt/cvxopt"
 SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
diff --git a/dev-python/cvxopt/cvxopt-1.2.5.ebuild b/dev-python/cvxopt/cvxopt-1.2.5.ebuild
deleted file mode 100644
index 4f197405a30a..000000000000
--- a/dev-python/cvxopt/cvxopt-1.2.5.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_6 python3_7 python3_8 )
-
-inherit distutils-r1 toolchain-funcs
-
-DESCRIPTION="Python package for convex optimization"
-HOMEPAGE="http://cvxopt.org/ https://github.com/cvxopt/cvxopt"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc +dsdp examples fftw +glpk gsl test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	virtual/blas
-	virtual/lapack
-	sci-libs/amd:0=
-	sci-libs/cholmod:0=
-	sci-libs/colamd:0=
-	sci-libs/suitesparseconfig:0=
-	sci-libs/umfpack:0=
-	dsdp? ( sci-libs/dsdp:0= )
-	fftw? ( sci-libs/fftw:3.0= )
-	glpk? ( >=sci-mathematics/glpk-4.49:0= )
-	gsl? ( sci-libs/gsl:0= )"
-
-RDEPEND="${DEPEND}"
-
-BDEPEND="virtual/pkgconfig
-	doc? ( dev-python/sphinx )
-	test? ( ${RDEPEND} dev-python/nose[${PYTHON_USEDEP}] )"
-
-python_prepare_all() {
-	pkg_libs() {
-		$(tc-getPKG_CONFIG) --libs-only-l $* | \
-			sed -e 's:[ ]-l*\(pthread\|m\)\([ ]\|$\)::g' -e 's:[ ]*$::' | \
-			tr ' ' '\n' | sort -u | sed -e "s:^-l\(.*\):\1:g" | \
-			tr '\n' ';' | sed -e 's:;$::'
-	}
-	pkg_libdir() {
-		$(tc-getPKG_CONFIG) --libs-only-L $* | \
-			sed -e 's:[ ]*$::' | \
-			tr ' ' '\n' | sort -u | sed -e "s:^-L\(.*\):\1:g" | \
-			tr '\n' ';' | sed -e 's:;$::'
-	}
-	pkg_incdir() {
-		$(tc-getPKG_CONFIG) --cflags-only-I $* | \
-			sed -e 's:[ ]*$::' | \
-			tr ' ' '\n' | sort -u | sed -e "s:^-I\(.*\):\1:g" | \
-			tr '\n' ';' | sed -e 's:,$::'
-	}
-
-	# mandatory dependencies
-	export CVXOPT_BLAS_LIB="$(pkg_libs blas)"
-	export CVXOPT_BLAS_LIB_DIR="$(pkg_libdir blas)"
-	export CVXOPT_LAPACK_LIB="$(pkg_libs lapack)"
-	export CVXOPT_SUITESPARSE_LIB_DIR="$(pkg_libdir umfpack cholmod amd colamd suitesparseconfig)"
-	export CVXOPT_SUITESPARSE_INC_DIR="$(pkg_incdir umfpack cholmod amd colamd suitesparseconfig)"
-
-	# optional dependencies
-	use dsdp && \
-		export CVXOPT_BUILD_DSDP=1 && \
-		export CVXOPT_DSDP_LIB_DIR="${EPREFIX}/usr/$(get_libdir)" && \
-		export CVXOPT_DSDP_INC_DIR="${EPREFIX}/usr/include"
-
-	use fftw && \
-		export CVXOPT_BUILD_FFTW=1 && \
-		export CVXOPT_FFTW_LIB_DIR="$(pkg_libdir fftw3)" && \
-		export CVXOPT_FFTW_INC_DIR="$(pkg_incdir fftw3)"
-
-	use glpk && \
-		export CVXOPT_BUILD_GLPK=1 && \
-		export CVXOPT_GLPK_LIB_DIR="${EPREFIX}/usr/$(get_libdir)" && \
-		export CVXOPT_GLPK_INC_DIR="${EPREFIX}/usr/include"
-
-	use gsl && \
-		export CVXOPT_BUILD_GSL=1 && \
-		export CVXOPT_GSL_LIB_DIR="$(pkg_libdir gsl)" && \
-		export CVXOPT_GSL_INC_DIR="$(pkg_incdir gsl)"
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && VARTEXFONTS="${T}/fonts" emake -C doc -B html
-}
-
-python_test() {
-	PYTHONPATH="${BUILD_DIR}"/lib nosetests -v || die
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( doc/build/html/. )
-	distutils-r1_python_install_all
-	if use examples; then
-		dodoc -r examples
-		docompress -x "/usr/share/doc/${PF}/examples"
-	fi
-}