gentoo resync : 25.08.2020

8 files changed, 2 insertions, 381 deletions

diff --git a/sci-libs/nlopt/Manifest b/sci-libs/nlopt/Manifest
index 5b902d46582f..27b3d1db2aff 100644
--- a/sci-libs/nlopt/Manifest
+++ b/sci-libs/nlopt/Manifest
@@ -1,10 +1,3 @@
-AUX nlopt-2.3-as-needed.patch 1062 BLAKE2B 69bb06372cdd37ba86e107eb1c9c545d084906495b3e20a223ed93a712663310e32d5fb37713450f957c76d9921ae6b8baba8a36f196b7b997e966442ebba9c1 SHA512 755e04b0e9d2ab5b1256c14015980b051716756777b910a9273a0dced4108e19a8f3030c1d03c6d96561a7edb3e883fdbc2822e1d6c1b74fa2794c336612cc47
-AUX nlopt-2.3-pkgconfig.patch 318 BLAKE2B 3569931fb9e2fceebf46c542e10fcd2562c8ac53a877128c3a99ad0c200ec35326c09881bf0f8726817637c612aea81b6d57ecc5544d4cf86245493082b575a0 SHA512 923b20e177a842643b1022d68168978d5fb35e987c6781d8b0b368a6c707f4b42a4141c4ca7cf33cd7067a39147ae87220adeaaa545a8731bb6a5d2f3d11a5bc
-AUX nlopt-2.4.2-fix-dynamic-underlinking.patch 2522 BLAKE2B 5cdb8ea93cb44c25b1814431962259727c5c4dc97b4cf78d239189187f953a4b9458849a9afe77979841768b78226c6218ecc531328cb5752d26b9df63468ee5 SHA512 bdb07b216ffb68b68cb3f03076336234c558db3953c48b02511883bf9fb12f5915c04950a2e3222577c7af4fb1e288a165af2e8adf211fc853e747c98a65cd19
-AUX nlopt-2.4.2-octave-4-map.patch 1858 BLAKE2B 34b1696762a9690a5ef5f3abc265b37d5de2f92b29e514952aa062faf1553a77ed3dba6f2abf7c8f1f7cbcc1cc63c9546967f3a317a773aa5e7c5c1e9c13f7e3 SHA512 00c45fe04fdc1acf4ccbb77aaf39feab0cb2b811b45edf791db7e87aa9e965c23b6131400eebd68335be8dcb86f346c01892e718f739f07dc0853b3dd9ea5ad4
-DIST nlopt-2.4.2.tar.gz 2361992 BLAKE2B c1c9f533c7e7b3bb61e81343ebd26b87e05434fdbea1f347fc5f6a6c10160289ce105a51c6540296f3f1d122d31b415452da49b84516cd13fabc73372e4cfd0e SHA512 136aacc00a69f77e8a7ce5dc26a5f3f027bc8c01b97aa1f43919462e0a412154eabfb01be258e082dffe61f9b554bb2bfbb550a7b82c7c77c7b22874a64a9703
 DIST nlopt-2.6.2.tar.gz 2040229 BLAKE2B f1f4124de574600ddbef8a885bbdd3a4f57b469b2f958ce94bbc831cf9bfa8a845e438fccfe4ab219a73a5675b8d880f6d49e0e7cbe9d0966777b0d2344521d4 SHA512 61e5c01140a57c0ad2a0acd82ad50dce1b5679dc281e55cbbc332e876b19a689013100617545a42b721d8c487df37d6ccd67859171243433fe29468f259b556b
-EBUILD nlopt-2.4.2-r2.ebuild 2714 BLAKE2B 3939763ab3da6e8708c10b3ca39f1c001f2d9913e883648cade9d58b83c3242804991373fdd36599474715840562533881c8ab0ffd98cda54ad71d3d4c12cbe4 SHA512 c2a7e3336ccb1887c2c6074aed5fffb254dd11e607d871bd3ed864794d04cdfb7a3aff711b8cb5f7f0a98629f34a196f4f5fa7221f5c07324b2439b48cc9e5c9
-EBUILD nlopt-2.6.2-r1.ebuild 2301 BLAKE2B 92872c3fe8856a81648071c2f4fea997c96f3e8590ccf9d5bcfc27dafc73bdff822e18768521c8ce42e1eb4e3ebca1a4ccd15038e4688ebb179907ab422c71ae SHA512 68a32c60540e17cb91ed86987e3981ad519656ab2bab83fbacc98fb01e439ca65e85a8c75c8d06860b4fc47329e08f19b591e1fae25192510f9a5d44216bf749
-EBUILD nlopt-2.6.2.ebuild 2412 BLAKE2B 722391655b7a5cebb487bf893efe1203a440affc3739282ba26e7a5202edff01d953a43a157da5c6c7d5f809135674089f8179edc2be43498daa8aaa5d8c4a19 SHA512 462bb900b0eaa779bf29c6dfb99f52b432e7c3c29c4c997e3fb8019b94ba0885fbab8b57e0d7673fc561407923942e7026febe1d3c196a10f9d53cd11feea02d
+EBUILD nlopt-2.6.2-r1.ebuild 2299 BLAKE2B 1785464bdd62a15a21e9172acf1113f1c501e866eda1f159885fe04e8afbed3341113c0f0e0e6acfbde8972bd2742815897f5b4db9f17b35fc110143087c1a47 SHA512 9b819bffce1da6f62efb61dcbb11837af6b57923906ddb39894aa406a9889902f9f2bd6d771dc1428275ba38b5f86e933b714833e43088c28f89c720cfb9e934
 MISC metadata.xml 1095 BLAKE2B e5032d65fbb49b125b6cb5abe332c52a1e058271c71aec2d2522cc78874a079f8987e2e8356290295bcb886c32e1cf794df9b157ebc712a862605105b80abe31 SHA512 74a37bc3e6fa74d0f96c3390fadf16e76caf904f43cf9ac0496f70e3e3bc458727e58d9fc65c39a81302b081575e530c27be3812488df20fab42aff5494437f7
diff --git a/sci-libs/nlopt/files/nlopt-2.3-as-needed.patch b/sci-libs/nlopt/files/nlopt-2.3-as-needed.patch
deleted file mode 100644
index 928ec174b771..000000000000
--- a/sci-libs/nlopt/files/nlopt-2.3-as-needed.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -Nur nlopt-2.3.orig/Makefile.am nlopt-2.3/Makefile.am
---- nlopt-2.3.orig/Makefile.am	2012-08-03 02:07:09.000000000 +0100
-+++ nlopt-2.3/Makefile.am	2012-08-03 02:13:13.000000000 +0100
-@@ -25,6 +25,7 @@
- 
- if WITH_CXX
- libnlopt@NLOPT_SUFFIX@_la_LDFLAGS = -version-info @SHARED_VERSION_INFO@
-+libnlopt@NLOPT_SUFFIX@_la_LIBADD += -lstdc++
- else
- libnlopt@NLOPT_SUFFIX@_la_LDFLAGS = -no-undefined -version-info @SHARED_VERSION_INFO@
- endif
-diff -Nur nlopt-2.3.orig/swig/Makefile.am nlopt-2.3/swig/Makefile.am
---- nlopt-2.3.orig/swig/Makefile.am	2012-08-03 02:07:09.000000000 +0100
-+++ nlopt-2.3/swig/Makefile.am	2012-08-03 03:04:30.000000000 +0100
-@@ -9,7 +9,7 @@
- # Guile wrapper
- 
- libnlopt@NLOPT_SUFFIX@_guile_la_SOURCES = nlopt-guile.cpp
--libnlopt@NLOPT_SUFFIX@_guile_la_LIBADD = ../libnlopt@NLOPT_SUFFIX@.la
-+libnlopt@NLOPT_SUFFIX@_guile_la_LIBADD = ../libnlopt@NLOPT_SUFFIX@.la @GUILE_LIBS@
- libnlopt@NLOPT_SUFFIX@_guile_la_LDFLAGS = -version-info @SHARED_VERSION_INFO@
- libnlopt@NLOPT_SUFFIX@_guile_la_CPPFLAGS = $(GUILE_CPPFLAGS) -I$(top_builddir)/api
- 
diff --git a/sci-libs/nlopt/files/nlopt-2.3-pkgconfig.patch b/sci-libs/nlopt/files/nlopt-2.3-pkgconfig.patch
deleted file mode 100644
index 8a072b15e2e2..000000000000
--- a/sci-libs/nlopt/files/nlopt-2.3-pkgconfig.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- nlopt.pc.in.orig	2012-08-03 01:41:30.000000000 +0100
-+++ nlopt.pc.in	2012-08-03 01:42:29.000000000 +0100
-@@ -6,5 +6,6 @@
- Name: NLopt
- Description: nonlinear optimization libary
- Version: @VERSION@
--Libs: -L${libdir} -lnlopt -lm
-+Libs: -L${libdir} -lnlopt@NLOPT_SUFFIX@
-+Libs.private: -lm
- Cflags: -I${includedir}
diff --git a/sci-libs/nlopt/files/nlopt-2.4.2-fix-dynamic-underlinking.patch b/sci-libs/nlopt/files/nlopt-2.4.2-fix-dynamic-underlinking.patch
deleted file mode 100644
index beb9dd4de815..000000000000
--- a/sci-libs/nlopt/files/nlopt-2.4.2-fix-dynamic-underlinking.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-Fix underlinking issues, caused by missing -lpython27 and -lpthread
-
---- nlopt-2.4.2/configure.ac
-+++ nlopt-2.4.2/configure.ac
-@@ -161,33 +161,17 @@
- dnl Python:
- AM_PATH_PYTHON([],[have_python=yes],[have_python=no])
- if test $have_python = yes; then
--  AC_ARG_VAR([PYTHON_CONFIG], [python-config program])
--  AC_PATH_PROGS([PYTHON_CONFIG], [python$PYTHON_VERSION-config python-config],
--                [unknown], [`dirname $PYTHON`:$PATH])
--  AC_MSG_CHECKING([for Python include flags])
--  if test "x$PYTHON_CONFIG" = "xunknown"; then
--      pinc=-I`echo "import distutils.sysconfig; print (distutils.sysconfig.get_python_inc())" | $PYTHON - 2>/dev/null`
--      test "x$pinc" = "x-I" && pinc=""
--  else
--      pinc=`$PYTHON_CONFIG --includes 2>/dev/null`
--  fi
--  AC_MSG_RESULT([${pinc:-unknown}])
--  PYTHON_INCLUDES="$pinc"
--  save_CPPFLAGS=$CPPFLAGS
--  CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES"
--  AC_CHECK_HEADER([Python.h], [], [AC_MSG_WARN([disabling Python wrappers]) 
--                                   have_python=no])
--  if test $have_python = yes; then
-+  PKG_CHECK_MODULES([PYTHON], [python-2.7])
-+  CPPFLAGS="$CPPFLAGS $PYTHON_CFLAGS"
-+  
-     AC_MSG_CHECKING([for Numpy include directory])
-     pinc=`echo "import numpy; print (numpy.get_include())" | $PYTHON - 2>/dev/null`
-     AC_MSG_RESULT([${pinc:-unknown}])
--    test -n "$pinc" && PYTHON_INCLUDES="$PYTHON_INCLUDES -I$pinc"
-+    test -n "$pinc" && PYTHON_INCLUDES="$PYTHON_CFLAGS -I$pinc"
-     CPPFLAGS="$save_CPPFLAGS $PYTHON_INCLUDES"
-     AC_CHECK_HEADER([numpy/arrayobject.h],[],[
-       AC_MSG_WARN([disabling Python wrappers])
-       have_python=no],[#include <Python.h>])
--  fi
--  CPPFLAGS=$save_CPPFLAGS
- fi
- 
- fi # with_python
---- nlopt-2.4.2/swig/Makefile.am
-+++ nlopt-2.4.2/swig/Makefile.am
-@@ -9,7 +9,7 @@
- # Guile wrapper
- 
- libnlopt@NLOPT_SUFFIX@_guile_la_SOURCES = nlopt-guile.cpp
--libnlopt@NLOPT_SUFFIX@_guile_la_LIBADD = ../libnlopt@NLOPT_SUFFIX@.la @GUILE_LIBS@
-+libnlopt@NLOPT_SUFFIX@_guile_la_LIBADD = -lpthread ../libnlopt@NLOPT_SUFFIX@.la @GUILE_LIBS@
- libnlopt@NLOPT_SUFFIX@_guile_la_LDFLAGS = -version-info @SHARED_VERSION_INFO@
- libnlopt@NLOPT_SUFFIX@_guile_la_CPPFLAGS = $(GUILE_CPPFLAGS) -I$(top_srcdir)/api
- 
-@@ -23,7 +23,7 @@
- # Python wrapper
- 
- _nlopt_la_SOURCES = nlopt-python.cpp
--_nlopt_la_LIBADD = ../libnlopt@NLOPT_SUFFIX@.la
-+_nlopt_la_LIBADD = ../libnlopt@NLOPT_SUFFIX@.la @PYTHON_LIBS@
- _nlopt_la_LDFLAGS = -module -version-info @SHARED_VERSION_INFO@
- _nlopt_la_CPPFLAGS = $(PYTHON_INCLUDES) -I$(top_srcdir)/api
- 
diff --git a/sci-libs/nlopt/files/nlopt-2.4.2-octave-4-map.patch b/sci-libs/nlopt/files/nlopt-2.4.2-octave-4-map.patch
deleted file mode 100644
index c82d99497e67..000000000000
--- a/sci-libs/nlopt/files/nlopt-2.4.2-octave-4-map.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-Fix issues caused by Octave-4 renaming Octave_map to octave_map
-See also
-https://bugs.gentoo.org/show_bug.cgi?id=569996
-https://github.com/stevengj/nlopt/commit/5326ab410c978f9d8c3cae7e4917f55c10ef2c2e?diff=unified
-
---- nlopt-2.4.2_old/octave/nlopt_optimize-oct.cc	2014-05-20 20:35:58.000000000 +0200
-+++ nlopt-2.4.2/octave/nlopt_optimize-oct.cc	2016-01-09 16:10:53.358491776 +0100
-@@ -30,5 +30,5 @@
- #include "nlopt_optimize_usage.h"
- 
--static int struct_val_default(Octave_map &m, const std::string& k,
-+static int struct_val_default(octave_map &m, const std::string& k,
- 				 int dflt)
- {
-@@ -40,5 +40,5 @@
- }
- 
--static double struct_val_default(Octave_map &m, const std::string& k,
-+static double struct_val_default(octave_map &m, const std::string& k,
- 				 double dflt)
- {
-@@ -50,5 +50,5 @@
- }
- 
--static Matrix struct_val_default(Octave_map &m, const std::string& k,
-+static Matrix struct_val_default(octave_map &m, const std::string& k,
- 				 Matrix &dflt)
- {
-@@ -141,5 +141,5 @@
- #define CHECK1(cond, msg) if (!(cond)) { fprintf(stderr, msg "\n\n"); nlopt_destroy(opt); nlopt_destroy(local_opt); return NULL; }
- 
--nlopt_opt make_opt(Octave_map &opts, int n)
-+nlopt_opt make_opt(octave_map &opts, int n)
- {
-   nlopt_opt opt = NULL, local_opt = NULL;
-@@ -196,5 +196,5 @@
- 	  && (opts.contents("local_optimizer"))(0).is_map(),
- 	  "opt.local_optimizer must be a structure");
--    Octave_map local_opts = (opts.contents("local_optimizer"))(0).map_value();
-+    octave_map local_opts = (opts.contents("local_optimizer"))(0).map_value();
-     CHECK1((local_opt = make_opt(local_opts, n)), 
- 	  "error initializing local optimizer");
-@@ -217,5 +217,5 @@
- 
-   CHECK(args(0).is_map(), "opt must be structure")
--  Octave_map opts = args(0).map_value();
-+  octave_map opts = args(0).map_value();
- 
-   CHECK(args(1).is_real_matrix() || args(1).is_real_scalar(),
diff --git a/sci-libs/nlopt/nlopt-2.4.2-r2.ebuild b/sci-libs/nlopt/nlopt-2.4.2-r2.ebuild
deleted file mode 100644
index 5a937cd80edd..000000000000
--- a/sci-libs/nlopt/nlopt-2.4.2-r2.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-AUTOTOOLS_AUTORECONF=1
-
-inherit python-r1 autotools-utils
-
-DESCRIPTION="Non-linear optimization library"
-HOMEPAGE="http://ab-initio.mit.edu/nlopt/"
-SRC_URI="http://ab-initio.mit.edu/nlopt/${P}.tar.gz"
-
-LICENSE="LGPL-2.1 MIT"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-SLOT="0"
-IUSE="cxx guile octave python static-libs"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-DEPEND="
-	guile? ( dev-scheme/guile:* )
-	octave? ( sci-mathematics/octave )
-	python? (
-		${PYTHON_DEPS}
-		|| (
-			dev-python/numpy-python2[${PYTHON_USEDEP}]
-			dev-python/numpy[${PYTHON_USEDEP}]
-		)
-	)"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.3-pkgconfig.patch
-	"${FILESDIR}"/${PN}-2.3-as-needed.patch
-	"${FILESDIR}"/${P}-fix-dynamic-underlinking.patch
-)
-
-src_prepare() {
-	# fix #569996 due to renaming of Octave_map class
-	has_version ">=sci-mathematics/octave-4.0" && \
-		epatch "${FILESDIR}/${P}-octave-4-map.patch"
-	autotools-utils_src_prepare
-	use cxx && BUILD_CXX="${S}_cxx"
-	use python && python_copy_sources
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_with octave)
-	)
-	if use octave; then
-		export OCT_INSTALL_DIR="$(octave-config -p LOCALOCTFILEDIR)"
-		export M_INSTALL_DIR="$(octave-config -p LOCALFCNFILEDIR)"
-	else
-		export MKOCTFILE=None
-	fi
-
-	myeconfargs+=(
-		$(use_with guile)
-	)
-
-	if use python; then
-		python_foreach_impl run_in_build_dir autotools-utils_src_configure
-	else
-		autotools-utils_src_configure
-	fi
-
-	if use cxx; then
-		myeconfargs+=( --with-cxx --without-octave --without-python )
-		BUILD_DIR="${BUILD_CXX}" autotools-utils_src_configure
-	fi
-}
-
-src_compile() {
-	if use python; then
-		python_foreach_impl run_in_build_dir autotools-utils_src_compile
-	else
-		autotools-utils_src_compile
-	fi
-	use cxx && BUILD_DIR="${BUILD_CXX}" autotools-utils_src_compile
-	#-C "${BUILD_DIR}_cxx"
-}
-
-src_test() {
-	do_test() {
-		local a f
-		cd "${BUILD_DIR}"/test
-		for a in {1..7}; do
-			for f in {5..9}; do
-				./testopt -a $a -o $f || die "algorithm $a function $f failed"
-			done
-		done
-	}
-	if use python; then
-		python_foreach_impl run_in_build_dir do_test
-	else
-		do_test
-	fi
-	cd "${BUILD_CXX}"/test
-	for a in {1..9}; do
-		for f in {5..9}; do
-			./testopt -a $a -o $f || die "algorithm $a function $f failed"
-		done
-	done
-}
-
-src_install() {
-	# build cxx first so the c lib overwrites the pc file
-	use cxx && BUILD_DIR="${BUILD_CXX}" autotools-utils_src_install
-	if use python; then
-		python_foreach_impl run_in_build_dir autotools-utils_src_install
-	else
-		autotools-utils_src_install
-	fi
-	local r
-	for r in */README; do newdoc ${r} README.$(dirname ${r}); done
-}
diff --git a/sci-libs/nlopt/nlopt-2.6.2-r1.ebuild b/sci-libs/nlopt/nlopt-2.6.2-r1.ebuild
index 416022d0dc54..6fa9dea93bbe 100644
--- a/sci-libs/nlopt/nlopt-2.6.2-r1.ebuild
+++ b/sci-libs/nlopt/nlopt-2.6.2-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://ab-initio.mit.edu/nlopt/"
 SRC_URI="https://github.com/stevengj/nlopt/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1 MIT"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 SLOT="0"
 IUSE="cxx guile octave python static-libs test"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/sci-libs/nlopt/nlopt-2.6.2.ebuild b/sci-libs/nlopt/nlopt-2.6.2.ebuild
deleted file mode 100644
index 21c2ada3624a..000000000000
--- a/sci-libs/nlopt/nlopt-2.6.2.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{6..9} )
-
-inherit python-r1 cmake fortran-2
-
-DESCRIPTION="Non-linear optimization library"
-HOMEPAGE="https://ab-initio.mit.edu/nlopt/"
-SRC_URI="https://github.com/stevengj/nlopt/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1 MIT"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-SLOT="0"
-IUSE="cxx guile octave python static-libs test"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	guile? ( dev-scheme/guile:* )
-	octave? ( sci-mathematics/octave )
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep 'dev-python/numpy-python2[${PYTHON_USEDEP}]' -2)
-		$(python_gen_cond_dep 'dev-python/numpy[${PYTHON_USEDEP}]' -3)
-	)
-	"
-DEPEND="
-	${RDEPEND}
-	python? ( dev-lang/swig )
-	"
-
-src_prepare() {
-	cmake_src_prepare
-	use python && python_copy_sources
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DNLOPT_CXX=$(usex cxx)
-		-DNLOPT_FORTRAN=$(usex test)
-		-DNLOPT_GUILE=$(usex guile)
-		-DNLOPT_OCTAVE=$(usex octave)
-		-DNLOPT_PYTHON=$(usex python)
-		-DNLOPT_SWIG=$(usex python)
-		-DNLOPT_TESTS=$(usex test)
-	)
-	if use python; then
-		python_foreach_impl run_in_build_dir cmake_src_configure
-	else
-		cmake_src_configure
-	fi
-	if use static-libs; then
-		mycmakeargs+=(
-			-DBUILD_SHARED_LIBS=OFF
-		)
-		BUILD_DIR="${S}_static-libs" run_in_build_dir cmake_src_configure
-	fi
-}
-
-src_compile() {
-	if use python; then
-		python_foreach_impl run_in_build_dir cmake_src_compile
-	else
-		cmake_src_compile
-	fi
-	if use static-libs; then
-		BUILD_DIR="${S}_static-libs" run_in_build_dir cmake_src_compile
-	fi
-}
-
-src_test() {
-	do_test() {
-		local a f
-		cd "${BUILD_DIR}"/test
-		for a in {1..$(usex cxx 9 7)}; do
-			for f in {5..9}; do
-				./testopt -a $a -o $f || die "algorithm $a function $f failed"
-			done
-		done
-	}
-	if use python; then
-		python_foreach_impl run_in_build_dir do_test
-	else
-		do_test
-	fi
-	if use static-libs; then
-		BUILD_DIR="${S}_static-libs" run_in_build_dir do_test
-	fi
-}
-
-nlopt_install() {
-	cmake_src_install
-	python_optimize
-}
-
-src_install() {
-	if use python; then
-		python_foreach_impl run_in_build_dir nlopt_install
-	else
-		cmake_src_install
-	fi
-	if use static-libs; then
-		BUILD_DIR="${S}_static-libs" run_in_build_dir dolib.a libnlopt.a
-	fi
-	local r
-	for r in */README; do newdoc ${r} README.$(dirname ${r}); done
-}