[gentoo-commits] proj/gnome:master commit in: dev-libs/libpeas/, dev-libs/libpeas/files/

[Alexandre Restovtsev]

commit:     7432d92b649634ba01819ffa74465a911c4dd628
Author:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Thu Nov  3 03:36:02 2011 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Thu Nov  3 04:06:20 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=7432d92b

dev-libs/libpeas: fix g-i annotations + qa

Add an upstream patch to change PeasPluginInfo return values from
transfer full to transfer none; fixes crashes in python code that uses
libpeas.

Drop $(use_enable deprecated depracation): it had no effect (we were
overriding it with --disable-depracation anyway, and there was no
deprecated in IUSE), and disabling deprecations only makes sense for
upstream libpeas developers, not for users.

Port to EAPI4 and let gnome.eclass take care of maintainer mode.

Drop KEYWORDS to match gx86.

---
 .../libpeas-1.2.0-PeasPluginInfo-annotation.patch  |   57 ++++++++++++++++++++
 ...ibpeas-1.2.0.ebuild => libpeas-1.2.0-r1.ebuild} |   21 +++++---
 dev-libs/libpeas/libpeas-9999.ebuild               |   12 ++---
 3 files changed, 75 insertions(+), 15 deletions(-)

diff --git a/dev-libs/libpeas/files/libpeas-1.2.0-PeasPluginInfo-annotation.patch b/dev-libs/libpeas/files/libpeas-1.2.0-PeasPluginInfo-annotation.patch
new file mode 100644
index 0000000..3a2e9b4
--- /dev/null
+++ b/dev-libs/libpeas/files/libpeas-1.2.0-PeasPluginInfo-annotation.patch
@@ -0,0 +1,57 @@
+From afa50c526ce1aab53eff3c3373a97180fc90abe2 Mon Sep 17 00:00:00 2001
+From: Garrett Regier <garrettregier@×××××.com>
+Date: Thu, 29 Sep 2011 15:46:49 -0700
+Subject: [PATCH] Annotate PeasPluginInfo return values as transfer none
+
+Otherwise GObject-Introspection says that it is transfer full.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=660524
+---
+ libpeas-gtk/peas-gtk-plugin-manager-view.c |    2 +-
+ libpeas/peas-engine.c                      |    2 +-
+ libpeas/peas-extension-base.c              |    3 ++-
+ 3 files changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/libpeas-gtk/peas-gtk-plugin-manager-view.c b/libpeas-gtk/peas-gtk-plugin-manager-view.c
+index 7eb7361..5f8f55f 100644
+--- a/libpeas-gtk/peas-gtk-plugin-manager-view.c
++++ b/libpeas-gtk/peas-gtk-plugin-manager-view.c
+@@ -952,7 +952,7 @@ peas_gtk_plugin_manager_view_set_selected_plugin (PeasGtkPluginManagerView *view
+  *
+  * Returns the currently selected plugin, or %NULL if a plugin is not selected.
+  *
+- * Returns: the selected plugin.
++ * Returns: (transfer none): the selected plugin.
+  */
+ PeasPluginInfo *
+ peas_gtk_plugin_manager_view_get_selected_plugin (PeasGtkPluginManagerView *view)
+diff --git a/libpeas/peas-engine.c b/libpeas/peas-engine.c
+index 1adf4ff..7b57d56 100644
+--- a/libpeas/peas-engine.c
++++ b/libpeas/peas-engine.c
+@@ -733,7 +733,7 @@ compare_plugin_info_and_name (PeasPluginInfo *info,
+  * Gets the #PeasPluginInfo corresponding with @plugin_name,
+  * or %NULL if @plugin_name was not found.
+  *
+- * Returns: the #PeasPluginInfo corresponding with
++ * Returns: (transfer none): the #PeasPluginInfo corresponding with
+  * a given plugin module name.
+  */
+ PeasPluginInfo *
+diff --git a/libpeas/peas-extension-base.c b/libpeas/peas-extension-base.c
+index 329a25f..7c4cba0 100644
+--- a/libpeas/peas-extension-base.c
++++ b/libpeas/peas-extension-base.c
+@@ -141,7 +141,8 @@ peas_extension_base_class_init (PeasExtensionBaseClass *klass)
+  *
+  * Get information relative to @extbase.
+  *
+- * Return value: the #PeasPluginInfo relative to the #PeasExtensionBase.
++ * Return value: (transfer none): the #PeasPluginInfo relative
++ * to the #PeasExtensionBase.
+  */
+ PeasPluginInfo *
+ peas_extension_base_get_plugin_info (PeasExtensionBase *extbase)
+-- 
+1.7.7.2
+

diff --git a/dev-libs/libpeas/libpeas-1.2.0.ebuild b/dev-libs/libpeas/libpeas-1.2.0-r1.ebuild
similarity index 84%
rename from dev-libs/libpeas/libpeas-1.2.0.ebuild
rename to dev-libs/libpeas/libpeas-1.2.0-r1.ebuild
index 9582642..aba6158 100644
--- a/dev-libs/libpeas/libpeas-1.2.0.ebuild
+++ b/dev-libs/libpeas/libpeas-1.2.0-r1.ebuild
@@ -2,13 +2,12 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="3"
-GNOME_TARBALL_SUFFIX="xz"
+EAPI="4"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 PYTHON_DEPEND="python? 2:2.5"
 
-inherit gnome2 python virtualx
+inherit eutils gnome2 python virtualx
 if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live
 fi
@@ -22,7 +21,7 @@ IUSE="doc gjs +gtk glade +python seed vala"
 if [[ ${PV} = 9999 ]]; then
 	KEYWORDS=""
 else
-	KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+	KEYWORDS="~amd64 ~x86"
 fi
 
 RDEPEND=">=dev-libs/glib-2.23.6:2
@@ -42,7 +41,6 @@ DOCS="AUTHORS ChangeLog NEWS README"
 
 pkg_setup() {
 	G2CONF="${G2CONF}
-		$(use_enable deprecated deprecation)
 		$(use_enable gjs)
 		$(use_enable glade glade-catalog)
 		$(use_enable gtk)
@@ -51,12 +49,19 @@ pkg_setup() {
 		$(use_enable vala)
 		VALAC=$(type -P valac-0.12)
 		--disable-deprecation
-		--disable-static
-		--disable-maintainer-mode"
+		--disable-static"
 	# Wtf, --disable-gcov, --enable-gcov=no, --enable-gcov, all enable gcov
 	# What do we do about gdb, valgrind, gcov, etc?
 
 	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	# Upstream patch to fix g-i annotations; prevents crashes
+	epatch "${FILESDIR}/${P}-PeasPluginInfo-annotation.patch"
+
+	gnome2_src_prepare
 }
 
 src_test() {
@@ -66,5 +71,5 @@ src_test() {
 	# >>> from gi.repository import Gtk
 	# >>> Gtk.IconTheme.get_default().has_icon("gtk-about")
 	# This should return True, it returns False for Xvfb
-	Xemake check || die
+	Xemake check
 }

diff --git a/dev-libs/libpeas/libpeas-9999.ebuild b/dev-libs/libpeas/libpeas-9999.ebuild
index 9582642..84eb038 100644
--- a/dev-libs/libpeas/libpeas-9999.ebuild
+++ b/dev-libs/libpeas/libpeas-9999.ebuild
@@ -2,8 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="3"
-GNOME_TARBALL_SUFFIX="xz"
+EAPI="4"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 PYTHON_DEPEND="python? 2:2.5"
@@ -22,7 +21,7 @@ IUSE="doc gjs +gtk glade +python seed vala"
 if [[ ${PV} = 9999 ]]; then
 	KEYWORDS=""
 else
-	KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+	KEYWORDS="~amd64 ~x86"
 fi
 
 RDEPEND=">=dev-libs/glib-2.23.6:2
@@ -42,7 +41,6 @@ DOCS="AUTHORS ChangeLog NEWS README"
 
 pkg_setup() {
 	G2CONF="${G2CONF}
-		$(use_enable deprecated deprecation)
 		$(use_enable gjs)
 		$(use_enable glade glade-catalog)
 		$(use_enable gtk)
@@ -51,12 +49,12 @@ pkg_setup() {
 		$(use_enable vala)
 		VALAC=$(type -P valac-0.12)
 		--disable-deprecation
-		--disable-static
-		--disable-maintainer-mode"
+		--disable-static"
 	# Wtf, --disable-gcov, --enable-gcov=no, --enable-gcov, all enable gcov
 	# What do we do about gdb, valgrind, gcov, etc?
 
 	python_set_active_version 2
+	python_pkg_setup
 }
 
 src_test() {
@@ -66,5 +64,5 @@ src_test() {
 	# >>> from gi.repository import Gtk
 	# >>> Gtk.IconTheme.get_default().has_icon("gtk-about")
 	# This should return True, it returns False for Xvfb
-	Xemake check || die
+	Xemake check
 }