| 1 |
commit: 3ae1284d2cb37473e1256b5d0cfde0c08444bed0 |
| 2 |
Author: Justin Lecher <jlec <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jan 2 22:01:07 2017 +0000 |
| 4 |
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jan 2 22:09:08 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ae1284d |
| 7 |
|
| 8 |
sci-libs/nlopt: Drop old |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
| 11 |
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org> |
| 12 |
|
| 13 |
sci-libs/nlopt/Manifest | 1 - |
| 14 |
.../files/nlopt-2.2.4-fix-nlopt_hpp-location.patch | 47 ---------- |
| 15 |
sci-libs/nlopt/metadata.xml | 16 ++-- |
| 16 |
sci-libs/nlopt/nlopt-2.2.4.ebuild | 98 -------------------- |
| 17 |
sci-libs/nlopt/nlopt-2.4.2.ebuild | 103 --------------------- |
| 18 |
5 files changed, 8 insertions(+), 257 deletions(-) |
| 19 |
|
| 20 |
diff --git a/sci-libs/nlopt/Manifest b/sci-libs/nlopt/Manifest |
| 21 |
index 4c71308..7a23c3e 100644 |
| 22 |
--- a/sci-libs/nlopt/Manifest |
| 23 |
+++ b/sci-libs/nlopt/Manifest |
| 24 |
@@ -1,2 +1 @@ |
| 25 |
-DIST nlopt-2.2.4.tar.gz 2315878 SHA256 a903125d6495df4861b2aea8b3ce9c6b881caaf36bf62db923335d96e3a60a20 SHA512 595a6da7f305a15ba16e42d6a2b28540fe3201568284600e57a091f9836dc04f657fad370ee5f2f528ebdc7ffa1f0fc81c2929bd49dbb861ddf7fd901beec871 WHIRLPOOL 62f8d0bf1e6fd003b8e3bb5da94eef7f59b10406d249026903f27f6738f4bf3e7bc83a06e1494a39a31f676f07df6d30d546717b44b469b77980dda3fce3c6f8 |
| 26 |
DIST nlopt-2.4.2.tar.gz 2361992 SHA256 8099633de9d71cbc06cd435da993eb424bbcdbded8f803cdaa9fb8c6e09c8e89 SHA512 136aacc00a69f77e8a7ce5dc26a5f3f027bc8c01b97aa1f43919462e0a412154eabfb01be258e082dffe61f9b554bb2bfbb550a7b82c7c77c7b22874a64a9703 WHIRLPOOL ec07f402cc1868f05adf1f261aa2e50901448e965ccdee3d249e1447ad0abdff354caf1bafbf0700a25896f9fcee509c916fd5e7bdd768514a55bf6fff40784d |
| 27 |
|
| 28 |
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 |
| 29 |
deleted file mode 100644 |
| 30 |
index 460b437..00000000 |
| 31 |
--- a/sci-libs/nlopt/files/nlopt-2.2.4-fix-nlopt_hpp-location.patch |
| 32 |
+++ /dev/null |
| 33 |
@@ -1,47 +0,0 @@ |
| 34 |
-Author: Dustin Polke <DuPol@×××.de> |
| 35 |
- |
| 36 |
-Header files are located in top_srcdir not top_builddir. |
| 37 |
---- a/swig/Makefile.am |
| 38 |
-+++ b/swig/Makefile.am |
| 39 |
-@@ -3,7 +3,7 @@ EXTRA_DIST = $(SWIG_SRC) nlopt-guile.i n |
| 40 |
- |
| 41 |
- BUILT_SOURCES = nlopt-guile.cpp nlopt-python.cpp nlopt-enum-renames.i nlopt.scm.in |
| 42 |
- |
| 43 |
--HDR = $(top_builddir)/api/nlopt.hpp |
| 44 |
-+HDR = $(top_srcdir)/api/nlopt.hpp |
| 45 |
- |
| 46 |
- ############################################################################## |
| 47 |
- # Guile wrapper |
| 48 |
-@@ -11,7 +11,7 @@ HDR = $(top_builddir)/api/nlopt.hpp |
| 49 |
- libnlopt@NLOPT_SUFFIX@_guile_la_SOURCES = nlopt-guile.cpp |
| 50 |
- libnlopt@NLOPT_SUFFIX@_guile_la_LIBADD = ../libnlopt@NLOPT_SUFFIX@.la |
| 51 |
- libnlopt@NLOPT_SUFFIX@_guile_la_LDFLAGS = -version-info @SHARED_VERSION_INFO@ |
| 52 |
--libnlopt@NLOPT_SUFFIX@_guile_la_CPPFLAGS = $(GUILE_CPPFLAGS) -I$(top_builddir)/api |
| 53 |
-+libnlopt@NLOPT_SUFFIX@_guile_la_CPPFLAGS = $(GUILE_CPPFLAGS) -I$(top_srcdir)/api |
| 54 |
- |
| 55 |
- guiledir = $(GUILE_INSTALL_DIR) |
| 56 |
- if WITH_GUILE |
| 57 |
-@@ -25,7 +25,7 @@ endif |
| 58 |
- _nlopt_la_SOURCES = nlopt-python.cpp |
| 59 |
- _nlopt_la_LIBADD = ../libnlopt@NLOPT_SUFFIX@.la |
| 60 |
- _nlopt_la_LDFLAGS = -module -version-info @SHARED_VERSION_INFO@ |
| 61 |
--_nlopt_la_CPPFLAGS = $(PYTHON_INCLUDES) -I$(top_builddir)/api |
| 62 |
-+_nlopt_la_CPPFLAGS = $(PYTHON_INCLUDES) -I$(top_srcdir)/api |
| 63 |
- |
| 64 |
- if WITH_PYTHON |
| 65 |
- python_PYTHON = nlopt.py |
| 66 |
-@@ -43,12 +43,12 @@ lib_LTLIBRARIES = $(guilelib) |
| 67 |
- if MAINTAINER_MODE |
| 68 |
- |
| 69 |
- nlopt-guile.cpp nlopt.scm.in: $(SWIG_SRC) nlopt-guile.i $(HDR) |
| 70 |
-- swig -I$(top_builddir)/api -outdir $(builddir) -c++ -guile -scmstub -o $@ nlopt.i |
| 71 |
-+ swig -I$(top_srcdir)/api -outdir $(builddir) -c++ -guile -scmstub -o $@ nlopt.i |
| 72 |
- rm -f nlopt.scm.in |
| 73 |
- mv nlopt.scm nlopt.scm.in |
| 74 |
- |
| 75 |
- nlopt-python.cpp nlopt.py: $(SWIG_SRC) nlopt-python.i numpy.i $(HDR) |
| 76 |
-- swig -I$(top_builddir)/api -outdir $(builddir) -c++ -python -o $@ nlopt.i |
| 77 |
-+ swig -I$(top_srcdir)/api -outdir $(builddir) -c++ -python -o $@ nlopt.i |
| 78 |
- |
| 79 |
- nlopt-enum-renames.i: $(top_srcdir)/api/nlopt.h |
| 80 |
- (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) > $@ |
| 81 |
|
| 82 |
diff --git a/sci-libs/nlopt/metadata.xml b/sci-libs/nlopt/metadata.xml |
| 83 |
index 9a998be..35f0459 100644 |
| 84 |
--- a/sci-libs/nlopt/metadata.xml |
| 85 |
+++ b/sci-libs/nlopt/metadata.xml |
| 86 |
@@ -1,11 +1,11 @@ |
| 87 |
<?xml version="1.0" encoding="UTF-8"?> |
| 88 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
| 89 |
<pkgmetadata> |
| 90 |
-<maintainer type="project"> |
| 91 |
- <email>sci@g.o</email> |
| 92 |
- <name>Gentoo Science Project</name> |
| 93 |
-</maintainer> |
| 94 |
-<longdescription lang="en"> |
| 95 |
+ <maintainer type="project"> |
| 96 |
+ <email>sci@g.o</email> |
| 97 |
+ <name>Gentoo Science Project</name> |
| 98 |
+ </maintainer> |
| 99 |
+ <longdescription lang="en"> |
| 100 |
NLopt is a library for nonlinear optimization, |
| 101 |
providing a common interface for a number of different free |
| 102 |
optimization routines available online as well as original |
| 103 |
@@ -18,7 +18,7 @@ |
| 104 |
* Algorithms for unconstrained optimization, bound-constrained |
| 105 |
optimization, and general nonlinear inequality constraints. |
| 106 |
</longdescription> |
| 107 |
-<use> |
| 108 |
- <flag name="octave">Add plugin for <pkg>sci-mathematics/octave</pkg></flag> |
| 109 |
-</use> |
| 110 |
+ <use> |
| 111 |
+ <flag name="octave">Add plugin for <pkg>sci-mathematics/octave</pkg></flag> |
| 112 |
+ </use> |
| 113 |
</pkgmetadata> |
| 114 |
|
| 115 |
diff --git a/sci-libs/nlopt/nlopt-2.2.4.ebuild b/sci-libs/nlopt/nlopt-2.2.4.ebuild |
| 116 |
deleted file mode 100644 |
| 117 |
index b3c8cf6..00000000 |
| 118 |
--- a/sci-libs/nlopt/nlopt-2.2.4.ebuild |
| 119 |
+++ /dev/null |
| 120 |
@@ -1,98 +0,0 @@ |
| 121 |
-# Copyright 1999-2013 Gentoo Foundation |
| 122 |
-# Distributed under the terms of the GNU General Public License v2 |
| 123 |
-# $Id$ |
| 124 |
- |
| 125 |
-EAPI=4 |
| 126 |
- |
| 127 |
-SUPPORT_PYTHON_ABIS="1" |
| 128 |
-PYTHON_DEPEND="python? *" |
| 129 |
-RESTRICT_PYTHON_ABIS="3.* 2.7-pypy-* *-jython" |
| 130 |
- |
| 131 |
-inherit python autotools-utils |
| 132 |
- |
| 133 |
-DESCRIPTION="Non-linear optimization library" |
| 134 |
-HOMEPAGE="http://ab-initio.mit.edu/nlopt/" |
| 135 |
-SRC_URI="${HOMEPAGE}/${P}.tar.gz" |
| 136 |
- |
| 137 |
-LICENSE="LGPL-2.1 MIT" |
| 138 |
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux" |
| 139 |
-SLOT="0" |
| 140 |
-IUSE="cxx guile octave python static-libs" |
| 141 |
- |
| 142 |
-DEPEND=" |
| 143 |
- guile? ( dev-scheme/guile ) |
| 144 |
- octave? ( sci-mathematics/octave ) |
| 145 |
- python? ( dev-python/numpy )" |
| 146 |
-RDEPEND="${DEPEND}" |
| 147 |
- |
| 148 |
-AUTOTOOLS_IN_SOURCE_BUILD=1 |
| 149 |
- |
| 150 |
-src_prepare() { |
| 151 |
- if use python; then |
| 152 |
- sed -i \ |
| 153 |
- -e '/^LTLIBRARIES/s:$(pyexec_LTLIBRARIES)::g' \ |
| 154 |
- swig/Makefile.in || die |
| 155 |
- echo '#!/bin/sh' > py-compile |
| 156 |
- fi |
| 157 |
- epatch "${FILESDIR}"/${P}-fix-nlopt_hpp-location.patch |
| 158 |
- eautoreconf |
| 159 |
-} |
| 160 |
- |
| 161 |
-src_configure() { |
| 162 |
- if use octave; then |
| 163 |
- export OCT_INSTALL_DIR="${EPREFIX}"/usr/libexec/octave/site/oct/${CHOST} |
| 164 |
- export M_INSTALL_DIR="${EPREFIX}"/usr/share/octave/site/m |
| 165 |
- else |
| 166 |
- export MKOCTFILE=None |
| 167 |
- fi |
| 168 |
- myeconfargs+=( |
| 169 |
- $(use_with cxx) |
| 170 |
- $(use_with guile) |
| 171 |
- $(use_with octave) |
| 172 |
- $(use_with python) |
| 173 |
- --without-matlab |
| 174 |
- ) |
| 175 |
- autotools-utils_src_configure |
| 176 |
-} |
| 177 |
- |
| 178 |
-src_compile() { |
| 179 |
- autotools-utils_src_compile |
| 180 |
- if use python; then |
| 181 |
- python_copy_sources swig |
| 182 |
- compilation() { |
| 183 |
- autotools-utils_src_compile \ |
| 184 |
- PYTHON_CPPFLAGS="-I${EPREFIX}$(python_get_includedir)" \ |
| 185 |
- PYTHON_LDFLAGS="${EPREFIX}$(python_get_library -l)" \ |
| 186 |
- PYTHON_SITE_PKG="${EPREFIX}$(python_get_sitedir)" \ |
| 187 |
- PYTHON_VERSION="${EPREFIX}$(python_get_version)" \ |
| 188 |
- PYTHON_INCLUDES="${EPREFIX}$(python_get_includedir)" \ |
| 189 |
- pythondir="${EPREFIX}$(python_get_sitedir)" \ |
| 190 |
- pyexecdir="${EPREFIX}$(python_get_sitedir)" |
| 191 |
- } |
| 192 |
- python_execute_function -s --source-dir swig compilation |
| 193 |
- fi |
| 194 |
-} |
| 195 |
- |
| 196 |
-src_install() { |
| 197 |
- autotools-utils_src_install |
| 198 |
- if use python; then |
| 199 |
- installation() { |
| 200 |
- rm *.la |
| 201 |
- emake DESTDIR="${D}" install \ |
| 202 |
- pyexecdir="${EPREFIX}$(python_get_sitedir)" \ |
| 203 |
- pythondir="${EPREFIX}$(python_get_sitedir)" |
| 204 |
- } |
| 205 |
- python_execute_function -s --source-dir swig installation |
| 206 |
- python_clean_installation_image |
| 207 |
- fi |
| 208 |
- local r |
| 209 |
- for r in */README; do newdoc ${r} README.$(dirname ${r}); done |
| 210 |
-} |
| 211 |
- |
| 212 |
-pkg_postinst() { |
| 213 |
- use python && python_mod_optimize ${PN}.py |
| 214 |
-} |
| 215 |
- |
| 216 |
-pkg_postrm() { |
| 217 |
- use python && python_mod_cleanup ${PN}.py |
| 218 |
-} |
| 219 |
|
| 220 |
diff --git a/sci-libs/nlopt/nlopt-2.4.2.ebuild b/sci-libs/nlopt/nlopt-2.4.2.ebuild |
| 221 |
deleted file mode 100644 |
| 222 |
index 66137d5..00000000 |
| 223 |
--- a/sci-libs/nlopt/nlopt-2.4.2.ebuild |
| 224 |
+++ /dev/null |
| 225 |
@@ -1,103 +0,0 @@ |
| 226 |
-# Copyright 1999-2016 Gentoo Foundation |
| 227 |
-# Distributed under the terms of the GNU General Public License v2 |
| 228 |
-# $Id$ |
| 229 |
- |
| 230 |
-EAPI=5 |
| 231 |
- |
| 232 |
-PYTHON_COMPAT=( python2_7 ) |
| 233 |
-AUTOTOOLS_AUTORECONF=1 |
| 234 |
- |
| 235 |
-inherit python-r1 autotools-utils |
| 236 |
- |
| 237 |
-DESCRIPTION="Non-linear optimization library" |
| 238 |
-HOMEPAGE="http://ab-initio.mit.edu/nlopt/" |
| 239 |
-SRC_URI="${HOMEPAGE}/${P}.tar.gz" |
| 240 |
- |
| 241 |
-LICENSE="LGPL-2.1 MIT" |
| 242 |
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
| 243 |
-SLOT="0" |
| 244 |
-IUSE="cxx guile octave python static-libs" |
| 245 |
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
| 246 |
-DEPEND=" |
| 247 |
- guile? ( dev-scheme/guile:* ) |
| 248 |
- octave? ( sci-mathematics/octave ) |
| 249 |
- python? ( dev-python/numpy[${PYTHON_USEDEP}] )" |
| 250 |
-RDEPEND="${DEPEND}" |
| 251 |
- |
| 252 |
-PATCHES=( |
| 253 |
- "${FILESDIR}"/${PN}-2.3-pkgconfig.patch |
| 254 |
- "${FILESDIR}"/${PN}-2.3-as-needed.patch |
| 255 |
-) |
| 256 |
- |
| 257 |
-src_prepare() { |
| 258 |
- autotools-utils_src_prepare |
| 259 |
- use cxx && BUILD_CXX="${S}_cxx" |
| 260 |
- use python && python_copy_sources |
| 261 |
-} |
| 262 |
- |
| 263 |
-src_configure() { |
| 264 |
- if use octave; then |
| 265 |
- export OCT_INSTALL_DIR="$(octave-config -p LOCALOCTFILEDIR)" |
| 266 |
- export M_INSTALL_DIR="$(octave-config -p LOCALFCNFILEDIR)" |
| 267 |
- |
| 268 |
- else |
| 269 |
- export MKOCTFILE=None |
| 270 |
- fi |
| 271 |
- local myeconfargs=( |
| 272 |
- $(use_with guile) |
| 273 |
- ) |
| 274 |
- if use python; then |
| 275 |
- python_foreach_impl run_in_build_dir autotools-utils_src_configure |
| 276 |
- else |
| 277 |
- autotools-utils_src_configure |
| 278 |
- fi |
| 279 |
- if use cxx; then |
| 280 |
- myeconfargs+=( --with-cxx --without-octave --without-python ) |
| 281 |
- BUILD_DIR="${BUILD_CXX}" autotools-utils_src_configure |
| 282 |
- fi |
| 283 |
-} |
| 284 |
- |
| 285 |
-src_compile() { |
| 286 |
- if use python; then |
| 287 |
- python_foreach_impl run_in_build_dir autotools-utils_src_compile |
| 288 |
- else |
| 289 |
- autotools-utils_src_compile |
| 290 |
- fi |
| 291 |
- use cxx && BUILD_DIR="${BUILD_CXX}" autotools-utils_src_compile |
| 292 |
- #-C "${BUILD_DIR}_cxx" |
| 293 |
-} |
| 294 |
- |
| 295 |
-src_test() { |
| 296 |
- do_test() { |
| 297 |
- local a f |
| 298 |
- cd "${BUILD_DIR}"/test |
| 299 |
- for a in {1..7}; do |
| 300 |
- for f in {5..9}; do |
| 301 |
- ./testopt -a $a -o $f || die "algorithm $a function $f failed" |
| 302 |
- done |
| 303 |
- done |
| 304 |
- } |
| 305 |
- if use python; then |
| 306 |
- python_foreach_impl run_in_build_dir do_test |
| 307 |
- else |
| 308 |
- do_test |
| 309 |
- fi |
| 310 |
- cd "${BUILD_CXX}"/test |
| 311 |
- for a in {1..9}; do |
| 312 |
- for f in {5..9}; do |
| 313 |
- ./testopt -a $a -o $f || die "algorithm $a function $f failed" |
| 314 |
- done |
| 315 |
- done |
| 316 |
-} |
| 317 |
- |
| 318 |
-src_install() { |
| 319 |
- # build cxx first so the c lib overwrites the pc file |
| 320 |
- use cxx && BUILD_DIR="${BUILD_CXX}" autotools-utils_src_install |
| 321 |
- if use python; then |
| 322 |
- python_foreach_impl run_in_build_dir autotools-utils_src_install |
| 323 |
- else |
| 324 |
- autotools-utils_src_install |
| 325 |
- fi |
| 326 |
- local r |
| 327 |
- for r in */README; do newdoc ${r} README.$(dirname ${r}); done |
| 328 |
-} |
Archives