diff options
| author |   Justin Lecher <jlec@gentoo.org> | 2012-04-04 08:07:04 +0000 |
|---|---|---|
| committer | Justin Lecher <jlec@gentoo.org> | 2012-04-04 08:07:04 +0000 |
| commit | 7d2c36f8981c13dc2c4931b94b0fc2157e5589f0 (patch) | |
| tree | afc2359edf49bdcaac0a8d65b1276fb5e8b8e0c8 /sci-libs/nlopt | |
| parent | marked x86 per bug 404689 (diff) | |
| download | historical-7d2c36f8981c13dc2c4931b94b0fc2157e5589f0.tar.gz historical-7d2c36f8981c13dc2c4931b94b0fc2157e5589f0.tar.bz2 historical-7d2c36f8981c13dc2c4931b94b0fc2157e5589f0.zip | |
sci-libs/nlopt: Correct handling of PYABI things, #405255
Package-Manager: portage-2.2.0_alpha99/cvs/Linux x86_64
Diffstat (limited to 'sci-libs/nlopt')
| -rw-r--r-- | sci-libs/nlopt/ChangeLog | 5 | ||||
| -rw-r--r-- | sci-libs/nlopt/Manifest | 10 | ||||
| -rw-r--r-- | sci-libs/nlopt/nlopt-2.2.4.ebuild | 11 |
3 files changed, 17 insertions, 9 deletions
diff --git a/sci-libs/nlopt/ChangeLog b/sci-libs/nlopt/ChangeLog index aef013591678..6bd846e9db6e 100644 --- a/sci-libs/nlopt/ChangeLog +++ b/sci-libs/nlopt/ChangeLog @@ -1,6 +1,9 @@ # 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.15 2012/04/01 05:25:43 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/nlopt/ChangeLog,v 1.16 2012/04/04 08:07:04 jlec Exp $ + + 04 Apr 2012; Justin Lecher <jlec@gentoo.org> nlopt-2.2.4.ebuild: + Correct handling of PYABI things, #405255 01 Apr 2012; Justin Lecher <jlec@gentoo.org> nlopt-2.2.4.ebuild, metadata.xml: diff --git a/sci-libs/nlopt/Manifest b/sci-libs/nlopt/Manifest index 82f1752d57e8..daaf4a17db6e 100644 --- a/sci-libs/nlopt/Manifest +++ b/sci-libs/nlopt/Manifest @@ -3,13 +3,13 @@ Hash: SHA512 AUX nlopt-2.2.4-fix-nlopt_hpp-location.patch 2420 RMD160 07dc14581bd55a5604c1d190ad75288b1a2cf384 SHA1 5418e4b0bec7bc97d2e4fc8d7af0e62964b00125 SHA256 5ea28e5f3817ad02f279f0307542d26c988c37f1395e64b911cdc787054ca14a DIST nlopt-2.2.4.tar.gz 2315878 RMD160 e3573ea28c2b572fc060a2c985729fb1e6e42bfe SHA1 a97fcffb0c3aaf57aab5aadb9487e99b09dbee54 SHA256 a903125d6495df4861b2aea8b3ce9c6b881caaf36bf62db923335d96e3a60a20 -EBUILD nlopt-2.2.4.ebuild 2246 RMD160 c5a9facabd71aee1c43506ba9e2c3ca9523fd8fd SHA1 42aa2667042d62fd321496e887d6715fe5c0a74c SHA256 d8908ff49ca79e521e6cf3e959a3c6d0185667831253a1b62f60850e6f905c1e -MISC ChangeLog 2401 RMD160 048ca91e62b0fc233fe0043294353d266cbbaa7c SHA1 809feb06806d7bde4568cc69a393127de732b742 SHA256 46d1f23f207d66d1df915b595daeafaf36cf7383693cf201a56cdab577620ab7 +EBUILD nlopt-2.2.4.ebuild 2361 RMD160 7fbd25149fcd1ecaac022a38b11cae9aff6da381 SHA1 30d431343c03f7ec8613edd323c5b522dfc93fbc SHA256 eee502172f91d711fd7f6cc20b2e3d782da4eed0f5a1599fb4db9c9fab448b6c +MISC ChangeLog 2513 RMD160 56caf50e27ac23b5bf1b4fbddd77485d7a50d755 SHA1 d84de0d90e0ae405082f976a9ce08f4cc54877ba SHA256 e12e3566a4cec6375032acc3c652b316e1fa424b336a686f9d1e39869141eba2 MISC metadata.xml 992 RMD160 54c2f4a85f0d4da490fa71604a372c3fead3b38a SHA1 9cc7c53cee85046cdfa7918b39b2eed1f86a1e8d SHA256 3c56212846ab6ffcb6520bdc9d701a0dc3eab63a5b0b7663a1becb023dabebed -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iEYEAREKAAYFAk935t0ACgkQgAnW8HDreRbvmgCgyUrxr4LaAVGHCFm0/wmeTBjm -kuwAnA9Zl55WulEuxCfskF+BQ+ErfrmB -=lC3V +iEYEAREKAAYFAk98AS0ACgkQgAnW8HDreRY2cwCgjktLkZ5tymKYr3ugXuv/B9V8 +QzkAnicxjEgVwqExLjeiVmd+xQ3/1BKW +=HCrO -----END PGP SIGNATURE----- diff --git a/sci-libs/nlopt/nlopt-2.2.4.ebuild b/sci-libs/nlopt/nlopt-2.2.4.ebuild index 7486d171915b..7a89ca74130c 100644 --- a/sci-libs/nlopt/nlopt-2.2.4.ebuild +++ b/sci-libs/nlopt/nlopt-2.2.4.ebuild @@ -1,6 +1,6 @@ # 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.2.4.ebuild,v 1.7 2012/04/01 05:25:43 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/nlopt/nlopt-2.2.4.ebuild,v 1.8 2012/04/04 08:07:04 jlec Exp $ EAPI=4 @@ -25,6 +25,8 @@ DEPEND=" python? ( dev-python/numpy )" RDEPEND="${DEPEND}" +AUTOTOOLS_IN_SOURCE_BUILD=1 + src_prepare() { if use python; then sed -i \ @@ -50,19 +52,21 @@ src_configure() { $(use_with python) --without-matlab ) - use python && python_copy_sources swig 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$(python_get_includedir)" \ PYTHON_LDFLAGS="$(python_get_library -l)" \ PYTHON_SITE_PKG="$(python_get_sitedir)" \ PYTHON_VERSION="$(python_get_version)" \ + PYTHON_INCLUDES="$(python_get_includedir)" \ + pythondir="$(python_get_sitedir)" \ pyexecdir="$(python_get_sitedir)" } python_execute_function -s --source-dir swig compilation @@ -73,7 +77,8 @@ src_install() { autotools-utils_src_install if use python; then installation() { - autotools-utils_src_install \ + rm *.la + emake DESTDIR=${D} install \ pyexecdir="$(python_get_sitedir)" \ pythondir="$(python_get_sitedir)" } |