Merge branch 'master' of git@github.com:sjnewbury/multilib-overlay

Conflicts:
	dev-lang/python/Manifest
	gnome-base/gnome-desktop/Manifest

18 files changed, 97 insertions, 30 deletions

diff --git a/gnome-base/gconf/Manifest b/gnome-base/gconf/Manifest
index c6be99493..c056f3169 100644
--- a/gnome-base/gconf/Manifest
+++ b/gnome-base/gconf/Manifest
@@ -6,4 +6,4 @@ DIST GConf-2.24.0.tar.bz2 1467817 RMD160 b4016275e9dffa248620303bc2241f6c0081be0
 DIST GConf-2.26.0.tar.bz2 1490741 RMD160 0673a347b42519f411a7ba247aad12e8249f754d SHA1 317fd4504cc4104b7b914326cbb3b73d61234b4c SHA256 2b9fe741f84d78d7c4f18835728facce81f7db656c2c37f669ee61785911da10
 EBUILD gconf-2.22.0.ebuild 2088 RMD160 12e7e6d1d1a18ac4d6a9a9ba4d0f0fc269e9ec4b SHA1 6819377d9543a1cc68a79d6aa3c2f574b53d3062 SHA256 b332e5ba915c92cbe695e2bd250bf2aeedbbb94b4be65473f11a1bcc1f3153fb
 EBUILD gconf-2.24.0.ebuild 2375 RMD160 d4809f807b4d17c8506cab43624334173f5d5651 SHA1 e490bfd2b85e4ee780d1eb4fa8d796dba8ca7218 SHA256 262988655781d84fd0881cb558c13c7e9cb274462700ccaabb1c16c50f4bdd31
-EBUILD gconf-2.26.0.ebuild 2394 RMD160 a491abd8eae7853a45ea47179a6ede9d5a819345 SHA1 78b5bd726b06cc301a76f9c826a025b0cf4241a6 SHA256 e3f7af45db260dd3e42ba42725a88295430648b6db97b810a276fe149c033a34
+EBUILD gconf-2.26.0.ebuild 2413 RMD160 11397c9cc98273365be0fca0c5326154232e417f SHA1 4c00b498f2b55917689f9156ebc8077a176a9a18 SHA256 864ba6ffb513cd81c4ec0d2fd73409df48fdbfe43f1867b14443d3fe34168749
diff --git a/gnome-base/gconf/gconf-2.26.0.ebuild b/gnome-base/gconf/gconf-2.26.0.ebuild
index 4e578704d..db3804254 100644
--- a/gnome-base/gconf/gconf-2.26.0.ebuild
+++ b/gnome-base/gconf/gconf-2.26.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/gconf-2.24.0.ebuild,v 1.1 2008/10/20 19:59:44 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/gconf-2.26.0.ebuild,v 1.1 2009/04/19 07:26:06 leio Exp $
 
 EAPI="2"
 
@@ -16,17 +16,17 @@ SRC_URI="mirror://gnome/sources/${MY_PN}/${PVP[0]}.${PVP[1]}/${MY_P}.tar.bz2"
 
 LICENSE="LGPL-2"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="debug doc ldap"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc64 ~sh ~sparc ~x86"
+IUSE="debug doc ldap policykit"
 
-# FIXME: add policykit support
 RDEPEND=">=dev-libs/glib-2.14[lib32?]
 	>=x11-libs/gtk+-2.8.16[lib32?]
 	>=dev-libs/dbus-glib-0.74[lib32?]
 	>=sys-apps/dbus-1[lib32?]
 	>=gnome-base/orbit-2.4[lib32?]
 	>=dev-libs/libxml2-2[lib32?]
-	ldap? ( net-nds/openldap )"
+	ldap? ( net-nds/openldap )
+	policykit? ( >=sys-auth/policykit-0.7 )"
 DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.35
 	>=dev-util/pkgconfig-0.9
@@ -41,9 +41,10 @@ pkg_setup() {
 	G2CONF="${G2CONF}
 		--enable-gtk
 		--disable-defaults-service
+		--disable-static
 		$(use_enable debug)
-		$(use_with ldap openldap)"
-	#$(use_enable policykit defaults-service)
+		$(use_with ldap openldap)
+		$(use_enable policykit defaults-service)"
 	kill_gconf
 }
 
@@ -62,7 +63,7 @@ src_unpack() {
 # Can't run tests, missing script.
 #src_test() {
 #	emake -C tests || die "make tests failed"
-#	sh "${S}"/tests/runtests.sh || die "running tests failed"
+#	sh "${S}"/tests/runtests.sh || die "running tests failed"
 #}
 
 multilib-native_src_install_internal() {
@@ -83,7 +84,7 @@ pkg_preinst() {
 pkg_postinst() {
 	kill_gconf
 
-	#change the permissions to avoid some gconf bugs
+	# change the permissions to avoid some gconf bugs
 	einfo "changing permissions for gconf dirs"
 	find  /etc/gconf/ -type d -exec chmod ugo+rx "{}" \;
 
diff --git a/gnome-base/gnome-desktop/Manifest b/gnome-base/gnome-desktop/Manifest
index a40c2b145..75170b716 100644
--- a/gnome-base/gnome-desktop/Manifest
+++ b/gnome-base/gnome-desktop/Manifest
@@ -1,7 +1,8 @@
 AUX gnome-desktop-2.24.2-background.patch 886 RMD160 032349d5797ce2333a961a214bf078138ab16010 SHA1 6e271f942e130cf1f5020d1d7ab9f64f81903fc0 SHA256 cbe72e1e9f8b4891cbbe321ab7f6e16ca98fbdf05a5c833dbf5dfb8135173457
 DIST gnome-desktop-2.24.3.tar.bz2 1509505 RMD160 b6489965a0baa6056b5c7826418401459ffbf0b9 SHA1 2ebbf2475bb741131b523819fb46e71d4489fa79 SHA256 03b1e08ee1318820f538864e8db492a245848bd727da1412a62de51d4cb76e89
 DIST gnome-desktop-2.26.1.tar.bz2 3228329 RMD160 12456ea4f356b5e6b772b077ca23e0d8d59ffccb SHA1 236e8c63cdb8ae4bc2ebae662a1fac88e09c2747 SHA256 a0341c77360dbb23fbad61987ce9f78f9bfc11ac12e48f60cb049359b4b76d7d
+EBUILD gnome-desktop-2.24.3-r1.ebuild 2047 RMD160 139ba28b53593051d6d61f0a3a6866637abc086d SHA1 4c5c50a5e62727964059cda561fe923aab44cb57 SHA256 dedb4689f95f7aa05d514fff58feb3094c7666983f23986a538d1dd5b2ae1ec0
 EBUILD gnome-desktop-2.24.3.ebuild 1870 RMD160 feb5785ff0b81f2fd0e999564e1f605700aa8e0a SHA1 4dc067b4136fc00d5ff7ab18ec11e0f8a7fa5619 SHA256 0dd3f31d08d12e46be8fb053bb33d0644bfd29fb98eddd6515e7d5c2c2d911ea
-EBUILD gnome-desktop-2.26.1.ebuild 1611 RMD160 4a63ee7f36b56d8ce8cd6c7be01c7709962cad88 SHA1 a45ad57525f8fb5dccc9f0cc3bdd0ec85b1d6344 SHA256 297faa76b258d4b379b4585c4d2ee387aeda2ec670df9f4c26244c6985bca9fd
+EBUILD gnome-desktop-2.26.1.ebuild 1543 RMD160 7d64f10cd055bcefb6776384f2e839845ef80c9c SHA1 5e7b40321e1f67490f2d6e153edfe348c684581a SHA256 020a9c1e27dd1525ce353b48b07ad38a96c38f594bb5f277b8c278f0aeb097a4
 MISC ChangeLog 30080 RMD160 7e10838d5cab967e0802b252866b1ffdbc01ecff SHA1 3b8af7ab12cd2fc803a254d2e1dbc0d8e1f8bd6e SHA256 1d6af4ac4119dd4e5993f3970357c3f55ecbcb662ba2aacf0458d65727c4dfbd
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
diff --git a/gnome-base/gnome-desktop/gnome-desktop-2.24.3-r1.ebuild b/gnome-base/gnome-desktop/gnome-desktop-2.24.3-r1.ebuild
new file mode 100644
index 000000000..c6e92f426
--- /dev/null
+++ b/gnome-base/gnome-desktop/gnome-desktop-2.24.3-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-desktop/gnome-desktop-2.24.3-r1.ebuild,v 1.2 2009/04/23 22:03:49 eva Exp $
+
+EAPI="2"
+
+inherit eutils autotools gnome2 multilib-native
+
+DESCRIPTION="Libraries for the gnome desktop that are not part of the UI"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="GPL-2 FDL-1.1 LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="doc"
+
+# FIXME: Python deps are needed for gnome-about but not
+# listed in configure.ac
+RDEPEND=">=dev-libs/libxml2-2.4.20[lib32?]
+	>=x11-libs/gtk+-2.11.3[lib32?]
+	>=dev-libs/glib-2.15.4[lib32?]
+	>=x11-libs/libXrandr-1.2[lib32?]
+	>=gnome-base/gconf-2[lib32?]
+	>=gnome-base/libgnomeui-2.6[lib32?]
+	>=x11-libs/startup-notification-0.5[lib32?]
+	>=dev-python/pygtk-2.8[lib32?]
+	>=dev-python/pygobject-2.14[lib32?]
+	>=dev-python/libgnome-python-2.22[lib32?]"
+DEPEND="${RDEPEND}
+	app-text/scrollkeeper
+	>=dev-util/intltool-0.40
+	>=dev-util/pkgconfig-0.9
+	>=app-text/gnome-doc-utils-0.3.2
+	doc? ( >=dev-util/gtk-doc-1.4 )
+	~app-text/docbook-xml-dtd-4.1.2
+	x11-proto/xproto
+	>=x11-proto/randrproto-1.2
+	gnome-base/gnome-common"
+# Includes X11/Xatom.h in libgnome-desktop/gnome-bg.c which comes from xproto
+# Includes X11/extensions/Xrandr.h that includes randr.h from randrproto (and
+# eventually libXrandr shouldn't RDEPEND on randrproto)
+
+DOCS="AUTHORS ChangeLog HACKING NEWS README"
+
+pkg_setup() {
+	G2CONF="${G2CONF} --with-gnome-distributor=Gentoo --disable-scrollkeeper"
+}
+
+src_unpack() {
+	gnome2_src_unpack
+
+	# Do not load background if not needed, bug #251350
+	epatch "${FILESDIR}/${PN}-2.24.2-background.patch"
+
+	# Broken intltool-0.40.6 used for 2.24.3, re-intltoolize
+	intltoolize --force --automake --copy || die "intltoolize failed"
+	eautomake
+}
+
+pkg_postinst() {
+	ewarn
+	ewarn "If you are upgrading from <gnome-base/gnome-desktop-2.24, please"
+	ewarn "make sure you run revdep-rebuild at the end of the upgrade."
+}
diff --git a/gnome-base/gnome-desktop/gnome-desktop-2.26.1.ebuild b/gnome-base/gnome-desktop/gnome-desktop-2.26.1.ebuild
index 240988d55..df5c9121b 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-2.26.1.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-2.26.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.gnome.org/"
 
 LICENSE="GPL-2 FDL-1.1 LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS=""
 IUSE="doc"
 
 # FIXME: Python deps are needed for gnome-about but not
diff --git a/gnome-base/gnome-keyring/Manifest b/gnome-base/gnome-keyring/Manifest
index 83ea75fc4..808b7a44c 100644
--- a/gnome-base/gnome-keyring/Manifest
+++ b/gnome-base/gnome-keyring/Manifest
@@ -4,4 +4,4 @@ DIST gnome-keyring-2.24.1.tar.bz2 1125993 RMD160 17c6701ef7b35902780b6c72b79a3f0
 DIST gnome-keyring-2.26.1.tar.bz2 2738687 RMD160 0975197ae8e58a8d98a2ff11c062ec6c9cf74a79 SHA1 3ff24987392b3f51109709b2c020af3557155ef8 SHA256 47a79a7963652c19d9f566289fdb49ca286bfb1bef32b7e1032eb36c49bf7926
 EBUILD gnome-keyring-2.22.3-r1.ebuild 1400 RMD160 0b79a30d5ed1ae5b78d22f86ca8d49547a689529 SHA1 c550eeea0b37cc4e964b87d645bc7a49cddfcb45 SHA256 786b225f4a79abf9d046c324d77bc8f75c05051e4087954788ed8e824b43df5a
 EBUILD gnome-keyring-2.24.1.ebuild 1379 RMD160 4f556a773bc9a87e732ff7356b2e42c35097fc5f SHA1 828dab19d8634a63d3963d094aea947b2f48443c SHA256 209571fc866720095a69d36a00530bc2b57bc7523fc1a6d2ae28557ac0a7baa9
-EBUILD gnome-keyring-2.26.1.ebuild 1441 RMD160 0b3e892c543060f316b535a75d2053b69d86a355 SHA1 0c38e3a9c12172153e8f6b31722545ecb6d1576e SHA256 554ab679e83d6aaa5c17e9f0c3d95354866e2fb43efb5e5d64c7840ad0822b93
+EBUILD gnome-keyring-2.26.1.ebuild 1367 RMD160 18a00ad24d6c717b378e25b021f244daafd58953 SHA1 512d776eaf2569a1702108236b5227a63971ed0b SHA256 f1f1fb59afebdd096edfcdf9ddbd4e1650c15623c6b757d13a07e2c4e0b2d206
diff --git a/gnome-base/gnome-keyring/gnome-keyring-2.26.1.ebuild b/gnome-base/gnome-keyring/gnome-keyring-2.26.1.ebuild
index ca6553594..afec8f9df 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-2.26.1.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-2.26.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.gnome.org/"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS=""
 IUSE="debug doc hal pam valgrind test"
 
 RDEPEND=">=dev-libs/glib-2.16[lib32?]
diff --git a/gnome-base/libbonobo/Manifest b/gnome-base/libbonobo/Manifest
index dd589db05..9db8964fd 100644
--- a/gnome-base/libbonobo/Manifest
+++ b/gnome-base/libbonobo/Manifest
@@ -1,4 +1,4 @@
 DIST libbonobo-2.24.0.tar.bz2 1455370 RMD160 244d93c8904e8ee04a76a5426849bedac0732950 SHA1 bd5f9e1eda3107fed86baad8a3501fa8d12b9b51 SHA256 bc851f032359f2c27d8980d8b0c6ba0e40e06c0c501ed9b897c7dd1723b5ef55
 DIST libbonobo-2.24.1.tar.bz2 1464385 RMD160 a6c49e74eda18bcd7a3ee842c2ae0c68502ef439 SHA1 9bd321ca9c7e6abba8d4f65b53940d7096e6724b SHA256 42b2ac58b86b2cc93fbbc65f94a3d1fcf5e8f33f728384653b30dbe456e91274
 EBUILD libbonobo-2.24.0.ebuild 1375 RMD160 6d6c3e4d07828d136cde2513bded7ce2acfefa3f SHA1 a431b5a2daf4ccf335e1cfeec561e75a09c79f71 SHA256 a03e17126fb4b9f91e9f6953d61ed88240ea6769dc89dded39b6ff326d365933
-EBUILD libbonobo-2.24.1.ebuild 967 RMD160 d1fa3c0b7c1d94ae74f170caece1bda35240e3ec SHA1 ae45edeee5fd1b20855bd074d95f9d865c19d606 SHA256 14430a7076f29501c3e5dc93af9ba5c07093c412286f0b58b8b5e4f12a9ffb3e
+EBUILD libbonobo-2.24.1.ebuild 966 RMD160 62b2d42b64eeac4dacbbab4351629bc72d800b46 SHA1 4674c0ec96c54334cc492807b1eee9fca236edb2 SHA256 ff554c2f8058d1e720a8763c224b0caa6917dd3d4904e30ded541e421a98ab8b
diff --git a/gnome-base/libbonobo/libbonobo-2.24.1.ebuild b/gnome-base/libbonobo/libbonobo-2.24.1.ebuild
index 472f6061d..0b189f7cc 100644
--- a/gnome-base/libbonobo/libbonobo-2.24.1.ebuild
+++ b/gnome-base/libbonobo/libbonobo-2.24.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libbonobo/libbonobo-2.24.1.ebuild,v 1.1 2009/03/08 01:19:09 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libbonobo/libbonobo-2.24.1.ebuild,v 1.3 2009/04/19 15:43:06 maekke Exp $
 
 EAPI="2"
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.gnome.org/"
 
 LICENSE="LGPL-2.1 GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~x86-fbsd"
 IUSE="debug doc"
 
 RDEPEND=">=dev-libs/glib-2.14[lib32?]
diff --git a/gnome-base/libbonoboui/Manifest b/gnome-base/libbonoboui/Manifest
index 2ada68a4a..1cd88afc1 100644
--- a/gnome-base/libbonoboui/Manifest
+++ b/gnome-base/libbonoboui/Manifest
@@ -1,2 +1,2 @@
 DIST libbonoboui-2.24.1.tar.bz2 988420 RMD160 6bea00e7ebe4f8601c9bc69e4c8008543064fed0 SHA1 30373b904003c9c20cd19510b05a6c388b3f8b82 SHA256 322536bdc23a70287f229168af2538a7b36c1b5041626ba15e22902228750c29
-EBUILD libbonoboui-2.24.1.ebuild 1277 RMD160 f74c8352ed699353044616ccc10e7dc753db6f5b SHA1 d10566c0ffe0b182dd853ebb7c238438c986caff SHA256 dd676b8fba34c0109536a40dc6981918257753f089cb91cabb2fa1eba480e757
+EBUILD libbonoboui-2.24.1.ebuild 1275 RMD160 bf35f54e7604a60a2f6236ed5daad8f6ce669b67 SHA1 52851a3a12d95add6e6824f0d1e9b115f214278d SHA256 ab583350d27a7d17a900e81c660ca585d6969a5f1a60ef8b1c7b6f5c2bf5f31e
diff --git a/gnome-base/libbonoboui/libbonoboui-2.24.1.ebuild b/gnome-base/libbonoboui/libbonoboui-2.24.1.ebuild
index 53d7b6396..6607f9409 100644
--- a/gnome-base/libbonoboui/libbonoboui-2.24.1.ebuild
+++ b/gnome-base/libbonoboui/libbonoboui-2.24.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libbonoboui/libbonoboui-2.24.1.ebuild,v 1.1 2009/03/08 01:39:47 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libbonoboui/libbonoboui-2.24.1.ebuild,v 1.4 2009/04/19 15:44:13 maekke Exp $
 
 GCONF_DEBUG="no"
 
@@ -13,7 +13,7 @@ HOMEPAGE="http://developer.gnome.org/arch/gnome/componentmodel/bonobo.html"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~x86-fbsd"
 IUSE="doc"
 
 # GTK+ dep due to bug #126565
diff --git a/gnome-base/libgnome/Manifest b/gnome-base/libgnome/Manifest
index 609877307..640a115cc 100644
--- a/gnome-base/libgnome/Manifest
+++ b/gnome-base/libgnome/Manifest
@@ -1,4 +1,4 @@
 DIST libgnome-2.24.1.tar.bz2 1416606 RMD160 8dc93692e878bd22143fb7f0bfaf375acb70758a SHA1 f9d1d922569cb8f8a44834f5eadc42ac21d184e1 SHA256 16c05ef6b1bbb057ceea512300de35f2d704609d7a3cacfd5301bc1a138e015a
 DIST libgnome-2.26.0.tar.bz2 1414016 RMD160 0c98138b3e19c70ea331ffb84019c8bdd277337b SHA1 a78143105f61ec2c65cc852a9e3da7a7b56e51a0 SHA256 2ef0287ab19fd34a7d20bc8beef86bb22db13cfc414367cb48e6121b8163e318
-EBUILD libgnome-2.24.1.ebuild 933 RMD160 b53ebd22b3e6ae17cc8aeaad6f797d1b24ea7933 SHA1 8d4ed0c7bcf2d2ad3a88fb4672e8776c65b9c381 SHA256 07da7eb3e2722db2a836de4ee630b85268ec8fc0f181433c2720028123dce3e5
-EBUILD libgnome-2.26.0.ebuild 936 RMD160 8189fe284c5cc42f2c2e0b5a21ad8e9d4b496c34 SHA1 7adea729f1b8195b413ed05406e26ec3cca23246 SHA256 8d925f89562ada7ea72675a8f8240e113b26d5817daf7ff6f8066b11e0e3f945
+EBUILD libgnome-2.24.1.ebuild 945 RMD160 c6f04bccfb6a32b59cd9570c0574aecb6e87c6fa SHA1 fd56b8e7dcc73d7b7722612d40181a6d0f3ee46a SHA256 80ef80bdbd839c483183892525445e5e2528be1a8e67ffe4fe887d5cfc5cec6d
+EBUILD libgnome-2.26.0.ebuild 864 RMD160 47033a2a0f06820fb4f757cde9791e032e67aae4 SHA1 c637ab9729b7897f1dd2a20f9dd53a6249a1f4ec SHA256 9a1ea1e2f3f95510192787d4b4c421b27ec8311abdddb7848581afab4fc277d7
diff --git a/gnome-base/libgnome/libgnome-2.24.1.ebuild b/gnome-base/libgnome/libgnome-2.24.1.ebuild
index 77cb56a84..3e33ad98f 100644
--- a/gnome-base/libgnome/libgnome-2.24.1.ebuild
+++ b/gnome-base/libgnome/libgnome-2.24.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnome/libgnome-2.24.1.ebuild,v 1.7 2009/04/12 20:44:13 bluebird Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnome/libgnome-2.24.1.ebuild,v 1.8 2009/04/18 22:41:07 eva Exp $
 
 EAPI="2"
 
@@ -16,6 +16,7 @@ IUSE="doc esd"
 
 RDEPEND=">=gnome-base/gconf-2[lib32?]
 	>=dev-libs/glib-2.16[lib32?]
+	gnome-base/gvfs
 	>=gnome-base/gnome-vfs-2.5.3[lib32?]
 	>=gnome-base/libbonobo-2.13[lib32?]
 	>=dev-libs/popt-1.7[lib32?]
diff --git a/gnome-base/libgnome/libgnome-2.26.0.ebuild b/gnome-base/libgnome/libgnome-2.26.0.ebuild
index 21d386fa7..6590de3ef 100644
--- a/gnome-base/libgnome/libgnome-2.26.0.ebuild
+++ b/gnome-base/libgnome/libgnome-2.26.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.gnome.org/"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS=""
 IUSE="doc esd"
 
 RDEPEND=">=gnome-base/gconf-2[lib32?]
diff --git a/gnome-base/libgnomecanvas/Manifest b/gnome-base/libgnomecanvas/Manifest
index d4492c375..048520cf1 100644
--- a/gnome-base/libgnomecanvas/Manifest
+++ b/gnome-base/libgnomecanvas/Manifest
@@ -1,4 +1,4 @@
 DIST libgnomecanvas-2.20.1.1.tar.bz2 583565 RMD160 fe5333c31f385313b2e90deb9710275d61bbc15b SHA1 302a4762b658244828ad1c9f291ffb972b8274c9 SHA256 70f906d52d98b7b45e95fd59ef10f06579b75ee9e70e67edabd30a4f6e5d6fe3
 DIST libgnomecanvas-2.26.0.tar.bz2 600470 RMD160 87eb8f61b4ed8c3c3ede4941aeb8b539731d1d9f SHA1 d0429140c3ae8974562f4eb34e89d4f512e8e4ec SHA256 80b480acc33d7303f651e9c5bc8fea51c9e9a9ed59ebfdbbb730dd798bcbc58d
 EBUILD libgnomecanvas-2.20.1.1.ebuild 970 RMD160 577d5434abf76b0ea79285e465437740020b7c09 SHA1 e8e493d4f8da62b6c376f8835909f948a9d9c236 SHA256 66cce1e051d8021e728c3933f6f19e655ea517d24903f456f63830ee17ab14cf
-EBUILD libgnomecanvas-2.26.0.ebuild 944 RMD160 9de813ddb930701a0c1e3ad9e497ef17809d6998 SHA1 23b9a04126e3694e5f3214057989702fab8158e0 SHA256 92131f3cb08c0a4b5d2e70011bea5ab3e26e00583165980d1008e9febccd1281
+EBUILD libgnomecanvas-2.26.0.ebuild 870 RMD160 69a986ad44d56bbe8b4a27129d5c8c78de2eef85 SHA1 317a3f4e7d1f39037155cf4c74b38c5f7bd98e8a SHA256 2d96151ad15e0481cd1fddb4a1fd084d9c8d6916a1ca763f2c58f3ebb808fc82
diff --git a/gnome-base/libgnomecanvas/libgnomecanvas-2.26.0.ebuild b/gnome-base/libgnomecanvas/libgnomecanvas-2.26.0.ebuild
index bb4b3fa95..2fc5069af 100644
--- a/gnome-base/libgnomecanvas/libgnomecanvas-2.26.0.ebuild
+++ b/gnome-base/libgnomecanvas/libgnomecanvas-2.26.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.gnome.org/"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS=""
 IUSE="doc"
 
 # gtk+ raised to fix gail dependency
diff --git a/gnome-base/libgnomeui/Manifest b/gnome-base/libgnomeui/Manifest
index dbb74d924..346018481 100644
--- a/gnome-base/libgnomeui/Manifest
+++ b/gnome-base/libgnomeui/Manifest
@@ -1,2 +1,2 @@
 DIST libgnomeui-2.24.1.tar.bz2 1494605 RMD160 b8c57e6cf2ba1667f7926b135121ef34e8c4167d SHA1 b95cd3da3908896bd09b129bcbe3a6eba7d37dd5 SHA256 a2ed289b7b35956eff7ddd4d9f4e2507260a7fcb5d7d01969f2e3bb8278e8dc1
-EBUILD libgnomeui-2.24.1.ebuild 1218 RMD160 1b7d0c3a015b75a7ce4180ea45d596b9a5f76226 SHA1 9c1a26b9d686b83564bf4cdb3448f5d5b4d0bf43 SHA256 a4129ee1d507728294b449d642f784ee1dff7c9533d0f683dac18432e8025ddc
+EBUILD libgnomeui-2.24.1.ebuild 1219 RMD160 167751300e8d07fab6e2bd366c541a82e64b04cf SHA1 4454a12574d16070a19c302dcc1cc95c85b90978 SHA256 7a032343ce10a2cce1692fa9e920587d18006e333fc31c5eb3f0c4c28a279ef8
diff --git a/gnome-base/libgnomeui/libgnomeui-2.24.1.ebuild b/gnome-base/libgnomeui/libgnomeui-2.24.1.ebuild
index 63fa482b1..0f4aa5fd7 100644
--- a/gnome-base/libgnomeui/libgnomeui-2.24.1.ebuild
+++ b/gnome-base/libgnomeui/libgnomeui-2.24.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomeui/libgnomeui-2.24.1.ebuild,v 1.1 2009/03/08 01:36:03 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomeui/libgnomeui-2.24.1.ebuild,v 1.4 2009/04/23 17:45:34 klausman Exp $
 
 GCONF_DEBUG="no"
 
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.gnome.org/"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="doc"
 
 # gtk+-2.14 dep instead of 2.12 ensures system doesn't loose VFS capabilities in GtkFilechooser