bump to 2.22.1. Bug fixes and translation updates.

Package-Manager: portage-2.1.5_rc2

5 files changed, 121 insertions, 12 deletions

diff --git a/gnome-base/control-center/ChangeLog b/gnome-base/control-center/ChangeLog
index f38b35af7afd..93f14db78752 100644
--- a/gnome-base/control-center/ChangeLog
+++ b/gnome-base/control-center/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-base/control-center
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/control-center/ChangeLog,v 1.266 2008/03/27 00:53:21 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/control-center/ChangeLog,v 1.267 2008/04/10 21:47:07 eva Exp $
+
+*control-center-2.22.1 (10 Apr 2008)
+
+  10 Apr 2008; Gilles Dartiguelongue <eva@gentoo.org>
+  +control-center-2.22.1.ebuild:
+  bump to 2.22.1. Bug fixes and translation updates.
 
 *control-center-2.22.0 (27 Mar 2008)
 
diff --git a/gnome-base/control-center/Manifest b/gnome-base/control-center/Manifest
index fea9855d5f75..33b7e80cedbc 100644
--- a/gnome-base/control-center/Manifest
+++ b/gnome-base/control-center/Manifest
@@ -9,15 +9,17 @@ AUX control-center-2.19.90-no-esd.patch 1169 RMD160 ca43e6a2abbf145c7da529dfe39d
 DIST control-center-2.18.1.tar.bz2 2150134 RMD160 f3980d2348a699f646d87ec27c61f27057594302 SHA1 4325caeb94de9b77cd57fc210f1ba623458a2aa8 SHA256 3bb1474a6914d5a210a6f21368c48c9c302918a4ab94a5282b84b57ebc432c87
 DIST gnome-control-center-2.20.3.tar.bz2 2259976 RMD160 96f56251c6a06315861dcd89a1c5f68ed47bd48f SHA1 57395df926f9fc79caa7dc94d55d22d55cfa15c0 SHA256 e3abed47de5f41511af95663d1adb3d35a575dc662b8611e959f2f5d205ab07f
 DIST gnome-control-center-2.22.0.tar.bz2 2176730 RMD160 2a49db07dffe67c23f96241c938423cefd1acc39 SHA1 178ef8e211d2cdbf89ce388b125c1cbfc3a26393 SHA256 13e5cc7181b4c380921984a327ec2f8a48077a4f15319bbe6cf6985f44ff3af0
-EBUILD control-center-2.18.1.ebuild 2806 RMD160 fbb5e5e426b92514ccbb5a98f00f02df808aed24 SHA1 411cae0841826a5592217c7d02ae9665c01d6f51 SHA256 a2a238dd23d3cc160feb1eb5569914960baf7e3e5847e8861ee4baa15f387c0d
+DIST gnome-control-center-2.22.1.tar.bz2 2174701 RMD160 c51bf51f26594021b98bc5e82db97fac7d9a7bd8 SHA1 d62a7cc6ce09e15e0040747a1c6eb9287d323562 SHA256 524563d285b5c3be71fce6596a81ef3057514382f4f61e4b64bb827a94a6b01c
+EBUILD control-center-2.18.1.ebuild 2806 RMD160 6d8e30e79d3e76e74d078e5824cac6a22bc56b54 SHA1 737f88abf6298b5339a9ed3064050209f24067d5 SHA256 00159c7f01f49b2723cd0e84ebebf9db7ee10af56bdc39c352f16a46783e6abb
 EBUILD control-center-2.20.3.ebuild 2633 RMD160 4a949073dcaaf6f80a009462537c8010aebfac95 SHA1 eafbf7d2d660ce2881b2c5f14b63849df5448747 SHA256 7bbcb52eca968580f7a0fd98b5b0981c473fe231b8a3a58dc16318d19c810049
-EBUILD control-center-2.22.0.ebuild 2659 RMD160 f373c9a12849b014d55919a134382903ecb0a7a8 SHA1 ec34703916d25bb42e36b5e7cfb335ce83657ed7 SHA256 503e18d596e46c0244fa291642b50590b950648e08f2db34301da84611d6507e
-MISC ChangeLog 36213 RMD160 5519c461b9c5aff80a1958cc9f6449b7bde530e0 SHA1 dd11ad618c0e35a5f947e0a9563ec855146110e3 SHA256 43f403119abfdf03003f9783007ab1719e677c37f5918d7dc269e57abc2b85fa
+EBUILD control-center-2.22.0.ebuild 2657 RMD160 10964bd15d23d03ae5ac3a0e7cb7cd846c938caa SHA1 304c6df6888b6a216d76ed923629b3e6d5061bdd SHA256 d918066a8ee5e1c972bf4b50db9faaf51426b2fe60b7710ef4045715894e343b
+EBUILD control-center-2.22.1.ebuild 2657 RMD160 f2b86a8216cfcb7309467e996c55e57171c88a5d SHA1 6e73dda1fabd0bd87d82d2fb431581d204791100 SHA256 b6ea33ad292e20034904cfdff5930c29357ec5a4938bc20c58f1c38a05e4c21b
+MISC ChangeLog 36391 RMD160 08e5b35a7c5bb11ba402da19db72642ff6eef823 SHA1 5268a70ea55512eaa7db6483ff66b18051d345b6 SHA256 a80a618f9d4c82138d88aac0cbb626df36d679e1ff36c3994990fbe74b91046a
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.8 (GNU/Linux)
+Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkfq8AgACgkQkeYb6olFHJfc1wCfaVxBFO/l6O2IfF/GNQUVGgcB
-b3oAnRn87qQCoh/aAwlL9G0AHVYu/Vdk
-=9F4X
+iEYEARECAAYFAkf+iuMACgkQ1fmVwcYIWAZlzwCfXovjTHGj6TNVPfWlIsU0VX4i
+qcUAoI3J0gxF+Cz9b3buRVefGUvJmTG4
+=HYUy
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/control-center/control-center-2.18.1.ebuild b/gnome-base/control-center/control-center-2.18.1.ebuild
index f3cb1fe0b050..d274500ee5ad 100644
--- a/gnome-base/control-center/control-center-2.18.1.ebuild
+++ b/gnome-base/control-center/control-center-2.18.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/control-center/control-center-2.18.1.ebuild,v 1.17 2007/10/14 11:13:07 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/control-center/control-center-2.18.1.ebuild,v 1.18 2008/04/10 21:47:07 eva Exp $
 
 inherit eutils gnome2 autotools
 
diff --git a/gnome-base/control-center/control-center-2.22.0.ebuild b/gnome-base/control-center/control-center-2.22.0.ebuild
index d551e6839ce1..ba1fca46cd79 100644
--- a/gnome-base/control-center/control-center-2.22.0.ebuild
+++ b/gnome-base/control-center/control-center-2.22.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gent1oo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/control-center/control-center-2.22.0.ebuild,v 1.1 2008/03/27 00:53:21 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/control-center/control-center-2.22.0.ebuild,v 1.2 2008/04/10 21:47:07 eva Exp $
 
 EAPI="1"
 
diff --git a/gnome-base/control-center/control-center-2.22.1.ebuild b/gnome-base/control-center/control-center-2.22.1.ebuild
new file mode 100644
index 000000000000..ff1fea3bea6d
--- /dev/null
+++ b/gnome-base/control-center/control-center-2.22.1.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/control-center/control-center-2.22.1.ebuild,v 1.1 2008/04/10 21:47:07 eva Exp $
+
+EAPI="1"
+
+inherit eutils gnome2 autotools
+
+DESCRIPTION="The gnome2 Desktop configuration tool"
+HOMEPAGE="http://www.gnome.org/"
+SRC_URI="mirror://gnome/sources/gnome-${PN}/${PVP[0]}.${PVP[1]}/gnome-${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="alsa eds esd hal"
+
+RDEPEND=">=virtual/xft-2.1.2
+		 >=x11-libs/gtk+-2.11.6
+		 >=dev-libs/glib-2.15.5
+		 >=gnome-base/gconf-2.0
+		 >=gnome-base/libglade-2
+		 >=gnome-base/librsvg-2.0
+		 >=gnome-base/nautilus-2.6
+		 >=media-libs/fontconfig-1
+		 >=dev-libs/dbus-glib-0.73
+		 >=gnome-base/gnome-vfs-2.2
+		 >=x11-libs/libxklavier-3.3
+		 >=x11-wm/metacity-2.21.21
+		 >=gnome-base/gnome-panel-2.0
+		 >=gnome-base/libgnomekbd-2.21.4.1
+		 >=gnome-base/gnome-desktop-2.21.4
+		 >=gnome-base/gnome-menus-2.11.1
+		 gnome-base/eel
+		 gnome-base/gnome-settings-daemon
+
+		>=media-libs/gstreamer-0.10.1.2
+		>=media-libs/gst-plugins-base-0.10.1.2
+		>=media-plugins/gst-plugins-gconf-0.10
+		media-plugins/gst-plugins-meta:0.10
+
+		x11-libs/pango
+		dev-libs/libxml2
+		media-libs/freetype
+
+		!arm? ( alsa? ( >=media-libs/alsa-lib-0.9.0 ) )
+		eds? ( >=gnome-extra/evolution-data-server-1.7.90 )
+		esd? ( >=media-sound/esound-0.2.28 )
+		hal? ( >=sys-apps/hal-0.5.6 )
+
+		>=gnome-base/libbonobo-2
+		>=gnome-base/libgnome-2.2
+		>=gnome-base/libbonoboui-2
+		>=gnome-base/libgnomeui-2.2
+
+		x11-apps/xmodmap
+		x11-libs/libXScrnSaver
+		x11-libs/libXext
+		x11-libs/libX11
+		x11-libs/libXxf86misc
+		x11-libs/libXrandr
+		x11-libs/libXrender
+		x11-libs/libXcursor"
+DEPEND="${RDEPEND}
+		x11-proto/scrnsaverproto
+		x11-proto/xextproto
+		x11-proto/xproto
+		x11-proto/xf86miscproto
+		x11-proto/kbproto
+		x11-proto/randrproto
+		x11-proto/renderproto
+
+		sys-devel/gettext
+		>=dev-util/intltool-0.35
+		>=dev-util/pkgconfig-0.19
+		dev-util/desktop-file-utils
+
+		app-text/scrollkeeper
+		gnome-base/gnome-common
+		>=app-text/gnome-doc-utils-0.10.1"
+
+DOCS="AUTHORS ChangeLog NEWS README TODO"
+S="${WORKDIR}/gnome-${P}"
+
+pkg_setup() {
+	G2CONF="${G2CONF} --disable-update-mimedb \
+			--enable-vfs-methods              \
+			--enable-gstreamer=0.10           \
+			$(use_enable alsa)                \
+			$(use_enable eds aboutme)         \
+			$(use_enable esd)                 \
+			$(use_enable hal)"
+}
+
+src_unpack() {
+	gnome2_src_unpack
+
+	# Allow building with scrollkeeper
+	epatch "${FILESDIR}/${PN}-2.18.1-gnome-doc-utils-fix.patch"
+	eautoreconf
+}