dev-vcs/gitg: 0.2.2

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

4 files changed, 127 insertions, 2 deletions

diff --git a/dev-vcs/gitg/ChangeLog b/dev-vcs/gitg/ChangeLog
index 3e65932edc4b..d9eb91668e4c 100644
--- a/dev-vcs/gitg/ChangeLog
+++ b/dev-vcs/gitg/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-vcs/gitg
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/gitg/ChangeLog,v 1.11 2011/04/12 00:51:16 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/gitg/ChangeLog,v 1.12 2011/07/15 13:56:36 sping Exp $
+
+*gitg-0.2.2 (15 Jul 2011)
+
+  15 Jul 2011; Sebastian Pipping <sping@gentoo.org>
+  +files/gitg-0.2.1-fix-disable-debug.patch, +gitg-0.2.2.ebuild:
+  Insert 0.2.2 from gnome overlay (bug #360659)
 
   12 Apr 2011; Sebastian Pipping <sping@gentoo.org> gitg-0.1.2.ebuild:
   Remove -Werror (bug #363009)
diff --git a/dev-vcs/gitg/Manifest b/dev-vcs/gitg/Manifest
index de6811b0cbb5..2facd5db80f0 100644
--- a/dev-vcs/gitg/Manifest
+++ b/dev-vcs/gitg/Manifest
@@ -1,9 +1,12 @@
 AUX gitg-0.1.2-fix-disable-debug.patch 1335 RMD160 be00ea5a5877777bcd7ad79d816a8ed31b73ce19 SHA1 e7a14b9c227975f35e563434005d2b57e7b42846 SHA256 4d5d51fbf0dbf9a162d1b97ed761cea9e7c5315f7eb152f1af3809dab22a7f6c
+AUX gitg-0.2.1-fix-disable-debug.patch 1335 RMD160 be00ea5a5877777bcd7ad79d816a8ed31b73ce19 SHA1 e7a14b9c227975f35e563434005d2b57e7b42846 SHA256 4d5d51fbf0dbf9a162d1b97ed761cea9e7c5315f7eb152f1af3809dab22a7f6c
 DIST gitg-0.0.6.tar.bz2 455034 RMD160 843f58296ba82ff1e30206dd8e8dc612a2434ef7 SHA1 ddc9459fe91aeef545ff453173bda60f0c294760 SHA256 1b4ae8f61ce0ba12e12645eca87799076dae961ca03a3906c35686aa3287e0bd
 DIST gitg-0.1.0.tar.bz2 539495 RMD160 034dd6be922e32def913a028d97782154e38953e SHA1 599f2f30a63a32658c8381c17da2d14f58631a25 SHA256 298f9771b7288406ae9a32b9117c1a963b72d9c21652987378ccb68eec2fcbc5
 DIST gitg-0.1.2.tar.bz2 657419 RMD160 e98f4c547d3e996000f9df9e642827c5dc025eeb SHA1 735beb8b2774451c707d2acbf77baa4f9beb281e SHA256 e7030b7d49169339f123c79eb6f289d9d1067fd5b248b7ce712a7b15a72e9f1a
+DIST gitg-0.2.2.tar.bz2 588416 RMD160 ddd1fc6dc429434ed543461d00e4a45679affdbb SHA1 892f5f8a72c1b11510901e68fb413e3c38c33f87 SHA256 cfa1b1d2bdd1211c09e00dca42130ea98e98fde576d85e18eabfde1802d0d04a
 EBUILD gitg-0.0.6.ebuild 912 RMD160 9116fb5c02c07e4cb0a0ec50c4bb2386ef13acff SHA1 58220bbcda129eb459471dee0cfe06c8eff69850 SHA256 76ded225b0b208f57a6fa3575ee451fca04a6b0af441720c14c2cb75ff84a508
 EBUILD gitg-0.1.0.ebuild 1147 RMD160 5bf38a07208043becb617f0cc609c5ffb30badda SHA1 7ecaf955a6ffb2d3330d0166a36f969972c34865 SHA256 f6d2335b7848435a323423a510516bc56368bf6af96354f6fb6d65920bb64d21
 EBUILD gitg-0.1.2.ebuild 1402 RMD160 ef60f14956210c9b03b90f5a48b27caac30c136b SHA1 5095f14e01ba9865864ccc88838dc392df8aad6e SHA256 f6061c25b416ae96b02c2826b8253427289a890c3f3bf37e475b919148d11474
-MISC ChangeLog 3169 RMD160 a2602677b50f46ee676be5698cdfc4b2645e372c SHA1 ba36d9d5c0d120f051fc12ad42f8654a3d90896e SHA256 821007d959f0b0b5ee7302dfee2beff224398828e826feab4e464d9c376ef182
+EBUILD gitg-0.2.2.ebuild 1383 RMD160 02edd50e111705f84252c988d6ba280cceada934 SHA1 1f4a780fe2bf6f5851232554a957e7442580b3af SHA256 1e287e2f90069f4f174c9d15aa30d8f93a9c9923ad230d62e34385ebdeef7f44
+MISC ChangeLog 3362 RMD160 9664fd9009d8d5b1f5f6da198d73fe888fa8bd46 SHA1 dd7dc561d96477825dce7e8dbbccf9ef02cc783c SHA256 8ba9ac39ec6f91d1805cbd784230f272dd699b1ebab736c0a868cf51939ff6f4
 MISC metadata.xml 497 RMD160 c5c3fd5a2b9304e35910cc0fa00bba50b520a035 SHA1 13a64ec08039c09b3bcb1382f7f7c0b892994c8f SHA256 88532678754bbf7629906230e3fcbba313277b5180f129e3f5380b1e6d9a09cf
diff --git a/dev-vcs/gitg/files/gitg-0.2.1-fix-disable-debug.patch b/dev-vcs/gitg/files/gitg-0.2.1-fix-disable-debug.patch
new file mode 100644
index 000000000000..3c0b88133485
--- /dev/null
+++ b/dev-vcs/gitg/files/gitg-0.2.1-fix-disable-debug.patch
@@ -0,0 +1,58 @@
+From eeec06ef06073b28f011a2be5417f4398d187c2e Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Sun, 27 Mar 2011 22:42:29 +0200
+Subject: [PATCH] Fix --disable-debug
+
+---
+ gitg-debug.c |    7 +++++++
+ gitg-debug.h |    4 ++--
+ 2 files changed, 9 insertions(+), 2 deletions(-)
+
+diff --git a/libgitg/gitg-debug.c b/libgitg/gitg-debug.c
+index 6530e7a..781101e 100644
+--- a/libgitg/gitg-debug.c
++++ b/libgitg/gitg-debug.c
+@@ -21,6 +21,7 @@
+  */
+ 
+ #include "gitg-debug.h"
++#if ENABLE_DEBUG
+ #include <glib.h>
+ #include <stdio.h>
+ 
+@@ -72,3 +73,9 @@ gitg_debug_message (guint level,
+ 		g_free (msg);
+ 	}
+ }
++
++#else
++
++void gitg_debug_init (void) { }
++
++#endif /* ENABLE_DEBUG */
+diff --git a/libgitg/gitg-debug.h b/libgitg/gitg-debug.h
+index 55d4428..ab81b4e 100644
+--- a/libgitg/gitg-debug.h
++++ b/libgitg/gitg-debug.h
+@@ -35,8 +35,9 @@ enum
+ 	GITG_DEBUG_CONFIG = 1 << 3
+ };
+ 
+-#if ENABLE_DEBUG
+ void gitg_debug_init (void);
++
++#if ENABLE_DEBUG
+ gboolean gitg_debug_enabled (guint debug);
+ 
+ void gitg_debug_message (guint level,
+@@ -49,7 +50,6 @@ void gitg_debug_message (guint level,
+ #define gitg_debug(level,args...) gitg_debug_message (level, __FILE__, __LINE__, G_STRFUNC, args)
+ #else
+ 
+-#define gitg_debug_init ;
+ #define gitg_debug_enabled(x) FALSE
+ #define gitg_debug(level,args...) ;
+ 
+-- 
+1.7.4.1
+
diff --git a/dev-vcs/gitg/gitg-0.2.2.ebuild b/dev-vcs/gitg/gitg-0.2.2.ebuild
new file mode 100644
index 000000000000..f271ce1af25e
--- /dev/null
+++ b/dev-vcs/gitg/gitg-0.2.2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/gitg/gitg-0.2.2.ebuild,v 1.1 2011/07/15 13:56:36 sping Exp $
+
+EAPI="3"
+GNOME2_LA_PUNT="yes"
+GCONF_DEBUG="no"
+
+inherit eutils gnome2
+
+DESCRIPTION="git repository viewer for GNOME"
+HOMEPAGE="http://trac.novowork.com/gitg/"
+
+LICENSE="|| ( GPL-2 GPL-3 )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+# FIXME: debug changes CFLAGS
+IUSE="debug glade"
+
+RDEPEND=">=dev-libs/glib-2.26:2
+	>=x11-libs/gtk+-3.0.0:3
+	>=x11-libs/gtksourceview-2.91.8:3.0
+	>=gnome-base/gconf-2.10:2
+	>=gnome-base/gsettings-desktop-schemas-0.1.1
+	dev-vcs/git
+	glade? ( >=dev-util/glade-3.2:3.10 )
+"
+DEPEND="${RDEPEND}
+	>=sys-devel/gettext-0.17
+	>=dev-util/pkgconfig-0.15
+	>=dev-util/intltool-0.40"
+
+pkg_setup() {
+	# Disable maintainer to get rid of -Werror  (bug #363009)
+	G2CONF="${G2CONF}
+		--disable-static
+		--disable-deprecations
+		--disable-dependency-tracking
+		--disable-maintainer-mode
+		$(use_enable debug)
+		$(use_enable glade glade-catalog)"
+
+	DOCS="AUTHORS ChangeLog NEWS README"
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.2.1-fix-disable-debug.patch
+
+	# fix typo, see upstream bug 650648
+	sed -e 's:$(GLADE_CATALOGDIR):$(GLADE_CATALOG_DIR):' -i data/Makefile* ||
+		die "sed of data/Makefile* failed"
+
+	gnome2_src_prepare
+}
+
+src_test() {
+	emake check || die
+}