Version bump for gnome-3.6. Update dependencies and license, drop useless doc USE flag. Drop old.

(Portage version: 2.2.0_alpha149/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61)

3 files changed, 29 insertions, 20 deletions

diff --git a/dev-libs/json-glib/ChangeLog b/dev-libs/json-glib/ChangeLog
index d3e0be0c103b..a3a10846cd3a 100644
--- a/dev-libs/json-glib/ChangeLog
+++ b/dev-libs/json-glib/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/json-glib
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/json-glib/ChangeLog,v 1.38 2012/12/16 08:10:00 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/json-glib/ChangeLog,v 1.39 2012/12/19 03:31:28 tetromino Exp $
+
+*json-glib-0.15.2 (19 Dec 2012)
+
+  19 Dec 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -json-glib-0.12.6.ebuild, json-glib-0.14.2.ebuild, +json-glib-0.15.2.ebuild:
+  Version bump for gnome-3.6. Update dependencies and license, drop useless doc
+  USE flag. Drop old.
 
   16 Dec 2012; Alexandre Rostovtsev <tetromino@gentoo.org> metadata.xml:
   Switch to global introspection USE flag.
diff --git a/dev-libs/json-glib/json-glib-0.14.2.ebuild b/dev-libs/json-glib/json-glib-0.14.2.ebuild
index 663fc3a4626a..7ab466ef954f 100644
--- a/dev-libs/json-glib/json-glib-0.14.2.ebuild
+++ b/dev-libs/json-glib/json-glib-0.14.2.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/dev-libs/json-glib/json-glib-0.14.2.ebuild,v 1.9 2012/07/14 13:23:39 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/json-glib/json-glib-0.14.2.ebuild,v 1.10 2012/12/19 03:31:28 tetromino Exp $
 
 EAPI=4
 GCONF_DEBUG=yes
@@ -11,22 +11,23 @@ inherit gnome2
 DESCRIPTION="A library providing GLib serialization and deserialization support for the JSON format"
 HOMEPAGE="http://live.gnome.org/JsonGlib"
 
-LICENSE="LGPL-2.1"
+LICENSE="LGPL-2.1+"
 SLOT="0"
 KEYWORDS="alpha amd64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="doc +introspection"
+IUSE="+introspection"
 
-RDEPEND=">=dev-libs/glib-2.26:2"
+RDEPEND=">=dev-libs/glib-2.26:2
+	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )"
 DEPEND="${RDEPEND}
-	virtual/pkgconfig
+	>=dev-util/gtk-doc-am-1.13
 	>=sys-devel/gettext-0.18
-	doc? ( >=dev-util/gtk-doc-1.13 )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )"
+	virtual/pkgconfig"
 
-pkg_setup() {
+src_configure() {
 	DOCS="ChangeLog NEWS README"
 	# Coverage support is useless, and causes runtime problems
 	G2CONF="${G2CONF}
 		--disable-gcov
 		$(use_enable introspection)"
+	gnome2_src_configure
 }
diff --git a/dev-libs/json-glib/json-glib-0.12.6.ebuild b/dev-libs/json-glib/json-glib-0.15.2.ebuild
index f7ff730c2741..f986ab1304fb 100644
--- a/dev-libs/json-glib/json-glib-0.12.6.ebuild
+++ b/dev-libs/json-glib/json-glib-0.15.2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2012 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.12.6.ebuild,v 1.9 2012/05/04 18:35:54 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/json-glib/json-glib-0.15.2.ebuild,v 1.1 2012/12/19 03:31:28 tetromino Exp $
 
-EAPI=4
+EAPI=5
 GCONF_DEBUG=yes
 GNOME2_LA_PUNT=yes
 
@@ -11,21 +11,22 @@ inherit gnome2
 DESCRIPTION="A library providing GLib serialization and deserialization support for the JSON format"
 HOMEPAGE="http://live.gnome.org/JsonGlib"
 
-LICENSE="LGPL-2.1"
+LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="alpha amd64 ~hppa ia64 ppc ppc64 sparc x86"
-IUSE="doc +introspection"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="+introspection"
 
-RDEPEND=">=dev-libs/glib-2.16:2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( >=dev-util/gtk-doc-1.13 )
+RDEPEND=">=dev-libs/glib-2.31:2
 	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.13
+	>=sys-devel/gettext-0.18
+	virtual/pkgconfig"
 
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog NEWS README"
+src_configure() {
 	# Coverage support is useless, and causes runtime problems
 	G2CONF="${G2CONF}
 		--disable-gcov
 		$(use_enable introspection)"
+	gnome2_src_configure
 }