EAPI bump. Raise gobject-introspection dependency per configure. Clean up old revisions.

(Portage version: 2.2.0_alpha29/cvs/Linux x86_64)

5 files changed, 12 insertions, 79 deletions

diff --git a/dev-libs/json-glib/ChangeLog b/dev-libs/json-glib/ChangeLog
index 6d34b648f5cd..a7ff36b82758 100644
--- a/dev-libs/json-glib/ChangeLog
+++ b/dev-libs/json-glib/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/json-glib
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/json-glib/ChangeLog,v 1.16 2011/04/12 22:29:15 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/json-glib/ChangeLog,v 1.17 2011/04/14 21:11:37 eva Exp $
+
+  14 Apr 2011; Gilles Dartiguelongue <eva@gentoo.org> -json-glib-0.7.6.ebuild,
+  -json-glib-0.8.2.ebuild, -json-glib-0.12.0.ebuild, json-glib-0.12.4.ebuild:
+  EAPI bump. Raise gobject-introspection dependency per configure. Clean up old
+  revisions.
 
 *json-glib-0.12.4 (12 Apr 2011)
 
diff --git a/dev-libs/json-glib/json-glib-0.12.0.ebuild b/dev-libs/json-glib/json-glib-0.12.0.ebuild
deleted file mode 100644
index 74f70cf06e4c..000000000000
--- a/dev-libs/json-glib/json-glib-0.12.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# 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.12.0.ebuild,v 1.1 2010/12/05 14:33:58 nirbheek Exp $
-
-EAPI="2"
-
-inherit gnome2 eutils
-
-DESCRIPTION="A library providing GLib serialization and deserialization support for the JSON format"
-HOMEPAGE="http://live.gnome.org/JsonGlib"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc coverage +introspection"
-
-RDEPEND=">=dev-libs/glib-2.16"
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.9
-	doc? ( >=dev-util/gtk-doc-1.13 )
-	introspection? ( >=dev-libs/gobject-introspection-0.6.5 )"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-pkg_setup() {
-	# coverage support needs gcov from gcc
-	G2CONF="${G2CONF}
-		$(use_enable coverage gcov)
-		$(use_enable introspection)"
-}
diff --git a/dev-libs/json-glib/json-glib-0.12.4.ebuild b/dev-libs/json-glib/json-glib-0.12.4.ebuild
index 9e27bec365af..17d00e2f3303 100644
--- a/dev-libs/json-glib/json-glib-0.12.4.ebuild
+++ b/dev-libs/json-glib/json-glib-0.12.4.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2011 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.4.ebuild,v 1.1 2011/04/12 22:29:15 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/json-glib/json-glib-0.12.4.ebuild,v 1.2 2011/04/14 21:11:37 eva Exp $
 
-EAPI="2"
+EAPI="3"
+GCONF_DEBUG="yes"
 
 inherit gnome2
 
@@ -14,15 +15,14 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="doc +introspection"
 
-RDEPEND=">=dev-libs/glib-2.16"
+RDEPEND=">=dev-libs/glib-2.16:2"
 DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.9
 	doc? ( >=dev-util/gtk-doc-1.13 )
-	introspection? ( >=dev-libs/gobject-introspection-0.6.5 )"
-
-DOCS="AUTHORS ChangeLog NEWS README"
+	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )"
 
 pkg_setup() {
+	DOCS="AUTHORS ChangeLog NEWS README"
 	# Coverage support is useless, and causes runtime problems
 	G2CONF="${G2CONF}
 		--disable-coverage
diff --git a/dev-libs/json-glib/json-glib-0.7.6.ebuild b/dev-libs/json-glib/json-glib-0.7.6.ebuild
deleted file mode 100644
index 80df9c940485..000000000000
--- a/dev-libs/json-glib/json-glib-0.7.6.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# 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.7.6.ebuild,v 1.3 2010/10/10 11:54:45 armin76 Exp $
-
-EAPI=2
-inherit gnome2 eutils
-
-DESCRIPTION="A library providing GLib serialization and deserialization support for the JSON format"
-HOMEPAGE="http://live.gnome.org/JsonGlib"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
-IUSE="doc"
-
-RDEPEND=">=dev-libs/glib-2.15"
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.9
-	doc? ( >=dev-util/gtk-doc-1.11 )"
-
-DOCS="AUTHORS ChangeLog NEWS README"
diff --git a/dev-libs/json-glib/json-glib-0.8.2.ebuild b/dev-libs/json-glib/json-glib-0.8.2.ebuild
deleted file mode 100644
index af5073c61221..000000000000
--- a/dev-libs/json-glib/json-glib-0.8.2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# 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.8.2.ebuild,v 1.2 2010/10/10 11:54:45 armin76 Exp $
-
-EAPI=2
-inherit gnome2 eutils
-
-DESCRIPTION="A library providing GLib serialization and deserialization support for the JSON format"
-HOMEPAGE="http://live.gnome.org/JsonGlib"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
-IUSE="doc"
-
-RDEPEND=">=dev-libs/glib-2.15"
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.9
-	doc? ( >=dev-util/gtk-doc-1.11 )"
-
-DOCS="AUTHORS ChangeLog NEWS README"