Version bump for Gnome 3.6. Switch to EAPI=5. Drop deprecated postinst, package is not using gconf anymore. 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, 58 deletions

diff --git a/gnome-base/gnome-panel/ChangeLog b/gnome-base/gnome-panel/ChangeLog
index 5c3d136db04f..988b3061596b 100644
--- a/gnome-base/gnome-panel/ChangeLog
+++ b/gnome-base/gnome-panel/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-base/gnome-panel
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/ChangeLog,v 1.356 2012/10/16 03:47:52 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/ChangeLog,v 1.357 2012/12/24 14:47:19 eva Exp $
+
+*gnome-panel-3.6.2 (24 Dec 2012)
+
+  24 Dec 2012; Gilles Dartiguelongue <eva@gentoo.org>
+  -gnome-panel-3.2.1.ebuild, +gnome-panel-3.6.2.ebuild, metadata.xml:
+  Version bump for Gnome 3.6. Switch to EAPI=5. Drop deprecated postinst,
+  package is not using gconf anymore. USE=introspection is now global.
 
   16 Oct 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
   -gnome-panel-2.32.1-r1.ebuild, -gnome-panel-2.32.1-r2.ebuild,
diff --git a/gnome-base/gnome-panel/Manifest b/gnome-base/gnome-panel/Manifest
index 86dc76ac1018..5cda3ee21533 100644
--- a/gnome-base/gnome-panel/Manifest
+++ b/gnome-base/gnome-panel/Manifest
@@ -10,22 +10,18 @@ AUX gnome-panel-3.2.1-gold.patch 6508 SHA256 19b867d126d12c5e26da141b6f21433dbf8
 AUX gnome-panel-3.4.2.1-gold.patch 1542 SHA256 cee57eeb17de297d42f8cc66e9794ca8ebf263c0365038835f432c09cfa653ae SHA512 469782d17e103e59afde5151e9af9d61890ac426f36bb1d0cb1d6576c59a49e34ba38803c4b82c67c881f719e84983af4c7bc1bc9055a0aad94271ebdc4fc669 WHIRLPOOL 5235ccb1cfce3be346917e51f75e663397713a1e29f7445eca5655b68b65df33f789c371baca4f646da16e11c5aefb6db2b9525ed21fcc2e117a02700b58b081
 DIST gnome-panel-2.32.1-patches.tar.bz2 6686 SHA256 b0e2f59e370a2a7da2cd5fd1513cc50cf2bf210fac765e05603d81f91e7bbcea SHA512 a9bf6765bddf535849a4983052451eb90a66131826923196dc0d7eda1ceb3a36510901da067ccf970dcac92b0cb4fce57fd1fe42594ada5e4b6c294c2128cf13 WHIRLPOOL c7c953d709402c6b505d87993fd446b63560e86218a767a0eae9348e6a25ba295be97232e9063de473611f3ccaf2ff0989f0974c9a753ff9092d8cda61ef95bf
 DIST gnome-panel-2.32.1.tar.bz2 3132156 SHA256 8f7828eb7a21c817a73b697844a4e20256059b32386414a10f97d51e7d9fca5f SHA512 ceae445cb64db89143b1d5aab46d5cd5e4b4c3333e67c03a54238bb55b396532a159bf13291f617c831664a699a6a323c69c471b534abf54ac697eb9923ef2e0 WHIRLPOOL 2da45235269373a37e722b3bdb92e5b946ed2cd0eb441702eb3ba804c362b5cc4b566ff9d4a012d52c0986badd6f2d0f1aa3c8bb7e50c7d8f2b7dbe7bf59fee3
-DIST gnome-panel-3.2.1.tar.xz 2424632 SHA256 ae5ed578f9f54ad763bf5e46fd5431cdbc06fa2eefea03b390c90a3ffb18870d SHA512 11af8d824f3ffa4268ffc7919244af6181db57f37069f8f0ea8a378dfb89a2626dd1aaea755f74889b2d8446d64de6873dfba326275e2ca8632546354e9d7cdb WHIRLPOOL 0a399a32c6d39919f7b62d175404c4f242f0e4eeb3c44c43738c44d98eacb92c90b1816af8a74ee24c56574824d85ab446943802ca01c2a149dc1c763f57374d
 DIST gnome-panel-3.4.2.1.tar.xz 2531232 SHA256 188ea2b93e4c8116e187abac3ecf590429ff8366ef4b610fab438bd338d857d2 SHA512 e52afd1a3c92a57f9e78f11aa0fd0322c44ea207fb47cba77d62e1e180a4274d902f772169a2fee0872e2cb2452f3857325e0327d00b81aec7ec49e7b5840634 WHIRLPOOL d92ba22fb1834c6e158b7e87d3004bac9325dcd0877272f27ad01911971f04b5f4022b7ba67a9d1db89d90dc50247ceda285141879117e81b27cc38bd6408f43
+DIST gnome-panel-3.6.2.tar.xz 2432152 SHA256 a41c45c5512e796b8602ce50bf0d205993eab364c860aae31afa582d77b77079 SHA512 af030927103ef786d1c94d835aea185059609b0a2855d4933c25792ee925425de04ecbaacf7cf8460974c151306a952f5eab88e7cf8215cf0ae3345640e0e1af WHIRLPOOL 6a7d69c09e5c12ece2dc65154a8be66eda105c4b45a45247011b87f041cdefc0cccd2f7b50cf3417ebb87cb9db63c691df2dd23e2cbe40daca85417ac1f1c144
 DIST introspection-20110205.m4.tar.bz2 1220 SHA256 4394a606d380ae5315872ede35387f104da5fad96794d29c45c444a9d481d8b2 SHA512 5c49239935b93d86cce68b577b43d1a56d8749ab5747029bfcfa67339697134be24ef29ba6c3d133b8c03e867864637c8eb61491a4b7f6bb1e56386ed66cb9be WHIRLPOOL 0765c0a72919b26d0c8c38714450eec578a347bfc1c59d4950b633b64b17aa1cde38dfb87fdcd6e2f364c98d6c0bd3dadaa9c2a9711bd1b5ac09a583b988f500
 EBUILD gnome-panel-2.32.1-r3.ebuild 3614 SHA256 2d419a3dc389358a958546cb950c9db4de3dd5d041e07ba3a6caccee40e27803 SHA512 252b97b406d498680938056e9565578a6b5868b3ed933b50b991dd84a03da0512dc990b4bc57d9ca9f90ab95466388361ff700ae056a940f02631624578d8d65 WHIRLPOOL eae042d75b504d443fc7d99cd80eb393b0cb81612d3f0105c9f709d8118ccece8d2bcac4acdc8ad902a4e791668a5419c584b342fefa6a8bed01dfdfa727c405
-EBUILD gnome-panel-3.2.1.ebuild 2684 SHA256 e3a0e02c4ded82af0ee12d03a747e5fccbd51d23621675add7d6106d98d59de1 SHA512 95c9ad8233a68f1a622b6d74da1ce81e36cff71d0cc0b0c449859fbfeb4fa9c4c48c7599d23e45e9fa82d6902f23da9cf459c23af642f9768d496d837a2a0e12 WHIRLPOOL b4f6df298b9e0cc0d803e246f0fc1f37b550536348c45b4ed451c80a9aea01f5e3ddede37f8c9960af28fab76a928e721160d71a6d3f2780c8127d7098cb1ee4
 EBUILD gnome-panel-3.4.2.1.ebuild 2849 SHA256 08a09037f350e9dba2295a8c08ced41a6a8df75a8c9fddd79d25448f3fd6d549 SHA512 b9b15512a88ddacd7f58ae81759409e0abd5cfc6901cfc4d668c774210c68eafe3656e171859aa59addd149c902634544f7653796c38e67a4dd6c526143e781c WHIRLPOOL b22d14a4ac71e9d1935cc9f3e6e3704320f4af4d1c3bcebdb32fd4eea700dafd77211952455cfd49b46073c1d23ce58e8a114a9dd0058cf77b51f6bea4a273bd
-MISC ChangeLog 50917 SHA256 72b160ec92d304d71a65b860ec1d6b0f061cc365640547d09c3bba0b42df0e74 SHA512 c261ba70d849c765a2830e7574495d65faed3875e63b2cd208c0a820bff08f2ec1265e8482c2343f7e43be9ebd76f45958407cd5bb7f2884f8eedda2b4a63491 WHIRLPOOL bf00aa4ee1e9cf22d48a054346d6b46d1af33fd85d9103cecbc2c97be3dcb4f7d9abfcbcd59552cea84698cc9f3762a174b8a0906c1658faca21147fcfd9e5ab
-MISC metadata.xml 374 SHA256 69c9f86e95c7553d0ff7f84838cde89d1537206aa0de8869ee6a1aeec3cde403 SHA512 406475c057377f15e7f8ecd4c83f1d9aa067b9eebed1d01604bb6d4fd439ed0b22582797d242e076801ee835901f40fa39cb053481f1d75244ff4209a34e2401 WHIRLPOOL 2e697c4f81f4f47a4473681cb82c3fec1ee17f1d7170bede5af802bcf5363a5c541c0f869eabd0c0331c97ee7e5dfa7faaf62179f1d11ef301493343efbf687c
+EBUILD gnome-panel-3.6.2.ebuild 2110 SHA256 85c0b2e83afa2e5554786ab127d523e9f6a9e0dc401056af65f0586249ec5ef5 SHA512 c8a5455fa9407bf9c84cf793f5f8ab2e5bfa00631f942598ae8534a5b6b912dfbd84537e44e148c0b89c2f0223d9e816a3d631b6cca78597cf674ba454ed1e0d WHIRLPOOL 9881e5263b5669f66fdbbc630d4b8d62cb77d01ba66a2bb8cd29079b58c5b8ae2993550cd648f6351b0c97cb3ba2ffdff4ba12f71334bc7c5981f386eeba5d81
+MISC ChangeLog 51215 SHA256 a4dd56260ef008d1f45bd738f5343434cd5efb4f374da8b247b02460b621bea7 SHA512 e42db6c5f6d6cf81c72f5367e28307b590abed666d9bdbfabc2c252966330a76834f8b6824960bdfbecb859556c16ed4fa5575b301d42ee7efe2e81985bf0de8 WHIRLPOOL 6c043b4561b70aa8e73f239d0bc678e7e2333f90e033a47cd3804439fa42c7297366b1ad9a9117435187a25f23cfc4d4b73f1aca85ecb5822e41375bb1a631c6
+MISC metadata.xml 275 SHA256 f1aff29e07ed70f09a7456702f2e968436de24580e8082dce5fbb828af2798f4 SHA512 04e4331ae1405fa36f40b26b86859d3427659f7fca39347229ca347ca5b502e6c8c7bbbcfd59fe7b485b3e522d96be4612939a522814165f9679e0a4f073127f WHIRLPOOL 8914bc6dce8db2c018fcfa75c993a1641efa534b0e31e1b74b9cc6c8ded7616a983f3d4c6a4b1f29db799ae187affbdf86ced41ba155e686f182e58f120784bc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQfNjpAAoJEJ0WA1zPCt1hUMoH/iIF6i6we0wuG+NyWDrRCTsD
-qWEKRmRBsWZ9VbK+D0xa9aLpZJ69XejoFT6P5/3lMkcHO+/g2jZlWkUgzcXcwkx0
-foLCZUkGTQkNsQe7vYt9HmjYpqLwYTnDncelUbcgSkekhiYEgEefN6P0wOstkBHv
-6gW7sJt8bcozssBF9+BxvNjnktLaOuP1mLpej1BWE29Ox+RhgXH2rJddvnGZR1dY
-H7a1YUahhbngnuDl5DnKUKRhGHsImkRwZp3kQO6rbpXIrIqKS7CMR059gkHuNKuj
-sbynx81BA01yNUocNnSWxqhyOfYHvPOSAXBIRoOWp8YjURpQRHiEEY08HPCh0Uo=
-=n6x1
+iEYEAREIAAYFAlDYavgACgkQ1fmVwcYIWAZgeQCgqH5wxjA1gZXh3H03iYaqzX7b
+eYEAn1z1IFFWYhQ7DtYLSi2ec5WCZMuL
+=hIqK
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-panel/gnome-panel-3.2.1.ebuild b/gnome-base/gnome-panel/gnome-panel-3.6.2.ebuild
index 49c90c3e6114..77d6e9378da4 100644
--- a/gnome-base/gnome-panel/gnome-panel-3.2.1.ebuild
+++ b/gnome-base/gnome-panel/gnome-panel-3.6.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/gnome-base/gnome-panel/gnome-panel-3.2.1.ebuild,v 1.4 2012/10/16 03:47:52 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/gnome-panel-3.6.2.ebuild,v 1.1 2012/12/24 14:47:19 eva Exp $
 
-EAPI="4"
+EAPI="5"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
@@ -17,75 +17,54 @@ IUSE="eds +introspection networkmanager"
 # Odd behaviour w.r.t. panels: https://bugzilla.gnome.org/show_bug.cgi?id=631553
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
 
-RDEPEND=">=gnome-base/gnome-desktop-2.91:3
-	>=x11-libs/pango-1.15.4[introspection?]
-	>=dev-libs/glib-2.25.12:2
-	>=x11-libs/gtk+-3.0:3[introspection?]
-	x11-libs/gdk-pixbuf:2
-	>=dev-libs/libgweather-2.91:2
+RDEPEND=">=dev-libs/glib-2.31.14:2
+	>=dev-libs/libgweather-3.5.1:2=
 	dev-libs/libxml2:2
-	gnome-base/dconf
+	>=gnome-base/dconf-0.13.4
 	>=gnome-base/gconf-2.6.1:2[introspection?]
+	>=gnome-base/gnome-desktop-2.91:3=
 	>=gnome-base/gnome-menus-3.1.4:3
 	gnome-base/gsettings-desktop-schemas
 	gnome-base/librsvg:2
-	>=net-libs/telepathy-glib-0.14.0
+	>=net-libs/telepathy-glib-0.14
+	sys-auth/polkit
 	>=x11-libs/cairo-1[X]
+	>=x11-libs/gdk-pixbuf-2.25.2:2
+	>=x11-libs/gtk+-3.3.8:3[introspection?]
 	x11-libs/libXau
 	x11-libs/libICE
 	x11-libs/libSM
 	>=x11-libs/libXrandr-1.2
 	>=x11-libs/libwnck-2.91:3
+	>=x11-libs/pango-1.15.4[introspection?]
 
-	eds? ( >=gnome-extra/evolution-data-server-2.91.2 )
+	eds? ( >=gnome-extra/evolution-data-server-3.5.3:= )
 	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
-	networkmanager? ( >=net-misc/networkmanager-0.6.7 )"
+	networkmanager? ( >=net-misc/networkmanager-0.6.7 )
+"
 DEPEND="${RDEPEND}
+	app-text/docbook-xml-dtd:4.1.2
 	>=dev-lang/perl-5
 	dev-util/gtk-doc-am
-	>=app-text/gnome-doc-utils-0.3.2
-	virtual/pkgconfig
 	>=dev-util/intltool-0.40
-	app-text/docbook-xml-dtd:4.1.2"
+	virtual/pkgconfig
+"
 # eautoreconf needs
+#	dev-libs/gobject-introspection-common
 #	gnome-base/gnome-common
 
-pkg_setup() {
+src_configure() {
 	# XXX: Make presence/telepathy-glib support optional?
 	#      We can do that if we intend to support fallback-only as a setup
 	G2CONF="${G2CONF}
 		--disable-deprecation-flags
 		--disable-static
-		--disable-scrollkeeper
-		--disable-schemas-install
-		--disable-schemas-compile
 		--with-in-process-applets=clock,notification-area,wncklet
 		--enable-telepathy-glib
 		$(use_enable networkmanager network-manager)
 		$(use_enable introspection)
-		$(use_enable eds)"
+		$(use_enable eds)
+		ITSTOOL=$(type -P true)"
 	DOCS="AUTHORS ChangeLog HACKING NEWS README"
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gold.patch
-	gnome2_src_prepare
-}
-
-pkg_postinst() {
-	local entries="${EROOT}etc/gconf/schemas/panel-default-setup.entries"
-	local gconftool="${EROOT}usr/bin/gconftool-2"
-
-	if [ -e "$entries" ]; then
-		einfo "Setting panel gconf defaults..."
-
-		GCONF_CONFIG_SOURCE="$("${gconftool}" --get-default-source | sed "s;:/;:${ROOT};")"
-
-		"${gconftool}" --direct --config-source \
-			"${GCONF_CONFIG_SOURCE}" --load="${entries}"
-	fi
-
-	# Calling this late so it doesn't process the GConf schemas file we already
-	# took care of.
-	gnome2_pkg_postinst
+	gnome2_src_configure
 }
diff --git a/gnome-base/gnome-panel/metadata.xml b/gnome-base/gnome-panel/metadata.xml
index 034912687a9f..9edb90d697d5 100644
--- a/gnome-base/gnome-panel/metadata.xml
+++ b/gnome-base/gnome-panel/metadata.xml
@@ -4,8 +4,6 @@
 <herd>gnome</herd>
 <use>
 	<flag name="bonobo">Enable Bonobo compatibility modules for applets
-	still not ported to DBUS.</flag>
-	<flag name="introspection">Use
-	<pkg>dev-libs/gobject-introspection</pkg> for introspection</flag>
+		still not ported to DBUS.</flag>
 </use>
 </pkgmetadata>