Version bump, closes bug #455360. Fix deps.

Package-Manager: portage-2.2.0_alpha161/cvs/Linux x86_64
Manifest-Sign-Key: 0x1CD13C8AD4301342

4 files changed, 27 insertions, 90 deletions

diff --git a/dev-util/gource/ChangeLog b/dev-util/gource/ChangeLog
index 761a9c4debf1..175e7dc6b763 100644
--- a/dev-util/gource/ChangeLog
+++ b/dev-util/gource/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/gource
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/gource/ChangeLog,v 1.24 2013/01/30 16:19:14 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/gource/ChangeLog,v 1.25 2013/02/04 15:42:42 flameeyes Exp $
+
+*gource-0.39 (04 Feb 2013)
+
+  04 Feb 2013; Diego E. Pettenò <flameeyes@gentoo.org> +gource-0.39.ebuild,
+  -files/gource-0.38+boost-1.50.patch, -gource-0.38-r1.ebuild:
+  Version bump, closes bug #455360. Fix deps.
 
 *gource-0.38-r1 (30 Jan 2013)
 
diff --git a/dev-util/gource/Manifest b/dev-util/gource/Manifest
index 9b454f549fb9..6776dc9bcdca 100644
--- a/dev-util/gource/Manifest
+++ b/dev-util/gource/Manifest
@@ -1,19 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-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-r1.ebuild 1480 SHA256 64d2a03204521d340b9d3897361e6b5a9d6ea03d15fc2ed74493bcbd75757409 SHA512 300b0b1fce8725062c87d070ada853f63c9ab8b2cf48175527c75f8486cbc699bc96d7e43a38363cf74759ae19473596d8a07ef8f074a6f55a3bc90b94fda828 WHIRLPOOL 668d0ea0394de79177ef040d4f5ac6c1e1c50d5481be946872b70a63167b490c2a598b77e1a6c90f1837b5834d40d4f36f24b37e9262d14833d83f38ce72e981
-MISC ChangeLog 4702 SHA256 3efd9402bfe7e10d2c7e8b0401c6d4ded327da2a988483192629683c6fc6a357 SHA512 300497361098e18a085d1cbeccc193ee2573e8c9e6d7bf176e6e61eeb9ac89223c0cf95bf38f5a3f429e9539273838520f354b4e3b7f70b40561cb49753d7ed5 WHIRLPOOL f0ad18b33a98b0dcfde0c8c0a5248ab5a706b1b390c8af10160a38085db506b8daddb53e04941e9e85a115706d6828608025a0807f003518d9d81b3b9931ab83
+DIST gource-0.39.tar.gz 856723 SHA256 0f97a3bad240ebc04e37ebbe8e0affaf8ad9bed997d90a4b59d05770c788ffeb SHA512 ff3e3ffb78e541c4aab542e2b0268e0008c9380743214b2726a95d88c7be07727535940c6225cdb7908c0dbf7b85565ee51fcc1d6f4244eef58b1efe68d2f7da WHIRLPOOL 5d8398be7bb543e0ced8cb8970c4e8e37aef23e2e999151f9371c2d4ece150c29d225c2e4d7adeefecffe98bf698e8353b77ae9b955317788fe2dcb0732251ec
+EBUILD gource-0.39.ebuild 1404 SHA256 1cab47a6d40d70a16f691959e2f20c91ee666894c7a65a4adfe04b4ad5477e9c SHA512 cdd2a6db49015957cb9f31893bcb4cecf8fba7920cb18f46914b85fcdee7e6fe9220752624833091ba383757dc67decf0305878da0d62551559138b687273be9 WHIRLPOOL 8c5d995cef5155f17152eab595c387cf0140162b7fadaf0636d6c15c77bdb647507a789a01cbf7bd875c35c9437270de51456ba1a41465c2730484d8667a5557
+MISC ChangeLog 4917 SHA256 6527d07802e102bb82396e08d74c99c9e7493e6ad48b89e79d8902f9bb1c964d SHA512 7c712ae1659a5ce2e662c19eed1bd8b256c5ee81805d6725efb645a6ddbde1d26ad404a0bb7c0a1bde2538570cf0ca9eb1649a72509489c65171cd11f73358da WHIRLPOOL ad72bc140ca478c0d027d80ca125a3f49b822d70ad64f39a06e472b3ad6efaae1f767adc9add431b4b7b25f5cc3fad7c6bb64e26119dc8f6c23b6234ea14d183
 MISC metadata.xml 440 SHA256 8beddbce025a7ea08f19052ab137cbb0283235e4e6a4fcdc0e4958d31c463e0f SHA512 72be48846a4dcd9d7abc985892e3b5960f00e22413bf9f0467ac7960723c4520d1f8a9f7437ad58e784fc9823206c5948f257cde62d78e788e193dd7bf3f8744 WHIRLPOOL a8556824a7babab1f923c97dbf4855fef5a5b958006bb5310227f2b9108a2ed180094d91862bab6a9075c0d05a7c8b0e4f7f5f4d73478a32c9de1f4dadb0fe46
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRCUglAAoJEBzRPIrUMBNCMKcH/RWw5TgFJMFWotsZ8sXPlPeJ
-sAQ0zETCgxM4HX55zB4c9hN6/vmM+8c6qKYL+ONYshUv+2PZ/V13JrUA7bKbkvqZ
-SSVIQJzVdgU0Z9X+pTdGNJzs5F5S+uLsjrpJIDpbYKYgCcF5RuIF9zKeKZEKCiK/
-qZqFwVb4QdY0LKySoK09qMvT2lMiA73tXiGPOeR4yHZDI60VXi3At/RcnlFSNJsV
-kDGlrwdVjuzY6IERME7pxBQLvPaa5tkQxTMM2AQ9fNVj+aTcxZnUQ7jMIE3tcsFp
-HenE0Env+tw3lCTEO0Ky12wCwdQvItsvVucKNHQHf/rFU9JWNKpeaUDecXOal/g=
-=FWjl
+iQEcBAEBCAAGBQJRD9b7AAoJEBzRPIrUMBNCcnIIAKJ222EBPhwW0thjN828fFrf
+NHoZjeYNOQU5Giy0XpFkDObC2PdOi/TpPd0KB2BDjyrLGnLGQX6kZOKQCM/liQM+
+lCbZgCciznm4CIg0TLwr6cbyklKH1f0LZQdyWXjCEjeqzz+QLu+vzBIDXUDoTkeE
+RVyqIY8KGeFUzyrXJACiQzenjPbPRDKa3huFFqmld1WaNw9SHVenF9CEWC7gOHm3
+wCiCtqKmGWKjIG6DrfdpZrt7GJx/OD4gAjl8UMVTQrDmce5j8cUeIG2BpkNQQR0N
+INNjJ4pMj3YA4SdxM+HqV+5SYc1o+/c969EPd7n26rPkMG6MSlXWJDxNQPKkGpY=
+=+knk
 -----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
deleted file mode 100644
index 994ea1e5f9da..000000000000
--- a/dev-util/gource/files/gource-0.38+boost-1.50.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-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-r1.ebuild b/dev-util/gource/gource-0.39.ebuild
index 87e8bf774aac..263a66cd16a1 100644
--- a/dev-util/gource/gource-0.38-r1.ebuild
+++ b/dev-util/gource/gource-0.39.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/gource/gource-0.38-r1.ebuild,v 1.1 2013/01/30 16:19:14 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/gource/gource-0.39.ebuild,v 1.1 2013/02/04 15:42:42 flameeyes Exp $
 
 EAPI=5
 
-inherit eutils autotools flag-o-matic versionator
+inherit eutils flag-o-matic versionator
 
 MY_P=${P/_p/-}
 MY_P=${MY_P/_/-}
@@ -20,21 +20,22 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="
+	>=dev-libs/boost-1.46[threads(+)]
+	>=media-libs/glew-1.5
+	>=media-libs/libpng-1.2
 	>=media-libs/libsdl-1.2.10[video,opengl,X]
 	>=media-libs/sdl-image-1.2[jpeg,png]
 	dev-libs/libpcre:3
-	>=media-libs/libpng-1.2
-	virtual/jpeg
-	media-libs/mesa
-	media-fonts/freefont
-	>=media-libs/glew-1.5
 	dev-libs/tinyxml
-	>=dev-libs/boost-1.46[threads(+)]
+	media-fonts/freefont
+	media-libs/freetype:2
+	media-libs/mesa
+	virtual/glu
+	virtual/jpeg
 	"
 DEPEND="
 	${RDEPEND}
 	virtual/pkgconfig
-	media-libs/freetype:2
 	>=media-libs/glm-0.9.3
 	"
 
@@ -47,11 +48,6 @@ case ${PV} in
 		S="${WORKDIR}/${PN}-$(get_version_component_range 1-2)" ;;
 esac
 
-src_prepare() {
-	epatch "${FILESDIR}/${P}+boost-1.50.patch"
-	eautoreconf
-}
-
 src_configure() {
 	# fix bug #386525
 	# this enable gource to be compiled against dev-libs/tinyxml[stl]