[gentoo-commits] dev/ikelos:master commit in: dev-vcs/gitg/files/, dev-vcs/gitg/

[Mike Auty]

commit:     2aa5df78e1540cebaa5688a46fea36dd483f9960
Author:     Mike Auty <ikelos <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 31 15:01:52 2014 +0000
Commit:     Mike Auty <ikelos <AT> gentoo <DOT> org>
CommitDate: Thu Jul 31 15:01:52 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=dev/ikelos.git;a=commit;h=2aa5df78

Bump gitg, for when its dependencies become available.

---
 dev-vcs/gitg/ChangeLog                             | 180 ++++++++++
 dev-vcs/gitg/Manifest                              |  10 +
 .../gitg/files/gitg-0.1.2-fix-disable-debug.patch  |  58 ++++
 .../gitg/files/gitg-0.2.6-fix-libreoffice.patch    | 371 +++++++++++++++++++++
 dev-vcs/gitg/gitg-0.2.7.ebuild                     |  59 ++++
 dev-vcs/gitg/gitg-0.3.2.ebuild                     |  79 +++++
 dev-vcs/gitg/gitg-0.3.3.ebuild                     |  79 +++++
 dev-vcs/gitg/metadata.xml                          |  15 +
 8 files changed, 851 insertions(+)

diff --git a/dev-vcs/gitg/ChangeLog b/dev-vcs/gitg/ChangeLog
new file mode 100644
index 0000000..b8605d4
--- /dev/null
+++ b/dev-vcs/gitg/ChangeLog
@@ -0,0 +1,180 @@
+# ChangeLog for dev-vcs/gitg
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/gitg/ChangeLog,v 1.29 2014/04/26 06:02:40 pacho Exp $
+
+  26 Apr 2014; Pacho Ramos <pacho@g.o> -gitg-0.2.6.ebuild:
+  drop old
+
+  05 Apr 2014; Mike Auty <ikelos@g.o> -gitg-0.0.6.ebuild,
+  -gitg-0.1.2.ebuild, gitg-0.2.6.ebuild, gitg-0.2.7.ebuild, gitg-0.3.2.ebuild:
+  Fix up dependencies (bug 506590 and bug 501696), and clear out old versions.
+
+  03 Apr 2014; Sebastian Pipping <sping@g.o> metadata.xml:
+  Remove myself as a maintainer
+
+  15 Mar 2014; Sebastian Pipping <sping@g.o> gitg-0.3.2.ebuild:
+  eautoreconf needs GNOME_COMPILE_WARNINGS from
+  /usr/share/aclocal/gnome-compiler-flags.m4 to rebuild configure script (bug
+  #504070)
+
+*gitg-0.3.2 (08 Feb 2014)
+
+  08 Feb 2014; Justin Lecher <jlec@g.o> +gitg-0.3.2.ebuild,
+  metadata.xml:
+  Version Bump, #497358; thanks for Mark R. Pariente, Konstantin and Jesús
+  Pérez (Chuso) working on the ebuild
+
+  18 Aug 2013; Agostino Sarubbo <ago@g.o> gitg-0.2.7.ebuild:
+  Stable for x86, wrt bug #478274
+
+  27 Jul 2013; Agostino Sarubbo <ago@g.o> gitg-0.2.7.ebuild:
+  Stable for amd64, wrt bug #478274
+
+*gitg-0.2.7 (13 Apr 2013)
+
+  13 Apr 2013; Mike Auty <ikelos@g.o> -gitg-0.2.5.ebuild,
+  gitg-0.2.6.ebuild, +gitg-0.2.7.ebuild:
+  Bump gitg to 0.2.7 and block 0.2.6 from gnome-3.8 libraries due to a
+  segfault. Fixes bug 465526.
+
+*gitg-0.2.6 (29 Mar 2013)
+
+  29 Mar 2013; Tomáš Chvátal <scarabeus@g.o>
+  +files/gitg-0.2.6-fix-libreoffice.patch, +gitg-0.2.6.ebuild,
+  -files/gitg-0.2.1-fix-disable-debug.patch, -gitg-0.1.0.ebuild,
+  -gitg-0.2.2.ebuild, -gitg-0.2.4.ebuild:
+  Version bump to latest and add patch to make it work with huge repos
+  (libreoffice). Drop overshadowed packages to reduce versions clutter.
+
+  11 Jun 2012; Agostino Sarubbo <ago@g.o> gitg-0.1.2.ebuild:
+  Stable for amd64, wrt bug #419893
+
+  09 Jun 2012; Sebastian Pipping <sping@g.o> gitg-0.0.6.ebuild,
+  gitg-0.1.0.ebuild, gitg-0.1.2.ebuild, gitg-0.2.2.ebuild, gitg-0.2.4.ebuild,
+  gitg-0.2.5.ebuild:
+  Fix homepage link (bug #420019)
+
+  06 Jun 2012; Jeff Horelick <jdhore@g.o> gitg-0.1.2.ebuild:
+  marked x86 per bug 419893
+
+  03 May 2012; Jeff Horelick <jdhore@g.o> gitg-0.0.6.ebuild,
+  gitg-0.1.0.ebuild, gitg-0.1.2.ebuild, gitg-0.2.2.ebuild, gitg-0.2.4.ebuild,
+  gitg-0.2.5.ebuild:
+  dev-util/pkgconfig -> virtual/pkgconfig
+
+  14 Apr 2012; Zac Medico <zmedico@g.o> gitg-0.2.5.ebuild:
+  Add ~amd64-linux keyword.
+
+*gitg-0.2.5 (28 Sep 2011)
+
+  28 Sep 2011; Sebastian Pipping <sping@g.o> +gitg-0.2.5.ebuild:
+  Bump to 0.2.5 (bug #383527)
+
+  07 Aug 2011; Zac Medico <zmedico@g.o> gitg-0.2.4.ebuild:
+  Add ~x86-linux keyword.
+
+*gitg-0.2.4 (31 Jul 2011)
+
+  31 Jul 2011; Sebastian Pipping <sping@g.o> +gitg-0.2.4.ebuild:
+  Bump to 0.2.4: Downstream patching no longer needed, newer version of
+  gtksourceview required
+
+*gitg-0.2.2 (15 Jul 2011)
+
+  15 Jul 2011; Sebastian Pipping <sping@g.o>
+  +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@g.o> gitg-0.1.2.ebuild:
+  Remove -Werror (bug #363009)
+
+*gitg-0.1.2 (27 Mar 2011)
+
+  27 Mar 2011; Sebastian Pipping <sping@g.o> +gitg-0.1.2.ebuild,
+  +files/gitg-0.1.2-fix-disable-debug.patch, metadata.xml:
+  Bump to 0.1.2
+
+  21 Mar 2011; Nirbheek Chauhan <nirbheek@g.o> -gitg-0.0.5.ebuild,
+  gitg-0.0.6.ebuild, -gitg-0.0.8.ebuild, gitg-0.1.0.ebuild:
+  Fix slot-deps on gnome libs
+
+*gitg-0.1.0 (25 Feb 2011)
+
+  25 Feb 2011; Mike Auty <ikelos@g.o> +gitg-0.1.0.ebuild:
+  Bump to 0.1.0, thanks to Alphat-PC (bug 354065).
+
+  02 Jan 2011; Sebastian Pipping <sping@g.o> gitg-0.0.8.ebuild:
+  Remove gone configure option --disable-bundle, integrate test suite from
+  "make check"
+
+  30 Dec 2010; Mike Auty <ikelos@g.o> gitg-0.0.8.ebuild:
+  Fix a few dependency/ebuild issues as mentioned in bug 350189.
+
+  30 Dec 2010; Mike Auty <ikelos@g.o> -gitg-0.0.1.ebuild,
+  -gitg-0.0.2.ebuild, -gitg-0.0.3.ebuild, -gitg-0.0.4.ebuild,
+  +gitg-0.0.8.ebuild:
+  Remove old never-stabilized versions of gitg.
+
+*gitg-0.0.8 (30 Dec 2010)
+
+  30 Dec 2010; Mike Auty <ikelos@g.o> +gitg-0.0.8.ebuild:
+  Version bump gitg to 0.0.8.
+
+  17 Jul 2010; Thomas Anderson <tanderson@g.o> gitg-0.0.6.ebuild:
+  stable amd64, bug 327337
+
+  17 Jul 2010; Christian Faulhammer <fauli@g.o> gitg-0.0.6.ebuild:
+  stable x86, bug 327337
+
+  17 Mar 2010; Sebastian Pipping <sping@g.o> gitg-0.0.1.ebuild,
+  gitg-0.0.2.ebuild, gitg-0.0.3.ebuild, gitg-0.0.4.ebuild,
+  gitg-0.0.5.ebuild, gitg-0.0.6.ebuild:
+  Propagate move of dev-util/git to dev-vcs/git
+
+*gitg-0.0.6 (21 Feb 2010)
+
+  21 Feb 2010; Sebastian Pipping <sping@g.o> +gitg-0.0.6.ebuild:
+  Bump to 0.0.6
+
+  07 Dec 2009; Markus Meier <maekke@g.o> gitg-0.0.5.ebuild:
+  amd64 stable, bug #288185
+
+  04 Dec 2009; Christian Faulhammer <fauli@g.o> gitg-0.0.5.ebuild:
+  stable x86, bug 288185
+
+  08 Oct 2009; Romain Perier <mrpouet@g.o>
+  gitg-0.0.4.ebuild:
+  Stable for amd64 per bug #288185.
+
+*gitg-0.0.5 (08 Oct 2009)
+
+  08 Oct 2009; Sebastian Pipping <sping@g.o> +gitg-0.0.5.ebuild,
+  metadata.xml:
+  Bump to 0.0.5, fix license, add myself as maintainer
+
+  22 Jul 2009; Mike Auty <ikelos@g.o> gitg-0.0.4.ebuild:
+  Fix up bug 278347.
+
+  16 Jul 2009; Mike Auty <ikelos@g.o> gitg-0.0.4.ebuild:
+  Fix up bug 278025.
+
+*gitg-0.0.4 (12 Jul 2009)
+
+  12 Jul 2009; Mike Auty <ikelos@g.o> +gitg-0.0.4.ebuild:
+  Version bump, bug 277327.
+
+*gitg-0.0.3 (29 Apr 2009)
+
+  29 Apr 2009; Mike Auty <ikelos@g.o> +gitg-0.0.3.ebuild:
+  Version bump gitg, thanks to voyageur for the notice.
+
+*gitg-0.0.2 (05 Apr 2009)
+
+  05 Apr 2009; Mike Auty <ikelos@g.o> +gitg-0.0.2.ebuild:
+  Version bump, thanks to sping for the notice.
+
+*gitg-0.0.1 (08 Mar 2009)
+
+  08 Mar 2009; Mike Auty <ikelos@g.o> +metadata.xml,
+  +gitg-0.0.1.ebuild:
+  Initial import, ebuild courtesy of Thorsten Vollmer (bug 258741).

diff --git a/dev-vcs/gitg/Manifest b/dev-vcs/gitg/Manifest
new file mode 100644
index 0000000..7c55c8f
--- /dev/null
+++ b/dev-vcs/gitg/Manifest
@@ -0,0 +1,10 @@
+AUX gitg-0.1.2-fix-disable-debug.patch 1335 SHA256 4d5d51fbf0dbf9a162d1b97ed761cea9e7c5315f7eb152f1af3809dab22a7f6c SHA512 0629fff2555a768ee1cd402c506c1c378ae90577735693be0f2319d6cdc795117c58aa9be8ab4e9b70cc11f2e9b7df815fc69a9bc87d01c1558e2db7673a2f4b WHIRLPOOL 35d946c8135e23b6f43939253dbaaa5d68feac5b81ce4712f653ff4f5b0aa375fb2fb917246730ec8b6cd548fb0f54b37aa96b64687f04d194d5dea276c2da94
+AUX gitg-0.2.6-fix-libreoffice.patch 11432 SHA256 4168a7b0f87a887019f41958001f026f35600e097f61cab8aac5d2df5d04aa7d SHA512 38fa8a2da67aa6efb0592720324baf05a9fdec5ac4fe533103983f92c3858d4ea1f8e7e2a41cd4a0bc0f919a744248e545be1df1bc30801a6dc0750bcfdab4ff WHIRLPOOL 6c9ac770272221fe18ee80a6f3520c47fc777b07c17a71c842fd26923816cf55b415a17a62c995857e20fcd60cd8da9fe6e56b23a3f570adfb63d1936eb675f7
+DIST gitg-0.2.7.tar.xz 528904 SHA256 c07fc4fc6cef31a06f0b9daa2ed23a5d0f6cb0a10a728324970675fc7001d095 SHA512 8d07e3410691a9ea4772e8db546d3da87f4517ac35111156c6cba3b9317e02fc7dd63a79c05aa0700ce59d2739d0c680d33825e3a8c8c7c242db7ac8ae6962c4 WHIRLPOOL 743a07f6478b0d2526aa1b1f2197353029caacd32d9fbfe75d32a287d4e55caf9441de69b5dfbf40c11597101016bdc843c2f1f0fe893370ee24ba2a06e43b9f
+DIST gitg-0.3.2.tar.xz 1080536 SHA256 77a30eb46ccd1882dca5a2bc4b43850c1066b1c406de86e335628c1c5a2a6c0f SHA512 cd8a24a5dfa833b4380e0b8da647bb6bfe97a28e9ba57fc26c9806939b06416f7728006fe247cf07264931d420416f25ac307051b672184b06809d750d3ed928 WHIRLPOOL 24230a3926f98c9f115cb1367091558aa68dc773c8b1c5c64992ef605d5b89862cbd1d9c898ebc9a4ab7c1ce837ccda7a7a08c8c680a9da3bf9dfad668a01869
+DIST gitg-0.3.3.tar.xz 1048704 SHA256 a206574d5d3542223c79693d0954fa87d4ba95f13074bb9598e83c91df8f9a16 SHA512 53be59fe8d9a4658db5a4ef7e180cd2f3af991612ebe1561104a8ee7c9235db0c984782a3a088582eb630a88f2e4358b3a44193674d285454ef456e0d84720bc WHIRLPOOL 45c9de6bc5754e13c1d14afdc528f84ed667a0097216ff7530f81f72f9c054c94e97d0e6134e00b207331221309edbb9eb29f17b2db7ab8677be9d735c27ebf8
+EBUILD gitg-0.2.7.ebuild 1293 SHA256 cbbe84a8a3ffd3df991fe7c64ebafffae1e70f6e97a4663fc12e887a93105d9c SHA512 e72afccca3ca4528d0dcd58c8729871f8d27f633da7f633669a01292f13690a8b459221a286cc9d5e7bcb9f50c41e9013d4646a42b5bedc6d779ef97acb54012 WHIRLPOOL f5af24106946439984f3dfe041d51bce3c9ea9307a38ee2ad23729ee363a0553e908ccd2b095fff9b1cad6a6896b0791c4b3a94993fd54fbadf77eb05ec0acdc
+EBUILD gitg-0.3.2.ebuild 1929 SHA256 e870b3e07d878eff46a613accf66780ebd70e9a023c3c6dac9a7f2eb6bd96374 SHA512 6710c59de177667763243330c945cd045dbfb3280a5eb2d0687c90cf214dbff2cd665a3fe40866c6c29fe7f5fae5c57b2bd070245135f5136e3d3b7712e12e4f WHIRLPOOL fc49e367aca715b8ff3dd45bdf8d611f080ae74368501c9ddac9778054983ceff056db6753edb7f331cc6ab75d67bafd5c1b571e70c0d8f4bcf10056534c7eb4
+EBUILD gitg-0.3.3.ebuild 1929 SHA256 dcda368c5797c2fe4bb1f0c14ef81b6e6f30c6dd4f4da1505248218323aab07a SHA512 eb659af0ba51ae939a9a2f677d500e1b98e547aca84072c13b1d15322cd08fb8f3d0ba97281677db19487c2801b27aad1dfd607693918be60a213d3d64594599 WHIRLPOOL 2aa79b869eb876d59b4060bc9c5c1ed3abc3b2cd1e6ca7413be1afcc778244ab24bb94a2c259dc50b0c26790bb0f362d5ed4c91aec3a0c8bf87aa905a4e9608a
+MISC ChangeLog 6168 SHA256 4023c8fdf0c386b1b232ed2a18dd5bf9d1a51854e4a990a91c6bdd341348f818 SHA512 92dacd532e6171379bec14d06fd7d54a11725c35c2e22b8d7af25c381f0ace76ced83e787f4ae1ceb36a0c4e645794a294e2fa08d9ed5a0b65d1e4c13c8d22db WHIRLPOOL d13c7dd277384524d508f8749fc5f8dd03df171c3b4d377dd31c3aa3eda1945e75842357e632390954b74f7997b876fb063118c632796de8c8fe20707f3a208f
+MISC metadata.xml 477 SHA256 3ac7963107238be17b779f613409daaaa9dff0224081c3ee9daff4bfef15fef8 SHA512 299f86ab1726b9e89bd5be17406ed6c4fbd32d9d1036ac74fe20f10056ed439308212f47ae9ca62135738255939a29bc30e71a60c377620b69583ba59f18dff5 WHIRLPOOL 8d8ffc0519d8e22f3442c0ab2c9b6ccf025ea7bb50d11d93351944ad8059af192ce94e9c4f0e9fce7e32895efdd71fed7ac331cc5a04f4e7d860c2da001556fc

diff --git a/dev-vcs/gitg/files/gitg-0.1.2-fix-disable-debug.patch b/dev-vcs/gitg/files/gitg-0.1.2-fix-disable-debug.patch
new file mode 100644
index 0000000..3c0b881
--- /dev/null
+++ b/dev-vcs/gitg/files/gitg-0.1.2-fix-disable-debug.patch
@@ -0,0 +1,58 @@
+From eeec06ef06073b28f011a2be5417f4398d187c2e Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@×××××××.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/files/gitg-0.2.6-fix-libreoffice.patch b/dev-vcs/gitg/files/gitg-0.2.6-fix-libreoffice.patch
new file mode 100644
index 0000000..48f875a
--- /dev/null
+++ b/dev-vcs/gitg/files/gitg-0.2.6-fix-libreoffice.patch
@@ -0,0 +1,371 @@
+From 9fda4e3c22475059f4910d3072e01c4436bfeca9 Mon Sep 17 00:00:00 2001
+From: Bjoern Michaelsen <bjoern.michaelsen@×××××××××.com>
+Date: Thu, 28 Mar 2013 00:08:17 +0100
+Subject: [PATCH] lp#1056378: make end to nonsensical premature 8-bit
+ optimization
+
+- 128 lanes are _not_ enough for everyone
+---
+ gitg/gitg-cell-renderer-path.c |  8 ++++----
+ libgitg/gitg-color.c           |  6 +++---
+ libgitg/gitg-color.h           |  2 +-
+ libgitg/gitg-lane.h            |  2 +-
+ libgitg/gitg-lanes.c           | 40 ++++++++++++++++++++--------------------
+ libgitg/gitg-lanes.h           |  2 +-
+ libgitg/gitg-repository.c      |  4 ++--
+ libgitg/gitg-revision.c        |  8 ++++----
+ libgitg/gitg-revision.h        |  6 +++---
+ 9 files changed, 39 insertions(+), 39 deletions(-)
+
+diff --git a/gitg/gitg-cell-renderer-path.c b/gitg/gitg-cell-renderer-path.c
+index 97902ee..e2ae957 100644
+--- a/gitg/gitg-cell-renderer-path.c
++++ b/gitg/gitg-cell-renderer-path.c
+@@ -151,7 +151,7 @@ static void
+ draw_arrow (GitgCellRendererPath *self,
+             cairo_t              *cr,
+             const GdkRectangle   *area,
+-            gint8                 laneidx,
++            gint32                 laneidx,
+             gboolean              top)
+ {
+ 	gdouble cw = self->priv->lane_width;
+@@ -187,7 +187,7 @@ draw_paths_real (GitgCellRendererPath *self,
+ 	}
+ 
+ 	GSList *lanes = gitg_revision_get_lanes (revision);
+-	gint8 to = 0;
++	gint32 to = 0;
+ 	gdouble cw = self->priv->lane_width;
+ 	gdouble ch = area->height / 2.0;
+ 	GitgLane *lane;
+@@ -201,7 +201,7 @@ draw_paths_real (GitgCellRendererPath *self,
+ 
+ 		for (item = lane->from; item; item = item->next)
+ 		{
+-			gint8 from = (gint8)GPOINTER_TO_INT (item->data);
++			gint32 from = (gint32)GPOINTER_TO_INT (item->data);
+ 
+ 			cairo_move_to (cr, area->x + from * cw + cw / 2.0,
+ 			               area->y + yoffset * ch);
+@@ -241,7 +241,7 @@ draw_arrows (GitgCellRendererPath *self,
+              const GdkRectangle   *area)
+ {
+ 	GSList *item;
+-	gint8 to = 0;
++	gint32 to = 0;
+ 
+ 	for (item = gitg_revision_get_lanes (self->priv->revision); item; item = item->next)
+ 	{
+diff --git a/libgitg/gitg-color.c b/libgitg/gitg-color.c
+index d5eeb85..f13dd77 100644
+--- a/libgitg/gitg-color.c
++++ b/libgitg/gitg-color.c
+@@ -23,7 +23,7 @@
+ #include "gitg-color.h"
+ #include <gdk/gdk.h>
+ 
+-static gint8 current_index = 0;
++static gint32 current_index = 0;
+ 
+ static gchar const *palette[] = {
+ 	"#c4a000",
+@@ -72,10 +72,10 @@ gitg_color_set_cairo_source (GitgColor *color, cairo_t *cr)
+ 	cairo_set_source_rgb(cr, r, g, b);
+ }
+ 
+-static gint8
++static gint32
+ next_index ()
+ {
+-	gint8 next = current_index++;
++	gint32 next = current_index++;
+ 
+ 	if (current_index == sizeof(palette) / sizeof(gchar const *))
+ 		current_index = 0;
+diff --git a/libgitg/gitg-color.h b/libgitg/gitg-color.h
+index c3c9bd3..1968597 100644
+--- a/libgitg/gitg-color.h
++++ b/libgitg/gitg-color.h
+@@ -33,7 +33,7 @@ typedef struct _GitgColor GitgColor;
+ struct _GitgColor
+ {
+ 	gulong ref_count;
+-	gint8 index;
++	gint32 index;
+ };
+ 
+ void gitg_color_reset (void);
+diff --git a/libgitg/gitg-lane.h b/libgitg/gitg-lane.h
+index 61664db..4ce0737 100644
+--- a/libgitg/gitg-lane.h
++++ b/libgitg/gitg-lane.h
+@@ -47,7 +47,7 @@ typedef struct
+ {
+ 	GitgColor *color; /** Pointer to color */
+ 	GSList *from; /** List of lanes merging on this lane */
+-	gint8 type;
++	gint32 type;
+ } GitgLane;
+ 
+ typedef struct
+diff --git a/libgitg/gitg-lanes.c b/libgitg/gitg-lanes.c
+index 41b8650..f3aaa61 100644
+--- a/libgitg/gitg-lanes.c
++++ b/libgitg/gitg-lanes.c
+@@ -46,7 +46,7 @@ typedef struct
+ typedef struct
+ {
+ 	GitgColor *color;
+-	gint8 index;
++	gint32 index;
+ 	gchar const *from;
+ 	gchar const *to;
+ } CollapsedLane;
+@@ -109,10 +109,10 @@ free_lanes (GitgLanes *lanes)
+ static LaneContainer *
+ find_lane_by_hash (GitgLanes   *lanes,
+                    gchar const *hash,
+-                   gint8       *pos)
++                   gint32       *pos)
+ {
+ 	GSList *item;
+-	gint8 p = 0;
++	gint32 p = 0;
+ 
+ 	if (!hash)
+ 	{
+@@ -344,14 +344,14 @@ lane_container_next (LaneContainer *container,
+ 
+ static void
+ update_lane_merge_indices (GSList *from,
+-                           gint8   index,
++                           gint32   index,
+                            gint    direction)
+ {
+ 	GSList *item;
+ 
+ 	for (item = from; item; item = g_slist_next (item))
+ 	{
+-		gint8 idx = GPOINTER_TO_INT (item->data);
++		gint32 idx = GPOINTER_TO_INT (item->data);
+ 
+ 		if ((direction < 0 && idx > index) || (direction > 0 && idx >= index))
+ 		{
+@@ -362,7 +362,7 @@ update_lane_merge_indices (GSList *from,
+ 
+ static void
+ update_merge_indices (GSList *lanes,
+-                      gint8   index,
++                      gint32   index,
+                       gint    direction)
+ {
+ 	GSList *item;
+@@ -378,7 +378,7 @@ update_merge_indices (GSList *lanes,
+ static void
+ add_collapsed (GitgLanes     *lanes,
+                LaneContainer *container,
+-               gint8          index)
++               gint32          index)
+ {
+ 	CollapsedLane *collapsed = collapsed_lane_new (container);
+ 	collapsed->index = index;
+@@ -389,7 +389,7 @@ add_collapsed (GitgLanes     *lanes,
+ static void
+ collapse_lane (GitgLanes     *lanes,
+                LaneContainer *container,
+-               gint8          index)
++               gint32          index)
+ {
+ 	/* backtrack for inactive-collapse revisions and remove this container from
+ 	   those revisions, appropriately updating merge indices etc */
+@@ -409,7 +409,7 @@ collapse_lane (GitgLanes     *lanes,
+ 			GSList *collapsed = g_slist_nth(lns, index);
+ 			GitgLane *lane = (GitgLane *)collapsed->data;
+ 
+-			gint8 newindex = GPOINTER_TO_INT(lane->from->data);
++			gint32 newindex = GPOINTER_TO_INT(lane->from->data);
+ 
+ 			lns = gitg_revision_remove_lane(revision, lane);
+ 
+@@ -445,8 +445,8 @@ collapse_lane (GitgLanes     *lanes,
+ 
+ static void
+ update_current_lanes_merge_indices (GitgLanes *lanes,
+-                                    gint8      index,
+-                                    gint8      direction)
++                                    gint32      index,
++                                    gint32      direction)
+ {
+ 	GSList *item;
+ 
+@@ -462,7 +462,7 @@ static void
+ collapse_lanes (GitgLanes *lanes)
+ {
+ 	GSList *item = lanes->priv->lanes;
+-	gint8 index = 0;
++	gint32 index = 0;
+ 
+ 	while (item)
+ 	{
+@@ -490,9 +490,9 @@ collapse_lanes (GitgLanes *lanes)
+ 	}
+ }
+ 
+-static gint8
++static gint32
+ ensure_correct_index (GitgRevision *revision,
+-                      gint8         index)
++                      gint32         index)
+ {
+ 	guint len = g_slist_length (gitg_revision_get_lanes (revision));
+ 
+@@ -509,11 +509,11 @@ expand_lane (GitgLanes     *lanes,
+              CollapsedLane *lane)
+ {
+ 	GSList *item;
+-	gint8 index = lane->index;
++	gint32 index = lane->index;
+ 
+ 	GitgLane *ln = gitg_lane_new_with_color (lane->color);
+ 	guint len = g_slist_length (lanes->priv->lanes);
+-	gint8 next;
++	gint32 next;
+ 
+ 	if (index > len)
+ 	{
+@@ -614,7 +614,7 @@ static void
+ init_next_layer (GitgLanes *lanes)
+ {
+ 	GSList *item = lanes->priv->lanes;
+-	gint8 index = 0;
++	gint32 index = 0;
+ 
+ 	/* Initialize new set of lanes based on 'lanes'. It copies the lane (refs
+ 	   the color) and adds the lane index as a merge (so it basicly represents
+@@ -628,7 +628,7 @@ init_next_layer (GitgLanes *lanes)
+ }
+ 
+ static void
+-prepare_lanes (GitgLanes *lanes, GitgRevision *next, gint8 *pos)
++prepare_lanes (GitgLanes *lanes, GitgRevision *next, gint32 *pos)
+ {
+ 	LaneContainer *mylane;
+ 	guint num;
+@@ -647,7 +647,7 @@ prepare_lanes (GitgLanes *lanes, GitgRevision *next, gint8 *pos)
+ 	/* Iterate over all parents and find them a lane */
+ 	for (i = 0; i < num; ++i)
+ 	{
+-		gint8 lnpos;
++		gint32 lnpos;
+ 		LaneContainer *container = find_lane_by_hash (lanes, parents[i], &lnpos);
+ 
+ 		if (container)
+@@ -710,7 +710,7 @@ prepare_lanes (GitgLanes *lanes, GitgRevision *next, gint8 *pos)
+ }
+ 
+ GSList *
+-gitg_lanes_next (GitgLanes *lanes, GitgRevision *next, gint8 *nextpos)
++gitg_lanes_next (GitgLanes *lanes, GitgRevision *next, gint32 *nextpos)
+ {
+ 	LaneContainer *mylane;
+ 	GSList *res;
+diff --git a/libgitg/gitg-lanes.h b/libgitg/gitg-lanes.h
+index ae71757..8e02bbb 100644
+--- a/libgitg/gitg-lanes.h
++++ b/libgitg/gitg-lanes.h
+@@ -55,7 +55,7 @@ GType gitg_lanes_get_type (void) G_GNUC_CONST;
+ 
+ GitgLanes *gitg_lanes_new(void);
+ void gitg_lanes_reset(GitgLanes *lanes);
+-GSList *gitg_lanes_next(GitgLanes *lanes, GitgRevision *next, gint8 *mylane);
++GSList *gitg_lanes_next(GitgLanes *lanes, GitgRevision *next, gint32 *mylane);
+ 
+ G_END_DECLS
+ 
+diff --git a/libgitg/gitg-repository.c b/libgitg/gitg-repository.c
+index f1d1b18..2751800 100644
+--- a/libgitg/gitg-repository.c
++++ b/libgitg/gitg-repository.c
+@@ -865,7 +865,7 @@ append_revision (GitgRepository *repository,
+                  GitgRevision   *rv)
+ {
+ 	GSList *lanes;
+-	gint8 mylane = 0;
++	gint32 mylane = 0;
+ 
+ 	if (repository->priv->size == 0)
+ 	{
+@@ -1158,7 +1158,7 @@ repository_relane (GitgRepository *repository)
+ 
+ 	for (i = 0; i < repository->priv->size; ++i)
+ 	{
+-		gint8 mylane;
++		gint32 mylane;
+ 		GitgRevision *revision = repository->priv->storage[i];
+ 
+ 		GSList *lanes = gitg_lanes_next (repository->priv->lanes,
+diff --git a/libgitg/gitg-revision.c b/libgitg/gitg-revision.c
+index 579c878..37ca641 100644
+--- a/libgitg/gitg-revision.c
++++ b/libgitg/gitg-revision.c
+@@ -45,7 +45,7 @@ struct _GitgRevision
+ 	char sign;
+ 
+ 	GSList *lanes;
+-	gint8 mylane;
++	gint32 mylane;
+ };
+ 
+ G_DEFINE_BOXED_TYPE (GitgRevision, gitg_revision, gitg_revision_ref, gitg_revision_unref)
+@@ -303,7 +303,7 @@ update_lane_type (GitgRevision *revision)
+ void
+ gitg_revision_set_lanes (GitgRevision *revision,
+                          GSList       *lanes,
+-                         gint8         mylane)
++                         gint32         mylane)
+ {
+ 	free_lanes (revision);
+ 	revision->lanes = lanes;
+@@ -316,7 +316,7 @@ gitg_revision_set_lanes (GitgRevision *revision,
+ 	update_lane_type (revision);
+ }
+ 
+-gint8
++gint32
+ gitg_revision_get_mylane (GitgRevision *revision)
+ {
+ 	return revision->mylane;
+@@ -324,7 +324,7 @@ gitg_revision_get_mylane (GitgRevision *revision)
+ 
+ void
+ gitg_revision_set_mylane (GitgRevision *revision,
+-                          gint8         mylane)
++                          gint32         mylane)
+ {
+ 	g_return_if_fail (mylane >= 0);
+ 
+diff --git a/libgitg/gitg-revision.h b/libgitg/gitg-revision.h
+index e01a141..72051d7 100644
+--- a/libgitg/gitg-revision.h
++++ b/libgitg/gitg-revision.h
+@@ -64,13 +64,13 @@ gchar **gitg_revision_get_parents (GitgRevision *revision);
+ 
+ GSList *gitg_revision_get_lanes (GitgRevision *revision);
+ GitgLane *gitg_revision_get_lane (GitgRevision *revision);
+-void gitg_revision_set_lanes (GitgRevision *revision, GSList *lanes, gint8 mylane);
++void gitg_revision_set_lanes (GitgRevision *revision, GSList *lanes, gint32 mylane);
+ 
+ GSList *gitg_revision_remove_lane (GitgRevision *revision, GitgLane *lane);
+ GSList *gitg_revision_insert_lane (GitgRevision *revision, GitgLane *lane, gint index);
+ 
+-gint8 gitg_revision_get_mylane (GitgRevision *revision);
+-void gitg_revision_set_mylane (GitgRevision *revision, gint8 mylane);
++gint32 gitg_revision_get_mylane (GitgRevision *revision);
++void gitg_revision_set_mylane (GitgRevision *revision, gint32 mylane);
+ 
+ void gitg_revision_set_sign(GitgRevision *revision, char sign);
+ char gitg_revision_get_sign(GitgRevision *revision);
+-- 
+1.8.1.5
+

diff --git a/dev-vcs/gitg/gitg-0.2.7.ebuild b/dev-vcs/gitg/gitg-0.2.7.ebuild
new file mode 100644
index 0000000..b939ae8
--- /dev/null
+++ b/dev-vcs/gitg/gitg-0.2.7.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/gitg/gitg-0.2.7.ebuild,v 1.5 2014/04/05 20:49:13 ikelos Exp $
+
+EAPI=5
+
+GCONF_DEBUG="no"
+inherit base eutils gnome2
+
+DESCRIPTION="git repository viewer for GNOME"
+HOMEPAGE="http://git.gnome.org/browse/gitg/"
+
+LICENSE="|| ( GPL-2 GPL-3 )"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+# FIXME: debug changes CFLAGS
+IUSE="debug glade"
+
+RDEPEND=">=dev-libs/glib-2.26:2
+	>=x11-libs/gtk+-3.0.0:3
+	>=x11-libs/gtksourceview-3.1.3: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}
+	gnome-base/gnome-common
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+	>=dev-util/intltool-0.40"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.2.6-fix-libreoffice.patch"
+)
+
+DOCS="AUTHORS ChangeLog NEWS README"
+
+src_prepare() {
+	base_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# 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)"
+
+	gnome2_src_configure
+}
+
+src_test() {
+	default
+}

diff --git a/dev-vcs/gitg/gitg-0.3.2.ebuild b/dev-vcs/gitg/gitg-0.3.2.ebuild
new file mode 100644
index 0000000..ef92101
--- /dev/null
+++ b/dev-vcs/gitg/gitg-0.3.2.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/gitg/gitg-0.3.2.ebuild,v 1.3 2014/04/05 20:49:13 ikelos Exp $
+
+EAPI=5
+
+VALA_MIN_API_VERSION="0.20"
+PYTHON_COMPAT=( python{3_2,3_3} )
+
+inherit autotools gnome2 python-r1 vala
+
+DESCRIPTION="git repository viewer for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Gitg"
+
+LICENSE="|| ( GPL-2 GPL-3 )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug glade +python"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+# test if unbundling of libgd is possible
+# Currently it seems not to be (unstable API/ABI)
+RDEPEND="
+	dev-libs/libgee:0.8[introspection]
+	>=dev-libs/json-glib-0.16
+	>=app-text/gtkspell-3.0.3:3
+	>=dev-libs/glib-2.38:2
+	>=dev-libs/gobject-introspection-0.10.1
+	dev-libs/libgit2[threads]
+	>=dev-libs/libgit2-glib-0.0.10
+	>=dev-libs/libpeas-1.5.0[gtk]
+	>=gnome-base/gsettings-desktop-schemas-0.1.1
+	>=net-libs/webkit-gtk-2.2:3[introspection]
+	>=x11-libs/gtk+-3.10.0:3
+	>=x11-libs/gtksourceview-3.10:3.0
+	>=x11-themes/gnome-icon-theme-symbolic-3.10
+	glade? ( >=dev-util/glade-3.2:3.10 )
+	python? (
+		${PYTHON_DEPS}
+		dev-libs/libpeas[python,${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+	)
+"
+DEPEND="${RDEPEND}
+	gnome-base/gnome-common
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+	>=dev-util/intltool-0.40
+	$(vala_depend)"
+
+DOCS="AUTHORS ChangeLog NEWS README"
+
+src_prepare() {
+	sed \
+		-e '/CFLAGS/s:-g::g' \
+		-e '/CFLAGS/s:-O0::g' \
+		-i configure.ac || die
+	eautoreconf
+	gnome2_src_prepare
+	vala_src_prepare
+}
+
+src_configure() {
+	# Disable maintainer to get rid of -Werror  (bug #363009)
+	G2CONF="${G2CONF}
+		--disable-static
+		--disable-deprecations
+		--disable-dependency-tracking
+		$(use_enable debug)
+		$(use_enable glade glade-catalog)
+		$(use_enable python)"
+
+	gnome2_src_configure
+}
+
+src_install() {
+	gnome2_src_install -j1
+}

diff --git a/dev-vcs/gitg/gitg-0.3.3.ebuild b/dev-vcs/gitg/gitg-0.3.3.ebuild
new file mode 100644
index 0000000..5efdc06
--- /dev/null
+++ b/dev-vcs/gitg/gitg-0.3.3.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/gitg/gitg-0.3.2.ebuild,v 1.3 2014/04/05 20:49:13 ikelos Exp $
+
+EAPI=5
+
+VALA_MIN_API_VERSION="0.20"
+PYTHON_COMPAT=( python{3_2,3_3} )
+
+inherit autotools gnome2 python-r1 vala
+
+DESCRIPTION="git repository viewer for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Gitg"
+
+LICENSE="|| ( GPL-2 GPL-3 )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug glade +python"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+# test if unbundling of libgd is possible
+# Currently it seems not to be (unstable API/ABI)
+RDEPEND="
+	dev-libs/libgee:0.8[introspection]
+	>=dev-libs/json-glib-0.16
+	>=app-text/gtkspell-3.0.3:3
+	>=dev-libs/glib-2.38:2
+	>=dev-libs/gobject-introspection-0.10.1
+	dev-libs/libgit2[threads]
+	>=dev-libs/libgit2-glib-0.0.18
+	>=dev-libs/libpeas-1.5.0[gtk]
+	>=gnome-base/gsettings-desktop-schemas-0.1.1
+	>=net-libs/webkit-gtk-2.2:3[introspection]
+	>=x11-libs/gtk+-3.12.0:3
+	>=x11-libs/gtksourceview-3.10:3.0
+	>=x11-themes/gnome-icon-theme-symbolic-3.10
+	glade? ( >=dev-util/glade-3.2:3.10 )
+	python? (
+		${PYTHON_DEPS}
+		dev-libs/libpeas[python,${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+	)
+"
+DEPEND="${RDEPEND}
+	gnome-base/gnome-common
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+	>=dev-util/intltool-0.40
+	$(vala_depend)"
+
+DOCS="AUTHORS ChangeLog NEWS README"
+
+src_prepare() {
+	sed \
+		-e '/CFLAGS/s:-g::g' \
+		-e '/CFLAGS/s:-O0::g' \
+		-i configure.ac || die
+	eautoreconf
+	gnome2_src_prepare
+	vala_src_prepare
+}
+
+src_configure() {
+	# Disable maintainer to get rid of -Werror  (bug #363009)
+	G2CONF="${G2CONF}
+		--disable-static
+		--disable-deprecations
+		--disable-dependency-tracking
+		$(use_enable debug)
+		$(use_enable glade glade-catalog)
+		$(use_enable python)"
+
+	gnome2_src_configure
+}
+
+src_install() {
+	gnome2_src_install -j1
+}

diff --git a/dev-vcs/gitg/metadata.xml b/dev-vcs/gitg/metadata.xml
new file mode 100644
index 0000000..6c5d64e
--- /dev/null
+++ b/dev-vcs/gitg/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer>
+    <email>ikelos@g.o</email>
+    <name>Mike Auty</name>
+  </maintainer>
+  <longdescription lang="en">
+		GTK+ based frontend for GIT
+	</longdescription>
+  <use>
+    <flag name="glade">Install a glade catalog file</flag>
+    <flag name="python">Install Python bindings for those plugins requiring it.</flag>
+  </use>
+</pkgmetadata>