Version bump

Package-Manager: portage-2.2.0_alpha120/cvs/Linux x86_64

4 files changed, 118 insertions, 13 deletions

diff --git a/sci-libs/nlopt/ChangeLog b/sci-libs/nlopt/ChangeLog
index df5217035616..cafb4218ea69 100644
--- a/sci-libs/nlopt/ChangeLog
+++ b/sci-libs/nlopt/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-libs/nlopt
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/nlopt/ChangeLog,v 1.17 2012/07/09 17:14:28 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/nlopt/ChangeLog,v 1.18 2012/08/03 00:00:28 bicatali Exp $
+
+*nlopt-2.3 (03 Aug 2012)
+
+  03 Aug 2012; Sébastien Fabbro <bicatali@gentoo.org> +nlopt-2.3.ebuild,
+  metadata.xml:
+  Version bump
 
   09 Jul 2012; Sébastien Fabbro <bicatali@gentoo.org> nlopt-2.2.4.ebuild:
   keyword amd64-linux and x86-linux
@@ -73,4 +79,3 @@
   10 Jul 2009; Sébastien Fabbro <bicatali@gentoo.org> +nlopt-1.0.1.ebuild,
   +files/nlopt-1.0.1-qsort.patch, +metadata.xml:
   Initial import
-
diff --git a/sci-libs/nlopt/Manifest b/sci-libs/nlopt/Manifest
index 76a1bd831f66..6c8f3c3c5e61 100644
--- a/sci-libs/nlopt/Manifest
+++ b/sci-libs/nlopt/Manifest
@@ -1,15 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX nlopt-2.2.4-fix-nlopt_hpp-location.patch 2420 SHA256 5ea28e5f3817ad02f279f0307542d26c988c37f1395e64b911cdc787054ca14a SHA512 0e37a023d7b19011a12b4370b0fb957dc74b2e424c17c21711380819f36f1c5ec69d68c87db78421a1521a3e78b917afb89118d600b886dfa9cb5ca666b808d1 WHIRLPOOL d3241c6620590d38363f633243a1fe04eb30c37a9141c8372627581c4708e5a22c559e25eae989988b9f955ddc2b1b1e8bdb6aa436a7ecb226c304b9f0960d9f
 DIST nlopt-2.2.4.tar.gz 2315878 SHA256 a903125d6495df4861b2aea8b3ce9c6b881caaf36bf62db923335d96e3a60a20 SHA512 595a6da7f305a15ba16e42d6a2b28540fe3201568284600e57a091f9836dc04f657fad370ee5f2f528ebdc7ffa1f0fc81c2929bd49dbb861ddf7fd901beec871 WHIRLPOOL 62f8d0bf1e6fd003b8e3bb5da94eef7f59b10406d249026903f27f6738f4bf3e7bc83a06e1494a39a31f676f07df6d30d546717b44b469b77980dda3fce3c6f8
+DIST nlopt-2.3.tar.gz 2353879 SHA256 e69ac787a7c49931570cb167a23f993b2f17ab05df1de2d2391ffbeb9f6482c7 SHA512 bb6ee24619098f952d1c89884024fb92ca01306d62a3bca07494bf0a82db2b0eb3805afb87a6c3394fc5969a49218983824cc8f6d85d74f7f8ebae389e4bdc49 WHIRLPOOL 13a35905beb261b8d89512b5c802a1b9a8b40e17e688eec85bc7491d3322b268d912e9e61761d57385dee89ff6fcda544ded961fc03f6b2e6dbb6e1c6d4fc8e4
 EBUILD nlopt-2.2.4.ebuild 2479 SHA256 1a281c304c341d835cbfb6305cb8adaa5af6a207b1557b2cab3a5f6121e591a4 SHA512 9ba883cee218d57fe7a674eb77c1f52abed45a84de0f687e07d8f56e4553243a0085299f0cbe45b87169a520f674a2ffa99cb071a07a806a8ad61d8f388c46f4 WHIRLPOOL 0ced2ff20365dc0e40674e43d14b0577b18d4ca08a26bb4c519f827b9c673a52bf994e964b10235ec53f900078f7990bace0495c710bb46c12487efbd040aae9
-MISC ChangeLog 2629 SHA256 a9fd893a7b51d47eb6c8a0193876d99696a80e054f00145754a454c30d12959c SHA512 3dd4763cf9867a66e342c1c983ab8931a3eeac4c4e92d36e6cfef798241e372731bc98eea8c62f3a247cbc0033f26f2e973a23216634f3790032ffe8c533843e WHIRLPOOL 3b8029540163cea2b06665823c11525392951916de903a2e26d8f3444434920313a0046da6f29da18bd3d06793c70e2411e2ec9f1dc7763bfc0bbd88d52798a5
-MISC metadata.xml 992 SHA256 3c56212846ab6ffcb6520bdc9d701a0dc3eab63a5b0b7663a1becb023dabebed SHA512 b531586e754726c016d41911b7dc3e755182055ecf27bd663eb73f0d093db4a3e5d3677925d027e8aed41437d1a1a0ffce564e61f7d0bdd9eadf1cfdebbf933e WHIRLPOOL cadb84b3dfc5fb1e2a93debe6d57c9de82a502fcbb2331f87ed1234e0fbb035543492af2dcb46988953307bc1aceb756b8afefb3d922d8d0b29df991a6bdd1ed
+EBUILD nlopt-2.3.ebuild 2486 SHA256 c8bc8603b4895b9f29dc561549595bffa63bc97d8094e625b5a2332a305cdda1 SHA512 e4bf93e30317a7b8a84240b507a8a4149319f48e62ae103f8f267e20f61df21353cf8422141514fb73690d2b799308bb2db8ba87eb15810d8d55208496330a26 WHIRLPOOL 1ff0ca975e74ac0052b4c29c5b0b83ab24d01dcf930da0a13924afe0a6b0e50ce7149eca63071297b84b673b58ccabe0ea6fad28388c19827038602580eb0c62
+MISC ChangeLog 2760 SHA256 cacc303bd05d1c0b59365ca53aaa925a75d9f77dbcdd075975db48a84f0bc605 SHA512 4e00ee68272555cab5f250db2240269951f54dcfe572d63f4570bde415c9f6c0557b1ae239bb1a0567a078827e207f0b429b8fad55accfc8018128abe7ca99f2 WHIRLPOOL 17819fbbbf6e7bc949bec2c7d0f65c50f1358c68af9ee00b4d30586ce0bc56ac0655dbe5da17a15532483ab4c96c122ccf261b05efc6903c750aeed49f87bf32
+MISC metadata.xml 988 SHA256 51c2b0fef29d5bc6fcc6bf5c3009c0b028afb4d881dae521e3f6d22ce5427a2f SHA512 2394c51a0cd79ea5c592cfbe98c36f4a21f22418ccebf3b82ab4822c696666063d1136c9734482dcfc95ccf9c41834384dccd2efb1275fe9598abea3c317acff WHIRLPOOL 84b95cec143160ad8f0c755a7a80c67687c93fe161c00aed97d6fa0205318be2e8381feb290fbf0d7d9cf4542577b8ab3f148b509f723af84f7e3fc1f31397e2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREKAAYFAk/7EXoACgkQ1ycZbhPLE2BABACgnWd4MwL5uzxX7do7YvcBvs2a
-eR4An0xoZW5BvJnDLSMaYn9jAcrvl3iA
-=L+Kr
+iEYEAREIAAYFAlAbFKUACgkQ1ycZbhPLE2B2bgCfaWqXEuM3+rnh1uxk/Ry4emcY
+RLsAoJKGaA3ORKouW9ro0xoJThq2qYjO
+=cBXG
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/nlopt/metadata.xml b/sci-libs/nlopt/metadata.xml
index 76e5a4b28cea..55d520d4b3ca 100644
--- a/sci-libs/nlopt/metadata.xml
+++ b/sci-libs/nlopt/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci</herd>
-	<longdescription lang="en">
+<herd>sci</herd>
+<longdescription lang="en">
   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
@@ -15,7 +15,7 @@
     * Algorithms for unconstrained optimization, bound-constrained
     optimization, and general nonlinear inequality constraints.
 </longdescription>
-	<use>
-		<flag name="octave">Add plugin for <pkg>sci-mathematics/octave</pkg></flag>
-	</use>
+<use>
+  <flag name="octave">Add plugin for <pkg>sci-mathematics/octave</pkg></flag>
+</use>
 </pkgmetadata>
diff --git a/sci-libs/nlopt/nlopt-2.3.ebuild b/sci-libs/nlopt/nlopt-2.3.ebuild
new file mode 100644
index 000000000000..e9c556820309
--- /dev/null
+++ b/sci-libs/nlopt/nlopt-2.3.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/nlopt/nlopt-2.3.ebuild,v 1.1 2012/08/03 00:00:28 bicatali Exp $
+
+EAPI=4
+
+SUPPORT_PYTHON_ABIS="1"
+PYTHON_DEPEND="python? *"
+RESTRICT_PYTHON_ABIS="3.* 2.7-pypy-* *-jython"
+
+inherit python autotools-utils
+
+DESCRIPTION="Non-linear optimization library"
+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"
+SLOT="0"
+IUSE="cxx guile octave python static-libs"
+
+DEPEND="
+	guile? ( dev-scheme/guile )
+	octave? ( sci-mathematics/octave )
+	python? ( dev-python/numpy )"
+RDEPEND="${DEPEND}"
+
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
+src_prepare() {
+	if use python; then
+		sed -i \
+			-e '/^LTLIBRARIES/s:$(pyexec_LTLIBRARIES)::g' \
+			swig/Makefile.in || die
+		echo '#!/bin/sh' > py-compile
+	fi
+	epatch "${FILESDIR}"/${PN}-2.2.4-fix-nlopt_hpp-location.patch
+	eautoreconf
+}
+
+src_configure() {
+	if use octave; then
+		export OCT_INSTALL_DIR="${EPREFIX}"/usr/libexec/octave/site/oct/${CHOST}
+		export M_INSTALL_DIR="${EPREFIX}"/usr/share/octave/site/m
+	else
+		export MKOCTFILE=None
+	fi
+	myeconfargs+=(
+		$(use_with cxx)
+		$(use_with guile)
+		$(use_with octave)
+		$(use_with python)
+		--without-matlab
+	)
+	autotools-utils_src_configure
+}
+
+src_compile() {
+	autotools-utils_src_compile
+	if use python; then
+		python_copy_sources swig
+		compilation() {
+			autotools-utils_src_compile \
+				PYTHON_CPPFLAGS="-I${EPREFIX}$(python_get_includedir)" \
+				PYTHON_LDFLAGS="${EPREFIX}$(python_get_library -l)" \
+				PYTHON_SITE_PKG="${EPREFIX}$(python_get_sitedir)" \
+				PYTHON_VERSION="${EPREFIX}$(python_get_version)" \
+				PYTHON_INCLUDES="${EPREFIX}$(python_get_includedir)" \
+				pythondir="${EPREFIX}$(python_get_sitedir)" \
+				pyexecdir="${EPREFIX}$(python_get_sitedir)"
+		}
+		python_execute_function -s --source-dir swig compilation
+	fi
+}
+
+src_install() {
+	autotools-utils_src_install
+	if use python; then
+		installation() {
+			rm *.la
+			emake DESTDIR=${D} install \
+				pyexecdir="${EPREFIX}$(python_get_sitedir)" \
+				pythondir="${EPREFIX}$(python_get_sitedir)"
+		}
+		python_execute_function -s --source-dir swig installation
+		python_clean_installation_image
+	fi
+	local r
+	for r in */README; do newdoc ${r} README.$(dirname ${r}); done
+}
+
+pkg_postinst() {
+	use python && python_mod_optimize ${PN}.py
+}
+
+pkg_postrm() {
+	use python && python_mod_cleanup ${PN}.py
+}