[gentoo-commits] dev/ikelos:master commit in: dev-vcs/giggle/files/, dev-vcs/giggle/

[Mike Auty]

commit:     5d5f55452874ecf2f98b344712c0c3d47ef368cf
Author:     Mike Auty <ikelos <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 30 15:50:03 2013 +0000
Commit:     Mike Auty <ikelos <AT> gentoo <DOT> org>
CommitDate: Sat Mar 30 15:50:03 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/ikelos.git;a=commit;h=5d5f5545

Test out giggle gtksourceview-3.8.0 patch.

---
 dev-vcs/giggle/ChangeLog                           |  169 ++++++++++++++++++++
 dev-vcs/giggle/Manifest                            |    6 +
 .../files/giggle-0.6.1-gmodule-explicit.patch      |   23 +++
 .../files/giggle-0.6.2-gtksourceview-3.8.0.patch   |   24 +++
 dev-vcs/giggle/giggle-0.6.2.ebuild                 |   39 +++++
 dev-vcs/giggle/metadata.xml                        |   12 ++
 6 files changed, 273 insertions(+), 0 deletions(-)

diff --git a/dev-vcs/giggle/ChangeLog b/dev-vcs/giggle/ChangeLog
new file mode 100644
index 0000000..8907592
--- /dev/null
+++ b/dev-vcs/giggle/ChangeLog
@@ -0,0 +1,169 @@
+# ChangeLog for dev-vcs/giggle
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/giggle/ChangeLog,v 1.19 2013/02/14 12:08:26 ago Exp $
+
+  14 Feb 2013; Agostino Sarubbo <ago@g.o> giggle-0.6.2.ebuild:
+  Stable for x86, wrt bug #457352
+
+  14 Feb 2013; Agostino Sarubbo <ago@g.o> giggle-0.6.2.ebuild:
+  Stable for amd64, wrt bug #457352
+
+*giggle-0.6.2 (29 Dec 2012)
+
+  29 Dec 2012; Mike Auty <ikelos@g.o> giggle-0.5.ebuild,
+  giggle-0.6.1.ebuild, +giggle-0.6.2.ebuild:
+  Bump giggle to 0.6.2. Also block all ebuilds on evolution-data-server-3.6
+  which changed headers out from under programs (see bug 449138).
+
+  03 Aug 2012; Markos Chandras <hwoarang@g.o> giggle-0.6.1.ebuild:
+  Stable on amd64 wrt bug #428054
+
+  27 Jul 2012; Jeff Horelick <jdhore@g.o> giggle-0.6.1.ebuild:
+  marked x86 per bug 428054
+
+  06 May 2012; Mike Auty <ikelos@g.o> giggle-0.6.1.ebuild,
+  +files/giggle-0.6.1-gmodule-explicit.patch:
+  Fix bug 414835, no version bump since it's a compilation bug.
+
+  03 May 2012; Jeff Horelick <jdhore@g.o> giggle-0.5.ebuild,
+  giggle-0.6.1.ebuild:
+  dev-util/pkgconfig -> virtual/pkgconfig
+
+  13 Dec 2011; Mike Auty <ikelos@g.o> giggle-0.6.1.ebuild:
+  Add dependency on yelp-tools (and hence itstool) to solve bug 394613.
+  Requires the removal of the ppc flag until itstool/yelp-tools are keyworded
+  for ppc.
+
+  10 Dec 2011; Mike Auty <ikelos@g.o> giggle-0.6.1.ebuild:
+  Removed the eautoreconf since it would have needed yelp-tools, which isn't
+  yet keyworded for ppc. Thanks to Rafał Mużyło for the speedy diagnosis.
+  Fixes bug 393271.
+
+  04 Dec 2011; Mike Auty <ikelos@g.o> giggle-0.6.1.ebuild:
+  Fix up missing dependencies, closes bug 393171.
+
+*giggle-0.6.1 (04 Dec 2011)
+
+  04 Dec 2011; Mike Auty <ikelos@g.o> +giggle-0.6.1.ebuild:
+  Bump giggle to 0.6.1.
+
+  21 Mar 2011; Nirbheek Chauhan <nirbheek@g.o> -giggle-0.4.ebuild,
+  -giggle-0.4.95.ebuild, -giggle-0.4.96.ebuild, giggle-0.5.ebuild:
+  Fix slot-deps on gnome libs
+
+  12 Jul 2010; Markos Chandras <hwoarang@g.o> giggle-0.5.ebuild:
+  Stable on amd64 wrt bug #327341
+
+  12 Jul 2010; Christian Faulhammer <fauli@g.o> giggle-0.5.ebuild:
+  stable x86, bug 327341
+
+  04 Jun 2010; Mike Auty <ikelos@g.o> 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)
+
+  04 Jun 2010; Mike Auty <ikelos@g.o> +giggle-0.5.ebuild:
+  Version bump giggle to 0.5.
+
+  21 Mar 2010; Mike Auty <ikelos@g.o> giggle-0.4.96.ebuild:
+  Add in x11-libs/vte to giggle's dependencies, bug 308393.
+
+  17 Mar 2010; Sebastian Pipping <sping@g.o> giggle-0.4.ebuild,
+  giggle-0.4.90.ebuild, giggle-0.4.91.ebuild, giggle-0.4.95.ebuild,
+  giggle-0.4.96.ebuild:
+  Propagate move of dev-util/git to dev-vcs/git
+
+  04 Mar 2010; Mike Auty <ikelos@g.o> +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, +metadata.xml:
+  Move category from dev-util to dev-vcs.
+
+  21 Feb 2010; Jonathan Callen <abcd@g.o> giggle-0.4.96.ebuild:
+  Transfer prefix keywords (no other changes)
+
+*giggle-0.4.96 (11 Feb 2010)
+
+  11 Feb 2010; Mike Auty <ikelos@g.o> +giggle-0.4.96.ebuild:
+  Version bump giggle to 0.4.96, fixes bug 304511.
+
+  09 Feb 2010; Mike Auty <ikelos@g.o> giggle-0.4.95.ebuild:
+  Fix up dependency on gtksourceview, bug 303981.
+
+  06 Feb 2010; Mike Auty <ikelos@g.o> giggle-0.4.95.ebuild:
+  Change giggle dependency to require >=autoconf-2.64. Since this would
+  break the install for affected users, no bump is required.
+
+  06 Feb 2010; Mike Auty <ikelos@g.o> giggle-0.4.95.ebuild:
+  Remove epatch line from 0.4.95.
+
+*giggle-0.4.95 (05 Feb 2010)
+
+  05 Feb 2010; Mike Auty <ikelos@g.o> +giggle-0.4.95.ebuild:
+  Version bump giggle to 0.4.95.
+
+  29 Apr 2009; Mike Auty <ikelos@g.o> -giggle-0.2.ebuild,
+  -giggle-0.3.ebuild, giggle-0.4.ebuild, giggle-0.4.90.ebuild,
+  giggle-0.4.91.ebuild:
+  Remove old versions and add DOCS to existing versions of giggle.
+
+  03 Apr 2009; Mike Auty <ikelos@g.o> giggle-0.4.91.ebuild:
+  Add dependency on libtool-2, fixes bug 264745.
+
+*giggle-0.4.91 (03 Apr 2009)
+
+  03 Apr 2009; Mike Auty <ikelos@g.o>
+  +files/giggle-0.4.91-libgiggle.patch, +giggle-0.4.91.ebuild:
+  Version bump giggle to development version 0.4.91.
+
+  15 Feb 2009; Mike Auty <ikelos@g.o> giggle-0.4.90.ebuild:
+  Giggle-0.4.90 depends on glib-2.18, thanks to Jose Marino (bug 259054).
+
+  14 Feb 2009; Mike Auty <ikelos@g.o> giggle-0.4.90.ebuild:
+  Add in dependency on evolution-data-server, which can't be configured out,
+  and is needed for a giggle plugin.
+
+*giggle-0.4.90 (14 Feb 2009)
+
+  14 Feb 2009; Mike Auty <ikelos@g.o> +giggle-0.4.90.ebuild:
+  Version bump, thanks to mraudsepp for the request.
+
+  26 Jan 2009; Mike Auty <ikelos@g.o> giggle-0.4.ebuild:
+  Fix homepage on most recent giggle ebuild.
+
+  15 Jan 2009; Mike Auty <ikelos@g.o> metadata.xml:
+  Compnerd's retired, taking over giggle.
+
+*giggle-0.4 (27 Jan 2008)
+
+  27 Jan 2008; Saleem Abdulrasool <compnerd@g.o> +giggle-0.4.ebuild:
+  Version bump from upstream
+
+  12 Oct 2007; Rémi Cardona <remi@g.o> giggle-0.2.ebuild,
+  giggle-0.3.ebuild:
+  update gtksourceview deps (see bug #195366)
+
+  16 May 2007; Joseph Jezak <josejx@g.o> giggle-0.2.ebuild,
+  giggle-0.3.ebuild:
+  Marked ~ppc for bug #178677.
+
+  15 May 2007; Thilo Bangert <bangert@g.o> metadata.xml:
+  add <herd>no-herd</herd>
+
+*giggle-0.3 (13 May 2007)
+
+  13 May 2007; Saleem Abdulrasool <compnerd@g.o> +giggle-0.3.ebuild:
+  Version bump from upstream
+
+  13 May 2007; Saleem Abdulrasool <compnerd@g.o> giggle-0.2.ebuild:
+  Fix the really broken dependencies
+
+*giggle-0.2 (11 May 2007)
+
+  11 May 2007; Saleem Abdulrasool <compnerd@g.o> +metadata.xml,
+  +giggle-0.2.ebuild:
+  Initial import of giggle

diff --git a/dev-vcs/giggle/Manifest b/dev-vcs/giggle/Manifest
new file mode 100644
index 0000000..e2e379f
--- /dev/null
+++ b/dev-vcs/giggle/Manifest
@@ -0,0 +1,6 @@
+AUX giggle-0.6.1-gmodule-explicit.patch 849 SHA256 f8ad37a5e533e24afe127e6d67f7baf055ebed93b822644d7a08d97c96079474 SHA512 7ba79fb3ef3a41c701fecb77af0b1fc4cd2c2de09d1769e1f50d5614d802dd8cfe5116b7f3f1a6355eae22d265a16a35f0eb19064012cfe3a4997bff2a554ee4 WHIRLPOOL 77460b73f8096e41799f60ce859767415765edea629746ae2cc144d38a4f193e5f440e185984246e84dc70118b1005d49a38110c0947c1531ca86422cb46fc3e
+AUX giggle-0.6.2-gtksourceview-3.8.0.patch 903 SHA256 1a24e5383f4bd2eac28a8c1e1ff46fd27159c0d58744a4fbaa179245eafdd1eb SHA512 c60aaeab48ce95fb33dd7a93d51c3d7d17f449fdb0ae29b58cbe10f8e722c482d3793885c5d870b6ec8c03162aa37fef0b5e9dfeb9844494eddb318ecb703425 WHIRLPOOL 06fe5d90f85e39291c1defc7acd0fe3d58adae0d8b947cbea09975c91e63dbde208b16b510873cd2e58bef270e66b589b3cce9412ee108fd8fe5fc63b5518ddf
+DIST giggle-0.6.2.tar.xz 1779744 SHA256 6d56c8a3b9ce12a87cd1aeb03f8cdabfc52a614d23a8db85878743b02426fee0 SHA512 e69bb477213475a7086719e0350947d18d7ce95ec68a88cfa83b6235f847304497046781c56304489a5e56ecb1b444e9c2642006157fd53a1c2252f5456334bf WHIRLPOOL 250c0d7308e725ed4e4b7457b1808abccd204978730289fa714eff7ba5917c5b0d5feb5e46a308996f2448a1582b6d73b68f8ac55332d84012e64b76efe27a0e
+EBUILD giggle-0.6.2.ebuild 1000 SHA256 a10f867000e7a45afed367e50d77b162dbc2248085787dd296595f53aef580eb SHA512 0608b43e4431974f00e2eb394d219c746ef7eb0507ecfe8fa55b2c17faac3a5547e42cacd04ebe34b9c607ab5854ecbd1b679481b2eec69c68f20bac66f2fff1 WHIRLPOOL a8ee445104759da187b5001d1cdb27d817ea1917e01f52bc22652228a1ab1b9501b3d0e52e8287e16474ebe1e716827ddc9b28de44352af9e514fd8e03f0d869
+MISC ChangeLog 6228 SHA256 93338fe0a78b9901dc22c4df055f306989cd0780cb325f405086463fe0203fa0 SHA512 4e885b2e0ee1e85d3dd18c9ab1198ca2b69150c9a8445af26421c216f72186b5aaf6c85d554b6b89e15963504f000159cc9bc631f7f4d3782772b35355217060 WHIRLPOOL f133c7d397d00ebc68802d75720841a579c76a74b5eb44905e63f61277749d0b2ea85172bf6edd29dd7adb35b4739e23061972e98acca04b999997578e993a61
+MISC metadata.xml 308 SHA256 99f014e759c422b2db301da36b8f3b84b1bd38fe53e49eb54c2827368e42bcee SHA512 d6c8bf2e6d89f4d4257f786656f09d4ee2a01e44112f0886e5759ce9baf8ec9be1d53b8c1871cffd861e0978c7993da1cfde38cdeea9b58ccb590812b2b074a4 WHIRLPOOL e654dba79563e6aa4673c8d5f859ee23a3f0e3c589b15d642e97991161b9a2755d90805c4c4a47bcf97427a0aebb740b0a7552143ec264ed5a24d5d618d4189a

diff --git a/dev-vcs/giggle/files/giggle-0.6.1-gmodule-explicit.patch b/dev-vcs/giggle/files/giggle-0.6.1-gmodule-explicit.patch
new file mode 100644
index 0000000..2716ea2
--- /dev/null
+++ b/dev-vcs/giggle/files/giggle-0.6.1-gmodule-explicit.patch
@@ -0,0 +1,23 @@
+From 6a4d71af9920df76a15e427671c90952fddbb411 Mon Sep 17 00:00:00 2001
+From: Vincent Untz <vuntz@×××××.org>
+Date: Thu, 19 Jan 2012 13:48:40 +0000
+Subject: build: Explicitly link to gmodule-2.0
+
+gmodule-2.0 is now gone from the pkg-config files for GTK+ 3 and others.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=667350
+---
+diff --git a/configure.ac b/configure.ac
+index 07f5b7b..aa11046 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -55,6 +55,7 @@ GTKSOURCE_REQUIRED_VERSION=3.0
+ PKG_CHECK_MODULES(GIGGLE, [
+         gio-2.0           >= $GLIB_REQUIRED_VERSION
+         glib-2.0          >= $GLIB_REQUIRED_VERSION
++        gmodule-2.0       >= $GLIB_REQUIRED_VERSION
+         gthread-2.0       >= $GLIB_REQUIRED_VERSION
+         gdk-pixbuf-2.0    >= $GDK_PIXBUF_REQUIRED_VERSION
+         gdk-3.0           >= $GTK_REQUIRED_VERSION
+--
+cgit v0.9.0.2

diff --git a/dev-vcs/giggle/files/giggle-0.6.2-gtksourceview-3.8.0.patch b/dev-vcs/giggle/files/giggle-0.6.2-gtksourceview-3.8.0.patch
new file mode 100644
index 0000000..37648e1
--- /dev/null
+++ b/dev-vcs/giggle/files/giggle-0.6.2-gtksourceview-3.8.0.patch
@@ -0,0 +1,24 @@
+diff --git a/src/giggle-diff-view.h b/src/giggle-diff-view.h
+index de5fe02..9ef33b5 100644
+--- a/src/giggle-diff-view.h
++++ b/src/giggle-diff-view.h
+@@ -23,6 +23,7 @@
+ 
+ #include <glib-object.h>
+ #include <gtk/gtk.h>
++#include <gtksourceview/gtksourcebuffer.h>
+ #include <gtksourceview/gtksourceview.h>
+ #include <gtksourceview/gtksourcelanguagemanager.h>
+ 
+diff --git a/src/giggle-view-file.c b/src/giggle-view-file.c
+index 7746225..7b74c0a 100644
+--- a/src/giggle-view-file.c
++++ b/src/giggle-view-file.c
+@@ -42,6 +42,7 @@
+ 
+ #include <gtksourceview/gtksourcelanguagemanager.h>
+ #include <gtksourceview/gtksourceview.h>
++#include <gtksourceview/gtksourcebuffer.h>
+ 
+ #define GIGGLE_TYPE_VIEW_FILE_SNAPSHOT            (giggle_view_file_snapshot_get_type ())
+ #define GIGGLE_VIEW_FILE_SNAPSHOT(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIGGLE_TYPE_VIEW_FILE_SNAPSHOT, GiggleViewFileSnapshot))

diff --git a/dev-vcs/giggle/giggle-0.6.2.ebuild b/dev-vcs/giggle/giggle-0.6.2.ebuild
new file mode 100644
index 0000000..f992ae1
--- /dev/null
+++ b/dev-vcs/giggle/giggle-0.6.2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/giggle/giggle-0.6.2.ebuild,v 1.3 2013/02/14 12:08:26 ago Exp $
+
+EAPI="5"
+
+inherit gnome2 eutils
+
+DESCRIPTION="GTK+ Frontend for GIT"
+HOMEPAGE="http://live.gnome.org/giggle"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86 ~x86-interix ~amd64-linux ~x86-linux"
+IUSE="eds"
+
+RDEPEND=">=dev-vcs/git-1.5
+		 >=dev-libs/glib-2.18:2
+		 >=x11-libs/gtk+-3.0:3
+		 >=x11-libs/gtksourceview-3.0:3.0
+		 >=x11-libs/gdk-pixbuf-2.22.0
+		 gnome-base/gnome-common
+		 eds? ( <gnome-extra/evolution-data-server-3.6 )
+		 >=x11-libs/vte-0.26:2.90"
+DEPEND="${RDEPEND}
+		sys-devel/gettext
+		app-text/yelp-tools
+		virtual/pkgconfig
+		>=dev-util/intltool-0.35
+		>=sys-devel/autoconf-2.64
+		>=sys-devel/libtool-2"
+
+DOCS="AUTHORS ChangeLog NEWS README"
+
+G2CONF="$(use_enable eds evolution-data-server)"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-0.6.2-gtksourceview-3.8.0.patch"
+}

diff --git a/dev-vcs/giggle/metadata.xml b/dev-vcs/giggle/metadata.xml
new file mode 100644
index 0000000..ff68861
--- /dev/null
+++ b/dev-vcs/giggle/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>ikelos@g.o</email>
+		<name>Mike Auty</name>
+	</maintainer>
+	<longdescription lang="en">
+		GTK+ based frontend for GIT
+	</longdescription>
+</pkgmetadata>
+