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

Package-Manager: portage-2.2.0_alpha149/cvs/Linux x86_64
Manifest-Sign-Key: 0xCF0ADD61

4 files changed, 40 insertions, 31 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/Manifest b/dev-libs/json-glib/Manifest
index f13a701837a2..8e271f3f84e3 100644
--- a/dev-libs/json-glib/Manifest
+++ b/dev-libs/json-glib/Manifest
@@ -1,20 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST json-glib-0.12.6.tar.xz 369036 SHA256 4f670fc356e7a30121ade956e93236986952bb2601d6678e94eab7d87c8866ce SHA512 77f05c69a5e42bea1839ff7c29d5b9fa03c7c9650b42a3055034918cdc5605c6c067f86e94105e010d6897ec66c75502ac3e778792248af4b0827d18562c3129 WHIRLPOOL f0cbc736607148ede805b15fe271c00a09563c40917ed7bc54830485504e256f0e84502aa3cefe226d75341bad06dc696c79a50721026469a77aa24b48d229f3
 DIST json-glib-0.14.2.tar.xz 445396 SHA256 b816a5fa3e5664b08679a6972a6e5693d6cc1990ff4a6f94c07554db96be94a7 SHA512 11a482eeac40e255dc844fc3ae2fca3240678ca131d2685ba574db5e1f2440f2305a4ebf74fcc30b18e4d883d1bf91d3a598819d93f204535dc949deb6749771 WHIRLPOOL 2afc121088d1c39ad0c04154b07f2758abf086c2e41810b0f6f21c83018d1f0dadc61d366cd4929121e9fd761bb88e60ce380cab29b72f769516b218eb169c87
-EBUILD json-glib-0.12.6.ebuild 884 SHA256 fffbaacdbcc71e3c0c2c3238c768c07d77525770c31aaf472e1df52ce3399d2c SHA512 d7eeca6f92b5fc51b062f10cbbc35b14e64477a941558dca3583959ec6cc0ecbdd8fe94e4aa9397b03ade7928a0b9eb07a317fc8f9af7f56fb0f6b1d6abebf85 WHIRLPOOL b72b8a92990a2dedc9cf874e109388b4a79d84695d38fbb874948edb489270f097d767b4d81a8065fb5b616faa970b13d60e8d6fa9c7a37132ab49aa96659b26
-EBUILD json-glib-0.14.2.ebuild 920 SHA256 dd2cf140399b0bf4773b6277959977ad4b51bf86aefb7ed4140ae000fc858ead SHA512 649b0f1faf2a55994a82e20ce61e0627454ced755f0a80a20ec605409057f46b239537d12840e1aafa616d2a0966318aea363992e8527ca71e5fc8b37cb881ae WHIRLPOOL dbd7d767bf9ee705f48cb2064059cfd50b04759c3ad39819a123b91784bd6db2d83fa1caba1633e59b3d1432f06a9c32961812ca379c6cab4e5b91b83891eb4a
-MISC ChangeLog 5594 SHA256 d92f5b6023c8be8177cdac3508d77a9a8d59c2d90890e61042290bfdbe33aac9 SHA512 7079e7c3df3339a02f6727e62574411c232e9da8901edc0270b66a73ebe7dc1f14fc034adcfaacfec8bb8f3a3b9fb938e9a34b462fbb0715c8e45f00fb761b8c WHIRLPOOL f11ff77664393def2a7051130dba7d5ab7ef67e78035933c0d336af5b80880b99f291dbd23e0167fac2e3e4a9a1092123adcedb2babfd36d890a99007bc710b8
+DIST json-glib-0.15.2.tar.xz 459232 SHA256 f090cd94acc85989e033d72028fa70863d05092ae5bba6b454e70c132b24cdde SHA512 1cf07e09cc7eeba07a5b0131a760cd022160a9b13c380bcbf9f197dc23bdc07665d7c2832812c9e36bcefef9e8096662733832b93041d927cc2b05e31623e707 WHIRLPOOL 6cbec3c8ff36af13d46962b81bba7b3618b7de50383f81f5390b4a4178b941119cd36e84d25ae72a7712e8d08668e62c5b78c4c6e8ed855d1bbd84d25f5b459a
+EBUILD json-glib-0.14.2.ebuild 939 SHA256 9d4c04e3bc1c10f90327401c50247f029d9531ab087d8d8730bc3e33104c193e SHA512 2f23bb8c92b58ee5d9d626e364f90905c005eff19d69c31a012e65878b4a3d143080f31e11b8118ccf8a7c890e46fc59ab6977ae7f51bf57ef3312820b74ed63 WHIRLPOOL 395ed09ef135743381b7cfaac39beb34a4ad97959fb2550e26ce1243a94ab4bff91816a956ed78da02914e26447faf2d7752da85cea60c82e72dd06de39baf63
+EBUILD json-glib-0.15.2.ebuild 915 SHA256 04c25ba0f7583ae6f7969afece63ee87dcd2b46e0a5d283c36c12d78e2388b84 SHA512 a621de718e0eade7337cba55194463d69e172ae7762ec909a434c92f9a95c4fea1ad87c3b69dde7f0524e66b614c1fe3734a5682c0211235e9eb948383acd6d9 WHIRLPOOL f3731a2ec38177f9708adfb9a5c185d612d1d8d523789fc0f79086b3da569c02726e1426ece40ae9cafdc7cfc02fd58f6f64c2bc13a13fcf551e87fd07f69858
+MISC ChangeLog 5868 SHA256 cd98789ba604a722aaacb45b876278b15af8713f59ae16233ae748b0d6e40901 SHA512 3fe3d9874d456c7a4539f988f77dd6e924c2d19cb30afeed301c30369f7c573af84c2fb7e50db8c8a44ec52ac943b58f9a8c22fb8f8ae0fb21ab699bc6435833 WHIRLPOOL 322531c30a13fc0cd0a885cb53b9124afbab1c7c3bc7ef731c9d6b7716a389ec742346f47302d3a7cfc592e0b282c0f490946d86982322a700a74156c2bd99d9
 MISC metadata.xml 1060 SHA256 f8c41c5a7e4950f631ab6cdb55ed4e4867dbdb24e9a89b116f9189620a06f6e7 SHA512 b05ed9cb8464da4462cd56044fde8b720dac53276d5a76f1697e536b37d1e96dfb3348c93f2d838559f122050c75c54516527f758da40878c76c8ec772fe5770 WHIRLPOOL cff42f26f1d5de50756271e13b8ba28f9863ed08ed96b6418693fb47009f9d191c9bfbc60dd486140ad482034cf21a92c3c6e17a0c3d67334d63e6488d009047
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEbBAEBCAAGBQJQzYHZAAoJEJ0WA1zPCt1h1lUH904SYGQVvyFiMW7Pd3iCa3AZ
-FkZBhNuMlfeqrjpnK4oKZTLWYILgpZDROtNeR0ctV063IP7dW/eU5G7p1oJMFb/O
-a4tmt2sJQIuIztsknMEd6NA8OifcFJbgTrp/X/ofbJZdSLSX3GwkIyMyTC+aOGvC
-CkyBxT8TIGlGH/rMrGlHbaws1Mg62Tm4V7bZ5RzXjybWStfCi+vTfCVak20LjzBH
-0trEsN0CYiTKZaEvFdyvDS0x01hjtsqQJW3wcmx0JBuHU3HeNzLj/wEMw0Z5vgeB
-mXk4CdWIcjE5G2jzrmYgZjyBmxBY6MnVGSaRsG0Ai0IHEmJb1/o5HVJCl2HPcQ==
-=vQR2
+iQEcBAEBCAAGBQJQ0TURAAoJEJ0WA1zPCt1hnvsIAIIqz6t3TwtPTXJM+r1kGPIK
+w5ucLSosiTraq8iBYodkxwK9/lBGgLOEthO+z7+MhWV3KDRROqfmcV7Cb3x3+13Y
+i2KFCXvWIg+tTyK4R0k3wSdrx4KCcKj2i5OAn/nHcajDxh2aeRQ/LW2QiBcDTO71
+sYQSbBU7Lr0Zi5Nw5ajKEIMKoZ+H1Jd+H9myKgKGlBzHO40xRwQ2nFtnNN1wchuy
+j9HNNf7R3gziE6jgBPxJGDT+L8AVOO7CFY90ZG9xYx6wmIYNkN6fdcw4fKooWWFE
+W/gUHk7LTyMjALCkkDaO33LDhxL6taYDM5VYHvL1Dc3T9EPqPcNBP7X+4cW9SYg=
+=yf9v
 -----END PGP SIGNATURE-----
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
 }