Bump gitg to 0.2.7 and block 0.2.6 from gnome-3.8 libraries due to a segfault. Fixes bug 465526.

(Portage version: 2.2.0_alpha171/cvs/Linux x86_64, signed Manifest commit with key 6C20157A)

3 files changed, 30 insertions, 11 deletions

diff --git a/dev-vcs/gitg/ChangeLog b/dev-vcs/gitg/ChangeLog
index f51a2111f401..16b6c3b60dac 100644
--- a/dev-vcs/gitg/ChangeLog
+++ b/dev-vcs/gitg/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-vcs/gitg
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/gitg/ChangeLog,v 1.22 2013/04/13 13:14:04 ikelos Exp $
+
+*gitg-0.2.7 (13 Apr 2013)
+
+  13 Apr 2013; Mike Auty <ikelos@gentoo.org> -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)
 
diff --git a/dev-vcs/gitg/gitg-0.2.6.ebuild b/dev-vcs/gitg/gitg-0.2.6.ebuild
index f9481a83a014..a129fe298e8a 100644
--- a/dev-vcs/gitg/gitg-0.2.6.ebuild
+++ b/dev-vcs/gitg/gitg-0.2.6.ebuild
@@ -1,6 +1,6 @@
 # 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.6.ebuild,v 1.1 2013/03/29 08:22:05 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/gitg/gitg-0.2.6.ebuild,v 1.2 2013/04/13 13:14:04 ikelos Exp $
 
 EAPI=5
 
@@ -17,7 +17,9 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug glade"
 
 RDEPEND=">=dev-libs/glib-2.26:2
+	<dev-libs/glib-2.36.0:2
 	>=x11-libs/gtk+-3.0.0:3
+	<x11-libs/gtk+-3.8.0:3
 	>=x11-libs/gtksourceview-3.1.3:3.0
 	>=gnome-base/gconf-2.10:2
 	>=gnome-base/gsettings-desktop-schemas-0.1.1
diff --git a/dev-vcs/gitg/gitg-0.2.5.ebuild b/dev-vcs/gitg/gitg-0.2.7.ebuild
index 20f538511660..e79440d9db8a 100644
--- a/dev-vcs/gitg/gitg-0.2.5.ebuild
+++ b/dev-vcs/gitg/gitg-0.2.7.ebuild
@@ -1,12 +1,11 @@
-# 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.5.ebuild,v 1.4 2012/06/09 14:29:42 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/gitg/gitg-0.2.7.ebuild,v 1.1 2013/04/13 13:14:04 ikelos 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/"
@@ -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
 }