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

Conflicts: dev-libs/icu/Manifest dev-libs/icu/icu-4.2.ebuild gnome-base/gnome-keyring/Manifest gnome-base/gnome-keyring/gnome-keyring-2.26.1-r1.ebuild media-libs/gst-plugins-base/Manifest media-libs/gst-plugins-base/gst-plugins-base-0.10.23.ebuild media-libs/gstreamer/Manifest media-libs/gstreamer/gstreamer-0.10.23.ebuild sys-apps/hal/Manifest sys-apps/hal/hal-0.5.12_rc1-r4.ebuild
author: Steven J Newbury <steve@snewbury.org.uk> 2009-05-17 11:30:34 +0100
committer: Steven J Newbury <steve@snewbury.org.uk> 2009-05-17 11:30:34 +0100
commit: 757438af5d8cd945d764306f2dfcd5e50f401acb (patch)
tree: aed803c9d10ea096a4bce1f7ecc6576f64d03637
parent: Update manifest (diff)
parent: x11-libs/libdrm and media-libs/mesa version bump (diff)
download: multilib-portage-757438af5d8cd945d764306f2dfcd5e50f401acb.tar.gz
multilib-portage-757438af5d8cd945d764306f2dfcd5e50f401acb.tar.bz2
multilib-portage-757438af5d8cd945d764306f2dfcd5e50f401acb.zip
95 files changed, 1406 insertions, 796 deletions
diff --git a/dev-cpp/glibmm/ChangeLog b/dev-cpp/glibmm/ChangeLog
index b6feea9e1..9b8fbd906 100644
--- a/dev-cpp/glibmm/ChangeLog
+++ b/dev-cpp/glibmm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-cpp/glibmm
-# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/glibmm/ChangeLog,v 1.125 2009/01/07 17:56:58 armin76 Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/glibmm/ChangeLog,v 1.126 2009/05/10 22:15:53 eva Exp $
+
+*glibmm-2.20.0 (10 May 2009)
+
+  10 May 2009; Gilles Dartiguelongue <eva@gentoo.org> glibmm-2.8.4.ebuild,
+  -glibmm-2.14.2.ebuild, glibmm-2.16.1.ebuild, +glibmm-2.20.0.ebuild:
+  New version for GNOME 2.26. Clean up old revisions.
 
   07 Jan 2009; Raúl Porcel <armin76@gentoo.org> glibmm-2.16.4.ebuild:
   arm/sh stable
diff --git a/dev-cpp/glibmm/Manifest b/dev-cpp/glibmm/Manifest
index f9f41ebc7..f13aadd0b 100644
--- a/dev-cpp/glibmm/Manifest
+++ b/dev-cpp/glibmm/Manifest
@@ -1,12 +1,12 @@
-DIST glibmm-2.14.2.tar.bz2 9268918 RMD160 8b3f93be8c6998188efe554bda005303712af867 SHA1 4edeb23a13b068c3ef93c6f0acfd5decbdd7a91d SHA256 7602068e8ea8e705c3970b5f2f524c7335db4ee0ca630a424690bc4951544851
 DIST glibmm-2.16.1.tar.bz2 12151123 RMD160 e33527f76fdf9b04bb58f1f812fb1ceb00e6170b SHA1 45edd554ccfd9796a94571e3188ceeb0209d7eaf SHA256 71582fa82f4e191be8a0ade34f55c93889b9409a0eb792287496d8799307e174
 DIST glibmm-2.16.4.tar.bz2 6375753 RMD160 48e5b4812d2dcd9af8419aa0a7b72c60065a5ab4 SHA1 5f6790bdafd4963219d5a60a8617c9ca89c98ef5 SHA256 a6d165e61d03e52956a040de4ccd8d35364be22124c6be6d048214aa6d7eae83
 DIST glibmm-2.18.1.tar.bz2 6714825 RMD160 61a832cd7fde601a20d3217d3050427b7b0580f6 SHA1 10171be1f1ec574f74cc3e38775219c1b342baae SHA256 79641fe9ca2ad2ad4c49f2ebe15f360b16cbbff852eaa51c99b8f36b362ce649
+DIST glibmm-2.20.0.tar.bz2 4345802 RMD160 2ab83f832f3c40196b33f799833106568f374ba7 SHA1 a3988446c4443cc944855abbc7f0851d46adc154 SHA256 573ee090bc1eb0ddb8a014021ca284f127d609f8bd1abdbc24cbb5b8287380b0
 DIST glibmm-2.8.4.tar.bz2 2024815 RMD160 2e774d07533943e80074b52c3ae81a2cb6784e04 SHA1 efc829c97e67230028e9876777fe0f959ad787a8 SHA256 7ff592b6687caefa367b33d8cb8f66f3c0273fa86d4b688c0758d0d9fee7a2cb
-EBUILD glibmm-2.14.2.ebuild 1137 RMD160 bcf98c39a1f7ccaf7c6eb124ba91c06e2ec0eb5a SHA1 e2ed1c94773b0ae7669cffd53cd28603bbade5c8 SHA256 6414784f2dbb64ffbd300c09a8b811274eab645daecd02bc167a79bd96f7316c
-EBUILD glibmm-2.16.1.ebuild 1086 RMD160 45d21bf64f0a42d07ec29bf6ce7ead00a73f805a SHA1 9a438d2626a30ef32e6adb9f26fc82fcd0b482d2 SHA256 9849465b7e1641233e305720850d85262099126869e1cbc2bb3c552601f1770b
+EBUILD glibmm-2.16.1.ebuild 1031 RMD160 d6c333d33648dec2b2455457575eefdc0bf16ad3 SHA1 64b0b6815a39849005e81863e93184693b9ec0c8 SHA256 16fb84d38a1516f90da994d5cbbd9052bacc792ddb3fbc755ed1a7d30e92a2de
 EBUILD glibmm-2.16.4.ebuild 1249 RMD160 a53498a2721a3003b3a4a0745881b3679b42511d SHA1 242f67f850296a6020350ef2fee6d65df18224a0 SHA256 336ec29680409c726fe2aabe2627ff38e46bc7fdad9ef6cde56d1df32a9baabd
 EBUILD glibmm-2.18.1.ebuild 1269 RMD160 1520f568a4f96bcdd9d82928f9b7f05a05dcf189 SHA1 d1379b556729d6d45b25190abed8ea602a6836ec SHA256 c8640c5227dfeb5f907deb488dfe986f29770a8c2dda07baa9c6ddecf2fb3b4a
-EBUILD glibmm-2.8.4.ebuild 1264 RMD160 8386dfbca21c1a0256947f1d356263c78c6873d4 SHA1 db5fa8e4818d9720d43f703cc8798784a94c9757 SHA256 183f7f85cb9a1f3ac95fee8d6cbff3d1ac26c3bccf89510e00858411eb85a4e3
-MISC ChangeLog 15102 RMD160 d9dfad51679517cd1bda78afcbab8c5542696db8 SHA1 ecae9905846b22a9b7d08b379820c9a65008f078 SHA256 e0601331d799404a154f900b54c191eca772133bbaafac6df669c4f229501a00
+EBUILD glibmm-2.20.0.ebuild 1431 RMD160 0639c047384b4678afd8670dda6f0b9136532eb1 SHA1 e0ea3a959ec316cae95e913290fc56d3904df164 SHA256 268925144eac3fdcc58d21c228367d1b07b1b33b663f43f157f9abd37df9c0ec
+EBUILD glibmm-2.8.4.ebuild 1204 RMD160 07cfe8795c236564216d1cc9dcd877abb84bf8e9 SHA1 42ea7549064790b3fc5baa8e9ea9b2575e12f1d0 SHA256 24742b3c8b571ace4fd840719c86494f755e56da52ca6dacba14590b2852e38d
+MISC ChangeLog 15328 RMD160 edb383cb11f25b3410861b62d0c34d305b275924 SHA1 38b8cc1c7b943ec5230e40689ff3d5f118de08f9 SHA256 68255e0b0442d5d399c384a617349c9a56ed4e46c033140a53e19c53e7573c29
 MISC metadata.xml 162 RMD160 e3b9e3d8ece920d890bf37c43a6bcd9757539556 SHA1 6ee3bb3e0cce43428124dfa192af30ddb055d95f SHA256 7d0ce82d5ca3b20cb1c4641c7b7aae7082fd6be059b85fab9699095fd965f2e9
diff --git a/dev-cpp/glibmm/glibmm-2.14.2.ebuild b/dev-cpp/glibmm/glibmm-2.14.2.ebuild
deleted file mode 100644
index e760011f0..000000000
--- a/dev-cpp/glibmm/glibmm-2.14.2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/glibmm/glibmm-2.14.2.ebuild,v 1.12 2008/07/18 09:14:12 aballier Exp $
-
-EAPI="2"
-
-inherit gnome2 eutils multilib-native
-
-DESCRIPTION="C++ interface for glib2"
-HOMEPAGE="http://www.gtkmm.org"
-
-LICENSE="LGPL-2.1"
-SLOT="2"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86"
-IUSE="doc examples"
-
-RDEPEND=">=dev-libs/libsigc++-2.0.11[lib32?]
-	>=dev-libs/glib-2.14[lib32?]"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	doc? ( app-doc/doxygen )"
-
-DOCS="AUTHORS CHANGES ChangeLog NEWS README"
-
-src_unpack() {
-	gnome2_src_unpack
-
-	if ! use examples; then
-		# don't waste time building the examples
-		sed -i 's/^\(SUBDIRS =.*\)examples\(.*\)$/\1\2/' Makefile.in || \
-			die "sed Makefile.in failed"
-	fi
-}
-
-multilib-native_src_install_internal() {
-	gnome2_src_install
-
-	if ! use doc && ! use examples; then
-		rm -fr "${D}"/usr/share/doc/glibmm-2.4
-	fi
-
-	if use examples; then
-		find examples -type d -name '.deps' -exec rm -fr {} \; 2>/dev/null
-		cp -R examples "${D}"/usr/share/doc/${PF}
-	fi
-}
diff --git a/dev-cpp/glibmm/glibmm-2.16.1.ebuild b/dev-cpp/glibmm/glibmm-2.16.1.ebuild
index ca07fa1f1..60f7aaf35 100644
--- a/dev-cpp/glibmm/glibmm-2.16.1.ebuild
+++ b/dev-cpp/glibmm/glibmm-2.16.1.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/dev-cpp/glibmm/glibmm-2.16.1.ebuild,v 1.9 2008/07/10 15:10:50 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/glibmm/glibmm-2.16.1.ebuild,v 1.10 2009/05/10 22:15:53 eva Exp $
 
 EAPI="2"
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.gtkmm.org"
 
 LICENSE="LGPL-2.1"
 SLOT="2"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd"
+KEYWORDS="ppc64"
 IUSE="doc examples"
 
 RDEPEND=">=dev-libs/libsigc++-2.2[lib32?]
diff --git a/dev-cpp/glibmm/glibmm-2.20.0.ebuild b/dev-cpp/glibmm/glibmm-2.20.0.ebuild
new file mode 100644
index 000000000..f5de97bbf
--- /dev/null
+++ b/dev-cpp/glibmm/glibmm-2.20.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/glibmm/glibmm-2.20.0.ebuild,v 1.1 2009/05/10 22:15:53 eva Exp $
+
+EAPI="2"
+
+inherit gnome2 multilib-native
+
+DESCRIPTION="C++ interface for glib2"
+HOMEPAGE="http://www.gtkmm.org"
+
+LICENSE="|| ( LGPL-2.1 GPL-2 )"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="doc examples test"
+
+RDEPEND=">=dev-libs/libsigc++-2.2[lib32?]
+	>=dev-libs/glib-2.19.8[lib32?]"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	doc? ( app-doc/doxygen )"
+
+DOCS="AUTHORS ChangeLog NEWS README"
+
+src_unpack() {
+	gnome2_src_unpack
+
+	if ! use test; then
+		# don't waste time building tests
+		sed 's/^\(SUBDIRS =.*\)tests\(.*\)$/\1\2/' \
+			-i Makefile.am Makefile.in || die "sed 1 failed"
+	fi
+
+	if ! use examples; then
+		# don't waste time building examples
+		sed 's/^\(SUBDIRS =.*\)examples\(.*\)$/\1\2/' \
+			-i Makefile.am Makefile.in || die "sed 2 failed"
+	fi
+}
+
+src_test() {
+	cd "${S}/tests/"
+	emake check || die "emake check failed"
+
+	for i in */test; do
+		${i} || die "Running tests failed at ${i}"
+	done
+}
+
+
+multilib-native_src_install_internal() {
+	gnome2_src_install
+
+	if ! use doc && ! use examples; then
+		rm -fr "${D}/usr/share/doc/glibmm*"
+	fi
+
+	if use examples; then
+		find examples -type d -name '.deps' -exec rm -rf {} \; 2>/dev/null
+		dodoc examples
+	fi
+}
diff --git a/dev-cpp/glibmm/glibmm-2.8.4.ebuild b/dev-cpp/glibmm/glibmm-2.8.4.ebuild
index ccf250480..b862b8727 100644
--- a/dev-cpp/glibmm/glibmm-2.8.4.ebuild
+++ b/dev-cpp/glibmm/glibmm-2.8.4.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/dev-cpp/glibmm/glibmm-2.8.4.ebuild,v 1.13 2008/07/10 15:12:31 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/glibmm/glibmm-2.8.4.ebuild,v 1.14 2009/05/10 22:15:53 eva Exp $
 
 EAPI="2"
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.gtkmm.org"
 
 LICENSE="LGPL-2.1"
 SLOT="2"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
+KEYWORDS="~mips"
 IUSE="doc"
 
 RDEPEND=">=dev-libs/libsigc++-2.0.11[lib32?]
diff --git a/dev-cpp/gtkmm/Manifest b/dev-cpp/gtkmm/Manifest
index 91c9eb9fb..c0dcad463 100644
--- a/dev-cpp/gtkmm/Manifest
+++ b/dev-cpp/gtkmm/Manifest
@@ -1,5 +1,7 @@
 AUX gtkmm-2.12.7-gtk2_14-compatibility.patch 2205 RMD160 3d65c0edd8a697648bf941da7ad48879008d1665 SHA1 150a24d053a7f8dbc7900e3de455bc630facd376 SHA256 093b450d90c7c672f0235fa005a0a6197b7b3a45b9a45410c6e906b580df9088
 DIST gtkmm-2.12.7.tar.bz2 15198578 RMD160 0363b0c03e56e965d1d25f1bbed80476af809f3c SHA1 ee7211c99e860c4b22091e81e6d1676d12fbb23c SHA256 4e58c9ad827759a2375b3c0d39952b5b2983111ab16ee329b10a34792fb1d9eb
 DIST gtkmm-2.14.3.tar.bz2 8667875 RMD160 014abe318544e9cfd95b62a2ac6d05fe14b3f84b SHA1 7cbccba6956a46f0613eb210aaf18b5bb549f179 SHA256 24b18105636cea1033658a0a5f7e86783d0e620590aa359a005ba64d055559a2
+DIST gtkmm-2.16.0.tar.bz2 9313258 RMD160 db9ce4005b7f6aecd88715c02f0ab9c43932e063 SHA1 e8cde1ebf651458c815d5e896bbae2ae4bf33d67 SHA256 9994e6a92f7086adb58aba0431f29a766218f806b9db95359dad59a0615f95bf
 EBUILD gtkmm-2.12.7.ebuild 1133 RMD160 8c72c2ca8ba01bfff16e83535ce880a8b3069bf0 SHA1 7fdb9559841b1358ba15afe8a4ee869f339fba0d SHA256 db310e2f4aae8ef312e870fc3be4b8d3ffd74cad1fb618e95402d338d4a505c2
 EBUILD gtkmm-2.14.3.ebuild 1020 RMD160 83d80beb0545a1a239c5b754de7b10fb13ae9e61 SHA1 c94e75f37a4be53fb715b638248561d416f97a35 SHA256 02f04b1081194ff44e1c6fc9519684200a173f5aac0e2aa92e708e049498c596
+EBUILD gtkmm-2.16.0.ebuild 1020 RMD160 d470e3772da711df96a60f19d6aea1ead0a12e38 SHA1 0c9fd3cd01542bf533998e7b1807f3488db7b3de SHA256 10804f1adcc9ad301cd4bc42d9bcb71289a3c6511eb75df62aa4bdcf4820b06f
diff --git a/dev-cpp/gtkmm/gtkmm-2.16.0.ebuild b/dev-cpp/gtkmm/gtkmm-2.16.0.ebuild
new file mode 100644
index 000000000..87c919cfa
--- /dev/null
+++ b/dev-cpp/gtkmm/gtkmm-2.16.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtkmm/gtkmm-2.14.3.ebuild,v 1.3 2009/03/24 10:11:09 remi Exp $
+
+EAPI="2"
+
+inherit gnome2 multilib-native
+
+DESCRIPTION="C++ interface for GTK+2"
+HOMEPAGE="http://www.gtkmm.org"
+
+LICENSE="LGPL-2.1"
+SLOT="2.4"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="doc examples test"
+
+RDEPEND=">=dev-cpp/glibmm-2.19[lib32?]
+	>=x11-libs/gtk+-2.15.5[lib32?]
+	>=dev-cpp/cairomm-1.2.2[lib32?]
+	>=dev-cpp/pangomm-2.14.0[lib32?]
+	>=dev-libs/atk-1.9.1[lib32?]"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+DOCS="AUTHORS CHANGES ChangeLog PORTING NEWS README"
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		--enable-api-atkmm
+		$(use_enable doc docs)
+		$(use_enable examples demos)"
+}
+
+src_unpack() {
+	gnome2_src_unpack
+
+	if ! use test; then
+		# don't waste time building tests
+		sed -i 's/^\(SUBDIRS =.*\)tests\(.*\)$/\1\2/' Makefile.in || die "sed failed"
+	fi
+}
diff --git a/dev-cpp/pangomm/ChangeLog b/dev-cpp/pangomm/ChangeLog
new file mode 100644
index 000000000..ff0b0b0f8
--- /dev/null
+++ b/dev-cpp/pangomm/ChangeLog
@@ -0,0 +1,24 @@
+# ChangeLog for dev-cpp/pangomm
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/pangomm/ChangeLog,v 1.4 2009/05/10 22:18:50 eva Exp $
+
+*pangomm-2.24.0 (10 May 2009)
+
+  10 May 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  -pangomm-2.14.0.ebuild, +pangomm-2.24.0.ebuild:
+  New version for GNOME 2.26. Clean up old revisions.
+
+*pangomm-2.14.1 (14 Nov 2008)
+
+  14 Nov 2008; Rémi Cardona <remi@gentoo.org> +pangomm-2.14.1.ebuild:
+  bump to 2.14.1
+
+  12 Nov 2008; Rémi Cardona <remi@gentoo.org> pangomm-2.14.0.ebuild:
+  use eapi=1 slotted deps for the gtkmm blocker (fixes bug #246212)
+
+*pangomm-2.14.0 (08 Nov 2008)
+
+  08 Nov 2008; Gilles Dartiguelongue <eva@gentoo.org>
+  +pangomm-2.14.0.ebuild:
+  New package for GNOME 2.24, pango bindings splitted off gtkmm sources.
+
diff --git a/dev-cpp/pangomm/Manifest b/dev-cpp/pangomm/Manifest
new file mode 100644
index 000000000..a2ff9602a
--- /dev/null
+++ b/dev-cpp/pangomm/Manifest
@@ -0,0 +1,6 @@
+DIST pangomm-2.14.1.tar.bz2 984848 RMD160 61e9c8688af762d9b859fc37d5390f7e02f70e5c SHA1 f439962a9e1d10ee3327cc1f393a43818f765fe3 SHA256 d7724d878242f7313086e23f774f5ae021f6ff8d0bd393d6c704ad89362c3557
+DIST pangomm-2.24.0.tar.bz2 996057 RMD160 f9f5c8d22c098ab95ca0ca61a6d25e0609bb0356 SHA1 bd14185ead820f4865608c6b0a641a9b6fd2a8b1 SHA256 0f0a45644bd11a3e354b52c3823a635cf0ebf2123fe7fa48e728e6aa5699039e
+EBUILD pangomm-2.14.1.ebuild 757 RMD160 d03d982c3a86d51f3970fb03d9677555818a0d7d SHA1 35861aa8dcea03577e6611a7aef04f3c7a27b4cf SHA256 9fce1852e69100a3e156c29ec0ffc8aa68f496c77c2ab6dc8f053255c4915582
+EBUILD pangomm-2.24.0.ebuild 751 RMD160 895fd3a85cc0b3b4d72483cd019b82ac21ee679c SHA1 4f7ef959ab5d8136862c88133e1a51715855d2b8 SHA256 88cf72c3b5a023694fe13d171276e05424184fdebf7703b17c95a60e9ad7b3bd
+MISC ChangeLog 834 RMD160 22ce446735b3cf439daf3dd60c40cdac8841d2f2 SHA1 48514421b058ee928ee5b0228d88c4d3975e5058 SHA256 36ac7e1d4d7a457e33edad22a08a1519b4cbc12c4b5acc5ee66dcdf921abf778
+MISC metadata.xml 162 RMD160 2c441279eeaef73d96c5af568de66b76ba671de0 SHA1 aa4164692130521a82d1876340680edfdbe102c0 SHA256 67ddef49cc30a5e3ba508122f16893cbbb91804f971f5a97c7886417ab41e009
diff --git a/dev-cpp/pangomm/metadata.xml b/dev-cpp/pangomm/metadata.xml
new file mode 100644
index 000000000..0c3fdbb65
--- /dev/null
+++ b/dev-cpp/pangomm/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>gnome-mm</herd>
+</pkgmetadata>
+
diff --git a/dev-cpp/pangomm/pangomm-2.14.1.ebuild b/dev-cpp/pangomm/pangomm-2.14.1.ebuild
new file mode 100644
index 000000000..439597fb7
--- /dev/null
+++ b/dev-cpp/pangomm/pangomm-2.14.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/pangomm/pangomm-2.14.1.ebuild,v 1.2 2008/12/31 06:27:06 mr_bones_ Exp $
+
+EAPI="2"
+
+inherit gnome2 multilib-native
+
+DESCRIPTION="C++ interface for pango"
+HOMEPAGE="http://www.gtkmm.org"
+
+LICENSE="LGPL-2.1"
+SLOT="2.4"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="doc"
+
+RDEPEND=">=x11-libs/pango-1.21.4[lib32?]
+	>=dev-cpp/glibmm-2.14.1[lib32?]
+	>=dev-cpp/cairomm-1.2.2[lib32?]
+	!<dev-cpp/gtkmm-2.13:2.4[lib32?]"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+DOCS="AUTHORS CHANGES ChangeLog PORTING NEWS README"
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		$(use_enable doc docs)"
+}
diff --git a/dev-cpp/pangomm/pangomm-2.24.0.ebuild b/dev-cpp/pangomm/pangomm-2.24.0.ebuild
new file mode 100644
index 000000000..1f5b517e5
--- /dev/null
+++ b/dev-cpp/pangomm/pangomm-2.24.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/pangomm/pangomm-2.24.0.ebuild,v 1.1 2009/05/10 22:18:50 eva Exp $
+
+EAPI="2"
+
+inherit gnome2 multilib-native
+
+DESCRIPTION="C++ interface for pango"
+HOMEPAGE="http://www.gtkmm.org"
+
+LICENSE="LGPL-2.1"
+SLOT="2.4"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="doc"
+
+RDEPEND=">=x11-libs/pango-1.23.0[lib32?]
+	>=dev-cpp/glibmm-2.14.1[lib32?]
+	>=dev-cpp/cairomm-1.2.2[lib32?]
+	!<dev-cpp/gtkmm-2.13:2.4[lib32?]"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+DOCS="AUTHORS CHANGES ChangeLog PORTING NEWS README"
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		$(use_enable doc docs)"
+}
diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index 0399f45aa..e33459ae3 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for dev-db/mysql
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.485 2009/03/01 10:50:36 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.487 2009/04/14 03:36:41 darkside Exp $
+
+  14 Apr 2009; Jeremy Olexa <darkside@gentoo.org>
+  -mysql-4.1.23_alpha20070101-r61.ebuild:
+  remove p.masked version after talking to robbat2 in irc
+
+*mysql-5.0.76-r1 (12 Apr 2009)
+
+  12 Apr 2009; Robin H. Johnson <robbat2@gentoo.org>
+  +mysql-5.0.76-r1.ebuild:
+  Bug #238487, lots of patching fun to enable building of a shared embedded
+  libmysqld for Amarok.
 
   01 Mar 2009; Raúl Porcel <armin76@gentoo.org> mysql-5.0.70-r1.ebuild:
   s390/sh stable wrt #246652
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 77f0d1ae4..607e1a192 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -5,7 +5,6 @@ AUX mysql.init 886 RMD160 26b8aa45af3f930db01f0db731865b9293626fb1 SHA1 d7d99a3f
 DIST mysql-3.23.58.tar.gz 12039843 RMD160 b7d436ac7aaa9238e724bf3c62c5f837bef676b6 SHA1 f3383e41e8926c040a295173881414a1e96e0266 SHA256 8dcc6a613820701221b787419c32c1c717562194cfd296187da0e87454252acc
 DIST mysql-4.0.27.tar.gz 11152643 RMD160 00cf895eab192e3e0ab526587ccab3e81c6c9070 SHA1 9cce3b92c47d17bf58ec6cdefebfdf953b5ce2c4 SHA256 c79f83bed7c1ea98e018b8829375b55c1de838d21a526d7f679becc75de00d0f
 DIST mysql-4.1.22.tar.gz 17761101 RMD160 bfcf5058e4247cf4d7d1550ea54c64ebc8bc615e SHA1 857e942cc3207caf56e2aa48961fc1ed66d932e6 SHA256 6bd2436fd0f233bb1518e15975cb4e9fa4434acb53c3c3cd7d4648219abf58e9
-DIST mysql-4.1.23-bk-20070101.tar.bz2 12171000 RMD160 3e7abcb4665b55bfe74305484b963a4d1d239a4f SHA1 3f7b79fbad7bdba2e09b5d5535fec8ef1d8a0d4d SHA256 65cd010a75c6bfc006cc3095623edf2d106f0af03154f24bc4fbf711ad2b98ef
 DIST mysql-5.0.26.tar.gz 25986952 RMD160 98ee85457de4bc8c8f8acddc8b6f0dc7687f32c7 SHA1 7197159f9214722aa41b82ad80f87b4af5d232ce SHA256 4266fe6a3593700d4157b8cc4278fa8ae98837d4757735fc6ed70d9df6bb2680
 DIST mysql-5.0.32.tar.gz 24820282 RMD160 14639884c1bdde356654c4c5fc75d2ff613cd1d1 SHA1 daa13b48b0ddca029bdf97b578481a9cf3e4ac15 SHA256 13891620173721d1b3723c73d2eafd1615566f0df14f21c551d645d5cff547e8
 DIST mysql-5.0.34.tar.gz 23015439 RMD160 5294b76edb004162247e9e032929fe728887202b SHA1 1b1a920aa0720a7d9abec839d31f384e75970934 SHA256 45ccd88a33964c58027cbd3cf5c5223ae04f9cfefd0ad15ca0ee6dbda3eff0b4
@@ -37,7 +36,6 @@ DIST mysql-extras-20090412-0009Z.tar.bz2 256637 RMD160 da0e1bbc6db770171e34c2f58
 EBUILD mysql-3.23.58-r1.ebuild 7463 RMD160 c48cfbebf69ddba93715f8c8eb467db81a35ede3 SHA1 f9ba83cbad91c25610c1916ba114dd7b61149bf8 SHA256 e6de26295104a12e294751c4aec4e8fdf7375530bc39a94a5eb1c5288ff509b5
 EBUILD mysql-4.0.27-r1.ebuild 1121 RMD160 668dd5dc456ff35dd8c65b15e360325081a83408 SHA1 edc4c31c0d7400ac132a71075b47f05bad70cb12 SHA256 55d838248c295a69e4fffe0e658f1cd53d87875249ae63291d550b65acfb3d71
 EBUILD mysql-4.1.22-r1.ebuild 1358 RMD160 713007a110406b6b6c3400f33a13675c2cb5d545 SHA1 3f498f1437fc3e23f59794e93f72f0e53cbc2cf9 SHA256 cfdf6c50a7f36898a4139591c1fd9cae0d818dd14dacea28ee4939a5ce97bbbf
-EBUILD mysql-4.1.23_alpha20070101-r61.ebuild 1337 RMD160 b42955f6effa04df9c9808650e220390fb5eed8a SHA1 63f912cea34866c034adbba72ec3ab85580605a8 SHA256 469ef369ec8177263a63e3107e63cce8ad4d5fd444d50a9ab32b46feab059994
 EBUILD mysql-5.0.26-r2.ebuild 2037 RMD160 57184e2acae551e615dbdb95a4bec6df2b298f13 SHA1 85a5648ab285504fa8e4c2a97d4eab40c7d5267f SHA256 7ba6a1a7986cfd5a252d3faa31c9f01335d19502b5b0d029982a8468856dba88
 EBUILD mysql-5.0.32.ebuild 2112 RMD160 232c42841ffb085aee10bd717bfc2cea7888f909 SHA1 2fbee46624d6d109156da55eecaa7adfd6005558 SHA256 e9a4e3f5381e6b4b9b851aa737da33b4f78411ae066a65f3ecb38a2eda204b7e
 EBUILD mysql-5.0.34.ebuild 2130 RMD160 d9141dc725012154ec4dfd151b347af07bf24944 SHA1 d061b52ebf031dbe7c71c65a044d1526bde5d927 SHA256 c17fc76bdff5938c727e1fe6755bbfd28a45b81ed1e8669940cb2692d8f37e09
@@ -57,5 +55,5 @@ EBUILD mysql-5.0.72-r1.ebuild 4244 RMD160 e0e5b321fd6c280fe65f1e977a5639e6bf8112
 EBUILD mysql-5.0.72.ebuild 4235 RMD160 b8a998d025f76ed31b00efccfb4793c13078ef71 SHA1 5a9331cc8b8fa6d2093e0627fe858aa0e4ebbd46 SHA256 d97f361f8f0561fc70e3239d5b93aa6236dbc47ad5c2bc0fdce4e977b82a8c6b
 EBUILD mysql-5.0.76-r1.ebuild 4783 RMD160 f61800c5fa532d9ddb7ab8400c17710b5a64cdbc SHA1 4cfa8d80bdccfa71f9df2b8b10325904f68a6369 SHA256 77e34a985d062d20edd828fb8cf25b11c3ed323583e220721015695b41ba0f59
 EBUILD mysql-5.0.76.ebuild 4782 RMD160 52befcd42955992d0603da40d39f57eadc1bfa3d SHA1 faecccc675697670bdda3eba877d8ed8b146d673 SHA256 15a58c7b230ffc4f765250ece716e62f2207df0e5f75c7dfa9baf4098587e25b
-MISC ChangeLog 92900 RMD160 351db75af5566a90ea2893caf2b4e9146d554fe3 SHA1 08447ad9d7f06501c538ac24ccce68fc89ed0c6d SHA256 b6024ee9fd05ed23e12a41e7ff9c46963777a02c267ca572753a03db4a1c0a49
+MISC ChangeLog 93265 RMD160 e6f8fa63fc0ad07afbaf976ab32317f69daa1294 SHA1 3d2cd5a49e852add7fd2d501c7c25fa3d8361559 SHA256 4aa9cc8b185861bc037fc40941f3977d6202dc15ca268478b606df6bdf0f3d2d
 MISC metadata.xml 746 RMD160 24dadde02462666d5b05608b73a87094de82af1a SHA1 596f0628975fc92ff1cb4d665f7fa5d7eac04505 SHA256 070b3c63ddedff2023166fd0f82bd9dc6a691079c10a6ee968ca7b28e97af5a6
diff --git a/dev-db/mysql/mysql-4.1.23_alpha20070101-r61.ebuild b/dev-db/mysql/mysql-4.1.23_alpha20070101-r61.ebuild
deleted file mode 100644
index 90078ea54..000000000
--- a/dev-db/mysql/mysql-4.1.23_alpha20070101-r61.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.1.23_alpha20070101-r61.ebuild,v 1.6 2009/02/28 22:42:10 robbat2 Exp $
-
-MY_EXTRAS_VER="20090228-2228Z"
-SERVER_URI="mirror://gentoo/MySQL-${PV%.*}/mysql-${PV//_alpha/-bk-}.tar.bz2"
-
-inherit mysql multilib-native
-# only to make repoman happy. it is really set in the eclass
-IUSE="$IUSE"
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-
-src_test() {
-	einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
-	make check || die "make check failed"
-	if ! use "minimal" ; then
-		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-		local retstatus
-		local testopts="--force"
-
-		# sandbox makes ndbd zombie
-		hasq "sandbox" ${FEATURES} && testopts="${testopts} --skip-ndb"
-
-		addpredict /this-dir-does-not-exist/t9.MYI
-
-		cd mysql-test
-
-		# from Makefile.am:
-		retstatus=1
-		./mysql-test-run.pl ${testopts} \
-		&& ./mysql-test-run.pl ${testopts} --ps-protocol \
-		&& retstatus=0
-
-		# Just to be sure ;)
-		pkill -9 -f "${S}/ndb" 2>/dev/null
-		pkill -9 -f "${S}/sql" 2>/dev/null
-		[[ $retstatus -eq 0 ]] || die "test failed"
-	else
-		einfo "Skipping server tests due to minimal build."
-	fi
-}
diff --git a/dev-db/sqlite/Manifest b/dev-db/sqlite/Manifest
index 7bbe5eec2..05c586d22 100644
--- a/dev-db/sqlite/Manifest
+++ b/dev-db/sqlite/Manifest
@@ -7,14 +7,11 @@ DIST sqlite-3.6.11.tar.gz 2804714 RMD160 c38d82c83f5d64cfb302e3232c507bafb0b64e7
 DIST sqlite-3.6.12.tar.gz 2769510 RMD160 c455dd7f5dac3ab75b1c0e58ca9a766e7fb19378 SHA1 05ffb484d264030de41ee4bde0915bf1900d5f32 SHA256 96c23c1e90808f06e4000e1e325f3547da1c38b164a237aab1184fa0da329201
 DIST sqlite-3.6.13.tar.gz 2780546 RMD160 9dd5d8b2ca5a63c194c8320ccfda77ac421eda3d SHA1 91dd2bb389fe559ae797440a1a787c8f886065a3 SHA256 6cce00b0ba6c74773e5a240f7adbacf53a763bd8e65713ae8e9d4fb24df7677c
 DIST sqlite-3.6.14.tar.gz 2894263 RMD160 a77bcc1daf35ef45d497d076d4a8d6945a2e5f39 SHA1 0e22b901fe905826c192f305b7934eb4fefcb15b SHA256 3d0429c50ff188fd7f30e54ae389eb87f77e74b2da4fdf68f3e8283d0937b19d
-DIST sqlite-3.6.6.2.tar.gz 2303256 RMD160 5ac51f8f8e473dc964232ccd450626a6d28be630 SHA1 4cd87fa954da5b11d7ee230e1003a23a68f68397 SHA256 09d261aa15f16ff97b2fdbc9883d85fa5f0a09d5509f8904fc1d1574dc0edda8
 DIST sqlite_docs_3_6_11.zip 2199886 RMD160 fb03c7299a77d6ee1c8af0db51c88c3948561d9b SHA1 cc8764b22a53b026ee95e554078bd536b426e339 SHA256 4acc5b4aae8fd63013bb3e13b7c006780681a53002e9ff0818f276a5345729be
 DIST sqlite_docs_3_6_12.zip 2230626 RMD160 c92c896a973cafe6dbfbd73824c84b3efc90a00b SHA1 7ecef637b64160681774e000399aec7e7fd13dff SHA256 b8cd8f82ba53d23863b96f51a5d7a58cc9fc1d2c928eae7009f8c5e9ed0e359d
 DIST sqlite_docs_3_6_13.zip 2234760 RMD160 d9246269030b3f8a9c00700f1d23140d499eb221 SHA1 92238762805019582d94398a19e7cd582932449f SHA256 9a9a76a0722f130d5c0a1b42d5f9cff4f8635e9ddbffa0c31960a31bf9ac5313
 DIST sqlite_docs_3_6_14.zip 2301548 RMD160 4b82f1ced5177b948824f2e0a99778ee80f62785 SHA1 21e504057bb051314e1bd7af1ab29e71ed9ecd73 SHA256 2106a41ec15d8acb759ab06dcefc729a53ab7e8ab8e7e6891621863f46d51bad
-DIST sqlite_docs_3_6_6.zip 2213432 RMD160 d23672a3074d38ae1501dce57cc0558abc6d57fa SHA1 fc3418a48d46dfc9e271c3819714ae7d5b984107 SHA256 792cc2ec5e207b92101d0adb37c2f8a453f7054c91282852eebed325a33ec815
-EBUILD sqlite-3.6.11.ebuild 2604 RMD160 54455a8cd9520af7e68ad3328f662323ce92b954 SHA1 9c2b34007d6335b38281f87ed24b8092ba310deb SHA256 0982b4c33891d955b833280130108f5ff7e1a5fc6bb17009c7242b5fc2742567
-EBUILD sqlite-3.6.12.ebuild 2506 RMD160 f73711461e24dda4a9b5767227efc1306765372c SHA1 88037ca1c0373ce40a2dbd6113fb20c842cc0d2b SHA256 3c05b22402e11e93a68259efe6f427f1a850b86c2b2edc7f6d52d5dbcc0d6b73
-EBUILD sqlite-3.6.13.ebuild 2554 RMD160 ad30e34810030ca709cf8ee0519c701eb96f6048 SHA1 45a3c7fe5e89339fa39930287e93678b032daf72 SHA256 f7f6f7b35ce98cb419b86588b9548f5c2289628cb4501a9aba1e1f545f441912
-EBUILD sqlite-3.6.14.ebuild 2399 RMD160 70fc07a9d696ce0f8132c797a844948e5a5008ab SHA1 f4ea8b4859ba1883c9e57ad39a3270ed57dc85d8 SHA256 043a5e7c41d81536e2632fb9521e88d23ed820fe84e5f2ee9c6efd0e0eb4b7e5
-EBUILD sqlite-3.6.6.2.ebuild 2390 RMD160 73b2054b9a509739c03132914c8b3763c8d23ae5 SHA1 1659987b46a6e918b68ebaeb55172e8d0c90d988 SHA256 5df05f7378b800cb4d9c3f6b2afd018ac9467372d4698ffe6909a0127c99ef03
+EBUILD sqlite-3.6.11.ebuild 2598 RMD160 f888cb316d991b639cd7212645b401fc574b16c2 SHA1 6f97e8138e45569dc375c3d52ae4a1137dcdb9db SHA256 52e0a1a6bf838c3dc65cb9ff6e529334ad41598696c45be9a55303693cc43f00
+EBUILD sqlite-3.6.12.ebuild 2500 RMD160 dbc98ae799943c9de1d7eb292aa20867b0d0cc84 SHA1 60a04dd4249dbca380c06f50752905ae6d32034c SHA256 870529e29a173afa436a15f74160972a2b33e009ded0e2c61394ada0c1557917
+EBUILD sqlite-3.6.13.ebuild 2547 RMD160 4c05af713a2569f26aba5cfd535b3ae7fd8f1bf4 SHA1 dae93a442483a08d21709e9cd072c89b1197b01a SHA256 54ccea00796824aebf0e1e81308e17af51ebd761473844159980e280dacc4940
+EBUILD sqlite-3.6.14.ebuild 2399 RMD160 a2daa56e3fce9bb767cb13efd308667a22f4e988 SHA1 9951cdef89a7ada81d8f53ba9bf67c5cf9c0955b SHA256 87116f3d23da3b9055b7533f45655ffe53ad9bf1f7789d4964f09582a9d4f103
diff --git a/dev-db/sqlite/sqlite-3.6.11.ebuild b/dev-db/sqlite/sqlite-3.6.11.ebuild
index d4d90c4c5..4c5212671 100644
--- a/dev-db/sqlite/sqlite-3.6.11.ebuild
+++ b/dev-db/sqlite/sqlite-3.6.11.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/dev-db/sqlite/sqlite-3.6.11.ebuild,v 1.7 2009/04/07 18:46:54 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-3.6.11.ebuild,v 1.8 2009/04/27 15:53:03 jer Exp $
 
 EAPI="2"
 
@@ -15,7 +15,7 @@ SRC_URI="http://www.sqlite.org/${P}.tar.gz
 
 LICENSE="as-is"
 SLOT="3"
-KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~sparc-fbsd x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~sparc-fbsd x86 ~x86-fbsd"
 IUSE="debug doc soundex tcl +threadsafe"
 RESTRICT="!tcl? ( test )"
 
diff --git a/dev-db/sqlite/sqlite-3.6.12.ebuild b/dev-db/sqlite/sqlite-3.6.12.ebuild
index 4f4d983d0..0f64456ad 100644
--- a/dev-db/sqlite/sqlite-3.6.12.ebuild
+++ b/dev-db/sqlite/sqlite-3.6.12.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/dev-db/sqlite/sqlite-3.6.12.ebuild,v 1.3 2009/04/04 18:24:40 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-3.6.12.ebuild,v 1.6 2009/05/04 15:45:54 ranger Exp $
 
 EAPI="2"
 
@@ -15,7 +15,7 @@ SRC_URI="http://www.sqlite.org/${P}.tar.gz
 
 LICENSE="as-is"
 SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~sparc-fbsd x86 ~x86-fbsd"
 IUSE="debug doc soundex tcl +threadsafe"
 RESTRICT="!tcl? ( test )"
 
diff --git a/dev-db/sqlite/sqlite-3.6.13.ebuild b/dev-db/sqlite/sqlite-3.6.13.ebuild
index c55ff7b84..314173339 100644
--- a/dev-db/sqlite/sqlite-3.6.13.ebuild
+++ b/dev-db/sqlite/sqlite-3.6.13.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/dev-db/sqlite/sqlite-3.6.13.ebuild,v 1.2 2009/04/19 00:10:20 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-3.6.13.ebuild,v 1.5 2009/05/16 13:06:15 klausman Exp $
 
 EAPI="2"
 
@@ -15,7 +15,7 @@ SRC_URI="http://www.sqlite.org/${P}.tar.gz
 
 LICENSE="as-is"
 SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+KEYWORDS="alpha ~amd64 arm hppa ia64 ~mips ~ppc ~ppc64 s390 sh sparc ~x86 ~sparc-fbsd ~x86-fbsd"
 IUSE="debug doc soundex tcl +threadsafe"
 RESTRICT="!tcl? ( test )"
 
diff --git a/dev-db/sqlite/sqlite-3.6.14.ebuild b/dev-db/sqlite/sqlite-3.6.14.ebuild
index d337f2ba0..aeee926e6 100644
--- a/dev-db/sqlite/sqlite-3.6.14.ebuild
+++ b/dev-db/sqlite/sqlite-3.6.14.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/dev-db/sqlite/sqlite-3.6.13.ebuild,v 1.2 2009/04/19 00:10:20 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-3.6.14.ebuild,v 1.2 2009/05/09 06:17:33 arfrever Exp $
 
 EAPI="2"
 
diff --git a/dev-db/sqlite/sqlite-3.6.6.2.ebuild b/dev-db/sqlite/sqlite-3.6.6.2.ebuild
deleted file mode 100644
index 146f7de86..000000000
--- a/dev-db/sqlite/sqlite-3.6.6.2.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-3.6.6.2.ebuild,v 1.10 2009/01/31 20:11:20 klausman Exp $
-
-EAPI="2"
-
-inherit versionator eutils flag-o-matic libtool multilib-native
-
-DESCRIPTION="an SQL Database Engine in a C Library"
-HOMEPAGE="http://www.sqlite.org/"
-DOC_BASE="$(get_version_component_range 1-3)"
-DOC_PV="$(replace_all_version_separators _ ${DOC_BASE})"
-SRC_URI="http://www.sqlite.org/${P}.tar.gz
-	doc? ( http://www.sqlite.org/${PN}_docs_${DOC_PV}.zip )"
-
-LICENSE="as-is"
-SLOT="3"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
-IUSE="debug doc soundex tcl +threadsafe"
-RESTRICT="!tcl? ( test )"
-
-RDEPEND="tcl? ( dev-lang/tcl )"
-DEPEND="${RDEPEND}
-	doc? ( app-arch/unzip )"
-
-pkg_setup() {
-	# test
-	if has test ${FEATURES}; then
-		if ! has userpriv ${FEATURES}; then
-			ewarn "The userpriv feature must be enabled to run tests."
-			eerror "Testsuite will not be run."
-		fi
-		if ! use tcl; then
-			ewarn "You must enable the tcl use flag if you want to run the testsuite."
-			eerror "Testsuite will not be run."
-		fi
-	fi
-}
-
-src_prepare() {
-	cd "${S}"
-
-	epatch "${FILESDIR}"/sandbox-fix2.patch
-	epatch "${FILESDIR}"/${P}-install-libsqlite3-first.patch
-
-	elibtoolize
-	epunt_cxx
-}
-
-multilib-native_src_configure_internal() {
-	# not available via configure and requested in bug #143794
-	use soundex && append-flags -DSQLITE_SOUNDEX=1
-
-	econf \
-		$(use_enable debug) \
-		$(use_enable threadsafe) \
-		$(use_enable threadsafe cross-thread-connections) \
-		$(use_enable tcl)
-}
-
-multilib-native_src_compile_internal() {
-	emake all || die "emake all failed"
-}
-
-src_test() {
-	if has userpriv ${FEATURES}; then
-		local test=test
-		use debug && tets=fulltest
-		emake ${test} || die "some test(s) failed"
-	fi
-}
-
-multilib-native_src_install_internal() {
-	emake \
-		DESTDIR="${D}" \
-		TCLLIBDIR="/usr/$(get_libdir)" \
-		install \
-		|| die "emake install failed"
-
-	doman sqlite3.1 || die
-
-	if use doc; then
-		# Naming scheme changes randomly between - and _ in releases
-		# http://www.sqlite.org/cvstrac/tktview?tn=3523
-		dohtml -r "${WORKDIR}"/${PN}-${DOC_PV}-docs/* || die
-	fi
-}
-
-pkg_postinst() {
-	elog "sqlite-3.6.X is not totally backwards compatible, see"
-	elog "http://www.sqlite.org/releaselog/3_6_0.html for full details."
-}
diff --git a/dev-lang/tcl/ChangeLog b/dev-lang/tcl/ChangeLog
index 3ae03c936..d74e1551b 100644
--- a/dev-lang/tcl/ChangeLog
+++ b/dev-lang/tcl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lang/tcl
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/ChangeLog,v 1.104 2009/01/21 16:30:07 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/ChangeLog,v 1.105 2009/04/17 18:56:08 mescalinum Exp $
+
+*tcl-8.5.7 (17 Apr 2009)
+
+  17 Apr 2009; Federico Ferri <mescalinum@gentoo.org> -tcl-8.5.1.ebuild,
+  -tcl-8.5.6.ebuild, +tcl-8.5.7.ebuild:
+  bump to version 8.5.7
 
 *tcl-8.5.6 (17 Jan 2009)
 
diff --git a/dev-lang/tcl/Manifest b/dev-lang/tcl/Manifest
index 95928e0da..73a885485 100644
--- a/dev-lang/tcl/Manifest
+++ b/dev-lang/tcl/Manifest
@@ -7,11 +7,9 @@ AUX tcl-8.5_alpha6-tclm4-soname.patch 486 RMD160 1795d442bf8ced0804d6aa364f628c5
 AUX tcl-configure-LANG.patch 1686 RMD160 4ff8355af81705058fd411910dfae94887bcd884 SHA1 67ae0deff73689cb39cd6e7451262bdda9c25a39 SHA256 dc9386b88eac48c282d63d0be7e7be81d4a0a08035a8b97138a61133e057bcea
 DIST tcl8.4.18-src.tar.gz 3653369 RMD160 735a9cc0575585de70cbd3cb2ff5c97d46c1dfbd SHA1 83b04c3ad092c22507869dec3a5c7ba821f109b0 SHA256 dee273cba588ec9190f0ee3dfe917be49c52ae847f20c3aa72461546451df0a4
 DIST tcl8.4.19-src.tar.gz 3658647 RMD160 6e3d2991e8e44a2e32f0da8fdf7ab07aa9b8202f SHA1 ed25c5a206bcd603c2d5e58790354b9be178f331 SHA256 1c244722fb409e8774c5d45d6a0b21edc3e4541fd016a40afdf53c94a69a3db9
-DIST tcl8.5.6-src.tar.gz 4409651 RMD160 1f3c937a5e77ec2fbf79240d385474eed24f8ea5 SHA1 02c57eea35191f027460c6df289179d03f2e9584 SHA256 246d09da115307c60f1c91fcfcef8518952e166de058b6aef7fbcffa76ca150e
 DIST tcl8.5.7-src.tar.gz 4421720 RMD160 1bb843548c05332eb3404b99b4800613f25a9dbf SHA1 a603d27bf0b854739c99f0d658bfc3f1c485f578 SHA256 67d28d51a8d04c37114030276503bc8859a4b291bc33133556ab2d11303e66f2
 EBUILD tcl-8.4.18.ebuild 3717 RMD160 0b5e954e7857a5b5aada07c547eb1ec8c1ad5c4f SHA1 4ec8b14bb788ccbeb0f01141831ca64ae558cb91 SHA256 406b9975e1e56a6adfa56a44d92e4594ec016c8033374e012b2ead0e3743b958
 EBUILD tcl-8.4.19.ebuild 3733 RMD160 84a9858740de01cc4f0269a93527ef252c1a9068 SHA1 6804d82bfe6b18686b853292b93f647dbc5f8d53 SHA256 f2d519a3b2afd40ce32a1b04b6516d837f0ce5fd50f7a357232346ed2fe6f710
-EBUILD tcl-8.5.6.ebuild 3286 RMD160 b1c526b368f14055d615474c57cf56d412822e62 SHA1 cd5018cd67569b9aa8c27d137d147c3132b5454f SHA256 5a13bcbbb2f3e8223dc30a29c8d46643e79259f3874612817db6f6605089187f
 EBUILD tcl-8.5.7.ebuild 3288 RMD160 74d3c38f6f7aba055df6e76237dd9028cc33b23a SHA1 f1964b6142c479605c28e7ac52f25a64bab98497 SHA256 22b3f906d30214245783edfe83e1e1b581454e6d7f40ac474a0a8cd9b8efc731
-MISC ChangeLog 13507 RMD160 f72b3eadbc756055815d2a75ecd536edab8867f9 SHA1 fc495dc2fd8f3162f838543075b7340d9873ad23 SHA256 b7490f7e53f1cecf0aaa850199ae0dd144b96708ca0cc2a5c40d25e782f1635e
+MISC ChangeLog 13677 RMD160 366ff816ecf784b42acf19271f3e4addd0212be3 SHA1 7578004c4284f9b22d76e222650ccad821415489 SHA256 b557a364cb9c7eb9e2b7be6486a6944850f212093849e38e8d9f1c0497b01127
 MISC metadata.xml 264 RMD160 6318855997b3e957f4ad5c59677534993e352c34 SHA1 19fe5fc86133d09d7fcb0b2ce44054eff4fff028 SHA256 01ce19dabf2e53a73d86e4b16f653c6cd2b6c9aca1b79ec095f353315c8b84ee
diff --git a/dev-lang/tcl/tcl-8.5.6.ebuild b/dev-lang/tcl/tcl-8.5.6.ebuild
deleted file mode 100644
index bb20e56a0..000000000
--- a/dev-lang/tcl/tcl-8.5.6.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/tcl-8.5.6.ebuild,v 1.1 2009/01/17 13:34:46 mescalinum Exp $
-
-EAPI=2
-
-WANT_AUTOCONF=latest
-WANT_AUTOMAKE=latest
-
-inherit autotools eutils multilib toolchain-funcs multilib-native
-
-MY_P="${PN}${PV/_beta/b}"
-DESCRIPTION="Tool Command Language"
-HOMEPAGE="http://www.tcl.tk/"
-SRC_URI="mirror://sourceforge/tcl/${MY_P}-src.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-IUSE="debug threads"
-
-DEPEND=""
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	if use threads ; then
-		ewarn ""
-		ewarn "PLEASE NOTE: You are compiling ${P} with"
-		ewarn "threading enabled."
-		ewarn "Threading is not supported by all applications"
-		ewarn "that compile against tcl. You use threading at"
-		ewarn "your own discretion."
-		ewarn ""
-		epause 5
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-8.5_alpha6-multilib.patch
-
-	# Bug 125971
-	epatch "${FILESDIR}"/${PN}-8.5_alpha6-tclm4-soname.patch
-
-	cd "${S}"/unix
-	eautoreconf
-}
-
-multilib-native_src_configure_internal() {
-	tc-export CC
-
-	cd "${S}"/unix
-	econf \
-		$(use_enable threads) \
-		$(use_enable debug symbols) || die
-}
-
-multilib-native_src_install_internal() {
-	#short version number
-	local v1
-	v1=${PV%.*}
-
-	cd "${S}"/unix
-	S= emake DESTDIR="${D}" install || die
-
-	# fix the tclConfig.sh to eliminate refs to the build directory
-	local mylibdir=$(get_libdir) ; mylibdir=${mylibdir//\/}
-	sed -i \
-		-e "s,^TCL_BUILD_LIB_SPEC='-L.*/unix,TCL_BUILD_LIB_SPEC='-L$/usr/${mylibdir}," \
-		-e "s,^TCL_SRC_DIR='.*',TCL_SRC_DIR='/usr/${mylibdir}/tcl${v1}/include'," \
-		-e "s,^TCL_BUILD_STUB_LIB_SPEC='-L.*/unix,TCL_BUILD_STUB_LIB_SPEC='-L/usr/${mylibdir}," \
-		-e "s,^TCL_BUILD_STUB_LIB_PATH='.*/unix,TCL_BUILD_STUB_LIB_PATH='/usr/${mylibdir}," \
-		-e "s,^TCL_LIB_FILE='libtcl${v1}..TCL_DBGX..so',TCL_LIB_FILE=\"libtcl${v1}\$\{TCL_DBGX\}.so\"," \
-		-e "s,^TCL_CC_SEARCH_FLAGS='\(.*\)',TCL_CC_SEARCH_FLAGS='\1:/usr/${mylibdir}'," \
-		-e "s,^TCL_LD_SEARCH_FLAGS='\(.*\)',TCL_LD_SEARCH_FLAGS='\1:/usr/${mylibdir}'," \
-		"${D}"/usr/${mylibdir}/tclConfig.sh || die
-
-	# install private headers
-	insinto /usr/${mylibdir}/tcl${v1}/include/unix
-	doins "${S}"/unix/*.h || die
-	insinto /usr/${mylibdir}/tcl${v1}/include/generic
-	doins "${S}"/generic/*.h || die
-	rm -f "${D}"/usr/${mylibdir}/tcl${v1}/include/generic/tcl.h
-	rm -f "${D}"/usr/${mylibdir}/tcl${v1}/include/generic/tclDecls.h
-	rm -f "${D}"/usr/${mylibdir}/tcl${v1}/include/generic/tclPlatDecls.h
-
-	# install symlink for libraries
-	dosym libtcl${v1}.so /usr/${mylibdir}/libtcl.so
-	dosym libtclstub${v1}.a /usr/${mylibdir}/libtclstub.a
-
-	dosym tclsh${v1} /usr/bin/tclsh
-
-	cd "${S}"
-	dodoc ChangeLog* README changes
-}
-
-pkg_postinst() {
-	ewarn
-	ewarn "If you're upgrading from <dev-lang/tcl-8.5, you must recompile the other"
-	ewarn "packages on your system that link with tcl after the upgrade"
-	ewarn "completes.  To perform this action, please run revdep-rebuild"
-	ewarn "in package app-portage/gentoolkit."
-	ewarn "If you have dev-lang/tk and dev-tcltk/tclx installed you should"
-	ewarn "upgrade them before this recompilation, too,"
-	ewarn
-}
diff --git a/dev-lang/tk/ChangeLog b/dev-lang/tk/ChangeLog
index 77b2bd6c5..7eeadba5e 100644
--- a/dev-lang/tk/ChangeLog
+++ b/dev-lang/tk/ChangeLog
@@ -1,6 +1,30 @@
 # ChangeLog for dev-lang/tk
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/ChangeLog,v 1.115 2009/02/25 15:17:11 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/ChangeLog,v 1.122 2009/05/07 19:08:18 klausman Exp $
+
+  07 May 2009; Tobias Klausmann <klausman@gentoo.org> tk-8.4.18-r1.ebuild:
+  Stable on alpha, bug #268174
+
+  06 May 2009; Kenneth Prugh <ken69267@gentoo.org> tk-8.4.18-r1.ebuild:
+  amd64 stable, bug #268174
+
+  06 May 2009; Jeroen Roovers <jer@gentoo.org> tk-8.4.18-r1.ebuild:
+  Stable for HPPA (bug #268174).
+
+  06 May 2009; Ferris McCormick <fmccor@gentoo.org> tk-8.4.18-r1.ebuild:
+  Sparc stable, bug #268174.
+
+  06 May 2009; Christian Faulhammer <fauli@gentoo.org> tk-8.4.18-r1.ebuild:
+  stable x86, bug 268174
+
+  06 May 2009; Brent Baude <ranger@gentoo.org> tk-8.4.18-r1.ebuild:
+  Marking tk-8.4.18-r1 ppc64 and ppc for bug 268174
+
+*tk-8.5.7 (17 Apr 2009)
+
+  17 Apr 2009; Federico Ferri <mescalinum@gentoo.org> -tk-8.5.1.ebuild,
+  -tk-8.5.6.ebuild, +tk-8.5.7.ebuild:
+  bump to version 8.5.7
 
   25 Feb 2009; Raúl Porcel <armin76@gentoo.org> tk-8.4.19-r1.ebuild,
   tk-8.5.6.ebuild:
diff --git a/dev-lang/tk/Manifest b/dev-lang/tk/Manifest
index 52a0fdb9a..afb3e3736 100644
--- a/dev-lang/tk/Manifest
+++ b/dev-lang/tk/Manifest
@@ -8,14 +8,10 @@ AUX tk-CVE-2007-4851.patch 405 RMD160 bfc884fbe1f0f2facb892ff0100f59dae0fe5256 S
 AUX tk-configure-LANG.patch 1686 RMD160 4ff8355af81705058fd411910dfae94887bcd884 SHA1 67ae0deff73689cb39cd6e7451262bdda9c25a39 SHA256 dc9386b88eac48c282d63d0be7e7be81d4a0a08035a8b97138a61133e057bcea
 DIST tk8.4.18-src.tar.gz 3363853 RMD160 9c01ba85575a230231793a9885457c98046e41bb SHA1 c1032f3cacd40406065fc1f46ecd217f50329273 SHA256 1757b0daff8a8bb962e612691236ae838e353521e7184464a5d32225905eac18
 DIST tk8.4.19-src.tar.gz 3362694 RMD160 c963297655740ad4b29a99c489c35a64e5e817ce SHA1 56d09be8a7670b2686d76b7526ff24b0240ca120 SHA256 d056fe6c204ac31539616e1069522dd5864a580b64e521fe1a49bc895ca8699f
-DIST tk8.5.1-src.tar.gz 3759545 RMD160 5e1196db5415771e5a7bf38425cacd7cb0ee1cd8 SHA1 3280ca4572f19c5dd379380e9a02d382127f3378 SHA256 d25126147f5fa8423de35cefd07b37583cf9c281a396f49450de42251e095fe7
-DIST tk8.5.6-src.tar.gz 3778532 RMD160 1b3d9166cc8d0c2f3c11ca98bf80a7f53447343b SHA1 3b1453d1efb47a5c600fa6b4825fed6afa3a32ad SHA256 dc918b89039d21cab4c09eddaf60abcc41e57f7bff4216a811237c1de3505907
 DIST tk8.5.7-src.tar.gz 3779867 RMD160 8ff412f84ffb76b9b0da5a32f7404c37a5337003 SHA1 b5def6871e53c78354ac01b27abd523bb4295158 SHA256 d9366ed397c4bde96550ec9d30a8fcf67878cf26937cae93e580726a87d7af30
-EBUILD tk-8.4.18-r1.ebuild 3412 RMD160 b365c068e2834c1941aa9ffef29aaeed232b88c7 SHA1 8ec2444b24345a5fb97d203f502d16689c00b490 SHA256 c374fbbe60a620d1c85b63118c32aa2824debd33ef7d9eb4ce6480cf6572ee3e
+EBUILD tk-8.4.18-r1.ebuild 3403 RMD160 f693bcd7fd68553b477daa245a12639cb55485a4 SHA1 df529fdb42929b1d046f4f20b74c6a4f5c59e678 SHA256 310a91c979e709447a13e5755f721f20f6cd4ce2f1260a5dc4a787d2cd3bbc03
 EBUILD tk-8.4.18.ebuild 3323 RMD160 6015f18d6688c364fc09c8a886ca029a1d5e3f68 SHA1 cdbe78e34b95f59fa42ae8f3ee134ce3ffab7f41 SHA256 143a71085d3309af68d5041a3468eb860f7e0ebe510886ac4a1e3754450d1411
 EBUILD tk-8.4.19-r1.ebuild 3415 RMD160 eea52253fbf3371d33bb707b15a84e8a56dbdcd5 SHA1 8581f919bce0ffda92232369d8096aef30659b93 SHA256 dfba2ad76b8d0b6f86a9026770a9eae321cf05816fc2101502b8ca44798175bc
-EBUILD tk-8.5.1.ebuild 2940 RMD160 c6f68502777d00ed110695387afbb0c10feefcf3 SHA1 dee0ff35e8af17ccffcc3d0ba9222ae4ad947f8a SHA256 d478fd2a1bbd5218b85d78a3a1f8429f1fc83298675e0d3b1f4dadacc3d38750
-EBUILD tk-8.5.6.ebuild 2947 RMD160 14f12e5678b86d2421043eb73ced0b1378dc3481 SHA1 d109b3ff76ad2b12448ff212b50191837939393b SHA256 d9bf76ada7dc39bc7f0a5b7a484063d78a996e0b0755593478baab6c1ec58e8f
 EBUILD tk-8.5.7.ebuild 2939 RMD160 2f2ecd6ab78f455cce86f40d60c2761b4c5ae074 SHA1 f451b50eb8e59a2c13af3089bd5909325c9ca403 SHA256 3c59c39805ab0b6ee91e6c644584f3072cb744acd9c3da30c686b460cbf97559
-MISC ChangeLog 16006 RMD160 c983340af35ab1d8edbfc6f0a00369395f17b634 SHA1 6c46c04279d381f074d6263fcf4feda5fd24be2a SHA256 52bef9439904439940233bd58e93086dada06a8d77d4b95b39ebc760dbf0c2db
+MISC ChangeLog 16803 RMD160 8734d678b25764580ca901ef16353bc6ed63c97f SHA1 48e83cc18ddb87d149b74a219fd6f013d66bd507 SHA256 92edfaaf94799fb8f6b9e03184552948cf45f6d6b3b5cab51bcd32e783a95063
 MISC metadata.xml 159 RMD160 117cc289391c0477579de68e7347628756673eac SHA1 37f242cbf27c6e859fc63487487fdcae09d6931f SHA256 2cf13398186ae4abcd9f41c51ffb3bcdcc7da32df2c2af5c2de2e2cc8ad194ce
diff --git a/dev-lang/tk/tk-8.4.18-r1.ebuild b/dev-lang/tk/tk-8.4.18-r1.ebuild
index 28099b73f..2d2eec1d8 100644
--- a/dev-lang/tk/tk-8.4.18-r1.ebuild
+++ b/dev-lang/tk/tk-8.4.18-r1.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/dev-lang/tk/tk-8.4.18-r1.ebuild,v 1.1 2008/10/27 20:27:07 mescalinum Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.4.18-r1.ebuild,v 1.7 2009/05/07 19:08:18 klausman Exp $
 
 EAPI="2"
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/tcl/${PN}${PV}-src.tar.gz"
 
 LICENSE="BSD"
 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 threads"
 
 RDEPEND="x11-libs/libX11[lib32?]
diff --git a/dev-lang/tk/tk-8.5.1.ebuild b/dev-lang/tk/tk-8.5.1.ebuild
deleted file mode 100644
index 49f0cbe7a..000000000
--- a/dev-lang/tk/tk-8.5.1.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.5.1.ebuild,v 1.1 2008/02/16 04:43:32 matsuu Exp $
-
-EAPI="2"
-
-WANT_AUTOCONF=latest
-WANT_AUTOMAKE=latest
-
-inherit autotools eutils multilib toolchain-funcs multilib-native
-
-MY_P="${PN}${PV/_beta/b}"
-DESCRIPTION="Tk Widget Set"
-HOMEPAGE="http://www.tcl.tk/"
-SRC_URI="mirror://sourceforge/tcl/${MY_P}-src.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="debug threads truetype"
-
-RDEPEND="x11-libs/libX11[lib32?]
-	~dev-lang/tcl-${PV}[lib32?]"
-DEPEND="${RDEPEND}
-	truetype? ( x11-libs/libXft[lib32?] )
-	x11-libs/libXt[lib32?]
-	x11-proto/xproto"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	if use threads ; then
-		ewarn ""
-		ewarn "PLEASE NOTE: You are compiling ${P} with"
-		ewarn "threading enabled."
-		ewarn "Threading is not supported by all applications"
-		ewarn "that compile against tcl. You use threading at"
-		ewarn "your own discretion."
-		ewarn ""
-		epause 5
-	fi
-}
-
-multilib-native_src_prepare_internal() {
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-8.4.11-multilib.patch
-
-	# Bug 125971
-	epatch "${FILESDIR}"/${PN}-8.5_alpha6-tclm4-soname.patch
-
-	cd "${S}"/unix
-	eautoreconf
-}
-
-multilib-native_src_configure_internal() {
-	tc-export CC
-	cd "${S}"/unix
-
-	local mylibdir=$(get_libdir) ; mylibdir=${mylibdir//\/}
-
-	econf \
-		--with-tcl=/usr/${mylibdir} \
-		$(use_enable threads) \
-		$(use_enable truetype xft) \
-		$(use_enable debug symbols) || die
-}
-
-multilib-native_src_install_internal() {
-	#short version number
-	local v1
-	v1=${PV%.*}
-
-	cd "${S}"/unix
-	S= emake DESTDIR="${D}" install || die
-
-	# fix the tkConfig.sh to eliminate refs to the build directory
-	local mylibdir=$(get_libdir) ; mylibdir=${mylibdir//\/}
-	sed -i \
-		-e "s,^\(TK_BUILD_LIB_SPEC='-L\)${S}/unix,\1/usr/${mylibdir}," \
-		-e "s,^\(TK_SRC_DIR='\)${S}',\1/usr/${mylibdir}/tk${v1}/include'," \
-		-e "s,^\(TK_BUILD_STUB_LIB_SPEC='-L\)${S}/unix,\1/usr/${mylibdir}," \
-		-e "s,^\(TK_BUILD_STUB_LIB_PATH='\)${S}/unix,\1/usr/${mylibdir}," \
-		-e "s,^\(TK_CC_SEARCH_FLAGS='.*\)',\1:/usr/${mylibdir}'," \
-		-e "s,^\(TK_LD_SEARCH_FLAGS='.*\)',\1:/usr/${mylibdir}'," \
-		"${D}"/usr/${mylibdir}/tkConfig.sh || die
-
-	# install private headers
-	insinto /usr/${mylibdir}/tk${v1}/include/unix
-	doins "${S}"/unix/*.h || die
-	insinto /usr/${mylibdir}/tk${v1}/include/generic
-	doins "${S}"/generic/*.h || die
-	rm -f "${D}"/usr/${mylibdir}/tk${v1}/include/generic/tk.h
-	rm -f "${D}"/usr/${mylibdir}/tk${v1}/include/generic/tkDecls.h
-	rm -f "${D}"/usr/${mylibdir}/tk${v1}/include/generic/tkPlatDecls.h
-
-	# install symlink for libraries
-	#dosym libtk${v1}.a /usr/${mylibdir}/libtk.a
-	dosym libtk${v1}.so /usr/${mylibdir}/libtk.so
-	dosym libtkstub${v1}.a /usr/${mylibdir}/libtkstub.a
-
-	dosym wish${v1} /usr/bin/wish
-
-	cd "${S}"
-	dodoc ChangeLog* README changes
-}
diff --git a/dev-lang/tk/tk-8.5.6.ebuild b/dev-lang/tk/tk-8.5.6.ebuild
deleted file mode 100644
index 133390788..000000000
--- a/dev-lang/tk/tk-8.5.6.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.5.6.ebuild,v 1.2 2009/02/25 15:17:11 armin76 Exp $
-
-EAPI="2"
-
-WANT_AUTOCONF=latest
-WANT_AUTOMAKE=latest
-
-inherit autotools eutils multilib toolchain-funcs multilib-native
-
-MY_P="${PN}${PV/_beta/b}"
-DESCRIPTION="Tk Widget Set"
-HOMEPAGE="http://www.tcl.tk/"
-SRC_URI="mirror://sourceforge/tcl/${MY_P}-src.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="debug threads truetype"
-
-RDEPEND="x11-libs/libX11[lib32?]
-	~dev-lang/tcl-${PV}[lib32?]"
-DEPEND="${RDEPEND}
-	truetype? ( x11-libs/libXft[lib32?] )
-	x11-libs/libXt[lib32?]
-	x11-proto/xproto"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	if use threads ; then
-		ewarn ""
-		ewarn "PLEASE NOTE: You are compiling ${P} with"
-		ewarn "threading enabled."
-		ewarn "Threading is not supported by all applications"
-		ewarn "that compile against tcl. You use threading at"
-		ewarn "your own discretion."
-		ewarn ""
-		epause 5
-	fi
-}
-
-multilib-native_src_prepare_internal() {
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-8.4.11-multilib.patch
-
-	# Bug 125971
-	epatch "${FILESDIR}"/${PN}-8.5_alpha6-tclm4-soname.patch
-
-	cd "${S}"/unix
-	eautoreconf
-}
-
-multilib-native_src_configure_internal() {
-	tc-export CC
-	cd "${S}"/unix
-
-	local mylibdir=$(get_libdir) ; mylibdir=${mylibdir//\/}
-
-	econf \
-		--with-tcl=/usr/${mylibdir} \
-		$(use_enable threads) \
-		$(use_enable truetype xft) \
-		$(use_enable debug symbols) || die
-}
-
-multilib-native_src_install_internal() {
-	#short version number
-	local v1
-	v1=${PV%.*}
-
-	cd "${S}"/unix
-	S= emake DESTDIR="${D}" install || die
-
-	# fix the tkConfig.sh to eliminate refs to the build directory
-	local mylibdir=$(get_libdir) ; mylibdir=${mylibdir//\/}
-	sed -i \
-		-e "s,^\(TK_BUILD_LIB_SPEC='-L\)${S}/unix,\1/usr/${mylibdir}," \
-		-e "s,^\(TK_SRC_DIR='\)${S}',\1/usr/${mylibdir}/tk${v1}/include'," \
-		-e "s,^\(TK_BUILD_STUB_LIB_SPEC='-L\)${S}/unix,\1/usr/${mylibdir}," \
-		-e "s,^\(TK_BUILD_STUB_LIB_PATH='\)${S}/unix,\1/usr/${mylibdir}," \
-		-e "s,^\(TK_CC_SEARCH_FLAGS='.*\)',\1:/usr/${mylibdir}'," \
-		-e "s,^\(TK_LD_SEARCH_FLAGS='.*\)',\1:/usr/${mylibdir}'," \
-		"${D}"/usr/${mylibdir}/tkConfig.sh || die
-
-	# install private headers
-	insinto /usr/${mylibdir}/tk${v1}/include/unix
-	doins "${S}"/unix/*.h || die
-	insinto /usr/${mylibdir}/tk${v1}/include/generic
-	doins "${S}"/generic/*.h || die
-	rm -f "${D}"/usr/${mylibdir}/tk${v1}/include/generic/tk.h
-	rm -f "${D}"/usr/${mylibdir}/tk${v1}/include/generic/tkDecls.h
-	rm -f "${D}"/usr/${mylibdir}/tk${v1}/include/generic/tkPlatDecls.h
-
-	# install symlink for libraries
-	#dosym libtk${v1}.a /usr/${mylibdir}/libtk.a
-	dosym libtk${v1}.so /usr/${mylibdir}/libtk.so
-	dosym libtkstub${v1}.a /usr/${mylibdir}/libtkstub.a
-
-	dosym wish${v1} /usr/bin/wish
-
-	cd "${S}"
-	dodoc ChangeLog* README changes
-}
diff --git a/dev-libs/atk/Manifest b/dev-libs/atk/Manifest
index d491c8de4..efc1f1dfa 100644
--- a/dev-libs/atk/Manifest
+++ b/dev-libs/atk/Manifest
@@ -1,4 +1,4 @@
 DIST atk-1.24.0.tar.bz2 701798 RMD160 63ce673732286f001f908316f06b8eb08c256943 SHA1 85ff5bd8f1879d2a43dfcf4842fc5ea9125dec11 SHA256 03a0b66efb6d69754ca18c133ca4d489dd8675bf366c03f58cc7b39f55a45d56
 DIST atk-1.26.0.tar.bz2 719807 RMD160 179a3a2dfb2c2e1e0a0bb0e25c43f7f26e9d3e1d SHA1 c31ae32fc7304430cdd45e7e85c7fda788e39471 SHA256 f7993d26c3606a9b0e32d1eebe716f2294ac37fac014c47744e986fc0ff5e6d1
 EBUILD atk-1.24.0.ebuild 652 RMD160 286d6a6f3c751f7155225d7c868994e5c8f88f5f SHA1 a2fc5f078cd65826b2a97f5a6f72ed20056858b8 SHA256 5a4698c03928b2ac59a1220521a7b249758bab81b3dc74d688e63ae659b4800d
-EBUILD atk-1.26.0.ebuild 582 RMD160 47aca74157f478d4a3597198f1362eb6a0abe8b3 SHA1 cfe96ff4ae327490b0e2a1db1883a289ec7b2f52 SHA256 871724bad1f6d925f222bad94d4cd9fdfed68cdce9cf26a88d12cf21cf121eab
+EBUILD atk-1.26.0.ebuild 677 RMD160 fec415b76da4a0382266ae2b3334f191939719a2 SHA1 d11d0c84290b81e991cac0d7725242150dc35e76 SHA256 1b96a2b21e787feb11fbbd67171aee4039c69e741031d42eb301ff7cfce7247f
diff --git a/dev-libs/atk/atk-1.26.0.ebuild b/dev-libs/atk/atk-1.26.0.ebuild
index 45137f816..33132b7ae 100644
--- a/dev-libs/atk/atk-1.26.0.ebuild
+++ b/dev-libs/atk/atk-1.26.0.ebuild
@@ -11,11 +11,12 @@ HOMEPAGE="http://developer.gnome.org/projects/gap/"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="doc"
 
-RDEPEND=">=dev-libs/glib-2.5.7[lib32?]"
+RDEPEND=">=dev-libs/glib-2[lib32?]"
 DEPEND="${RDEPEND}
+	>=dev-lang/perl-5
 	sys-devel/gettext
 	>=dev-util/pkgconfig-0.9
 	doc? ( >=dev-util/gtk-doc-1 )"
diff --git a/dev-libs/icu/Manifest b/dev-libs/icu/Manifest
index 66ec1f4ee..df4838f6c 100644
--- a/dev-libs/icu/Manifest
+++ b/dev-libs/icu/Manifest
@@ -18,6 +18,6 @@ EBUILD icu-3.6.ebuild 835 RMD160 878d307f8176cbc515ab7749006911ca0cafd57f SHA1 4
 EBUILD icu-3.8.1-r1.ebuild 2264 RMD160 c60a44866dc9d8c90a155621ba72c441dabc6000 SHA1 b1dc413b85123966c31a657f766c7d2d46378b50 SHA256 8f6ed1cf834f810088eabc724350304ef57affdabc97300b6441f02de1fa80a7
 EBUILD icu-3.8.1.ebuild 2193 RMD160 b19ec002b8c12bd49806b3880abaad35e9458933 SHA1 1bdca9f631e21a430e7fc776162d2fbd0684f197 SHA256 40c7159c1856a1ec667df2ffbb5f7195aefad9942b0c582917586c66c9c8981d
 EBUILD icu-4.0.1.ebuild 2185 RMD160 f52944664e0cbd8a6930425032f6a3dac50c7121 SHA1 0482e8109274c18d4ff56c2bbc239cfaf09c6a66 SHA256 4a47dffbc444e1c17dc7dbe3889f4e8bc2c6a7532e3bca719b531c7a910ac4ae
-EBUILD icu-4.2.ebuild 1867 RMD160 bab3b108bd372dac046f5ad97fbf78f96f54141a SHA1 8f0811ba23221a2fdbdeaad2ae014ce5629cdca1 SHA256 5f6ec3ae11d9ba3d403b5a2f1cf998e6bee07b1c1b595f6d8d677ecfd55116bd
+EBUILD icu-4.2.ebuild 1892 RMD160 cef22265347709a6ee10bdc87eeb166d166226cb SHA1 055d8b3a03cd3edc475fca9c329754550db0757a SHA256 4ae6ddcab957d39894c6b67b2a281fa6d4492e6492f60df94b3eeef21c76910b
 MISC ChangeLog 9116 RMD160 c5760c710ab8ec9efeb985133a05e378e8a0e5bf SHA1 cf6507f20620371b6671be2bca921612b61fd4b6 SHA256 acf385c1bf1374dc52df05679ea6545a1d68aaac11b02de3efcd2f78dd05642d
 MISC metadata.xml 274 RMD160 c5ce174bf40a37d632d003bab5e2c5b97777a1c6 SHA1 ccf8f018b8d3a49a1557b5f77e29802cbbc6140d SHA256 b2c70fe9d0595a367c5d41793662a02d301f77b09b6dc70f5b675c2725419a6a
diff --git a/dev-libs/icu/icu-4.2.ebuild b/dev-libs/icu/icu-4.2.ebuild
index 9070295f7..8d062c030 100644
--- a/dev-libs/icu/icu-4.2.ebuild
+++ b/dev-libs/icu/icu-4.2.ebuild
@@ -55,7 +55,7 @@ multilib-native_src_configure_internal() {
 		$(use_enable examples samples)
 }
 
-src_test() {
+multilib-native_src_test_internal() {
 	emake check || die "emake check failed"
 }
 
diff --git a/dev-python/libgnome-python/Manifest b/dev-python/libgnome-python/Manifest
index af6e32926..021dc23b7 100644
--- a/dev-python/libgnome-python/Manifest
+++ b/dev-python/libgnome-python/Manifest
@@ -3,6 +3,6 @@ DIST gnome-python-2.22.3.tar.bz2 588459 RMD160 81772db78abe864dcbf3c89b7f864dd3b
 DIST gnome-python-2.26.1.tar.bz2 523132 RMD160 054901ecd209953225ccfa725fdd9164447fbb49 SHA1 789627d4107aa50cd7fc763c4de015032346524e SHA256 ede0203f1eec22b3ed4a91c7b769e437859e5bc4b89a8f8e80b3f7ca62317098
 EBUILD libgnome-python-2.22.1.ebuild 832 RMD160 7e3bd25c293f021f67319c4babbfe39c4c625a5e SHA1 4b0e4a8edf7cc685feef679a57a1c7a21d3aab50 SHA256 4e703995e11123fea8f2d2b31c4870acadf10e0b46bbf3930bfe8777fddb7064
 EBUILD libgnome-python-2.22.3.ebuild 815 RMD160 f23463f99e6765a18a58de4e72c09f90500d297d SHA1 36b895aa366b938e066bb8ccd23f3669f22ad438 SHA256 2740729cf611f1c1a475edee2fe8f8462da91f40fc571394d7a76ce55e77517c
-EBUILD libgnome-python-2.26.1.ebuild 764 RMD160 8ebd0dd5eeb4686175d43f01fa8a9db47f31a72f SHA1 4e5e9c54e7d0b612c5779e37c920ef810977f289 SHA256 fe4569ffef522bca1a35054aabe2554ab40237ad04e91b97e251f1bc33f2c2bd
+EBUILD libgnome-python-2.26.1.ebuild 832 RMD160 6bec70d4b1c87d8bed472b519bef94f79b179d79 SHA1 d9da7813f260fc065d496c30ab235632ba63816e SHA256 114aea53c5c6611e592128b31aed4c374bbedb2600531f5a71e8e5d244921f52
 MISC ChangeLog 1358 RMD160 1ddd2d258718d6015ff42df6b8cae8f5a1e5884b SHA1 55252ed0521a27bb64fe661175829e2b4bc94f01 SHA256 e014d6100fc0ef955607c56bb79d33e27e8bf63252daf38a6f4ca3aa4a2ee79b
 MISC metadata.xml 178 RMD160 ec0937689a645defb2b870b481c4d4db57a0fa73 SHA1 aa77d904544ca6e6e684658ec652463fdb2ca58d SHA256 ccdf4a821074a281d4fd442460b65f57e77546cea36756c435db5529d22fa2a6
diff --git a/dev-python/libgnome-python/libgnome-python-2.26.1.ebuild b/dev-python/libgnome-python/libgnome-python-2.26.1.ebuild
index c803056fd..29cdcea60 100644
--- a/dev-python/libgnome-python/libgnome-python-2.26.1.ebuild
+++ b/dev-python/libgnome-python/libgnome-python-2.26.1.ebuild
@@ -10,7 +10,7 @@ inherit gnome-python-common multilib-native
 DESCRIPTION="Python bindings for essential GNOME libraries"
 LICENSE="LGPL-2.1"
 SLOT="2"
-KEYWORDS=""
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="examples"
 
 RDEPEND=">=gnome-base/libgnome-2.24.1
diff --git a/gnome-base/gnome-desktop/Manifest b/gnome-base/gnome-desktop/Manifest
index 75170b716..dcf9e88b5 100644
--- a/gnome-base/gnome-desktop/Manifest
+++ b/gnome-base/gnome-desktop/Manifest
@@ -3,6 +3,6 @@ DIST gnome-desktop-2.24.3.tar.bz2 1509505 RMD160 b6489965a0baa6056b5c78264184014
 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 1543 RMD160 7d64f10cd055bcefb6776384f2e839845ef80c9c SHA1 5e7b40321e1f67490f2d6e153edfe348c684581a SHA256 020a9c1e27dd1525ce353b48b07ad38a96c38f594bb5f277b8c278f0aeb097a4
+EBUILD gnome-desktop-2.26.1.ebuild 1635 RMD160 05077cf120caf32c136b08816900024c8a4ab24a SHA1 2cc3de89c95eab7cc1461077df538a8dbbf97883 SHA256 3dd9c9486aba19b0c5c123923e0967ead250e28ac10a7dd138c2b5e7f2e2acbf
 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.26.1.ebuild b/gnome-base/gnome-desktop/gnome-desktop-2.26.1.ebuild
index df5c9121b..225c5494f 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=""
+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
@@ -39,7 +39,10 @@ DEPEND="${RDEPEND}
 DOCS="AUTHORS ChangeLog HACKING NEWS README"
 
 pkg_setup() {
-	G2CONF="${G2CONF} --with-gnome-distributor=Gentoo --disable-scrollkeeper"
+	G2CONF="${G2CONF} 
+		--with-gnome-distributor=Gentoo
+		--disable-scrollkeeper
+		--disable-static"
 }
 
 pkg_postinst() {
diff --git a/gnome-base/gnome-keyring/Manifest b/gnome-base/gnome-keyring/Manifest
index fb92a79bb..065de5c1d 100644
--- a/gnome-base/gnome-keyring/Manifest
+++ b/gnome-base/gnome-keyring/Manifest
@@ -5,5 +5,5 @@ 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-r1.ebuild 1779 RMD160 0121fa6587af7e9c94d7244857e8373923e1766c SHA1 4bb497bcb6be100ea27ff5848dad72b92728c05b SHA256 04aa60e62faa9dd01d2dd08f3ebc53e80f86b4dae3e3e1d3211db9d9f7dc20e9
-EBUILD gnome-keyring-2.26.1.ebuild 1582 RMD160 f7bd799050906405c96d8e59c22072db35afa391 SHA1 11ef9374c6e6d66cbfa6cc63bb36e2473d070b7d SHA256 96b1fc55cfc1afa56f6989c2296c124222f68ef38284e74aa76eff0f77ad1802
+EBUILD gnome-keyring-2.26.1-r1.ebuild 1835 RMD160 e6a484aa8a9ec3365a9a3937aab280d2c7b04924 SHA1 dc7887cfab8f8dfb5c8d2483614d814b652bba7d SHA256 b97d78e49d49f1a9cf23f092277a30c2cb7a4627bed19847852d2f5cbce55d6f
+EBUILD gnome-keyring-2.26.1.ebuild 1709 RMD160 97a5a6165023f8108071dce6921143b221d635fc SHA1 fdf89f72df54137d82fc09c322527639c6f3cf69 SHA256 4fe784d0a469a3ec509327525eedebe857aeda973eccbd510681b6b3846a231c
diff --git a/gnome-base/gnome-keyring/gnome-keyring-2.26.1-r1.ebuild b/gnome-base/gnome-keyring/gnome-keyring-2.26.1-r1.ebuild
index 3495c8b24..7106a42e7 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-2.26.1-r1.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-2.26.1-r1.ebuild
@@ -21,6 +21,7 @@ RDEPEND=">=dev-libs/glib-2.16[lib32?]
 	>=sys-apps/dbus-1.0[lib32?]
 	hal? ( >=sys-apps/hal-0.5.7[lib32?] )
 	pam? ( virtual/pam )
+	pam? ( sys-libs/pam[lib32?] )
 	>=dev-libs/libgcrypt-1.2.2[lib32?]
 	>=dev-libs/libtasn1-1[lib32?]"
 #	valgrind? ( dev-util/valgrind )"
@@ -45,7 +46,7 @@ pkg_setup() {
 #		$(use_enable valgrind)
 }
 
-src_prepare() {
+multilib-native_src_prepare_internal() {
 	gnome2_src_prepare
 
 	# Remove silly CFLAGS
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 d447f8e42..0421764b6 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-2.26.1.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-2.26.1.ebuild
@@ -11,8 +11,9 @@ HOMEPAGE="http://www.gnome.org/"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS=""
-IUSE="debug doc hal pam valgrind test"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="debug doc hal pam test"
+# USE=valgrind is probably not a good idea for the tree
 
 RDEPEND=">=dev-libs/glib-2.16[lib32?]
 	 >=x11-libs/gtk+-2.6[lib32?]
@@ -22,13 +23,13 @@ RDEPEND=">=dev-libs/glib-2.16[lib32?]
 	 pam? ( virtual/pam )
 	 lib32? ( pam? ( sys-libs/pam[lib32] ) )
 	 >=dev-libs/libgcrypt-1.2.2[lib32?]
-	 >=dev-libs/libtasn1-0.3.4[lib32?]
-	 valgrind? ( dev-util/valgrind )"
+	 >=dev-libs/libtasn1-1[lib32?]
+	#valgrind? ( dev-util/valgrind )"
 DEPEND="${RDEPEND}
 	sys-devel/gettext[lib32?]
 	>=dev-util/intltool-0.35
 	>=dev-util/pkgconfig-0.9
-	doc? ( dev-util/gtk-doc )"
+	doc? ( dev-util/gtk-doc-1.9 )"
 
 DOCS="AUTHORS ChangeLog NEWS README TODO"
 
@@ -39,10 +40,10 @@ pkg_setup() {
 		$(use_enable test tests)
 		$(use_enable pam)
 		$(use_with pam pam-dir $(getpam_mod_dir))
-		$(use_enable valgrind)
 		--with-root-certs=/usr/share/ca-certificates/
 		--enable-acl-prompts
 		--enable-ssh-agent"
+#       $(use_enable valgrind)
 }
 
 multilib-native_src_prepare_internal() {
diff --git a/gnome-base/gnome-menus/Manifest b/gnome-base/gnome-menus/Manifest
index 7b0498d05..32a37362a 100644
--- a/gnome-base/gnome-menus/Manifest
+++ b/gnome-base/gnome-menus/Manifest
@@ -3,9 +3,11 @@ DIST gnome-menus-2.20.3.tar.bz2 446966 RMD160 eb1ff84b161d8354b1ee30364cefec91a4
 DIST gnome-menus-2.22.2.tar.bz2 465566 RMD160 a14afa2b5d9647ee2fd4a840c335c710e607ecc3 SHA1 48d2557cd33265a760e43402b4f87faf6a8990db SHA256 b3ef17eb05308e35e1627e5ca56b6951e9aea69cf112164ef698cdad6f44ed23
 DIST gnome-menus-2.24.2.tar.bz2 453261 RMD160 f377b2ea6f94a4ecd159e0a095c8a0ea3139ed37 SHA1 8769c37ca8a7045d9b79b02fd3fa3f89442b4271 SHA256 c28cc72e69164533e4a64270486d18b58184920ec4f4b288758758a373d45d3c
 DIST gnome-menus-2.26.0.tar.bz2 460779 RMD160 16520707e6e0f9cac6125648b7b34a1a60bc9652 SHA1 76e415eb2cc2099c95d4aff17f58d80a56e05a7e SHA256 84a97b6d74b14e27888a0f54759e570cb701400c5b176471871bc08a6acafb15
+DIST gnome-menus-2.26.1.tar.bz2 460916 RMD160 53e37a05b67e8e757888b5726e24c58fc7e15ffa SHA1 e89b4cc483821429fba4db3399e35775e5f73d20 SHA256 2a5696f6673aef57a87bb32e36c51a1a940ca701f6222c864b428b356bfe84e4
 EBUILD gnome-menus-2.20.3.ebuild 1648 RMD160 ed38970288b35878263f6b87bfe74afd8b6bc30b SHA1 96baf59064bba833e720fa388d011d4c4d594a43 SHA256 79a48f3dddf5584101c9e11885e17395a442f587019aaf0eb26b1675cf32a619
 EBUILD gnome-menus-2.22.2.ebuild 1512 RMD160 182aef13e33564b829517d4856c606cd5fced6de SHA1 a3158fa78628943b263c013e6a476a392d00618c SHA256 963df3b12e9ce357148093ba1644c7b657f4a3eed614fcda1269d5d3d8a99bb9
 EBUILD gnome-menus-2.24.2.ebuild 1646 RMD160 4c41095217a72510e7b758f0b5fbd612f2beaa4b SHA1 e613cf7da4492f2173ceb71519d2e5d785116238 SHA256 740d93cdcb3d34763e8fe04695180907e72e7d6534340de24d0548fbd7061735
 EBUILD gnome-menus-2.26.0.ebuild 1646 RMD160 877a9435a91444240ff5bf03904e5b7f144d7325 SHA1 560a35a09500c758d8e6f35d0f590b55f4f4700e SHA256 973b6aa48456ecaff60f9fadfd10236cb193cec3a2f3282f2744970c5cfe05dd
+EBUILD gnome-menus-2.26.1.ebuild 1665 RMD160 1420d0e64530f08558f647c510107ee52cf6fe52 SHA1 e6b2413329f5cfbfed6078a11464ef3e424f568e SHA256 e5641c4247f4c91fe993fb7aa3a937d2775fd6566af31c9711a5d6756d9807a0
 MISC ChangeLog 16262 RMD160 7b81e2d6c122d3bd09e58cd1f8ee9d47531026eb SHA1 978450d0d8fe54ad50c16031dc9aa41cecc7f8ba SHA256 729fe14f2e45ef42a2a69ba8ebc1d2d088d326d9607fc9e47a55d112b6200021
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
diff --git a/gnome-base/gnome-menus/gnome-menus-2.26.1.ebuild b/gnome-base/gnome-menus/gnome-menus-2.26.1.ebuild
new file mode 100644
index 000000000..3f6294444
--- /dev/null
+++ b/gnome-base/gnome-menus/gnome-menus-2.26.1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-menus/gnome-menus-2.24.2.ebuild,v 1.6 2009/03/18 14:54:18 armin76 Exp $
+
+EAPI="2"
+
+inherit eutils gnome2 python multilib-native
+
+DESCRIPTION="The GNOME menu system, implementing the F.D.O cross-desktop spec"
+HOMEPAGE="http://www.gnome.org"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="debug python"
+
+RDEPEND=">=dev-libs/glib-2.15.2[lib32?]
+	python? (
+		>=dev-lang/python-2.4.4-r5
+		dev-python/pygtk )"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	>=dev-util/pkgconfig-0.9
+	>=dev-util/intltool-0.40"
+
+DOCS="AUTHORS ChangeLog HACKING NEWS README"
+
+multilib-native_pkg_setup_internal() {
+	# Do NOT compile with --disable-debug/--enable-debug=no
+	# FIXME: fix autofoo and report upstream
+	if use debug ; then
+		G2CONF="${G2CONF} --enable-debug=yes"
+	fi
+
+	G2CONF="${G2CONF} $(use_enable python) --disable-static"
+}
+
+src_unpack() {
+	gnome2_src_unpack
+
+	# Don't show KDE standalone settings desktop files in GNOME others menu
+	epatch "${FILESDIR}/${PN}-2.18.3-ignore_kde_standalone.patch"
+
+	# disable pyc compiling
+	mv py-compile py-compile-disabled
+	ln -s $(type -P true) py-compile
+}
+
+multilib-native_pkg_postinst_internal() {
+	gnome2_pkg_postinst
+	if use python; then
+		python_version
+		python_need_rebuild
+		python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages/GMenuSimpleEditor
+	fi
+}
+
+multilib-native_pkg_postrm_internal() {
+	gnome2_pkg_postrm
+	python_mod_cleanup /usr/$(get_libdir)/python*/site-packages/GMenuSimpleEditor
+}
diff --git a/gnome-base/libgnome/Manifest b/gnome-base/libgnome/Manifest
index 640a115cc..3bc9f2493 100644
--- a/gnome-base/libgnome/Manifest
+++ b/gnome-base/libgnome/Manifest
@@ -1,4 +1,5 @@
+DIST gentoo-gdm-theme-r3.tar.bz2 411703 RMD160 9188c8f2661163be72595a6b4924fae0648e7df5 SHA1 246a7ce67ad9d826b1cca6d90b53369b88be72ac SHA256 c7cbe97757ff93f0ffd42f9d9fb702278a361e830940a03901cda9943f44ba68
 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 945 RMD160 c6f04bccfb6a32b59cd9570c0574aecb6e87c6fa SHA1 fd56b8e7dcc73d7b7722612d40181a6d0f3ee46a SHA256 80ef80bdbd839c483183892525445e5e2528be1a8e67ffe4fe887d5cfc5cec6d
-EBUILD libgnome-2.26.0.ebuild 864 RMD160 47033a2a0f06820fb4f757cde9791e032e67aae4 SHA1 c637ab9729b7897f1dd2a20f9dd53a6249a1f4ec SHA256 9a1ea1e2f3f95510192787d4b4c421b27ec8311abdddb7848581afab4fc277d7
+EBUILD libgnome-2.26.0.ebuild 1539 RMD160 62ff56cc857aaeecf6a99f999c0a83fdea2b0233 SHA1 00627d1b905af52bb26e5c561a27f890610fd0bb SHA256 028e4ad95bf3dc92078b01b708ff07ee0ef14233af40ae7c012acb1a90d029df
diff --git a/gnome-base/libgnome/libgnome-2.26.0.ebuild b/gnome-base/libgnome/libgnome-2.26.0.ebuild
index 6590de3ef..543c2b999 100644
--- a/gnome-base/libgnome/libgnome-2.26.0.ebuild
+++ b/gnome-base/libgnome/libgnome-2.26.0.ebuild
@@ -1,18 +1,21 @@
 # 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.3 2009/03/06 15:36:28 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnome/libgnome-2.26.0.ebuild,v 1.1 2009/05/10 18:34:54 eva Exp $
 
 EAPI="2"
 
-inherit gnome2 multilib-native
+inherit gnome2 eutils multilib-native
 
 DESCRIPTION="Essential Gnome Libraries"
 HOMEPAGE="http://www.gnome.org/"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS=""
-IUSE="doc esd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="branding doc esd"
+
+SRC_URI="${SRC_URI}
+	branding? ( mirror://gentoo/gentoo-gdm-theme-r3.tar.bz2 )"
 
 RDEPEND=">=gnome-base/gconf-2[lib32?]
 	>=dev-libs/glib-2.16[lib32?]
@@ -21,8 +24,7 @@ RDEPEND=">=gnome-base/gconf-2[lib32?]
 	>=dev-libs/popt-1.7[lib32?]
 	esd? (
 		>=media-sound/esound-0.2.26
-		>=media-libs/audiofile-0.2.3
-	)"
+		>=media-libs/audiofile-0.2.3 )"
 
 DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.40
@@ -34,3 +36,21 @@ DOCS="AUTHORS ChangeLog NEWS README"
 pkg_setup() {
 	G2CONF="${G2CONF} --disable-schemas-install $(use_enable esd)"
 }
+
+multilib-native_src_prepare_internal() {
+	gnome2_src_prepare
+
+	use branding && epatch "${FILESDIR}"/${P}-branding.patch
+}
+
+multilib-native_src_install_internal() {
+	gnome2_src_install
+
+	if use branding; then
+		# Add gentoo backgrounds
+		dodir /usr/share/pixmaps/backgrounds/gnome/gentoo
+		insinto /usr/share/pixmaps/backgrounds/gnome/gentoo
+		doins "${WORKDIR}"/gentoo-emergence/gentoo-emergence.png || die "doins 1 failed"
+		doins "${WORKDIR}"/gentoo-cow/gentoo-cow-alpha.png || die "doins 2 failed"
+	fi
+}
diff --git a/gnome-base/libgnomecanvas/Manifest b/gnome-base/libgnomecanvas/Manifest
index 048520cf1..a7cd260bb 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 870 RMD160 69a986ad44d56bbe8b4a27129d5c8c78de2eef85 SHA1 317a3f4e7d1f39037155cf4c74b38c5f7bd98e8a SHA256 2d96151ad15e0481cd1fddb4a1fd084d9c8d6916a1ca763f2c58f3ebb808fc82
+EBUILD libgnomecanvas-2.26.0.ebuild 907 RMD160 2f7188a282279c5e2b119928fe712f15f1fce77f SHA1 b4ac9c3d749932b7260e173d13732fcd76505506 SHA256 9608f3574a94a25239365a5f9a87923202ee5f5b2be3023b74650d9cef5e5cff
diff --git a/gnome-base/libgnomecanvas/libgnomecanvas-2.26.0.ebuild b/gnome-base/libgnomecanvas/libgnomecanvas-2.26.0.ebuild
index 2fc5069af..51577b808 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=""
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="doc"
 
 # gtk+ raised to fix gail dependency
@@ -21,6 +21,7 @@ RDEPEND=">=x11-libs/gtk+-2.13[lib32?]
 	>=gnome-base/libglade-2[lib32?]"
 
 DEPEND="${RDEPEND}
+	>=dev-lang/perl-5
 	sys-devel/gettext
 	>=dev-util/intltool-0.35
 	>=dev-util/pkgconfig-0.18
@@ -28,10 +29,6 @@ DEPEND="${RDEPEND}
 
 DOCS="AUTHORS ChangeLog NEWS README"
 
-pkg_setup() {
-	G2CONF="${G2CONF} --disable-rebuilds"
-}
-
 src_test() {
 	Xmake check || die "Test phase failed"
 }
diff --git a/gnome-extra/bug-buddy/Manifest b/gnome-extra/bug-buddy/Manifest
index cd0944a4d..0af989b47 100644
--- a/gnome-extra/bug-buddy/Manifest
+++ b/gnome-extra/bug-buddy/Manifest
@@ -1,6 +1,6 @@
 DIST bug-buddy-2.24.2.tar.bz2 1109562 RMD160 fb443a39f1a6cff96c909e483aaec370a87b38ad SHA1 00eb4f47af4e56d94ef8862acf782e572fdec7d2 SHA256 d64125505546183d44727e812b0ac7e9c60f0fff0eaf164b874974647067cbb4
 DIST bug-buddy-2.26.0.tar.bz2 1051956 RMD160 51dac975a5752c910928ddf07bab3bc9c0225649 SHA1 6b96ea35d58b969fe0129af2bfb4aa144c207e6d SHA256 91780659fb3f360ed2f2b0804ceb619d9cbc7754115bf50f442bdd2c7dca224c
 EBUILD bug-buddy-2.24.2.ebuild 1261 RMD160 87499d0602b5f5debb11c61b21aa1ce6905f9818 SHA1 b68f792b566d224958d685c547c2f42e0c1f11c3 SHA256 e1dda68c49195f466f91173d78bb2003c7879051b5120e60a732203f0b5549bb
-EBUILD bug-buddy-2.26.0.ebuild 1248 RMD160 1efcb2056f0e2807537e4e85a3d8dff94f4a1c7a SHA1 20640ff128044778d01c67ffa58145ea1d26d772 SHA256 529194859220b074c03fd045bfda9eb31ccd584e1637ed25f81912e55eac52aa
+EBUILD bug-buddy-2.26.0.ebuild 1330 RMD160 32d61c6d11c40f379fe78d274d145b3aff68b649 SHA1 4a165e7953d1671baa278554a4826eb158394b0d SHA256 e8eddfe3f1e81002fd31914217868bdeb56a722dbb907efd3e634c2705854a00
 MISC ChangeLog 18384 RMD160 df806eed6d1f98d8981e80544bf6e9b0a9d69149 SHA1 50236cb94d968cd64224333c9798e6a7b004369a SHA256 f19da1a7626cd748a164d96c065e2014fa66e6eb1cbc34c897207b352c39c264
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
diff --git a/gnome-extra/bug-buddy/bug-buddy-2.26.0.ebuild b/gnome-extra/bug-buddy/bug-buddy-2.26.0.ebuild
index 3f5dd672b..a04d65e15 100644
--- a/gnome-extra/bug-buddy/bug-buddy-2.26.0.ebuild
+++ b/gnome-extra/bug-buddy/bug-buddy-2.26.0.ebuild
@@ -11,17 +11,15 @@ HOMEPAGE="http://www.gnome.org/"
 
 LICENSE="Ximian-logos GPL-2"
 SLOT="2"
-KEYWORDS=""
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="eds"
 
 # Articifially raise gtk+ dep to support loading through XSettings
 RDEPEND=">=gnome-base/libbonobo-2[lib32?]
 	>=dev-libs/glib-2.16.0[lib32?]
-	>=gnome-base/libgnome-2[lib32?]
 	>=gnome-base/gnome-menus-2.11.1[lib32?]
-	>=gnome-base/libgnomeui-2.5.92[lib32?]
 	>=dev-libs/libxml2-2.4.6[lib32?]
-	>=x11-libs/gtk+-2.14[lib32?]
+	>=x11-libs/gtk+-2.14.0[lib32?]
 	>=net-libs/libsoup-2.4[lib32?]
 	>=gnome-base/libgtop-2.13.3[lib32?]
 	eds? ( >=gnome-extra/evolution-data-server-1.3 )
@@ -30,7 +28,6 @@ RDEPEND=">=gnome-base/libbonobo-2[lib32?]
 	>=sys-devel/gdb-5.1"
 
 DEPEND=${RDEPEND}"
-	>=app-text/scrollkeeper-0.3.9
 	>=app-text/gnome-doc-utils-0.3.2
 	>=dev-util/pkgconfig-0.9
 	>=dev-util/intltool-0.40"
@@ -38,7 +35,11 @@ DEPEND=${RDEPEND}"
 DOCS="AUTHORS ChangeLog NEWS README TODO"
 
 pkg_setup() {
-	G2CONF="${G2CONF} $(use_enable eds) --disable-scrollkeeper"
+	# Google-breakpad seems to support only x86.
+	# It is mostly useless for a distro like gentoo. Disable for now.
+	G2CONF="${G2CONF}
+		--disable-google-breakpad
+		$(use_enable eds)"
 }
 
 multilib-native_pkg_setup_internal() { :; }
diff --git a/media-libs/libpng/Manifest b/media-libs/libpng/Manifest
index cc9fa8fcc..37c03ec5e 100644
--- a/media-libs/libpng/Manifest
+++ b/media-libs/libpng/Manifest
@@ -4,6 +4,6 @@ DIST libpng-1.2.35.tar.lzma 514777 RMD160 9566efec8770ac7c816e268fc2ef4a60960029
 DIST libpng-1.2.36.tar.lzma 516736 RMD160 9435c8abbd5317e8b326d2695a799ee2bf70ec7b SHA1 2a36983ff74f6b13db45eace692f4b3ec5f684cb SHA256 5df30d36cedec2ad1cf33a07db796c9c79abb39bad443f42bef6a9b28cccc9b6
 EBUILD libpng-1.2.34.ebuild 1201 RMD160 4153df7800ee596e696add79e897a89e2265f4c1 SHA1 3dd38d08aff9c0af56db42d3fbecc6ed62f28b62 SHA256 198a9169a146887c80ea418657a783f40f40bd8c2f09e1abbdc7d478fc6cacbc
 EBUILD libpng-1.2.35.ebuild 1202 RMD160 ceceb18c400ffac6a5c69dddcd469fd08b89ea0c SHA1 9135fa20fde8dd713a36380f6f057aba4c85b685 SHA256 30a8cfbbdb4ad47321e15c6fb583daaec4a942028df125e451fbae030cb59ee6
-EBUILD libpng-1.2.36.ebuild 894 RMD160 f046edf1e3d6436f8e508915cf5e99e86dddc041 SHA1 d2edc6c7af3ce7e6db6540f0916c72f5bc569561 SHA256 51ad75bc19a4158c559007bb97cb2ab2e148c155fd6ae774a4e67310f436c3fa
+EBUILD libpng-1.2.36.ebuild 868 RMD160 b144204b2f693b1ece8a3b9728ac5b849a656a16 SHA1 539f3b3e49e6d1401bc33e4e321d75af16f9bae6 SHA256 2a1312d5f6d7b86087e45173d543a2add51c8054dd42a3e0b90135820324ce2b
 MISC ChangeLog 29278 RMD160 76cd55deb089f4d3bb3eda3706eacd5e440022bb SHA1 771063cc068eac5aaab7490ac08a3f92f7221521 SHA256 b557cf097bc5b17ee1476e96bf4a15205d5041ae1c6a870b655383c92da39cf8
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
diff --git a/media-libs/libpng/libpng-1.2.36.ebuild b/media-libs/libpng/libpng-1.2.36.ebuild
index 5f721e10f..52d2ae4e7 100644
--- a/media-libs/libpng/libpng-1.2.36.ebuild
+++ b/media-libs/libpng/libpng-1.2.36.ebuild
@@ -6,10 +6,9 @@ EAPI="2"
 
 inherit libtool multilib eutils multilib-native
 
-MY_PV=${PV/_}
 DESCRIPTION="Portable Network Graphics library"
 HOMEPAGE="http://www.libpng.org/"
-SRC_URI="mirror://sourceforge/libpng/${PN}-${MY_PV}.tar.lzma"
+SRC_URI="mirror://sourceforge/libpng/${P}.tar.lzma"
 
 LICENSE="as-is"
 SLOT="1.2"
@@ -23,13 +22,11 @@ DEPEND="${RDEPEND}
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-
 	# So we get sane .so versioning on FreeBSD
 	elibtoolize
 }
 
 multilib-native_src_install_internal() {
 	emake DESTDIR="${D}" install || die
-
 	dodoc ANNOUNCE CHANGES KNOWNBUG README TODO Y2KINFO
 }
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index f22fe1173..b02949a99 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -8,6 +8,7 @@ DIST MesaLib-7.3.tar.bz2 3368281 RMD160 ee0b06d375d1ea91dc26ae96c807918e1d3cb7c8
 DIST MesaLib-7.4-rc1.tar.gz 4441158 RMD160 931a282d01b30522697377567eceb1e32e1f1040 SHA1 a43fc2563ef190b4dba17afd2c22fa676e9cc80f SHA256 caf32570cd55b8fdd86bf837536996a309add977e084cae4b4c95422f77d9321
 DIST MesaLib-7.4-rc2.tar.gz 4443420 RMD160 79c874081bbba8d455d688e93382122a015f24c3 SHA1 1c60ccaf1ea1c69598d183e7808444180c85048b SHA256 9004390f98ff890f8dc3214a4dfb76bb26531f08bc55517de284455dd0a4831c
 DIST MesaLib-7.4.1.tar.bz2 3373554 RMD160 6a178359f26f54198e17d22c12f396940abb2b18 SHA1 ee3f8baa48fa31441fc07ccd06734279cb1ca18a SHA256 cba38fc0f6896757cb6e3962d3bb091d3d724a536a213ab9cf6b00a760efc5d2
+DIST MesaLib-7.4.2.tar.bz2 3371577 RMD160 e70b8fd203325e676d90485632bf266e39d46a7e SHA1 fe70945ccf2c08d18ae4e83000018f0400352065 SHA256 71b978812cfc0dbc378315de42ef44a32f171b4166733b18455ec04a7fbc6434
 DIST MesaLib-7.4.tar.bz2 3370157 RMD160 a3e601a5fbb482b4d9668d88a33592ea180170d5 SHA1 66b5fe185e63706ee2a76e247fd982fdf13972e2 SHA256 6e945389add4e5b41f2c403ced13c343767565f2eacde4b16de2d0f9f8a6aac4
 DIST mesa-7.3-gentoo-patches-01.tar.bz2 34342 RMD160 547e3d1e8a72cd7df13bf699c181a5f8d36bff33 SHA1 51310d802ad1ee8b660fc7cf77c37b5478f3794a SHA256 e3d27046f73b6fc3d89e06fdfce9d065fa79705f59950b65350fa55bd539e56a
 DIST mesa-7.4.1-gentoo-patches-01.tar.bz2 3727 RMD160 8df6389bc867a1f3892e038e12fcb285d063b6a4 SHA1 5521f884503004f90c0211fa1c6abbe54a3c4243 SHA256 d39052d8a75f45f07af85b9f50852ac3596e90296b8afbe6a71d42bd74caaa79
@@ -18,6 +19,7 @@ EBUILD mesa-7.3-r1.ebuild 7312 RMD160 165484966aba64b9ca9f7342ba9d1d464ae03622 S
 EBUILD mesa-7.3.ebuild 7193 RMD160 7e11d44f4b3d27968981280cecd68d0dc4b25e5b SHA1 9bfc23142e18e6e135e3d363560645bde881525c SHA256 fc302b1d645de522830ba11871d19c670541da3d0e1209211f1c6ac6860a1eab
 EBUILD mesa-7.4.1-r1.ebuild 8014 RMD160 1068c18eab006bccdfa291538074b29f3a37554a SHA1 31fdb6c785ca833654af8ee16c41250fc1632d96 SHA256 a93be506cd33c18a5c9a14cdb3491aedd9ed09da1e2c2beb4471d7d04c00b037
 EBUILD mesa-7.4.1-r2.ebuild 8028 RMD160 3cb0a7354ff71125dcca07872a6009baea2411e8 SHA1 f3897b0e20857951889fbb07f902fdcfd79da03c SHA256 3ad796ee9f4d40b0564a0fb3ae9f33918f6e27a952f2383207a0d163556bde43
+EBUILD mesa-7.4.2.ebuild 7983 RMD160 8550f37c9f646030e5c7f3e6837f7a63a42c29a1 SHA1 1f89849673f400e9d06bb1db5e1570183724117d SHA256 6e3bf82566233a23763f80b3eb40fceff779b338bc9d154a45c548e43993dad2
 EBUILD mesa-7.4.ebuild 7687 RMD160 b87172541b48207a4e3f1d84b9ca62359c9d972d SHA1 2d226feb694586d6d46006bbc914a455f6f13bf4 SHA256 6e5111028f43207ba0a17ac70f80f66c18b815c9cf9f6de0d0ced93d883a8e40
 EBUILD mesa-7.4_rc1.ebuild 7586 RMD160 8b053af8f7b64440db7e5807117a9aabf48c41aa SHA1 ba783f037ec7c37ef20841149df9cc8b8c276e67 SHA256 a792703c8c70e4658e9059c8df54b85d071552f1427f5f049b6ec7c5f8dff931
 EBUILD mesa-7.4_rc2.ebuild 7507 RMD160 6b694b5c333488523135eb86210429a809f4207e SHA1 76f97392d69d58d56ecf34f0afdfe618b81ece28 SHA256 f8bbb3437c21819d86caede141e98f3ecb7465499a3519dfa11512fc8376c4b2
diff --git a/media-libs/mesa/mesa-7.4.2.ebuild b/media-libs/mesa/mesa-7.4.2.ebuild
new file mode 100644
index 000000000..2cff13b8b
--- /dev/null
+++ b/media-libs/mesa/mesa-7.4.2.ebuild
@@ -0,0 +1,277 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-7.4.2.ebuild,v 1.1 2009/05/16 08:43:30 remi Exp $
+
+EAPI="2"
+MULTILIB_IN_SOURCE_BUILD="yes"
+
+EGIT_REPO_URI="git://anongit.freedesktop.org/mesa/mesa"
+
+if [[ ${PV} = 9999* ]]; then
+	GIT_ECLASS="git"
+	EXPERIMENTAL="true"
+	IUSE_VIDEO_CARDS_UNSTABLE="video_cards_nouveau"
+	IUSE_UNSTABLE="gallium"
+	# User can also specify branch by simply adding MESA_LIVE_BRANCH="blesmrt"
+	# to the make.conf, where blesmrt is desired branch.
+	[[ -z ${MESA_LIVE_BRANCH} ]] || EGIT_BRANCH="${MESA_LIVE_BRANCH}"
+fi
+
+inherit autotools multilib flag-o-matic ${GIT_ECLASS} portability multilib-native
+
+OPENGL_DIR="xorg-x11"
+
+MY_PN="${PN/m/M}"
+MY_P="${MY_PN}-${PV/_/-}"
+MY_SRC_P="${MY_PN}Lib-${PV/_/-}"
+DESCRIPTION="OpenGL-like graphic library for Linux"
+HOMEPAGE="http://mesa3d.sourceforge.net/"
+
+#SRC_PATCHES="mirror://gentoo/${P}-gentoo-patches-01.tar.bz2"
+if [[ $PV = *_rc* ]]; then
+	SRC_URI="http://www.mesa3d.org/beta/${MY_SRC_P}.tar.gz
+		${SRC_PATCHES}"
+elif [[ $PV = 9999* ]]; then
+	SRC_URI="${SRC_PATCHES}"
+else
+	SRC_URI="mirror://sourceforge/mesa3d/${MY_SRC_P}.tar.bz2
+		${SRC_PATCHES}"
+fi
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+
+IUSE_VIDEO_CARDS="${IUSE_VIDEO_CARDS_UNSTABLE}
+	video_cards_intel
+	video_cards_mach64
+	video_cards_mga
+	video_cards_none
+	video_cards_r128
+	video_cards_radeon
+	video_cards_radeonhd
+	video_cards_s3virge
+	video_cards_savage
+	video_cards_sis
+	video_cards_sunffb
+	video_cards_tdfx
+	video_cards_trident
+	video_cards_via"
+IUSE="${IUSE_VIDEO_CARDS} ${IUSE_UNSTABLE}
+	debug doc motif nptl pic xcb kernel_FreeBSD"
+
+# keep correct libdrm and dri2proto dep
+# keep blocks in rdepend for binpkg
+RDEPEND="!<=x11-base/xorg-x11-6.9
+	!<=x11-proto/xf86driproto-2.0.3
+	app-admin/eselect-opengl
+	dev-libs/expat[lib32?]
+	>=x11-libs/libdrm-2.4.6[lib32?]
+	x11-libs/libICE[lib32?]
+	x11-libs/libX11[xcb?,lib32?]
+	x11-libs/libXdamage[lib32?]
+	x11-libs/libXext[lib32?]
+	x11-libs/libXi[lib32?]
+	x11-libs/libXmu[lib32?]
+	x11-libs/libXxf86vm[lib32?]
+	motif? ( x11-libs/openmotif[lib32?] )
+	doc? ( app-doc/opengl-manpages )
+"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	x11-misc/makedepend
+	>=x11-proto/dri2proto-1.99.3
+	>=x11-proto/glproto-1.4.8
+	x11-proto/inputproto
+	x11-proto/xextproto
+	x11-proto/xf86vidmodeproto
+	x11-proto/xf86driproto
+"
+# glew depend on mesa and it is needed in runtime
+PDEPEND=">=media-libs/glew-1.5.1[lib32?]"
+
+S="${WORKDIR}/${MY_P}"
+
+# Think about: ggi, svga, fbcon, no-X configs
+
+pkg_setup() {
+	if use debug; then
+		append-flags -g
+	fi
+
+	# gcc 4.2 has buggy ivopts
+	if [[ $(gcc-version) = "4.2" ]]; then
+		append-flags -fno-ivopts
+	fi
+
+	# recommended by upstream
+	append-flags -ffast-math
+}
+
+src_unpack() {
+	[[ $PV = 9999* ]] && git_src_unpack || unpack ${A}
+}
+
+src_prepare() {
+	# apply patches
+	if [[ ${PV} != 9999* && -n ${SRC_PATCHES} ]]; then
+		EPATCH_FORCE="yes" \
+		EPATCH_SOURCE="${WORKDIR}/patches" \
+		EPATCH_SUFFIX="patch" \
+		epatch
+	fi
+	# FreeBSD 6.* doesn't have posix_memalign().
+	[[ ${CHOST} == *-freebsd6.* ]] && \
+		sed -i -e "s/-DHAVE_POSIX_MEMALIGN//" configure.ac
+
+	eautoreconf
+}
+
+multilib-native_src_configure_internal() {
+	local myconf
+
+	# Configurable DRI drivers
+	driver_enable swrast
+	driver_enable video_cards_intel i810 i915 i965
+	driver_enable video_cards_mach64 mach64
+	driver_enable video_cards_mga mga
+	driver_enable video_cards_r128 r128
+	# ATI has two implementations as video_cards
+	driver_enable video_cards_radeon radeon r200 r300
+	driver_enable video_cards_radeonhd r300
+	driver_enable video_cards_s3virge s3v
+	driver_enable video_cards_savage savage
+	driver_enable video_cards_sis sis
+	driver_enable video_cards_sunffb ffb
+	driver_enable video_cards_tdfx tdfx
+	driver_enable video_cards_trident trident
+	driver_enable video_cards_via unichrome
+
+	# all live (experimental) stuff is wrapped around with experimental variable
+	# so the users cant get to this parts even with enabled useflags (downgrade
+	# from live to stable for example)
+	if [[ -n ${EXPERIMENTAL} ]]; then
+		# nouveau works only with gallium and intel, radeon, radeonhd can use
+		# gallium as alternative implementation (NOTE: THIS IS EXPERIMENTAL)
+		if use video_cards_nouveau && ! use gallium ; then
+			elog "Nouveau driver is available only via gallium interface."
+			elog "Enable gallium useflag if you want to use nouveau."
+			echo
+		fi
+		# state trackers, for now enable the one i want
+		# think about this bit more...
+		myconf="${myconf} $(use_enable gallium)"
+		if use gallium; then
+			elog "Warning gallium interface is highly experimental so use"
+			elog "it only if you feel really really brave."
+			elog
+			elog "Intel: works only i915."
+			elog "Nouveau: only available implementation, so no other choice"
+			elog "Radeon: not working, disabled."
+			echo
+			myconf="${myconf}
+				--with-state-trackers=glx,dri,egl
+				$(use_enable video_cards_nouveau gallium-nouveau)
+				$(use_enable video_cards_intel gallium-intel)"
+				#$(use_enable video_cards_radeon gallium-radeon)
+				#$(use_enable video_cards_radeonhd gallium-radeon)"
+		fi
+	fi
+
+	# Deactivate assembly code for pic build
+	# Sparc assembly code is not working
+	myconf="${myconf} $(use_enable !pic asm)"
+	myconf="${myconf} $(use_enable !sparc asm)"
+
+	# --with-driver=dri|xlib|osmesa ; might get changed later to something
+	# else than dri
+	econf \
+		--with-driver=dri \
+		--disable-glut \
+		--without-demos \
+		$(use_enable debug) \
+		$(use_enable motif glw) \
+		$(use_enable motif) \
+		$(use_enable nptl glx-tls) \
+		$(use_enable xcb) \
+		--with-dri-drivers=${DRI_DRIVERS} \
+		${myconf}
+}
+
+multilib-native_src_install_internal() {
+	dodir /usr
+	emake DESTDIR="${D}" install || die "Installation failed"
+
+	# Remove redundant headers
+	# GLUT thing
+	rm -f "${D}"/usr/include/GL/glut*.h || die "Removing glut include failed."
+	# Glew headers
+	rm -f "${D}"/usr/include/GL/{glew,glxew,wglew}.h \
+		|| die "Removing glew includes failed."
+
+	# Move libGL and others from /usr/lib to /usr/lib/opengl/blah/lib
+	# because user can eselect desired GL provider.
+	ebegin "Moving libGL and friends for dynamic switching"
+		dodir /usr/$(get_libdir)/opengl/${OPENGL_DIR}/{lib,extensions,include}
+		local x
+		for x in "${D}"/usr/$(get_libdir)/libGL.{la,a,so*}; do
+			if [ -f ${x} -o -L ${x} ]; then
+				mv -f ${x} "${D}"/usr/$(get_libdir)/opengl/${OPENGL_DIR}/lib \
+					|| die "Failed to move ${x}"
+			fi
+		done
+		for x in "${D}"/usr/include/GL/{gl.h,glx.h,glext.h,glxext.h}; do
+			if [ -f ${x} -o -L ${x} ]; then
+				mv -f ${x} "${D}"/usr/$(get_libdir)/opengl/${OPENGL_DIR}/include \
+					|| die "Failed to move ${x}"
+			fi
+		done
+	eend $?
+
+	# Install libtool archives
+	insinto /usr/$(get_libdir)
+	# Should this use the -L/usr/lib instead of -L/usr/$(get_libdir)?
+	# Please confirm and update this comment or the file.
+	doins "${FILESDIR}"/lib/libGLU.la || die "doins libGLU.la failed"
+	sed -i -e "s:/lib:/$(get_libdir):g" \
+		"${D}"/usr/$(get_libdir)/libGLU.la
+
+	sed \
+		-e "s:\${libdir}:$(get_libdir):g" \
+		"${FILESDIR}"/lib/libGL.la \
+		> "${D}"/usr/$(get_libdir)/opengl/xorg-x11/lib/libGL.la
+
+	# On *BSD libcs dlopen() and similar functions are present directly in
+	# libc.so and does not require linking to libdl. portability eclass takes
+	# care of finding the needed library (if needed) witht the dlopen_lib
+	# function.
+	sed -i \
+		-e 's:-ldl:'$(dlopen_lib)':g' \
+		"${D}"/usr/$(get_libdir)/{libGLU.la,opengl/xorg-x11/lib/libGL.la} \
+		|| die "sed dlopen failed"
+}
+
+pkg_postinst() {
+	# Switch to the xorg implementation.
+	echo
+	eselect opengl set --use-old ${OPENGL_DIR}
+}
+
+# $1 - VIDEO_CARDS flag
+# other args - names of DRI drivers to enable
+driver_enable() {
+	case $# in
+		# for enabling unconditionally
+		1)
+			DRI_DRIVERS="${DRI_DRIVERS},$1"
+			;;
+		*)
+			if use $1; then
+				shift
+				for i in $@; do
+					DRI_DRIVERS="${DRI_DRIVERS},${i}"
+				done
+			fi
+			;;
+	esac
+}
diff --git a/metadata/cache/dev-cpp/glibmm-2.20.0 b/metadata/cache/dev-cpp/glibmm-2.20.0
new file mode 100644
index 000000000..d735d9163
--- /dev/null
+++ b/metadata/cache/dev-cpp/glibmm-2.20.0
@@ -0,0 +1,22 @@
+>=dev-libs/libsigc++-2.2[lib32?] >=dev-libs/glib-2.19.8[lib32?] dev-util/pkgconfig doc? ( app-doc/doxygen ) >=sys-apps/sed-4
+>=dev-libs/libsigc++-2.2[lib32?] >=dev-libs/glib-2.19.8[lib32?]
+2
+mirror://gnome/sources/glibmm/2.20/glibmm-2.20.0.tar.bz2
+
+http://www.gtkmm.org
+|| ( LGPL-2.1 GPL-2 )
+C++ interface for glib2
+~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd
+base eutils fdo-mime gnome.org gnome2 gnome2-utils libtool multilib multilib-native portability toolchain-funcs
+doc examples test debug lib32
+
+
+
+2
+
+compile configure install postinst postrm preinst prepare setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-cpp/gtkmm-2.16.0 b/metadata/cache/dev-cpp/gtkmm-2.16.0
new file mode 100644
index 000000000..c53aa9990
--- /dev/null
+++ b/metadata/cache/dev-cpp/gtkmm-2.16.0
@@ -0,0 +1,22 @@
+>=dev-cpp/glibmm-2.19[lib32?] >=x11-libs/gtk+-2.15.5[lib32?] >=dev-cpp/cairomm-1.2.2[lib32?] >=dev-cpp/pangomm-2.14.0[lib32?] >=dev-libs/atk-1.9.1[lib32?] dev-util/pkgconfig >=sys-apps/sed-4
+>=dev-cpp/glibmm-2.19[lib32?] >=x11-libs/gtk+-2.15.5[lib32?] >=dev-cpp/cairomm-1.2.2[lib32?] >=dev-cpp/pangomm-2.14.0[lib32?] >=dev-libs/atk-1.9.1[lib32?]
+2.4
+mirror://gnome/sources/gtkmm/2.16/gtkmm-2.16.0.tar.bz2
+
+http://www.gtkmm.org
+LGPL-2.1
+C++ interface for GTK+2
+~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd
+base eutils fdo-mime gnome.org gnome2 gnome2-utils libtool multilib multilib-native portability toolchain-funcs
+doc examples test debug lib32
+
+
+
+2
+
+compile configure install postinst postrm preinst prepare setup unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-cpp/pangomm-2.14.1 b/metadata/cache/dev-cpp/pangomm-2.14.1
new file mode 100644
index 000000000..c1f7d16b6
--- /dev/null
+++ b/metadata/cache/dev-cpp/pangomm-2.14.1
@@ -0,0 +1,22 @@
+>=x11-libs/pango-1.21.4[lib32?] >=dev-cpp/glibmm-2.14.1[lib32?] >=dev-cpp/cairomm-1.2.2[lib32?] !<dev-cpp/gtkmm-2.13:2.4[lib32?] dev-util/pkgconfig >=sys-apps/sed-4
+>=x11-libs/pango-1.21.4[lib32?] >=dev-cpp/glibmm-2.14.1[lib32?] >=dev-cpp/cairomm-1.2.2[lib32?] !<dev-cpp/gtkmm-2.13:2.4[lib32?]
+2.4
+mirror://gnome/sources/pangomm/2.14/pangomm-2.14.1.tar.bz2
+
+http://www.gtkmm.org
+LGPL-2.1
+C++ interface for pango
+~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd
+base eutils fdo-mime gnome.org gnome2 gnome2-utils libtool multilib multilib-native portability toolchain-funcs
+doc debug lib32
+
+
+
+2
+
+compile configure install postinst postrm preinst prepare setup unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-cpp/pangomm-2.24.0 b/metadata/cache/dev-cpp/pangomm-2.24.0
new file mode 100644
index 000000000..984db917c
--- /dev/null
+++ b/metadata/cache/dev-cpp/pangomm-2.24.0
@@ -0,0 +1,22 @@
+>=x11-libs/pango-1.23.0[lib32?] >=dev-cpp/glibmm-2.14.1[lib32?] >=dev-cpp/cairomm-1.2.2[lib32?] !<dev-cpp/gtkmm-2.13:2.4[lib32?] dev-util/pkgconfig >=sys-apps/sed-4
+>=x11-libs/pango-1.23.0[lib32?] >=dev-cpp/glibmm-2.14.1[lib32?] >=dev-cpp/cairomm-1.2.2[lib32?] !<dev-cpp/gtkmm-2.13:2.4[lib32?]
+2.4
+mirror://gnome/sources/pangomm/2.24/pangomm-2.24.0.tar.bz2
+
+http://www.gtkmm.org
+LGPL-2.1
+C++ interface for pango
+~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd
+base eutils fdo-mime gnome.org gnome2 gnome2-utils libtool multilib multilib-native portability toolchain-funcs
+doc debug lib32
+
+
+
+2
+
+compile configure install postinst postrm preinst prepare setup unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-libs/atk-1.26.0 b/metadata/cache/dev-libs/atk-1.26.0
index 34442872c..5ff39c6b6 100644
--- a/metadata/cache/dev-libs/atk-1.26.0
+++ b/metadata/cache/dev-libs/atk-1.26.0
@@ -1,12 +1,12 @@
->=dev-libs/glib-2.5.7[lib32?] sys-devel/gettext >=dev-util/pkgconfig-0.9 doc? ( >=dev-util/gtk-doc-1 ) >=sys-apps/sed-4
->=dev-libs/glib-2.5.7[lib32?]
+>=dev-libs/glib-2[lib32?] >=dev-lang/perl-5 sys-devel/gettext >=dev-util/pkgconfig-0.9 doc? ( >=dev-util/gtk-doc-1 ) >=sys-apps/sed-4
+>=dev-libs/glib-2[lib32?]
 0
 mirror://gnome/sources/atk/1.26/atk-1.26.0.tar.bz2
 
 http://developer.gnome.org/projects/gap/
 LGPL-2
 GTK+ & GNOME Accessibility Toolkit
-
+~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
 base eutils fdo-mime gnome.org gnome2 gnome2-utils libtool multilib multilib-native portability toolchain-funcs
 doc debug lib32
 
diff --git a/metadata/cache/dev-libs/icu-4.2 b/metadata/cache/dev-libs/icu-4.2
new file mode 100644
index 000000000..ec6e9fa3b
--- /dev/null
+++ b/metadata/cache/dev-libs/icu-4.2
@@ -0,0 +1,22 @@
+doc? ( app-arch/unzip )
+
+0
+http://download.icu-project.org/files/icu4c/4.2/icu4c-4_2-src.tgz doc? ( http://download.icu-project.org/files/icu4c/4.2/icu4c-4_2-docs.zip )
+
+http://www.icu-project.org/ http://ibm.com/software/globalization/icu/
+BSD
+International Components for Unicode
+~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
+base eutils multilib multilib-native portability toolchain-funcs versionator
+debug doc examples lib32
+
+
+
+2
+
+compile configure install postinst postrm preinst prepare setup unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-python/libgnome-python-2.26.1 b/metadata/cache/dev-python/libgnome-python-2.26.1
index ca0c3ec3f..4bbd98671 100644
--- a/metadata/cache/dev-python/libgnome-python-2.26.1
+++ b/metadata/cache/dev-python/libgnome-python-2.26.1
@@ -6,7 +6,7 @@ test
 http://pygtk.org/
 LGPL-2.1
 Python bindings for essential GNOME libraries
-
+~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd
 alternatives autotools base eutils fdo-mime gnome-python-common gnome.org gnome2 gnome2-utils libtool multilib multilib-native portability python toolchain-funcs versionator
 examples debug lib32
 
diff --git a/metadata/cache/gnome-base/gnome-desktop-2.26.1 b/metadata/cache/gnome-base/gnome-desktop-2.26.1
index bfb218a2d..4208a10b5 100644
--- a/metadata/cache/gnome-base/gnome-desktop-2.26.1
+++ b/metadata/cache/gnome-base/gnome-desktop-2.26.1
@@ -6,7 +6,7 @@ mirror://gnome/sources/gnome-desktop/2.26/gnome-desktop-2.26.1.tar.bz2
 http://www.gnome.org/
 GPL-2 FDL-1.1 LGPL-2
 Libraries for the gnome desktop that are not part of the UI
-
+~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd
 base eutils fdo-mime gnome.org gnome2 gnome2-utils libtool multilib multilib-native portability toolchain-funcs
 doc debug lib32
 
diff --git a/metadata/cache/gnome-base/gnome-keyring-2.26.1 b/metadata/cache/gnome-base/gnome-keyring-2.26.1
index 42e6eb84e..f07e9b083 100644
--- a/metadata/cache/gnome-base/gnome-keyring-2.26.1
+++ b/metadata/cache/gnome-base/gnome-keyring-2.26.1
@@ -1,14 +1,14 @@
->=dev-libs/glib-2.16[lib32?] >=x11-libs/gtk+-2.6[lib32?] gnome-base/gconf[lib32?] >=sys-apps/dbus-1.0[lib32?] hal? ( >=sys-apps/hal-0.5.7[lib32?] ) pam? ( virtual/pam ) lib32? ( pam? ( sys-libs/pam[lib32] ) ) >=dev-libs/libgcrypt-1.2.2[lib32?] >=dev-libs/libtasn1-0.3.4[lib32?] valgrind? ( dev-util/valgrind ) sys-devel/gettext[lib32?] >=dev-util/intltool-0.35 >=dev-util/pkgconfig-0.9 doc? ( dev-util/gtk-doc ) >=sys-apps/sed-4 X? ( x11-base/xorg-server x11-apps/xhost )
->=dev-libs/glib-2.16[lib32?] >=x11-libs/gtk+-2.6[lib32?] gnome-base/gconf[lib32?] >=sys-apps/dbus-1.0[lib32?] hal? ( >=sys-apps/hal-0.5.7[lib32?] ) pam? ( virtual/pam ) lib32? ( pam? ( sys-libs/pam[lib32] ) ) >=dev-libs/libgcrypt-1.2.2[lib32?] >=dev-libs/libtasn1-0.3.4[lib32?] valgrind? ( dev-util/valgrind )
+>=dev-libs/glib-2.16[lib32?] >=x11-libs/gtk+-2.6[lib32?] gnome-base/gconf[lib32?] >=sys-apps/dbus-1.0[lib32?] hal? ( >=sys-apps/hal-0.5.7[lib32?] ) pam? ( virtual/pam ) lib32? ( pam? ( sys-libs/pam[lib32] ) ) >=dev-libs/libgcrypt-1.2.2[lib32?] >=dev-libs/libtasn1-1[lib32?] #valgrind? ( dev-util/valgrind ) sys-devel/gettext[lib32?] >=dev-util/intltool-0.35 >=dev-util/pkgconfig-0.9 doc? ( dev-util/gtk-doc-1.9 ) >=sys-apps/sed-4 X? ( x11-base/xorg-server x11-apps/xhost )
+>=dev-libs/glib-2.16[lib32?] >=x11-libs/gtk+-2.6[lib32?] gnome-base/gconf[lib32?] >=sys-apps/dbus-1.0[lib32?] hal? ( >=sys-apps/hal-0.5.7[lib32?] ) pam? ( virtual/pam ) lib32? ( pam? ( sys-libs/pam[lib32] ) ) >=dev-libs/libgcrypt-1.2.2[lib32?] >=dev-libs/libtasn1-1[lib32?] #valgrind? ( dev-util/valgrind )
 0
 mirror://gnome/sources/gnome-keyring/2.26/gnome-keyring-2.26.1.tar.bz2
 
 http://www.gnome.org/
 GPL-2 LGPL-2
 Password and keyring managing daemon
-
+~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd
 base eutils fdo-mime gnome.org gnome2 gnome2-utils libtool multilib multilib-native pam portability toolchain-funcs virtualx
-debug doc hal pam valgrind test debug X lib32
+debug doc hal pam test debug X lib32
 
 
 
diff --git a/metadata/cache/gnome-base/gnome-keyring-2.26.1-r1 b/metadata/cache/gnome-base/gnome-keyring-2.26.1-r1
new file mode 100644
index 000000000..f07e9b083
--- /dev/null
+++ b/metadata/cache/gnome-base/gnome-keyring-2.26.1-r1
@@ -0,0 +1,22 @@
+>=dev-libs/glib-2.16[lib32?] >=x11-libs/gtk+-2.6[lib32?] gnome-base/gconf[lib32?] >=sys-apps/dbus-1.0[lib32?] hal? ( >=sys-apps/hal-0.5.7[lib32?] ) pam? ( virtual/pam ) lib32? ( pam? ( sys-libs/pam[lib32] ) ) >=dev-libs/libgcrypt-1.2.2[lib32?] >=dev-libs/libtasn1-1[lib32?] #valgrind? ( dev-util/valgrind ) sys-devel/gettext[lib32?] >=dev-util/intltool-0.35 >=dev-util/pkgconfig-0.9 doc? ( dev-util/gtk-doc-1.9 ) >=sys-apps/sed-4 X? ( x11-base/xorg-server x11-apps/xhost )
+>=dev-libs/glib-2.16[lib32?] >=x11-libs/gtk+-2.6[lib32?] gnome-base/gconf[lib32?] >=sys-apps/dbus-1.0[lib32?] hal? ( >=sys-apps/hal-0.5.7[lib32?] ) pam? ( virtual/pam ) lib32? ( pam? ( sys-libs/pam[lib32] ) ) >=dev-libs/libgcrypt-1.2.2[lib32?] >=dev-libs/libtasn1-1[lib32?] #valgrind? ( dev-util/valgrind )
+0
+mirror://gnome/sources/gnome-keyring/2.26/gnome-keyring-2.26.1.tar.bz2
+
+http://www.gnome.org/
+GPL-2 LGPL-2
+Password and keyring managing daemon
+~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd
+base eutils fdo-mime gnome.org gnome2 gnome2-utils libtool multilib multilib-native pam portability toolchain-funcs virtualx
+debug doc hal pam test debug X lib32
+
+
+
+2
+
+compile configure install postinst postrm preinst prepare setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/gnome-base/gnome-menus-2.26.1 b/metadata/cache/gnome-base/gnome-menus-2.26.1
new file mode 100644
index 000000000..9c3e10ac5
--- /dev/null
+++ b/metadata/cache/gnome-base/gnome-menus-2.26.1
@@ -0,0 +1,22 @@
+>=dev-libs/glib-2.15.2[lib32?] python? ( >=dev-lang/python-2.4.4-r5 dev-python/pygtk ) sys-devel/gettext >=dev-util/pkgconfig-0.9 >=dev-util/intltool-0.40 >=sys-apps/sed-4
+>=dev-libs/glib-2.15.2[lib32?] python? ( >=dev-lang/python-2.4.4-r5 dev-python/pygtk )
+0
+mirror://gnome/sources/gnome-menus/2.26/gnome-menus-2.26.1.tar.bz2
+
+http://www.gnome.org
+GPL-2 LGPL-2
+The GNOME menu system, implementing the F.D.O cross-desktop spec
+~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd
+alternatives base eutils fdo-mime gnome.org gnome2 gnome2-utils libtool multilib multilib-native portability python toolchain-funcs
+debug python debug lib32
+
+
+
+2
+
+compile configure install postinst postrm preinst prepare setup unpack
+
+
+
+
+
diff --git a/metadata/cache/gnome-base/libgnome-2.26.0 b/metadata/cache/gnome-base/libgnome-2.26.0
index 63ef23db0..90bbeb7f9 100644
--- a/metadata/cache/gnome-base/libgnome-2.26.0
+++ b/metadata/cache/gnome-base/libgnome-2.26.0
@@ -1,14 +1,14 @@
 >=gnome-base/gconf-2[lib32?] >=dev-libs/glib-2.16[lib32?] >=gnome-base/gnome-vfs-2.5.3[lib32?] >=gnome-base/libbonobo-2.13[lib32?] >=dev-libs/popt-1.7[lib32?] esd? ( >=media-sound/esound-0.2.26 >=media-libs/audiofile-0.2.3 ) >=dev-util/intltool-0.40 >=dev-util/pkgconfig-0.17 doc? ( >=dev-util/gtk-doc-1 ) >=sys-apps/sed-4
 >=gnome-base/gconf-2[lib32?] >=dev-libs/glib-2.16[lib32?] >=gnome-base/gnome-vfs-2.5.3[lib32?] >=gnome-base/libbonobo-2.13[lib32?] >=dev-libs/popt-1.7[lib32?] esd? ( >=media-sound/esound-0.2.26 >=media-libs/audiofile-0.2.3 )
 0
-mirror://gnome/sources/libgnome/2.26/libgnome-2.26.0.tar.bz2
+mirror://gnome/sources/libgnome/2.26/libgnome-2.26.0.tar.bz2 branding? ( mirror://gentoo/gentoo-gdm-theme-r3.tar.bz2 )
 
 http://www.gnome.org/
 LGPL-2
 Essential Gnome Libraries
-
+~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd
 base eutils fdo-mime gnome.org gnome2 gnome2-utils libtool multilib multilib-native portability toolchain-funcs
-doc esd debug lib32
+branding doc esd debug lib32
 
 
 
diff --git a/metadata/cache/gnome-base/libgnomecanvas-2.26.0 b/metadata/cache/gnome-base/libgnomecanvas-2.26.0
index 909a403ce..2878b5b18 100644
--- a/metadata/cache/gnome-base/libgnomecanvas-2.26.0
+++ b/metadata/cache/gnome-base/libgnomecanvas-2.26.0
@@ -1,4 +1,4 @@
->=x11-libs/gtk+-2.13[lib32?] >=media-libs/libart_lgpl-2.3.8[lib32?] >=x11-libs/pango-1.0.1[lib32?] >=gnome-base/libglade-2[lib32?] sys-devel/gettext >=dev-util/intltool-0.35 >=dev-util/pkgconfig-0.18 doc? ( >=dev-util/gtk-doc-1 ) X? ( x11-base/xorg-server x11-apps/xhost ) >=sys-apps/sed-4
+>=x11-libs/gtk+-2.13[lib32?] >=media-libs/libart_lgpl-2.3.8[lib32?] >=x11-libs/pango-1.0.1[lib32?] >=gnome-base/libglade-2[lib32?] >=dev-lang/perl-5 sys-devel/gettext >=dev-util/intltool-0.35 >=dev-util/pkgconfig-0.18 doc? ( >=dev-util/gtk-doc-1 ) X? ( x11-base/xorg-server x11-apps/xhost ) >=sys-apps/sed-4
 >=x11-libs/gtk+-2.13[lib32?] >=media-libs/libart_lgpl-2.3.8[lib32?] >=x11-libs/pango-1.0.1[lib32?] >=gnome-base/libglade-2[lib32?]
 0
 mirror://gnome/sources/libgnomecanvas/2.26/libgnomecanvas-2.26.0.tar.bz2
@@ -6,7 +6,7 @@ mirror://gnome/sources/libgnomecanvas/2.26/libgnomecanvas-2.26.0.tar.bz2
 http://www.gnome.org/
 LGPL-2
 The Gnome 2 Canvas library
-
+~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd
 base eutils fdo-mime gnome.org gnome2 gnome2-utils libtool multilib multilib-native portability toolchain-funcs virtualx
 doc X debug lib32
 
diff --git a/metadata/cache/gnome-extra/bug-buddy-2.26.0 b/metadata/cache/gnome-extra/bug-buddy-2.26.0
index 5ebe5d875..274704bbf 100644
--- a/metadata/cache/gnome-extra/bug-buddy-2.26.0
+++ b/metadata/cache/gnome-extra/bug-buddy-2.26.0
@@ -1,12 +1,12 @@
->=gnome-base/libbonobo-2[lib32?] >=dev-libs/glib-2.16.0[lib32?] >=gnome-base/libgnome-2[lib32?] >=gnome-base/gnome-menus-2.11.1[lib32?] >=gnome-base/libgnomeui-2.5.92[lib32?] >=dev-libs/libxml2-2.4.6[lib32?] >=x11-libs/gtk+-2.14[lib32?] >=net-libs/libsoup-2.4[lib32?] >=gnome-base/libgtop-2.13.3[lib32?] eds? ( >=gnome-extra/evolution-data-server-1.3 ) >=gnome-base/gconf-2[lib32?] || ( dev-libs/elfutils dev-libs/libelf ) >=sys-devel/gdb-5.1 >=app-text/scrollkeeper-0.3.9 >=app-text/gnome-doc-utils-0.3.2 >=dev-util/pkgconfig-0.9 >=dev-util/intltool-0.40 >=sys-apps/sed-4
->=gnome-base/libbonobo-2[lib32?] >=dev-libs/glib-2.16.0[lib32?] >=gnome-base/libgnome-2[lib32?] >=gnome-base/gnome-menus-2.11.1[lib32?] >=gnome-base/libgnomeui-2.5.92[lib32?] >=dev-libs/libxml2-2.4.6[lib32?] >=x11-libs/gtk+-2.14[lib32?] >=net-libs/libsoup-2.4[lib32?] >=gnome-base/libgtop-2.13.3[lib32?] eds? ( >=gnome-extra/evolution-data-server-1.3 ) >=gnome-base/gconf-2[lib32?] || ( dev-libs/elfutils dev-libs/libelf ) >=sys-devel/gdb-5.1
+>=gnome-base/libbonobo-2[lib32?] >=dev-libs/glib-2.16.0[lib32?] >=gnome-base/gnome-menus-2.11.1[lib32?] >=dev-libs/libxml2-2.4.6[lib32?] >=x11-libs/gtk+-2.14.0[lib32?] >=net-libs/libsoup-2.4[lib32?] >=gnome-base/libgtop-2.13.3[lib32?] eds? ( >=gnome-extra/evolution-data-server-1.3 ) >=gnome-base/gconf-2[lib32?] || ( dev-libs/elfutils dev-libs/libelf ) >=sys-devel/gdb-5.1 >=app-text/gnome-doc-utils-0.3.2 >=dev-util/pkgconfig-0.9 >=dev-util/intltool-0.40 >=sys-apps/sed-4
+>=gnome-base/libbonobo-2[lib32?] >=dev-libs/glib-2.16.0[lib32?] >=gnome-base/gnome-menus-2.11.1[lib32?] >=dev-libs/libxml2-2.4.6[lib32?] >=x11-libs/gtk+-2.14.0[lib32?] >=net-libs/libsoup-2.4[lib32?] >=gnome-base/libgtop-2.13.3[lib32?] eds? ( >=gnome-extra/evolution-data-server-1.3 ) >=gnome-base/gconf-2[lib32?] || ( dev-libs/elfutils dev-libs/libelf ) >=sys-devel/gdb-5.1
 2
 mirror://gnome/sources/bug-buddy/2.26/bug-buddy-2.26.0.tar.bz2
 
 http://www.gnome.org/
 Ximian-logos GPL-2
 A graphical bug reporting tool
-
+~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
 base eutils fdo-mime gnome.org gnome2 gnome2-utils libtool multilib multilib-native portability toolchain-funcs
 eds debug lib32
 
diff --git a/metadata/cache/media-libs/gst-plugins-base-0.10.23 b/metadata/cache/media-libs/gst-plugins-base-0.10.23
new file mode 100644
index 000000000..7cb63242f
--- /dev/null
+++ b/metadata/cache/media-libs/gst-plugins-base-0.10.23
@@ -0,0 +1,22 @@
+>=dev-libs/glib-2.8[lib32?] >=media-libs/gstreamer-0.10.23[lib32?] >=dev-libs/liboil-0.3.14o[lib32?] !<media-libs/gst-plugins-bad-0.10.10 nls? ( >=sys-devel/gettext-0.11.5[lib32?] ) dev-util/pkgconfig >=sys-apps/sed-4
+>=dev-libs/glib-2.8[lib32?] >=media-libs/gstreamer-0.10.23[lib32?] >=dev-libs/liboil-0.3.14o[lib32?] !<media-libs/gst-plugins-bad-0.10.10
+0.10
+http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-0.10.23.tar.bz2
+
+http://gstreamer.sourceforge.net
+GPL-2
+Basepack of plugins for gstreamer
+~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd
+base eutils fdo-mime flag-o-matic gnome.org gnome2 gnome2-utils gst-plugins-base gst-plugins10 libtool multilib multilib-native portability toolchain-funcs
+nls debug lib32
+
+
+
+2
+
+compile configure install postinst postrm preinst prepare setup unpack
+
+
+
+
+
diff --git a/metadata/cache/media-libs/gstreamer-0.10.23 b/metadata/cache/media-libs/gstreamer-0.10.23
new file mode 100644
index 000000000..f19832652
--- /dev/null
+++ b/metadata/cache/media-libs/gstreamer-0.10.23
@@ -0,0 +1,22 @@
+>=dev-libs/glib-2.12:2[lib32?] dev-libs/libxml2[lib32?] >=dev-libs/check-0.9.2[lib32?] dev-util/pkgconfig nls? ( sys-devel/gettext[lib32?] )
+>=dev-libs/glib-2.12:2[lib32?] dev-libs/libxml2[lib32?] >=dev-libs/check-0.9.2[lib32?]
+0.10
+http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-0.10.23.tar.bz2
+
+http://gstreamer.sourceforge.net
+LGPL-2
+Streaming media framework
+~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd
+base eutils multilib multilib-native portability toolchain-funcs versionator
+nls test lib32
+
+
+
+2
+
+compile configure install postinst postrm preinst prepare setup unpack
+
+
+
+
+
diff --git a/metadata/cache/media-libs/sdl-image-1.2.6-r1 b/metadata/cache/media-libs/sdl-image-1.2.6-r1
deleted file mode 100644
index eb6a581b5..000000000
--- a/metadata/cache/media-libs/sdl-image-1.2.6-r1
+++ /dev/null
@@ -1,22 +0,0 @@
-sys-libs/zlib[lib32?] >=media-libs/libsdl-1.2.10[lib32?] png? ( >=media-libs/libpng-1.2.1[lib32?] ) jpeg? ( >=media-libs/jpeg-6b[lib32?] ) tiff? ( media-libs/tiff[lib32?] )
-sys-libs/zlib[lib32?] >=media-libs/libsdl-1.2.10[lib32?] png? ( >=media-libs/libpng-1.2.1[lib32?] ) jpeg? ( >=media-libs/jpeg-6b[lib32?] ) tiff? ( media-libs/tiff[lib32?] )
-0
-http://www.libsdl.org/projects/SDL_image/release/SDL_image-1.2.6.tar.gz
-
-http://www.libsdl.org/projects/SDL_image/index.html
-LGPL-2.1
-image file loading library
-alpha amd64 hppa ia64 mips ppc ppc64 sparc x86 ~x86-fbsd
-base eutils flag-o-matic multilib multilib-native portability toolchain-funcs
-gif jpeg tiff png lib32
-
-
-
-2
-
-compile configure install postinst postrm preinst prepare setup unpack
-
-
-
-
-
diff --git a/metadata/cache/net-libs/libproxy-0.2.3 b/metadata/cache/net-libs/libproxy-0.2.3
index 8790cb21d..901ebc2b8 100644
--- a/metadata/cache/net-libs/libproxy-0.2.3
+++ b/metadata/cache/net-libs/libproxy-0.2.3
@@ -1,14 +1,14 @@
-gnome? ( x11-libs/libX11[lib32?] x11-libs/libXmu[lib32?] gnome-base/gconf[lib32?] ) kde? ( x11-libs/libX11[lib32?] x11-libs/libXmu[lib32?] ) networkmanager? ( net-misc/networkmanager[lib32?] ) python? ( >=dev-lang/python-2.5[lib32?] ) webkit? ( net-libs/webkit-gtk[lib32?] ) >=dev-util/pkgconfig-0.19 =sys-devel/automake-1.10* >=sys-devel/autoconf-2.61 sys-devel/libtool
-gnome? ( x11-libs/libX11[lib32?] x11-libs/libXmu[lib32?] gnome-base/gconf[lib32?] ) kde? ( x11-libs/libX11[lib32?] x11-libs/libXmu[lib32?] ) networkmanager? ( net-misc/networkmanager[lib32?] ) python? ( >=dev-lang/python-2.5[lib32?] ) webkit? ( net-libs/webkit-gtk[lib32?] )
+gnome? ( x11-libs/libX11[lib32?] x11-libs/libXmu[lib32?] gnome-base/gconf[lib32?] ) kde? ( x11-libs/libX11[lib32?] x11-libs/libXmu[lib32?] ) networkmanager? ( net-misc/networkmanager[lib32?] ) python? ( >=dev-lang/python-2.5[lib32?] ) webkit? ( net-libs/webkit-gtk[lib32?] ) xulrunner? ( net-libs/xulrunner[lib32?] ) >=dev-util/pkgconfig-0.19 =sys-devel/automake-1.10* >=sys-devel/autoconf-2.61 sys-devel/libtool
+gnome? ( x11-libs/libX11[lib32?] x11-libs/libXmu[lib32?] gnome-base/gconf[lib32?] ) kde? ( x11-libs/libX11[lib32?] x11-libs/libXmu[lib32?] ) networkmanager? ( net-misc/networkmanager[lib32?] ) python? ( >=dev-lang/python-2.5[lib32?] ) webkit? ( net-libs/webkit-gtk[lib32?] ) xulrunner? ( net-libs/xulrunner[lib32?] )
 0
 http://libproxy.googlecode.com/files/libproxy-0.2.3.tar.gz
 
 http://code.google.com/p/libproxy/
 LGPL-2.1
 Library for automatic proxy configuration management
-~amd64 ~x86
+~alpha ~amd64 ~hppa ~x86
 alternatives autotools base eutils libtool multilib multilib-native portability python toolchain-funcs
-gnome kde networkmanager python webkit lib32
+gnome kde networkmanager python webkit xulrunner lib32
 
 
 
diff --git a/metadata/cache/net-wireless/bluez-4.32 b/metadata/cache/net-wireless/bluez-4.32
deleted file mode 100644
index b43840b5c..000000000
--- a/metadata/cache/net-wireless/bluez-4.32
+++ /dev/null
@@ -1,22 +0,0 @@
-sys-devel/flex dev-util/pkgconfig doc? ( dev-util/gtk-doc ) alsa? ( media-libs/alsa-lib[lib32?] ) gstreamer? ( >=media-libs/gstreamer-0.10[lib32?] >=media-libs/gst-plugins-base-0.10[lib32?] ) usb? ( dev-libs/libusb[lib32?] ) cups? ( net-print/cups[lib32?] ) sys-fs/udev[lib32?] dev-libs/glib[lib32?] sys-apps/dbus[lib32?] media-libs/libsndfile[lib32?] >=dev-libs/libnl-1.1[lib32?] !net-wireless/bluez-libs !net-wireless/bluez-utils =sys-devel/automake-1.10* >=sys-devel/autoconf-2.61 sys-devel/libtool
-alsa? ( media-libs/alsa-lib[lib32?] ) gstreamer? ( >=media-libs/gstreamer-0.10[lib32?] >=media-libs/gst-plugins-base-0.10[lib32?] ) usb? ( dev-libs/libusb[lib32?] ) cups? ( net-print/cups[lib32?] ) sys-fs/udev[lib32?] dev-libs/glib[lib32?] sys-apps/dbus[lib32?] media-libs/libsndfile[lib32?] >=dev-libs/libnl-1.1[lib32?] !net-wireless/bluez-libs !net-wireless/bluez-utils sys-auth/pambase[consolekit]
-0
-mirror://kernel/linux/bluetooth/bluez-4.32.tar.gz
-
-http://bluez.sourceforge.net/
-GPL-2 LGPL-2.1
-Bluetooth Tools and System Daemons for Linux
-~amd64 ~arm ~hppa ~ppc ~ppc64 ~sh ~sparc ~x86
-autotools base eutils libtool multilib multilib-native portability toolchain-funcs
-alsa cups debug doc gstreamer old-daemons test-programs usb lib32
-
-
-
-2
-
-compile configure install postinst postrm preinst prepare setup unpack
-
-
-
-
-
diff --git a/metadata/cache/net-wireless/bluez-4.36 b/metadata/cache/net-wireless/bluez-4.38
index 3432bab53..14968e0c8 100644
--- a/metadata/cache/net-wireless/bluez-4.36
+++ b/metadata/cache/net-wireless/bluez-4.38
@@ -1,7 +1,7 @@
 sys-devel/flex >=dev-util/pkgconfig-0.20 doc? ( dev-util/gtk-doc ) alsa? ( media-libs/alsa-lib[lib32?] ) gstreamer? ( >=media-libs/gstreamer-0.10[lib32?] >=media-libs/gst-plugins-base-0.10[lib32?] ) usb? ( dev-libs/libusb[lib32?] ) cups? ( net-print/cups[lib32?] ) sys-fs/udev[lib32?] dev-libs/glib[lib32?] sys-apps/dbus[lib32?] media-libs/libsndfile[lib32?] >=dev-libs/libnl-1.1[lib32?] !net-wireless/bluez-libs !net-wireless/bluez-utils =sys-devel/automake-1.10* >=sys-devel/autoconf-2.61 sys-devel/libtool
 alsa? ( media-libs/alsa-lib[lib32?] ) gstreamer? ( >=media-libs/gstreamer-0.10[lib32?] >=media-libs/gst-plugins-base-0.10[lib32?] ) usb? ( dev-libs/libusb[lib32?] ) cups? ( net-print/cups[lib32?] ) sys-fs/udev[lib32?] dev-libs/glib[lib32?] sys-apps/dbus[lib32?] media-libs/libsndfile[lib32?] >=dev-libs/libnl-1.1[lib32?] !net-wireless/bluez-libs !net-wireless/bluez-utils sys-auth/pambase[consolekit]
 0
-mirror://kernel/linux/bluetooth/bluez-4.36.tar.gz
+mirror://kernel/linux/bluetooth/bluez-4.38.tar.gz
 
 http://bluez.sourceforge.net/
 GPL-2 LGPL-2.1
diff --git a/metadata/cache/sys-apps/hal-0.5.12_rc1-r3 b/metadata/cache/sys-apps/hal-0.5.12_rc1-r3
new file mode 100644
index 000000000..295d046b6
--- /dev/null
+++ b/metadata/cache/sys-apps/hal-0.5.12_rc1-r3
@@ -0,0 +1,22 @@
+>=dev-libs/dbus-glib-0.61[lib32?] >=dev-libs/glib-2.14[lib32?] >=dev-libs/expat-1.95.8[lib32?] >=dev-libs/libusb-0.1.10a[lib32?] >=sys-apps/pciutils-2.2.7-r1[lib32?] >=dev-util/gperf-3.0.3 sys-apps/usbutils virtual/eject amd64? ( >=sys-apps/dmidecode-2.7 ) dell? ( >=sys-libs/libsmbios-0.13.4 ) disk-partition? ( >=sys-apps/parted-1.8.0 ) ia64? ( >=sys-apps/dmidecode-2.7 ) kernel_linux? ( >=sys-fs/udev-117[lib32?] >=sys-apps/util-linux-2.13 >=sys-kernel/linux-headers-2.6.19 crypt? ( >=sys-fs/cryptsetup-1.0.5 ) ) kernel_FreeBSD? ( >=dev-libs/libvolume_id-0.77 ) x86? ( >=sys-apps/dmidecode-2.7 ) selinux? ( sys-libs/libselinux sec-policy/selinux-hal ) consolekit? ( sys-auth/consolekit[policykit=] ) policykit? ( sys-auth/consolekit[policykit] sys-auth/policykit[pam] ) dev-util/pkgconfig >=dev-util/intltool-0.35 doc? ( app-text/xmlto dev-libs/libxml2 dev-util/gtk-doc app-text/docbook-sgml-utils ) kernel_linux? ( virtual/linux-sources ) =sys-devel/automake-1.10* >=sys-devel/autoconf-2.61 sys-devel/libtool
+>=dev-libs/dbus-glib-0.61[lib32?] >=dev-libs/glib-2.14[lib32?] >=dev-libs/expat-1.95.8[lib32?] >=dev-libs/libusb-0.1.10a[lib32?] >=sys-apps/pciutils-2.2.7-r1[lib32?] >=dev-util/gperf-3.0.3 sys-apps/usbutils virtual/eject amd64? ( >=sys-apps/dmidecode-2.7 ) dell? ( >=sys-libs/libsmbios-0.13.4 ) disk-partition? ( >=sys-apps/parted-1.8.0 ) ia64? ( >=sys-apps/dmidecode-2.7 ) kernel_linux? ( >=sys-fs/udev-117[lib32?] >=sys-apps/util-linux-2.13 >=sys-kernel/linux-headers-2.6.19 crypt? ( >=sys-fs/cryptsetup-1.0.5 ) ) kernel_FreeBSD? ( >=dev-libs/libvolume_id-0.77 ) x86? ( >=sys-apps/dmidecode-2.7 ) selinux? ( sys-libs/libselinux sec-policy/selinux-hal ) consolekit? ( sys-auth/consolekit[policykit=] ) policykit? ( sys-auth/consolekit[policykit] sys-auth/policykit[pam] )
+0
+http://hal.freedesktop.org/releases/hal-0.5.12rc1.tar.bz2 http://dev.gentoo.org/~dang/files/hal-0.5.12rc1-gentoo-patches-4.tar.bz2
+
+http://www.freedesktop.org/wiki/Software/hal
+|| ( GPL-2 AFL-2.0 )
+Hardware Abstraction Layer
+~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd
+autotools base eutils flag-o-matic libtool linux-info multilib multilib-native portability toolchain-funcs versionator
+X acpi apm crypt consolekit debug dell disk-partition doc laptop policykit selinux kernel_linux kernel_FreeBSD lib32
+
+|| ( >=app-misc/hal-info-20081219 ) !gnome-extra/hal-device-manager laptop? ( >=sys-power/pm-utils-0.99.3 )
+
+2
+
+compile configure install postinst postrm preinst prepare setup unpack
+
+
+
+
+
diff --git a/metadata/cache/sys-apps/hal-0.5.12_rc1-r4 b/metadata/cache/sys-apps/hal-0.5.12_rc1-r4
new file mode 100644
index 000000000..576fcbb94
--- /dev/null
+++ b/metadata/cache/sys-apps/hal-0.5.12_rc1-r4
@@ -0,0 +1,22 @@
+>=dev-libs/dbus-glib-0.61[lib32?] >=dev-libs/glib-2.14[lib32?] >=dev-libs/expat-1.95.8[lib32?] >=dev-libs/libusb-0.1.10a[lib32?] >=sys-apps/pciutils-2.2.7-r1[lib32?] >=dev-util/gperf-3.0.3 sys-apps/usbutils virtual/eject amd64? ( >=sys-apps/dmidecode-2.7 ) dell? ( >=sys-libs/libsmbios-0.13.4 ) disk-partition? ( >=sys-apps/parted-1.8.0 ) ia64? ( >=sys-apps/dmidecode-2.7 ) kernel_linux? ( >=sys-fs/udev-117[lib32?] >=sys-apps/util-linux-2.13 >=sys-kernel/linux-headers-2.6.19 crypt? ( >=sys-fs/cryptsetup-1.0.5 ) ) kernel_FreeBSD? ( >=dev-libs/libvolume_id-0.77 ) x86? ( >=sys-apps/dmidecode-2.7 ) selinux? ( sys-libs/libselinux sec-policy/selinux-hal ) consolekit? ( sys-auth/consolekit[policykit=] ) policykit? ( sys-auth/consolekit[policykit] sys-auth/policykit[pam] ) dev-util/pkgconfig >=dev-util/intltool-0.35 doc? ( app-text/xmlto dev-libs/libxml2 dev-util/gtk-doc app-text/docbook-sgml-utils ) kernel_linux? ( virtual/linux-sources ) =sys-devel/automake-1.10* >=sys-devel/autoconf-2.61 sys-devel/libtool
+>=dev-libs/dbus-glib-0.61[lib32?] >=dev-libs/glib-2.14[lib32?] >=dev-libs/expat-1.95.8[lib32?] >=dev-libs/libusb-0.1.10a[lib32?] >=sys-apps/pciutils-2.2.7-r1[lib32?] >=dev-util/gperf-3.0.3 sys-apps/usbutils virtual/eject amd64? ( >=sys-apps/dmidecode-2.7 ) dell? ( >=sys-libs/libsmbios-0.13.4 ) disk-partition? ( >=sys-apps/parted-1.8.0 ) ia64? ( >=sys-apps/dmidecode-2.7 ) kernel_linux? ( >=sys-fs/udev-117[lib32?] >=sys-apps/util-linux-2.13 >=sys-kernel/linux-headers-2.6.19 crypt? ( >=sys-fs/cryptsetup-1.0.5 ) ) kernel_FreeBSD? ( >=dev-libs/libvolume_id-0.77 ) x86? ( >=sys-apps/dmidecode-2.7 ) selinux? ( sys-libs/libselinux sec-policy/selinux-hal ) consolekit? ( sys-auth/consolekit[policykit=] ) policykit? ( sys-auth/consolekit[policykit] sys-auth/policykit[pam] )
+0
+http://hal.freedesktop.org/releases/hal-0.5.12rc1.tar.bz2 http://dev.gentoo.org/~dang/files/hal-0.5.12rc1-gentoo-patches-5.tar.bz2
+
+http://www.freedesktop.org/wiki/Software/hal
+|| ( GPL-2 AFL-2.0 )
+Hardware Abstraction Layer
+~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd
+autotools base eutils flag-o-matic libtool linux-info multilib multilib-native portability toolchain-funcs versionator
+X acpi apm crypt consolekit debug dell disk-partition doc laptop policykit selinux kernel_linux kernel_FreeBSD lib32
+
+|| ( >=app-misc/hal-info-20081219 ) !gnome-extra/hal-device-manager laptop? ( >=sys-power/pm-utils-0.99.3 )
+
+2
+
+compile configure install postinst postrm preinst prepare setup unpack
+
+
+
+
+
diff --git a/metadata/cache/sys-libs/slang-2.1.3-r1 b/metadata/cache/sys-libs/slang-2.1.3-r1
deleted file mode 100644
index 9560ff7be..000000000
--- a/metadata/cache/sys-libs/slang-2.1.3-r1
+++ /dev/null
@@ -1,22 +0,0 @@
-sys-libs/ncurses pcre? ( dev-libs/libpcre[lib32?] ) png? ( media-libs/libpng[lib32?] ) cjk? ( dev-libs/oniguruma[lib32?] ) readline? ( sys-libs/readline[lib32?] ) !=sys-libs/slang-2.1.2
-sys-libs/ncurses pcre? ( dev-libs/libpcre[lib32?] ) png? ( media-libs/libpng[lib32?] ) cjk? ( dev-libs/oniguruma[lib32?] ) readline? ( sys-libs/readline[lib32?] )
-0
-ftp://ftp.fu-berlin.de/pub/unix/misc/slang/v2.1/slang-2.1.3.tar.bz2
-
-http://www.s-lang.org
-GPL-2
-a portable programmer's library designed to allow a developer to create robust portable software.
-alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd
-base eutils multilib multilib-native portability toolchain-funcs
-cjk pcre png readline lib32
-
-
-
-2
-
-compile configure install postinst postrm preinst prepare setup unpack
-
-
-
-
-
diff --git a/metadata/cache/sys-libs/slang-2.1.4 b/metadata/cache/sys-libs/slang-2.1.4
index ba06bc136..3cc4510fe 100644
--- a/metadata/cache/sys-libs/slang-2.1.4
+++ b/metadata/cache/sys-libs/slang-2.1.4
@@ -1,4 +1,4 @@
-sys-libs/ncurses[-minimal,lib32?] pcre? ( dev-libs/libpcre[lib32?] ) png? ( media-libs/libpng[lib32?] ) cjk? ( dev-libs/oniguruma[lib32?] ) readline? ( sys-libs/readline[lib32?] ) !=sys-libs/slang-2.1.2
+sys-libs/ncurses[-minimal,lib32?] pcre? ( dev-libs/libpcre[lib32?] ) png? ( media-libs/libpng[lib32?] ) cjk? ( dev-libs/oniguruma[lib32?] ) readline? ( sys-libs/readline[lib32?] )
 sys-libs/ncurses[-minimal,lib32?] pcre? ( dev-libs/libpcre[lib32?] ) png? ( media-libs/libpng[lib32?] ) cjk? ( dev-libs/oniguruma[lib32?] ) readline? ( sys-libs/readline[lib32?] )
 0
 ftp://ftp.fu-berlin.de/pub/unix/misc/slang/v2.1/slang-2.1.4.tar.bz2
@@ -6,7 +6,7 @@ ftp://ftp.fu-berlin.de/pub/unix/misc/slang/v2.1/slang-2.1.4.tar.bz2
 http://www.s-lang.org
 GPL-2
 a portable programmer's library designed to allow a developer to create robust portable software.
-~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd
+alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd
 base eutils multilib multilib-native portability toolchain-funcs
 cjk pcre png readline lib32
 
diff --git a/metadata/cache/x11-libs/pango-1.24.1 b/metadata/cache/x11-libs/pango-1.24.1
index 046e81021..df93a5832 100644
--- a/metadata/cache/x11-libs/pango-1.24.1
+++ b/metadata/cache/x11-libs/pango-1.24.1
@@ -6,7 +6,7 @@ mirror://gnome/sources/pango/1.24/pango-1.24.1.tar.bz2
 http://www.pango.org/
 LGPL-2 FTL
 Text rendering and layout library
-
+~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
 autotools base eutils fdo-mime gnome.org gnome2 gnome2-utils libtool multilib multilib-native portability toolchain-funcs
 X debug doc debug lib32
 
diff --git a/net-libs/libproxy/Manifest b/net-libs/libproxy/Manifest
index 6aa7fdbe8..393648330 100644
--- a/net-libs/libproxy/Manifest
+++ b/net-libs/libproxy/Manifest
@@ -1,5 +1,6 @@
 AUX libproxy-0.2.3-fix-as-needed-problem.patch 570 RMD160 1ebdc1552919bea0ad62108e1ac3fc60a3b70a8c SHA1 c453c230a787ac9f7f9803329962a807fb2a0b14 SHA256 9b00f329db1ad6b398be47cee0eb32e34052bc2b589b7e57b92023c7b33c609e
 AUX libproxy-0.2.3-fix-dbus-includes.patch 1387 RMD160 ae39dca04f17f58f1a0c36208ceed8190af82d95 SHA1 f43e6d39ecaf7847c3f11255f56d205383e982e6 SHA256 31be2886acd191a80d86a75c9aec090998dd2b21ec23e64d0cda51e73b71d60e
+AUX libproxy-0.2.3-fix-libxul-cflags.patch 960 RMD160 16c5c40040fb81821914ff18e79560d828d57693 SHA1 08c3d1e983d313969905c1c40bf5f3e680020283 SHA256 5b91ca5403f9827d6961b31caf1a730f603e54b209b755514411a4505ef838ec
 AUX libproxy-0.2.3-fix-python-automagic.patch 858 RMD160 ec182cb70c84ffbf7faa8a1ff8f68b95b2e57155 SHA1 842170203e449b6fcd704fa1183956d1a079bab8 SHA256 0d21b238b2476920c4fcdcff238526ddac4ab3022d359a918aab0e3315f105a4
 DIST libproxy-0.2.3.tar.gz 378773 RMD160 c86c4f8403cb879380e101d074af469c960b5c1c SHA1 2b2b00a179740548035a1145bbae600db9b0a2ce SHA256 59ded160b3547d29e37cc9d06359f7f37d94112214e4532430cd65e704c1339a
-EBUILD libproxy-0.2.3.ebuild 1855 RMD160 7a917929a44be3ead76d1c33a5bfda55ea2a1a33 SHA1 1a3652410498f20d7460796631276d2d575c2123 SHA256 933f45d487c1c43efae3c5871722ff9364dc92050fcb111168c0f130b689103f
+EBUILD libproxy-0.2.3.ebuild 1960 RMD160 69a9e8efdd37a09f1d28f33b4ec80072d816593e SHA1 675b4a05c79d193ef5a09b068a03bd0c596fa461 SHA256 4a0f8cde1b11b8a076310a49b44fd96a7d8b7b4f89ce08456445cf309c43b7a4
diff --git a/net-libs/libproxy/files/libproxy-0.2.3-fix-libxul-cflags.patch b/net-libs/libproxy/files/libproxy-0.2.3-fix-libxul-cflags.patch
new file mode 100644
index 000000000..0ee34f040
--- /dev/null
+++ b/net-libs/libproxy/files/libproxy-0.2.3-fix-libxul-cflags.patch
@@ -0,0 +1,26 @@
+ configure.ac |    5 +++--
+ 1 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index bfea453..844896b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -23,6 +23,7 @@ PKG_CHECK_MODULES(mozjs, xulrunner-js, have_mozjs=yes,
+ PKG_CHECK_MODULES(NetworkManager, NetworkManager, 
+ 					have_networkmanager=yes, have_networkmanager=no)
+ PKG_CHECK_MODULES(dbus, dbus-1, have_dbus=yes, have_dbus=no)
++PKG_CHECK_MODULES(libxul_unstable, libxul-unstable, have_mozjs=yes, have_mozjs=no)
+ 
+ # Environmental Variable
+ AC_ARG_WITH([envvar],
+@@ -117,8 +118,8 @@ AC_ARG_WITH([mozjs],
+             [test x$have_mozjs == xyes && with_mozjs=yes])
+ if test x$with_mozjs = xyes; then
+ 	if test x$have_mozjs == xyes; then
+-		MOZJS_CFLAGS="$mozjs_CFLAGS"
+-		MOZJS_LIBS="$mozjs_LIBS"
++		MOZJS_CFLAGS="$mozjs_CFLAGS $libxul_unstable_CFLAGS"
++		MOZJS_LIBS="$mozjs_LIBS $libxul_unstable_LIBS"
+ 		AC_SUBST(MOZJS_CFLAGS)
+ 		AC_SUBST(MOZJS_LIBS)
+ 	else
diff --git a/net-libs/libproxy/libproxy-0.2.3.ebuild b/net-libs/libproxy/libproxy-0.2.3.ebuild
index 8dda710cf..776a22ffc 100644
--- a/net-libs/libproxy/libproxy-0.2.3.ebuild
+++ b/net-libs/libproxy/libproxy-0.2.3.ebuild
@@ -1,7 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
-EAPI=2
+
+EAPI="2"
 
 inherit autotools eutils python multilib-native
 
@@ -11,8 +12,8 @@ SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gnome kde networkmanager python webkit"
+KEYWORDS="~alpha ~amd64 ~hppa ~x86"
+IUSE="gnome kde networkmanager python webkit xulrunner"
 
 RDEPEND="
 	gnome? ( 
@@ -25,20 +26,24 @@ RDEPEND="
 	networkmanager? ( net-misc/networkmanager[lib32?] )
 	python? ( >=dev-lang/python-2.5[lib32?] )
 	webkit? ( net-libs/webkit-gtk[lib32?] )
+	xulrunner? ( net-libs/xulrunner[lib32?] )
 "
 DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.19"
 
-# dang: disable xulrunner until someone has time to figure out how to make it
-# actually build.
 src_prepare() {
 	# http://code.google.com/p/libproxy/issues/detail?id=23
 	epatch "${FILESDIR}/${P}-fix-dbus-includes.patch"
+
 	# http://code.google.com/p/libproxy/issues/detail?id=24
 	epatch "${FILESDIR}/${P}-fix-python-automagic.patch"
+
 	# http://code.google.com/p/libproxy/issues/detail?id=25
 	epatch "${FILESDIR}/${P}-fix-as-needed-problem.patch"
 
+	# http://bugs.gentoo.org/show_bug.cgi?id=259178
+	epatch "${FILESDIR}/${P}-fix-libxul-cflags.patch"
+
 	eautoreconf
 }
 
@@ -46,10 +51,10 @@ multilib-native_src_configure_internal() {
 	econf --with-envvar \
 		--with-file \
 		--disable-static \
-		--without-mozjs \
 		$(use_with gnome) \
 		$(use_with kde) \
 		$(use_with webkit) \
+		$(use_with xulrunner mozjs) \
 		$(use_with networkmanager) \
 		$(use_with python)
 }
@@ -67,5 +72,5 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-	python_mod_cleanup "$(python_get_sitedir)/${PN}.py"
+	python_mod_cleanup /usr/$(get_libdir)/python*/site-packages/${PN}.py
 }
diff --git a/sys-apps/hal/Manifest b/sys-apps/hal/Manifest
index 92f46570f..3b3f99782 100644
--- a/sys-apps/hal/Manifest
+++ b/sys-apps/hal/Manifest
@@ -63,9 +63,11 @@ DIST hal-0.5.11-gentoo-patches-5.tar.bz2 8890 RMD160 ffa1ae251baa8caff74f343f985
 DIST hal-0.5.11.tar.bz2 1281251 RMD160 741cfe82f0bc2d67106b24cfe526a754ab36e45f SHA1 1ddb7895d2ddc2464b553ad11f7ba38860478ae9 SHA256 78a2621209b2db4d71f25fe3a7df7b7dd4b5e866e9c699454b78e611def065cf
 DIST hal-0.5.12rc1-gentoo-patches-1.tar.bz2 3828 RMD160 3c313dd63c4f7b81bb61701222252086aeeafc1c SHA1 11d74bde76f6b03daa0afa03d3d7ccb83f8d6e27 SHA256 0f182436469223e6a2b06cfe2f2fc893f17c351075b259977f217756962a05dd
 DIST hal-0.5.12rc1-gentoo-patches-3.tar.bz2 3741 RMD160 93fbb71a9f7a0fa42f44ad4e032d00acf622447f SHA1 ccd33490e65e4ba134c88c3e1f7f7f4ba61ce7c7 SHA256 5951489f2241ae0cef1ac668fe024f97c9cdc651dac841dd18cc796073205085
+DIST hal-0.5.12rc1-gentoo-patches-4.tar.bz2 4167 RMD160 da9770ac03fe765522647f229e1b14448fd3de25 SHA1 ad27d7271a42ec5ac4c7e5935ad3cdcc719ebb3e SHA256 fd95635a3db2f7dca516b0619ca6593cf252c86dc386688a61ca57a2b4bfe3cf
 DIST hal-0.5.12rc1-gentoo-patches-5.tar.bz2 4014 RMD160 dab46cd7efb0099be1961970261ec03ea3d6291a SHA1 55a4171b6df37f89df7b9baa0a9f6c19ccb4137a SHA256 339030bf17d4fc5eb4fe42ac9b2267e4bf2a6c1f27267f0666e1f4b18e59dfae
 DIST hal-0.5.12rc1.tar.bz2 1160384 RMD160 dce660d600c18bfd910814516b675f141d369824 SHA1 1dc809e98cea0fc2f183958da24921c2eaf55edc SHA256 eeeb438dcc2a58288ed3def8c1d0076ca16f35b54d501c46f96e89da24fe38f4
 EBUILD hal-0.5.11-r8.ebuild 9002 RMD160 3e806382bdee1b294e9cd4961280c0e440aebbea SHA1 37180c316348135dec5f4a9b25bb82dd7372ea18 SHA256 91b74e7c06b41ad17d802991f14249fd50b7b41123357584c97d4ed0b27a3a94
 EBUILD hal-0.5.12_rc1-r2.ebuild 9457 RMD160 039593dd789bf8b84566aea391e64d3e859f4456 SHA1 221f849a138cd3e53f87581813607f11beea8497 SHA256 90cfce72a5873ef353febc0faa6a61b6eec537b7d67ee3abe0caee894733be1c
+EBUILD hal-0.5.12_rc1-r3.ebuild 9558 RMD160 3d33e08d70225c2d30b45a6649050638503411fb SHA1 10b4dba2bffd800fbea0e7ddf6c5f150e0fc51b5 SHA256 3129df8ad2f2adb4f22ea2e7008cbfca5e9615f827163d0fc02081b7f11b791a
 EBUILD hal-0.5.12_rc1-r4.ebuild 9591 RMD160 d8a226d5febaf9cef15955f86d682d8f62b8ce78 SHA1 bb44fe578d0a366f9cc625e61fa26ee498984dae SHA256 c849455968cd90da7c5b4770716b6c30a03cb6573d69c7bfca958af1ac07510e
 EBUILD hal-0.5.12_rc1.ebuild 9022 RMD160 d0e3ff058cfb4b37dea6c43fb63ed3f6fc5117e4 SHA1 78d3df2c0578c497eb782329d8cc68569dee3872 SHA256 e9d128e2ba1cab4ba98bac4f628842658fb142bfefaaac88b31f1226f76b8d37
diff --git a/sys-apps/hal/hal-0.5.12_rc1-r3.ebuild b/sys-apps/hal/hal-0.5.12_rc1-r3.ebuild
new file mode 100644
index 000000000..90ac89815
--- /dev/null
+++ b/sys-apps/hal/hal-0.5.12_rc1-r3.ebuild
@@ -0,0 +1,307 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.12_rc1.ebuild,v 1.1 2009/03/08 22:03:59 chainsaw Exp $
+
+EAPI="2"
+
+inherit eutils linux-info autotools flag-o-matic multilib-native
+
+PATCH_VERSION="4"
+
+MY_P=${P/_/}
+S=${WORKDIR}/${MY_P}
+PATCHNAME="${MY_P}-gentoo-patches-${PATCH_VERSION}"
+DESCRIPTION="Hardware Abstraction Layer"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/hal"
+SRC_URI="http://hal.freedesktop.org/releases/${MY_P}.tar.bz2
+		http://dev.gentoo.org/~dang/files/${PATCHNAME}.tar.bz2"
+
+LICENSE="|| ( GPL-2 AFL-2.0 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+
+KERNEL_IUSE="kernel_linux kernel_FreeBSD"
+IUSE="X acpi apm crypt consolekit debug dell disk-partition doc laptop policykit
+selinux ${KERNEL_IUSE}"
+
+RDEPEND=">=dev-libs/dbus-glib-0.61[lib32?]
+		 >=dev-libs/glib-2.14[lib32?]
+		 >=dev-libs/expat-1.95.8[lib32?]
+		 >=dev-libs/libusb-0.1.10a[lib32?]
+		 >=sys-apps/pciutils-2.2.7-r1[lib32?]
+		 >=dev-util/gperf-3.0.3
+		   sys-apps/usbutils
+		   virtual/eject
+		 amd64? ( >=sys-apps/dmidecode-2.7 )
+		 dell? ( >=sys-libs/libsmbios-0.13.4 )
+		 disk-partition? ( >=sys-apps/parted-1.8.0 )
+		 ia64? ( >=sys-apps/dmidecode-2.7 )
+		 kernel_linux?	(
+							>=sys-fs/udev-117[lib32?]
+							>=sys-apps/util-linux-2.13
+							>=sys-kernel/linux-headers-2.6.19
+							crypt?	( >=sys-fs/cryptsetup-1.0.5 )
+						)
+		 kernel_FreeBSD? ( >=dev-libs/libvolume_id-0.77 )
+		 x86? ( >=sys-apps/dmidecode-2.7 )
+		 selinux? ( sys-libs/libselinux sec-policy/selinux-hal )
+		 consolekit?    (
+		 					sys-auth/consolekit[policykit=]
+						)
+		 policykit?     (
+		 					sys-auth/consolekit[policykit]
+		 					sys-auth/policykit[pam]
+						)"
+DEPEND="${RDEPEND}
+		dev-util/pkgconfig
+		>=dev-util/intltool-0.35
+		doc?	(
+					app-text/xmlto
+					dev-libs/libxml2
+					dev-util/gtk-doc
+					app-text/docbook-sgml-utils
+				)"
+PDEPEND="|| (
+	>=app-misc/hal-info-20081219 )
+	!gnome-extra/hal-device-manager
+	laptop? ( >=sys-power/pm-utils-0.99.3 )"
+
+## HAL Daemon drops privledges so we need group access to read disks
+HALDAEMON_GROUPS_LINUX="haldaemon,plugdev,disk,cdrom,cdrw,floppy,usb"
+HALDAEMON_GROUPS_FREEBSD="haldaemon,plugdev,operator"
+
+function check_hotplug_net() {
+	local CONFIG_CHECK="~HOTPLUG ~NET"
+	local WARNING_HOTPLUG="CONFIG_HOTPLUG:\tis not set (required for HAL)\n"
+	local WARNING_NET="CONFIG_NET:\tis not set (required for HAL)\n"
+	check_extra_config
+}
+
+function check_inotify() {
+	local CONFIG_CHECK="~INOTIFY_USER"
+	local WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER:\tis not set (required for HAL)\n"
+	check_extra_config
+}
+
+function check_acpi_proc() {
+	local CONFIG_CHECK="~ACPI_PROCFS ~ACPI_PROC_EVENT"
+	local WARNING_ACPI_PROCFS="CONFIG_ACPI_PROCFS:\tis not set (required for HAL)\n"
+	local WARNING_ACPI_PROC_EVENT="CONFIG_ACPI_PROC_EVENT:\tis not set (required for HAL)\n"
+	check_extra_config
+}
+
+pkg_setup() {
+	if use kernel_linux ; then
+		if [[ -e "${ROOT}/usr/src/linux/.config" ]] ; then
+			kernel_is ge 2 6 19 || ewarn "HAL requires a kernel version 2.6.19 or newer"
+
+			if kernel_is lt 2 6 23 && use acpi ; then
+				check_acpi_proc
+			fi
+		fi
+
+		check_hotplug_net
+		check_inotify
+	fi
+
+	# http://devmanual.gentoo.org/ebuild-writing/functions/
+	# http://bugs.gentoo.org/show_bug.cgi?id=191605
+
+	# Create groups for hotplugging and HAL
+	enewgroup haldaemon
+	enewgroup plugdev
+
+	# HAL drops priviledges by default now ...
+	# ... so we must make sure it can read disk/cdrom info (ie. be in ${HALDAEMON_GROUPS} groups)
+	if use kernel_linux; then
+		enewuser haldaemon -1 "-1" /dev/null ${HALDAEMON_GROUPS_LINUX}
+	elif use kernel_FreeBSD; then
+		enewuser haldaemon -1 "-1" /dev/null ${HALDAEMON_GROUPS_FREEBSD}
+	fi
+
+	# Make sure that the haldaemon user is in the ${HALDAEMON_GROUPS}
+	# If users have a problem with this, let them file a bug
+	if [[ ${ROOT} == / ]] ; then
+		if use kernel_linux; then
+			usermod -G ${HALDAEMON_GROUPS_LINUX} haldaemon
+		elif use kernel_FreeBSD; then
+			pw usermod haldaemon -G ${HALDAEMON_GROUPS_FREEBSD}
+		fi
+	fi
+}
+
+src_prepare() {
+	EPATCH_MULTI_MSG="Applying Gentoo Patchset ..." \
+	EPATCH_SUFFIX="patch" \
+	EPATCH_SOURCE="${WORKDIR}/${PATCHNAME}/${P}-patches/" \
+	EPATCH_FORCE="yes" \
+	epatch
+
+	eautoreconf
+}
+
+multilib-native_src_configure_internal() {
+	local acpi="$(use_enable acpi)"
+	local backend=
+	local hardware=
+	local consolekit="$(use_enable consolekit console-kit)"
+
+	append-flags -rdynamic
+
+	if use kernel_linux ; then
+		backend="linux"
+	elif use kernel_FreeBSD ; then
+		backend="freebsd"
+	else
+		eerror "Invalid backend"
+	fi
+
+	if use kernel_linux ; then
+		if use acpi ; then
+			# Using IBM ACPI and Toshiba ACPI results in double notification as this
+			# was merged into the Linux Kernel 2.6.22
+			if kernel_is lt 2 6 22 ; then
+				acpi="$acpi --enable-acpi-ibm --enable-acpi-toshiba"
+			else
+				acpi="$acpi --disable-acpi-ibm --disable-acpi-toshiba"
+			fi
+
+			acpi="$acpi --enable-acpi-proc --enable-acpi-acpid"
+		else
+			acpi="$acpi --disable-acpi-ibm --disable-acpi-toshiba"
+			acpi="$acpi --disable-acpi-proc --disable-acpi-acpid"
+		fi
+
+		hardware="--with-cpufreq --with-usb-csr --with-keymaps"
+		use arm && hardware="$hardware --with-omap --enable-pmu"
+		use ppc && hardware="$hardware --enable-pmu"
+		if use x86 || use amd64; then
+			hardware="$hardware --with-macbook --with-macbookpro"
+		fi
+
+		if use dell ; then
+			hardware="$hardware --with-dell-backlight"
+		else
+			hardware="$hardware --without-dell-backlight"
+		fi
+
+		hardware="$hardware --enable-sonypic"
+	else
+		hardware="--without-cpufreq --without-usb-csr --without-keymaps"
+		hardware="$hardware --without-omap"
+		hardware="$hardware --without-dell-backlight"
+		hardware="$hardware --enable-acpi-ibm --enable-acpi-toshiba"
+		hardware="$hardware --disable-sonypic"
+	fi
+
+	# Policykit support depends on consolekit support.  Therefore, force on
+	# consolekit, even if it's USE flag is off, if policykit support is on.
+	# This enables packages to USE-depend on hal[policykit?]
+	if use policykit ; then
+		consolekit="--enable-console-kit"
+	fi
+
+	econf --with-backend=${backend} \
+		  --with-os-type=gentoo \
+		  --with-pid-file=/var/run/hald.pid \
+		  --with-hwdata=/usr/share/misc \
+		  --with-socket-dir=/var/run/hald \
+		  --enable-umount-helper \
+		  --enable-man-pages \
+		  --disable-acl-management \
+		  --enable-pci \
+		  $(use_enable apm) \
+		  $(use_enable debug verbose-mode) \
+		  $(use_enable disk-partition parted) \
+		  $(use_enable doc docbook-docs) \
+		  $(use_enable doc gtk-doc) \
+		  $(use_enable policykit policy-kit) \
+		  ${consolekit} \
+		  --docdir=/usr/share/doc/${PF} \
+		  --localstatedir=/var \
+		  ${acpi} ${hardware} \
+	|| die "configure failed"
+}
+
+multilib-native_src_install_internal() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog NEWS README || die "docs failed"
+
+	# hal umount for unclean unmounts
+	exeinto /lib/udev/
+	newexe "${FILESDIR}/hal-unmount.dev" hal_unmount || die "udev helper failed"
+
+	# initscript
+	newinitd "${FILESDIR}/0.5.10-hald.rc" hald || die "init script failed"
+
+	# configuration
+	cp "${FILESDIR}/0.5.10-hald.conf" "${WORKDIR}/" || \
+		die "failed to copy hald.conf"
+
+	if use debug; then
+		sed -e 's:HALD_VERBOSE="no":HALD_VERBOSE="yes":' \
+			-i "${WORKDIR}/0.5.10-hald.conf" || die "failed to change verbose"
+	fi
+	newconfd "${WORKDIR}/0.5.10-hald.conf" hald || \
+		die "failed to install hald.conf"
+
+	if use X ; then
+		# New Configuration Snippets
+		dodoc "${WORKDIR}/${PATCHNAME}/${PN}-config-examples/"*.fdi || \
+			die "dodoc X examples failed"
+	fi
+
+	# We now create and keep /media here as both gnome-mount and pmount
+	# use these directories, to avoid collision.
+	keepdir /media
+
+	# We also need to create and keep /etc/fdi/{information,policy,preprobe}
+	# or else hal bombs.
+	keepdir /etc/hal/fdi/{information,policy,preprobe}
+
+	# HAL stores it's fdi cache in /var/cache/hald
+	keepdir /var/cache/hald
+
+	# HAL keeps its unix socket here
+	keepdir /var/run/hald
+	keepdir /var/lib/hal
+}
+
+pkg_postinst() {
+	# Despite what people keep changing this location. Either one works.. it doesn't matter
+	# http://dev.gentoo.org/~plasmaroo/devmanual/ebuild-writing/functions/
+
+	elog "The HAL daemon needs to be running for certain applications to"
+	elog "work. Suggested is to add the init script to your start-up"
+	elog "scripts, this should be done like this :"
+	elog "\`rc-update add hald default\`"
+	echo
+	elog "Looking for automounting support? Add yourself to the plugdev group"
+	echo
+	elog "IF you have additional applications which consume ACPI events, you"
+	elog "should consider installing acpid to allow applications to share ACPI"
+	elog "events."
+	if use X ; then
+		echo
+		elog "If you wish to use a non US layout, you may do so by executing:"
+		elog "setxkbmap <layout> or by utilizing your Desktop Environment's"
+		elog "Keyboard Layout Settings mechanism."
+		elog "Under GNOME, this is gnome-keyboard-properties, and under KDE"
+		elog "it is kxkb."
+	fi
+	echo
+	elog "In order have suspend/hibernate function with HAL or apps that use HAL"
+	elog "(such as gnome-power-manager), you should build HAL with the laptop"
+	elog "useflag which will install pm-utils."
+	if use X ; then
+		echo
+		elog "X Input Hotplugging (if you build xorg-server with the HAL useflag)"
+		elog "reads user specific configuration from /etc/hal/fdi/policy/."
+		echo
+		elog "You should remove the Input sections from your xorg.conf once you have"
+		elog "migrated the rules to a HAL fdi file."
+	fi
+
+	ebeep 5
+	epause 5
+}
diff --git a/sys-libs/slang/ChangeLog b/sys-libs/slang/ChangeLog
index e4d85d682..ee2fecd87 100644
--- a/sys-libs/slang/ChangeLog
+++ b/sys-libs/slang/ChangeLog
@@ -1,22 +1,45 @@
 # ChangeLog for sys-libs/slang
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/slang/ChangeLog,v 1.93 2008/11/03 01:47:54 matsuu Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/slang/ChangeLog,v 1.100 2009/05/06 17:56:05 armin76 Exp $
+
+  06 May 2009; Raúl Porcel <armin76@gentoo.org> slang-2.1.4.ebuild:
+  arm/ia64/s390/sh/sparc stable wrt #267920
+
+  03 May 2009; Tobias Klausmann <klausman@gentoo.org> slang-2.1.4.ebuild:
+  Stable on alpha, bug #267920
+
+  03 May 2009; Markus Meier <maekke@gentoo.org> slang-2.1.4.ebuild:
+  amd64/x86 stable, bug #267920
+
+  02 May 2009; Jeroen Roovers <jer@gentoo.org> slang-2.1.4.ebuild:
+  Stable for HPPA (bug #267920).
+
+  01 May 2009; Brent Baude <ranger@gentoo.org> slang-2.1.4.ebuild:
+  stable ppc64, bug 267920
+
+  30 Apr 2009; Brent Baude <ranger@gentoo.org> slang-2.1.4.ebuild:
+  stable ppc, bug 267920
+
+  30 Apr 2009; Samuli Suominen <ssuominen@gentoo.org> slang-2.1.3-r1.ebuild,
+  slang-2.1.4.ebuild:
+  Because ncurses5-config --terminfo returns /usr/share/terminfo we keepdir
+  it wrt #245374 and drop USE -minimal depend.
 
 *slang-2.1.4 (03 Nov 2008)
 
   03 Nov 2008; MATSUU Takuto <matsuu@gentoo.org> +slang-2.1.4.ebuild:
   Version bumped, bug #237144. Added EAPI=2.
 
-  12 Jun 2008; Samuli Suominen <drac@gentoo.org> slang-2.1.3-r1.ebuild:
+  12 Jun 2008; Samuli Suominen <ssuominen@gentoo.org> slang-2.1.3-r1.ebuild:
   arm stable
 
-  29 May 2008; Samuli Suominen <drac@gentoo.org> slang-2.1.3-r1.ebuild:
+  29 May 2008; Samuli Suominen <ssuominen@gentoo.org> slang-2.1.3-r1.ebuild:
   keyword ~arm
 
-  04 Apr 2008; Samuli Suominen <drac@gentoo.org> slang-2.1.3-r1.ebuild:
+  04 Apr 2008; Samuli Suominen <ssuominen@gentoo.org> slang-2.1.3-r1.ebuild:
   Keyword ~sparc-fbsd, thanks to Uberlord for testing.
 
-  19 Mar 2008; Samuli Suominen <drac@gentoo.org>
+  19 Mar 2008; Samuli Suominen <ssuominen@gentoo.org>
   +files/slang-2.1.3-uclibc.patch, slang-2.1.3-r1.ebuild:
   Fix a regression from slang-1.4.9-r2, building on uclibc wrt bug 213925
   thanks to Natanael Copa.
@@ -30,7 +53,7 @@
   11 Mar 2008; Brent Baude <ranger@gentoo.org> slang-2.1.3-r1.ebuild:
   stable ppc64, bug 211986
 
-  10 Mar 2008; Samuli Suominen <drac@gentoo.org> slang-2.1.3-r1.ebuild:
+  10 Mar 2008; Samuli Suominen <ssuominen@gentoo.org> slang-2.1.3-r1.ebuild:
   amd64 stable wrt #211986
 
   10 Mar 2008; Raúl Porcel <armin76@gentoo.org> slang-2.1.3-r1.ebuild:
@@ -45,11 +68,11 @@
   17 Feb 2008; Alexis Ballier <aballier@gentoo.org> slang-2.1.3-r1.ebuild:
   keyword ~x86-fbsd
 
-  15 Feb 2008; Samuli Suominen <drac@gentoo.org> slang-2.1.3-r1.ebuild:
+  15 Feb 2008; Samuli Suominen <ssuominen@gentoo.org> slang-2.1.3-r1.ebuild:
   If USE readline is used, and it's enabled by default in profiles use system
   readline for slsh instead of native slang.
 
-  15 Feb 2008; Samuli Suominen <drac@gentoo.org> slang-2.1.3-r1.ebuild:
+  15 Feb 2008; Samuli Suominen <ssuominen@gentoo.org> slang-2.1.3-r1.ebuild:
   sys-libs/ncurses is required for /usr/share/terminfo files which means it
   cannot be built with USE minimal wrt #210063 by Saul Peebsen.
 
@@ -59,9 +82,8 @@
   11 Feb 2008; Raúl Porcel <armin76@gentoo.org> slang-2.1.3-r1.ebuild:
   Re-add ~ia64/~sparc
 
-  11 Feb 2008; Samuli Suominen <drac@gentoo.org> slang-2.1.3-r1.ebuild:
-  Force -j1 for both building and installing wrt #209643, but it fails in many
-  different ways.
+  11 Feb 2008; Samuli Suominen <ssuominen@gentoo.org> slang-2.1.3-r1.ebuild:
+  Force -j1 for both building and installing wrt #209643.
 
   11 Feb 2008; Brent Baude <ranger@gentoo.org> slang-2.1.3-r1.ebuild:
   Marking slang-2.1.3-r1 ~ppc64 for bug 209422
@@ -71,10 +93,10 @@
 
 *slang-2.1.3-r1 (10 Feb 2008)
 
-  10 Feb 2008; Samuli Suominen <drac@gentoo.org> +slang-2.1.3-r1.ebuild:
+  10 Feb 2008; Samuli Suominen <ssuominen@gentoo.org> +slang-2.1.3-r1.ebuild:
   USE cjk for optional dev-libs/oniguruma dep.
 
-  10 Feb 2008; Samuli Suominen <drac@gentoo.org> slang-2.1.3.ebuild:
+  10 Feb 2008; Samuli Suominen <ssuominen@gentoo.org> slang-2.1.3.ebuild:
   Use targets elf and static in src_compile and install-all in src_install to
   avoid compiling at install phase.
 
@@ -87,13 +109,13 @@
   09 Feb 2008; Brent Baude <ranger@gentoo.org> slang-2.1.3.ebuild:
   keyworded ~arch for ppc64, bug 209434
 
-  09 Feb 2008; Samuli Suominen <drac@gentoo.org> slang-1.4.9-r2.ebuild,
+  09 Feb 2008; Samuli Suominen <ssuominen@gentoo.org> slang-1.4.9-r2.ebuild,
   -slang-2.1.2.ebuild:
   Remove unused version and fix quoting of stable.
 
 *slang-2.1.3 (09 Feb 2008)
 
-  09 Feb 2008; Samuli Suominen <drac@gentoo.org> +slang-2.1.3.ebuild:
+  09 Feb 2008; Samuli Suominen <ssuominen@gentoo.org> +slang-2.1.3.ebuild:
   Version bump wrt #202344, thanks to Arfrever Frehtes Taifersar Arahesis for
   reporting.
 
diff --git a/sys-libs/slang/Manifest b/sys-libs/slang/Manifest
index 114893ea5..6658a6457 100644
--- a/sys-libs/slang/Manifest
+++ b/sys-libs/slang/Manifest
@@ -1,8 +1,6 @@
 AUX slang-2.1.2-slsh-libs.patch 637 RMD160 0c8b60cf026ab7fc5ad079f04766b907325ed4df SHA1 fd1a58367e2d94f55154d66fedfe69fe921cb794 SHA256 fe5e969a51b6de0874c6b903dcf0ad21f6d5b27813e0e4c79a4dc929ab737ea8
 AUX slang-2.1.3-uclibc.patch 494 RMD160 28ce3d06e5554697bf90f4991128820b19aba11e SHA1 a09a554c6166d81e223a77edc629a19bb8bf0b53 SHA256 7b88890ae8787617065d693f0469b2d462148964e3de9d74e28c0b202590fd69
-DIST slang-2.1.3.tar.bz2 1191425 RMD160 b59424972e52c361a15b23874d1a0539683608e5 SHA1 31fc6162684f69d9dd0377372dfdc336f0c4343a SHA256 534b80d31f582a00163c2abdcc0317585fa06918c96af65d008718f3b68fddfc
 DIST slang-2.1.4.tar.bz2 1283938 RMD160 394d6b6d4d770b6f006355772c159aa6ad5cde79 SHA1 8670420f870f3f5b92e72ec5962aefa52fd546a5 SHA256 944e7123a3889f1e972f77c7cd46e2e98f7f8d02d25c585f1276c9c9307161a6
-EBUILD slang-2.1.3-r1.ebuild 1764 RMD160 9832834ec7e8b220237d2cf3cc40d2869b783f5f SHA1 feec52df1f13c3ad5bad290aa36091c65ab1a930 SHA256 4fe8cb4d9ecaefb59734a2b45b603d52374389dd3e398a914279d6d2352987bb
-EBUILD slang-2.1.4.ebuild 1678 RMD160 201ba66dc749011b6f5369010afcdfdfe2a0f6fa SHA1 d28f9c827ba7918a7dd5a348599f344bd38a55fa SHA256 ae52659ba198847436089e9b5dcfec1e7775b86f1ade2f24cb1fab715db21b4f
-MISC ChangeLog 12362 RMD160 e06ab2b9935ce21d0c304b5d52a5f088cc2f8a66 SHA1 15547c699ea5bcceebfa8b69332664d8e2eb179d SHA256 662887954a1996f7eccb67d9dfbc5acb8508741f07e4b1b6a26ae3b440cb8b69
+EBUILD slang-2.1.4.ebuild 1614 RMD160 332c794143151f2f5023be1f7948fd4869ffdcd6 SHA1 33b786fcda6831d57c853866ac01f3a2fa555580 SHA256 f28a17425875bd9099d725b432952b053a598046194842c8ebbb48a2000c90e6
+MISC ChangeLog 13218 RMD160 74d170513d0f0e6aa45f13322e91f06b837681b6 SHA1 b6d954cf4a563abd010931f9e3e7b515e6dbaf1b SHA256 a8cdafe4621d1e239a125acd46035dc454e8c9da338c8ecb5c39e5dc2b720b55
 MISC metadata.xml 157 RMD160 1305e8c09c6d49c0db2a18bb50b045460c124ebe SHA1 874689ae30dfe223d487e0e6a5e0a0dbf06a69f4 SHA256 c3c089740b31ec0f4d7fbc3bf2d6bb8460ccfd0694f01bf91b22a2e1930d6d5d
diff --git a/sys-libs/slang/slang-2.1.3-r1.ebuild b/sys-libs/slang/slang-2.1.3-r1.ebuild
deleted file mode 100644
index 92dacefc7..000000000
--- a/sys-libs/slang/slang-2.1.3-r1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/slang/slang-2.1.3-r1.ebuild,v 1.20 2008/06/13 05:30:44 vapier Exp $
-
-EAPI="2"
-
-inherit eutils multilib-native
-
-DESCRIPTION="a portable programmer's library designed to allow a developer to create robust portable software."
-HOMEPAGE="http://www.s-lang.org"
-SRC_URI="ftp://ftp.fu-berlin.de/pub/unix/misc/slang/v${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
-IUSE="cjk pcre png readline"
-
-RDEPEND="sys-libs/ncurses
-	pcre? ( dev-libs/libpcre[lib32?] )
-	png? ( media-libs/libpng[lib32?] )
-	cjk? ( dev-libs/oniguruma[lib32?] )
-	readline? ( sys-libs/readline[lib32?] )"
-DEPEND="${RDEPEND}
-	!=sys-libs/slang-2.1.2"
-
-pkg_setup() {
-	local fail="Re-emerge sys-libs/ncurses with USE -minimal."
-	if built_with_use sys-libs/ncurses minimal; then
-		eerror "${fail}"
-		die "${fail}"
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.1.2-slsh-libs.patch
-	epatch "${FILESDIR}"/${P}-uclibc.patch
-}
-
-multilib-native_src_configure_internal() {
-	local readline
-
-	if use readline; then
-		readline=gnu
-	else
-		readline=slang
-	fi
-
-	econf $(use_with cjk onig) $(use_with pcre) $(use_with png) \
-		--with-readline=${readline}
-}
-
-multilib-native_src_compile_internal() {
-	emake -j1 elf static || die "emake elf static failed."
-
-	cd slsh
-	emake -j1 slsh || die "emake slsh failed."
-}
-
-multilib-native_src_install_internal() {
-	emake -j1 DESTDIR="${D}" install-all || die "emake install-all failed."
-
-	rm -rf "${D}"/usr/share/doc/{slang,slsh}
-
-	dodoc NEWS README *.txt doc/{,internal,text}/*.txt
-	dohtml doc/slangdoc.html slsh/doc/html/*.html
-}
diff --git a/sys-libs/slang/slang-2.1.4.ebuild b/sys-libs/slang/slang-2.1.4.ebuild
index 8a18179b5..f6976629a 100644
--- a/sys-libs/slang/slang-2.1.4.ebuild
+++ b/sys-libs/slang/slang-2.1.4.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/sys-libs/slang/slang-2.1.4.ebuild,v 1.1 2008/11/03 01:47:54 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/slang/slang-2.1.4.ebuild,v 1.8 2009/05/06 17:56:05 armin76 Exp $
 
 EAPI=2
 
@@ -12,7 +12,7 @@ SRC_URI="ftp://ftp.fu-berlin.de/pub/unix/misc/slang/v${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
 IUSE="cjk pcre png readline"
 
 RDEPEND="sys-libs/ncurses[-minimal,lib32?]
@@ -20,39 +20,38 @@ RDEPEND="sys-libs/ncurses[-minimal,lib32?]
 	png? ( media-libs/libpng[lib32?] )
 	cjk? ( dev-libs/oniguruma[lib32?] )
 	readline? ( sys-libs/readline[lib32?] )"
-DEPEND="${RDEPEND}
-	!=sys-libs/slang-2.1.2"
+DEPEND="${RDEPEND}"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.1.2-slsh-libs.patch
-	epatch "${FILESDIR}"/${PN}-2.1.3-uclibc.patch
+	epatch "${FILESDIR}"/${PN}-2.1.2-slsh-libs.patch \
+		"${FILESDIR}"/${PN}-2.1.3-uclibc.patch
 }
 
 multilib-native_src_configure_internal() {
 	local myconf
 
 	if use readline; then
-		myconf="${myconf} --with-readline=gnu"
+		myconf+=" --with-readline=gnu"
 	else
-		myconf="${myconf} --with-readline=slang"
+		myconf+=" --with-readline=slang"
 	fi
 
 	econf \
 		$(use_with cjk onig) \
 		$(use_with pcre) \
 		$(use_with png) \
-		${myconf} || die
+		${myconf}
 }
 
 multilib-native_src_compile_internal() {
-	emake -j1 elf static || die "emake elf static failed."
+	emake -j1 elf static || die "emake elf static failed"
 
 	cd slsh
-	emake -j1 slsh || die "emake slsh failed."
+	emake -j1 slsh || die "emake slsh failed"
 }
 
 multilib-native_src_install_internal() {
-	emake -j1 DESTDIR="${D}" install-all || die "emake install-all failed."
+	emake -j1 DESTDIR="${D}" install-all || die "emake install-all failed"
 
 	rm -rf "${D}"/usr/share/doc/{slang,slsh}
 
diff --git a/x11-libs/libICE/Manifest b/x11-libs/libICE/Manifest
index cfba52623..8f3843bfb 100644
--- a/x11-libs/libICE/Manifest
+++ b/x11-libs/libICE/Manifest
@@ -1,7 +1,7 @@
 DIST libICE-1.0.4.tar.bz2 252304 RMD160 cb83eafe547a04586877ffffa8d07e1dc9fcd613 SHA1 67bc7d35a273023a593c10ce05fd307f496892b4 SHA256 13055e2f4c645cbd135ce97a7974a5866f9ba3ed8988e686b552f55c30514f04
 DIST libICE-1.0.5.tar.bz2 263786 RMD160 4c08c4ef542eedd315a9b097bcec6779be01b2b7 SHA1 be6fb2a00f34689c16dad63e1ad36896f5efd7d2 SHA256 2fba2c850bf2f60fc2a423438188b04439d149a7e81d8433264f0613ebb7be3a
 EBUILD libICE-1.0.4.ebuild 559 RMD160 38228c4a0f346f3ebb23196cd4d355b38bf6a857 SHA1 35cedda5c359cd690f53ca36c47e05330bfda3d0 SHA256 ea1546598ea986faa821810259f0f2eb2d3266f29e38e35202ad9114ea36e3be
-EBUILD libICE-1.0.5.ebuild 569 RMD160 7efe8a656c8c3d3a0e253aa217a3f39c18b29b46 SHA1 638a8ff7eca711a2e1cc3253073b50dff0ecdace SHA256 3a43ec401c6b76e14f726cfa5c391568f5cb5a31c92ba033401be1e26f0f89d9
+EBUILD libICE-1.0.5.ebuild 586 RMD160 41a6309dd83b4832c663c6f8fdc655bc49e63561 SHA1 f5982ebad9b2376984833a62e0f40685237e6578 SHA256 ac5489d189290227472b879b052f28030ad659a33bc1a0f978789c52f1f75b31
 EBUILD libICE-9999.ebuild 488 RMD160 bdfaf17daf747728b3a0ae1120d8aecc85917951 SHA1 2a07f71cb92baa3b021462b72d2575fd832e51af SHA256 3aa01436e6ffa8358a43fe6ec8e0149936671cb338232d5cc285115492d3010a
 MISC ChangeLog 5775 RMD160 077443d12dd0591446b868114439a71aa98abd3b SHA1 38e322155a096e22777843d1d0bd7a28deec220b SHA256 e08953f924abad6cfb8f0d520be8ec28996411a2986aef4a25ed43d7bfb58b65
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
diff --git a/x11-libs/libICE/libICE-1.0.5.ebuild b/x11-libs/libICE/libICE-1.0.5.ebuild
index 57e62693c..5a9cc89c8 100644
--- a/x11-libs/libICE/libICE-1.0.5.ebuild
+++ b/x11-libs/libICE/libICE-1.0.5.ebuild
@@ -18,4 +18,6 @@ RDEPEND="x11-libs/xtrans
 	x11-proto/xproto"
 DEPEND="${RDEPEND}"
 
-CONFIGURE_OPTIONS="$(use_enable ipv6)"
+pkg_setup() {
+	CONFIGURE_OPTIONS="$(use_enable ipv6)"
+}
diff --git a/x11-libs/libdrm/Manifest b/x11-libs/libdrm/Manifest
index 6f8ff798e..7164b94c1 100644
--- a/x11-libs/libdrm/Manifest
+++ b/x11-libs/libdrm/Manifest
@@ -4,9 +4,11 @@ AUX 2.4.9-0001-nouveau-store-bo-handle-in-public-struct-in-bo_ref_.patch 711 RMD
 AUX 2.4.9-0002-nouveau-write-posting-got-lost-somewhere-bring-it.patch 708 RMD160 795b4dbf84914bbc13c5db086769d0b500385441 SHA1 187780606e0100c8d2de251af4af8cb773955180 SHA256 cfc0325d305c5d534a0c564d90f63f2ff27a45968203453defd531d38d853c3e
 AUX 2.4.9-0003-libdrm-mode-align-subpixel-results.patch 901 RMD160 1a66e30396a1c6a04d8e398dabe7f42c975e8327 SHA1 12eb648b7f41de9e5ce4f2a3dcec32d1d93e07a6 SHA256 567f496c402ee78ad99d4a95e2ee297208ea4593d1be2040eaf368edc6a2d7ba
 AUX 2.4.9-0004-intel-NULL-fake-bo-block-when-freeing-in-evict_all.patch 1048 RMD160 358d8dfdc8b6ea36bffe476151a24467d96fc5eb SHA1 55bd0fb8342e5be26ee4498242670f13535ed2a7 SHA256 12cf1766699dd02c0df7558972ac67026742b0d016c749c3f5b0c5eba85e5dce
+DIST libdrm-2.4.11.tar.gz 523915 RMD160 2d23505423da4abed249c44b550097d05bc11da8 SHA1 3b24b3b2d7dd35ab16abc06ce80e9c86c59979ed SHA256 42876c0dd6caef0be0fc884a5a26d99854ebbbdae3afec5359a93fbeed7afe51
 DIST libdrm-2.4.5.tar.gz 563395 RMD160 11a512368c32fb6ed3fa17d7d728e244d61547db SHA1 9e919c4cda6454118ebd288edc3bc65fc6779a51 SHA256 4ada5afa0ac774b9affce9762e703d0a98bfcb3537a5230ef12955b0068259d1
 DIST libdrm-2.4.6.tar.bz2 417305 RMD160 e49f1d8d068f7e28b612e300b2b3e2b08565b870 SHA1 69dc8ddb2f41f6dc87c3c3d4ff7d09f1a89d3dd6 SHA256 6813f4ff5eb62d638bb452a6fc6ddbc26b7362f2d32b8be950c73a318239b006
 DIST libdrm-2.4.9.tar.gz 523793 RMD160 2d988da67c343dc480a46ea4370dbe0067c47212 SHA1 ca40ef9fe1cfbfd2538631d449a68bf5247bc285 SHA256 c74b2e188398978c6a358d7c0fa2c8db7ac13c548b32c297f14c2cc2550cb2dd
+EBUILD libdrm-2.4.11.ebuild 933 RMD160 44e0ff19936d1f23e024767546bd5611c24e28b8 SHA1 083c67187b05ad13933ea1cdf55da58e9bed4ba0 SHA256 73520e19310db489900948c10ca7f03f4a2f28489e96947b6b30d381832c0966
 EBUILD libdrm-2.4.5.ebuild 989 RMD160 75f6dbb8e2a8a6adbf475166d1e53e3d2e070cd8 SHA1 411bf1d72436d4a15a8e25fb2a1ff03e11959e41 SHA256 5bf1a30470385da1e91e029c1dc02b43ccb803788708fa354f5fd432f010a6c2
 EBUILD libdrm-2.4.6.ebuild 1094 RMD160 1163261966bc22092ceecb2bd40104d1461a8622 SHA1 05d1c967a210d9c36caf75533f703b3931ad7188 SHA256 06909746d2197d5c2e994823043f351f5ba807b1c78bfe37c0cc6039edeb79ce
 EBUILD libdrm-2.4.9.ebuild 1229 RMD160 86b1f41253d70a95d9beac88f5710a0bbcd0a1be SHA1 3f1b5ee93049e6db28797dc8981ba8a4da895dc9 SHA256 025ce83e64fd378b1da26dfd4804a715c158feba66e2992aa07a8aa14951674b
diff --git a/x11-libs/libdrm/libdrm-2.4.11.ebuild b/x11-libs/libdrm/libdrm-2.4.11.ebuild
new file mode 100644
index 000000000..bdde7e40a
--- /dev/null
+++ b/x11-libs/libdrm/libdrm-2.4.11.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libdrm/libdrm-2.4.11.ebuild,v 1.1 2009/05/16 07:55:10 remi Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+EAPI="2"
+
+inherit x-modular multilib-native
+
+DESCRIPTION="X.Org libdrm library"
+HOMEPAGE="http://dri.freedesktop.org/"
+SRC_URI="http://dri.freedesktop.org/libdrm/${P}.tar.gz"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+RESTRICT="test" # see bug #236845
+
+RDEPEND="dev-libs/libpthread-stubs"
+DEPEND="${RDEPEND}"
+# dispite its name --enable-udev does not pull in libudev
+
+pkg_postinst() {
+	x-modular_pkg_postinst
+
+	ewarn "libdrm's ABI may have changed without change in library name"
+	ewarn "Please rebuild media-libs/mesa, x11-base/xorg-server and"
+	ewarn "your video drivers in x11-drivers/*."
+}
diff --git a/x11-libs/pango/Manifest b/x11-libs/pango/Manifest
index d36f128fc..8b9efada3 100644
--- a/x11-libs/pango/Manifest
+++ b/x11-libs/pango/Manifest
@@ -5,4 +5,4 @@ DIST pango-1.22.4.tar.bz2 1496168 RMD160 118986ea419d22937dd5e2b033f46f34a45f24e
 DIST pango-1.24.1.tar.bz2 1526008 RMD160 8924a2ef039c2bf71e185cad96e87e8c973a59c0 SHA1 917ad4559cceaf27adbfddee11a833c3e536d4a9 SHA256 e00c343dd14c23b89a6767f87d31d4246c14739c57c0174008a86b33174b9ab2
 EBUILD pango-1.22.4-r1.ebuild 2415 RMD160 e9aeff7823cfad7f2dbf4aff11a35aacb257001f SHA1 64cda26805646421a2dc0d5891a47f5434e1b5f8 SHA256 bc357ac2bdad4a60dc6211d97126e5233922a86ba1cd11d8095459660ff4d137
 EBUILD pango-1.22.4.ebuild 2288 RMD160 415424d584b3a2d6a7295cbad93a664a49b02c6a SHA1 11c0d55d73006846a645fd68d2fd7ab3ac162e4f SHA256 ad7121da7224bcef71eb92a0ac354ce59ca8fb599d0208fd3d2c8422dc065f86
-EBUILD pango-1.24.1.ebuild 2323 RMD160 23b33a3dcabda1926e4306a5123ad142033af42f SHA1 522e8c56d2f04e4145bfa77efa50c0e7d840319f SHA256 38d95c2e5a63750e4d866185a3039eb30300ac77b9904f67e6c16cb846b9b01b
+EBUILD pango-1.24.1.ebuild 2658 RMD160 3317a7ac29ca40823bec15de2b50fd797300be19 SHA1 77f71192c0e241a011f242a8e9e0e61a17de6438 SHA256 e857f15cb6c7d213778d539b8865cebb8720c1b800c1a4f1b058614ac5453fd0
diff --git a/x11-libs/pango/pango-1.24.1.ebuild b/x11-libs/pango/pango-1.24.1.ebuild
index 98d591b55..d8b434eda 100644
--- a/x11-libs/pango/pango-1.24.1.ebuild
+++ b/x11-libs/pango/pango-1.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/x11-libs/pango/pango-1.22.4.ebuild,v 1.2 2009/01/18 21:02:37 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.24.1.ebuild,v 1.4 2009/05/13 14:17:42 nirbheek Exp $
 
 EAPI="2"
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.pango.org/"
 
 LICENSE="LGPL-2 FTL"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="X debug doc"
 
 # FIXME: add gobject-introspection dependency when it is available
@@ -46,15 +46,19 @@ pkg_setup() {
 }
 
 src_prepare() {
+	gnome2_src_prepare
+
 	# make config file location host specific so that a 32bit and 64bit pango
 	# wont fight with each other on a multilib system.  Fix building for
 	# emul-linux-x86-gtklibs
 	if multilib_enabled ; then
 		epatch "${FILESDIR}/${PN}-1.2.5-lib64.patch"
-		epatch "${FILESDIR}/${P}-no-man-gzip.patch"
 	fi
 
-	eautoreconf
+	# gtk-doc checks do not pass, upstream bug #578944
+	sed 's:TESTS = check.docs: TESTS = :g'\
+		-i docs/Makefile.am docs/Makefile.in || die "sed failed"
+	sed -e '/@cd "$(DESTDIR)$(man1dir)" && gzip -c pango-view.1 > preload.1.gz && $(RM) preload.1/d' -i pango-view/Makefile.{in,am} || die 
 }
 
 multilib-native_src_configure_internal() {
@@ -97,4 +101,3 @@ multilib-native_pkg_postinst_internal() {
 		fi
 	fi
 }
-
diff --git a/x11-proto/dri2proto/Manifest b/x11-proto/dri2proto/Manifest
index 592d35081..f58fa2e60 100644
--- a/x11-proto/dri2proto/Manifest
+++ b/x11-proto/dri2proto/Manifest
@@ -3,7 +3,7 @@ DIST dri2proto-1.99.3.tar.bz2 42094 RMD160 f24d61dde1c0bd0f7fcad85d24b8ac149736c
 DIST dri2proto-2.0.tar.bz2 50908 RMD160 e843c4b33aa31edc78030f873c10ec53cc421ba5 SHA1 cb6342ea88f57f7d0023abdf9a3ff6000f8e7a0f SHA256 1954a7e96d7fe70611c483836ed143e84a069eed6d3dab22c05a531bfb6da9e4
 EBUILD dri2proto-1.1.ebuild 432 RMD160 8595bbc9ab39615ea285fa0594b7ada2bf5b04f3 SHA1 4ba293e27f400271d4447d16247585166912be36 SHA256 6c9e3873635ab48f5fd80b7ff376c85add7bfff7ca898d2b32f62d8d9373c02d
 EBUILD dri2proto-1.99.3.ebuild 447 RMD160 f1cb282f1965dbfeda5049bc5095936d3886f54c SHA1 6aae7d7977f92bc47def435de6cda4212d9670a4 SHA256 0d011015841ad6c25d6c0b94f729a434cf4be57e07fc35fb26670d30cb69107c
-EBUILD dri2proto-2.0.ebuild 455 RMD160 5e19e05df1ededab9d35aeee89f4ce5718727121 SHA1 c8e64c79ee73725ae9484e5c53bad622497df9db SHA256 b9d1ca61e387fc68a3d2625258a128f13f306b6733cbb36b113f4f2698d7820e
+EBUILD dri2proto-2.0.ebuild 462 RMD160 294e84edb5c055983570ad69312acaf620bd2d13 SHA1 c0ddf9d29e0085169067ebec709e0f1f409d069d SHA256 815162bff37df2179242197a280a499f1b70d1c7ecc42df5ad7cac1b6c9d23ef
 EBUILD dri2proto-9999.ebuild 388 RMD160 b66d0aa0da0de5d0de879c49b5b138f6819686e7 SHA1 22c2ba81d9be0138f1a4c7c1f4514ab63e37654a SHA256 bf5898802d2af02cf43302c66d3c91cabfb2fa73235dc3d7d5f809d631d1f2f7
 MISC ChangeLog 938 RMD160 bd9e884d021aad428727ef4a5dc157af4048ff3e SHA1 4b7bb588c8c5ba974ebadbd02fb5fe2a0f8eaf97 SHA256 aa32a75fca114b926257077dc903ef78ee4e4f454fc88a475e90bad62ca4626f
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
diff --git a/x11-proto/dri2proto/dri2proto-2.0.ebuild b/x11-proto/dri2proto/dri2proto-2.0.ebuild
index 94c07d391..60ca66e25 100644
--- a/x11-proto/dri2proto/dri2proto-2.0.ebuild
+++ b/x11-proto/dri2proto/dri2proto-2.0.ebuild
@@ -10,6 +10,6 @@ DESCRIPTION="X.Org DRI2 protocol headers"
 
 LICENSE="X11"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-
+IUSE=""
 RDEPEND=""
 DEPEND="${RDEPEND}"
author	Steven J Newbury <steve@snewbury.org.uk>	2009-05-17 11:30:34 +0100
committer	Steven J Newbury <steve@snewbury.org.uk>	2009-05-17 11:30:34 +0100
commit	757438af5d8cd945d764306f2dfcd5e50f401acb (patch)
tree	aed803c9d10ea096a4bce1f7ecc6576f64d03637
parent	Update manifest (diff)
parent	x11-libs/libdrm and media-libs/mesa version bump (diff)
download	multilib-portage-757438af5d8cd945d764306f2dfcd5e50f401acb.tar.gz multilib-portage-757438af5d8cd945d764306f2dfcd5e50f401acb.tar.bz2 multilib-portage-757438af5d8cd945d764306f2dfcd5e50f401acb.zip