Version bump for Gnome 3.6. Switch to EAPI=5. USE=introspection is now global.

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

4 files changed, 38 insertions, 44 deletions

diff --git a/gnome-base/libgnomekbd/ChangeLog b/gnome-base/libgnomekbd/ChangeLog
index 3d771a1704a9..5d285ca47242 100644
--- a/gnome-base/libgnomekbd/ChangeLog
+++ b/gnome-base/libgnomekbd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-base/libgnomekbd
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomekbd/ChangeLog,v 1.101 2012/05/21 18:57:27 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomekbd/ChangeLog,v 1.102 2012/12/25 18:17:36 eva Exp $
+
+*libgnomekbd-3.6.0 (25 Dec 2012)
+
+  25 Dec 2012; Gilles Dartiguelongue <eva@gentoo.org>
+  -libgnomekbd-3.2.0-r1.ebuild, +libgnomekbd-3.6.0.ebuild, metadata.xml:
+  Version bump for Gnome 3.6. Switch to EAPI=5. USE=introspection is now
+  global.
 
   21 May 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
   libgnomekbd-2.32.0-r1.ebuild:
diff --git a/gnome-base/libgnomekbd/Manifest b/gnome-base/libgnomekbd/Manifest
index e8e4b5eff342..487f553c1dec 100644
--- a/gnome-base/libgnomekbd/Manifest
+++ b/gnome-base/libgnomekbd/Manifest
@@ -1,26 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX libgnomekbd-2.32.0-gdkdisplay-usage.patch 2563 RMD160 0303c844d43df7b5f5fb1139802eb18f9ddc6f3d SHA1 bfe39ccd38da66bc96948654202c6fb0f712761b SHA256 65ba86cc9386d6562cfc26175015943548f9efeeafe6a55e803e3398dcc1874c
-AUX libgnomekbd-2.32.0-gdkkeyname-replace.patch 5628 RMD160 6bda98342945024bc6294eed8fc4177739608804 SHA1 0d90cce527c43c9de22b56559f46419cacbae93b SHA256 f65fbe70dd6fdaef0f8aa370471390a34bcb30b5b01da449139bf42f8da92ea6
-AUX libgnomekbd-2.32.0-unneeded-casts.patch 1630 RMD160 747b75c8f10cc229a41fe97f517091743a5c5a66 SHA1 ef33c764e03346fc9ee510e1002c003c48c3bc24 SHA256 2b1b28aa84450a0ccd438f2d8a97918193dca1ddcf9dbe9e17e61d0b9e14e436
-AUX libgnomekbd-3.2.0-fg-color.patch 1316 RMD160 a7d1f7bb20b8fcfe583833b138805a3dd457dde0 SHA1 5271f834ce058915161c35ba2ee093a6b2da08f5 SHA256 87a92d8e48404268f6301157f697d4c220a9bfc0b1dd0fc8b5c1fc4017778bc9
-DIST libgnomekbd-2.32.0.tar.bz2 410928 RMD160 5ecca30979373f746224693c6b9ff8b6fe2a8e18 SHA1 8401db5d7888185fb3a5855f316771aa09865403 SHA256 ddd52c4cc7d83ad7ef964a1bcb4db87407e65b00ffc3e70c088ca4ee7383d256
-DIST libgnomekbd-3.2.0.tar.xz 376580 RMD160 c7d549c731c57b995c4036d9378a5f33419bfe29 SHA1 c7a0af337df1ba67e3e1824db3191abdd7b6a098 SHA256 810ff305bbf076f6689911cf7b040d2113f501311a866abc37aa6bf5b28e1a2b
-DIST libgnomekbd-3.4.0.2.tar.xz 368552 RMD160 337cfd7103103f65aa839f135912f30f7980e710 SHA1 781ea3c2ae8e6ae2a8196ad40062796ee19c1fbe SHA256 6e6c8956adbd39f1c3a8ec5c77bcf7ffbdaa54320398015d1174cd5003664e39
-EBUILD libgnomekbd-2.32.0-r1.ebuild 1175 RMD160 bd467a840b5df6084e13d16f2fe639623d603ca3 SHA1 90db9e44d4d2d0e90a37529227fd11b9eb858143 SHA256 c51d7ab023da64c6dba8e3694cbffcad362ad4d89f3652d7a35921634881d034
-EBUILD libgnomekbd-3.2.0-r1.ebuild 1120 RMD160 7cdbd06ce4a8cdf6545945be8252ce9c5d57223a SHA1 d4c45a6dfa720643344c87d03e2a59bc3a1e92fd SHA256 6b15eddff8dc07df3a6f6e1fa78b6d5cc2631be8978106e7ab8ab134a6bfd267
-EBUILD libgnomekbd-3.4.0.2.ebuild 971 RMD160 22c96d6099e5ea3aa435e855db064cd5253078fa SHA1 36466f5f79d54e517f44aff6e54ecdc30dc9f31f SHA256 0358214d742ecee584e90975eded0eb03cb10df917357e31c3c4b4dd9231f0d9
-MISC ChangeLog 13889 RMD160 e41460e5533a2f077a47f44a972bb3cf5305c337 SHA1 5fed76c2567c80f660a33f42fb1dae4667f72151 SHA256 893917c025caa8deae8543dcd71976b2c0d0ddb8d42d5c95ee5c7d47c6566aae
-MISC metadata.xml 277 RMD160 2ffb105a089a3b759ddef20bf72b06362a1d1c63 SHA1 82aa8cfe90fb0c9f7c02f295d2802d41ad2af380 SHA256 3d52f90556a9db4ad09f2fbe34e2d25b21f345e474e829ac84669d49cb64c8bb
+AUX libgnomekbd-2.32.0-gdkdisplay-usage.patch 2563 SHA256 65ba86cc9386d6562cfc26175015943548f9efeeafe6a55e803e3398dcc1874c SHA512 2b9a90b03ab685a9a0745d0b9e950ae71837007218540226e13b5273e7fd5185c68a0bca7df15f7324a74cb8fca79cd9fdda2aaf84173b2b9cf19a561db6ce94 WHIRLPOOL b8c00f5d3b85324440274bfe0e575db68ac41843e6a3714098d01606a060b7a7acf4e56211680abb642e0f51b734b7f18218094188f98cf726fa998920d3d5dc
+AUX libgnomekbd-2.32.0-gdkkeyname-replace.patch 5628 SHA256 f65fbe70dd6fdaef0f8aa370471390a34bcb30b5b01da449139bf42f8da92ea6 SHA512 3b853280c612986b1ec1683a0adaa9e18f65fb188deedb204f8d72a592a826d81f9e98700e516ee262068592cbe247115a61bc917bffae996dbbcb7e0366add7 WHIRLPOOL 9f13b90e22fab6daa4c9cef931190c5489cd1d661dcb3fb6e7ae7b5c246f98f0c9aaf8d853fb785524bd6405fd75ad1efde311e480d845fbd7743ca798ee951d
+AUX libgnomekbd-2.32.0-unneeded-casts.patch 1630 SHA256 2b1b28aa84450a0ccd438f2d8a97918193dca1ddcf9dbe9e17e61d0b9e14e436 SHA512 1a948d5c0162924204d9eda9a390e49362e1eb99898c5b6b36fe6749e9a28a8391ac61e19b9fc50d1109c796c0e1266e9c220a3dbe2b0177809158dcd1f4ca02 WHIRLPOOL a536ee1588095d749401c45807cfd9263faa49d57c36acf275b2e3052624d0b6f37dae091987716b75d9ccb8340baf3efd9a3dca198ffa1ef98f56048838e60e
+AUX libgnomekbd-3.2.0-fg-color.patch 1316 SHA256 87a92d8e48404268f6301157f697d4c220a9bfc0b1dd0fc8b5c1fc4017778bc9 SHA512 0ab2ec061c1e9d906ec098e4c0d8ab6aa4c7c1861df0480486263c440f65efd8da544bf36316299ed2b1fc781bf41e016cf7d91fa9f42bff3b87b915880680e0 WHIRLPOOL fba454a81d1eea56c513ab75677a36eca49619844f75ae0160d1ffeae3c57acaea1bd6dd1c659f1c317e11a3b469bdebcf7866bf180c135d836e35a34ea76f83
+DIST libgnomekbd-2.32.0.tar.bz2 410928 SHA256 ddd52c4cc7d83ad7ef964a1bcb4db87407e65b00ffc3e70c088ca4ee7383d256 SHA512 7e60a613d28735b478a7480b4a90505bfdfd6d98398860b9d1ad5074ad4fad7e39c9d5865add1d3efc324d0c4c2501531ddd1a281055e797a543b05fe815d3f4 WHIRLPOOL ffc558291d6b0d10081b2f95ac9f53653c5a10dcab564f4a115fde02834c5fe4ef479d53ac201dd9c8c8a230e65d5b6d0d7fd54ab6d5dbb71c8ae69ae316c906
+DIST libgnomekbd-3.4.0.2.tar.xz 368552 SHA256 6e6c8956adbd39f1c3a8ec5c77bcf7ffbdaa54320398015d1174cd5003664e39 SHA512 5fba7ccb9f4933f4a89e5f7f5cb02ed150a46cf2c0ce7db7e7c90c6484b22b29bd56a5557f825d49dbc22159df1c88f1c44cca5769a96fa0b5729009817c2daa WHIRLPOOL a802b60019d7b0d08bd389c7d3ab47c9a5c8e3404f409a3f6dfb9a634270961f584e8dea78f4ebbe7ca25c0c929895cd1410e2fd609053e370f8d7f9d88a2e47
+DIST libgnomekbd-3.6.0.tar.xz 373588 SHA256 c41ea5b0f64da470925ba09f9f1b46b26b82d4e433e594b2c71eab3da8856a09 SHA512 27d0711eeebba91ca0dbed079c17acfec97116153a01f4f6e78cb30044afc534c438f655c6836b74b377acb8116d3b70e1f09578f182bb4fc51d8d05e89c6f17 WHIRLPOOL d64b284471e1ba62f13c06c12a89ccc86548fe77f1ab85dfce6d97d5a4bacccb510f0f0181229a8c8f55e2142362148b7614036520305a1fcad444beaf8863df
+EBUILD libgnomekbd-2.32.0-r1.ebuild 1175 SHA256 c51d7ab023da64c6dba8e3694cbffcad362ad4d89f3652d7a35921634881d034 SHA512 e5229b2c6da37739496584628474fb207525d5423ee457456b325c3ecfafe53791fd6a39959ffc993e2dd19d6fc13287b2319ba665d8add10984d180e667975a WHIRLPOOL 93bafe6830dff0a88d3afd6e17262d80206654d4ae3b44072eaf28fde084c2432129717a05535338dee6ec6a437c0040697b7e454eebc0b21357efd9e4e97dce
+EBUILD libgnomekbd-3.4.0.2.ebuild 971 SHA256 0358214d742ecee584e90975eded0eb03cb10df917357e31c3c4b4dd9231f0d9 SHA512 28caa6e9503fce3bec921ace29e9853f0bcbd842b0ef49c810ea86aafa1e9894556c6341ce3e426ad4eef13b7e850259de0df334626ce41da3e91bd894e91987 WHIRLPOOL e26cb714fa31222a59cfc603ce13c5604dafa171fbeb737d0a9e39a9a6e24b71c84468e12dd0c79cef92be8dd7929ca3285bc87ecdfedbd52761902514274e2a
+EBUILD libgnomekbd-3.6.0.ebuild 928 SHA256 c38420bc0dc341f1d800a7b38245777ab1a0cb1bad3bcbbbf477d0ec8c97f09b SHA512 bcd60e09855ff1dc28820a29abacb8866a5bb55b9109dbd414fdecc82663dfa20aa0e01542580a8e9e6f6c58cccd3278c9dcb22ec4a58f5b87288546bd362384 WHIRLPOOL cec2f97b8905cb36fd0fdaf3f36a1571004beb223d082dad05ea0be34e07ae4fbf35b84140a322b4fcf9855c7ad618ff06e143eef003c799db1e440c25022c0a
+MISC ChangeLog 14128 SHA256 a392049e30270e45bec576ac13b2b2c5182a2b13fe563c9e625dc324d7cff15d SHA512 ad7fbf4edac3635306697aea5a5f5ce400a24ec55fb597ca459794b2a25c3721043588bdc9baaf429abf8361cebaf434dacec611e0203716dc93c781bee534b4 WHIRLPOOL 0a2b14044737291c240a5ef27417dc4eeb7da8bbfc29f0af8c51e412e216edbd9d5484ced1b711db8f5cf1e3de12e521361f6a3f71073eaacabdb5f96d891bcd
+MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPupAcAAoJEJ0WA1zPCt1hrzcIAKpJhpQGZjWMfrqd9zDkSfGh
-uBmPZba8s5PKahEDUkDL/28k2ywcYGHh+10NuBdC9FevTbIjrJ76HpinF53TbrJx
-3JxJTTdTOGAMY1l2E4ZENXRyKy9VoMnJz6u+mZBM8x/UEAdYUlLQz42twsPMeg/Z
-KKd6AqaRkfy8OvSyk0dTmXkQkbfccviBndxe+f1Rl/PE73h9sht+f7PFbQKjVrml
-x4zlD+iTJIAszMvYTylE0IqcBOz8eXrTEIABrEvness+9X57nmlpAYAMAJU1Jn/u
-nxrx3rHOv581Bob3V0iKz/TBSwvvTTck0v0+CYdmGnQKi+BbZQPJmlVF0+ud45A=
-=H9Qa
+iEYEAREIAAYFAlDZ7b4ACgkQ1fmVwcYIWAa0DgCgpeve8x6/EG+yu5R7hhpf9eF1
+o1EAoM4Cnjko8JD7qRKupqnyY+0D3JEW
+=Nvq+
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/libgnomekbd/libgnomekbd-3.2.0-r1.ebuild b/gnome-base/libgnomekbd/libgnomekbd-3.6.0.ebuild
index 531c01920ff9..a80d666bf7db 100644
--- a/gnome-base/libgnomekbd/libgnomekbd-3.2.0-r1.ebuild
+++ b/gnome-base/libgnomekbd/libgnomekbd-3.6.0.ebuild
@@ -1,42 +1,37 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomekbd/libgnomekbd-3.2.0-r1.ebuild,v 1.2 2012/05/05 05:38:10 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomekbd/libgnomekbd-3.6.0.ebuild,v 1.1 2012/12/25 18:17:36 eva Exp $
 
-EAPI="4"
+EAPI="5"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
-inherit eutils gnome2
+inherit gnome2
 
 DESCRIPTION="Gnome keyboard configuration library"
 HOMEPAGE="http://www.gnome.org"
 
-LICENSE="LGPL-2"
+LICENSE="LGPL-2+"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="+introspection test"
 
-RDEPEND=">=dev-libs/glib-2.18:2
+RDEPEND="
+	>=dev-libs/glib-2.18:2
 	>=x11-libs/gtk+-2.91.7:3[introspection?]
-	>=x11-libs/libxklavier-5.1
+	>=x11-libs/libxklavier-5.2[introspection?]
 
-	introspection? ( >=dev-libs/gobject-introspection-0.6.7 )"
+	introspection? ( >=dev-libs/gobject-introspection-0.6.7 )
+"
 DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.35
-	virtual/pkgconfig"
+	virtual/pkgconfig
+"
 
-pkg_setup() {
+src_configure() {
 	G2CONF="${G2CONF}
 		--disable-static
-		--disable-schemas-compile
 		$(use_enable introspection)
 		$(use_enable test tests)"
-	DOCS="AUTHORS ChangeLog NEWS README"
-}
-
-src_prepare() {
-	# Upstream patch to use correct GtkTrayIcon:fg-color type; fixes g-s-d crash
-	epatch "${FILESDIR}/${P}-fg-color.patch"
-
-	gnome2_src_prepare
+	gnome2_src_configure
 }
diff --git a/gnome-base/libgnomekbd/metadata.xml b/gnome-base/libgnomekbd/metadata.xml
index 44825d13c084..da6fd63d0085 100644
--- a/gnome-base/libgnomekbd/metadata.xml
+++ b/gnome-base/libgnomekbd/metadata.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnome</herd>
-	<use>
-		<flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg>
-			for introspection</flag>
-	</use>
+<herd>gnome</herd>
 </pkgmetadata>