sci-libs/nlopt: Fix deprecated macro usage, #466988

Package-Manager: portage-2.2.0_alpha173/cvs/Linux x86_64
Manifest-Sign-Key: 0x8009D6F070EB7916

6 files changed, 30 insertions, 23 deletions

diff --git a/sci-libs/nlopt/ChangeLog b/sci-libs/nlopt/ChangeLog
index c7743941bedc..c9315edb51ef 100644
--- a/sci-libs/nlopt/ChangeLog
+++ b/sci-libs/nlopt/ChangeLog
@@ -1,6 +1,10 @@
 # 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.21 2013/03/04 17:19:40 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/nlopt/ChangeLog,v 1.22 2013/04/24 12:20:01 jlec Exp $
+
+  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:
+  Fix deprecated macro usage, #466988
 
   04 Mar 2013; Sébastien Fabbro <bicatali@gentoo.org> nlopt-2.3-r2.ebuild:
   Remove pure C++ tests when testing C library, bug #460284
diff --git a/sci-libs/nlopt/Manifest b/sci-libs/nlopt/Manifest
index 1cc33f481c97..f9b76fc992c9 100644
--- a/sci-libs/nlopt/Manifest
+++ b/sci-libs/nlopt/Manifest
@@ -1,20 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 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
-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
-EBUILD nlopt-2.3-r2.ebuild 3229 SHA256 6087515426358cff815301cb0398707be7b73b40e520d0ec26ff7a3fd494ab07 SHA512 d2b209adee229ad8ee690320efbb455cbe3e1f1a65021d9a1470d1f027ca1bbf0063f8d67399587afbfd7d09b0cf40d928038df2673d3237c50a6ba2dd81c460 WHIRLPOOL 78e0ee5a44efc1bf413c509586981ef4a980f2debe360b3243752be6a6d4ea1f001a705afa31b700ddb87ecc3f859fa5489e000502622ce14b4bf610b5f07763
-MISC ChangeLog 3399 SHA256 8cfc4900c844aa838f198fc1b6672971192839756c542b68abedcf4c8ba995d0 SHA512 7315edb1399bba54fc3b0828fe933ed20e5e4a1707bd87412915c1195b6ff05b18656ac27834fa450c8bc10dfeadcf8bb10a14329c8c28d3fbeb1317640c5552 WHIRLPOOL 532cbfe67f0f13e33d7ad65804e2b8f73ef4901fc0e9b90a9f9fe0fd1696669dbdea61bda0539b4737fe4a05bab20e0e4ab78f8f06a73ae23af2cbf75d2bc675
-MISC metadata.xml 988 SHA256 51c2b0fef29d5bc6fcc6bf5c3009c0b028afb4d881dae521e3f6d22ce5427a2f SHA512 2394c51a0cd79ea5c592cfbe98c36f4a21f22418ccebf3b82ab4822c696666063d1136c9734482dcfc95ccf9c41834384dccd2efb1275fe9598abea3c317acff WHIRLPOOL 84b95cec143160ad8f0c755a7a80c67687c93fe161c00aed97d6fa0205318be2e8381feb290fbf0d7d9cf4542577b8ab3f148b509f723af84f7e3fc1f31397e2
+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
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlE017AACgkQ1ycZbhPLE2DuMACgingruxiSFCfbt/KpxoPTsDc3
-mDMAn0c73tUXq7SB0uf32vd+qBVdesou
-=GlEc
+iEYEAREKAAYFAlF3zfIACgkQgAnW8HDreRbRLwCePGE08xSVAmVVy692K+irSZlI
+YEIAoIofc1Bp8qhLhsbdl8UD03Q0yLoI
+=FBaX
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/nlopt/metadata.xml b/sci-libs/nlopt/metadata.xml
index 55d520d4b3ca..4b343041281b 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.2.4.ebuild b/sci-libs/nlopt/nlopt-2.2.4.ebuild
index 65e3b9664c71..77ad380b37db 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
+# 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.2.4.ebuild,v 1.9 2012/07/09 17:14:28 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/nlopt/nlopt-2.2.4.ebuild,v 1.10 2013/04/24 12:20:01 jlec Exp $
 
 EAPI=4
 
@@ -78,7 +78,7 @@ src_install() {
 	if use python; then
 		installation() {
 			rm *.la
-			emake DESTDIR=${D} install \
+			emake DESTDIR="${D}" install \
 				pyexecdir="${EPREFIX}$(python_get_sitedir)" \
 				pythondir="${EPREFIX}$(python_get_sitedir)"
 		}
diff --git a/sci-libs/nlopt/nlopt-2.3-r1.ebuild b/sci-libs/nlopt/nlopt-2.3-r1.ebuild
index 1ec445c23993..ce82d7573474 100644
--- a/sci-libs/nlopt/nlopt-2.3-r1.ebuild
+++ b/sci-libs/nlopt/nlopt-2.3-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# 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-r1.ebuild,v 1.1 2012/08/03 17:43:29 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/nlopt/nlopt-2.3-r1.ebuild,v 1.2 2013/04/24 12:20:01 jlec Exp $
 
 EAPI=4
 
@@ -93,7 +93,7 @@ src_install() {
 		installation() {
 			cd "${AUTOTOOLS_BUILD_DIR}"
 			rm *.la
-			emake DESTDIR=${D} install \
+			emake DESTDIR="${D}" install \
 				pyexecdir="${EPREFIX}$(python_get_sitedir)" \
 				pythondir="${EPREFIX}$(python_get_sitedir)"
 		}
diff --git a/sci-libs/nlopt/nlopt-2.3-r2.ebuild b/sci-libs/nlopt/nlopt-2.3-r2.ebuild
index b7017e205366..97e787eb298c 100644
--- a/sci-libs/nlopt/nlopt-2.3-r2.ebuild
+++ b/sci-libs/nlopt/nlopt-2.3-r2.ebuild
@@ -1,6 +1,6 @@
 # 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.2 2013/03/04 17:19:40 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/nlopt/nlopt-2.3-r2.ebuild,v 1.3 2013/04/24 12:20:01 jlec Exp $
 
 EAPI=5
 
@@ -33,6 +33,9 @@ PATCHES=(
 )
 
 src_prepare() {
+	sed \
+		-e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:g' \
+		-i configure.ac || die
 	autotools-utils_src_prepare
 	if use python; then
 		sed -i \
@@ -106,7 +109,7 @@ src_install() {
 		installation() {
 			cd "${AUTOTOOLS_BUILD_DIR}"
 			rm *.la
-			emake DESTDIR=${D} install \
+			emake DESTDIR="${D}" install \
 				pyexecdir="${EPREFIX}$(python_get_sitedir)" \
 				pythondir="${EPREFIX}$(python_get_sitedir)"
 		}