Remove old versions and add gnome-common build dependency to fix bug 322617.

(Portage version: 2.2_rc67/cvs/Linux i686)

8 files changed, 16 insertions, 112 deletions

diff --git a/dev-vcs/giggle/ChangeLog b/dev-vcs/giggle/ChangeLog
index 24692fde0063..11654b53970b 100644
--- a/dev-vcs/giggle/ChangeLog
+++ b/dev-vcs/giggle/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-vcs/giggle
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/giggle/ChangeLog,v 1.4 2010/06/04 00:15:24 ikelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/giggle/ChangeLog,v 1.5 2010/06/04 08:08:50 ikelos Exp $
+
+  04 Jun 2010; Mike Auty <ikelos@gentoo.org> giggle-0.4.ebuild,
+  -giggle-0.4.90.ebuild, -giggle-0.4.91.ebuild,
+  -files/giggle-0.4.91-libgiggle.patch, giggle-0.4.95.ebuild,
+  giggle-0.4.96.ebuild, giggle-0.5.ebuild:
+  Remove old versions and add gnome-common build dependency to fix bug
+  322617.
 
 *giggle-0.5 (04 Jun 2010)
 
diff --git a/dev-vcs/giggle/files/giggle-0.4.91-libgiggle.patch b/dev-vcs/giggle/files/giggle-0.4.91-libgiggle.patch
deleted file mode 100644
index 3685b575b487..000000000000
--- a/dev-vcs/giggle/files/giggle-0.4.91-libgiggle.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From e428743b9a4a69cd3ad6f5e863356dda0d0499cb Mon Sep 17 00:00:00 2001
-From: Mathias Hasselmann <hasselmm@gnome.org>
-Date: Sat, 21 Feb 2009 00:01:41 +0100
-Subject: [PATCH] Cleanup library dependencies. Might fix GB#572506.
-
-Signed-off-by: Mathias Hasselmann <hasselmm@gnome.org>
----
- libgiggle-git/Makefile.am |    2 +-
- src/Makefile.am           |    3 +--
- 2 files changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/libgiggle-git/Makefile.am b/libgiggle-git/Makefile.am
-index db684de..509d334 100644
---- a/libgiggle-git/Makefile.am
-+++ b/libgiggle-git/Makefile.am
-@@ -63,7 +63,7 @@ libgiggle_git_HEADERS = \
- 	$(NULL)
- 
- libgiggle_git_la_LIBADD = \
--	$(GIGGLE_LIBS) ../libgiggle/libgiggle.la
-+	../libgiggle/libgiggle.la
- libgiggle_git_la_LDFLAGS = \
- 	$(AM_LDFLAGS) \
- 	-version-info $(LIBGIGGLE_GIT_ABI) \
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 2960e17..11f19cd 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -70,8 +70,7 @@ giggle_SOURCES = \
- 	giggle-main.c \
- 	$(NULL)
- 
--LDADD = \
--	../libgiggle/libgiggle.la \
-+giggle_LDADD = \
- 	../libgiggle-git/libgiggle-git.la
- 
- if IGE_PLATFORM_OSX
--- 
-1.6.1.3
-
diff --git a/dev-vcs/giggle/giggle-0.4.90.ebuild b/dev-vcs/giggle/giggle-0.4.90.ebuild
deleted file mode 100644
index 2408d7b9e71c..000000000000
--- a/dev-vcs/giggle/giggle-0.4.90.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/giggle/giggle-0.4.90.ebuild,v 1.2 2010/03/17 16:42:52 sping Exp $
-
-EAPI="1"
-
-inherit gnome2
-
-DESCRIPTION="GTK+ Frontend for GIT"
-HOMEPAGE="http://live.gnome.org/giggle"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND=">=dev-vcs/git-1.4.4.3
-		 >=dev-libs/glib-2.18
-		 >=x11-libs/gtk+-2.10
-		 x11-libs/gtksourceview:2.0
-		 gnome-extra/evolution-data-server
-		 >=gnome-base/libglade-2.4"
-DEPEND="${RDEPEND}
-		  sys-devel/gettext
-		>=dev-util/pkgconfig-0.15
-		>=dev-util/intltool-0.35"
-
-DOCS="AUTHORS ChangeLog NEWS README"
diff --git a/dev-vcs/giggle/giggle-0.4.91.ebuild b/dev-vcs/giggle/giggle-0.4.91.ebuild
deleted file mode 100644
index abeea15d618a..000000000000
--- a/dev-vcs/giggle/giggle-0.4.91.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/giggle/giggle-0.4.91.ebuild,v 1.2 2010/03/17 16:42:52 sping Exp $
-
-EAPI="1"
-
-inherit autotools gnome2
-
-DESCRIPTION="GTK+ Frontend for GIT"
-HOMEPAGE="http://live.gnome.org/giggle"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="eds"
-
-RDEPEND=">=dev-vcs/git-1.4.4.3
-		 >=dev-libs/glib-2.18
-		 >=x11-libs/gtk+-2.10
-		 x11-libs/gtksourceview:2.0
-		 eds? ( gnome-extra/evolution-data-server )
-		 >=gnome-base/libglade-2.4"
-DEPEND="${RDEPEND}
-		  sys-devel/gettext
-		>=dev-util/pkgconfig-0.15
-		>=dev-util/intltool-0.35
-		>=sys-devel/libtool-2"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-G2CONF="$(use_enable eds evolution-data-server)"
-
-src_unpack() {
-	gnome2_src_unpack
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-libgiggle.patch"
-	eautoreconf
-}
diff --git a/dev-vcs/giggle/giggle-0.4.95.ebuild b/dev-vcs/giggle/giggle-0.4.95.ebuild
index 6807ec7d6300..50605f0f0f00 100644
--- a/dev-vcs/giggle/giggle-0.4.95.ebuild
+++ b/dev-vcs/giggle/giggle-0.4.95.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/giggle/giggle-0.4.95.ebuild,v 1.2 2010/03/17 16:42:52 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/giggle/giggle-0.4.95.ebuild,v 1.3 2010/06/04 08:08:50 ikelos Exp $
 
 EAPI="1"
 
@@ -18,6 +18,7 @@ RDEPEND=">=dev-vcs/git-1.4.4.3
 		 >=dev-libs/glib-2.18
 		 >=x11-libs/gtk+-2.10
 		 >=x11-libs/gtksourceview-2.8
+		 gnome-base/gnome-common
 		 eds? ( gnome-extra/evolution-data-server )
 		 >=gnome-base/libglade-2.4"
 DEPEND="${RDEPEND}
diff --git a/dev-vcs/giggle/giggle-0.4.96.ebuild b/dev-vcs/giggle/giggle-0.4.96.ebuild
index 66084895a421..b36ea5f7d0e6 100644
--- a/dev-vcs/giggle/giggle-0.4.96.ebuild
+++ b/dev-vcs/giggle/giggle-0.4.96.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/giggle/giggle-0.4.96.ebuild,v 1.3 2010/03/21 10:40:01 ikelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/giggle/giggle-0.4.96.ebuild,v 1.4 2010/06/04 08:08:50 ikelos Exp $
 
 EAPI="1"
 
@@ -18,6 +18,7 @@ RDEPEND=">=dev-vcs/git-1.4.4.3
 		 >=dev-libs/glib-2.18
 		 >=x11-libs/gtk+-2.10
 		 >=x11-libs/gtksourceview-2.8
+		 gnome-base/gnome-common
 		 eds? ( gnome-extra/evolution-data-server )
 		 >=gnome-base/libglade-2.4
 		 >=x11-libs/vte-0.17"
diff --git a/dev-vcs/giggle/giggle-0.4.ebuild b/dev-vcs/giggle/giggle-0.4.ebuild
index 19eb0a94ff81..c5bd60f96211 100644
--- a/dev-vcs/giggle/giggle-0.4.ebuild
+++ b/dev-vcs/giggle/giggle-0.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/giggle/giggle-0.4.ebuild,v 1.2 2010/03/17 16:42:52 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/giggle/giggle-0.4.ebuild,v 1.3 2010/06/04 08:08:50 ikelos Exp $
 
 EAPI="1"
 
@@ -19,6 +19,7 @@ RDEPEND=">=dev-vcs/git-1.4.4.3
 		 >=dev-libs/glib-2.12
 		 >=x11-libs/gtk+-2.10
 		 x11-libs/gtksourceview:2.0
+		 gnome-base/gnome-common
 		 >=gnome-base/libglade-2.4"
 DEPEND="${RDEPEND}
 		  sys-devel/gettext
diff --git a/dev-vcs/giggle/giggle-0.5.ebuild b/dev-vcs/giggle/giggle-0.5.ebuild
index 64070727a9ff..e72a3c039adf 100644
--- a/dev-vcs/giggle/giggle-0.5.ebuild
+++ b/dev-vcs/giggle/giggle-0.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/giggle/giggle-0.5.ebuild,v 1.1 2010/06/04 00:15:24 ikelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/giggle/giggle-0.5.ebuild,v 1.2 2010/06/04 08:08:50 ikelos Exp $
 
 EAPI="1"
 
@@ -18,6 +18,7 @@ RDEPEND=">=dev-vcs/git-1.5
 		 >=dev-libs/glib-2.18
 		 >=x11-libs/gtk+-2.10
 		 >=x11-libs/gtksourceview-2.8
+		 gnome-base/gnome-common
 		 eds? ( gnome-extra/evolution-data-server )
 		 >=gnome-base/libglade-2.4
 		 >=x11-libs/vte-0.17"