Version bump to latest and add patch to make it work with huge repos (libreoffice). Drop overshadowed packages to reduce versions clutter.

Package-Manager: portage-2.2.0_alpha169/cvs/Linux x86_64
Manifest-Sign-Key: 0x8EEE3BE8

7 files changed, 427 insertions, 187 deletions

diff --git a/dev-vcs/gitg/ChangeLog b/dev-vcs/gitg/ChangeLog
index ac77db09dbff..f51a2111f401 100644
--- a/dev-vcs/gitg/ChangeLog
+++ b/dev-vcs/gitg/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-vcs/gitg
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/gitg/ChangeLog,v 1.20 2012/06/11 09:19:31 ago Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/gitg/ChangeLog,v 1.21 2013/03/29 08:22:05 scarabeus Exp $
+
+*gitg-0.2.6 (29 Mar 2013)
+
+  29 Mar 2013; Tomáš Chvátal <scarabeus@gentoo.org>
+  +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@gentoo.org> gitg-0.1.2.ebuild:
   Stable for amd64, wrt bug #419893
@@ -134,4 +143,3 @@
   08 Mar 2009; Mike Auty <ikelos@gentoo.org> +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
index 4eed119777fe..24a06348a66c 100644
--- a/dev-vcs/gitg/Manifest
+++ b/dev-vcs/gitg/Manifest
@@ -1,16 +1,32 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX gitg-0.1.2-fix-disable-debug.patch 1335 SHA256 4d5d51fbf0dbf9a162d1b97ed761cea9e7c5315f7eb152f1af3809dab22a7f6c SHA512 0629fff2555a768ee1cd402c506c1c378ae90577735693be0f2319d6cdc795117c58aa9be8ab4e9b70cc11f2e9b7df815fc69a9bc87d01c1558e2db7673a2f4b WHIRLPOOL 35d946c8135e23b6f43939253dbaaa5d68feac5b81ce4712f653ff4f5b0aa375fb2fb917246730ec8b6cd548fb0f54b37aa96b64687f04d194d5dea276c2da94
-AUX gitg-0.2.1-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.0.6.tar.bz2 455034 SHA256 1b4ae8f61ce0ba12e12645eca87799076dae961ca03a3906c35686aa3287e0bd SHA512 a85f45ca1acdc1490462849af8d8917c82dcc328a450063b5e261dba3a48f628dd7c28e39e2e410d08187707722fc73de14ea15c370bdf2b26249571b8249e8c WHIRLPOOL 640e9a7db5138db446cb17a161d7a403cab8968c44e248726d673380211035c7eef13f8f76acdbaa70182da85b2954fec7d0a9f48d1ac47965130be80ae9a13c
-DIST gitg-0.1.0.tar.bz2 539495 SHA256 298f9771b7288406ae9a32b9117c1a963b72d9c21652987378ccb68eec2fcbc5 SHA512 38dbe721e4e77193afcd152bc965633efd0791388f0c3f5b0eb32731e3e8dfe1009d70ec001bc34ed6adf854971aeb86589945520c3877c3e000303d58668007 WHIRLPOOL 2f48f35cdc5848b6f538c43cf32e9786c0bef8115499df9703c24efab7d204ae00c6e2870a1b598f4bf7f02173054ca67e5cd43943294747b806e8f99cde49a0
 DIST gitg-0.1.2.tar.bz2 657419 SHA256 e7030b7d49169339f123c79eb6f289d9d1067fd5b248b7ce712a7b15a72e9f1a SHA512 c20b5cfe06ea22c1087d20b75ee92380eb8e3efbf4d60957730dd0efa3fc696468e5fe987b484f1dd655ce722d83d31befba5f47546b39185f433ee5512097c1 WHIRLPOOL 19615011df7b2209b12ce8e0a0b10df0fc1d29bd0f7f31e3ac6fee28bd3b2c66af5e45705f9961ae6cfa371629ba754ca0efc413f5982618c2bfd6871a2395a0
-DIST gitg-0.2.2.tar.bz2 588416 SHA256 cfa1b1d2bdd1211c09e00dca42130ea98e98fde576d85e18eabfde1802d0d04a SHA512 ef1beec66f474e11b7653c5b9395b4614d76d61b99d3ae7f1864b54a7612b7bdb4dd497d181532574641cf39ebaccecbc10c50a5cf4a463a5ea4a9cb0166c774 WHIRLPOOL 9e171afd0f69500ad2f674cf4be74123a8bdc722d4f8661cedba816ef1f266700ba8f0ba09127900a28862e26d561e967b0a20bd6478a088d78437059e5dfd90
-DIST gitg-0.2.4.tar.bz2 611076 SHA256 96705b0edf6525a131a34d015544da67add9ed992babbd45fc768cdd032b65d0 SHA512 b98359291aacd57023dcce171a96304da25bcde5b6704e1d02ad0b7d6c42e3d37834c12794a27a96108741143ba12175faa86299ca6643b82012c0986ce4b192 WHIRLPOOL e151ce7e9858f9e4d3a7f735a6c5086aa74e1d66941e7e386a0f2f203c4a242ecae27decb76bb3fce0fd95d9cae97bd59106d1cc1a75586047a1fa8a72b5526e
 DIST gitg-0.2.5.tar.bz2 623306 SHA256 84b159fc77901767772d5c9ff3e0dec67d9e51bc12ab1e461b8a16deea8bfb68 SHA512 45beb9da7fcad11d8d9d6ae17565d1af4c2cc70e79a1f31ee2e2eed408fce0b9afb3cb9bc0da62f0556872cd9ac588d10f69a2c34bbf5425424bc738f9284190 WHIRLPOOL 8d24ebd05cfdce77287e4ea9a091c1da7a43e2f23f8ef47f87bf52477eb5bcac40fef5125237256b09a91cf81c40091490faf5a019b4589297b7406ed8a203ae
+DIST gitg-0.2.6.tar.xz 528672 SHA256 f1e71384066de94a549e76ee73494f755453ad1e2c045309fcf3fe7aaaf89a69 SHA512 d02d55608f9187ba8fe9d188ccdc32b1e45ff33944b010e5570f9fd303969475b775d8b282654bf3c7af0338d56431dffce127751d8501ce3c4f091c96990965 WHIRLPOOL 2549158ebec0653390f00fc5e2e7d79826397f3c32e271183c1c27d094f345dbf79d7b736d413a36a1818875276c1843257d70c40dd0c950ba5d1f43ade18f08
 EBUILD gitg-0.0.6.ebuild 904 SHA256 9480c2dce5938c6c063b6d8a79479f43807c58d82808e1aad5f041bb1b6c2bda SHA512 b5eda0847eb18478501e742bae5d766915aa77361fcee6838bb31af0d4a9307d31980d656b7053821427e65b0b18eeaa1ff00d6b7649bcb1a77a1286ae7eccc4 WHIRLPOOL da297acfec322ecd3396fe91c53ac3f2ea57c6ed4d9b9141fd02c1bbef92499ffb4aeb577dd055cef4c3f19f4e159575f447d3c3d6246b8d2718a5ee38e11029
-EBUILD gitg-0.1.0.ebuild 1139 SHA256 00e6a54cd50e1a166ced5571ec62098c86ff6ad93e82a60a1383fb33bea1d7fb SHA512 fa795d7b389a8ad957b0c23022b0139234d2d1e11ec15a51129566815bfd0edeb306a176502d7dea3ea4705d5b2082200d1eaec06f16a9c3e59d44e692ef7640 WHIRLPOOL d297ebbbe9a8df9648cb91f941de42a4c6a51565722360f257ee1543463e52f637cfec187457946c4d04043e57fdb52cb0f2305022efe223bd0db8ffdb7652d1
 EBUILD gitg-0.1.2.ebuild 1393 SHA256 8c3e7d4386a8a34a6100b3438a8b3e4cdcc6e7d05b0b178043a5a5d61595c23d SHA512 da357e9f0184e4bed576249a7e3d02c5f2425e335ca20f3857a96dc3e34eb30c4d439375339ce48dc8b92e76203c0de5942945d347e41e86b8878847f4cc0564 WHIRLPOOL 2462054a4cbadc6805e004fd2c9439afee686fb503e650a51187c06ac43ebf469027d9f9f5fc762c5f26baf584f5d9116ed6dfe1b58aacf6824f41b932f3ad16
-EBUILD gitg-0.2.2.ebuild 1378 SHA256 a55d08d0c050f6576486b47fcf32a254d3b19447c866ae506b5612782e1a11be SHA512 1d72b860f7d287a0bf4dfe1d15061f57d734617dd66244da6daaa30461c64956877664718d4a5c3e8f0cf048cf55376a5af92aed65b8d36189e1f00027a0387c WHIRLPOOL a69ecf5b9e25dd028bebc777bab519efd7e7c1f60f5423e84b60fc07b3eb9eb52ade9df7950d7662ef74122598ea551837a2c0a2f52f85dbe83fdec8af3994c8
-EBUILD gitg-0.2.4.ebuild 1140 SHA256 b2c2abbf1e4885a58fba69a57857718686dbe397ee475a5ea4f8057cb80905bc SHA512 24ff59e64fa414db70786d7f39ee551d65fce9355c2b3b5c5922a19499d4c2aa4af83d150fb71b67398838fb2eb2e1a7e24462afec16a8a436801875184a274d WHIRLPOOL 3bb3195ec864bc54f22422a2bda5bbc5affd7132caca2054217821f849d94f05793fac2fcf096342685786a263bb3607f2d2a9ed5044bb33f9ea0ff61f012832
 EBUILD gitg-0.2.5.ebuild 1153 SHA256 18eb8d1a85affd2ff3e152c8ce16ba3590d6df71fd1ce45f7fa051d56ef61c44 SHA512 3e58a45ad30aa1305403cd68e803d0dc81beb690e5b1506b6b9473ab16282f91c2c69a412ccf54a520bb614f090a720beb2dde5c8b753e228e419b1a055d8708 WHIRLPOOL e079ef623a257654929dda69ffdfb1d4a7699f2623d33d60a609f1e0e483c8ca10de46864dfc9de2a9c9f64408d7878f1089d118b796d7b4fc6fe2fcbed8d676
-MISC ChangeLog 4492 SHA256 ba87239387a107f9e14d410f72764e46ee6e18327ff46baae4df07dafa3c4c0e SHA512 17f0850353e1a88443179f9ec01fa58f143a87658cdfd83f960658379f2cfe4118c83cfe589d3eb60967cd3fb4ccb419ca12e6076ce36c814653db17491522e3 WHIRLPOOL 3baf1d76e0759b29001fc221a3de09710318e285a94a4332aebb856be35239b4d7303b08f203e67ad3fe8ee811f970918137d2ed863ec243d78b27b07c7459eb
+EBUILD gitg-0.2.6.ebuild 1273 SHA256 45a7c134ca3fd39130643f3e51017c29aa790d10ef22df8a763794f1e87f6794 SHA512 f740251b8bc3517f01f1d5110619c05327711143cebe388430bc58a000637042becdb71f1de74df9dff56fc6329cc70b8a6c6ee600f79e1a52f3f3976ca41c6b WHIRLPOOL d14bf7a08e4daa56c26cf0b379454a4d8a5d4e543c4bd53af3ca05af3afc27e007e041b08e76bc0cd1a1e1cb6971a73e050bb5b246871391c3de42dda268fb39
+MISC ChangeLog 4893 SHA256 65788960051df2bba847a61375292141665f149bc36c5d61d6fa1a224906bf27 SHA512 931fe2255217c4512173fc1c7b6392fa45b60c82993bb5df92ac0b6d8bc3bbe2fa89214c48d1a73a8d2bb8d4ae895f1803dafd8f8317c7710412c4087a4e97f9 WHIRLPOOL fd6e718cd5b5a844533ca04bee1fbc85ea7d5128b94c8084ef2b12a655a07d58e950668c368a733f75817011c23bed4545aba0975aaad2a14f6a2660fa756bd7
 MISC metadata.xml 475 SHA256 c68c56645dbaee9924039560e13275de51cbe4769e5122543ff923c8509fa5bc SHA512 9afa4297b706b37b52d2463fa012900c44b8d93d02e7992696c9aa8c4e9b195d8176e6004c8b231479cd97a97f09f76b1cc2bad996a0fba7aea06f0ef838038a WHIRLPOOL 8ca6f0ac2aaf7f3e523cc5bf758af9c4799de2cadef284b835dbdb630cf624dcdbe9b7f27de7be496230b2f5c3344e9d3cb2c14778590870b204c24eefdae9f0
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBCAAGBQJRVU8yAAoJEOSiRoyO7jvoaKkQAIiwiOoCKEq9fUchvx5QgjqY
+qSfYAIPIaN/106HickDj8yLyGRCsPuaiTursnIWTK5AwTONF/JgEAycr4oPbzpO3
+Z9TXTAEY89/qweA1xnduMmSAnauaUV+QIxTBYQeLy0ze8pkHMKLS81npS3185XbJ
+GnHy60xPwkiO0+/WI59ikK4mGorUpWscct3kosrsltuFcBLSlTffbkumeD37XI3w
+6m1uBFAKvZyR/NOwqINYuNpfVoX2HdtFsL8fUfibgKc791WoGQBfv5BWLQZ+Sq2q
+WcqfxsBKkpKnPkhMykG/wB1fVduIqjJj4hIVw5Cvsgm7aF1M4coS3G/LY9dEg/b0
+r1CVa8xwPqS8CLkpq/Q9CvgCJDKTtedPxLCnAnbBVKL6xSEKNeNcmW9MZX+rIdf3
+psr3ke/OCwrdFpBm7Yv+U6nJl18SJo6wSSauP5dijaIBPOb5ZhfvnohPi/WDXVnw
+/3voOWDTel/URzMInk0wX1Oz+BpPcuDQr1vmT5Ez3bGJlGoCKDB+gRB5Nwfrkgxz
+BcIZVPt98y4BSUKaR4XXcBm6Log2YSCa3KHG+js++IL7C7l8BFIYXwHIPt5iCoof
+liD97osbdsVVy9h5IaUzAtH4xEjD/cWga0mU4BkFe4MJE48C36mL2+woxhqfHu4H
+Mo/7j/qJeF7wtmoPDRah
+=NuTt
+-----END PGP SIGNATURE-----
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
deleted file mode 100644
index 3c0b88133485..000000000000
--- a/dev-vcs/gitg/files/gitg-0.2.1-fix-disable-debug.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-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/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 000000000000..48f875a612c2
--- /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@canonical.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.1.0.ebuild b/dev-vcs/gitg/gitg-0.1.0.ebuild
deleted file mode 100644
index 442bd9cb012d..000000000000
--- a/dev-vcs/gitg/gitg-0.1.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/gitg/gitg-0.1.0.ebuild,v 1.4 2012/06/09 14:29:42 sping Exp $
-
-EAPI="3"
-
-inherit gnome2
-
-DESCRIPTION="git repository viewer for GNOME"
-HOMEPAGE="http://git.gnome.org/browse/gitg/"
-
-LICENSE="|| ( GPL-2 GPL-3 )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2.26:2
-	>=x11-libs/gtk+-2.18:2
-	>=x11-libs/gtksourceview-2.8:2.0
-	>=gnome-base/gconf-2.10:2
-	>=gnome-base/gsettings-desktop-schemas-0.1.1
-	dev-vcs/git"
-
-DEPEND="${RDEPEND}
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-	>=dev-util/intltool-0.40"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-dependency-tracking
-		--with-gtk=2.0"
-
-	DOCS="AUTHORS ChangeLog NEWS README"
-}
-
-src_prepare() {
-	# Fix intltoolize broken file, see <https://bugzilla.gnome.org/show_bug.cgi?id=577133>
-	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i "${S}/po/Makefile.in.in" || die "sed failed"
-}
-
-src_install() {
-	gnome2_src_install
-	find "${ED}" -name "*.la" -delete || die "Removal of .la files failed"
-}
-
-src_test() {
-	emake check || die
-}
diff --git a/dev-vcs/gitg/gitg-0.2.2.ebuild b/dev-vcs/gitg/gitg-0.2.2.ebuild
deleted file mode 100644
index 9d29fa86455a..000000000000
--- a/dev-vcs/gitg/gitg-0.2.2.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2012 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.3 2012/06/09 14:29:42 sping Exp $
-
-EAPI="3"
-GNOME2_LA_PUNT="yes"
-GCONF_DEBUG="no"
-
-inherit 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"
-# 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
-	virtual/pkgconfig
-	>=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
-}
diff --git a/dev-vcs/gitg/gitg-0.2.4.ebuild b/dev-vcs/gitg/gitg-0.2.6.ebuild
index 50c99625fb19..f9481a83a014 100644
--- a/dev-vcs/gitg/gitg-0.2.4.ebuild
+++ b/dev-vcs/gitg/gitg-0.2.6.ebuild
@@ -1,25 +1,24 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/gitg/gitg-0.2.4.ebuild,v 1.4 2012/06/09 14:29:42 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/gitg/gitg-0.2.6.ebuild,v 1.1 2013/03/29 08:22:05 scarabeus Exp $
 
-EAPI="3"
-GNOME2_LA_PUNT="yes"
-GCONF_DEBUG="no"
+EAPI=5
 
-inherit eutils gnome2
+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 ~x86-linux"
+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.0.0:3.0
+	>=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
@@ -30,7 +29,18 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	>=dev-util/intltool-0.40"
 
-pkg_setup() {
+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
@@ -40,9 +50,9 @@ pkg_setup() {
 		$(use_enable debug)
 		$(use_enable glade glade-catalog)"
 
-	DOCS="AUTHORS ChangeLog NEWS README"
+	gnome2_src_configure
 }
 
 src_test() {
-	emake check || die
+	default
 }