[gentoo-commits] repo/gentoo:master commit in: sci-libs/nlopt/, profiles/

2024-09-18 Thread Arsen Arsenović 
commit: 01f1676c357e17cfde5abb0ccca96766e69bbe6f
Author: Alfred Wingate  protonmail  com>
AuthorDate: Tue Aug 27 15:11:51 2024 +
Commit: Arsen Arsenović  gentoo  org>
CommitDate: Wed Sep 18 13:06:41 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01f1676c

sci-libs/nlopt: switch to new guile mechanism

Signed-off-by: Alfred Wingate  protonmail.com>
Signed-off-by: Arsen Arsenović  gentoo.org>

 profiles/package.mask  |   1 +
 sci-libs/nlopt/nlopt-2.7.1-r100.ebuild | 115 +
 2 files changed, 116 insertions(+)

diff --git a/profiles/package.mask b/profiles/package.mask
index e96b57254b33..c7ffd7860231 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -392,6 +392,7 @@ dev-scheme/guile:3.0
 >=sci-electronics/geda-1.10.2-r100
 >=sci-electronics/gwave-20190116-r100
 >=sci-libs/linux-gpib-4.3.6-r100
+>=sci-libs/nlopt-2.7.1-r100
 
 # Eli Schwartz  (2024-08-15)
 # Abandoned upstream since 2011, unmaintained in gentoo since 2017. Tons of

diff --git a/sci-libs/nlopt/nlopt-2.7.1-r100.ebuild 
b/sci-libs/nlopt/nlopt-2.7.1-r100.ebuild
new file mode 100644
index ..55bc5573894b
--- /dev/null
+++ b/sci-libs/nlopt/nlopt-2.7.1-r100.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+GUILE_COMPAT=( 2-2 3-0 )
+PYTHON_COMPAT=( python3_{10..12} )
+FORTRAN_NEEDED="test"
+
+inherit python-r1 cmake guile-single fortran-2
+
+DESCRIPTION="Non-linear optimization library"
+HOMEPAGE="https://github.com/stevengj/nlopt";
+SRC_URI="https://github.com/stevengj/nlopt/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+
+LICENSE="LGPL-2.1 MIT"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+SLOT="0"
+IUSE="cxx guile octave python test"
+REQUIRED_USE="guile? ( ${GUILE_REQUIRED_USE} ) python? ( 
${PYTHON_REQUIRED_USE} )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+   guile? ( ${GUILE_DEPS} )
+   octave? ( >=sci-mathematics/octave-6:= )
+   python? (
+   ${PYTHON_DEPS}
+   dev-python/numpy[${PYTHON_USEDEP}]
+   )
+   "
+DEPEND="${RDEPEND}"
+BDEPEND="python? ( dev-lang/swig )"
+
+src_prepare() {
+   cmake_src_prepare
+
+   use guile && guile_bump_sources
+   use python && python_copy_sources
+}
+
+src_configure() {
+   # MATLAB detection causes problems (as in bug 826774) if we don't
+   # explicitly disable it.
+   local mycmakeargs=(
+   -DNLOPT_CXX=$(usex cxx)
+   -DNLOPT_FORTRAN=$(usex test)
+   -DNLOPT_GUILE=$(usex guile)
+   -DNLOPT_OCTAVE=$(usex octave)
+   -DNLOPT_MATLAB=OFF
+   -DNLOPT_PYTHON=OFF
+   -DNLOPT_SWIG=$(usex python)
+   -DNLOPT_TESTS=$(usex test)
+   )
+
+   cmake_src_configure
+
+   if use python; then
+   python_configure() {
+   local mycmakeargs=(
+   ${mycmakeargs[@]}
+   -DNLOPT_PYTHON=ON
+   -DINSTALL_PYTHON_DIR="$(python_get_sitedir)"
+   )
+
+   cmake_src_configure
+   }
+
+   python_foreach_impl run_in_build_dir python_configure
+   fi
+}
+
+src_compile() {
+   cmake_src_compile
+
+   if use python; then
+   python_foreach_impl 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
+   }
+
+   do_test
+
+   if use python; then
+   python_foreach_impl run_in_build_dir do_test
+   fi
+}
+
+nlopt_install() {
+   cmake_src_install
+   python_optimize
+}
+
+src_install() {
+   cmake_src_install
+
+   guile_unstrip_ccache
+   if use python; then
+   python_foreach_impl run_in_build_dir nlopt_install
+   fi
+
+   local r
+   for r in */README; do
+   newdoc ${r} README.$(dirname ${r})
+   done
+}

[gentoo-commits] repo/gentoo:master commit in: sci-libs/nlopt/

2024-06-04 Thread Andrew Ammerlaan 
commit: 0822c43442ed125d2f6669413e244d174ba87cca
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Tue Jun  4 20:20:57 2024 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Tue Jun  4 20:20:57 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0822c434

sci-libs/nlopt: enable py3.12

Closes: https://bugs.gentoo.org/929783
Signed-off-by: Andrew Ammerlaan  gentoo.org>

 sci-libs/nlopt/nlopt-2.7.1-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/nlopt/nlopt-2.7.1-r2.ebuild 
b/sci-libs/nlopt/nlopt-2.7.1-r2.ebuild
index bd1b810d4ad8..4788982d8935 100644
--- a/sci-libs/nlopt/nlopt-2.7.1-r2.ebuild
+++ b/sci-libs/nlopt/nlopt-2.7.1-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 FORTRAN_NEEDED="test"
 
 inherit python-r1 cmake fortran-2

[gentoo-commits] repo/gentoo:master commit in: sci-libs/nlopt/

2024-04-08 Thread Andrew Ammerlaan 
commit: beb3da96273ef03651fd9c34d09d904f68015be2
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Mon Apr  8 18:24:08 2024 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Mon Apr  8 18:48:46 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=beb3da96

sci-libs/nlopt: add missing remote-id

Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Signed-off-by: Andrew Ammerlaan  gentoo.org>

 sci-libs/nlopt/metadata.xml | 25 ++---
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/sci-libs/nlopt/metadata.xml b/sci-libs/nlopt/metadata.xml
index 2147f867cb61..17976ba280dd 100644
--- a/sci-libs/nlopt/metadata.xml
+++ b/sci-libs/nlopt/metadata.xml
@@ -6,18 +6,21 @@
 Gentoo Science Project
   
   
-  NLopt is a library for nonlinear optimization,
-  providing a common interface for a number of different free
-  optimization routines available online as well as original
-  implementations of various other algorithms. Its features include:
-* Callable from variety of languages (C, C++, Fortran, Python, Octave)
-* A common interface for many different algorithms—try a different
-algorithm just by changing one parameter.
-* Both global and local optimization algorithms.
-* Both derivative-free and gradient-based optimization algorithms.
-* Algorithms for unconstrained optimization, bound-constrained
-optimization, and general nonlinear inequality constraints.
+NLopt is a library for nonlinear optimization,
+providing a common interface for a number of different free
+optimization routines available online as well as original
+implementations of various other algorithms. Its features include:
+  * Callable from variety of languages (C, C++, Fortran, Python, Octave)
+  * A common interface for many different algorithms—try a different
+  algorithm just by changing one parameter.
+  * Both global and local optimization algorithms.
+  * Both derivative-free and gradient-based optimization algorithms.
+  * Algorithms for unconstrained optimization, bound-constrained
+  optimization, and general nonlinear inequality constraints.
   
+  
+stevengj/nlopt
+  
   
 Add plugin for sci-mathematics/octave

[gentoo-commits] repo/gentoo:master commit in: sci-libs/nlopt/

2024-03-02 Thread Arthur Zamarin 
commit: 79f6bb46582928f0f99d99fd88666af495358092
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Mar  2 14:55:29 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Mar  2 14:55:29 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79f6bb46

sci-libs/nlopt: Stabilize 2.7.1-r2 ppc64, #924846

Signed-off-by: Arthur Zamarin  gentoo.org>

 sci-libs/nlopt/nlopt-2.7.1-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/nlopt/nlopt-2.7.1-r2.ebuild 
b/sci-libs/nlopt/nlopt-2.7.1-r2.ebuild
index b95c60952ce8..bd1b810d4ad8 100644
--- a/sci-libs/nlopt/nlopt-2.7.1-r2.ebuild
+++ b/sci-libs/nlopt/nlopt-2.7.1-r2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/stevengj/nlopt";
 SRC_URI="https://github.com/stevengj/nlopt/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
 
 LICENSE="LGPL-2.1 MIT"
-KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~ppc ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 SLOT="0"
 IUSE="cxx guile octave python test"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"

[gentoo-commits] repo/gentoo:master commit in: sci-libs/nlopt/

2024-01-11 Thread Sam James 
commit: 2d1ff566ca0f13e8b1d6d77625413633429592eb
Author: Sam James  gentoo  org>
AuthorDate: Thu Jan 11 09:36:44 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jan 11 09:36:44 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d1ff566

sci-libs/nlopt: Keyword 2.7.1-r2 ppc64, #921695

Signed-off-by: Sam James  gentoo.org>

 sci-libs/nlopt/nlopt-2.7.1-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/nlopt/nlopt-2.7.1-r2.ebuild 
b/sci-libs/nlopt/nlopt-2.7.1-r2.ebuild
index 4998984c409b..b95c60952ce8 100644
--- a/sci-libs/nlopt/nlopt-2.7.1-r2.ebuild
+++ b/sci-libs/nlopt/nlopt-2.7.1-r2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/stevengj/nlopt";
 SRC_URI="https://github.com/stevengj/nlopt/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
 
 LICENSE="LGPL-2.1 MIT"
-KEYWORDS="amd64 ~arm64 ~ppc ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 SLOT="0"
 IUSE="cxx guile octave python test"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"

[gentoo-commits] repo/gentoo:master commit in: sci-libs/nlopt/

2024-01-10 Thread Jakov Smolić 
commit: 638db5f082ec977368768418a6f362fe210f045e
Author: Jakov Smolić  gentoo  org>
AuthorDate: Wed Jan 10 12:31:35 2024 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Wed Jan 10 12:31:35 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=638db5f0

sci-libs/nlopt: Keyword 2.7.1-r2 riscv, #921695

Signed-off-by: Jakov Smolić  gentoo.org>

 sci-libs/nlopt/nlopt-2.7.1-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/nlopt/nlopt-2.7.1-r2.ebuild 
b/sci-libs/nlopt/nlopt-2.7.1-r2.ebuild
index 8e594862846e..4998984c409b 100644
--- a/sci-libs/nlopt/nlopt-2.7.1-r2.ebuild
+++ b/sci-libs/nlopt/nlopt-2.7.1-r2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/stevengj/nlopt";
 SRC_URI="https://github.com/stevengj/nlopt/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
 
 LICENSE="LGPL-2.1 MIT"
-KEYWORDS="amd64 ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~ppc ~riscv ~x86 ~amd64-linux ~x86-linux"
 SLOT="0"
 IUSE="cxx guile octave python test"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"

[gentoo-commits] repo/gentoo:master commit in: sci-libs/nlopt/

2024-01-10 Thread Sam James 
commit: a8833ed830b30fe970c38abe8ae3bc8d0c955f93
Author: Sam James  gentoo  org>
AuthorDate: Wed Jan 10 12:10:06 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jan 10 12:10:06 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8833ed8

sci-libs/nlopt: Keyword 2.7.1-r2 ppc, #921695

Signed-off-by: Sam James  gentoo.org>

 sci-libs/nlopt/nlopt-2.7.1-r2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-libs/nlopt/nlopt-2.7.1-r2.ebuild 
b/sci-libs/nlopt/nlopt-2.7.1-r2.ebuild
index 634c1c5947bf..8e594862846e 100644
--- a/sci-libs/nlopt/nlopt-2.7.1-r2.ebuild
+++ b/sci-libs/nlopt/nlopt-2.7.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/stevengj/nlopt";
 SRC_URI="https://github.com/stevengj/nlopt/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
 
 LICENSE="LGPL-2.1 MIT"
-KEYWORDS="amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 SLOT="0"
 IUSE="cxx guile octave python test"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"

[gentoo-commits] repo/gentoo:master commit in: sci-libs/nlopt/

2023-03-18 Thread Sam James 
commit: a247f9ca0211517836c9832aef383de627d2465e
Author: Violet Purcell  inventati  org>
AuthorDate: Sat Mar 18 01:25:56 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Mar 19 03:00:45 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a247f9ca

sci-libs/nlopt: Fortran is only needed for tests

Signed-off-by: Violet Purcell  inventati.org>
Closes: https://github.com/gentoo/gentoo/pull/30201
Signed-off-by: Sam James  gentoo.org>

 sci-libs/nlopt/nlopt-2.7.1-r1.ebuild | 1 +
 sci-libs/nlopt/nlopt-2.7.1-r2.ebuild | 1 +
 2 files changed, 2 insertions(+)

diff --git a/sci-libs/nlopt/nlopt-2.7.1-r1.ebuild 
b/sci-libs/nlopt/nlopt-2.7.1-r1.ebuild
index 5adc753ba921..538051367347 100644
--- a/sci-libs/nlopt/nlopt-2.7.1-r1.ebuild
+++ b/sci-libs/nlopt/nlopt-2.7.1-r1.ebuild
@@ -4,6 +4,7 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{9..10} )
+FORTRAN_NEEDED="test"
 
 inherit python-r1 cmake fortran-2
 

diff --git a/sci-libs/nlopt/nlopt-2.7.1-r2.ebuild 
b/sci-libs/nlopt/nlopt-2.7.1-r2.ebuild
index 67b4245b9809..8c7936051193 100644
--- a/sci-libs/nlopt/nlopt-2.7.1-r2.ebuild
+++ b/sci-libs/nlopt/nlopt-2.7.1-r2.ebuild
@@ -4,6 +4,7 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{9..11} )
+FORTRAN_NEEDED="test"
 
 inherit python-r1 cmake fortran-2

[gentoo-commits] repo/gentoo:master commit in: sci-libs/nlopt/

2023-03-07 Thread Sam James 
commit: 939891caa4bceb0431569be4f1ce2a0d35ce6a9f
Author: Sam James  gentoo  org>
AuthorDate: Tue Mar  7 11:40:38 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Mar  7 11:40:38 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=939891ca

sci-libs/nlopt: Stabilize 2.7.1-r2 amd64, #899464

Signed-off-by: Sam James  gentoo.org>

 sci-libs/nlopt/nlopt-2.7.1-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/nlopt/nlopt-2.7.1-r2.ebuild 
b/sci-libs/nlopt/nlopt-2.7.1-r2.ebuild
index 93bb1a042c26..67b4245b9809 100644
--- a/sci-libs/nlopt/nlopt-2.7.1-r2.ebuild
+++ b/sci-libs/nlopt/nlopt-2.7.1-r2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://github.com/stevengj/nlopt";
 SRC_URI="https://github.com/stevengj/nlopt/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
 
 LICENSE="LGPL-2.1 MIT"
-KEYWORDS="~amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 SLOT="0"
 IUSE="cxx guile octave python test"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"

[gentoo-commits] repo/gentoo:master commit in: sci-libs/nlopt/

2023-03-03 Thread Arthur Zamarin 
commit: 5c44691dec10d19dba3de614caee91d07216ee27
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Mar  4 07:37:45 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Mar  4 07:37:45 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c44691d

sci-libs/nlopt: Stabilize 2.7.1-r2 x86, #899464

Signed-off-by: Arthur Zamarin  gentoo.org>

 sci-libs/nlopt/nlopt-2.7.1-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/nlopt/nlopt-2.7.1-r2.ebuild 
b/sci-libs/nlopt/nlopt-2.7.1-r2.ebuild
index 974f2f022535..93bb1a042c26 100644
--- a/sci-libs/nlopt/nlopt-2.7.1-r2.ebuild
+++ b/sci-libs/nlopt/nlopt-2.7.1-r2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://github.com/stevengj/nlopt";
 SRC_URI="https://github.com/stevengj/nlopt/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
 
 LICENSE="LGPL-2.1 MIT"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 SLOT="0"
 IUSE="cxx guile octave python test"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"

[gentoo-commits] repo/gentoo:master commit in: sci-libs/nlopt/

2023-02-24 Thread Andrew Ammerlaan 
commit: 1a985c49217b7512a90146596fde61353a8768cf
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Fri Feb 24 11:24:22 2023 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Fri Feb 24 11:24:29 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a985c49

sci-libs/nlopt: enable py3.11

Signed-off-by: Andrew Ammerlaan  gentoo.org>

 sci-libs/nlopt/nlopt-2.7.1-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/nlopt/nlopt-2.7.1-r2.ebuild 
b/sci-libs/nlopt/nlopt-2.7.1-r2.ebuild
index 6a362c01d90e..974f2f022535 100644
--- a/sci-libs/nlopt/nlopt-2.7.1-r2.ebuild
+++ b/sci-libs/nlopt/nlopt-2.7.1-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 
 inherit python-r1 cmake fortran-2

[gentoo-commits] repo/gentoo:master commit in: sci-libs/nlopt/

2022-09-12 Thread Michael Orlitzky 
commit: e1bf0ac69752835111fef2a6700624d7ef74abc7
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Mon Sep 12 20:26:23 2022 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Mon Sep 12 20:31:30 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1bf0ac6

sci-libs/nlopt: new revision with subslot dependency on sci-math/octave.

With USE=octave, NLopt builds a *.oct interface using mkoctfile, and
that requires a rebuild when Octave is upgraded.

Closes: https://bugs.gentoo.org/869863
Signed-off-by: Michael Orlitzky  gentoo.org>

 sci-libs/nlopt/nlopt-2.7.1-r2.ebuild | 111 +++
 1 file changed, 111 insertions(+)

diff --git a/sci-libs/nlopt/nlopt-2.7.1-r2.ebuild 
b/sci-libs/nlopt/nlopt-2.7.1-r2.ebuild
new file mode 100644
index ..b49baaa4267f
--- /dev/null
+++ b/sci-libs/nlopt/nlopt-2.7.1-r2.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit python-r1 cmake fortran-2
+
+DESCRIPTION="Non-linear optimization library"
+HOMEPAGE="https://github.com/stevengj/nlopt";
+SRC_URI="https://github.com/stevengj/nlopt/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+
+LICENSE="LGPL-2.1 MIT"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+SLOT="0"
+IUSE="cxx guile octave python test"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+   guile? ( dev-scheme/guile:* )
+   octave? ( >=sci-mathematics/octave-6:= )
+   python? (
+   ${PYTHON_DEPS}
+   dev-python/numpy[${PYTHON_USEDEP}]
+   )
+   "
+DEPEND="${RDEPEND}"
+BDEPEND="python? ( dev-lang/swig )"
+
+src_prepare() {
+   cmake_src_prepare
+
+   use python && python_copy_sources
+}
+
+src_configure() {
+   # MATLAB detection causes problems (as in bug 826774) if we don't
+   # explicitly disable it.
+   local mycmakeargs=(
+   -DNLOPT_CXX=$(usex cxx)
+   -DNLOPT_FORTRAN=$(usex test)
+   -DNLOPT_GUILE=$(usex guile)
+   -DNLOPT_OCTAVE=$(usex octave)
+   -DNLOPT_MATLAB=OFF
+   -DNLOPT_PYTHON=OFF
+   -DNLOPT_SWIG=$(usex python)
+   -DNLOPT_TESTS=$(usex test)
+   )
+
+   cmake_src_configure
+
+   if use python; then
+   python_configure() {
+   local mycmakeargs=(
+   ${mycmakeargs[@]}
+   -DNLOPT_PYTHON=ON
+   -DINSTALL_PYTHON_DIR="$(python_get_sitedir)"
+   )
+
+   cmake_src_configure
+   }
+
+   python_foreach_impl run_in_build_dir python_configure
+   fi
+}
+
+src_compile() {
+   cmake_src_compile
+
+   if use python; then
+   python_foreach_impl 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
+   }
+
+   do_test
+
+   if use python; then
+   python_foreach_impl run_in_build_dir do_test
+   fi
+}
+
+nlopt_install() {
+   cmake_src_install
+   python_optimize
+}
+
+src_install() {
+   cmake_src_install
+
+   if use python; then
+   python_foreach_impl run_in_build_dir nlopt_install
+   fi
+
+   local r
+   for r in */README; do
+   newdoc ${r} README.$(dirname ${r})
+   done
+}

[gentoo-commits] repo/gentoo:master commit in: sci-libs/nlopt/

2022-09-12 Thread Michael Orlitzky 
commit: f22acba679894d575d5910eb0ee80009434f1dcb
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Mon Sep 12 20:18:54 2022 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Mon Sep 12 20:31:29 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f22acba6

sci-libs/nlopt: drop 2.6.2-r1, 2.7.1

Signed-off-by: Michael Orlitzky  gentoo.org>

 sci-libs/nlopt/Manifest  |   1 -
 sci-libs/nlopt/nlopt-2.6.2-r1.ebuild | 109 ---
 sci-libs/nlopt/nlopt-2.7.1.ebuild|  97 ---
 3 files changed, 207 deletions(-)

diff --git a/sci-libs/nlopt/Manifest b/sci-libs/nlopt/Manifest
index bc0bc63e1b06..91292448e091 100644
--- a/sci-libs/nlopt/Manifest
+++ b/sci-libs/nlopt/Manifest
@@ -1,2 +1 @@
-DIST nlopt-2.6.2.tar.gz 2040229 BLAKE2B 
f1f4124de574600ddbef8a885bbdd3a4f57b469b2f958ce94bbc831cf9bfa8a845e438fccfe4ab219a73a5675b8d880f6d49e0e7cbe9d0966777b0d2344521d4
 SHA512 
61e5c01140a57c0ad2a0acd82ad50dce1b5679dc281e55cbbc332e876b19a689013100617545a42b721d8c487df37d6ccd67859171243433fe29468f259b556b
 DIST nlopt-2.7.1.tar.gz 2044180 BLAKE2B 
6d459f94a26ee6dd7f72c73c48992bd047150aa525bc4ad088c8516127afc5c7843f6fbb6726c2f845271b87934c13e0892a063362ab50df51f92e81979111fb
 SHA512 
e23cb522fc696010574c14b72be85acc0f8ccf0bf208bf2b8789c57d6c5a6e6d419ee10330581518b1c1567018ae909b626ce7761d4fbd5bf112916871e420e2

diff --git a/sci-libs/nlopt/nlopt-2.6.2-r1.ebuild 
b/sci-libs/nlopt/nlopt-2.6.2-r1.ebuild
deleted file mode 100644
index 01368b67d508..
--- a/sci-libs/nlopt/nlopt-2.6.2-r1.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-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 ~arm64 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}
-   dev-python/numpy[${PYTHON_USEDEP}]
-   )
-   "
-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
-}

diff --git a/sci-libs/nlopt/nlopt-2.7.1.ebuild 
b/sci-libs/nlopt/nlopt-2.7.1.ebuild
deleted file mode 100644
index 10e6b998d4e3..
--- a/sci-libs/nlopt/nlopt-2.7.1.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under

[gentoo-commits] repo/gentoo:master commit in: sci-libs/nlopt/

2022-07-22 Thread Agostino Sarubbo 
commit: 8cddb178467586f506a6ab9899961cc4ebd1
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri Jul 22 07:48:00 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri Jul 22 07:48:00 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8cddb888

sci-libs/nlopt: x86 stable wrt bug #859166

Signed-off-by: Agostino Sarubbo  gentoo.org>

 sci-libs/nlopt/nlopt-2.7.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/nlopt/nlopt-2.7.1-r1.ebuild 
b/sci-libs/nlopt/nlopt-2.7.1-r1.ebuild
index 0ca16291154d..e6f71f100981 100644
--- a/sci-libs/nlopt/nlopt-2.7.1-r1.ebuild
+++ b/sci-libs/nlopt/nlopt-2.7.1-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://github.com/stevengj/nlopt";
 SRC_URI="https://github.com/stevengj/nlopt/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
 
 LICENSE="LGPL-2.1 MIT"
-KEYWORDS="amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 SLOT="0"
 IUSE="cxx guile octave python test"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"

[gentoo-commits] repo/gentoo:master commit in: sci-libs/nlopt/

2022-07-22 Thread Agostino Sarubbo 
commit: 34896281ac61179035ed5dfe7ab4c58d841e00c7
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri Jul 22 07:42:54 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri Jul 22 07:42:54 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34896281

sci-libs/nlopt: amd64 stable wrt bug #859166

Signed-off-by: Agostino Sarubbo  gentoo.org>

 sci-libs/nlopt/nlopt-2.7.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/nlopt/nlopt-2.7.1-r1.ebuild 
b/sci-libs/nlopt/nlopt-2.7.1-r1.ebuild
index a7ca0ef31672..0ca16291154d 100644
--- a/sci-libs/nlopt/nlopt-2.7.1-r1.ebuild
+++ b/sci-libs/nlopt/nlopt-2.7.1-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://github.com/stevengj/nlopt";
 SRC_URI="https://github.com/stevengj/nlopt/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
 
 LICENSE="LGPL-2.1 MIT"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
 SLOT="0"
 IUSE="cxx guile octave python test"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"

[gentoo-commits] repo/gentoo:master commit in: sci-libs/nlopt/

2022-07-18 Thread Sam James 
commit: 61b86bf09b542f6cbbf044876c4a2571b97530c7
Author: Sam James  gentoo  org>
AuthorDate: Mon Jul 18 20:07:41 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jul 18 20:07:47 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61b86bf0

sci-libs/nlopt: fix installed Python module location

Closes: https://bugs.gentoo.org/859163
Signed-off-by: Sam James  gentoo.org>

 sci-libs/nlopt/nlopt-2.7.1-r1.ebuild | 111 +++
 1 file changed, 111 insertions(+)

diff --git a/sci-libs/nlopt/nlopt-2.7.1-r1.ebuild 
b/sci-libs/nlopt/nlopt-2.7.1-r1.ebuild
new file mode 100644
index ..a7ca0ef31672
--- /dev/null
+++ b/sci-libs/nlopt/nlopt-2.7.1-r1.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit python-r1 cmake fortran-2
+
+DESCRIPTION="Non-linear optimization library"
+HOMEPAGE="https://github.com/stevengj/nlopt";
+SRC_URI="https://github.com/stevengj/nlopt/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+
+LICENSE="LGPL-2.1 MIT"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+SLOT="0"
+IUSE="cxx guile octave python test"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+   guile? ( dev-scheme/guile:* )
+   octave? ( >=sci-mathematics/octave-6 )
+   python? (
+   ${PYTHON_DEPS}
+   dev-python/numpy[${PYTHON_USEDEP}]
+   )
+   "
+DEPEND="${RDEPEND}"
+BDEPEND="python? ( dev-lang/swig )"
+
+src_prepare() {
+   cmake_src_prepare
+
+   use python && python_copy_sources
+}
+
+src_configure() {
+   # MATLAB detection causes problems (as in bug 826774) if we don't
+   # explicitly disable it.
+   local mycmakeargs=(
+   -DNLOPT_CXX=$(usex cxx)
+   -DNLOPT_FORTRAN=$(usex test)
+   -DNLOPT_GUILE=$(usex guile)
+   -DNLOPT_OCTAVE=$(usex octave)
+   -DNLOPT_MATLAB=OFF
+   -DNLOPT_PYTHON=OFF
+   -DNLOPT_SWIG=$(usex python)
+   -DNLOPT_TESTS=$(usex test)
+   )
+
+   cmake_src_configure
+
+   if use python; then
+   python_configure() {
+   local mycmakeargs=(
+   ${mycmakeargs[@]}
+   -DNLOPT_PYTHON=ON
+   -DINSTALL_PYTHON_DIR="$(python_get_sitedir)"
+   )
+
+   cmake_src_configure
+   }
+
+   python_foreach_impl run_in_build_dir python_configure
+   fi
+}
+
+src_compile() {
+   cmake_src_compile
+
+   if use python; then
+   python_foreach_impl 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
+   }
+
+   do_test
+
+   if use python; then
+   python_foreach_impl run_in_build_dir do_test
+   fi
+}
+
+nlopt_install() {
+   cmake_src_install
+   python_optimize
+}
+
+src_install() {
+   cmake_src_install
+
+   if use python; then
+   python_foreach_impl run_in_build_dir nlopt_install
+   fi
+
+   local r
+   for r in */README; do
+   newdoc ${r} README.$(dirname ${r})
+   done
+}

[gentoo-commits] repo/gentoo:master commit in: sci-libs/nlopt/

2022-07-09 Thread Agostino Sarubbo 
commit: f5051763c22e0783d2cdbe0c5d83984b83108505
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sat Jul  9 12:17:05 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sat Jul  9 12:17:05 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5051763

sci-libs/nlopt: x86 stable wrt bug #856550

Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 sci-libs/nlopt/nlopt-2.7.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/nlopt/nlopt-2.7.1.ebuild 
b/sci-libs/nlopt/nlopt-2.7.1.ebuild
index 967176d9ee7c..10e6b998d4e3 100644
--- a/sci-libs/nlopt/nlopt-2.7.1.ebuild
+++ b/sci-libs/nlopt/nlopt-2.7.1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://github.com/stevengj/nlopt";
 SRC_URI="https://github.com/stevengj/nlopt/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
 
 LICENSE="LGPL-2.1 MIT"
-KEYWORDS="amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 SLOT="0"
 IUSE="cxx guile octave python test"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"

[gentoo-commits] repo/gentoo:master commit in: sci-libs/nlopt/

2022-07-09 Thread Agostino Sarubbo 
commit: 2c435455483724b347a8d63ab7c1c6d06d26d4da
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sat Jul  9 12:13:44 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sat Jul  9 12:13:44 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c435455

sci-libs/nlopt: amd64 stable wrt bug #856550

Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 sci-libs/nlopt/nlopt-2.7.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/nlopt/nlopt-2.7.1.ebuild 
b/sci-libs/nlopt/nlopt-2.7.1.ebuild
index 814c7a1440fc..967176d9ee7c 100644
--- a/sci-libs/nlopt/nlopt-2.7.1.ebuild
+++ b/sci-libs/nlopt/nlopt-2.7.1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://github.com/stevengj/nlopt";
 SRC_URI="https://github.com/stevengj/nlopt/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
 
 LICENSE="LGPL-2.1 MIT"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
 SLOT="0"
 IUSE="cxx guile octave python test"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"

[gentoo-commits] repo/gentoo:master commit in: sci-libs/nlopt/

2022-05-17 Thread Michael Orlitzky 
commit: b42d8d1364f977dbfceb02de0784c3b0e9e2df8d
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Wed May 18 01:34:02 2022 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Wed May 18 01:35:24 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b42d8d13

sci-libs/nlopt: new upstream v2.7.1.

  * Update HOMEPAGE.
  * Disable MATLAB detection in src_configure().
  * No more static libs.

Closes: https://bugs.gentoo.org/661952
Bug: https://bugs.gentoo.org/826774
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Michael Orlitzky  gentoo.org>

 sci-libs/nlopt/Manifest   |  1 +
 sci-libs/nlopt/nlopt-2.7.1.ebuild | 97 +++
 2 files changed, 98 insertions(+)

diff --git a/sci-libs/nlopt/Manifest b/sci-libs/nlopt/Manifest
index a4d07e389b10..bc0bc63e1b06 100644
--- a/sci-libs/nlopt/Manifest
+++ b/sci-libs/nlopt/Manifest
@@ -1 +1,2 @@
 DIST nlopt-2.6.2.tar.gz 2040229 BLAKE2B 
f1f4124de574600ddbef8a885bbdd3a4f57b469b2f958ce94bbc831cf9bfa8a845e438fccfe4ab219a73a5675b8d880f6d49e0e7cbe9d0966777b0d2344521d4
 SHA512 
61e5c01140a57c0ad2a0acd82ad50dce1b5679dc281e55cbbc332e876b19a689013100617545a42b721d8c487df37d6ccd67859171243433fe29468f259b556b
+DIST nlopt-2.7.1.tar.gz 2044180 BLAKE2B 
6d459f94a26ee6dd7f72c73c48992bd047150aa525bc4ad088c8516127afc5c7843f6fbb6726c2f845271b87934c13e0892a063362ab50df51f92e81979111fb
 SHA512 
e23cb522fc696010574c14b72be85acc0f8ccf0bf208bf2b8789c57d6c5a6e6d419ee10330581518b1c1567018ae909b626ce7761d4fbd5bf112916871e420e2

diff --git a/sci-libs/nlopt/nlopt-2.7.1.ebuild 
b/sci-libs/nlopt/nlopt-2.7.1.ebuild
new file mode 100644
index ..814c7a1440fc
--- /dev/null
+++ b/sci-libs/nlopt/nlopt-2.7.1.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit python-r1 cmake fortran-2
+
+DESCRIPTION="Non-linear optimization library"
+HOMEPAGE="https://github.com/stevengj/nlopt";
+SRC_URI="https://github.com/stevengj/nlopt/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+
+LICENSE="LGPL-2.1 MIT"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+SLOT="0"
+IUSE="cxx guile octave python test"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+   guile? ( dev-scheme/guile:* )
+   octave? ( >=sci-mathematics/octave-6 )
+   python? (
+   ${PYTHON_DEPS}
+   dev-python/numpy[${PYTHON_USEDEP}]
+   )
+   "
+DEPEND="
+   ${RDEPEND}
+   python? ( dev-lang/swig )
+   "
+
+src_prepare() {
+   cmake_src_prepare
+   use python && python_copy_sources
+}
+
+src_configure() {
+   # MATLAB detection causes problems (as in bug 826774) if we don't
+   # explicitly disable it.
+   local mycmakeargs=(
+   -DNLOPT_CXX=$(usex cxx)
+   -DNLOPT_FORTRAN=$(usex test)
+   -DNLOPT_GUILE=$(usex guile)
+   -DNLOPT_OCTAVE=$(usex octave)
+   -DNLOPT_MATLAB=OFF
+   -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
+}
+
+src_compile() {
+   if use python; then
+   python_foreach_impl run_in_build_dir cmake_src_compile
+   else
+   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
+}
+
+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
+   local r
+   for r in */README; do newdoc ${r} README.$(dirname ${r}); done
+}

[gentoo-commits] repo/gentoo:master commit in: sci-libs/nlopt/

2021-10-25 Thread Arthur Zamarin 
commit: 441465f60a8e1654ca8c07aac9c07e5296bb2652
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Mon Oct 25 05:08:18 2021 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Mon Oct 25 17:19:18 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=441465f6

sci-libs/nlopt: enable py3.10

Signed-off-by: Arthur Zamarin  gentoo.org>

 sci-libs/nlopt/nlopt-2.6.2-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-libs/nlopt/nlopt-2.6.2-r1.ebuild 
b/sci-libs/nlopt/nlopt-2.6.2-r1.ebuild
index 7590eee2b11..01368b67d50 100644
--- a/sci-libs/nlopt/nlopt-2.6.2-r1.ebuild
+++ b/sci-libs/nlopt/nlopt-2.6.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit python-r1 cmake fortran-2

[gentoo-commits] repo/gentoo:master commit in: sci-libs/nlopt/

2020-12-13 Thread Sam James 
commit: c58109c666c91f4d8ea933d4c7687c4959cf
Author: Sam James  gentoo  org>
AuthorDate: Mon Dec 14 00:46:10 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Dec 14 00:46:10 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c58109c6

sci-libs/nlopt: arm64 keyworded (bug #757849)

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Sam James  gentoo.org>

 sci-libs/nlopt/nlopt-2.6.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/nlopt/nlopt-2.6.2-r1.ebuild 
b/sci-libs/nlopt/nlopt-2.6.2-r1.ebuild
index 6fa9dea93bb..4378cda85f1 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 ~arm64 x86 ~amd64-linux ~x86-linux"
 SLOT="0"
 IUSE="cxx guile octave python static-libs test"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"

[gentoo-commits] repo/gentoo:master commit in: sci-libs/nlopt/files/

2020-07-21 Thread Andreas Sturmlechner 
commit: 75d5f89f7f0bd192e2d97c2607ac875db22ee20b
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Jul 21 09:43:23 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Jul 21 09:43:23 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75d5f89f

sci-libs/nlopt: Cleanup unused patches

Package-Manager: Portage-3.0.0, Repoman-2.3.23
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 sci-libs/nlopt/files/nlopt-2.3-as-needed.patch | 23 
 sci-libs/nlopt/files/nlopt-2.3-pkgconfig.patch | 10 
 .../nlopt-2.4.2-fix-dynamic-underlinking.patch | 62 --
 .../nlopt/files/nlopt-2.4.2-octave-4-map.patch | 49 -
 4 files changed, 144 deletions(-)

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 928ec174b77..000
--- 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.0 +0100
-+++ nlopt-2.3/Makefile.am  2012-08-03 02:13:13.0 +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.am2012-08-03 02:07:09.0 +0100
-+++ nlopt-2.3/swig/Makefile.am 2012-08-03 03:04:30.0 +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 8a072b15e2e..000
--- 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.0 +0100
-+++ nlopt.pc.in2012-08-03 01:42:29.0 +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 beb9dd4de81..000
--- 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 ])
--  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@
-+libnlo

[gentoo-commits] repo/gentoo:master commit in: sci-libs/nlopt/

2020-07-21 Thread Andreas Sturmlechner 
commit: b9ce0bb059a90dc796135b4fee18c1044d338775
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Jul 21 09:42:03 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Jul 21 09:42:03 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9ce0bb0

sci-libs/nlopt: Drop 2.4.2-r2 and 2.6.2 (r0)

Closes: https://bugs.gentoo.org/724640
Package-Manager: Portage-3.0.0, Repoman-2.3.23
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 sci-libs/nlopt/Manifest  |   1 -
 sci-libs/nlopt/nlopt-2.4.2-r2.ebuild | 118 ---
 sci-libs/nlopt/nlopt-2.6.2.ebuild| 110 
 3 files changed, 229 deletions(-)

diff --git a/sci-libs/nlopt/Manifest b/sci-libs/nlopt/Manifest
index 763315e9b52..a4d07e389b1 100644
--- a/sci-libs/nlopt/Manifest
+++ b/sci-libs/nlopt/Manifest
@@ -1,2 +1 @@
-DIST nlopt-2.4.2.tar.gz 2361992 BLAKE2B 
c1c9f533c7e7b3bb61e81343ebd26b87e05434fdbea1f347fc5f6a6c10160289ce105a51c6540296f3f1d122d31b415452da49b84516cd13fabc73372e4cfd0e
 SHA512 
136aacc00a69f77e8a7ce5dc26a5f3f027bc8c01b97aa1f43919462e0a412154eabfb01be258e082dffe61f9b554bb2bfbb550a7b82c7c77c7b22874a64a9703
 DIST nlopt-2.6.2.tar.gz 2040229 BLAKE2B 
f1f4124de574600ddbef8a885bbdd3a4f57b469b2f958ce94bbc831cf9bfa8a845e438fccfe4ab219a73a5675b8d880f6d49e0e7cbe9d0966777b0d2344521d4
 SHA512 
61e5c01140a57c0ad2a0acd82ad50dce1b5679dc281e55cbbc332e876b19a689013100617545a42b721d8c487df37d6ccd67859171243433fe29468f259b556b

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 5a937cd80ed..000
--- 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

[gentoo-commits] repo/gentoo:master commit in: sci-libs/nlopt/

2020-07-21 Thread Agostino Sarubbo 
commit: 661f9e371de23a0e95a33d6634bb3e090b0aebaf
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Jul 21 09:32:25 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Jul 21 09:32:25 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=661f9e37

sci-libs/nlopt: x86 stable wrt bug #724640

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 sci-libs/nlopt/nlopt-2.6.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/nlopt/nlopt-2.6.2-r1.ebuild 
b/sci-libs/nlopt/nlopt-2.6.2-r1.ebuild
index e84205a3af5..6fa9dea93bb 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} )"

[gentoo-commits] repo/gentoo:master commit in: sci-libs/nlopt/

2020-07-21 Thread Agostino Sarubbo 
commit: f26b17eec86b329c376825bd8b48344308b04378
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Jul 21 08:47:09 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Jul 21 08:47:09 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f26b17ee

sci-libs/nlopt: amd64 stable wrt bug #724640

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 sci-libs/nlopt/nlopt-2.6.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/nlopt/nlopt-2.6.2-r1.ebuild 
b/sci-libs/nlopt/nlopt-2.6.2-r1.ebuild
index 416022d0dc5..e84205a3af5 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} )"

[gentoo-commits] repo/gentoo:master commit in: sci-libs/nlopt/

2020-06-21 Thread Mark Wright 
commit: 81c90b0e2306772099620a6c0a56d7f991506ad1
Author: Mark Wright  gentoo  org>
AuthorDate: Mon Jun 22 01:41:27 2020 +
Commit: Mark Wright  gentoo  org>
CommitDate: Mon Jun 22 01:41:27 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81c90b0e

sci-libs/nlopt: Inherit fortran, fix static-libs logic.

Fix QA bad filename: [ v2.6.2.tar.gz ], thanks to
Michelangelo Scopelliti for reporting.

inherit fortran-2, thanks to Michelangelo Scopelliti and
François Bissey for reporting.

Put back the logic I incorrectly removed when adding support
for USE=static-libs for building stuff when USE=-python.

Thanks to Michelangelo Scopelliti, François Bissey and
Andreas Sturmlechner for helping.

Co-Authored-By: François Bissey  gmail.com>
Bug: https://bugs.gentoo.org/724640
Package-Manager: Portage-2.3.101, Repoman-2.3.22
Signed-off-by: Mark Wright  gentoo.org>

 sci-libs/nlopt/Manifest  |  2 +-
 sci-libs/nlopt/nlopt-2.6.2-r1.ebuild | 12 ++--
 sci-libs/nlopt/nlopt-2.6.2.ebuild| 12 ++--
 3 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/sci-libs/nlopt/Manifest b/sci-libs/nlopt/Manifest
index 459d271131f..763315e9b52 100644
--- a/sci-libs/nlopt/Manifest
+++ b/sci-libs/nlopt/Manifest
@@ -1,2 +1,2 @@
 DIST nlopt-2.4.2.tar.gz 2361992 BLAKE2B 
c1c9f533c7e7b3bb61e81343ebd26b87e05434fdbea1f347fc5f6a6c10160289ce105a51c6540296f3f1d122d31b415452da49b84516cd13fabc73372e4cfd0e
 SHA512 
136aacc00a69f77e8a7ce5dc26a5f3f027bc8c01b97aa1f43919462e0a412154eabfb01be258e082dffe61f9b554bb2bfbb550a7b82c7c77c7b22874a64a9703
-DIST v2.6.2.tar.gz 2040229 BLAKE2B 
f1f4124de574600ddbef8a885bbdd3a4f57b469b2f958ce94bbc831cf9bfa8a845e438fccfe4ab219a73a5675b8d880f6d49e0e7cbe9d0966777b0d2344521d4
 SHA512 
61e5c01140a57c0ad2a0acd82ad50dce1b5679dc281e55cbbc332e876b19a689013100617545a42b721d8c487df37d6ccd67859171243433fe29468f259b556b
+DIST nlopt-2.6.2.tar.gz 2040229 BLAKE2B 
f1f4124de574600ddbef8a885bbdd3a4f57b469b2f958ce94bbc831cf9bfa8a845e438fccfe4ab219a73a5675b8d880f6d49e0e7cbe9d0966777b0d2344521d4
 SHA512 
61e5c01140a57c0ad2a0acd82ad50dce1b5679dc281e55cbbc332e876b19a689013100617545a42b721d8c487df37d6ccd67859171243433fe29468f259b556b

diff --git a/sci-libs/nlopt/nlopt-2.6.2-r1.ebuild 
b/sci-libs/nlopt/nlopt-2.6.2-r1.ebuild
index e99f07d1cdf..416022d0dc5 100644
--- a/sci-libs/nlopt/nlopt-2.6.2-r1.ebuild
+++ b/sci-libs/nlopt/nlopt-2.6.2-r1.ebuild
@@ -5,11 +5,11 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{6..9} )
 
-inherit python-r1 cmake
+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";
+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"
@@ -48,6 +48,8 @@ src_configure() {
)
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+=(
@@ -60,6 +62,8 @@ src_configure() {
 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
@@ -78,6 +82,8 @@ src_test() {
}
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
@@ -92,6 +98,8 @@ nlopt_install() {
 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

diff --git a/sci-libs/nlopt/nlopt-2.6.2.ebuild 
b/sci-libs/nlopt/nlopt-2.6.2.ebuild
index ec04d41e8bc..21c2ada3624 100644
--- a/sci-libs/nlopt/nlopt-2.6.2.ebuild
+++ b/sci-libs/nlopt/nlopt-2.6.2.ebuild
@@ -5,11 +5,11 @@ EAPI=7
 
 PYTHON_COMPAT=( python2_7 python3_{6..9} )
 
-inherit python-r1 cmake
+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";
+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"
@@ -49,6 +49,8 @@ src_configure() {
)
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+=(
@@ -6

[gentoo-commits] repo/gentoo:master commit in: sci-libs/nlopt/

2020-06-21 Thread Mark Wright 
commit: e364e1fc6dc01eb6078974cce77c26a12d5ac5e0
Author: Mark Wright  gentoo  org>
AuthorDate: Sun Jun 21 14:04:30 2020 +
Commit: Mark Wright  gentoo  org>
CommitDate: Sun Jun 21 14:04:30 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e364e1fc

sci-libs/nlopt: Fix USE=static-libs

Need to multibuild it again to obtain the libnlopt.a, and install it.

Package-Manager: Portage-2.3.101, Repoman-2.3.22
Signed-off-by: Mark Wright  gentoo.org>

 sci-libs/nlopt/nlopt-2.6.2.ebuild | 23 +++
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/sci-libs/nlopt/nlopt-2.6.2.ebuild 
b/sci-libs/nlopt/nlopt-2.6.2.ebuild
index f21aa295b04..ec04d41e8bc 100644
--- a/sci-libs/nlopt/nlopt-2.6.2.ebuild
+++ b/sci-libs/nlopt/nlopt-2.6.2.ebuild
@@ -49,16 +49,21 @@ src_configure() {
)
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
 }
 
@@ -74,8 +79,9 @@ src_test() {
}
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
 }
 
@@ -87,8 +93,9 @@ nlopt_install() {
 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

[gentoo-commits] repo/gentoo:master commit in: sci-libs/nlopt/

2020-06-21 Thread Mark Wright 
commit: 6e291a9886c1bfd29640d8a59ead8015e38a3fd2
Author: Mark Wright  gentoo  org>
AuthorDate: Sun Jun 21 14:11:28 2020 +
Commit: Mark Wright  gentoo  org>
CommitDate: Sun Jun 21 14:11:28 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e291a98

sci-libs/nlopt: Remove python 2.7

As numpy-python2 is only for cases where it is not
possible to build with python 3.

Package-Manager: Portage-2.3.101, Repoman-2.3.22
Signed-off-by: Mark Wright  gentoo.org>

 sci-libs/nlopt/nlopt-2.6.2-r1.ebuild | 101 +++
 1 file changed, 101 insertions(+)

diff --git a/sci-libs/nlopt/nlopt-2.6.2-r1.ebuild 
b/sci-libs/nlopt/nlopt-2.6.2-r1.ebuild
new file mode 100644
index 000..e99f07d1cdf
--- /dev/null
+++ b/sci-libs/nlopt/nlopt-2.6.2-r1.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit python-r1 cmake
+
+DESCRIPTION="Non-linear optimization library"
+HOMEPAGE="https://ab-initio.mit.edu/nlopt/";
+SRC_URI="https://github.com/stevengj/nlopt/archive/v${PV}.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}
+   dev-python/numpy[${PYTHON_USEDEP}]
+   )
+   "
+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
+   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
+   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
+   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
+   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
+}

[gentoo-commits] repo/gentoo:master commit in: sci-libs/nlopt/

2020-06-20 Thread Mark Wright 
commit: 1c975626cefbea18e1d2e1c1c1bfbedc662b1cda
Author: Mark Wright  gentoo  org>
AuthorDate: Sun Jun 21 04:54:05 2020 +
Commit: Mark Wright  gentoo  org>
CommitDate: Sun Jun 21 04:54:05 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c975626

sci-libs/nlopt: Bump to 2.6.2

Thanks to Marian Kyral for starting work on the ebuild bump.

Closes: https://bugs.gentoo.org/724640
Package-Manager: Portage-2.3.101, Repoman-2.3.22
Signed-off-by: Mark Wright  gentoo.org>

 sci-libs/nlopt/Manifest   |  1 +
 sci-libs/nlopt/nlopt-2.6.2.ebuild | 95 +++
 2 files changed, 96 insertions(+)

diff --git a/sci-libs/nlopt/Manifest b/sci-libs/nlopt/Manifest
index 1f8348cf56b..459d271131f 100644
--- a/sci-libs/nlopt/Manifest
+++ b/sci-libs/nlopt/Manifest
@@ -1 +1,2 @@
 DIST nlopt-2.4.2.tar.gz 2361992 BLAKE2B 
c1c9f533c7e7b3bb61e81343ebd26b87e05434fdbea1f347fc5f6a6c10160289ce105a51c6540296f3f1d122d31b415452da49b84516cd13fabc73372e4cfd0e
 SHA512 
136aacc00a69f77e8a7ce5dc26a5f3f027bc8c01b97aa1f43919462e0a412154eabfb01be258e082dffe61f9b554bb2bfbb550a7b82c7c77c7b22874a64a9703
+DIST v2.6.2.tar.gz 2040229 BLAKE2B 
f1f4124de574600ddbef8a885bbdd3a4f57b469b2f958ce94bbc831cf9bfa8a845e438fccfe4ab219a73a5675b8d880f6d49e0e7cbe9d0966777b0d2344521d4
 SHA512 
61e5c01140a57c0ad2a0acd82ad50dce1b5679dc281e55cbbc332e876b19a689013100617545a42b721d8c487df37d6ccd67859171243433fe29468f259b556b

diff --git a/sci-libs/nlopt/nlopt-2.6.2.ebuild 
b/sci-libs/nlopt/nlopt-2.6.2.ebuild
new file mode 100644
index 000..f21aa295b04
--- /dev/null
+++ b/sci-libs/nlopt/nlopt-2.6.2.ebuild
@@ -0,0 +1,95 @@
+# 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
+
+DESCRIPTION="Non-linear optimization library"
+HOMEPAGE="https://ab-initio.mit.edu/nlopt/";
+SRC_URI="https://github.com/stevengj/nlopt/archive/v${PV}.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
+}
+
+src_compile() {
+   if use python; then
+   python_foreach_impl run_in_build_dir cmake_src_compile
+   else
+   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
+}
+
+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
+   local r
+   for r in */README; do newdoc ${r} README.$(dirname ${r}); done
+}

[gentoo-commits] repo/gentoo:master commit in: sci-libs/nlopt/

2020-01-22 Thread Michał Górny 
commit: 8d550dda5b53bfb97a17965d0797381be6450999
Author: Michał Górny  gentoo  org>
AuthorDate: Wed Jan 22 21:42:40 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Wed Jan 22 21:49:48 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d550dda

sci-libs/nlopt: Revbump post dep change

Signed-off-by: Michał Górny  gentoo.org>

 sci-libs/nlopt/{nlopt-2.4.2-r1.ebuild => nlopt-2.4.2-r2.ebuild} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/sci-libs/nlopt/nlopt-2.4.2-r1.ebuild 
b/sci-libs/nlopt/nlopt-2.4.2-r2.ebuild
similarity index 100%
rename from sci-libs/nlopt/nlopt-2.4.2-r1.ebuild
rename to sci-libs/nlopt/nlopt-2.4.2-r2.ebuild

[gentoo-commits] repo/gentoo:master commit in: sci-libs/nlopt/

2020-01-15 Thread Michał Górny 
commit: e153a0cbbcaa93370fed8807b03f60e84f6ed6e6
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Jan 16 06:50:10 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Jan 16 07:02:42 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e153a0cb

sci-libs/nlopt: Permit numpy-python2

Signed-off-by: Michał Górny  gentoo.org>

 sci-libs/nlopt/nlopt-2.4.2-r1.ebuild | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/sci-libs/nlopt/nlopt-2.4.2-r1.ebuild 
b/sci-libs/nlopt/nlopt-2.4.2-r1.ebuild
index ff049980545..5a937cd80ed 100644
--- a/sci-libs/nlopt/nlopt-2.4.2-r1.ebuild
+++ b/sci-libs/nlopt/nlopt-2.4.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -23,7 +23,10 @@ DEPEND="
octave? ( sci-mathematics/octave )
python? (
${PYTHON_DEPS}
-   dev-python/numpy[${PYTHON_USEDEP}]
+   || (
+   dev-python/numpy-python2[${PYTHON_USEDEP}]
+   dev-python/numpy[${PYTHON_USEDEP}]
+   )
)"
 RDEPEND="${DEPEND}"

[gentoo-commits] repo/gentoo:master commit in: sci-libs/nlopt/

2017-04-20 Thread David Seifert 
commit: 7155ba88514834f90a5fd981b1eb51fecbadcfc0
Author: David Seifert  gentoo  org>
AuthorDate: Thu Apr 20 15:43:44 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Thu Apr 20 16:38:49 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7155ba88

sci-libs/nlopt: [QA] Add missing python metadata variables

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 sci-libs/nlopt/nlopt-2.4.2-r1.ebuild | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/sci-libs/nlopt/nlopt-2.4.2-r1.ebuild 
b/sci-libs/nlopt/nlopt-2.4.2-r1.ebuild
index 2dee716055a..8562dd322d0 100644
--- a/sci-libs/nlopt/nlopt-2.4.2-r1.ebuild
+++ b/sci-libs/nlopt/nlopt-2.4.2-r1.ebuild
@@ -17,10 +17,14 @@ 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? ( dev-python/numpy[${PYTHON_USEDEP}] )"
+   python? (
+   ${PYTHON_DEPS}
+   dev-python/numpy[${PYTHON_USEDEP}]
+   )"
 RDEPEND="${DEPEND}"
 
 PATCHES=(

[gentoo-commits] repo/gentoo:master commit in: sci-libs/nlopt/, sci-libs/nlopt/files/

2017-01-02 Thread Justin Lecher 
commit: 3ae1284d2cb37473e1256b5d0cfde0c08444bed0
Author: Justin Lecher  gentoo  org>
AuthorDate: Mon Jan  2 22:01:07 2017 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Mon Jan  2 22:09:08 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ae1284d

sci-libs/nlopt: Drop old

Package-Manager: Portage-2.3.3, Repoman-2.3.1
Signed-off-by: Justin Lecher  gentoo.org>

 sci-libs/nlopt/Manifest|   1 -
 .../files/nlopt-2.2.4-fix-nlopt_hpp-location.patch |  47 --
 sci-libs/nlopt/metadata.xml|  16 ++--
 sci-libs/nlopt/nlopt-2.2.4.ebuild  |  98 
 sci-libs/nlopt/nlopt-2.4.2.ebuild  | 103 -
 5 files changed, 8 insertions(+), 257 deletions(-)

diff --git a/sci-libs/nlopt/Manifest b/sci-libs/nlopt/Manifest
index 4c71308..7a23c3e 100644
--- a/sci-libs/nlopt/Manifest
+++ b/sci-libs/nlopt/Manifest
@@ -1,2 +1 @@
-DIST nlopt-2.2.4.tar.gz 2315878 SHA256 
a903125d6495df4861b2aea8b3ce9c6b881caaf36bf62db923335d96e3a60a20 SHA512 
595a6da7f305a15ba16e42d6a2b28540fe3201568284600e57a091f9836dc04f657fad370ee5f2f528ebdc7ffa1f0fc81c2929bd49dbb861ddf7fd901beec871
 WHIRLPOOL 
62f8d0bf1e6fd003b8e3bb5da94eef7f59b10406d249026903f27f6738f4bf3e7bc83a06e1494a39a31f676f07df6d30d546717b44b469b77980dda3fce3c6f8
 DIST nlopt-2.4.2.tar.gz 2361992 SHA256 
8099633de9d71cbc06cd435da993eb424bbcdbded8f803cdaa9fb8c6e09c8e89 SHA512 
136aacc00a69f77e8a7ce5dc26a5f3f027bc8c01b97aa1f43919462e0a412154eabfb01be258e082dffe61f9b554bb2bfbb550a7b82c7c77c7b22874a64a9703
 WHIRLPOOL 
ec07f402cc1868f05adf1f261aa2e50901448e965ccdee3d249e1447ad0abdff354caf1bafbf0700a25896f9fcee509c916fd5e7bdd768514a55bf6fff40784d

diff --git a/sci-libs/nlopt/files/nlopt-2.2.4-fix-nlopt_hpp-location.patch 
b/sci-libs/nlopt/files/nlopt-2.2.4-fix-nlopt_hpp-location.patch
deleted file mode 100644
index 460b437..
--- a/sci-libs/nlopt/files/nlopt-2.2.4-fix-nlopt_hpp-location.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-Author: Dustin Polke 
-
-Header files are located in top_srcdir not top_builddir.
 a/swig/Makefile.am
-+++ b/swig/Makefile.am
-@@ -3,7 +3,7 @@ EXTRA_DIST = $(SWIG_SRC) nlopt-guile.i n
- 
- BUILT_SOURCES = nlopt-guile.cpp nlopt-python.cpp nlopt-enum-renames.i 
nlopt.scm.in
- 
--HDR = $(top_builddir)/api/nlopt.hpp
-+HDR = $(top_srcdir)/api/nlopt.hpp
- 
- ##
- # Guile wrapper
-@@ -11,7 +11,7 @@ HDR = $(top_builddir)/api/nlopt.hpp
- libnlopt@NLOPT_SUFFIX@_guile_la_SOURCES = nlopt-guile.cpp
- libnlopt@NLOPT_SUFFIX@_guile_la_LIBADD = ../libnlopt@NLOPT_SUFFIX@.la
- libnlopt@NLOPT_SUFFIX@_guile_la_LDFLAGS = -version-info @SHARED_VERSION_INFO@
--libnlopt@NLOPT_SUFFIX@_guile_la_CPPFLAGS = $(GUILE_CPPFLAGS) 
-I$(top_builddir)/api
-+libnlopt@NLOPT_SUFFIX@_guile_la_CPPFLAGS = $(GUILE_CPPFLAGS) 
-I$(top_srcdir)/api
- 
- guiledir = $(GUILE_INSTALL_DIR)
- if WITH_GUILE
-@@ -25,7 +25,7 @@ endif
- _nlopt_la_SOURCES = nlopt-python.cpp
- _nlopt_la_LIBADD = ../libnlopt@NLOPT_SUFFIX@.la
- _nlopt_la_LDFLAGS = -module -version-info @SHARED_VERSION_INFO@
--_nlopt_la_CPPFLAGS = $(PYTHON_INCLUDES) -I$(top_builddir)/api
-+_nlopt_la_CPPFLAGS = $(PYTHON_INCLUDES) -I$(top_srcdir)/api
- 
- if WITH_PYTHON
- python_PYTHON = nlopt.py
-@@ -43,12 +43,12 @@ lib_LTLIBRARIES = $(guilelib)
- if MAINTAINER_MODE
- 
- nlopt-guile.cpp nlopt.scm.in: $(SWIG_SRC) nlopt-guile.i $(HDR)
--  swig -I$(top_builddir)/api -outdir $(builddir) -c++ -guile -scmstub -o 
$@ nlopt.i
-+  swig -I$(top_srcdir)/api -outdir $(builddir) -c++ -guile -scmstub -o $@ 
nlopt.i
-   rm -f nlopt.scm.in
-   mv nlopt.scm nlopt.scm.in
- 
- nlopt-python.cpp nlopt.py: $(SWIG_SRC) nlopt-python.i numpy.i $(HDR)
--  swig -I$(top_builddir)/api -outdir $(builddir) -c++ -python -o $@ 
nlopt.i
-+  swig -I$(top_srcdir)/api -outdir $(builddir) -c++ -python -o $@ nlopt.i
- 
- nlopt-enum-renames.i: $(top_srcdir)/api/nlopt.h
-   (echo "// AUTOMATICALLY GENERATED -- DO NOT EDIT"; egrep 
'NLOPT_[LG][DN]|NLOPT_AUGLAG|NLOPT_G_MLSL|NLOPT_NUM_ALGORITHMS' 
$(top_srcdir)/api/nlopt.h | sed 's/NLOPT_//g' |tr -d ' ' |tr '/' ',' |tr '=' 
',' |cut -d, -f1 |while read name; do echo "%rename(NLOPT_$$name) 
nlopt::$$name;"; done; egrep 'NLOPT_[A-Z_]* =' $(top_srcdir)/api/nlopt.h | 
egrep -v 'NLOPT_[LG][DN]|NLOPT_AUGLAG|NLOPT_G_MLSL' | sed 's/NLOPT_//g' |tr -d 
' ' |cut -d'=' -f1 | while read name; do echo "%rename(NLOPT_$$name) 
nlopt::$$name;"; done) > $@

diff --git a/sci-libs/nlopt/metadata.xml b/sci-libs/nlopt/metadata.xml
index 9a998be..35f0459 100644
--- a/sci-libs/nlopt/metadata.xml
+++ b/sci-libs/nlopt/metadata.xml
@@ -1,11 +1,11 @@
 
 http://www.gentoo.org/dtd/metadata.dtd";>
 
-
-  s...@gentoo.org
-  Gentoo Science Project
-
-
+  
+s...@gentoo.org
+Gentoo Science Project
+  
+  
   NLopt is a library for nonlinear optimization,
   providing a common interface for a number of different free

[gentoo-commits] repo/gentoo:master commit in: sci-libs/nlopt/

2016-12-20 Thread Tobias Klausmann 
commit: c9a84c7cf4e05cf4dd5931db3114da0fb48926a0
Author: Tobias Klausmann  gentoo  org>
AuthorDate: Tue Dec 20 16:51:22 2016 +
Commit: Tobias Klausmann  gentoo  org>
CommitDate: Tue Dec 20 16:52:18 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9a84c7c

sci-libs/nlopt-2.4.2-r1: stable on amd64

Gentoo-Bug: 593568

 sci-libs/nlopt/nlopt-2.4.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/nlopt/nlopt-2.4.2-r1.ebuild 
b/sci-libs/nlopt/nlopt-2.4.2-r1.ebuild
index 97662c0..f2e4af6 100644
--- a/sci-libs/nlopt/nlopt-2.4.2-r1.ebuild
+++ b/sci-libs/nlopt/nlopt-2.4.2-r1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="http://ab-initio.mit.edu/nlopt/";
 SRC_URI="${HOMEPAGE}/${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"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"

[gentoo-commits] repo/gentoo:master commit in: sci-libs/nlopt/files/, sci-libs/nlopt/

2016-01-16 Thread David Seifert 
commit: ba9ea4fa92d088aabd40f31a0c566f6f57f2c2a9
Author: David Seifert  gentoo  org>
AuthorDate: Sat Jan 16 14:50:35 2016 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Jan 16 14:51:37 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba9ea4fa

sci-libs/nlopt: Add patch for octave-4.0.0

Gentoo-Bug: 569996
In addition, add patch for underlinking and fix when
building with USE="-octave".

Package-Manager: portage-2.2.26

 .../nlopt-2.4.2-fix-dynamic-underlinking.patch |  62 
 .../nlopt/files/nlopt-2.4.2-octave-4-map.patch |  49 +
 sci-libs/nlopt/nlopt-2.4.2-r1.ebuild   | 112 +
 3 files changed, 223 insertions(+)

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
new file mode 100644
index 000..beb9dd4
--- /dev/null
+++ b/sci-libs/nlopt/files/nlopt-2.4.2-fix-dynamic-underlinking.patch
@@ -0,0 +1,62 @@
+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 ])
+-  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
new file mode 100644
index 000..c82d994
--- /dev/null
+++ b/sci-libs/nlopt/files/nlopt-2.4.2-octave-4-map.patch
@@ -0,0 +1,49 @@
+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.0 +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)) { f