Allow C and C++ libraries to be simultaneously installed

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

3 files changed, 131 insertions, 6 deletions

diff --git a/sci-libs/nlopt/ChangeLog b/sci-libs/nlopt/ChangeLog
index d1df8e65bb2c..7b0dfd2b5650 100644
--- a/sci-libs/nlopt/ChangeLog
+++ b/sci-libs/nlopt/ChangeLog
@@ -1,6 +1,11 @@
 # 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.19 2012/08/03 17:43:29 bicatali Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/nlopt/ChangeLog,v 1.20 2013/03/03 05:21:04 bicatali Exp $
+
+*nlopt-2.3-r2 (03 Mar 2013)
+
+  03 Mar 2013; Sébastien Fabbro <bicatali@gentoo.org> +nlopt-2.3-r2.ebuild:
+  Allow C and C++ libraries to be simultaneously installed
 
 *nlopt-2.3-r1 (03 Aug 2012)
 
diff --git a/sci-libs/nlopt/Manifest b/sci-libs/nlopt/Manifest
index 965c57157126..9d7c2fc5c46d 100644
--- a/sci-libs/nlopt/Manifest
+++ b/sci-libs/nlopt/Manifest
@@ -8,12 +8,13 @@ DIST nlopt-2.2.4.tar.gz 2315878 SHA256 a903125d6495df4861b2aea8b3ce9c6b881caaf36
 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
 EBUILD nlopt-2.3-r1.ebuild 2825 SHA256 9d552b96ff08386ec31a43082af0c1f69084b089428db1c328fe215553130766 SHA512 aa6630364c6a72faf52aedc76c1d545b4ba514cce4f5495e5e4a238ef7d6161aa298fc587f62c43f19e1a8eeb82aa5180791ae275efece8ff6dd9c3903170a10 WHIRLPOOL 0a28e78dd57c65df032b4fed76bd96b749dde64e4e294d497dc321418d04866cf7ce65578920200b87b44b3e4a343610389dfb5a1a50836511732f185d24ac29
-MISC ChangeLog 3096 SHA256 f70f202aea719df22904b8d477c310f0dd78c37164a4ab0022b4d488de514d83 SHA512 bcd82d2647f38cf743cebde7865106d87ae759da8dd8216033e29d3de37db92c8059829ba35949c843c98b802b5333b3cddacf8a22ff913070d54f7a4b10c5f3 WHIRLPOOL 20ce69e1e444573bffd37ab669c668e5393d669652440cced9e1639be39d5cee314cce11e424a68c0401df97a6de692e4664a36a39bdedec84b0fcb29ee074dd
+EBUILD nlopt-2.3-r2.ebuild 3099 SHA256 034ad990a7d5ba9a93af0bc8583de79434eb2ca937ac05787622e9f1490e5b63 SHA512 f6b8886b5cb690580242fe2c938e2b172aab97aa3c45f1853977b424521f602815316ef9b5d65874d5e2c4fcb2b71bc7ac7440d8fe8f8f79db2e63a56a532e13 WHIRLPOOL 835818ac36b76c92afda119ca03037df882b445053b01ab35d21f702cf14fd851efcacb5d018384ee6d3d26e3bcb54d3d262fe1bcf411b9ccebe96b61989fb65
+MISC ChangeLog 3262 SHA256 afc15057bceaa0a3992a5803e405dfd1f66cf7e0651d2d8041c6305b11485f11 SHA512 374cfb444fc61e7b7ab0a9f4289fdd93069728205734ba83e800c12977e18b8ea793308c152904449dd58cc8a5f47c905c10d63639568e954950310e0537275c WHIRLPOOL d2214204582993e86c06e19dcbfcaa9dea7ef8255f52455eb97e25cc7efcf0223bbc5569993e59b647b85fd710bafdc66a52a9ff4b01669e03c86442bbf424cb
 MISC metadata.xml 988 SHA256 51c2b0fef29d5bc6fcc6bf5c3009c0b028afb4d881dae521e3f6d22ce5427a2f SHA512 2394c51a0cd79ea5c592cfbe98c36f4a21f22418ccebf3b82ab4822c696666063d1136c9734482dcfc95ccf9c41834384dccd2efb1275fe9598abea3c317acff WHIRLPOOL 84b95cec143160ad8f0c755a7a80c67687c93fe161c00aed97d6fa0205318be2e8381feb290fbf0d7d9cf4542577b8ab3f148b509f723af84f7e3fc1f31397e2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlAcE+IACgkQ1ycZbhPLE2BRjACfTmdIkeHKoM9uSkioSwZ6JKtJ
-4E4An2o7q2hYkR/WXm48Hnfy7TUSetCA
-=evP1
+iEYEAREIAAYFAlEy3cQACgkQ1ycZbhPLE2CS/ACdHSFBhsVt/oUSQUl/JZEvIYhV
+c3IAn00a0FBwGtzZbjMKTWeJ4Z4Nl8Yh
+=IwmR
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/nlopt/nlopt-2.3-r2.ebuild b/sci-libs/nlopt/nlopt-2.3-r2.ebuild
new file mode 100644
index 000000000000..a2025cc13998
--- /dev/null
+++ b/sci-libs/nlopt/nlopt-2.3-r2.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/nlopt/nlopt-2.3-r2.ebuild,v 1.1 2013/03/03 05:21:04 bicatali Exp $
+
+EAPI=5
+
+SUPPORT_PYTHON_ABIS="1"
+PYTHON_DEPEND="python? *"
+RESTRICT_PYTHON_ABIS="3.* 2.7-pypy-* *-jython"
+AUTOTOOLS_AUTORECONF=1
+
+inherit  autotools-utils python
+
+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}"
+
+PATCHES=(
+		"${FILESDIR}"/${PN}-2.2.4-fix-nlopt_hpp-location.patch
+		"${FILESDIR}"/${PN}-2.3-pkgconfig.patch
+		"${FILESDIR}"/${PN}-2.3-as-needed.patch
+)
+
+src_prepare() {
+	autotools-utils_src_prepare
+	if use python; then
+		sed -i \
+			-e '/^LTLIBRARIES/s:$(pyexec_LTLIBRARIES)::g' \
+			swig/Makefile.in || die
+		echo '#!/bin/sh' > py-compile
+	fi
+	use python && python_src_prepare
+}
+
+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
+	local myeconfargs=(
+		$(use_with guile)
+		$(use_with octave)
+		$(use_with python)
+	)
+	autotools-utils_src_configure
+	if use cxx; then
+		myeconfargs+=( --with-cxx )
+		BUILD_DIR="${BUILD_DIR}_cxx" autotools-utils_src_configure
+	fi
+}
+
+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
+	use cxx && autotools-utils_src_compile -C "${BUILD_DIR}_cxx"
+}
+
+src_test() {
+	cd "${AUTOTOOLS_BUILD_DIR}"/test
+	local a f
+	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 && autotools-utils_src_install -C "${BUILD_DIR}_cxx"
+	autotools-utils_src_install
+	if use python; then
+		installation() {
+			cd "${AUTOTOOLS_BUILD_DIR}"
+			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
+}