Fix up dependencies (bug 506590 and bug 501696), and clear out old versions.

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

6 files changed, 12 insertions, 102 deletions

diff --git a/dev-vcs/gitg/ChangeLog b/dev-vcs/gitg/ChangeLog
index e5caf7030cc3..d18e732ea51d 100644
--- a/dev-vcs/gitg/ChangeLog
+++ b/dev-vcs/gitg/ChangeLog
@@ -1,6 +1,10 @@
 # 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.27 2014/04/03 18:30:10 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/gitg/ChangeLog,v 1.28 2014/04/05 20:49:13 ikelos Exp $
+
+  05 Apr 2014; Mike Auty <ikelos@gentoo.org> -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@gentoo.org> metadata.xml:
   Remove myself as a maintainer
diff --git a/dev-vcs/gitg/gitg-0.0.6.ebuild b/dev-vcs/gitg/gitg-0.0.6.ebuild
deleted file mode 100644
index 3520c7c483c7..000000000000
--- a/dev-vcs/gitg/gitg-0.0.6.ebuild
+++ /dev/null
@@ -1,37 +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.0.6.ebuild,v 1.7 2012/06/09 14:29:42 sping Exp $
-
-EAPI="2"
-
-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.16:2
-	>=x11-libs/gtk+-2.16:2
-	>=x11-libs/gtksourceview-2.8:2.0
-	>=gnome-base/gconf-2.10:2
-	dev-vcs/git"
-
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig
-	>=dev-util/intltool-0.35"
-
-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"
-}
-
-pkg_setup() {
-	G2CONF="${G2CONF} --disable-bundle"
-}
diff --git a/dev-vcs/gitg/gitg-0.1.2.ebuild b/dev-vcs/gitg/gitg-0.1.2.ebuild
deleted file mode 100644
index b3ff3e5f980f..000000000000
--- a/dev-vcs/gitg/gitg-0.1.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.1.2.ebuild,v 1.6 2012/06/11 09:19:31 ago Exp $
-
-EAPI="3"
-
-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"
-IUSE="debug glade"
-
-RDEPEND=">=dev-libs/glib-2.26:2
-	>=x11-libs/gtk+-2.19: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
-	glade? ( dev-util/glade )"
-
-DEPEND="${RDEPEND}
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-	>=dev-util/intltool-0.40"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-dependency-tracking
-		$(use_enable debug)
-		$(use_enable glade glade-catalog)"
-
-	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"
-
-	epatch "${FILESDIR}"/${P}-fix-disable-debug.patch
-}
-
-src_configure() {
-	# Disable maintainer to get rid of -Werror  (bug #363009)
-	econf --disable-maintainer-mode || die
-}
-
-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.6.ebuild b/dev-vcs/gitg/gitg-0.2.6.ebuild
index e67789d37f45..372082e98ed2 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
+# 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.6.ebuild,v 1.3 2014/03/15 15:04:20 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/gitg/gitg-0.2.6.ebuild,v 1.4 2014/04/05 20:49:13 ikelos Exp $
 
 EAPI=5
 
diff --git a/dev-vcs/gitg/gitg-0.2.7.ebuild b/dev-vcs/gitg/gitg-0.2.7.ebuild
index a3dd8acdbe63..b939ae8cb327 100644
--- a/dev-vcs/gitg/gitg-0.2.7.ebuild
+++ b/dev-vcs/gitg/gitg-0.2.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# 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.4 2014/03/15 15:04:20 sping Exp $
+# $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
 
diff --git a/dev-vcs/gitg/gitg-0.3.2.ebuild b/dev-vcs/gitg/gitg-0.3.2.ebuild
index 79bef606430b..ef92101aaec4 100644
--- a/dev-vcs/gitg/gitg-0.3.2.ebuild
+++ b/dev-vcs/gitg/gitg-0.3.2.ebuild
@@ -1,6 +1,6 @@
 # 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.2 2014/03/15 15:04:20 sping Exp $
+# $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
 
@@ -22,7 +22,7 @@ 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
+	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
@@ -34,6 +34,7 @@ RDEPEND="
 	>=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}