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

Package-Manager: portage-2.2_rc67/cvs/Linux i686

9 files changed, 24 insertions, 125 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/Manifest b/dev-vcs/giggle/Manifest
index a597449e35d5..59bc6824b521 100644
--- a/dev-vcs/giggle/Manifest
+++ b/dev-vcs/giggle/Manifest
@@ -1,25 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX giggle-0.4.91-libgiggle.patch 1132 RMD160 3dcae577895b1ed934b8c6bbf9590040ca6987e5 SHA1 a94d8c4079ee7e2fd307aea906f9b25443076ffb SHA256 9e982bd5f6066993d0f4b49e32349fb95197e9d909bd1921cdbfb09edafa76f2
-DIST giggle-0.4.90.tar.bz2 414880 RMD160 34a0c843d3ce4a100ed20d52a8e03b8aa076cf80 SHA1 416bf6e98523517e023f6750cabffce32963c9a0 SHA256 a0a14bd15b538c746b688f9fc08fd6b225533b307ca9ef085e795285853ef21c
-DIST giggle-0.4.91.tar.bz2 416878 RMD160 a9b27c650f5f5356172894298f5b5cc6587b89da SHA1 9dde9736714aa41a4550dc817082ffe49f62ede9 SHA256 1f7025b336b176d54d0c1794309b53699785912a6468a4ca4a96f9c5b699d8c3
 DIST giggle-0.4.95.tar.bz2 483360 RMD160 fc0a28d09197defb8fa2ea8690b56b34f6f79d29 SHA1 433517ad0c680a0a95b05e8e80c98c960b646de8 SHA256 485869cf1b697f3d428a8bb0d56d75f575f927aeafa6b154850389ffdee5265b
 DIST giggle-0.4.96.tar.bz2 500805 RMD160 bbaab29856d189f6180c481d3855a363bd5075f1 SHA1 45559288fcf9d4ffc2114d521594baf866029dbb SHA256 a655c9a84956bae5bc08411a328fe2455aa952d42ed74580551240c7423e346f
 DIST giggle-0.4.tar.gz 539885 RMD160 6e4d6691179c4a0d43bc0f252603ca911683cddc SHA1 6cb44e5a64a8279aee2e19e00d8714cd3b0f43aa SHA256 e46399530676a9a2473473471c0ee8a3c417923756867c83c1f70653c13409ad
 DIST giggle-0.5.tar.bz2 486406 RMD160 ee2ff519d7bd29f59a5b4b26342e1dfc7916deb2 SHA1 43143e49be8f510e126c19c68ce19870448e9430 SHA256 2e2c70d25159d31c87d155c9f799e0f1feb30fe26fc8aaf207ca6b3bd9b2b259
-EBUILD giggle-0.4.90.ebuild 693 RMD160 cc399103882364d436eeff904e7a6842673f68ea SHA1 1c2bbb99fa32bf45e785a6dcd69e1c57e3982d33 SHA256 81df882b37b03d5a44c9066a6dc041f211d69308668a4a7667f0b51a5f0b372c
-EBUILD giggle-0.4.91.ebuild 893 RMD160 5eefc8312df69115bb1e2c524861188947211209 SHA1 89e44ebf2c6d601deafd11e99f34da9c3f4b52a8 SHA256 5efa663b02c67825e221fa6635869eec6fef52404f3a82caaf3ca64411658304
-EBUILD giggle-0.4.95.ebuild 880 RMD160 3f9cdd3a4bccc6292874cef90ee5c7c55636f1a8 SHA1 3586af51c8b51cf0a097ce0b5a398c145cb0d1eb SHA256 0c18b972af06e988d203435ea49c5db33078fbcae70126c0dfc8a41a38a79a9c
-EBUILD giggle-0.4.96.ebuild 941 RMD160 32f7c11bb3876f7d40c37b177dd0559e08c74e51 SHA1 dd020526535f097c1ffc49779440eb1a486a2727 SHA256 d976e610e12580b0754c53397da72ee8b924aa7666a60e10497de04cebca0690
-EBUILD giggle-0.4.ebuild 720 RMD160 01c64399d60cf95cdc7a06d7519147ffb56c0f4e SHA1 cc2e853cd27255c72865fac33d8511a597569bae SHA256 a0bd886cfa13ad0a1b0c4671fad2d061177c5e91aa7016c33144ce53f5f6656b
-EBUILD giggle-0.5.ebuild 934 RMD160 2fef0b7643c35d58d989e4f60c13522d70d1f617 SHA1 32305fceb4399049307384a0cc3ca3b99fd63d78 SHA256 37471f0aeace6d0a70706331f18e282beb4bf878728e4a0feaa2f825d980093c
-MISC ChangeLog 3834 RMD160 03849d0f5601f6d6d0331d1677ebe5aa151db55a SHA1 f94377b25f309b094e69c878bfe17561524fc81e SHA256 88b28669b72feeb5d49cf2063b130f3a3ff28e640d30546b4081e9569bb419c1
+EBUILD giggle-0.4.95.ebuild 908 RMD160 f7e3951a161fbab36d242f0885701fb25d3dab23 SHA1 27fc6165281503762492c80c530d02a3da79220e SHA256 fcbd87444e3b25a2186e4c1e9f7143e1fa4fe0e4ce47588f70652fc2cdeee41c
+EBUILD giggle-0.4.96.ebuild 968 RMD160 642859f97965794c975540cc875c7aba795e3059 SHA1 40eadb635380cbfaf1a6b0b6c5168d2c23fb8f23 SHA256 37e68244663ddf24b9a88ed6159ed87acf961f48e55296449ec0c2793e9063d0
+EBUILD giggle-0.4.ebuild 748 RMD160 f7a828650fc29c35acf9da68b31e28125f2f8a06 SHA1 7648fe4644cf0dc5c5d533fd8f224ac50b98a07e SHA256 833528d6eb5d2081b49a894299895b59778ccad3ae4387c728089afd4019ec3f
+EBUILD giggle-0.5.ebuild 961 RMD160 d775c07da101a70b02b028341794bc00b05fb316 SHA1 329cc6fce0c0f655cf4f14ac672247a2b404a951 SHA256 1b2f7630aaa54b01e4f6ac991521096be900a8de6c3270cbfc9c6a4cb8a7a361
+MISC ChangeLog 4133 RMD160 2293dce0fe0b817daa5154da40dbbcc490ba0df4 SHA1 a6d93b755c7b9929162b7730edfa13b53f93ddaa SHA256 7a0793c522e068cdeef251d3ec7ca4467f07f55b9188ff381d9a2cc21b8a1d83
 MISC metadata.xml 330 RMD160 ebd81b774e9fc194d76d6972ae0b5242563f7716 SHA1 c88cb5bd6aa8480f9f939be1890eda2dea083a19 SHA256 34755ef9637f42e2a77bd8159b8b7679bb3e619d5d5fa7b7dc36a8fbeb2c96f7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkwIRacACgkQu7rWomwgFXpCDwCeM9+J8TY3zOZjwavMNRzpW+sW
-7GUAnRWsi4fjH5Rvf4pZt0nnj7B/zBbu
-=j3nm
+iEYEARECAAYFAkwItJwACgkQu7rWomwgFXo2CACfXW6NV58DEsi6rSElXzwhZtfw
+NbMAnj0PlG5+c3Lvny3XX4LdBvZRhaRn
+=Hw52
 -----END PGP SIGNATURE-----
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"