Version bump. Worked out some kind of multibuild for both C and C++ libraries

Package-Manager: portage-HEAD/cvs/Linux x86_64
Manifest-Sign-Key: 0x13CB1360

4 files changed, 126 insertions, 15 deletions

diff --git a/sci-libs/nlopt/ChangeLog b/sci-libs/nlopt/ChangeLog
index c9315edb51ef..363a7656784b 100644
--- a/sci-libs/nlopt/ChangeLog
+++ b/sci-libs/nlopt/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-libs/nlopt
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/nlopt/ChangeLog,v 1.22 2013/04/24 12:20:01 jlec Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/nlopt/ChangeLog,v 1.23 2014/06/09 04:12:12 bicatali Exp $
+
+*nlopt-2.4.2 (09 Jun 2014)
+
+  09 Jun 2014; Sébastien Fabbro <bicatali@gentoo.org> +nlopt-2.4.2.ebuild,
+  metadata.xml:
+  Version bump. Worked out some kind of multibuild for both C and C++ libraries
 
   24 Apr 2013; Justin Lecher <jlec@gentoo.org> nlopt-2.2.4.ebuild,
   nlopt-2.3-r1.ebuild, nlopt-2.3-r2.ebuild, metadata.xml:
diff --git a/sci-libs/nlopt/Manifest b/sci-libs/nlopt/Manifest
index f9b76fc992c9..3da322bd29a0 100644
--- a/sci-libs/nlopt/Manifest
+++ b/sci-libs/nlopt/Manifest
@@ -1,20 +1,22 @@
 -----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
 AUX nlopt-2.3-as-needed.patch 1062 SHA256 fdd21b03d1a667b0be4b1ce5b516d9c28ea2b5e116252f2f6fd2fbf0530395f2 SHA512 755e04b0e9d2ab5b1256c14015980b051716756777b910a9273a0dced4108e19a8f3030c1d03c6d96561a7edb3e883fdbc2822e1d6c1b74fa2794c336612cc47 WHIRLPOOL 88d7d978eafb5dc9c2de25e26e515d7ce1eed194da39f4b35f8c61c3588cfca49affc3d31ba0b0f7d25188a80310c8f45b9da3237f415df5a7a38f0e73abed4f
 AUX nlopt-2.3-pkgconfig.patch 318 SHA256 d7f9eb5f7912b4722e4f5514f27682ed3e20104076c2dc03d693aef449e4283a SHA512 923b20e177a842643b1022d68168978d5fb35e987c6781d8b0b368a6c707f4b42a4141c4ca7cf33cd7067a39147ae87220adeaaa545a8731bb6a5d2f3d11a5bc WHIRLPOOL 4f9fc1ee7800b48fec6c2f2d41dddee39ea371ea31e08f0b57faffe4bfffa370390d2d20e03bd96aec4e5c57d3a6d57897992557895d4be149fa83bc095cb6f8
 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
+DIST nlopt-2.4.2.tar.gz 2361992 SHA256 8099633de9d71cbc06cd435da993eb424bbcdbded8f803cdaa9fb8c6e09c8e89 SHA512 136aacc00a69f77e8a7ce5dc26a5f3f027bc8c01b97aa1f43919462e0a412154eabfb01be258e082dffe61f9b554bb2bfbb550a7b82c7c77c7b22874a64a9703 WHIRLPOOL ec07f402cc1868f05adf1f261aa2e50901448e965ccdee3d249e1447ad0abdff354caf1bafbf0700a25896f9fcee509c916fd5e7bdd768514a55bf6fff40784d
 EBUILD nlopt-2.2.4.ebuild 2478 SHA256 f3730f6ebc6c98f5f9f5b068b5340195644008d4be95fa36e708d0becf313132 SHA512 123c61c28d76e7055ec0e0f1b7bda5560ce9ac086c04a75e251dfef6dfa581553dfd657938bde923cd4e1de3ec82b02425db14bf8d6e66e52b0dc87047cc01d8 WHIRLPOOL 7240946a3aeb00e25775f07bd6ccab79ad2057aa416f278bf74f39d5404a0381f149deb932e04aa90eb504a29e41f4de3ef3bc4c5d80dc5aa44521ddbf2a0ab8
 EBUILD nlopt-2.3-r1.ebuild 2823 SHA256 7d708a737f77d5fd725f746016ffd214db6efbff8ab4efec2566c83985ae2b02 SHA512 265240fd82185ea1e9eed2da5e2459ffe09dfd1d4973fe6af7699353a68f1a291916af8de013b5fd9e1d942eb1e69a4e57a0d5eedc484fabcabce20d4d09f5a9 WHIRLPOOL a95b174d21f13410d3d97bab2f91b2981a22c3f5f63c817810b0eb3c443e7d56eb72f4af10e54e107fa0e7318d4d04eb26e4ebabf14df20d8c9be127a9e04196
 EBUILD nlopt-2.3-r2.ebuild 3307 SHA256 e55f9e7025a434e746addbaebe37bedee89036b25251145538db17e36e5c1b70 SHA512 5121b230a7c291fb56720653257a34635b0b3961134e132dfbb53189bb922eb6749427e458514044b1f0ae83545c8caa141245d11d8d414dd0f1a33cad4450c2 WHIRLPOOL 86dd8e98e7c4c6034b00538d48c01b1bc22672b58dc33a237b4acedb6072356583b7f51be80f4a9a236ef26665e931cf32968cb6399bdb740705955c6cee4d0d
-MISC ChangeLog 3559 SHA256 b93bb8ec5e45c675abd18c71730ad8d7988a7c0073635ace10f1decf289c7c19 SHA512 2704236df60bb5ec65e81938c8d81d71ecca4626acdd3153503be1a6bb5ed17fd6011859d367e5149523b49ad8bc264081997971bc8b6b1ef6c4a6dd6eebb70c WHIRLPOOL fb70121fe9911d5384095d67ca49c10f05d3280bd16466e67ad959cc3b928c66df524e23a6875cb24a1fa1905690c61e889e96b5272982352531d678125ea595
-MISC metadata.xml 998 SHA256 1acac883f89e9d64c3515f51881d7aabbcd7bc6d3391fd750768ed0330bea2b0 SHA512 9f89dba7ae499730355f188bb8d006f0467e5911a2778cad4a0d00690927b8efac11d0fc586a97132e319207cb4a901c199f6d45466d0b30e974efb72526143b WHIRLPOOL 8be43fe265c508374dbc30cb880e4c5ff776f64542e9e429f1d5a94a87211d9cc20d39715758f6192e7940a286473d360dcba2f4347f236ae38d21a9e4f01121
+EBUILD nlopt-2.4.2.ebuild 2495 SHA256 f73298b1f10a2c84e2ec0689d60ccd2d2f94e404c37fd8fa78b72abb38f0ff65 SHA512 13c11007f80763dbb0de0d10a2c7ed048e40e1655584300cca699801ba71549610f1dc7cf62c3ca05acfd387e742c24a91164d081b2807a422603e2a204ab8fe WHIRLPOOL 25e5658a7f97570ea2c09e5b51d2ecc3cf445de8747136f74b3b8f290d65854f3c33992d2c3c51b0038c41ef33971b26d50a368616b4f3779c337b69a17ed02e
+MISC ChangeLog 3764 SHA256 c8ead569e97ac76ec106575ae1a3b61ace562e99a57645fd9493944903479c36 SHA512 e1d5f57fb59fafb390a40bf330806a71a420b54487c9ae610a2abfffd7939605049030953072a116be0dd3b30af89c7e3c73a545c3e8c9dc75a00e73c8297c6c WHIRLPOOL 2890b7e8caf09bb7426a63aec0d6f3a23d0836c5369efa5c1fbe4ab723a0af2f291e30816c6a3c156393a57a164157d4476c21c0218045dca1648e9c53d24001
+MISC metadata.xml 984 SHA256 bb0ad90f2a093c097a7e06f7b6397ac6942e25c9fdc5327e159f595c18757c3d SHA512 fa4f3b3770a5bf160b41ed411928dc6964a3571f58e71fa0c685d8206e067e360a37d119c9edf0ff830e122b19e1ce1d15e55c972ea118839568d04d770f9654 WHIRLPOOL bb7bb69f508dfab6ab65bda6c7df44e6e17dbabf42e53828a56ccf43e926cfc3d7651e3ab955484faedbf2ad2767bef2b0d0aa41581b1c042af03b0f9ef29fef
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREKAAYFAlF3zfIACgkQgAnW8HDreRbRLwCePGE08xSVAmVVy692K+irSZlI
-YEIAoIofc1Bp8qhLhsbdl8UD03Q0yLoI
-=FBaX
+iEYEAREIAAYFAlOVNCAACgkQ1ycZbhPLE2DfugCgrDpByi5QgHOuyFsdzu1ySm2w
+nJ8AoJTbpnz9k+jwMxosjMVEVMZI2mH4
+=/4c6
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/nlopt/metadata.xml b/sci-libs/nlopt/metadata.xml
index 4b343041281b..41afd070ac46 100644
--- a/sci-libs/nlopt/metadata.xml
+++ b/sci-libs/nlopt/metadata.xml
@@ -1,13 +1,13 @@
 <?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
   implementations of various other algorithms. Its features include:
-    * Callable from variety of languages (C, C++, Fortran, Python, Octave,...)
+    * 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.
@@ -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.4.2.ebuild b/sci-libs/nlopt/nlopt-2.4.2.ebuild
new file mode 100644
index 000000000000..b8e6e74b462b
--- /dev/null
+++ b/sci-libs/nlopt/nlopt-2.4.2.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/nlopt/nlopt-2.4.2.ebuild,v 1.1 2014/06/09 04:12:12 bicatali Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7} )
+AUTOTOOLS_AUTORECONF=1
+
+inherit python-r1 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"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+DEPEND="
+	guile? ( dev-scheme/guile )
+	octave? ( sci-mathematics/octave )
+	python? ( dev-python/numpy[${PYTHON_USEDEP}] )"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.3-pkgconfig.patch
+	"${FILESDIR}"/${PN}-2.3-as-needed.patch
+)
+
+src_prepare() {
+	autotools-utils_src_prepare
+	use cxx && BUILD_CXX="${S}_cxx"
+	use python && python_copy_sources
+}
+
+src_configure() {
+	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
+	local myeconfargs=(
+		$(use_with guile)
+	)
+	if use python; then
+		python_foreach_impl run_in_build_dir autotools-utils_src_configure
+	else
+		autotools-utils_src_configure
+	fi
+	if use cxx; then
+		myeconfargs+=( --with-cxx --without-octave --without-python )
+		BUILD_DIR="${BUILD_CXX}" autotools-utils_src_configure
+	fi
+}
+
+src_compile() {
+	if use python; then
+		python_foreach_impl run_in_build_dir autotools-utils_src_compile
+	else
+		autotools-utils_src_compile
+	fi
+	use cxx && BUILD_DIR="${BUILD_CXX}" autotools-utils_src_compile
+	#-C "${BUILD_DIR}_cxx"
+}
+
+src_test() {
+	do_test() {
+		local a f
+		cd "${BUILD_DIR}"/test
+		for a in {1..7}; do
+			for f in {5..9}; do
+				./testopt -a $a -o $f || die "algorithm $a function $f failed"
+			done
+		done
+	}
+	if use python; then
+		python_foreach_impl run_in_build_dir do_test
+	else
+		do_test
+	fi
+	cd "${BUILD_CXX}"/test
+	for a in {1..9}; do
+		for f in {5..9}; do
+			./testopt -a $a -o $f || die "algorithm $a function $f failed"
+		done
+	done
+}
+
+src_install() {
+	# build cxx first so the c lib overwrites the pc file
+	use cxx && BUILD_DIR="${BUILD_CXX}" autotools-utils_src_install
+	if use python; then
+		python_foreach_impl run_in_build_dir autotools-utils_src_install
+	else
+		autotools-utils_src_install
+	fi
+	local r
+	for r in */README; do newdoc ${r} README.$(dirname ${r}); done
+}