summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastien Fabbro <bicatali@gentoo.org>2010-08-10 22:04:02 +0000
committerSebastien Fabbro <bicatali@gentoo.org>2010-08-10 22:04:02 +0000
commitaa0c9dec6453523c55325412f555d384ab9f8846 (patch)
tree8c91108472f4ad5721049fac8f4d908344321e23 /sci-libs
parentStable on amd64 wrt bug #331717 (diff)
downloadhistorical-aa0c9dec6453523c55325412f555d384ab9f8846.tar.gz
historical-aa0c9dec6453523c55325412f555d384ab9f8846.tar.bz2
historical-aa0c9dec6453523c55325412f555d384ab9f8846.zip
Fixed for guile and multiple python, bug #331347
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
Diffstat (limited to 'sci-libs')
-rw-r--r--sci-libs/nlopt/ChangeLog5
-rw-r--r--sci-libs/nlopt/Manifest10
-rw-r--r--sci-libs/nlopt/nlopt-2.2.ebuild7
3 files changed, 12 insertions, 10 deletions
diff --git a/sci-libs/nlopt/ChangeLog b/sci-libs/nlopt/ChangeLog
index d615dd291a0d..9ca6f11c471e 100644
--- a/sci-libs/nlopt/ChangeLog
+++ b/sci-libs/nlopt/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for sci-libs/nlopt
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/nlopt/ChangeLog,v 1.4 2010/07/20 19:43:50 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/nlopt/ChangeLog,v 1.5 2010/08/10 22:04:02 bicatali Exp $
+
+ 10 Aug 2010; SĂ©bastien Fabbro <bicatali@gentoo.org> nlopt-2.2.ebuild:
+ Fixed for guile and multiple python, bug #331347
*nlopt-2.2 (20 Jul 2010)
diff --git a/sci-libs/nlopt/Manifest b/sci-libs/nlopt/Manifest
index a0195b622396..a7e531f123a3 100644
--- a/sci-libs/nlopt/Manifest
+++ b/sci-libs/nlopt/Manifest
@@ -4,13 +4,13 @@ Hash: SHA1
DIST nlopt-1.2.tar.gz 2143629 RMD160 1e8373cf4630c10f4c0a23b5d0f91e6e1d545ab2 SHA1 8cf141172b88f53365c3cac7ff0c1a753555b36a SHA256 5e5143abcb5334d1c67a41794a554a9105117c42c13832abf6c21c88e7351944
DIST nlopt-2.2.tar.gz 2306197 RMD160 4442db99416926cdc3641157bb017a5f487f00a2 SHA1 6681d63b1c53feeb1c90d2c45f38184cfc55528c SHA256 e04ad51d287fdb7e5546d660ce6bf811aa7d00a23b1a2d3559dab00bcba09e58
EBUILD nlopt-1.2.ebuild 958 RMD160 a4be9b64bb1d93fc1fba7111962e83ced9bc4e1d SHA1 b3644f5f04d594b9e66fa196a70b6e5a3293bea3 SHA256 8e55e0930e792f72aa3fb84822bab2061c1ef0fc029f1ae2f74071b1082f1647
-EBUILD nlopt-2.2.ebuild 2159 RMD160 1bb4db651ce043c603a17dcfe3337383f4ef27d0 SHA1 6cea7a479714766d21ecb23469c53d064383d434 SHA256 9d9db496f287c311d55381a944fe0f8a3135e9349eff3d38b844d5dafe3b2abc
-MISC ChangeLog 957 RMD160 1948c026ae1840102c670f1a584b0fca5af96e61 SHA1 ba6f681fb5c58d61541a69c6b074631c6b5a50fd SHA256 b05e17c78422b83c07243806c0194cd47ad33c5e032f8e30496d1bbb743f551a
+EBUILD nlopt-2.2.ebuild 2156 RMD160 65d4ec372b982b2eb5a160e33cc705ddfbf90017 SHA1 11a48bdaaf17ef7864f2ad86bd924229cbbcc734 SHA256 7c5b6e6eff2c21be1c216ff6852934d7c35858a7c1eeed7ebd2b64eacfd95584
+MISC ChangeLog 1082 RMD160 85f1afb4a64556e4943c64eafd73c37d16342ea2 SHA1 4358ca76c93fb4a2862ec2229acc051900e6adfd SHA256 5316d9fdda52b5b56bb813fae7318667395066f3e38764e891f57f6a9df772e1
MISC metadata.xml 989 RMD160 6f55880019b7536e9d06ec148a89b1a78549739c SHA1 cf38e876466795bf3f1a346109735250deb110ce SHA256 bb292895a0e7ea7abba5a9588b702755fcd85918ea1c58b8ad71f9d4ddde52cc
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.16 (GNU/Linux)
-iEYEARECAAYFAkxF//EACgkQ1ycZbhPLE2DxBACgs3c6+pjlQO4/A0O7dwj2e0aj
-VgAAoK2RgXX4MAIQS7+s7PbZydWvjujZ
-=5hUR
+iEYEARECAAYFAkxh2IIACgkQ1ycZbhPLE2BaiQCdE5eMEfbIH4r4w6BbRDQ6T/kk
+DO0AoJLyX27EmFSNHf9lzYGqMEP/xudy
+=bQw/
-----END PGP SIGNATURE-----
diff --git a/sci-libs/nlopt/nlopt-2.2.ebuild b/sci-libs/nlopt/nlopt-2.2.ebuild
index 9e30bd7e6f6c..d4fc6a6caab3 100644
--- a/sci-libs/nlopt/nlopt-2.2.ebuild
+++ b/sci-libs/nlopt/nlopt-2.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/nlopt/nlopt-2.2.ebuild,v 1.2 2010/07/20 19:58:31 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/nlopt/nlopt-2.2.ebuild,v 1.3 2010/08/10 22:04:01 bicatali Exp $
EAPI=3
SUPPORT_PYTHON_ABIS="1"
@@ -45,20 +45,19 @@ src_configure() {
$(use_with guile) \
$(use_with octave) \
$(use_with python)
+ use python && python_copy_sources swig
}
src_compile() {
default
if use python; then
- python_copy_sources swig
compilation() {
emake \
PYTHON_CPPFLAGS="-I$(python_get_includedir)" \
PYTHON_LDFLAGS="$(python_get_library -l)" \
PYTHON_SITE_PKG="$(python_get_sitedir)" \
PYTHON_VERSION="$(python_get_version)" \
- pyexecdir="$(python_get_sitedir)" \
- _nlopt.la
+ pyexecdir="$(python_get_sitedir)"
}
python_execute_function -s --source-dir swig compilation
fi