[gentoo-commits] proj/gnome:master commit in: dev-util/glade/, dev-util/glade/files/

[Gilles Dartiguelongue]

commit:     59137486bd3d7f02c4a2c94a27f7eaa043483dba
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 30 22:25:07 2012 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Tue Oct 30 22:25:07 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=59137486

dev-util/glade: 3.12.1 → 3.14.1

---
 .../glade/files/glade-3.14.1-doc-version.patch     |   29 +++++++++
 dev-util/glade/glade-3.14.1.ebuild                 |   64 ++++++++++++++++++++
 dev-util/glade/metadata.xml                        |    9 +++
 3 files changed, 102 insertions(+), 0 deletions(-)

diff --git a/dev-util/glade/files/glade-3.14.1-doc-version.patch b/dev-util/glade/files/glade-3.14.1-doc-version.patch
new file mode 100644
index 0000000..39c9641
--- /dev/null
+++ b/dev-util/glade/files/glade-3.14.1-doc-version.patch
@@ -0,0 +1,29 @@
+From e3e91245e730f0532e913fde910054f464085241 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@g.o>
+Date: Sun, 6 May 2012 22:40:47 -0400
+Subject: [PATCH] Version glade documentation
+
+Rename gnome help files to prevent collision with other versions.
+
+Avoid loading glade-3.8's devhelp files.
+---
+ help/Makefile.am   |    5 ++++-
+ src/glade-window.c |    2 +-
+ 2 files changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/src/glade-window.c b/src/glade-window.c
+index 89a4549..4eb8be5 100644
+--- a/src/glade-window.c
++++ b/src/glade-window.c
+@@ -2041,7 +2041,7 @@ show_developer_manual_cb (GtkAction * action, GladeWindow * window)
+ {
+   if (glade_util_have_devhelp ())
+     {
+-      glade_util_search_devhelp ("gladeui", NULL, NULL);
++      glade_util_search_devhelp ("gladeui-2", NULL, NULL);
+       return;
+     }
+ 
+-- 
+1.7.8.6
+

diff --git a/dev-util/glade/glade-3.14.1.ebuild b/dev-util/glade/glade-3.14.1.ebuild
new file mode 100644
index 0000000..f67cf11
--- /dev/null
+++ b/dev-util/glade/glade-3.14.1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/glade/glade-3.12.2.ebuild,v 1.1 2012/09/22 10:06:06 pacho Exp $
+
+EAPI="4"
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
+
+inherit eutils gnome2 versionator
+
+DESCRIPTION="A User Interface Designer"
+HOMEPAGE="http://glade.gnome.org/"
+
+LICENSE="GPL-2"
+SLOT="3.10"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="+introspection python"
+
+RDEPEND="dev-libs/atk[introspection?]
+	>=dev-libs/glib-2.32:2
+	>=dev-libs/libxml2-2.4.0:2
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2[introspection?]
+	>=x11-libs/gtk+-3.6:3[introspection?]
+	x11-libs/pango[introspection?]
+	introspection? ( >=dev-libs/gobject-introspection-0.10.1 )
+	python? ( >=dev-python/pygobject-2.90.4:3 )
+"
+DEPEND="${RDEPEND}
+	app-text/docbook-xml-dtd:4.1.2
+	app-text/yelp-tools
+	>=dev-util/gtk-doc-am-1.13
+	>=dev-util/intltool-0.41.0
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+"
+# eautoreconf requires:
+#	dev-libs/gobject-introspection-common
+#	gnome-base/gnome-common
+
+src_prepare() {
+	DOCS="AUTHORS ChangeLog NEWS README TODO"
+	G2CONF="${G2CONF}
+		--disable-static
+		--enable-libtool-lock
+		$(use_enable introspection)
+		$(use_enable python)"
+
+	# To avoid file collison with other slots, rename help module.
+	# Prevent the UI from loading glade:3's gladeui devhelp documentation.
+	epatch "${FILESDIR}/${PN}-3.14.1-doc-version.patch"
+
+	gnome2_src_prepare
+}
+
+src_install() {
+	# modify Name in .desktop file to avoid confusion with other slots
+	sed -e 's:^\(Name.*=Glade\):\1 '$(get_version_component_range 1-2): \
+		-i data/glade.desktop || die "sed of data/glade.desktop failed"
+	# modify name in .devhelp2 file to avoid shadowing with glade:3 docs
+	sed -e 's:name="gladeui":name="gladeui-2":' \
+		-i doc/html/gladeui.devhelp2 || die "sed of gladeui.devhelp2 failed"
+	gnome2_src_install
+}

diff --git a/dev-util/glade/metadata.xml b/dev-util/glade/metadata.xml
new file mode 100644
index 0000000..e86947c
--- /dev/null
+++ b/dev-util/glade/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>gnome</herd>
+  <use>
+    <flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg>
+      for introspection</flag>
+  </use>
+</pkgmetadata>