Bump to 0.10.2, add +introspection support, remove old+unused 0.6.2 version

Package-Manager: portage-2.1.8.3/cvs/Linux i686

5 files changed, 29 insertions, 45 deletions

diff --git a/dev-libs/json-glib/ChangeLog b/dev-libs/json-glib/ChangeLog
index 5f072bec6ab3..4be0ad2c22ca 100644
--- a/dev-libs/json-glib/ChangeLog
+++ b/dev-libs/json-glib/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-libs/json-glib
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/json-glib/ChangeLog,v 1.5 2009/11/02 20:19:10 voyageur Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/json-glib/ChangeLog,v 1.6 2010/06/25 14:12:14 nirbheek Exp $
+
+*json-glib-0.10.2 (25 Jun 2010)
+
+  25 Jun 2010; Nirbheek Chauhan <nirbheek@gentoo.org>
+  -json-glib-0.6.2.ebuild, -files/json-glib-0.6.2-fixtests.patch,
+  +json-glib-0.10.2.ebuild, metadata.xml:
+  Bump to 0.10.2, add +introspection support, remove old+unused 0.6.2
+  version
 
 *json-glib-0.8.2 (02 Nov 2009)
 
diff --git a/dev-libs/json-glib/Manifest b/dev-libs/json-glib/Manifest
index 18d87aaf6788..4c31346b43db 100644
--- a/dev-libs/json-glib/Manifest
+++ b/dev-libs/json-glib/Manifest
@@ -1,9 +1,8 @@
-AUX json-glib-0.6.2-fixtests.patch 976 RMD160 a6f763e10cb64eae5b300ce6805773c448a49f79 SHA1 df1221faf075ee355d9535e3850d4fe83f1efe89 SHA256 73b4ebda3f006aba1ca9a77b19ec7b14edc00321b284dfe39b0fb93a624e0817
-DIST json-glib-0.6.2.tar.gz 453865 RMD160 3e0f9748d64e6372609fdf106f49cf6c25133507 SHA1 de4d9b51cc507e97f3427e01a616a9b6fb7fe3cd SHA256 7befca7f7d7d65cbb260eacd86eff2c1dcae8d859ae2c3e3002e2536d02b2c49
+DIST json-glib-0.10.2.tar.bz2 417175 RMD160 d975d34d83ea8ac36ec562d6e92846377f9f77da SHA1 ed106b81338819ebe58daeacdeb54ccc148c4c8e SHA256 b252f4a4819da560ffe0c2dfe0b2d014d836c5deefde15b83013dfd8d382c920
 DIST json-glib-0.7.6.tar.bz2 389038 RMD160 db5b4f9878517a944d0783d2ea6c5c099e098da0 SHA1 e80ec320b2a88d0885df08c4760bba83ee0b5d8d SHA256 dc439b6619dce45c5aff82387259ccc05c55007e8e7f4fe6290bf99ef828ca64
 DIST json-glib-0.8.2.tar.bz2 392020 RMD160 2af40503fac0fba35ee6974149117c958c4dcaa0 SHA1 4f03e5f6d5cedddb81a0d547313e9cdf406e582d SHA256 51d64ee2f70e7d8d67eca4c1b35575dd7aa2a08dad7662e53d6c6c60af7a3dde
-EBUILD json-glib-0.6.2.ebuild 788 RMD160 c978ccfc3bd92cf312ed8ef89ef46754d4de40a3 SHA1 8caad527e01b06abe35c0c9f240b830386e7b63f SHA256 6f390617d1644184cb706e05c01db7e6a0d23d15e17206911d67dad77898536c
+EBUILD json-glib-0.10.2.ebuild 762 RMD160 b53f67e96b9f01139b9bb0a35b75561a194eec0a SHA1 07260cb25485d77d02406199a5af4fe1d68904ec SHA256 e8db5237a78006ac7d2004de76444b84438028243fe033912a15a316d5312460
 EBUILD json-glib-0.7.6.ebuild 618 RMD160 d9aec7b437023f82d5c5ce20c10e9d3c29daa1e7 SHA1 a5b166cb292f8e2bb8e2e5a33e53987356541f55 SHA256 b51d04988b12c844a247b26abfc1a43ab77362881177d5fac96ff8d07b03b5b1
 EBUILD json-glib-0.8.2.ebuild 617 RMD160 c5d8da2e3c9a96d5f421c9a98fc9021c6b1e27a1 SHA1 2fd770e0d038cbd98e7e067e2cb07bf43dc00f48 SHA256 2e6fca6ccd5fdbd2e32a00a45a4ff1c68cb0bb07f67acd3876385495f87f0cf3
-MISC ChangeLog 1088 RMD160 95a4f195506c85ace081e48f6427c11241e5a7c0 SHA1 c372bbfe30812842dd9ffafe17a5b7e1acfe8599 SHA256 5c62ee75418e5f676572566a42d297ec215d080dab98e8bec42bb299e503babc
-MISC metadata.xml 1062 RMD160 8c9644851c8d144f4ea9ad5b9f16e40f8c0e4d80 SHA1 1da40081dc5b39a6f6dcba28a2c985f59a713e5e SHA256 1cc59d76f12fcda3ba90fcbc8bae0a22eadb4dc22ec798e65605ea2df73ee510
+MISC ChangeLog 1364 RMD160 3ff1b96c6ca6bd65018dafd33838a6db319c9ebb SHA1 75661ff8ccd78ecebf1143ee25f0506c29d8ec00 SHA256 c8369f1f47f1e6d4fadbd1f29ce944b9cecb83575b39065b486f75bc1b5fd205
+MISC metadata.xml 1178 RMD160 4a998dd9f5aca6d344666b2d5a94be86c2ff205c SHA1 cfcfeca90392de4a872e6a283c290e7a09b5b642 SHA256 7e00645c655ec80faba064dbb83a1cf1a4389dcd9a05c2af52f2824f529eb71f
diff --git a/dev-libs/json-glib/files/json-glib-0.6.2-fixtests.patch b/dev-libs/json-glib/files/json-glib-0.6.2-fixtests.patch
deleted file mode 100644
index 993dcd62d81d..000000000000
--- a/dev-libs/json-glib/files/json-glib-0.6.2-fixtests.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From a19a51df9e95e36edf949e68581731bd31959081 Mon Sep 17 00:00:00 2001
-From: Emmanuele Bassi <ebassi@linux.intel.com>
-Date: Mon, 13 Apr 2009 21:08:21 +0000
-Subject: [tests] Use 'static' when registering enum types
-
-Bug 1393 - Regression tests fails on OpenBSD
-
-When registering a GEnumClass we need to set the GEnumValue array
-as static const because g_enum_register_static() does not contain
-the word "static" just for fun.
-
-Reported by: Jasper <jasper@humppa.nl>
----
-diff --git a/tests/test-serialize-full.c b/tests/test-serialize-full.c
-index f549fe1..95925da 100644
---- a/tests/test-serialize-full.c
-+++ b/tests/test-serialize-full.c
-@@ -92,7 +92,7 @@ test_enum_get_type (void)
- 
-   if (G_UNLIKELY (e_type == 0))
-     {
--      const GEnumValue values[] = {
-+      static const GEnumValue values[] = {
-         { TEST_ENUM_FOO, "TEST_ENUM_FOO", "foo" },
-         { TEST_ENUM_BAR, "TEST_ENUM_BAR", "bar" },
-         { TEST_ENUM_BAZ, "TEST_ENUM_BAZ", "baz" },
---
-cgit v0.8.2
diff --git a/dev-libs/json-glib/json-glib-0.6.2.ebuild b/dev-libs/json-glib/json-glib-0.10.2.ebuild
index 63c11feeb01a..0e9db68e5c9c 100644
--- a/dev-libs/json-glib/json-glib-0.6.2.ebuild
+++ b/dev-libs/json-glib/json-glib-0.10.2.ebuild
@@ -1,27 +1,28 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/json-glib/json-glib-0.6.2.ebuild,v 1.2 2009/07/06 12:11:11 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/json-glib/json-glib-0.10.2.ebuild,v 1.1 2010/06/25 14:12:14 nirbheek Exp $
+
+EAPI="2"
 
-EAPI=2
 inherit gnome2 eutils
 
 DESCRIPTION="A library providing GLib serialization and deserialization support for the JSON format"
 HOMEPAGE="http://live.gnome.org/JsonGlib"
-SRC_URI="http://folks.o-hand.com/~ebassi/sources/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="doc"
+IUSE="doc +introspection"
 
 RDEPEND=">=dev-libs/glib-2.15"
 DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.9
-	doc? ( dev-util/gtk-doc )"
+	doc? ( >=dev-util/gtk-doc-1.11 )
+	introspection? ( >=dev-libs/gobject-introspection-0.6.3 )"
 
 DOCS="AUTHORS ChangeLog NEWS README"
 
-src_prepare() {
-	# http://bugzilla.openedhand.com/show_bug.cgi?id=1393
-	epatch "${FILESDIR}"/${P}-fixtests.patch
+pkg_setup() {
+	G2CONF="${G2CONF}
+		$(use_enable introspection)"
 }
diff --git a/dev-libs/json-glib/metadata.xml b/dev-libs/json-glib/metadata.xml
index cdb3af2fe43c..307911c5dce9 100644
--- a/dev-libs/json-glib/metadata.xml
+++ b/dev-libs/json-glib/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>no-herd</herd>
+	<herd>gnome</herd>
 	<maintainer>
 		<email>voyageur@gentoo.org</email>
 		<name>Bernard Cafarelli</name>
@@ -9,4 +9,8 @@
 	<longdescription>JSON-GLib is a library providing serialization and deserialization support for the JavaScript Object Notation (JSON) format described by RFC 4627. Many high-level languages already provide native modules for parsing, generating and manipulating JSON data streams. JSON-GLib is a C library based on GLib and released under the terms of the GNU Lesser General Public License version 2.1. It provides a parser and a generator GObject classes and various wrappers for the complex data types employed by JSON, such as arrays and objects.
 
 JSON-GLib uses GLib native data types and the generic value container GValue for ease of development. It also provides integration with the GObject classes for direct serialization into, and deserialization from, JSON data streams.</longdescription>
+	<use>
+		<flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg> for
+			introspection</flag>
+	</use>
 </pkgmetadata>