Fixed directory location for swig generated pfiles, thanks Dustin Polke, bug #402513

Package-Manager: portage-2.1.10.41/cvs/Linux x86_64

4 files changed, 64 insertions, 13 deletions

diff --git a/sci-libs/nlopt/ChangeLog b/sci-libs/nlopt/ChangeLog
index ae76816955f6..54a78122a1e2 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.11 2012/02/07 13:53:02 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/nlopt/ChangeLog,v 1.12 2012/02/09 17:50:14 bicatali Exp $
+
+  09 Feb 2012; Sébastien Fabbro <bicatali@gentoo.org> nlopt-2.2.4.ebuild,
+  +files/nlopt-2.2.4-fix-nlopt_hpp-location.patch:
+  Fixed directory location for swig generated pfiles, thanks Dustin Polke, bug
+  #402513
 
   07 Feb 2012; Agostino Sarubbo <ago@gentoo.org> nlopt-2.2.4.ebuild:
   Stable for amd64, wrt bug #386953
diff --git a/sci-libs/nlopt/Manifest b/sci-libs/nlopt/Manifest
index 625492c1e24b..9866ad432052 100644
--- a/sci-libs/nlopt/Manifest
+++ b/sci-libs/nlopt/Manifest
@@ -1,18 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
+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 2138 RMD160 129606cb87b0a26401c5b85850078cdab542878f SHA1 b256ff5064633c3171a5937c2118f88d4389d749 SHA256 827c9866e178af8ff95917ee43ea9da7cbd76f985dd524dd8b8e6649f4eb754f
-MISC ChangeLog 1840 RMD160 aabc3c1e9ac1837abb26bc20975ba4caed34a664 SHA1 87cf799ae0b16619b6964433907d152f4f3fc254 SHA256 12fd92a1a89b0b941033cb1958019d4a81af002ecd7aa81ef6215b23559b7d49
+EBUILD nlopt-2.2.4.ebuild 2212 RMD160 1d07eaba29951e9e6109ed2e91a1ac85b37613c3 SHA1 3cf774a56416f72f73849ed198e1eaa354c524a7 SHA256 6b20922d3e1cb60b223382754ac3e47dd60e66fdae3df5cfd6f5930855e286d3
+MISC ChangeLog 2061 RMD160 c6423659562a0e1fef4942b589c7243ddd6778aa SHA1 3650f3c11870e694a2cee72e588e9242d47f8c3b SHA256 8418f3f1cc89d1e223742c17685337a847bc37b5958507859a74a273be66e360
 MISC metadata.xml 989 RMD160 6f55880019b7536e9d06ec148a89b1a78549739c SHA1 cf38e876466795bf3f1a346109735250deb110ce SHA256 bb292895a0e7ea7abba5a9588b702755fcd85918ea1c58b8ad71f9d4ddde52cc
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBCgAGBQJPMSzDAAoJEOTDgjZ80txdKJgH/0eYWhHetB61vbh92CyQWxV5
-6Bdgsmo7+McAF850Oiz5HNQymEWAfn0LV77XGRBvQnIfhe2PGfzAVXx6Ki8Gqvuy
-1FjXmksWcyQ0XQm94Bici60YsEhKSfcEca/NPiWlAc2w9q3Vyb1qBOXrErnYd+zE
-nyazuxRiiheGnVrYUI+pMTikQx/0cyzbCQ4KUSE1wOzl6MHG1YtxFY2Hj3acZyje
-Kc3ohD9HuW+9vKwVx/DhTZuKu2vxQNfpoWNzzyV71EPKeiJibdh+sEQszM3S4tBm
-M4tZy07TVqIMhoq/00d3KKpa6utHl/jgogT1kfKRCnBAgLWukngSdK8cJFJ2XH4=
-=k1aM
+iEYEARECAAYFAk80B2oACgkQ1ycZbhPLE2CXMACcC5d81RkD0U8RSCrsatbQYj+y
+cmsAnjT1QdGz49uT431j7xjRLtx8OiuK
+=8ZlK
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/nlopt/files/nlopt-2.2.4-fix-nlopt_hpp-location.patch b/sci-libs/nlopt/files/nlopt-2.2.4-fix-nlopt_hpp-location.patch
new file mode 100644
index 000000000000..460b4378673a
--- /dev/null
+++ b/sci-libs/nlopt/files/nlopt-2.2.4-fix-nlopt_hpp-location.patch
@@ -0,0 +1,47 @@
+Author: Dustin Polke <DuPol@gmx.de>
+
+Header files are located in top_srcdir not top_builddir.
+--- a/swig/Makefile.am
++++ b/swig/Makefile.am
+@@ -3,7 +3,7 @@ EXTRA_DIST = $(SWIG_SRC) nlopt-guile.i n
+ 
+ BUILT_SOURCES = nlopt-guile.cpp nlopt-python.cpp nlopt-enum-renames.i nlopt.scm.in
+ 
+-HDR = $(top_builddir)/api/nlopt.hpp
++HDR = $(top_srcdir)/api/nlopt.hpp
+ 
+ ##############################################################################
+ # Guile wrapper
+@@ -11,7 +11,7 @@ HDR = $(top_builddir)/api/nlopt.hpp
+ libnlopt@NLOPT_SUFFIX@_guile_la_SOURCES = nlopt-guile.cpp
+ libnlopt@NLOPT_SUFFIX@_guile_la_LIBADD = ../libnlopt@NLOPT_SUFFIX@.la
+ libnlopt@NLOPT_SUFFIX@_guile_la_LDFLAGS = -version-info @SHARED_VERSION_INFO@
+-libnlopt@NLOPT_SUFFIX@_guile_la_CPPFLAGS = $(GUILE_CPPFLAGS) -I$(top_builddir)/api
++libnlopt@NLOPT_SUFFIX@_guile_la_CPPFLAGS = $(GUILE_CPPFLAGS) -I$(top_srcdir)/api
+ 
+ guiledir = $(GUILE_INSTALL_DIR)
+ if WITH_GUILE
+@@ -25,7 +25,7 @@ endif
+ _nlopt_la_SOURCES = nlopt-python.cpp
+ _nlopt_la_LIBADD = ../libnlopt@NLOPT_SUFFIX@.la
+ _nlopt_la_LDFLAGS = -module -version-info @SHARED_VERSION_INFO@
+-_nlopt_la_CPPFLAGS = $(PYTHON_INCLUDES) -I$(top_builddir)/api
++_nlopt_la_CPPFLAGS = $(PYTHON_INCLUDES) -I$(top_srcdir)/api
+ 
+ if WITH_PYTHON
+ python_PYTHON = nlopt.py
+@@ -43,12 +43,12 @@ lib_LTLIBRARIES = $(guilelib)
+ if MAINTAINER_MODE
+ 
+ nlopt-guile.cpp nlopt.scm.in: $(SWIG_SRC) nlopt-guile.i $(HDR)
+-	swig -I$(top_builddir)/api -outdir $(builddir) -c++ -guile -scmstub -o $@ nlopt.i
++	swig -I$(top_srcdir)/api -outdir $(builddir) -c++ -guile -scmstub -o $@ nlopt.i
+ 	rm -f nlopt.scm.in
+ 	mv nlopt.scm nlopt.scm.in
+ 
+ nlopt-python.cpp nlopt.py: $(SWIG_SRC) nlopt-python.i numpy.i $(HDR)
+-	swig -I$(top_builddir)/api -outdir $(builddir) -c++ -python -o $@ nlopt.i
++	swig -I$(top_srcdir)/api -outdir $(builddir) -c++ -python -o $@ nlopt.i
+ 
+ nlopt-enum-renames.i: $(top_srcdir)/api/nlopt.h
+ 	(echo "// AUTOMATICALLY GENERATED -- DO NOT EDIT"; egrep 'NLOPT_[LG][DN]|NLOPT_AUGLAG|NLOPT_G_MLSL|NLOPT_NUM_ALGORITHMS' $(top_srcdir)/api/nlopt.h | sed 's/NLOPT_//g' |tr -d ' ' |tr '/' ',' |tr '=' ',' |cut -d, -f1 |while read name; do echo "%rename(NLOPT_$$name) nlopt::$$name;"; done; egrep 'NLOPT_[A-Z_]* =' $(top_srcdir)/api/nlopt.h | egrep -v 'NLOPT_[LG][DN]|NLOPT_AUGLAG|NLOPT_G_MLSL' | sed 's/NLOPT_//g' |tr -d ' ' |cut -d'=' -f1 | while read name; do echo "%rename(NLOPT_$$name) nlopt::$$name;"; done) > $@
diff --git a/sci-libs/nlopt/nlopt-2.2.4.ebuild b/sci-libs/nlopt/nlopt-2.2.4.ebuild
index 23f4a25882ee..fb92e425b87c 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.3 2012/02/07 13:53:02 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/nlopt/nlopt-2.2.4.ebuild,v 1.4 2012/02/09 17:50:14 bicatali Exp $
 
 EAPI=4
 
@@ -32,6 +32,8 @@ src_prepare() {
 			swig/Makefile.in || die
 		echo '#!/bin/sh' > py-compile
 	fi
+	epatch "${FILESDIR}"/${P}-fix-nlopt_hpp-location.patch
+	eautoreconf
 }
 
 src_configure() {