Fix namespacing of introspection annotations, bug #426984 by Flo Gravo and Randy Tupas. Drop old.

Package-Manager: portage-2.1.11.9/cvs/Linux x86_64

5 files changed, 104 insertions, 96 deletions

diff --git a/net-libs/libsocialweb/ChangeLog b/net-libs/libsocialweb/ChangeLog
index 0a78cb82ad14..d48415e02380 100644
--- a/net-libs/libsocialweb/ChangeLog
+++ b/net-libs/libsocialweb/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-libs/libsocialweb
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libsocialweb/ChangeLog,v 1.9 2012/06/05 08:19:13 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libsocialweb/ChangeLog,v 1.10 2012/07/21 12:12:05 pacho Exp $
+
+  21 Jul 2012; Pacho Ramos <pacho@gentoo.org>
+  +files/libsocialweb-0.25.20-introspection-annotations.patch,
+  -libsocialweb-0.25.19.ebuild, libsocialweb-0.25.20.ebuild:
+  Fix namespacing of introspection annotations, bug #426984 by Flo Gravo and
+  Randy Tupas. Drop old.
 
   05 Jun 2012; Justin Lecher <jlec@gentoo.org> libsocialweb-0.25.20.ebuild,
   +files/libsocialweb-0.25.20-gold.patch:
@@ -49,4 +55,3 @@
   24 Apr 2011; Nirbheek Chauhan <nirbheek@gentoo.org>
   +libsocialweb-0.25.16.ebuild, +metadata.xml:
   Move libsocialweb from the gnome overlay to tree
-
diff --git a/net-libs/libsocialweb/Manifest b/net-libs/libsocialweb/Manifest
index 41d2ae2c978d..c2231f119675 100644
--- a/net-libs/libsocialweb/Manifest
+++ b/net-libs/libsocialweb/Manifest
@@ -1,18 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
-AUX libsocialweb-0.25.20-gold.patch 5004 RMD160 f7da6faab94fb31bf5b2ff06b021d0e68d4d7e73 SHA1 c26b663fde81769f13cfa373467d77f3c4c3f903 SHA256 c61af2d8855e44bdb4e54ebfff874e53d5d7af5ea304a5e8983b2f0a02a71f4d
-DIST libsocialweb-0.25.19.tar.xz 470420 RMD160 7f84a0fcb423b861b22b59de7b44e43d490f051f SHA1 0742c5644cbacd6e5a14eaf377ffe8b5994e8a30 SHA256 377b165fed92e1d4f6c7a2430191388633ad25421a72d640e9e60dfdf1d54625
-DIST libsocialweb-0.25.20.tar.xz 471464 RMD160 55292f28cfaf5edc58df23dacc66b971a6fcc40a SHA1 85021d882e54643ee54df73fbd8f255e9d2353ea SHA256 eb0078f44eb5fc4570fcee26c5670a433ca1bb83be0cead421a4a03e7d838ff5
-EBUILD libsocialweb-0.25.19.ebuild 2245 RMD160 80b42aa7594e2def1d97e48acc38c124bb95c378 SHA1 ce270de6160fc09a128b5815fe69af7c2604e76c SHA256 8322dd997605bfcecffc84ac71d33b46bf37149ce6a01b0f1704018778d081a9
-EBUILD libsocialweb-0.25.20.ebuild 2108 RMD160 20ca97937cd4f0ff415b81eea96c7e010ee64c44 SHA1 df3d886326a7a5c024091ff3af6d6f8dd2356ab5 SHA256 11e09cf75542c3af2bfa70bd04086363047191ffb288158482062bb198af0f90
-MISC ChangeLog 1911 RMD160 0a3a152d693e0061f7abed36ac58095f6103969e SHA1 4f461b7f0e6d632c17b78578680969ff0e6c6411 SHA256 4f9e676a4182932133cff02ab664f2ee02dc5f0fa4a066151921b8339283e5e6
-MISC metadata.xml 556 RMD160 39c8463f2b9bed271b7579685ca5d28d80ab235e SHA1 84f44951299dec0c1ff993a203cead2871e08b3b SHA256 105ea0ba3827c13d8e3feea95034e64d682ecf6a3f17e62a396873a79fa32e18
+AUX libsocialweb-0.25.20-gold.patch 5004 SHA256 c61af2d8855e44bdb4e54ebfff874e53d5d7af5ea304a5e8983b2f0a02a71f4d SHA512 b25e77bb6797298536fb11af57ddf1491e70dee9698ee1fb43c7341801f9d30d2c681ff712ecea4d89669da1c6135c6c6c9ba78f93a640b92e614b7f79c7e0ff WHIRLPOOL 066cbd90eb23f18e9c10a7bbe506bab7b4c6913743e475d8488facf6f42a050d57861f3cd15cf914216701adbb671d71ec9d0665e2266267d7a1308610510b77
+AUX libsocialweb-0.25.20-introspection-annotations.patch 3152 SHA256 fec8d2c67c62618b89dca238ebe502c6525d42987625b6d87dd704f88219a46a SHA512 aad78b04fc850babff31a2b88e019d40642ffb838b54e891b0ebc33f07d5acd75b4bf257aee9cfee340180687ef23c0a07327f4003a09f1981d1f7728ef5ff82 WHIRLPOOL a3676fbc8f0399bdeaaeaa2d428d5c18370146d7912a6cf85053efc4f56b13464072a4a998b9c2fe96d0ed252b784428a56ecfeae09e64db84158452e13aabf7
+DIST libsocialweb-0.25.20.tar.xz 471464 SHA256 eb0078f44eb5fc4570fcee26c5670a433ca1bb83be0cead421a4a03e7d838ff5 SHA512 f10899e24a5127d63f46f07fffb32235209188aac0100f4756a077ed9cf74b928d0edcb7359fc606e0d6301c5ab2d79a525f1dfddf730250e31b5b30f3ef1544 WHIRLPOOL 3f456e189f604f125c7de71936f24b23ba00a25459f8b7112f24848a0179d36f92aa8f81107bf5f8f44b50a9523625ce1a61b4aa3058b047e7b1cdc1b0cd614d
+EBUILD libsocialweb-0.25.20.ebuild 2240 SHA256 b82f79de7541fe70a6722f0991201fe6296ecefe16b6e23dd0d556bed2677f8b SHA512 8a1961b0d176aed2acc633e89c34e73ef71c9866494b27e78c66e578063890084238fe0517f49431f06728e1c101b0b978db4743c7932e92001f6d12555e665e WHIRLPOOL 812931b55bd96442d75074dbcb7a37b9d044947a97839f08ce8b5c03271f866d759993ac51f9bf32de6cb22b4e41eab570415b9da5129912ead6d3ec0635f658
+MISC ChangeLog 2185 SHA256 7c1126650ce25834545ca8eb75d509b8639c9440a04d5b9d549e7bfa3d9fc1a9 SHA512 d26806ac53c0e319d2eecff2b276603f7d82954dfb85de26c2a85a4ecabf8709215f7a8a06946648a5e0e1b65c6b00ce55a8d6ac894010f3bf041d0763267b54 WHIRLPOOL 0794aad8f3daa3e7a719d121c6ce9bf5880c55e2df2062aac1351d0a8018397ae6e371d64ce635c1a489c219cc3766589d659c458c457b3b1e7a78bdc4294133
+MISC metadata.xml 556 SHA256 105ea0ba3827c13d8e3feea95034e64d682ecf6a3f17e62a396873a79fa32e18 SHA512 cfdff39a285a9163cdcad3bc007b4ce45ee18fe05e3150bfce29d6c2412915ec6e2a23c981d98a72bee28ba3f2c028347d0fd8f8f201a7dbddb548d3db509db8 WHIRLPOOL 225b12d5556c9c20cb5e989ca2d29c0b0319cb4faee5aa4a1fb51fbc507d572d0e6d3a1ddf6e9bd331d037db71e5edfa875520f8a94aa347d7b27eba771d06f6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
-Comment: GPGTools - http://gpgtools.org
 
-iEYEAREKAAYFAk/NwQMACgkQgAnW8HDreRaQZACffYHHovrZhEcoT/sinx/ALing
-ZK4AoJ39/5OvL0Z3MT7gIbNxvIcZ3GAX
-=pXZT
+iEYEAREIAAYFAlAKnJsACgkQCaWpQKGI+9T8eACeNULHIElUwVejDSafvhDTmUR9
+iSMAn1BvYhuOPH29ql3mrt9E5c835wOQ
+=lxxa
 -----END PGP SIGNATURE-----
diff --git a/net-libs/libsocialweb/files/libsocialweb-0.25.20-introspection-annotations.patch b/net-libs/libsocialweb/files/libsocialweb-0.25.20-introspection-annotations.patch
new file mode 100644
index 000000000000..23fc0f535853
--- /dev/null
+++ b/net-libs/libsocialweb/files/libsocialweb-0.25.20-introspection-annotations.patch
@@ -0,0 +1,82 @@
+From c1791e96182815449781fcda6007b69cd88cf7bf Mon Sep 17 00:00:00 2001
+From: Colin Walters <walters@verbum.org>
+Date: Mon, 04 Jun 2012 17:54:12 +0000
+Subject: client: Fix namespacing of introspection annotations
+
+---
+diff --git a/libsocialweb-client/sw-client-contact-view.c b/libsocialweb-client/sw-client-contact-view.c
+index bb2679f..6eaee0e 100644
+--- a/libsocialweb-client/sw-client-contact-view.c
++++ b/libsocialweb-client/sw-client-contact-view.c
+@@ -384,7 +384,7 @@ sw_client_contact_view_class_init (SwClientContactViewClass *klass)
+   /**
+    * SwClientContactView::contacts-added:
+    * @self:
+-   * @contacts: (type GLib.List) (element-type Sw.Contact):
++   * @contacts: (type GLib.List) (element-type SocialWebClient.Contact):
+    */
+   signals[CONTACTS_ADDED_SIGNAL] =
+     g_signal_new ("contacts-added",
+@@ -401,7 +401,7 @@ sw_client_contact_view_class_init (SwClientContactViewClass *klass)
+   /**
+    * SwClientContactView::contacts-removed:
+    * @self:
+-   * @contacts: (type GLib.List) (element-type Sw.Contact):
++   * @contacts: (type GLib.List) (element-type SocialWebClient.Contact):
+    */
+   signals[CONTACTS_REMOVED_SIGNAL] =
+     g_signal_new ("contacts-removed",
+@@ -418,7 +418,7 @@ sw_client_contact_view_class_init (SwClientContactViewClass *klass)
+   /**
+    * SwClientContactView::contacts-changed:
+    * @self:
+-   * @contacts: (type GLib.List) (element-type Sw.Contact):
++   * @contacts: (type GLib.List) (element-type SocialWebClient.Contact):
+    */
+   signals[CONTACTS_CHANGED_SIGNAL] =
+     g_signal_new ("contacts-changed",
+diff --git a/libsocialweb-client/sw-client-item-view.c b/libsocialweb-client/sw-client-item-view.c
+index 6bfdb76..ab98fdd 100644
+--- a/libsocialweb-client/sw-client-item-view.c
++++ b/libsocialweb-client/sw-client-item-view.c
+@@ -389,7 +389,7 @@ sw_client_item_view_class_init (SwClientItemViewClass *klass)
+   /**
+    * SwClientItemView::items-added:
+    * @self:
+-   * @items: (type GLib.List) (element-type Sw.Item):
++   * @items: (type GLib.List) (element-type SocialWebClient.Item):
+    */
+   signals[ITEMS_ADDED_SIGNAL] =
+     g_signal_new ("items-added",
+@@ -406,7 +406,7 @@ sw_client_item_view_class_init (SwClientItemViewClass *klass)
+   /**
+    * SwClientItemView::items-removed:
+    * @self:
+-   * @items: (type GLib.List) (element-type Sw.Item):
++   * @items: (type GLib.List) (element-type SocialWebClient.Item):
+    */
+   signals[ITEMS_REMOVED_SIGNAL] =
+     g_signal_new ("items-removed",
+@@ -423,7 +423,7 @@ sw_client_item_view_class_init (SwClientItemViewClass *klass)
+   /**
+    * SwClientItemView::items-changed:
+    * @self:
+-   * @items: (type GLib.List) (element-type Sw.Item):
++   * @items: (type GLib.List) (element-type SocialWebClient.Item):
+    */
+   signals[ITEMS_CHANGED_SIGNAL] =
+     g_signal_new ("items-changed",
+diff --git a/libsocialweb-client/sw-contact.c b/libsocialweb-client/sw-contact.c
+index efefb37..b56ab39 100644
+--- a/libsocialweb-client/sw-contact.c
++++ b/libsocialweb-client/sw-contact.c
+@@ -104,7 +104,6 @@ sw_contact_get_value (SwContact  *contact,
+ 
+ /**
+  * sw_contact_get_value_all: 
+- *
+  * @contact: :
+  * @key: :
+  *
+--
+cgit v0.9.0.2
diff --git a/net-libs/libsocialweb/libsocialweb-0.25.19.ebuild b/net-libs/libsocialweb/libsocialweb-0.25.19.ebuild
deleted file mode 100644
index f26ba3c04a62..000000000000
--- a/net-libs/libsocialweb/libsocialweb-0.25.19.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libsocialweb/libsocialweb-0.25.19.ebuild,v 1.2 2012/05/05 02:54:28 jdhore Exp $
-
-EAPI="3"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-GNOME_TARBALL_SUFFIX="xz"
-PYTHON_DEPEND="2"
-
-inherit gnome2 python
-
-DESCRIPTION="Social web services integration framework"
-HOMEPAGE="http://git.gnome.org/browse/libsocialweb"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc connman +gnome +introspection +networkmanager vala"
-
-# NOTE: coverage testing should not be enabled
-RDEPEND=">=dev-libs/glib-2.14:2
-	>=net-libs/rest-0.7.10
-
-	gnome-base/gconf:2
-	gnome-base/libgnome-keyring
-	dev-libs/dbus-glib
-	dev-libs/json-glib
-	net-libs/libsoup:2.4
-
-	gnome? ( >=net-libs/libsoup-gnome-2.25.1:2.4 )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.6 )
-	networkmanager? ( net-misc/networkmanager )
-	!networkmanager? ( connman? ( net-misc/connman ) )"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.15
-	>=dev-util/intltool-0.40
-	virtual/pkgconfig
-	sys-devel/gettext
-	doc? (
-		dev-libs/libxslt
-		>=dev-util/gtk-doc-1.15 )
-	vala? (
-		>=dev-lang/vala-0.10.0:0.12[vapigen]
-		>=dev-libs/gobject-introspection-0.9.6 )"
-
-pkg_setup() {
-	# TODO: enable sys-apps/keyutils support (--without-kernel-keyring)
-	G2CONF="${G2CONF}
-		--disable-static
-		--disable-gcov
-		--without-kernel-keyring
-		--enable-all-services
-		$(use_enable introspection)
-		$(use_enable vala vala-bindings)
-		$(use_with gnome)
-		VALAC=$(type -P valac-0.12)
-		VAPIGEN=$(type -P vapigen-0.12)
-		--with-online=always"
-
-	# NetworkManager always overrides connman support
-	use connman && G2CONF="${G2CONF} --with-online=connman"
-	use networkmanager && G2CONF="${G2CONF} --with-online=networkmanager"
-
-	# Introspection is needed for vala bindings
-	# FIXME: Replace with USE_REQUIRED when python.eclass gets EAPI=4 support
-	if use vala && ! use introspection; then
-		ewarn "Introspection support is needed for Vala bindings, auto-enabling..."
-		G2CONF="${G2CONF} --enable-introspection"
-	fi
-
-	DOCS="AUTHORS README TODO"
-
-	python_set_active_version 2
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	python_convert_shebangs 2 "${S}/tools/glib-ginterface-gen.py"
-}
diff --git a/net-libs/libsocialweb/libsocialweb-0.25.20.ebuild b/net-libs/libsocialweb/libsocialweb-0.25.20.ebuild
index 345275376dee..faf6ac71e3c0 100644
--- a/net-libs/libsocialweb/libsocialweb-0.25.20.ebuild
+++ b/net-libs/libsocialweb/libsocialweb-0.25.20.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libsocialweb/libsocialweb-0.25.20.ebuild,v 1.5 2012/06/05 08:19:13 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libsocialweb/libsocialweb-0.25.20.ebuild,v 1.6 2012/07/21 12:12:05 pacho Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -73,6 +73,10 @@ pkg_setup() {
 src_prepare() {
 	# Sent upstream, gnome bug 677445
 	epatch "${FILESDIR}"/${P}-gold.patch
+
+	# Fix namespacing of introspection annotations, bug #426984
+	epatch "${FILESDIR}"/${PN}-0.25.20-introspection-annotations.patch
+
 	gnome2_src_prepare
 
 	python_convert_shebangs 2 "${S}/tools/glib-ginterface-gen.py"