Add patch to fix building with boost 1.50, mixing one fix from upstream and one upstreamed. Thanks Enrico for finding the fix. Closes bug #425460.

Package-Manager: portage-2.2.0_alpha116/cvs/Linux x86_64

4 files changed, 83 insertions, 12 deletions

diff --git a/dev-util/gource/ChangeLog b/dev-util/gource/ChangeLog
index fe4ff8af591e..afda6c9a376a 100644
--- a/dev-util/gource/ChangeLog
+++ b/dev-util/gource/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/gource
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/gource/ChangeLog,v 1.21 2012/07/09 09:39:10 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/gource/ChangeLog,v 1.22 2012/07/10 09:56:31 flameeyes Exp $
+
+  10 Jul 2012; Diego E. Pettenò <flameeyes@gentoo.org>
+  +files/gource-0.38+boost-1.50.patch, gource-0.38.ebuild:
+  Add patch to fix building with boost 1.50, mixing one fix from upstream and
+  one upstreamed. Thanks Enrico for finding the fix. Closes bug #425460.
 
   09 Jul 2012; Diego E. Pettenò <flameeyes@gentoo.org> metadata.xml:
   Reorder metadata to help auto-filing.
diff --git a/dev-util/gource/Manifest b/dev-util/gource/Manifest
index c41d42fd9fff..ca4ae2399914 100644
--- a/dev-util/gource/Manifest
+++ b/dev-util/gource/Manifest
@@ -1,18 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX gource-0.38+boost-1.50.patch 4225 SHA256 7994b994bcd0846e70b345579f3aeb9c68ed5ad1f31fc3d4a8310ffb8e0b9aca SHA512 53dca26c9fdb3af9cc9e7ff0de69dcd5c0e39617bff02c23fb67a33d3e17f7d853d616610fc1c8b0e2be8d3c374ed0d2501fbf7ea02765da5d2c41b3a7368bb0 WHIRLPOOL 585f2e13a6e2bae958285f1ecd46453bcd0b922c1cab796898e96fd5e914f4b0a33b4754c2c9d00d960cd00270d87a03cd74377a458d766f7d9cc2b9fab2a035
 DIST gource-0.38.tar.gz 850811 SHA256 9b250a70c1fbe9383a22673931bbc4ff43d669da5d6c1e18b5b3329ad2154505 SHA512 d59aa62be9bda04c9baed07813915cf8d712472485114d223e78060bab952073065faf26e5f9a14ef08a7166f20343dba8525694349f21cdbf35a502d9872b45 WHIRLPOOL f801505cf6b0e076c6cca04ba79d4fe1a0a2a039cd10ca6eee0d67ec0ca7c33d731b38f3244f71103a6772f3f782edfd973c98f3209fa91b0a08554c6058b9b8
-EBUILD gource-0.38.ebuild 1514 SHA256 9bd63943f546cf10d54cd7fdc54bce76af0b5b38d142a4dec0357f18aed57305 SHA512 4170c2046e9a6078d86b5d0caa971091c963071e70997c0cc29bbb83cf1fa89ff2753e7f7e57d0070807ec3f5b132af9f4a7530d4437af17eceab00269ccf14a WHIRLPOOL 5b1017c6b3a633f093e8c4880bc607bf0cb3cebf37b73b97d807f2e0ca6464cc9762f48507eced77f6768179864dcf752b3ecf138af17a4455e55c18bdcd9d57
-MISC ChangeLog 4061 SHA256 6f76f9a8754296d2df8f9bcd6f20731263288e47068a38a9bbc1878ba86011c7 SHA512 00ed73a5e6d732f5d170fcf5f6b01a551fb1b93766b67af7166a7966073eca3825072f01a16e544c5ae16686f6f00ccc14e992ed05c2fd866b619832e3c1696e WHIRLPOOL c016a748d9362876b783cae5b8a81a19d5e58522a1d18182bab5b7e6017f4234083b18bf6802b040b9bc877308bde804ce77c58a09f5247186f93271bbd6b0f1
+EBUILD gource-0.38.ebuild 1565 SHA256 49980a91b0ebd8db183b141d5fe854ccb7fe72c590f30e372c5aa48c16920c92 SHA512 933bd595cabc8eb75fe7cb85bc817eed6cc549f17fe5a2799a0e8ff76bd2e2114fde547a52103cf71eea431c036bc43e84b49b129e88809d7e93d5863c889494 WHIRLPOOL fdc78c2ecbd67bf20de834a5b2c838172ba28246e25389b0315e1a599085545a5ce94b60803d2ffd10b15c131fbd023c0007900b170d319630275eaa4f8b034a
+MISC ChangeLog 4328 SHA256 981f5e92705d174dac276b0c82202705cf5d7a7fa50bd7d9714524fc0e1ee91a SHA512 cfc7e610191760481214fb83323aec5eca09ce5f6675decbfb00dda0663ad4f02e201aeda448fff2df00a8f27cbc61b0dc8c29046f26f0ca04879513a92f0b9f WHIRLPOOL be579d8f7f2c2d8fe9f45bd0de3d519a62a906a5126d7dd8ed53839a5e1b8454acc5f039cd3240a4dd5c282924ab8c621d2d5571d11e7ba83316d6d9f56a757b
 MISC metadata.xml 440 SHA256 8beddbce025a7ea08f19052ab137cbb0283235e4e6a4fcdc0e4958d31c463e0f SHA512 72be48846a4dcd9d7abc985892e3b5960f00e22413bf9f0467ac7960723c4520d1f8a9f7437ad58e784fc9823206c5948f257cde62d78e788e193dd7bf3f8744 WHIRLPOOL a8556824a7babab1f923c97dbf4855fef5a5b958006bb5310227f2b9108a2ed180094d91862bab6a9075c0d05a7c8b0e4f7f5f4d73478a32c9de1f4dadb0fe46
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJP+qbIAAoJEBzRPIrUMBNCyQ4H/RirIZjnd/5XT+XRJQk86Z74
-KwSKZ7hGyAmkAF4J2dlyOlYmESc3oSQcTpAT3IPu9Wn04LZqyIXuCPWWM7tVtIPV
-v/JvWo0TGSn8lSxY99b2U9e8Xl+wEMlLJaESWYkPaCWXB8BiBw0NNm6MnpjLu4xQ
-1iDanp0dReLxCm/KZkq10TNu4PGVOrLXNuCjJatW2E4LoQewubZkU5CvoGUhkCrQ
-T1NttQOrbNu/n/jE0ITxyO6anCrJIEgw6VlIQ5yqzzUvvsZW7+BXg9I59YLtbf2z
-A7qluL3xOMVZ9sFnYhQ7ixs8UZhT6xsNuidThy3lpRsjVHrglIYpgeJSANe1AoM=
-=mMPj
+iQEcBAEBAgAGBQJP+/xcAAoJEBzRPIrUMBNCUsUH/3vNGDOA7oPi/JKgTnDhPmO4
+AC/P6KOMDt52i/35iNl2FfZEAsJMqL/QUrHsmYJe/LK2a7CkEETDTCtu5DNsBOKp
+omYM8B8MbGbFm0g0nGaqHjZFcoMm4WeSbpF78mA7bz0jO8imA2Fq15WGdqMF3FEE
+XuGD2pcBB2eC2D7cLTP4tNADa5mU4f8wNjA6rdXSru7wjBT8rM70Ah+5bZIocQV9
+2v58DXtPH31Rwg2ZjmtAsQsVn1PW+S2/eUxTav37JBhPrEh+7/2Q6/tWVcl8xwX1
+bAY5x0cSUE1K9KiQixGixDB0SRC7D1cb4Nd7DayQSWM9xJsHOxsprW+QsQgtH70=
+=EcsI
 -----END PGP SIGNATURE-----
diff --git a/dev-util/gource/files/gource-0.38+boost-1.50.patch b/dev-util/gource/files/gource-0.38+boost-1.50.patch
new file mode 100644
index 000000000000..994ea1e5f9da
--- /dev/null
+++ b/dev-util/gource/files/gource-0.38+boost-1.50.patch
@@ -0,0 +1,64 @@
+diff --git a/m4/m4_ax_boost_filesystem.m4 b/m4/ax_boost_filesystem.m4
+index 18df8f4..aebcbf7 100644
+--- a/m4/m4_ax_boost_filesystem.m4
++++ b/m4/m4_ax_boost_filesystem.m4
+@@ -31,7 +31,7 @@
+ #   and this notice are preserved. This file is offered as-is, without any
+ #   warranty.
+ 
+-#serial 22
++#serial 24
+ 
+ AC_DEFUN([AX_BOOST_FILESYSTEM],
+ [
+@@ -81,14 +81,14 @@ AC_DEFUN([AX_BOOST_FILESYSTEM],
+ 			AC_DEFINE(HAVE_BOOST_FILESYSTEM,,[define if the Boost::Filesystem library is available])
+             BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'`
+             if test "x$ax_boost_user_filesystem_lib" = "x"; then
+-                for libextension in `ls $BOOSTLIBDIR/libboost_filesystem*.so* $BOOSTLIBDIR/libboost_filesystem*.dylib* $BOOSTLIBDIR/libboost_filesystem*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_filesystem.*\)\.so.*$;\1;' -e 's;^lib\(boost_filesystem.*\)\.a*$;\1;' -e 's;^lib\(boost_filesystem.*\)\.dylib$;\1;'` ; do
++                for libextension in `ls $BOOSTLIBDIR/libboost_filesystem*.so* $BOOSTLIBDIR/libboost_filesystem*.dylib* $BOOSTLIBDIR/libboost_filesystem*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_filesystem.*\)\.\(dylib\|a\|so\).*$;\1;' | tac` ; do
+                      ax_lib=${libextension}
+ 				    AC_CHECK_LIB($ax_lib, exit,
+                                  [BOOST_FILESYSTEM_LIB="-l$ax_lib"; AC_SUBST(BOOST_FILESYSTEM_LIB) link_filesystem="yes"; break],
+                                  [link_filesystem="no"])
+ 				done
+                 if test "x$link_filesystem" != "xyes"; then
+-                for libextension in `ls $BOOSTLIBDIR/boost_filesystem*.{dll,a}* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_filesystem.*\)\.dll.*$;\1;' -e 's;^\(boost_filesystem.*\)\.a*$;\1;'` ; do
++                for libextension in `ls $BOOSTLIBDIR/boost_filesystem*.dll* $BOOSTLIBDIR/boost_filesystem*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_filesystem.*\)\.\(dll\|a\).*$;\1;' | tac` ; do
+                      ax_lib=${libextension}
+ 				    AC_CHECK_LIB($ax_lib, exit,
+                                  [BOOST_FILESYSTEM_LIB="-l$ax_lib"; AC_SUBST(BOOST_FILESYSTEM_LIB) link_filesystem="yes"; break],
+diff --git a/m4/m4_ax_boost_system.m4 b/m4/ax_boost_system.m4
+index 7fbf6d3..bf82391 100644
+--- a/m4/m4_ax_boost_system.m4
++++ b/m4/m4_ax_boost_system.m4
+@@ -83,14 +83,14 @@ AC_DEFUN([AX_BOOST_SYSTEM],
+ 
+ 			LDFLAGS_SAVE=$LDFLAGS
+             if test "x$ax_boost_user_system_lib" = "x"; then
+-                for libextension in `ls $BOOSTLIBDIR/libboost_system*.so* $BOOSTLIBDIR/libboost_system*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_system.*\)\.so.*$;\1;' -e 's;^lib\(boost_system.*\)\.a*$;\1;'` ; do
++                for libextension in `ls $BOOSTLIBDIR/libboost_system*.a* $BOOSTLIBDIR/libboost_system*.so* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_system.*\)\.\(so\|a\).*$;\1;' | tac` ; do
+                      ax_lib=${libextension}
+ 				    AC_CHECK_LIB($ax_lib, exit,
+                                  [BOOST_SYSTEM_LIB="-l$ax_lib"; AC_SUBST(BOOST_SYSTEM_LIB) link_system="yes"; break],
+                                  [link_system="no"])
+ 				done
+                 if test "x$link_system" != "xyes"; then
+-                for libextension in `ls $BOOSTLIBDIR/boost_system*.{dll,a}* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_system.*\)\.dll.*$;\1;' -e 's;^\(boost_system.*\)\.a*$;\1;'` ; do
++                for libextension in `ls $BOOSTLIBDIR/boost_system*.{dll,a}* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_system.*\)\.\(dll\|a\).*$;\1;' | tac` ; do
+                      ax_lib=${libextension}
+ 				    AC_CHECK_LIB($ax_lib, exit,
+                                  [BOOST_SYSTEM_LIB="-l$ax_lib"; AC_SUBST(BOOST_SYSTEM_LIB) link_system="yes"; break],
+diff --git a/src/logmill.cpp b/src/logmill.cpp
+index 8fc6153..2a9afd9 100644
+--- a/src/logmill.cpp
++++ b/src/logmill.cpp
+@@ -176,7 +176,7 @@ RCommitLog* RLogMill::fetchLog(std::string& log_format) {
+                     logfile = repo_path.string();
+                 }
+             }
+-        } catch(boost::filesystem3::filesystem_error& error) {
++        } catch(boost::filesystem::filesystem_error& error) {
+         }
+     }
+ 
diff --git a/dev-util/gource/gource-0.38.ebuild b/dev-util/gource/gource-0.38.ebuild
index 3152737ba3b1..b42170629cdb 100644
--- a/dev-util/gource/gource-0.38.ebuild
+++ b/dev-util/gource/gource-0.38.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/gource/gource-0.38.ebuild,v 1.3 2012/05/12 19:25:31 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/gource/gource-0.38.ebuild,v 1.4 2012/07/10 09:56:31 flameeyes Exp $
 
 EAPI=2
 
-inherit autotools flag-o-matic versionator
+inherit eutils autotools flag-o-matic versionator
 
 MY_P=${P/_p/-}
 MY_P=${MY_P/_/-}
@@ -48,6 +48,7 @@ case ${PV} in
 esac
 
 src_prepare() {
+	epatch "${FILESDIR}/${P}+boost-1.50.patch"
 	eautoreconf
 }