diff --git a/app-admin/ansible/Manifest b/app-admin/ansible/Manifest
index 44a1c249a538..054a7baddd7c 100644
--- a/app-admin/ansible/Manifest
+++ b/app-admin/ansible/Manifest
@@ -1 +1 @@
-DIST ansible-0.7.tar.gz 120774 SHA256 2ca0dd70a23f5c111effe5ceffad0844107fa9fe7f0f2ab085437d1beb6de4fc SHA512 3fd0ab7f21e0aa112301f54bf96c7f5e93563e5cae247b8a7a8a4351bad37c7969af58bbd9614535a6a04c6fa2414455cc7d93b63d1301c8cf4644d746503dcc WHIRLPOOL 721e7da0586fd39e18e596e97ac2ddd28f04617212eadcea271c1a03fb6bfb0df410769e0c2771423a2cb74eb1d67b7366539cc0a833d0fab2aa698d805add6a
+DIST ansible-0.7.1.tar.gz 120826 SHA256 906ae866254095fa96d28212a9e9e4c80d6feb819c402e570005c1a18c00bd59 SHA512 6eefef520240a51926370ec0997350ab44dfe1c94414f8c04c7a45e9ea134fe7f23ae0bcf59f9278cec83fbba96bf6f6d1bf98beb397b35fdf106491231f8df4 WHIRLPOOL 15e6b03e2f6212ec0f0423943bb606b83d1dfa86ea24360e80c563bf432fd75dec82a9c5d669dd8725edd887c87556f20ca4d891d7b03f1b0aac22586b910fa8
diff --git a/app-admin/ansible/ansible-0.7.ebuild b/app-admin/ansible/ansible-0.7.1.ebuild
similarity index 92%
rename from app-admin/ansible/ansible-0.7.ebuild
rename to app-admin/ansible/ansible-0.7.1.ebuild
index a1d46097ff9c..9b6e904db32d 100644
--- a/app-admin/ansible/ansible-0.7.ebuild
+++ b/app-admin/ansible/ansible-0.7.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/ansible/ansible-0.7.ebuild,v 1.1 2012/09/09 08:59:42 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/ansible/ansible-0.7.1.ebuild,v 1.2 2012/10/21 14:50:25 pinkbyte Exp $
 
 EAPI="4"
 
@@ -9,7 +9,7 @@ PYTHON_COMPAT="python2_6 python2_7"
 inherit distutils
 
 DESCRIPTION="Radically simple deployment, model-driven configuration management, and command execution framework"
-HOMEPAGE="http://ansible.github.com/"
+HOMEPAGE="http://ansible.cc/"
 SRC_URI="mirror://github/ansible/${PN}/${P}.tar.gz"
 
 KEYWORDS="~amd64 ~x86"
@@ -21,7 +21,7 @@ IUSE="examples paramiko +sudo"
 RESTRICT="test"
 
 DEPEND=""
-RDEPEND="${DEPEND}
+RDEPEND="
 	dev-python/jinja
 	dev-python/pyyaml
 	paramiko? ( dev-python/paramiko )
diff --git a/app-admin/ansible/ansible-9999.ebuild b/app-admin/ansible/ansible-9999.ebuild
index 87e636539966..1bb975a174c7 100644
--- a/app-admin/ansible/ansible-9999.ebuild
+++ b/app-admin/ansible/ansible-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/ansible/ansible-9999.ebuild,v 1.3 2012/09/10 16:28:59 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/ansible/ansible-9999.ebuild,v 1.4 2012/10/21 14:50:25 pinkbyte Exp $
 
 EAPI="4"
 
@@ -12,7 +12,7 @@ EGIT_BRANCH="devel"
 inherit distutils git-2
 
 DESCRIPTION="Radically simple deployment, model-driven configuration management, and command execution framework"
-HOMEPAGE="http://ansible.github.com/"
+HOMEPAGE="http://ansible.cc/"
 SRC_URI=""
 
 KEYWORDS=""
diff --git a/app-admin/eclean-kernel/eclean-kernel-0.3.1.ebuild b/app-admin/eclean-kernel/eclean-kernel-0.3.1.ebuild
index 3ae5aec449a4..10f2ccb70d1e 100644
--- a/app-admin/eclean-kernel/eclean-kernel-0.3.1.ebuild
+++ b/app-admin/eclean-kernel/eclean-kernel-0.3.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eclean-kernel/eclean-kernel-0.3.1.ebuild,v 1.1 2012/10/15 13:47:16 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eclean-kernel/eclean-kernel-0.3.1.ebuild,v 1.2 2012/10/20 21:45:09 mgorny Exp $
 
 EAPI=4
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://bitbucket/mgorny/${PN}/downloads/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~mips ~x86"
+KEYWORDS="~amd64 ~mips ~x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND="kernel_linux? ( dev-python/pymountboot[${PYTHON_USEDEP}] )"
diff --git a/app-admin/usbview/files/usbview-1.1-missing-usbfs.patch b/app-admin/usbview/files/usbview-1.1-missing-usbfs.patch
new file mode 100644
index 000000000000..7f7b8f98fcbc
--- /dev/null
+++ b/app-admin/usbview/files/usbview-1.1-missing-usbfs.patch
@@ -0,0 +1,13 @@
+http://bugs.gentoo.org/433096
+https://projects.archlinux.org/svntogit/packages.git/plain/trunk/usbview-1.1-missing-usbfs.patch?h=packages/usbview
+
+--- usbtree.c
++++ usbtree.c
+@@ -397,7 +397,7 @@
+
+ void initialize_stuff (void)
+ {
+-	strcpy (devicesFile, "/proc/bus/usb/devices");
++	strcpy (devicesFile, "/sys/kernel/debug/usb/devices");
+	memset (&previousDevicesFile[0], 0x00, sizeof(previousDevicesFile));
+	previousChange = 0;
diff --git a/app-admin/usbview/usbview-1.1-r1.ebuild b/app-admin/usbview/usbview-1.1-r1.ebuild
new file mode 100644
index 000000000000..666f49ccfdad
--- /dev/null
+++ b/app-admin/usbview/usbview-1.1-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/usbview/usbview-1.1-r1.ebuild,v 1.1 2012/10/21 08:52:57 ssuominen Exp $
+
+EAPI=4
+inherit eutils
+
+DESCRIPTION="Display the topology of devices on the USB bus"
+HOMEPAGE="http://www.kroah.com/linux-usb/"
+SRC_URI="http://www.kroah.com/linux-usb/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND="x11-libs/gtk+:2"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS="AUTHORS ChangeLog NEWS README TODO"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-missing-usbfs.patch
+}
+
+src_install() {
+	default
+	doman ${PN}.8
+	doicon usb_icon.xpm
+	make_desktop_entry ${PN} 'USB Viewer' usb_icon
+}
diff --git a/app-cdr/xfburn/Manifest b/app-cdr/xfburn/Manifest
index b70b3dcaa383..db7a427284b3 100644
--- a/app-cdr/xfburn/Manifest
+++ b/app-cdr/xfburn/Manifest
@@ -1,3 +1,2 @@
-DIST xfburn-0.4.3.tar.bz2 652080 SHA256 c9993226f0f4e3dea3326ad320a01c165a7e1a485f07fa4a2583475a4e6eaafe SHA512 3b82d763f6ac542eeaac0d752faa487f9f5101b6e2d11080e4ec80141496a3c80edfeb0249b37d7bef49505b37c1dd60468253758bbedbd1258a8f3f0db99205 WHIRLPOOL a7d9f11a6e40b405d2b2e36c2ed9f569a4fe8a94ab3248dfd96a08b61c05f923ee3e9364a2526789a4fa8e2072c0aa8fc3d68aeee21b52336e0ac1e597268dd9
 DIST xfburn-0.4.3_p20120601.tar.xz 451252 SHA256 0e27c6cfccc1860d5cf84acfeaff4100eddbf563a2d6a4cf20dd0d781cc98824 SHA512 bf0cd41217b8ecf50b43b24f0b0bd8452a5bc12eb89debb2404a56d75d079e407ec9863dd368091fd34cb8a20604c1f80f7e2aeab500cd3d8473ee35eab1d0b3 WHIRLPOOL acdc2bfa506bc96a83a021d07026f236c96a81c590a22fbf5e5425026aa97256d737522bde116acba3c8387230c059ce226c00cf264698448dae162361797da5
-DIST xfburn_0.4.3-4.debian.tar.gz 25747 SHA256 d5d2de1bccf7e5e4083beada69385a3e5a1d0636534b87fbd0af84cf1a8e53e5 SHA512 2b149819650bb3de805a2df236413e6946547f8064a1759a85c0aa68efaba509b5d87a62c6497c94031769dc97b5c87269d16f3b1d7b903cb86dd1c2e7ecbc2b WHIRLPOOL bd652c7bf18e22bb951e30d5d0937b950287f67213cbd699b7bf655545241b801c64a7856ad8a6618a5dab98fb8831ba15685b3a1a444e97fb9c42d07c485363
+DIST xfburn-0.4.3_p20121021.tar.xz 464084 SHA256 3c3541765da9263e435562188ec2c137fb31d19591dd169b6fb2ef2fefa01bc9 SHA512 5c7cf0e14f632769bc0e249c104207dbf3f2bbd9b9836e9aa409b55f44df735a6ddcf4cb41ab71072ab020b1be51f81e2f2b68ed5b04b52907df216bb68acf7d WHIRLPOOL 75bc723699a862e1a243b3bf0ab1a99b49607c25862da412a74d65bede95170e42a3917ca211cabbaf24c2f30ea37540eb7578cbcbd5817180b720b65ee7d16b
diff --git a/app-cdr/xfburn/files/xfburn-0.4.3-gobject_h.patch b/app-cdr/xfburn/files/xfburn-0.4.3-gobject_h.patch
deleted file mode 100644
index c2e24d7e38e4..000000000000
--- a/app-cdr/xfburn/files/xfburn-0.4.3-gobject_h.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-http://bugs.gentoo.org/410565
-
-Unknown type name errors with references to GObject, GObjectClass, GType and GTypeInfo
-
-The errors started manifesting after upgrading to Xfce 4.10 pre1 libraries
-
---- xfburn/xfburn-settings.h
-+++ xfburn/xfburn-settings.h
-@@ -24,6 +24,7 @@
- #endif /* !HAVE_CONFIG_H */
- 
- #include <glib.h>
-+#include <glib-object.h>
- 
- G_BEGIN_DECLS
- 
diff --git a/app-cdr/xfburn/files/xfburn-0.4.3-update_desktop_entry.patch b/app-cdr/xfburn/files/xfburn-0.4.3-update_desktop_entry.patch
deleted file mode 100644
index 8175185cdaaf..000000000000
--- a/app-cdr/xfburn/files/xfburn-0.4.3-update_desktop_entry.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-http://bugs.gentoo.org/388827
-http://bugzilla.xfce.org/show_bug.cgi?id=6691
-
---- xfburn.desktop.in
-+++ xfburn.desktop.in
-@@ -6,15 +6,15 @@
- Exec=xfburn
- TryExec=xfburn
- Icon=media-cdrom
--MimeType=application/x-cd-image
-+MimeType=application/x-cd-image;
- Terminal=false
--Categories=X-XFCE;GTK;DiscBurning;Archiving;AudioVideo;
-+Categories=X-XFCE;GTK;DiscBurning;Archiving;Utility;AudioVideo;
- StartupNotify=true
- 
- Actions=BurnImage;
- 
- [Desktop Action BurnImage]
--MimeType=application/x-cd-image
-+MimeType=application/x-cd-image;
- Icon=media-cdrom
- Exec=xfburn -i %f
- _Name=Burn Image (xfburn)
diff --git a/app-cdr/xfburn/xfburn-0.4.3-r3.ebuild b/app-cdr/xfburn/xfburn-0.4.3-r3.ebuild
deleted file mode 100644
index 355bfebb1f3c..000000000000
--- a/app-cdr/xfburn/xfburn-0.4.3-r3.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/xfburn/xfburn-0.4.3-r3.ebuild,v 1.8 2012/05/31 03:09:08 zmedico Exp $
-
-EAPI=4
-EAUTORECONF=yes
-inherit eutils xfconf
-
-DESCRIPTION="GTK+ based CD and DVD burning application"
-HOMEPAGE="http://goodies.xfce.org/projects/applications/xfburn"
-SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2
-	mirror://debian/pool/main/x/${PN}/${PN}_${PV}-4.debian.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="debug gstreamer udev"
-
-RDEPEND=">=dev-libs/glib-2.22
-	>=dev-libs/libburn-0.4.2
-	>=dev-libs/libisofs-0.6.2
-	>=x11-libs/gtk+-2.10:2
-	>=xfce-base/exo-0.6
-	>=xfce-base/libxfce4ui-4.8
-	gstreamer? ( >=media-libs/gst-plugins-base-0.10.20:0.10 )
-	udev? ( || ( >=sys-fs/udev-171-r1[gudev] <sys-fs/udev-171-r1[extras] ) )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	dev-util/intltool
-	sys-devel/gettext"
-
-pkg_setup() {
-	PATCHES=(
-		"${FILESDIR}"/${P}-update_desktop_entry.patch
-		"${FILESDIR}"/${P}-empty_directory_segmentation_fault-2.patch
-		"${FILESDIR}"/${P}-gobject_h.patch
-		)
-
-	XFCONF=(
-		$(use_enable udev gudev)
-		$(use_enable gstreamer)
-		$(xfconf_use_debug)
-		)
-
-	DOCS=( AUTHORS ChangeLog NEWS README TODO )
-}
-
-src_prepare() {
-	EPATCH_FORCE=yes EPATCH_SUFFIX=patch EPATCH_SOURCE="${WORKDIR}"/debian/patches epatch
-	xfconf_src_prepare
-}
diff --git a/app-cdr/xfburn/xfburn-0.4.3_p20121021.ebuild b/app-cdr/xfburn/xfburn-0.4.3_p20121021.ebuild
new file mode 100644
index 000000000000..308bc33b7f2f
--- /dev/null
+++ b/app-cdr/xfburn/xfburn-0.4.3_p20121021.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/xfburn/xfburn-0.4.3_p20121021.ebuild,v 1.1 2012/10/21 09:26:14 ssuominen Exp $
+
+EAPI=4
+#EAUTORECONF=yes
+inherit autotools xfconf
+
+DESCRIPTION="GTK+ based CD and DVD burning application"
+HOMEPAGE="http://goodies.xfce.org/projects/applications/xfburn"
+SRC_URI="http://dev.gentoo.org/~ssuominen/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug gstreamer udev"
+
+RDEPEND=">=dev-libs/glib-2.30
+	>=dev-libs/libburn-0.4.2
+	>=dev-libs/libisofs-0.6.2
+	>=x11-libs/gtk+-2.24:2
+	>=xfce-base/exo-0.6
+	>=xfce-base/libxfce4ui-4.10
+	gstreamer? ( >=media-libs/gst-plugins-base-0.10.20:0.10 )
+	udev? ( || ( >=sys-fs/udev-171-r6[gudev] <sys-fs/udev-171[extras] ) )"
+# dev-libs/libxslt -> xsltproc -> --enable-maintainer-mode -> docs/Makefile.am
+DEPEND="${RDEPEND}
+	dev-libs/libxslt
+	dev-util/intltool
+	>=dev-util/xfce4-dev-tools-4.10
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+pkg_setup() {
+	XFCONF=(
+		--enable-maintainer-mode
+		$(use_enable udev gudev)
+		$(use_enable gstreamer)
+		$(xfconf_use_debug)
+		)
+
+	DOCS=( AUTHORS ChangeLog NEWS README TODO )
+}
+
+src_prepare() {
+	# .in.in -> .in
+	sed -i -e '/^exec.*xdt-autogen/d' autogen.sh || die
+	./autogen.sh
+
+	# Prevent glib-gettextize from running wrt #420639
+	intltoolize --automake --copy --force
+	_elibtoolize --copy --force --install
+	AT_M4DIR=${EPREFIX}/usr/share/xfce4/dev-tools/m4macros eaclocal
+	eautoconf
+	eautoheader
+	eautomake
+
+	xfconf_src_prepare
+}
diff --git a/app-dicts/eblook/eblook-1.6.1.ebuild b/app-dicts/eblook/eblook-1.6.1.ebuild
index 2e6c3df160f5..84a9e56a1ab9 100644
--- a/app-dicts/eblook/eblook-1.6.1.ebuild
+++ b/app-dicts/eblook/eblook-1.6.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-dicts/eblook/eblook-1.6.1.ebuild,v 1.7 2012/07/01 09:57:13 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-dicts/eblook/eblook-1.6.1.ebuild,v 1.8 2012/10/20 18:32:59 ago Exp $
 
 EAPI=4
 
@@ -10,7 +10,7 @@ SRC_URI="http://openlab.ring.gr.jp/edict/eblook/dist/${P/_/}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ppc"
+KEYWORDS="~amd64 ppc x86"
 IUSE=""
 
 DEPEND=">=dev-libs/eb-3.3.4"
diff --git a/app-dicts/wnn-ldic/wnn-ldic-1.04.ebuild b/app-dicts/wnn-ldic/wnn-ldic-1.04.ebuild
index 1f4092329902..9d30a8cc11dd 100644
--- a/app-dicts/wnn-ldic/wnn-ldic-1.04.ebuild
+++ b/app-dicts/wnn-ldic/wnn-ldic-1.04.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-dicts/wnn-ldic/wnn-ldic-1.04.ebuild,v 1.4 2009/10/18 01:06:14 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-dicts/wnn-ldic/wnn-ldic-1.04.ebuild,v 1.5 2012/10/20 18:37:13 ago Exp $
 
 DESCRIPTION="Wnn dictionary for librarian"
 
@@ -9,7 +9,7 @@ SRC_URI="http://www.tulips.tsukuba.ac.jp/misc/export/cat/ldic/ldic-${PV}-wnn.txt
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~x86"
 
 IUSE=""
 
diff --git a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.37.ebuild b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.37.ebuild
index bc3910833a04..8895056e9169 100644
--- a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.37.ebuild
+++ b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.37.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.37.ebuild,v 1.1 2012/10/17 14:45:17 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.37.ebuild,v 1.2 2012/10/21 10:59:26 ago Exp $
 
 EAPI="4"
 
@@ -20,7 +20,7 @@ SRC_URI="${X86_AT}"
 
 LICENSE="Oracle-BCLA-JavaSE"
 SLOT="1.6"
-KEYWORDS="-* ~amd64"
+KEYWORDS="-* amd64"
 IUSE="X alsa nsplugin pax_kernel"
 
 RESTRICT="fetch strip"
diff --git a/app-emulation/qemu/files/qemu-0.11.0-mips64-user-fix.patch b/app-emulation/qemu/files/qemu-0.11.0-mips64-user-fix.patch
deleted file mode 100644
index c069f898c12d..000000000000
--- a/app-emulation/qemu/files/qemu-0.11.0-mips64-user-fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- qemu-0.11.0.orig/linux-user/main.c	2009-10-23 02:19:57.000000000 +0200
-+++ qemu-0.11.0/linux-user/main.c	2009-10-23 02:47:09.000000000 +0200
-@@ -1469,6 +1469,8 @@
- 
- #ifdef TARGET_MIPS
- 
-+#define TARGET_QEMU_ESIGRETURN 255
-+
- #define MIPS_SYS(name, args) args,
- 
- static const uint8_t mips_syscall_args[] = {
diff --git a/app-emulation/qemu/files/qemu-0.11.1-CVE-2012-0029-backport.patch b/app-emulation/qemu/files/qemu-0.11.1-CVE-2012-0029-backport.patch
deleted file mode 100644
index d8935e31c3b5..000000000000
--- a/app-emulation/qemu/files/qemu-0.11.1-CVE-2012-0029-backport.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Backported upstream patch:
-> From d0ed2d2e8e863a9a64c9fc9c08fa68bee546ad00 Mon Sep 17 00:00:00 2001
-> From: Anthony Liguori <aliguori@us.ibm.com>
-> Date: Mon, 23 Jan 2012 07:30:43 -0600
-> Subject: [PATCH 26/26] e1000: bounds packet size against buffer size
->
-> Otherwise we can write beyond the buffer and corrupt memory.  This is tracked
-> as CVE-2012-0029.
->
-> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
----
- hw/e1000.c |    3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
-
-diff --git a/hw/e1000.c b/hw/e1000.c
-index b0542d7..54ade40 100644
---- a/hw/e1000.c
-+++ b/hw/e1000.c
-@@ -447,6 +447,8 @@ process_tx_desc(E1000State *s, struct e1000_tx_desc *dp)
-             bytes = split_size;
-             if (tp->size + bytes > msh)
-                 bytes = msh - tp->size;
-+
-+            bytes = MIN(sizeof(tp->data) - tp->size, bytes);
-             cpu_physical_memory_read(addr, tp->data + tp->size, bytes);
-             if ((sz = tp->size + bytes) >= hdr && tp->size < hdr)
-                 memmove(tp->header, tp->data, hdr);
-@@ -462,6 +464,7 @@ process_tx_desc(E1000State *s, struct e1000_tx_desc *dp)
-         // context descriptor TSE is not set, while data descriptor TSE is set
-         DBGOUT(TXERR, "TCP segmentaion Error\n");
-     } else {
-+        split_size = MIN(sizeof(tp->data) - tp->size, split_size);
-         cpu_physical_memory_read(addr, tp->data + tp->size, split_size);
-         tp->size += split_size;
-     }
diff --git a/app-emulation/qemu/files/qemu-0.11.1-cfg-pulse.patch b/app-emulation/qemu/files/qemu-0.11.1-cfg-pulse.patch
deleted file mode 100644
index 767038357cf4..000000000000
--- a/app-emulation/qemu/files/qemu-0.11.1-cfg-pulse.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From: Nathan Phillip Brink <binki@gentoo.org>
-
-Fix detection of pulseaudio caused by not including the headers which
-define NULL.
-
---- a/configure
-+++ b/configure
-@@ -1004,7 +1004,9 @@
-     lib=$3
-     exp=$4
-     cfl=$5
-+    prologue=${6}
-         cat > $TMPC << EOF
-+${prologue}
- #include <$hdr>
- int main(void) { $exp }
- EOF
-@@ -1044,7 +1046,8 @@
- 
-     pa)
-     audio_drv_probe $drv pulse/simple.h -lpulse-simple \
--        "pa_simple *s = NULL; pa_simple_free(s); return 0;"
-+        "pa_simple *s = NULL; pa_simple_free(s); return 0;" \
-+	'' '#include <stddef.h> /* NULL */'
-     ;;
- 
-     oss|sdl|core|wav|dsound)
-
diff --git a/app-emulation/qemu/files/qemu-1.0-unmagic-debug.patch b/app-emulation/qemu/files/qemu-1.0-unmagic-debug.patch
deleted file mode 100644
index 9ad232a778be..000000000000
--- a/app-emulation/qemu/files/qemu-1.0-unmagic-debug.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-commit 5bc62e01cd22ea1f56bde94b0616c46f8af2676e
-Author: Gerd Hoffmann <kraxel@redhat.com>
-Date:   Wed Feb 8 13:54:13 2012 +0100
-
-    build: allow turning off debuginfo
-    
-    This patch adds --{enable,disable}-debug-info switches to configure
-    which allows to include/exclude the '-g' switch on the gcc & ld
-    command lines.  Not building debug info reduces ressource usage
-    (especially disk) alot and is quite useful for test builds.
-    
-    Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
-    Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
-
-diff --git a/configure b/configure
-index a1f4a6b..b22fcda 100755
---- a/configure
-+++ b/configure
-@@ -98,6 +98,7 @@ audio_pt_int=""
- audio_win_int=""
- cc_i386=i386-pc-linux-gnu-gcc
- libs_qga=""
-+debug_info="yes"
- 
- target_list=""
- 
-@@ -207,6 +208,10 @@ for opt do
-   ;;
-   --extra-ldflags=*) LDFLAGS="$optarg $LDFLAGS"
-   ;;
-+  --enable-debug-info) debug_info="yes"
-+  ;;
-+  --disable-debug-info) debug_info="no"
-+  ;;
-   --sparc_cpu=*)
-     sparc_cpu="$optarg"
-     case $sparc_cpu in
-@@ -244,13 +249,15 @@ sdl_config="${SDL_CONFIG-${cross_prefix}sdl-config}"
- 
- # default flags for all hosts
- QEMU_CFLAGS="-fno-strict-aliasing $QEMU_CFLAGS"
--CFLAGS="-g $CFLAGS"
- QEMU_CFLAGS="-Wall -Wundef -Wwrite-strings -Wmissing-prototypes $QEMU_CFLAGS"
- QEMU_CFLAGS="-Wstrict-prototypes -Wredundant-decls $QEMU_CFLAGS"
- QEMU_CFLAGS="-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE $QEMU_CFLAGS"
- QEMU_CFLAGS="-D_FORTIFY_SOURCE=2 $QEMU_CFLAGS"
- QEMU_INCLUDES="-I. -I\$(SRC_PATH) -I\$(SRC_PATH)/fpu"
--LDFLAGS="-g $LDFLAGS"
-+if test "$debug_info" = "yes"; then
-+    CFLAGS="-g $CFLAGS"
-+    LDFLAGS="-g $LDFLAGS"
-+fi
- 
- # make source path absolute
- source_path=`cd "$source_path"; pwd`
-@@ -545,6 +552,10 @@ for opt do
-   ;;
-   --extra-ldflags=*)
-   ;;
-+  --enable-debug-info)
-+  ;;
-+  --disable-debug-info)
-+  ;;
-   --cpu=*)
-   ;;
-   --target-list=*) target_list="$optarg"
diff --git a/app-emulation/qemu/files/qemu-1.0-unmagic-xfsctl.patch b/app-emulation/qemu/files/qemu-1.0-unmagic-xfsctl.patch
deleted file mode 100644
index df8aacbc4f36..000000000000
--- a/app-emulation/qemu/files/qemu-1.0-unmagic-xfsctl.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-commit 8c84cf11660322489f839bc29db79bad31b4ecde
-Author: Sergei Trofimovich <slyfox@gentoo.org>
-Date:   Tue Jan 24 20:42:40 2012 +0300
-
-    ./configure: export xfs config via --{enable, disable}-xfsctl
-    
-    Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
-    Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
-
-diff --git a/configure b/configure
-index 9d5175b..69fb239 100755
---- a/configure
-+++ b/configure
-@@ -766,6 +766,10 @@ for opt do
-   ;;
-   --enable-rbd) rbd="yes"
-   ;;
-+  --disable-xfsctl) xfs="no"
-+  ;;
-+  --enable-xfsctl) xfs="yes"
-+  ;;
-   --disable-smartcard) smartcard="no"
-   ;;
-   --enable-smartcard) smartcard="yes"
diff --git a/app-emulation/qemu/files/qemu-1.0.1-siginfo.patch b/app-emulation/qemu/files/qemu-1.0.1-siginfo.patch
deleted file mode 100644
index 571dd295159b..000000000000
--- a/app-emulation/qemu/files/qemu-1.0.1-siginfo.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From 02d2bd5d57812154cfb978bc2098cf49d551583d Mon Sep 17 00:00:00 2001
-From: "Richard W.M. Jones" <rjones@redhat.com>
-Date: Thu, 5 Jul 2012 03:32:44 +0000
-Subject: [PATCH] Replace 'struct siginfo' with 'siginfo_t'.
-
-glibc 2.16 will remove the undocumented definition of 'struct siginfo'
-from <bits/siginfo.h>.
-
-This change is already present in glibc 2.15.90, so qemu compilation
-of certain targets (eg. cris-user) breaks.
-
-This struct was always typedef'd to be the same as 'siginfo_t' which
-is what POSIX documents, so use that instead.
-
-Signed-off-by: Richard W.M. Jones <rjones@redhat.com>
-Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
-Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
----
- linux-user/signal.c |    8 ++++----
- user-exec.c         |    2 +-
- 2 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/linux-user/signal.c b/linux-user/signal.c
-index 97f30d9..9be5ac0 100644
---- a/linux-user/signal.c
-+++ b/linux-user/signal.c
-@@ -2849,7 +2849,7 @@ static void setup_rt_frame(int sig, struct target_sigaction *ka,
-     * Arguments to signal handler:
-     *
-     *   a0 = signal number
--    *   a1 = pointer to struct siginfo
-+    *   a1 = pointer to siginfo_t
-     *   a2 = pointer to struct ucontext
-     *
-     * $25 and PC point to the signal handler, $29 points to the
-@@ -3255,7 +3255,7 @@ struct target_signal_frame {
- };
- 
- struct rt_signal_frame {
--    struct siginfo info;
-+    siginfo_t info;
-     struct ucontext uc;
-     uint32_t tramp[2];
- };
-@@ -3474,9 +3474,9 @@ struct target_signal_frame {
- };
- 
- struct rt_signal_frame {
--        struct siginfo *pinfo;
-+        siginfo_t *pinfo;
-         void *puc;
--        struct siginfo info;
-+        siginfo_t info;
-         struct ucontext uc;
-         uint8_t retcode[8];       /* Trampoline code. */
- };
-diff --git a/user-exec.c b/user-exec.c
-index b2a4261..1a9c276 100644
---- a/user-exec.c
-+++ b/user-exec.c
-@@ -588,7 +588,7 @@ int cpu_signal_handler(int host_signum, void *pinfo,
- int cpu_signal_handler(int host_signum, void *pinfo,
-                        void *puc)
- {
--    struct siginfo *info = pinfo;
-+    siginfo_t *info = pinfo;
-     struct ucontext *uc = puc;
-     unsigned long pc = uc->uc_mcontext.sc_iaoq[0];
-     uint32_t insn = *(uint32_t *)pc;
--- 
-1.7.9.7
-
diff --git a/app-emulation/qemu/files/qemu-ifdown b/app-emulation/qemu/files/qemu-ifdown
deleted file mode 100644
index c173e43a9813..000000000000
--- a/app-emulation/qemu/files/qemu-ifdown
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-
-if [ -x /sbin/brctl ]; then
-  BRCTL="/sbin/brctl"
-elif [ -x /usr/sbin/brctl ]; then
-  BRCTL="/usr/sbin/brctl"
-else
-  echo "no bridge utils installed"
-  exit 1
-fi
-
-if [ -x /sbin/ip ]; then
-  switch=( $(/sbin/ip route list | awk '/^default / { sub(/.* dev /, ""); print $1 }') )
-  ${BRCTL} delif ${switch} $1
-  /sbin/ip link set $1 down
-else
-  switch=( $(/bin/netstat -rn | awk '/^0\.0\.0\.0/ { print $NF }') )
-  ${BRCTL} delif ${switch} $1
-  /sbin/ifconfig $1 down
-fi
diff --git a/app-emulation/qemu/files/qemu-ifup b/app-emulation/qemu/files/qemu-ifup
deleted file mode 100644
index 4a30e7d5645f..000000000000
--- a/app-emulation/qemu/files/qemu-ifup
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-
-if [ -x /sbin/brctl ]; then
-  BRCTL="/sbin/brctl"
-elif [ -x /usr/sbin/brctl ]; then
-  BRCTL="/usr/sbin/brctl"
-else
-  echo "no bridge utils installed"
-  exit 1
-fi
-
-if [ -x /sbin/ip ]; then
-  switch=( $(/sbin/ip route list | awk '/^default / { sub(/.* dev /, ""); print $1 }') )
-  /sbin/ip link set $1 up
-else
-  switch=( $(/bin/netstat -rn | awk '/^0\.0\.0\.0/ { print $NF }') )
-  /sbin/ifconfig $1 0.0.0.0 up
-fi
-
-[[ ${switch#} -ne "1" ]] && logger -t qemu "$0 found more than one bridge connecting $1 to ${switch}"
-${BRCTL} addif ${switch} $1
-
diff --git a/app-emulation/qemu/files/qemu-kvm-1.0-e1000-bounds-packet-size-against-buffer-size.patch b/app-emulation/qemu/files/qemu-kvm-1.0-e1000-bounds-packet-size-against-buffer-size.patch
deleted file mode 100644
index bd2bdc7425df..000000000000
--- a/app-emulation/qemu/files/qemu-kvm-1.0-e1000-bounds-packet-size-against-buffer-size.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From d0ed2d2e8e863a9a64c9fc9c08fa68bee546ad00 Mon Sep 17 00:00:00 2001
-From: Anthony Liguori <aliguori@us.ibm.com>
-Date: Mon, 23 Jan 2012 07:30:43 -0600
-Subject: [PATCH 26/26] e1000: bounds packet size against buffer size
-
-Otherwise we can write beyond the buffer and corrupt memory.  This is tracked
-as CVE-2012-0029.
-
-Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
----
- hw/e1000.c |    3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
-
-diff --git a/hw/e1000.c b/hw/e1000.c
-index 986ed9c..e164d79 100644
---- a/hw/e1000.c
-+++ b/hw/e1000.c
-@@ -466,6 +466,8 @@ process_tx_desc(E1000State *s, struct e1000_tx_desc *dp)
-             bytes = split_size;
-             if (tp->size + bytes > msh)
-                 bytes = msh - tp->size;
-+
-+            bytes = MIN(sizeof(tp->data) - tp->size, bytes);
-             pci_dma_read(&s->dev, addr, tp->data + tp->size, bytes);
-             if ((sz = tp->size + bytes) >= hdr && tp->size < hdr)
-                 memmove(tp->header, tp->data, hdr);
-@@ -481,6 +483,7 @@ process_tx_desc(E1000State *s, struct e1000_tx_desc *dp)
-         // context descriptor TSE is not set, while data descriptor TSE is set
-         DBGOUT(TXERR, "TCP segmentaion Error\n");
-     } else {
-+        split_size = MIN(sizeof(tp->data) - tp->size, split_size);
-         pci_dma_read(&s->dev, addr, tp->data + tp->size, split_size);
-         tp->size += split_size;
-     }
--- 
-1.7.7.6
-
diff --git a/app-emulation/qemu/qemu-1.1.2.ebuild b/app-emulation/qemu/qemu-1.1.2.ebuild
deleted file mode 100644
index f11b84946c03..000000000000
--- a/app-emulation/qemu/qemu-1.1.2.ebuild
+++ /dev/null
@@ -1,368 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-1.1.2.ebuild,v 1.5 2012/10/10 19:29:27 vapier Exp $
-
-EAPI="4"
-
-MY_PN="qemu-kvm"
-MY_P=${MY_PN}-${PV}
-
-PYTHON_DEPEND="2"
-inherit eutils flag-o-matic linux-info toolchain-funcs multilib python user
-#BACKPORTS=2
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="git://git.kernel.org/pub/scm/virt/kvm/qemu-kvm.git"
-	inherit git-2
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="mirror://sourceforge/kvm/${MY_PN}/${MY_P}.tar.gz
-	${BACKPORTS:+
-		http://dev.gentoo.org/~cardoe/distfiles/${MY_P}-bp-${BACKPORTS}.tar.xz}"
-	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
-fi
-
-DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
-HOMEPAGE="http://www.linux-kvm.org"
-
-LICENSE="GPL-2 LGPL-2 BSD-2"
-SLOT="0"
-IUSE="+aio alsa bluetooth brltty +caps +curl debug doc fdt +jpeg kernel_linux \
-kernel_FreeBSD mixemu ncurses opengl +png pulseaudio python rbd sasl sdl \
-smartcard spice static systemtap tci +threads tls usbredir +uuid vde +vhost-net \
-virtfs +vnc xattr xen xfs"
-
-COMMON_TARGETS="i386 x86_64 alpha arm cris m68k microblaze microblazeel mips mipsel ppc ppc64 sh4 sh4eb sparc sparc64 s390x"
-IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} lm32 mips64 mips64el ppcemb xtensa xtensaeb"
-IUSE_USER_TARGETS="${COMMON_TARGETS} armeb ppc64abi32 sparc32plus unicore32"
-
-# Setup the default SoftMMU targets, while using the loops
-# below to setup the other targets.
-IUSE="${IUSE}"
-REQUIRED_USE="|| ("
-
-for target in ${IUSE_SOFTMMU_TARGETS}; do
-	IUSE="${IUSE} qemu_softmmu_targets_${target}"
-	REQUIRED_USE="${REQUIRED_USE} qemu_softmmu_targets_${target}"
-done
-REQUIRED_USE="${REQUIRED_USE} )"
-
-for target in ${IUSE_USER_TARGETS}; do
-	IUSE="${IUSE} qemu_user_targets_${target}"
-done
-
-REQUIRED_USE="${REQUIRED_USE}
-	static? ( !alsa !pulseaudio )
-	virtfs? ( xattr )"
-
-# Yep, you need both libcap and libcap-ng since virtfs only uses libcap.
-LIB_DEPEND=">=dev-libs/glib-2.0[static-libs(+)]
-	sys-apps/pciutils[static-libs(+)]
-	sys-libs/zlib[static-libs(+)]
-	aio? ( dev-libs/libaio[static-libs(+)] )
-	caps? ( sys-libs/libcap-ng[static-libs(+)] )
-	curl? ( >=net-misc/curl-7.15.4[static-libs(+)] )
-	fdt? ( >=sys-apps/dtc-1.2.0[static-libs(+)] )
-	jpeg? ( virtual/jpeg[static-libs(+)] )
-	ncurses? ( sys-libs/ncurses[static-libs(+)] )
-	png? ( media-libs/libpng[static-libs(+)] )
-	rbd? ( sys-cluster/ceph[static-libs(+)] )
-	sasl? ( dev-libs/cyrus-sasl[static-libs(+)] )
-	sdl? ( >=media-libs/libsdl-1.2.11[static-libs(+)] )
-	spice? ( >=app-emulation/spice-0.9.0[static-libs(+)] )
-	tls? ( net-libs/gnutls[static-libs(+)] )
-	uuid? ( >=sys-apps/util-linux-2.16.0[static-libs(+)] )
-	vde? ( net-misc/vde[static-libs(+)] )
-	xattr? ( sys-apps/attr[static-libs(+)] )
-	xfs? ( sys-fs/xfsprogs[static-libs(+)] )"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
-	!app-emulation/kqemu
-	!app-emulation/qemu
-	!<app-emulation/qemu-1.0
-	>=sys-firmware/seabios-1.7.0
-	sys-firmware/sgabios
-	sys-firmware/vgabios
-	alsa? ( >=media-libs/alsa-lib-1.0.13 )
-	bluetooth? ( net-wireless/bluez )
-	brltty? ( app-accessibility/brltty )
-	opengl? ( virtual/opengl )
-	pulseaudio? ( media-sound/pulseaudio )
-	python? ( =dev-lang/python-2*[ncurses] )
-	sdl? ( media-libs/libsdl[X] )
-	smartcard? ( dev-libs/nss )
-	spice? ( >=app-emulation/spice-protocol-0.8.1 )
-	systemtap? ( dev-util/systemtap )
-	usbredir? ( sys-apps/usbredir )
-	virtfs? ( sys-libs/libcap )
-	xen? ( app-emulation/xen-tools )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-text/texi2html )
-	kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 )
-	static? ( ${LIB_DEPEND} )"
-
-S="${WORKDIR}/${MY_P}"
-
-STRIP_MASK="/usr/share/qemu/palcode-clipper"
-
-QA_PREBUILT="
-	usr/share/qemu/openbios-ppc
-	usr/share/qemu/openbios-sparc64
-	usr/share/qemu/openbios-sparc32
-	usr/share/qemu/palcode-clipper"
-
-QA_WX_LOAD="${QA_PRESTRIPPED}
-	usr/bin/qemu-i386
-	usr/bin/qemu-x86_64
-	usr/bin/qemu-alpha
-	usr/bin/qemu-arm
-	usr/bin/qemu-cris
-	usr/bin/qemu-m68k
-	usr/bin/qemu-microblaze
-	usr/bin/qemu-mips
-	usr/bin/qemu-mipsel
-	usr/bin/qemu-ppc
-	usr/bin/qemu-ppc64
-	usr/bin/qemu-ppc64abi32
-	usr/bin/qemu-sh4
-	usr/bin/qemu-sh4eb
-	usr/bin/qemu-sparc
-	usr/bin/qemu-sparc64
-	usr/bin/qemu-armeb
-	usr/bin/qemu-sparc32plus"
-
-pkg_pretend() {
-	if use kernel_linux && kernel_is lt 2 6 25; then
-		eerror "This version of KVM requres a host kernel of 2.6.25 or higher."
-	elif use kernel_linux; then
-		if ! linux_config_exists; then
-			eerror "Unable to check your kernel for KVM support"
-		else
-			CONFIG_CHECK="~KVM ~TUN ~BRIDGE"
-			ERROR_KVM="You must enable KVM in your kernel to continue"
-			ERROR_KVM_AMD="If you have an AMD CPU, you must enable KVM_AMD in"
-			ERROR_KVM_AMD+=" your kernel configuration."
-			ERROR_KVM_INTEL="If you have an Intel CPU, you must enable"
-			ERROR_KVM_INTEL+=" KVM_INTEL in your kernel configuration."
-			ERROR_TUN="You will need the Universal TUN/TAP driver compiled"
-			ERROR_TUN+=" into your kernel or loaded as a module to use the"
-			ERROR_TUN+=" virtual network device if using -net tap."
-			ERROR_BRIDGE="You will also need support for 802.1d"
-			ERROR_BRIDGE+=" Ethernet Bridging for some network configurations."
-			use vhost-net && CHECK_CHECK+=" ~VHOST_NET"
-			ERROR_VHOST_NET="You must enable VHOST_NET to have vhost-net"
-			ERROR_VHOST_NET+=" support"
-
-			if use amd64 || use x86 || use amd64-linux || use x86-linux; then
-				CONFIG_CHECK+=" ~KVM_AMD ~KVM_INTEL"
-			fi
-
-			use python && CONFIG_CHECK+=" ~DEBUG_FS"
-			ERROR_DEBUG_FS="debugFS support required for kvm_stat"
-
-			# Now do the actual checks setup above
-			check_extra_config
-		fi
-	fi
-
-	if use static; then
-		ewarn "USE=static is very much a moving target because of the packages"
-		ewarn "we depend on will have their static libs ripped out or wrapped"
-		ewarn "with USE=static-libs or USE=static due to continued dicsussion"
-		ewarn "on the mailing list about USE=static's place in Gentoo. As a"
-		ewarn "result what worked today may not work tomorrow."
-	fi
-}
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-
-	enewgroup kvm 78
-}
-
-src_prepare() {
-	# Alter target makefiles to accept CFLAGS set via flag-o
-	sed -i 's/^\(C\|OP_C\|HELPER_C\)FLAGS=/\1FLAGS+=/' \
-		Makefile Makefile.target || die
-
-	python_convert_shebangs -r 2 "${S}/scripts/kvm/kvm_stat"
-
-	[[ -n ${BACKPORTS} ]] && \
-		EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
-			epatch
-
-	epatch_user
-}
-
-src_configure() {
-	local conf_opts audio_opts user_targets
-
-	for target in ${IUSE_SOFTMMU_TARGETS} ; do
-		use "qemu_softmmu_targets_${target}" && \
-		softmmu_targets="${softmmu_targets} ${target}-softmmu"
-	done
-
-	for target in ${IUSE_USER_TARGETS} ; do
-		use "qemu_user_targets_${target}" && \
-		user_targets="${user_targets} ${target}-linux-user"
-	done
-
-	einfo "Building the following softmmu targets: ${softmmu_targets}"
-
-	if [[ -n ${user_targets} ]]; then
-		einfo "Building the following user targets: ${user_targets}"
-		conf_opts="${conf_opts} --enable-linux-user"
-	else
-		conf_opts="${conf_opts} --disable-linux-user"
-	fi
-
-	# Add support for SystemTAP
-	use systemtap && conf_opts="${conf_opts} --enable-trace-backend=dtrace"
-
-	# Fix QA issues. QEMU needs executable heaps and we need to mark it as such
-	#conf_opts="${conf_opts} --extra-ldflags=-Wl,-z,execheap"
-
-	# Add support for static builds
-	use static && conf_opts="${conf_opts} --static --disable-pie"
-
-	# We always want to attempt to build with PIE support as it results
-	# in a more secure binary. But it doesn't work with static or if
-	# the current GCC doesn't have PIE support.
-	if ! use static && gcc-specs-pie; then
-		conf_opts="${conf_opts} --enable-pie"
-	fi
-
-	# audio options
-	audio_opts="oss"
-	use alsa && audio_opts="alsa,${audio_opts}"
-	use sdl && audio_opts="sdl,${audio_opts}"
-	use pulseaudio && audio_opts="pa,${audio_opts}"
-	use mixemu && conf_opts="${conf_opts} --enable-mixemu"
-
-	# --enable-vnc-thread will go away in 1.2
-	# $(use_enable xen xen-pci-passthrough) for 1.2
-	./configure --prefix=/usr \
-		--sysconfdir=/etc \
-		--disable-bsd-user \
-		--disable-guest-agent \
-		--disable-libiscsi \
-		--disable-strip \
-		--disable-werror \
-		--python=python2 \
-		$(use_enable aio linux-aio) \
-		$(use_enable bluetooth bluez) \
-		$(use_enable brltty brlapi) \
-		$(use_enable caps cap-ng) \
-		$(use_enable curl) \
-		$(use_enable debug debug-info) \
-		$(use_enable debug debug-mon) \
-		$(use_enable debug debug-tcg) \
-		$(use_enable doc docs) \
-		$(use_enable fdt) \
-		$(use_enable jpeg vnc-jpeg) \
-		$(use_enable kernel_linux kvm) \
-		$(use_enable kernel_linux kvm-device-assignment) \
-		$(use_enable kernel_linux nptl) \
-		$(use_enable ncurses curses) \
-		$(use_enable opengl) \
-		$(use_enable png vnc-png) \
-		$(use_enable rbd) \
-		$(use_enable sasl vnc-sasl) \
-		$(use_enable sdl) \
-		$(use_enable smartcard smartcard) \
-		$(use_enable smartcard smartcard-nss) \
-		$(use_enable spice) \
-		$(use_enable tci tcg-interpreter) \
-		$(use_enable threads vnc-thread) \
-		$(use_enable tls vnc-tls) \
-		$(use_enable usbredir usb-redir) \
-		$(use_enable uuid) \
-		$(use_enable vde) \
-		$(use_enable vhost-net) \
-		$(use_enable virtfs) \
-		$(use_enable vnc) \
-		$(use_enable xattr attr) \
-		$(use_enable xen) \
-		$(use_enable xfs xfsctl) \
-		--audio-drv-list=${audio_opts} \
-		--target-list="${softmmu_targets} ${user_targets}" \
-		--cc="$(tc-getCC)" \
-		--host-cc="$(tc-getBUILD_CC)" \
-		${conf_opts} \
-		|| die "configure failed"
-
-		# FreeBSD's kernel does not support QEMU assigning/grabbing
-		# host USB devices yet
-		use kernel_FreeBSD && \
-			sed -E -e "s|^(HOST_USB=)bsd|\1stub|" -i "${S}"/config-host.mak
-}
-
-src_install() {
-	emake DESTDIR="${ED}" install
-
-	if [[ -n ${softmmu_targets} ]]; then
-		if use kernel_linux; then
-			insinto /lib/udev/rules.d/
-			doins "${FILESDIR}"/65-kvm.rules
-		fi
-
-		if use qemu_softmmu_targets_x86_64 ; then
-			dobin "${FILESDIR}"/qemu-kvm
-			ewarn "The depreciated '/usr/bin/kvm' symlink is no longer installed"
-			ewarn "You should use '/usr/bin/qemu-kvm', you may need to edit"
-			ewarn "your libvirt configs or other wrappers for ${PN}"
-		else
-			elog "You disabled QEMU_SOFTMMU_TARGETS=x86_64, this disables install"
-			elog "of /usr/bin/qemu-kvm"
-		fi
-	fi
-
-	dodoc Changelog MAINTAINERS TODO pci-ids.txt
-	newdoc pc-bios/README README.pc-bios
-
-	if use doc; then
-		dohtml qemu-doc.html qemu-tech.html || die
-	fi
-
-	use python & dobin scripts/kvm/kvm_stat
-
-	# Remove SeaBIOS since we're using the SeaBIOS packaged one
-	rm "${ED}/usr/share/qemu/bios.bin"
-	dosym ../seabios/bios.bin /usr/share/qemu/bios.bin
-
-	# Remove vgabios since we're using the vgabios packaged one
-	rm "${ED}/usr/share/qemu/vgabios.bin"
-	rm "${ED}/usr/share/qemu/vgabios-cirrus.bin"
-	rm "${ED}/usr/share/qemu/vgabios-qxl.bin"
-	rm "${ED}/usr/share/qemu/vgabios-stdvga.bin"
-	rm "${ED}/usr/share/qemu/vgabios-vmware.bin"
-	dosym ../vgabios/vgabios.bin /usr/share/qemu/vgabios.bin
-	dosym ../vgabios/vgabios-cirrus.bin /usr/share/qemu/vgabios-cirrus.bin
-	dosym ../vgabios/vgabios-qxl.bin /usr/share/qemu/vgabios-qxl.bin
-	dosym ../vgabios/vgabios-stdvga.bin /usr/share/qemu/vgabios-stdvga.bin
-	dosym ../vgabios/vgabios-vmware.bin /usr/share/qemu/vgabios-vmware.bin
-
-	# Remove sgabios since we're using the sgabios packaged one
-	rm "${ED}/usr/share/qemu/sgabios.bin"
-	dosym ../sgabios/sgabios.bin /usr/share/qemu/sgabios.bin
-}
-
-pkg_postinst() {
-	if [[ -n ${softmmu_targets} ]]; then
-		elog "If you don't have kvm compiled into the kernel, make sure you have"
-		elog "the kernel module loaded before running kvm. The easiest way to"
-		elog "ensure that the kernel module is loaded is to load it on boot."
-		elog "For AMD CPUs the module is called 'kvm-amd'"
-		elog "For Intel CPUs the module is called 'kvm-intel'"
-		elog "Please review /etc/conf.d/modules for how to load these"
-		elog
-		elog "Make sure your user is in the 'kvm' group"
-		elog "Just run 'gpasswd -a <USER> kvm', then have <USER> re-login."
-		elog
-		elog "The ssl USE flag was renamed to tls, so adjust your USE flags."
-		elog "The nss USE flag was renamed to smartcard, so adjust your USE flags."
-	fi
-}
diff --git a/app-misc/empty/Manifest b/app-misc/empty/Manifest
index 1b122366dff9..bd71eb1e97e7 100644
--- a/app-misc/empty/Manifest
+++ b/app-misc/empty/Manifest
@@ -1 +1,2 @@
 DIST empty-0.6.18b.tgz 16166 SHA256 8ea08afd6b637c49125b2fa6f0b571fd72b3aa8547a8834266fcbf0302d1efd3 SHA512 3f79ccefc884d541d3ba458839cefd7d979231350dc160020c4789deaf1e25645399258587b0a4b08eb1babe250870a3cc55e5edc135e44f2e6eeaf0e254cea1 WHIRLPOOL 6e282aee1fef96bfde69edb71fac8ada65029a0a21f79685fa6a85a7ef593e543f4242b16a4937721bf7c32a08f1789cda08cad002d8dd691bd87bc8a836a0ba
+DIST empty-0.6.19b.tgz 16075 SHA256 05b7cb361ef815774abda325c09c573f8c9039ccbb71eedc743439e4637c314a SHA512 7afb2b5d08f2d3ebe0819eccef39b2e35fa532b6cbdcef49d2dbb4a5aa57fe55b1765461de9691d6eaa3188a9ecd98c291de738c13c9c2158c4f53d704b83670 WHIRLPOOL ed003801da923de6b50e6b29313b5603c18b98851e7523971b7a1059c9d14bc9545726437c6c8c41427fe7fbac531469aa7500ffb324f3cd77682208da88088b
diff --git a/app-misc/empty/empty-0.6.18b.ebuild b/app-misc/empty/empty-0.6.18b.ebuild
index c5b4172515b4..e108554a86d3 100644
--- a/app-misc/empty/empty-0.6.18b.ebuild
+++ b/app-misc/empty/empty-0.6.18b.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/empty/empty-0.6.18b.ebuild,v 1.3 2012/08/04 10:56:25 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/empty/empty-0.6.18b.ebuild,v 1.4 2012/10/21 15:07:39 pinkbyte Exp $
 
 EAPI="4"
 inherit eutils toolchain-funcs
@@ -18,7 +18,7 @@ RDEPEND="virtual/logger"
 
 src_prepare() {
 	epatch "${FILESDIR}/overflow-fixes.patch"
-	epatch "${FILESDIR}/${P}-respect-LDFLAGS.patch"
+	epatch "${FILESDIR}/${PN}-respect-LDFLAGS.patch"
 }
 
 src_compile() {
diff --git a/app-misc/empty/empty-0.6.19b.ebuild b/app-misc/empty/empty-0.6.19b.ebuild
new file mode 100644
index 000000000000..4071d3df9577
--- /dev/null
+++ b/app-misc/empty/empty-0.6.19b.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/empty/empty-0.6.19b.ebuild,v 1.1 2012/10/21 15:07:39 pinkbyte Exp $
+
+EAPI="4"
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Small shell utility, similar to expect(1)"
+HOMEPAGE="http://empty.sourceforge.net"
+SRC_URI="mirror://sourceforge/empty/${P}.tgz"
+LICENSE="BSD"
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+DEPEND=""
+RDEPEND="virtual/logger"
+
+src_prepare() {
+	epatch "${FILESDIR}/overflow-fixes.patch"
+	epatch "${FILESDIR}/${PN}-respect-LDFLAGS.patch"
+}
+
+src_compile() {
+	emake CC=$(tc-getCC)
+}
+
+src_install() {
+	dobin empty
+	doman empty.1
+	dodoc README
+	use examples && dodoc -r examples
+}
diff --git a/app-misc/empty/files/empty-0.6.18b-respect-LDFLAGS.patch b/app-misc/empty/files/empty-respect-LDFLAGS.patch
similarity index 100%
rename from app-misc/empty/files/empty-0.6.18b-respect-LDFLAGS.patch
rename to app-misc/empty/files/empty-respect-LDFLAGS.patch
diff --git a/app-misc/hivex/Manifest b/app-misc/hivex/Manifest
index 839fdc9ed328..218b453c2adf 100644
--- a/app-misc/hivex/Manifest
+++ b/app-misc/hivex/Manifest
@@ -2,3 +2,4 @@ DIST hivex-1.3.2.tar.gz 1082330 SHA256 e02d664b262f616e842d58a3787315ceb239c5986
 DIST hivex-1.3.3.tar.gz 1135870 SHA256 c6342ad9f3cd55fa4eb2f5d3acbeeb9701c94f0ad31eb9809639f8f6fc2c1676 SHA512 3a96310e8da255e625f63c67dbc71322f136cfd61e240695184ab7dfb5981f672998209847987e127f1ba52b425c3c638b0920e52326e93428f42e51fcfcb1e0 WHIRLPOOL 38071acb48fa75431eaaa2dacd7b8443c8ebaa701269d9f82af71acb8a7085f3987dc35b64b83808088b8d35808f0b54b9d0e1fc6a5252b929298711f2d6f874
 DIST hivex-1.3.5.tar.gz 1142710 SHA256 e3614bc5b8fd8ed5268be7183dea015d5ab2007d8b47f1c594e6a947bb834adf SHA512 20bc10506b875aa9992e391679ecfd9281b6e3c170c636123f5c90021d219858f1b75228276f5dfa45df031489505ffdec7a3a532d3720b144987a5994985ebb WHIRLPOOL fb70051fb9f9fdccb376cd79c20433994fad935bddbb4ed596b5c53895d9e3421afd963a61e7f90e98e36f6597b1c2fabb5ba3c10f6c8cd124c181ee73584a9c
 DIST hivex-1.3.6.tar.gz 1163454 SHA256 aecc2ba1735a818391a430661f805434bf409c9068ffa495763b69ea94e47e64 SHA512 ff89e12042207289f5962bc3eef99003db761ef0e95466fb3b6586aae0cd9051ba64db9dbab406d0d24faf9ebcce2f581f4fa345f01fcd76a618a71c31b30d95 WHIRLPOOL 259c7cb65c1d63042be3494b4ae4442b9cb3982e6e4eb69aaf7051396183b96774afee64eb7d9044935ac5230972515c64d22c3fcfa58d7ea6ed6b07f8716ac0
+DIST hivex-1.3.7.tar.gz 1168881 SHA256 9f74432bb7b620d6629265fa5efefa45a978b1ee80e4891d12789dc34896eb83 SHA512 0e3cbd02e457472a53ec06e0aab3d6fc65f67cf97d1f0bd5d62cadb52fd8f70f4281ee7e1fc614a5aa030d86edaab32c2eea3b9d9d9e2d77c12e4c421118a142 WHIRLPOOL 759307f458c1f2f082462aedc7f19cb5175f72a89efc32815d22f02b26353a73e5c5d0967ff2d002de919a17ae9999fec51b648355a8cdfefbc0557bc33bf9a6
diff --git a/app-misc/hivex/hivex-1.3.7.ebuild b/app-misc/hivex/hivex-1.3.7.ebuild
new file mode 100644
index 000000000000..4657fedde4a5
--- /dev/null
+++ b/app-misc/hivex/hivex-1.3.7.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/hivex/hivex-1.3.7.ebuild,v 1.1 2012/10/21 15:37:45 maksbotan Exp $
+
+EAPI=4
+
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
+USE_RUBY="ruby18"
+RUBY_OPTIONAL=yes
+PYTHON_DEPEND="python? 2:2.6"
+SUPPORT_PYTHON_ABIS=1
+
+inherit autotools-utils eutils perl-app python
+
+DESCRIPTION="Library for reading and writing Windows Registry 'hive' binary files"
+HOMEPAGE="http://libguestfs.org"
+SRC_URI="http://libguestfs.org/download/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ocaml readline +perl python test static-libs ruby"
+
+RDEPEND="
+	virtual/libiconv
+	virtual/libintl
+	dev-libs/libxml2:2
+	ocaml? ( dev-lang/ocaml[ocamlopt]
+			 dev-ml/findlib[ocamlopt]
+			 )
+	readline? ( sys-libs/readline )
+	perl? ( dev-perl/IO-stringy )
+	"
+
+DEPEND="${RDEPEND}
+	dev-lang/perl
+	perl? (
+	 	test? ( dev-perl/Pod-Coverage
+			dev-perl/Test-Pod-Coverage )
+	      )
+	ruby? ( dev-ruby/rake )
+	"
+# Patches added to apstream
+
+DOCS=(README)
+
+pkg_setup() {
+	if use python; then
+		python_pkg_setup
+	fi
+	if use perl; then
+		perl-module_pkg_setup
+	fi
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_with readline)
+		$(use_enable ocaml)
+		$(use_enable perl)
+		--enable-nls
+		$(use_enable python)
+		$(use_enable ruby)
+		--disable-rpath )
+
+	autotools-utils_src_configure
+
+	if use perl; then
+		pushd perl
+		perl-app_src_configure
+		popd
+	fi
+}
+
+src_compile() {
+	autotools-utils_src_compile
+}
+
+src_test() {
+	if use perl;then
+		pushd perl
+		perl-app_src_install
+		popd
+	fi
+
+	autotools-utils_src_compile check
+}
+
+src_install() {
+	strip-linguas -i po
+
+	autotools-utils_src_install "LINGUAS=""${LINGUAS}"""
+
+	if use perl; then
+		fixlocalpod
+	fi
+	if use python; then
+		compile_and_install() {
+			emake -C python clean
+			emake -C python PYTHON_VERSION="${PYTHON_ABI}" \
+							PYTHON_INCLUDEDIR="$(python_get_includedir)" \
+							PYTHON_INSTALLDIR="$(python_get_sitedir)" \
+							DESTDIR="${ED}" install
+		}
+		python_execute_function compile_and_install
+	fi
+}
diff --git a/app-misc/ttysnoop/metadata.xml b/app-misc/ttysnoop/metadata.xml
index d462405e15b6..b6b8956cde34 100644
--- a/app-misc/ttysnoop/metadata.xml
+++ b/app-misc/ttysnoop/metadata.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-  <email>maksbotan@gentoo.org</email>
-</maintainer>
+	<maintainer>
+		<email>pinkbyte@gentoo.org</email>
+		<name>Sergey Popov</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-portage/diffmask/diffmask-0.3.3-r2.ebuild b/app-portage/diffmask/diffmask-0.3.3-r2.ebuild
index 88a3eefe8769..3ef610c8999c 100644
--- a/app-portage/diffmask/diffmask-0.3.3-r2.ebuild
+++ b/app-portage/diffmask/diffmask-0.3.3-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/diffmask/diffmask-0.3.3-r2.ebuild,v 1.1 2012/10/15 08:01:00 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/diffmask/diffmask-0.3.3-r2.ebuild,v 1.2 2012/10/21 08:10:41 mgorny Exp $
 
 EAPI=4
 PYTHON_COMPAT=(python2_6 python2_7 python3_1 python3_2)
@@ -13,7 +13,7 @@ SRC_URI="mirror://bitbucket/mgorny/${PN}/downloads/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~mips ~x86"
+KEYWORDS="~amd64 ~mips ~x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=sys-apps/portage-2.1.8.3"
diff --git a/app-portage/flaggie/flaggie-0.2-r2.ebuild b/app-portage/flaggie/flaggie-0.2-r2.ebuild
index 6ee604270d8d..b2b058eeb215 100644
--- a/app-portage/flaggie/flaggie-0.2-r2.ebuild
+++ b/app-portage/flaggie/flaggie-0.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/flaggie/flaggie-0.2-r2.ebuild,v 1.3 2012/10/20 16:20:23 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/flaggie/flaggie-0.2-r2.ebuild,v 1.4 2012/10/21 08:12:14 mgorny Exp $
 
 EAPI=4
 PYTHON_COMPAT=(python2_6 python2_7 python3_1 python3_2)
@@ -13,7 +13,7 @@ SRC_URI="mirror://bitbucket/mgorny/${PN}/downloads/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~mips ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~mips ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=sys-apps/portage-2.1.8.3"
diff --git a/app-portage/gentoopm/gentoopm-0.2.6.ebuild b/app-portage/gentoopm/gentoopm-0.2.6.ebuild
index 42df5544667d..3c5c8e0ab9ab 100644
--- a/app-portage/gentoopm/gentoopm-0.2.6.ebuild
+++ b/app-portage/gentoopm/gentoopm-0.2.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoopm/gentoopm-0.2.6.ebuild,v 1.1 2012/10/15 07:14:52 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoopm/gentoopm-0.2.6.ebuild,v 1.2 2012/10/21 08:13:52 mgorny Exp $
 
 EAPI=4
 PYTHON_COMPAT=(python2_6 python2_7 python3_1 python3_2)
@@ -13,7 +13,7 @@ SRC_URI="mirror://bitbucket/mgorny/${PN}/downloads/${P}.tar.bz2"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~mips ~x86"
+KEYWORDS="~amd64 ~mips ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="doc"
 
 RDEPEND="|| (
diff --git a/app-portage/install-mask/install-mask-0.0.2-r2.ebuild b/app-portage/install-mask/install-mask-0.0.2-r2.ebuild
index bf29086e76ec..d5124d1accc1 100644
--- a/app-portage/install-mask/install-mask-0.0.2-r2.ebuild
+++ b/app-portage/install-mask/install-mask-0.0.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/install-mask/install-mask-0.0.2-r2.ebuild,v 1.1 2012/10/15 08:12:00 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/install-mask/install-mask-0.0.2-r2.ebuild,v 1.2 2012/10/21 08:13:56 mgorny Exp $
 
 EAPI=4
 PYTHON_COMPAT=(python2_6 python2_7 python3_1 python3_2)
@@ -13,7 +13,7 @@ SRC_URI="mirror://bitbucket/mgorny/${PN}/downloads/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~mips ~x86"
+KEYWORDS="~amd64 ~mips ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND="app-portage/flaggie[${PYTHON_USEDEP}]
diff --git a/app-portage/layman/Manifest b/app-portage/layman/Manifest
index 30a62fe5ac14..343c7382f632 100644
--- a/app-portage/layman/Manifest
+++ b/app-portage/layman/Manifest
@@ -1,3 +1,4 @@
 DIST layman-1.4.1.tar.gz 59960 SHA256 6dfa2a99b6ec4ee2f7a0a9f1e293dbb1bf2a52e408098aebd5031d93f8c4f248 SHA512 8473439b7a7b51af4a35f1229a272438696028451a217195ee1c412cab02a7bd68499c4515cfb5fabc7704bf8afea3eb8809738434dc5978c3d1de131a62ad13 WHIRLPOOL 6cf8da63764ceddd44131022c3014f0a6892b84c093f01794fba1311031e695fbbc4f96c6a7fce5fef461b849ec67d07df830575ae01f33da2fecc842d5bfc22
 DIST layman-1.4.2.tar.gz 60655 SHA256 a10418aa33f4f849c190b5c15b37abac81058858be3cb107d084057cef56ccfd SHA512 b3e4c706873b594876dfe9664b6debd5e75332ea5016a4eb7a91dfdca116c217dba6fe9235ebfbed148e8f05bda44859a2c145ae59f4d45cf5e59fdb89a7370b WHIRLPOOL 05a0953555617f29213e920cf2449ecc281a23348255362701d32d1c6b46e5b770055c3e588a23d9e3344e6bcdcd126e876275599eb4b017b45ab8b07a98afc5
 DIST layman-2.0.0_rc3.tar.gz 74440 SHA256 fcbf59924f2fa62ef16ace2b4d66f9677c57396209b9c41a3548486f8d7453ab SHA512 5e18565f208ca18fbf14a9e3c255f26bf6b806fd809108ca05e2f2ebf46b1bd2557f3bacdef78df802832a5868e5533feb24103e7fb2d997302a961b01582a0d WHIRLPOOL 1a52406fad2fc42f8b8fba8545b33898696e8a05f4166815cd0c143328ffdd0b22eff04115d6541e038d605ff2a896521773709a41d1dc610929701831d9e62f
+DIST layman-2.0.0_rc4.tar.gz 81058 SHA256 b3a4a97c2c7abae0bf41968b373176cc2becbcfef18de33dda8a3fbef0d60eef SHA512 0726e2144008be087d340992f799899c2c7b2292c106d6214eb7194817ad319be3c292f7d81cd1b6756af367d3af8f4062f4f5d95c994804b55730028e2e198b WHIRLPOOL 6bf22e26ef509cfb026709423e93f3c3deb6b0c806ed637fbf61734ef6015035cf7ba4d05a93aa924b669244fe173378a61737fb15337035f5b32318ae049843
diff --git a/app-portage/layman/layman-2.0.0_rc4.ebuild b/app-portage/layman/layman-2.0.0_rc4.ebuild
new file mode 100644
index 000000000000..237b5f80f478
--- /dev/null
+++ b/app-portage/layman/layman-2.0.0_rc4.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/layman-2.0.0_rc4.ebuild,v 1.1 2012/10/21 03:00:31 dolsen Exp $
+
+EAPI="3"
+SUPPORT_PYTHON_ABIS="1"
+PYTHON_DEPEND="2:2.6"
+RESTRICT_PYTHON_ABIS="2.4 3.*"
+PYTHON_USE_WITH="xml"
+
+inherit eutils distutils prefix
+
+DESCRIPTION="Tool to manage Gentoo overlays"
+HOMEPAGE="http://layman.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="bazaar cvs darcs +git mercurial subversion test"
+
+COMMON_DEPS="dev-lang/python"
+DEPEND="${COMMON_DEPS}
+	test? ( dev-vcs/subversion )"
+RDEPEND="${COMMON_DEPS}
+	bazaar? ( dev-vcs/bzr )
+	cvs? ( dev-vcs/cvs )
+	darcs? ( dev-vcs/darcs )
+	git? ( dev-vcs/git )
+	mercurial? ( dev-vcs/mercurial )
+	subversion? (
+		|| (
+			>=dev-vcs/subversion-1.5.4[webdav-neon]
+			>=dev-vcs/subversion-1.5.4[webdav-serf]
+		)
+	)"
+
+src_prepare() {
+	eprefixify etc/layman.cfg layman/config.py
+}
+
+src_test() {
+	testing() {
+		for suite in layman/tests/{dtest,external}.py ; do
+			PYTHONPATH="." "$(PYTHON)" ${suite} \
+					|| die "test suite '${suite}' failed"
+		done
+	}
+	python_execute_function testing
+}
+
+src_install() {
+	distutils_src_install
+
+	insinto /etc/layman
+	doins etc/layman.cfg || die
+
+	doman doc/layman.8
+	dohtml doc/layman.8.html
+
+	keepdir /var/lib/layman
+	keepdir /etc/layman/overlays
+}
+
+pkg_postinst() {
+	distutils_pkg_postinst
+
+	# now run layman's update utility
+	einfo "Running layman-updater..."
+	"${EROOT}"/usr/bin/layman-updater
+	einfo
+}
diff --git a/app-portage/layman/layman-9999.ebuild b/app-portage/layman/layman-9999.ebuild
index 367aac02256a..700a5d28b03c 100644
--- a/app-portage/layman/layman-9999.ebuild
+++ b/app-portage/layman/layman-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/layman-9999.ebuild,v 1.24 2012/10/15 02:47:07 dolsen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/layman-9999.ebuild,v 1.25 2012/10/21 03:00:31 dolsen Exp $
 
 EAPI="3"
 SUPPORT_PYTHON_ABIS="1"
@@ -22,58 +22,59 @@ IUSE="bazaar cvs darcs +git mercurial subversion test"
 
 COMMON_DEPS="dev-lang/python"
 DEPEND="${COMMON_DEPS}
-    test? ( dev-vcs/subversion )
-    app-text/asciidoc"
+	test? ( dev-vcs/subversion )
+	app-text/asciidoc"
 RDEPEND="${COMMON_DEPS}
-    bazaar? ( dev-vcs/bzr )
-    cvs? ( dev-vcs/cvs )
-    darcs? ( dev-vcs/darcs )
-    git? ( dev-vcs/git )
-    mercurial? ( dev-vcs/mercurial )
-    subversion? (
-        || (
-            >=dev-vcs/subversion-1.5.4[webdav-neon]
-            >=dev-vcs/subversion-1.5.4[webdav-serf]
-        )
-    )"
+	bazaar? ( dev-vcs/bzr )
+	cvs? ( dev-vcs/cvs )
+	darcs? ( dev-vcs/darcs )
+	git? ( dev-vcs/git )
+	mercurial? ( dev-vcs/mercurial )
+	subversion? (
+		|| (
+			>=dev-vcs/subversion-1.5.4[webdav-neon]
+			>=dev-vcs/subversion-1.5.4[webdav-serf]
+		)
+	)"
 
 src_prepare() {
-    eprefixify etc/layman.cfg layman/config.py
+	eprefixify etc/layman.cfg layman/config.py
 }
 
 src_test() {
-    testing() {
-        for suite in layman/tests/{dtest,external}.py ; do
-            PYTHONPATH="." "$(PYTHON)" ${suite} \
-                    || die "test suite '${suite}' failed"
-        done
-    }
-    python_execute_function testing
+	testing() {
+		for suite in layman/tests/{dtest,external}.py ; do
+			PYTHONPATH="." "$(PYTHON)" ${suite} \
+					|| die "test suite '${suite}' failed"
+		done
+	}
+	python_execute_function testing
 }
 
 src_compile() {
-    distutils_src_compile
-    # override MAKEOPTS to prevent build failure
-    emake -j1 -C doc || die "emake -C doc failed"
+	distutils_src_compile
+	# override MAKEOPTS to prevent build failure
+	emake -j1 -C doc || die "emake -C doc failed"
 }
 
 src_install() {
-    distutils_src_install
+	distutils_src_install
 
-    insinto /etc/layman
-    doins etc/layman.cfg || die
+	insinto /etc/layman
+	doins etc/layman.cfg || die
 
-    doman doc/layman.8
-    dohtml doc/layman.8.html
+	doman doc/layman.8
+	dohtml doc/layman.8.html
 
-    keepdir /var/lib/layman
+	keepdir /var/lib/layman
+	keepdir /etc/layman/overlays
 }
 
 pkg_postinst() {
-    distutils_pkg_postinst
+	distutils_pkg_postinst
 
-    # now run layman's update utility
-    einfo "Running layman-updater..."
-    "${EROOT}"/usr/bin/layman-updater
-    einfo
+	# now run layman's update utility
+	einfo "Running layman-updater..."
+	"${EROOT}"/usr/bin/layman-updater
+	einfo
 }
diff --git a/app-portage/layman/metadata.xml b/app-portage/layman/metadata.xml
index 576dc44448c4..956db9956fdb 100644
--- a/app-portage/layman/metadata.xml
+++ b/app-portage/layman/metadata.xml
@@ -8,8 +8,10 @@
 	</maintainer>
 	<use>
 		<flag name="bazaar">Support <pkg>dev-vcs/bzr</pkg> based overlays</flag>
+		<flag name="cvs">Support <pkg>dev-vcs/cvs</pkg> based overlays</flag>
 		<flag name="darcs">Support <pkg>dev-vcs/darcs</pkg> based overlays</flag>
 		<flag name="git">Support <pkg>dev-vcs/git</pkg> based overlays</flag>
 		<flag name="mercurial">Support <pkg>dev-vcs/mercurial</pkg> based overlays</flag>
+		<flag name="subversion">Support <pkg>dev-vcs/subversion</pkg> based overlays</flag>
 	</use>
 </pkgmetadata>
diff --git a/app-text/calibre/calibre-0.9.1.ebuild b/app-text/calibre/calibre-0.9.1.ebuild
index 6190213793eb..e661c19b96bc 100644
--- a/app-text/calibre/calibre-0.9.1.ebuild
+++ b/app-text/calibre/calibre-0.9.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.9.1.ebuild,v 1.3 2012/10/19 05:05:52 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.9.1.ebuild,v 1.4 2012/10/20 17:52:25 zmedico Exp $
 
 EAPI=4
 PYTHON_DEPEND=2:2.7
@@ -29,6 +29,7 @@ COMMON_DEPEND="
 	dev-python/netifaces
 	dev-python/python-dateutil
 	>=dev-python/dnspython-1.6.0
+	>=dev-python/cssselect-0.7.1
 	>=dev-python/cssutils-0.9.9
 	>=dev-python/dbus-python-0.82.2
 	>=dev-python/imaging-1.1.6
diff --git a/app-text/calibre/calibre-0.9.2.ebuild b/app-text/calibre/calibre-0.9.2.ebuild
index 999d8425d35e..e5528c321ccc 100644
--- a/app-text/calibre/calibre-0.9.2.ebuild
+++ b/app-text/calibre/calibre-0.9.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.9.2.ebuild,v 1.2 2012/10/19 05:05:52 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.9.2.ebuild,v 1.3 2012/10/20 17:52:25 zmedico Exp $
 
 EAPI=4
 PYTHON_DEPEND=2:2.7
@@ -29,6 +29,7 @@ COMMON_DEPEND="
 	dev-python/netifaces
 	dev-python/python-dateutil
 	>=dev-python/dnspython-1.6.0
+	>=dev-python/cssselect-0.7.1
 	>=dev-python/cssutils-0.9.9
 	>=dev-python/dbus-python-0.82.2
 	>=dev-python/imaging-1.1.6
diff --git a/app-text/calibre/calibre-0.9.3.ebuild b/app-text/calibre/calibre-0.9.3.ebuild
index 9d935e1d0d0e..311b8d0e6d81 100644
--- a/app-text/calibre/calibre-0.9.3.ebuild
+++ b/app-text/calibre/calibre-0.9.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.9.3.ebuild,v 1.1 2012/10/19 05:30:45 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.9.3.ebuild,v 1.2 2012/10/20 17:52:25 zmedico Exp $
 
 EAPI=4
 PYTHON_DEPEND=2:2.7
@@ -29,6 +29,7 @@ COMMON_DEPEND="
 	dev-python/netifaces
 	dev-python/python-dateutil
 	>=dev-python/dnspython-1.6.0
+	>=dev-python/cssselect-0.7.1
 	>=dev-python/cssutils-0.9.9
 	>=dev-python/dbus-python-0.82.2
 	>=dev-python/imaging-1.1.6
diff --git a/dev-haskell/haddock/files/haddock-2.10.0-ticket-202.patch b/dev-haskell/haddock/files/haddock-2.10.0-ticket-202.patch
new file mode 100644
index 000000000000..744609006da7
--- /dev/null
+++ b/dev-haskell/haddock/files/haddock-2.10.0-ticket-202.patch
@@ -0,0 +1,30 @@
+--- haddock-2.10.0-orig/src/Haddock/Interface/Create.hs	2012-03-04 03:21:18.000000000 +1100
++++ haddock-2.10.0/src/Haddock/Interface/Create.hs	2012-06-27 00:05:37.874840635 +1000
+@@ -35,6 +35,7 @@
+ import Name
+ import Bag
+ import RdrName (GlobalRdrEnv)
++import TcRnTypes
+ 
+ 
+ -- | Use a 'TypecheckedModule' to produce an 'Interface'.
+@@ -50,6 +51,8 @@
+       instances     = modInfoInstances mi
+       exportedNames = modInfoExports mi
+ 
++      (TcGblEnv {tcg_rdr_env = gre}, _) = tm_internals_ tm
++
+   -- The renamed source should always be available to us, but it's best
+   -- to be on the safe side.
+   (group_, mayExports, mayDocHeader) <-
+@@ -59,10 +62,6 @@
+         return (emptyRnGroup, Nothing, Nothing)
+       Just (x, _, y, z) -> return (x, y, z)
+ 
+-  -- The pattern-match should not fail, because createInterface is only
+-  -- done on loaded modules.
+-  Just gre <- liftGhcToErrMsgGhc $ lookupLoadedHomeModuleGRE (moduleName mdl)
+-
+   opts0 <- liftErrMsg $ mkDocOpts (haddockOptions dflags) flags mdl
+   let opts
+         | Flag_IgnoreAllExports `elem` flags = OptIgnoreExports : opts0
diff --git a/dev-haskell/haddock/haddock-2.10.0-r1.ebuild b/dev-haskell/haddock/haddock-2.10.0-r2.ebuild
similarity index 77%
rename from dev-haskell/haddock/haddock-2.10.0-r1.ebuild
rename to dev-haskell/haddock/haddock-2.10.0-r2.ebuild
index 91bbc29ca024..7cfedbf0f898 100644
--- a/dev-haskell/haddock/haddock-2.10.0-r1.ebuild
+++ b/dev-haskell/haddock/haddock-2.10.0-r2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-2.10.0-r1.ebuild,v 1.3 2012/09/14 07:03:20 qnikst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-2.10.0-r2.ebuild,v 1.1 2012/10/21 08:04:50 slyfox Exp $
 
 EAPI="4"
 
-CABAL_FEATURES="bin lib profile haddock hscolour"
+CABAL_FEATURES="bin lib profile haddock hscolour nocabaldep"
 inherit eutils haskell-cabal pax-utils
 
 DESCRIPTION="A documentation-generation tool for Haskell libraries"
@@ -33,6 +33,9 @@ src_prepare() {
 	epatch "${FILESDIR}"/${P}-drop-tools.patch
 	# http://www.mail-archive.com/cvs-ghc@haskell.org/msg37186.html
 	epatch "${FILESDIR}"/${P}-dont-crash-on-unicode-strings-in-doc-comments.patch
+	# http://trac.haskell.org/haddock/ticket/202 fixed by upstream in ghc-7.4
+	# branch only (fix is not in master branch on 20120626)
+	epatch "${FILESDIR}/${P}-ticket-202.patch"
 
 	for f in Lex Parse; do
 		rm "src/Haddock/$f."*
@@ -49,7 +52,12 @@ src_configure() {
 	echo -e "#!/bin/sh\necho Haddock version ${PV}" > "${exe}"
 	chmod +x "${exe}"
 
-	haskell-cabal_src_configure --with-haddock="${exe}"
+	# we use 'nocabaldep' to use ghc's bundled Cabal
+	# as external one is likely to break our haddock
+	# (known to work on 1.16.0 and breaks on 1.16.0.1!)
+	haskell-cabal_src_configure \
+		--with-haddock="${exe}" \
+		--constraint="Cabal == $(cabal-version)"
 }
 
 src_compile() {
@@ -63,5 +71,5 @@ src_install() {
 	cabal_src_install
 	# haddock uses GHC-api to process TH source.
 	# TH requires GHCi which needs mmap('rwx') (bug #299709)
-	pax-mark -m "${ED}/usr/bin/${PN}"
+	pax-mark -m "${D}/usr/bin/${PN}"
 }
diff --git a/dev-haskell/haddock/haddock-2.10.0.ebuild b/dev-haskell/haddock/haddock-2.10.0.ebuild
index 1c640a524501..beb282b65cb3 100644
--- a/dev-haskell/haddock/haddock-2.10.0.ebuild
+++ b/dev-haskell/haddock/haddock-2.10.0.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-2.10.0.ebuild,v 1.3 2012/09/14 07:03:20 qnikst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-2.10.0.ebuild,v 1.4 2012/10/21 08:04:50 slyfox Exp $
 
 EAPI="4"
 
-CABAL_FEATURES="bin lib profile haddock hscolour"
+CABAL_FEATURES="bin lib profile haddock hscolour nocabaldep"
 inherit eutils haskell-cabal pax-utils
 
 DESCRIPTION="A documentation-generation tool for Haskell libraries"
@@ -47,7 +47,12 @@ src_configure() {
 	echo -e "#!/bin/sh\necho Haddock version ${PV}" > "${exe}"
 	chmod +x "${exe}"
 
-	haskell-cabal_src_configure --with-haddock="${exe}"
+	# we use 'nocabaldep' to use ghc's bundled Cabal
+	# as external one is likely to break our haddock
+	# (known to work on 1.16.0 and breaks on 1.16.0.1!)
+	haskell-cabal_src_configure \
+		--with-haddock="${exe}" \
+		--constraint="Cabal == $(cabal-version)"
 }
 
 src_compile() {
diff --git a/dev-java/icedtea-bin/Manifest b/dev-java/icedtea-bin/Manifest
index 6a084a6029c8..1041dc5ef679 100644
--- a/dev-java/icedtea-bin/Manifest
+++ b/dev-java/icedtea-bin/Manifest
@@ -2,31 +2,47 @@ DIST icedtea-bin-core-6.1.11.3-amd64.tar.bz2 35220677 SHA256 57221abf8cc0eb10f57
 DIST icedtea-bin-core-6.1.11.3-x86.tar.bz2 36185189 SHA256 89c1b12e368b142328176722744ca58877114b88a0ed14e71eb775a4a64831a2 SHA512 6f6aa5d7c6cdaa0ba2976a7d540528ab356adeb8ccf273442d68b8382d4833368f6e56a79d82daa96446b7cb8d42d1d05a6becc403980865b56aaad4b363cd59 WHIRLPOOL 59d4b689e50f69665b9fb63c333c0d9c7a5f15f028cfdddb44a6cc1f7adfcb7b76dd6621d26b02ad8005f9f565ccc784a7ec5b89da7436e376d04c3a3c08db2a
 DIST icedtea-bin-core-6.1.11.4-amd64.tar.bz2 32979668 SHA256 e43b7359c6501333096faf0b4ea22a820902f9b20719cb253f1a60e43104e37f SHA512 41d10eb58f7387cd852210b730c627fcda40f37249caba68a1686ea779a128bb5be4611ee67aebb58b140b19a08dd3a236f85456f92798020e36c844e4c090dc WHIRLPOOL 81d4d012aa59b37885a109d04de9989a351bbc266e961517d8ced39e3fd6f07aa14f5b34245600daf5f03ab172931720ab0d645ca8227c10ceb65559df9bbde4
 DIST icedtea-bin-core-6.1.11.4-x86.tar.bz2 33929116 SHA256 8d0e72b29d40b9c0079985b3c22e256839ee921afd3f9cf94a2095363161695a SHA512 63371ab4e06357053fd9b4b8f4aed774145f715f8dcfa00fe5243fe3a8af65e305b7006b66432ae3afb6d9f08a2d0cd447e690712eca000e9860404675c93595 WHIRLPOOL 5b329710db5f9a0767ace473124a966a0a433c8a185059252413ecc60414dac1937ce2aa4485dc41d1fba2c948bd675bbd4d42be447fbdcda3477452d488b474
+DIST icedtea-bin-core-6.1.11.5-amd64.tar.bz2 32980753 SHA256 ca12b761f7c299e7485ead654ce640ecec3e311c342cc8d07f8dfa9e8d4cce16 SHA512 8cdd8256fd432ce7a01775908789953bfdad6b2b944afb42282e258e0bba92b29f6f44190e8911a52a909acd07ed5fd07547e808184129e39314310290703ac3 WHIRLPOOL 3fe1dfe6de3ca5ee5d55fe7cada0bfbd0edcb9e43d1ea90a3c271dd29ecb3ddddf99c564c8416af207897e55af103e2d9c6cc9cf373ea94bf669013b4e24e73e
+DIST icedtea-bin-core-6.1.11.5-x86.tar.bz2 33919404 SHA256 bd086dbf01347fcf88a0217278e3c1a30178f596f8a0e49b5b2e7f4b24ddb7d9 SHA512 b2b42639cda25d3bb49d2383c99c65994e99c976cbc0a1094153ed34b0b95a71bba597dc41fb71ab83dcca5dfb144d347efb90f7ba0db6f443d1b5a87c60848b WHIRLPOOL 454ab0b6ec212aee75e3d4bbef299eb4cb4efd39e527502c63407bbab5559c2a6dbee8e9260ada9e6ab175646002e762704514540ac69dc829f49f3ff9701671
 DIST icedtea-bin-core-7.2.2.1-amd64.tar.bz2 34545223 SHA256 7a994ae25bc3d0a5981f7c37f0e2fb96c7518eeb7a698227438c274044777ccf SHA512 1c28dbaa401803379b2133163eeb6070ebcda231a23bf6b1a0f31d502cf140552349423e17d48aab50833d0254978815eb53dacf716b8d9ef5fe60de3395d6cb WHIRLPOOL 6a800c9b48ecf399098f76fbf9504e4bd74b45b73b274fdb4ceee67216a2fcd5f2baa6bed2b28de3dad1d669017f377d5c92c0911e1ccf4ab9fb441b383e68d7
 DIST icedtea-bin-core-7.2.2.1-x86.tar.bz2 35875404 SHA256 68e401fd294f617786019da8470304d250befcbe00d3741da0fae3ab06753e28 SHA512 2cf77aed4c4f18a462f2e18b0ed69df6093f8a570fdc4c98a29d9e6381c8664dd39c74313af4e03c8554ee678c959512738507b96f3b853f700ed59c4d50d619 WHIRLPOOL b3c0247e762d85bd27204468a64caa8e23c9d0558de5562bac79fd90b7e012b156cc2c09f9c825da815751968264104e6eb62d403add91f10fa1e76d69bd12c5
 DIST icedtea-bin-core-7.2.3.2-amd64.tar.bz2 48833057 SHA256 8771c26a5a5cefc8917bcc9b42eb912c3425a1e8e64e12aaeb945f67249d7788 SHA512 0ab92d97930708d3ab4a1f2b53395869da0487ea17b4778162e466249a1e76491bc9a291fe5e16a86ac5c7ba87b51b95b53a901729d4d786104fdf8d1d1e0bc8 WHIRLPOOL 1b59fd6681f4fd46e5d9a71d9058aaf6f81f23150ad3d6413743a3dd218878286d2c8a0b0b08d689c290251117a1980db19ec21e3669324db961fb48d61f24b0
 DIST icedtea-bin-core-7.2.3.2-x86.tar.bz2 49946217 SHA256 6ffba0ee686f8b7eaab99fa7803efb0e1e74c07a12019bdb454715d60f01063e SHA512 09e02d132cb441f302514bb245238d17ccc234f01621022ddc9dafa8f108375b518cde1d03c4382eaa8406df8528544c71b0ba83026b96bcf27904baa4b24b82 WHIRLPOOL 258f68775e36044e9abff4966f17e0d358ef7b7857b635c724a6ba50aeffa21df4af9a1109857b533a16380ee58c88a254dc110a1e06826f4bedc1bc0182098d
+DIST icedtea-bin-core-7.2.3.3-amd64.tar.bz2 48848494 SHA256 3cfdd8d83190892a1540e84daa3c7e454889e151537e708737a413b10ede54ec SHA512 f7238cef43d725e33ec8e27a2ae13500eff2446d393e3704c5c7beb27ffad1bbc52cd13bbbb4ae527702aca56c9b7650a5076b387d760a7f6a0763b439c2a41c WHIRLPOOL eb95a76a9ef25e52f0cc64f2c16ad2d7d8758026cb4c627681b5841e35bc86614a7a9c5a6a6b4d710c4eac50972f9524780e54a65ec041e2fddc1a20c6108f8a
+DIST icedtea-bin-core-7.2.3.3-x86.tar.bz2 49962247 SHA256 d0ad8f8f1f74de7bef59a8284d23e63bb601ba369a86014303b33cf2abcf8bcd SHA512 84efff48a8d3eb5a3c749f7c806c90d1d02e672868dd27573c760ba85b149bbca8979d4a329110d07aa66980e3b33445e261b81554e756a3df802bdee4c61f25 WHIRLPOOL f236132ef0f6ba364789f4cbb6c4451869764028d34c078cb796ee142eb97c8c21ca0a0ff1ebf6410f9c96d0745de21e9dbab78bcf4b7d8c29b1e64fd8544019
 DIST icedtea-bin-doc-6.1.11.3.tar.bz2 11637048 SHA256 42af2848903db3d4e0392aa2eb579bdd755c05f0e12ff1a48975c754e7b18c21 SHA512 bce5193d66d00f5382f816e4238a7a043b42020218eeab948004c3957abb1d6631b91adaaaa3d125bce956d260a2903cb497267c173cd538f3246b81a8c0bc08 WHIRLPOOL 44872c2fd8edb1d8fd0e0be2a0fe194b210862db3c293fea2c5490c3d67be4645796bef22a8ab055c40a8044003cca6e7222df4d635af2b4d352d6d8ba825155
 DIST icedtea-bin-doc-6.1.11.4.tar.bz2 11637075 SHA256 cc9ceab9c8fe60d5ccef80faae2b664a33094f6e94174d2218a332dd1a64efde SHA512 2137aef8d952186dc103da2e80e2f4b634e12a73c19e5c815089f40d8c68ed181a88ab68b0c08e36c4ec5ac370e1520e1c1b44679aff0ae29e257fb61fca87a0 WHIRLPOOL 40e4a856dc79c0d637b64cc910648b1462e46d5c8f3ae7b288157b5844963db41f2a41517d7d48856a32510c7619437b17b042ac71558ffe84bfbc8372e2c50a
+DIST icedtea-bin-doc-6.1.11.5.tar.bz2 11636975 SHA256 0b5dacb7c5873d58c31870090a641cd0df58424478eff2d72499d1af4db35ba3 SHA512 0ffb517a23ee0b9a3876ed7113e86377a16b6bdca6aafc02aa5eb1343ef3bb958c3c255ff0e0958619ac1ebf5c993239ea736ef07204148cdb62b2ce4d5f7569 WHIRLPOOL ef4c53462f666b5202c43d44533b1991406cddc6243f9c2ac60ca8f4634f6f6636caf55a7d49c66851c13a4067013075816bf3f30b72b51aa208dc62852b40e6
 DIST icedtea-bin-doc-7.2.2.1.tar.bz2 12537417 SHA256 211e7849b890091477ea5f5b415808fff516d080bd20363585607fb47ee3078b SHA512 ae33cd133cdfdcc566e2163b0fd099087a2d560af117df2b2a8a8d8518e89d7c42de270b641ffe7ffa497f4288eb8e80b1eb7431bc2bfad586f72a6377067cdc WHIRLPOOL d7a03d7f8191e3d87956f9a030b1a10c62c6e2cc63c8b4841fdef778e5ea69f415232491079372f940043e20aa740a1ecd0b11803fec43a73988603e042fcb48
 DIST icedtea-bin-doc-7.2.3.2.tar.bz2 12532861 SHA256 9213dbd09fcea6fef85f6f0e61c4ee88bf4545779193f7af5a1aef8f05af773f SHA512 5486ba852a3379a7f04e2e6385219e2fffa3506a8e8d80fef668fe391b1ad047496bad511769506ff63cbac3745799650c29c0d5c43738ac40f72b1702179c58 WHIRLPOOL 237ffc186b0940efb485878356a7d80e490c95b0ae20080e59103f4e5a4c0315d611bf7079042bd9439b83895bed7fe25cdabd63781c5eecfa1826997d1e6c68
+DIST icedtea-bin-doc-7.2.3.3.tar.bz2 12533982 SHA256 9f251b1a743f75891ea771de4c6f3f1e250f221f600c59b481cc992ba908fb8a SHA512 cc658427f612c0434411774c47a1e500e56e927f9e77db0685bcdb1e763c6540b286f054f1d2a4f2aeb7db27d02a7e09dbf0b4c1a8fabd9297801ca8608ce006 WHIRLPOOL 31b6fcbfa988001ece3a1dc9dfde679169cf773660c3a5817143f504fb5906b09baa7220e0f4dcb7bccc7a9f84fd5639448b94085e26d040ac67b5811481880d
 DIST icedtea-bin-examples-6.1.11.3-amd64.tar.bz2 2164741 SHA256 820837c0675287260819382032bec17c7d1613be61c447872ffdb5ca758201ca SHA512 1089e0a1cad9a41452b4a3938d45ecc5a223616d502faf0283b69157c2ad2f8d5eb0aed7c70600b79a4128a09b347adc696b04b12016cab8f567650dc9dd6c14 WHIRLPOOL a2eb0989904f6c77678010cdfabde981ad52d0c2d1a46ea5910623769cbbc8bc765e67b9127dd836e538908d89e90d9b1af81e2f3e1dd803bc3e4f57f38958df
 DIST icedtea-bin-examples-6.1.11.3-x86.tar.bz2 2133486 SHA256 193418a4c6889d9071dbdb309fd2fd468a959a69e44e570384c67c7cb4411be1 SHA512 a1c2503f1e0121e47cde38c31ee0f70d8f56f3a97f47cb5d3c21909e2394aaa3a325ee4da55bc1e1ca1d92fbbefc2f9c1b581fc4691942ffe5eea786d8a30952 WHIRLPOOL 96ca5c0059274e6d1ecad26a7f4db87abbaf665b29f2926c76546e567b27148822121ed3678a8743a449377dfa846ad5de95996a03f2a208c5cd792048719022
 DIST icedtea-bin-examples-6.1.11.4-amd64.tar.bz2 2164910 SHA256 0540a0a610c6ef906bc61cae0fc532c422bba4e72e149cc6294df20427ba9a98 SHA512 15c686c201a90bac891a9f616ba738981bc3a8117cdd70edb36c4e0de650e8db4d719fec66bc53e4b5f39907cdee001f0ca571ead709003f3a4bdb15b135cffb WHIRLPOOL 6b7bb5de6bb6f4ddbca687caec5a2cda98f67b71878568271a207f79f0639317dbbe465e7ca5a72bddf623d218fe4b0827be655f796b32cf4da4053371157d4a
 DIST icedtea-bin-examples-6.1.11.4-x86.tar.bz2 2133506 SHA256 6cdcd26e4e3881e57e3915e521340c2b31d1b85d549a74542423147dee285e99 SHA512 1984ce07765a831be625d2ba3180477dde8d71f5cff71a61b22c89a9ffca489f8ac999cc2cec1b5a919a90d87bb2e34e36bee72e1035370097a52269e55de744 WHIRLPOOL b7580dd2ddbc7cf8a4a6c09096f558f225d1f96b89b7eaa21a1a6bdf700b10ec504b2437078766b7e5b0246da1698f6c62ef69eb8bc72104b5b59b981de98f51
+DIST icedtea-bin-examples-6.1.11.5-amd64.tar.bz2 2164804 SHA256 ddfab3fed17111cd766592ed34a3846447a4ea2f779d173f3b7a8e2d0be02286 SHA512 659b32184cbb393cfe925382b8169d2afdd7a68b492aace19ca13e14b76498da042c5a8c0e4e1302098d5b0a7d735beda2d1e2035e43a29abed2d41f737f7726 WHIRLPOOL 13b7373d71fad319fffd1e1d3158f23dd643c4ad78c44c8c0ffe500dee4abbcabf2842a01441efd5625c390519e3c6676a8f912e9c1d4885bbe0bea9210edb8c
+DIST icedtea-bin-examples-6.1.11.5-x86.tar.bz2 2133703 SHA256 4f48a3aa286fc3083f2aaa7e3605bb85c26fea286acfcf800f49e685298593ee SHA512 c01e3b6c323f5ad9163bcd1d27f07cce66cf72f54bc5a2c93240bb7e53a48137fddd9ceab82413aef6781fe1ff79019bb87f2fdecd25a5df685cca9f89957392 WHIRLPOOL 1976e26e211dfa12c30063f2951d91d90c15ead0d1897fcf636451b0f024feff2d691b0f96e440284d7c0d5291af976bae77d4a5c5258c77904f9084302f64f5
 DIST icedtea-bin-examples-7.2.2.1-amd64.tar.bz2 2333141 SHA256 9d5d07664f259c230a39edfb817d3852d1018c057ba5343519231e2386a83605 SHA512 46bc37e95ee4f8a52fba52a355c48970550e28b4ccc8d61a28f16c67a3457e28abd2b321db09862ce21c68dfa87880f62a594efd68729a9338ce4562b5481a23 WHIRLPOOL 87f84af1ed2b7044a92d60e725a8fb4a22d2bb2e40514dbc89f9dd578901930355c542c976f14df582b71686d3787ca446ec0f6741f3c0c9298017937baf6107
 DIST icedtea-bin-examples-7.2.2.1-x86.tar.bz2 2311137 SHA256 0276e8ffefd1640e79d753dafdea8e24e9bc5fed1664adda001196cdccaa219f SHA512 80b31f79c55533db9c518f84862a9d70832b205ec0ebdd4368bb8d7707dfa445fa1a09adaf2e418c89eb51f02d4a7452b8c31800389a986c2cea7655d5663f4d WHIRLPOOL 1a9995d2758980bc099b59d5c7556640e56bd9d78417197ce55b842f50bc94add663f192982a14e416d67b8e82067a5e5fd9ab172ad1ca5b54b44115c51b20ea
 DIST icedtea-bin-examples-7.2.3.2-amd64.tar.bz2 2334178 SHA256 dbe306b6bc306014c03badd13345b1c971d5258919e0b639788a5c71f3b04bb3 SHA512 22f31442a07b8b7f2d5b08c5e31bb27ad4a9748041e251a7bae520b7db69552014077b32f805ca84ceef27b6404faa906b28702a2b87ec133be6b666b907f0b8 WHIRLPOOL 71bc98528c6655cd8c3f3cc42887cc21899a23da31815ea4463966aed93124a7815b66fbf68d806e6d7ca16a7d4892da4d61e4981bf2bd0d7fe748578dac7e95
 DIST icedtea-bin-examples-7.2.3.2-x86.tar.bz2 2313941 SHA256 4fe47c64d5e53c828f1cc93657e68db7b18fa5df39dd3f308db9e4d26bfac614 SHA512 29af358bd9eb3f60827742cd838a229b3c36842a6d0c07429a3a9fcd6ad1506d2636bdc2ab7290db2b67d495596a9d625b67574b8059a6e877f28174d9505b4e WHIRLPOOL ec4b37fb8816c0d158257321a0ea662ba166db24299d12ecc9b84a6469b899fe9a3710b2fbd7b81ce7d0f92bcaac179c00c8e0b2de4d454a041d68b606e1ba3b
+DIST icedtea-bin-examples-7.2.3.3-amd64.tar.bz2 2334417 SHA256 f02e6492f9dbfcf70e04b6fa4ef1e0d883c7e3751f16f6dd2c734ce981880124 SHA512 1585e22d5f87446e1c937d6e012025adc39b737bba81aebb52b0ec996e00d8fa20faeda37158f12fe55bfbdf8bdb64539719aabd8f2439112a8e67e17f0e311b WHIRLPOOL a2ef26ee0101249c93ce332742485feaa2df32cdd6ffbf5506ef163f75cb3bb7c28b605350c3b2c15a9a8ac5deacecf0ada4e90099b47bb058e34514faa494c1
+DIST icedtea-bin-examples-7.2.3.3-x86.tar.bz2 2313601 SHA256 61ef2242b646235006bc06451c9620d11b289e4a857286ae20283330545d919b SHA512 77af4a58cbb0a120c898a7cdeec30b4b1f55a74479cdab7801ab274814e5546d2dd2b8c154aedd70edd4aa226eb83538fd23a9fa16481303fc039fe5f5866201 WHIRLPOOL 432d82f02331225d6b70e17676f7fb989e290e915a18db7bf363ec1a35e60a6e470db369632eaeb1b9d8194ae488a49ff9665680d1a949ee94763dd1e0d6e1fd
 DIST icedtea-bin-nsplugin-6.1.11.3-r1-amd64.tar.bz2 932423 SHA256 c39bb89524dcfd8360e6daeb523b3fca2645380006b392bcde1143c192953c31 SHA512 73f6ade8c6049669c8afb9dd5c5f67564669d05bf2d9288a09c045b0d6d694c08aa53be144819f465589faee77177fae707ad2bfb4ac6654708d496eb0509176 WHIRLPOOL 05c734fe908ad7390092be0d14d0e8689218e494abc2ea6de05aea31a744059531c179c7bcd756abfc045072228715298b2a816d1a0fca534d092c1720ea0797
 DIST icedtea-bin-nsplugin-6.1.11.3-r1-x86.tar.bz2 925742 SHA256 25ec2b630371c1c7783b8ff0676828a0a05485404f350c36744505daa997cbc6 SHA512 f3eb8cad679f07501a0500ef2dec006adf833e4b5cdfb0de98b744cf90ef7de58a04f7c962d23b2ea7bc2ed5ed6c094a6e22dfe47e08af1b3e5a0b091fe613f9 WHIRLPOOL 5c9425719dc2baadf1d4ac29c99350e6a727402786c38920d4ed0fa78555a33c81cdead1c121cf53348ea9108105a28c69170bff94c40ea4e12ba24c0af539f4
 DIST icedtea-bin-nsplugin-6.1.11.4-amd64.tar.bz2 932183 SHA256 f4e451094901205a3c24e7236dbd2e93014397c07d4595b76541f436ca4bccb9 SHA512 629468f192ed9d014643199d4287f2d1ec2d98d508a25a43bf20187b28aa0e805aef6dd7de41e32e57e8b0e97362c0504c5d6898defeca1910715272269eb0c9 WHIRLPOOL 014823f9d5736bc03618cad0e3e271cb3e6dd2c5d1826dcbf9e92d84f1150208df60e25653d29512d882558a022b0c6b3a79a0cb013e60db8356f6a246077355
 DIST icedtea-bin-nsplugin-6.1.11.4-x86.tar.bz2 926156 SHA256 1b6f98971ce1b5541c598eb6baf1ea62fb06b0f5ba14916b7c0fd2dcf1a029e1 SHA512 e75fec899070b1bca855951095ce31738e3ff717f431f12af683389d0180859c937dcea1945ec8086eb25be0a86767e1410a5b52067033ab77face54f49ca0bc WHIRLPOOL 379fd62d8d65b1f61e1e14c41a5e2e8a65af6f9922be6a3b5e9d67a004861bd06b04723f27d55545e8d7f788212ff81664a2eea78495a013eb833866c29f3618
+DIST icedtea-bin-nsplugin-6.1.11.5-amd64.tar.bz2 1008682 SHA256 92d960861834d3a8731e4a2f9589dcab4ba8c70e250b0deb63b96582ab33b731 SHA512 05cff934639baece960552938a0f52ac2cc0e5f14bd82ca9922b59870542e0a1d1d1e40a758aa5e77595ff7fad41d3bcf6ca368a9a097eb86fc2b5a424b89276 WHIRLPOOL e4994b44b3044deece2c36862500ffb15e19362e4aec0ad5a856cbb2006d55cedd554155e09153fc15f2c3431b0c90305a59521a256ce402a0e1af731cd98561
+DIST icedtea-bin-nsplugin-6.1.11.5-x86.tar.bz2 1002312 SHA256 bcab76c6e2cb2dd678650ff9505f018a0244c8f2333c1a3ef6bf4ea3acc5372d SHA512 373c9b74f92e2d3ecb68b3815ac999d7e5411078b3398fb71722a4ba6d9518ae96d686536c204f632e19dbe86e2bbd00e8d518b2c8fbb69aba19ce28ff646e57 WHIRLPOOL 09b992843154afdfefbed396746921c4585312f1e4efebf55c872f7a79edbf89452e3078e0ec6cf103a9c87762e1cdcf47fee3eacdc48543f92203df049c86a5
 DIST icedtea-bin-nsplugin-7.2.2.1-r1-amd64.tar.bz2 964786 SHA256 5a084b0d6a3d3fc64f1bfc9f87a2c67f4aceea6819d09416e5480309b59daea6 SHA512 769b7c24b94742886294d7aae4d9ec074292811dd68ffccb7775cd2218faabb7acba8000efef4281d92001276c332134edd4ffb75c7441c01aee16760ae52500 WHIRLPOOL e2bf4fab5f7acc96bf4ee9f388274b9920f8e4a5c257729e39b0e4ffb66a954b67fbd0fd2306cc56b5827ca157c526715741d860d84ff304479be7f7df3e7f13
 DIST icedtea-bin-nsplugin-7.2.2.1-r1-x86.tar.bz2 958854 SHA256 afbf663f91ba3a66d131cc4eb7b4d14038fcb7d6d1f29f1672242e0a512d048c SHA512 e6c309fba200a309afb369f277f9df2fbfe75ca6f1c179d76f5d4f6c2067309f19214261523239a401050d9151d967a5c2ffcef1b320fdca9e4ad5bd3810aee8 WHIRLPOOL 81533335eb77460b5918e9135e15d61716d5cf07e131239e690c6403b569cb4d47e7aa20cf83bc525ddcd873f98365e1a226c4bab7337e37d12c3c2cdf2735dc
 DIST icedtea-bin-nsplugin-7.2.3.2-amd64.tar.bz2 964874 SHA256 928c96c01e63f152e5709228d220f8d8a53179de52d640735385cbf39690f518 SHA512 647784a8dc12e3749fefbffa8e0dda0fd4e06a27081debb890039f5d547f247a4f00caebfb11988c7ff576e0977acaec42d57b3afa5c36a26c116c33bb8bde08 WHIRLPOOL a3cc7c1127132b3d8e410fde30a41331c1c8c84b323b11764274d24cc2f4065e829d2ad48539c7c5eafd3b45e0618813187802e673fcc765a957d98ba1a326d4
 DIST icedtea-bin-nsplugin-7.2.3.2-x86.tar.bz2 958329 SHA256 28087df12bef7606a0a36f6bb5fef2c1edff8ce301fe065cd08f511def9c7b2e SHA512 bd3ee7468c94d793d5d8f380796259b568c30edb404a675c2e3c6a4867d90dbc37b3737782933f81244942300407d8c3a561fc579990e38c3122fd9094375bb3 WHIRLPOOL faf1e62471ec64e20a43766c01f3a946c5fbb26c58d162fa363255c42e629d99009cc291aa344c0ec2742e6f9f7ea384a9789db160b05919f53e0193a366b741
+DIST icedtea-bin-nsplugin-7.2.3.3-amd64.tar.bz2 1042904 SHA256 f3d3b9547260a992b281f19757e2102fe5d635f6785c22d582b5baebcedfccef SHA512 5afb8e775890fd09da3f4394aa17636b6121bd2066d09de508256f1bd6020a58d672ba72351fa71c18a57b9aa0aefbd0b6f7b407dd736181bfd02adcf7a79577 WHIRLPOOL 2ae06ff8702fd276836f5f7b8abc772984fb2628ae2ed265caa089d36b1bf6d22a3116cb6e8db22e8a30d410472156c1fb76d7179733ca33d6b3b2c9a87d858d
+DIST icedtea-bin-nsplugin-7.2.3.3-x86.tar.bz2 1036471 SHA256 f5bfe521cfe7a88f3d51f38c71e3fdf2bdb36f584f3dc792cb4fd92fc39d934e SHA512 bf5c1f9f6a6e918e096938889aff94d54eb8b0e7e89847475f6a4f4045d65b752ffeeea42040ba64ec057e091a704d6143b0e85d12a84ff0eed8bf52c1fbf78e WHIRLPOOL d331440494dd7f5ede97ccf2441617f6a05752363c395032f88675ee969a52ba79c47e6e13474ac191f17a4474060a66f6d1dd4292f791e6b9e32a3bfa24ac5f
 DIST icedtea-bin-src-6.1.11.3.tar.bz2 40853562 SHA256 8082fac3686976e815a1817f874bcd319ff6c7ad87a20f26ea4172d48bf60b43 SHA512 d9add829594aca50a3bb338cee97109d8be12fc6455b1a5f815bbcc36ad23104227ca4e80dfaccba38734f22e881b381ca035d8e61c545ade78366821f82f7b1 WHIRLPOOL c47bee04158d65fceae5e47466b19fc89b9c3965521908d65d7e11d8cf7deaee786b556259cc09f2f2f07aafdc61b2f9f15c089016c1f4d31713536796122b75
 DIST icedtea-bin-src-6.1.11.4.tar.bz2 40856998 SHA256 a403d0e8314f6af40405c47c9457baf5b1a1e7a43b189d6ba341cb6d89c9172f SHA512 860e7d05bbdd07c205e73b7ac0ea222b86cb559906d994ba34653aab271e6373e0ef20d44bf36219cf460e77dfc7964f5770c10878462d136af8d5450695cd8e WHIRLPOOL 083f4ab0a68ca01710781b81afc75b626dd068ff7fd8f4f4c0118c389184b58d55aaefba26af60846c241766e8d3f3bfcb2de5fb52e4fbbd02f603404c05cb73
+DIST icedtea-bin-src-6.1.11.5.tar.bz2 40863162 SHA256 f6108917d2fdfcf201f991fde861df8107978198dd37463f9d2a5e2d7d563074 SHA512 fc0e6a6cd4857abb7c757b14dcb77724e13df85151ef0bcb8f8013e58919f5d7f6ba7ee601e36f99f6f43eee83ac1c74ec567ea64daf7d2d706b60561340d793 WHIRLPOOL 02e7a60a374597561d35c9381872b046de6fb087d5a48dfb2de2097afe4222e1e004e02048229eda7c2561375ab9fbff78eaa193623b825c07158e52237b0290
 DIST icedtea-bin-src-7.2.2.1.tar.bz2 41372726 SHA256 5b85db6829f77daa78c69a2044369bc24cf4833a7f0da5e7edc240b74e1f18fd SHA512 016865c61fb50c8ddcd69f752c207fcd06ebba2a6d8bbcaa51d018c3005b02394502e1fee191a3d597360a9a10fcc8255b0eaca499060101207f04d02f037fb1 WHIRLPOOL 629e8388eb534f4fffd4ffb75c8e099a943c6a0fdedc3c283f80f1acff3c6faccf1a1ebe8075ac84b79858bfcd3988afdd6f9a8b9e55c5851f60b584b27ef20e
 DIST icedtea-bin-src-7.2.3.2.tar.bz2 41280408 SHA256 7aa0f52a63f0f3eb5fb0823da7981fe8d4d832e9ea5822222b5a0d15c824df61 SHA512 8a2871717c347de34212a47fd5b708ff6be10fde83e89d84c76b195da5e4e676835751f7349e0aeb90a50895bf30d998f34addc0b162925b058946f1d0ae6377 WHIRLPOOL ef8b8e933175f0bc2b2ed26e4ea17c6ec4c9227343858ef11415e933b5777a72fccf0fe89eed23d335c46c9f264b724df49729c936f5afc5c889b854744c3de6
+DIST icedtea-bin-src-7.2.3.3.tar.bz2 41285893 SHA256 d781856b75d062480db486945c3a8408078a3a0ef80fe58dae6ac3dc9fa65abb SHA512 0d08e9282fe9e5ca1ae4ce8d866ee85d49f8d53f8c8dca6fe7fc198fb74fd28b6ec84ec8ca74c78d8da8a764c62ab544769cc5b1afa305edbcaad702a956e4c8 WHIRLPOOL 618218c213dce7ab6193c98d6b6fce481c66945aaefbe21cdc3ca8f8c791d8bfa20e40d939e0bbdd18aee8ae151bd0469777c71c96c1d038c635e94f94e84973
diff --git a/dev-java/icedtea-bin/icedtea-bin-6.1.11.5.ebuild b/dev-java/icedtea-bin/icedtea-bin-6.1.11.5.ebuild
new file mode 100644
index 000000000000..3a3e8ed41aaf
--- /dev/null
+++ b/dev-java/icedtea-bin/icedtea-bin-6.1.11.5.ebuild
@@ -0,0 +1,152 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-bin/icedtea-bin-6.1.11.5.ebuild,v 1.2 2012/10/21 10:31:52 ago Exp $
+
+EAPI="4"
+
+inherit java-vm-2 multilib prefix
+
+dist="http://dev.gentoo.org/~caster/distfiles/"
+TARBALL_VERSION="${PV}"
+PLUGIN_VERSION="${PVR}"
+
+DESCRIPTION="A Gentoo-made binary build of the IcedTea JDK"
+HOMEPAGE="http://icedtea.classpath.org"
+SRC_URI="
+	amd64? ( ${dist}/${PN}-core-${TARBALL_VERSION}-amd64.tar.bz2 )
+	x86? ( ${dist}/${PN}-core-${TARBALL_VERSION}-x86.tar.bz2 )
+	doc? ( ${dist}/${PN}-doc-${TARBALL_VERSION}.tar.bz2 )
+	examples? (
+		amd64? ( ${dist}/${PN}-examples-${TARBALL_VERSION}-amd64.tar.bz2 )
+		x86? ( ${dist}/${PN}-examples-${TARBALL_VERSION}-x86.tar.bz2 )
+	)
+	nsplugin? (
+		amd64? ( ${dist}/${PN}-nsplugin-${PLUGIN_VERSION}-amd64.tar.bz2 )
+		x86? ( ${dist}/${PN}-nsplugin-${PLUGIN_VERSION}-x86.tar.bz2 )
+	)
+	source? ( ${dist}/${PN}-src-${TARBALL_VERSION}.tar.bz2 )"
+
+LICENSE="GPL-2-with-linking-exception"
+SLOT="6"
+KEYWORDS="-* amd64 ~x86"
+
+IUSE="+X +alsa cjk +cups doc examples nsplugin source"
+REQUIRED_USE="nsplugin? ( X )"
+RESTRICT="strip"
+
+# 423161
+QA_PREBUILT="opt/.*"
+
+ALSA_COMMON_DEP="
+	>=media-libs/alsa-lib-1.0.20"
+CUPS_COMMON_DEP="
+	>=net-print/cups-1.4"
+X_COMMON_DEP="
+	dev-libs/glib
+	>=media-libs/freetype-2.3.9:2
+	>=x11-libs/gtk+-2.20.1:2
+	>=x11-libs/libX11-1.3
+	>=x11-libs/libXext-1.1
+	>=x11-libs/libXi-1.3
+	>=x11-libs/libXtst-1.1"
+
+COMMON_DEP="
+	>=media-libs/giflib-4.1.6-r1
+	>=media-libs/libpng-1.5
+	>=sys-devel/gcc-4.3
+	>=sys-libs/glibc-2.11.2
+	>=sys-libs/zlib-1.2.3-r1
+	virtual/jpeg
+	nsplugin? (
+		>=dev-libs/atk-1.30.0
+		>=dev-libs/glib-2.20.5:2
+		>=dev-libs/nspr-4.8
+		>=x11-libs/cairo-1.8.8
+		>=x11-libs/pango-1.24.5
+
+	)"
+
+RDEPEND="${COMMON_DEP}
+	X? (
+		${X_COMMON_DEP}
+		media-fonts/dejavu
+		cjk? (
+			media-fonts/arphicfonts
+			media-fonts/baekmuk-fonts
+			media-fonts/lklug
+			media-fonts/lohit-fonts
+			media-fonts/sazanami
+		)
+	)
+	alsa? ( ${ALSA_COMMON_DEP} )
+	cups? ( ${CUPS_COMMON_DEP} )"
+
+src_install() {
+	local dest="/opt/${P}"
+	local ddest="${ED}/${dest}"
+	dodir "${dest}"
+
+	# Ensures HeadlessGraphicsEnvironment is used.
+	if ! use X; then
+		rm -r jre/lib/$(get_system_arch)/xawt || die
+	fi
+
+	# doins can't handle symlinks.
+	cp -pRP bin include jre lib man "${ddest}" || die
+
+	# Remove on next bump as the needed marks are already set by icedtea ebuild.
+	java-vm_set-pax-markings "${ddest}"
+
+	dodoc ../doc/{ASSEMBLY_EXCEPTION,THIRD_PARTY_README}
+
+	if use doc; then
+		dohtml -r ../doc/html/*
+	fi
+
+	if use examples; then
+		cp -pRP share/{demo,sample} "${ddest}" || die
+	fi
+
+	if use source; then
+		cp src.zip "${ddest}" || die
+	fi
+
+	if use nsplugin; then
+		cp -pPR ../icedtea-web-bin-${SLOT} "${ddest}"/.. || die
+		install_mozilla_plugin "/opt/icedtea-web-bin-${SLOT}/$(get_libdir)/IcedTeaPlugin.so"
+		docinto icedtea-web
+		dodoc ../doc/icedtea-web/*
+	fi
+
+	# Remove after next bump, handled by icedtea ebuild. Bug 390663
+	cp "${FILESDIR}"/fontconfig.Gentoo.properties.src "${T}"/fontconfig.Gentoo.properties || die
+	eprefixify "${T}"/fontconfig.Gentoo.properties
+	insinto "${dest}"/jre/lib
+	doins "${T}"/fontconfig.Gentoo.properties
+
+	set_java_env
+	java-vm_revdep-mask "${dest}"
+}
+
+pkg_preinst() {
+	if has_version "<=dev-java/icedtea-bin-1.10.4:${SLOT}"; then
+		# portage would preserve the symlink otherwise, related to bug #384397
+		rm -f "${EROOT}/usr/lib/jvm/icedtea6-bin"
+		elog "To unify the layout and simplify scripts, the identifier of Icedtea-bin-6*"
+		elog "has changed from 'icedtea6-bin' to 'icedtea-bin-6' starting from version 6.1.10.4"
+		elog "If you had icedtea6-bin as system VM, the change should be automatic, however"
+		elog "build VM settings in /etc/java-config-2/build/jdk.conf are not changed"
+		elog "and the same holds for any user VM settings. Sorry for the inconvenience."
+	fi
+}
+
+pkg_postinst() {
+	# Set as default VM if none exists
+	java-vm-2_pkg_postinst
+
+	if use nsplugin && [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog "The icedtea-bin-${SLOT} browser plugin can be enabled using eselect java-nsplugin"
+		elog "Note that the plugin works only in browsers based on xulrunner-1.9.1+"
+		elog "such as Firefox 3.5+ and recent Chromium versions."
+	fi
+}
diff --git a/dev-java/icedtea-bin/icedtea-bin-7.2.3.3.ebuild b/dev-java/icedtea-bin/icedtea-bin-7.2.3.3.ebuild
new file mode 100644
index 000000000000..3ad0f7431c80
--- /dev/null
+++ b/dev-java/icedtea-bin/icedtea-bin-7.2.3.3.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-bin/icedtea-bin-7.2.3.3.ebuild,v 1.1 2012/10/20 21:47:49 caster Exp $
+
+EAPI="4"
+
+inherit java-vm-2 multilib prefix
+
+dist="http://dev.gentoo.org/~caster/distfiles/"
+TARBALL_VERSION="${PV}"
+PLUGIN_VERSION="${PVR}"
+
+DESCRIPTION="A Gentoo-made binary build of the IcedTea JDK"
+HOMEPAGE="http://icedtea.classpath.org"
+SRC_URI="
+	amd64? ( ${dist}/${PN}-core-${TARBALL_VERSION}-amd64.tar.bz2 )
+	x86? ( ${dist}/${PN}-core-${TARBALL_VERSION}-x86.tar.bz2 )
+	doc? ( ${dist}/${PN}-doc-${TARBALL_VERSION}.tar.bz2 )
+	examples? (
+		amd64? ( ${dist}/${PN}-examples-${TARBALL_VERSION}-amd64.tar.bz2 )
+		x86? ( ${dist}/${PN}-examples-${TARBALL_VERSION}-x86.tar.bz2 )
+	)
+	nsplugin? (
+		amd64? ( ${dist}/${PN}-nsplugin-${PLUGIN_VERSION}-amd64.tar.bz2 )
+		x86? ( ${dist}/${PN}-nsplugin-${PLUGIN_VERSION}-x86.tar.bz2 )
+	)
+	source? ( ${dist}/${PN}-src-${TARBALL_VERSION}.tar.bz2 )"
+
+LICENSE="GPL-2-with-linking-exception"
+SLOT="7"
+KEYWORDS="-* ~amd64 ~x86"
+
+IUSE="+X +alsa cjk +cups doc examples nsplugin source"
+REQUIRED_USE="nsplugin? ( X )"
+RESTRICT="strip"
+
+# 423161
+QA_PREBUILT="opt/.*"
+
+ALSA_COMMON_DEP="
+	>=media-libs/alsa-lib-1.0.20"
+CUPS_COMMON_DEP="
+	>=net-print/cups-1.4"
+X_COMMON_DEP="
+		>=dev-libs/atk-1.30.0
+		>=dev-libs/glib-2.20.5:2
+		>=media-libs/fontconfig-2.6.0-r2:1.0
+		>=media-libs/freetype-2.3.9:2
+		>=x11-libs/cairo-1.8.8
+		x11-libs/gdk-pixbuf:2
+		>=x11-libs/gtk+-2.20.1:2
+		>=x11-libs/libX11-1.3
+		>=x11-libs/libXext-1.1
+		>=x11-libs/libXi-1.3
+		x11-libs/libXrender
+		>=x11-libs/libXtst-1.1
+	>=x11-libs/pango-1.24.5"
+
+COMMON_DEP="
+	>=media-libs/giflib-4.1.6-r1
+	media-libs/lcms:2
+	>=media-libs/libpng-1.5
+	>=sys-devel/gcc-4.3
+	>=sys-libs/glibc-2.11.2
+	>=sys-libs/zlib-1.2.3-r1
+	virtual/jpeg"
+
+# cups is needed for X. #390945 #390975
+RDEPEND="${COMMON_DEP}
+	X? (
+		${CUPS_COMMON_DEP}
+		${X_COMMON_DEP}
+		media-fonts/dejavu
+		cjk? (
+			media-fonts/arphicfonts
+			media-fonts/baekmuk-fonts
+			media-fonts/lklug
+			media-fonts/lohit-fonts
+			media-fonts/sazanami
+		)
+	)
+	alsa? ( ${ALSA_COMMON_DEP} )
+	cups? ( ${CUPS_COMMON_DEP} )"
+
+src_install() {
+	local dest="/opt/${P}"
+	local ddest="${ED}/${dest}"
+	dodir "${dest}"
+
+	# Ensures HeadlessGraphicsEnvironment is used.
+	if ! use X; then
+		rm -r jre/lib/$(get_system_arch)/xawt || die
+	fi
+
+	# doins can't handle symlinks.
+	cp -pRP bin include jre lib man "${ddest}" || die
+
+	# Remove on next bump as the needed marks are already set by icedtea ebuild.
+	java-vm_set-pax-markings "${ddest}"
+
+	dodoc ../doc/{ASSEMBLY_EXCEPTION,THIRD_PARTY_README}
+
+	if use doc; then
+		dohtml -r ../doc/html/*
+	fi
+
+	if use examples; then
+		cp -pRP share/{demo,sample} "${ddest}" || die
+	fi
+
+	if use source; then
+		cp src.zip "${ddest}" || die
+	fi
+
+	if use nsplugin; then
+		cp -pPR ../icedtea-web-bin-${SLOT} "${ddest}"/.. || die
+		install_mozilla_plugin "/opt/icedtea-web-bin-${SLOT}/$(get_libdir)/IcedTeaPlugin.so"
+		docinto icedtea-web
+		dodoc ../doc/icedtea-web/*
+	fi
+
+	# Remove after next bump, handled by icedtea ebuild. Bug 390663
+	cp "${FILESDIR}"/fontconfig.Gentoo.properties.src "${T}"/fontconfig.Gentoo.properties || die
+	eprefixify "${T}"/fontconfig.Gentoo.properties
+	insinto "${dest}"/jre/lib
+	doins "${T}"/fontconfig.Gentoo.properties
+
+	set_java_env
+	java-vm_revdep-mask "${dest}"
+	java-vm_sandbox-predict /proc/self/coredump_filter
+}
+
+pkg_postinst() {
+	# Set as default VM if none exists
+	java-vm-2_pkg_postinst
+
+	if use nsplugin && [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog "The icedtea-bin-${SLOT} browser plugin can be enabled using eselect java-nsplugin"
+		elog "Note that the plugin works only in browsers based on xulrunner-1.9.1+"
+		elog "such as Firefox 3.5+ and recent Chromium versions."
+	fi
+}
diff --git a/dev-java/sun-jdk/sun-jdk-1.6.0.37.ebuild b/dev-java/sun-jdk/sun-jdk-1.6.0.37.ebuild
index 347fa6ecb629..ac8b091751ce 100644
--- a/dev-java/sun-jdk/sun-jdk-1.6.0.37.ebuild
+++ b/dev-java/sun-jdk/sun-jdk-1.6.0.37.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.6.0.37.ebuild,v 1.1 2012/10/17 15:19:20 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.6.0.37.ebuild,v 1.2 2012/10/21 10:59:42 ago Exp $
 
 EAPI="4"
 
@@ -51,7 +51,7 @@ SRC_URI="
 
 LICENSE="Oracle-BCLA-JavaSE examples? ( BSD )"
 SLOT="1.6"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 IUSE="X alsa derby doc examples jce kernel_SunOS nsplugin pax_kernel +source"
 
diff --git a/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.37.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.37.ebuild
index 9d2d39267a74..e5f813263508 100644
--- a/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.37.ebuild
+++ b/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.37.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.37.ebuild,v 1.1 2012/10/17 14:22:00 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.37.ebuild,v 1.2 2012/10/21 10:59:56 ago Exp $
 
 EAPI="4"
 
@@ -25,7 +25,7 @@ SRC_URI="
 
 LICENSE="Oracle-BCLA-JavaSE"
 SLOT="1.6"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="X alsa jce nsplugin pax_kernel"
 
 RESTRICT="fetch strip"
diff --git a/dev-lang/php/php-5.4.6.ebuild b/dev-lang/php/php-5.4.6.ebuild
index b2d8ef05157a..6179c07fe042 100644
--- a/dev-lang/php/php-5.4.6.ebuild
+++ b/dev-lang/php/php-5.4.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.4.6.ebuild,v 1.5 2012/09/06 01:00:40 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.4.6.ebuild,v 1.6 2012/10/21 09:02:13 maekke Exp $
 
 EAPI=4
 
@@ -10,7 +10,7 @@ SUHOSIN_VERSION=""
 FPM_VERSION="builtin"
 EXPECTED_TEST_FAILURES=""
 
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd"
 
 function php_get_uri ()
 {
diff --git a/dev-libs/boost/boost-1.49.0-r1.ebuild b/dev-libs/boost/boost-1.49.0-r1.ebuild
index 7b99c1474121..72211a563055 100644
--- a/dev-libs/boost/boost-1.49.0-r1.ebuild
+++ b/dev-libs/boost/boost-1.49.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.49.0-r1.ebuild,v 1.7 2012/09/23 12:28:19 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.49.0-r1.ebuild,v 1.8 2012/10/21 09:08:50 maekke Exp $
 
 EAPI="4"
 PYTHON_DEPEND="python? *"
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/boost/${MY_P}.tar.bz2"
 
 LICENSE="Boost-1.0"
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="debug doc +eselect icu mpi python static-libs test tools"
 
 RDEPEND="icu? ( >=dev-libs/icu-3.3 )
diff --git a/dev-libs/keybinder/Manifest b/dev-libs/keybinder/Manifest
index 48c2c1725997..d9aac7d6ccae 100644
--- a/dev-libs/keybinder/Manifest
+++ b/dev-libs/keybinder/Manifest
@@ -1,3 +1,2 @@
-DIST keybinder-0.2.2.tar.gz 324264 SHA256 152846803f43bf5ad303809b15479fa5f2bc7a0c6e6e31353686c1429b81b363 SHA512 f67f36db6044823b59ddf8106e1b7315c4a504916ce12e29bf7b6c089436a447e57ec2ddbdd22b205a2fade96d1f3c32cb2773eac289bce0c511fafa37099e23 WHIRLPOOL d1c0ce27d84f19cf55d64761ffd88b1dd6b2627b9ddc911f0603b5418054bc501ed1386b2ac6da60efb68b137712af945d2b4498709bfd5cbdf7ebcf3f91ae79
 DIST keybinder-0.3.0.tar.gz 377765 SHA256 42863ca0174d568a8c02c6fb243fee1681823825e8bcb1718c51611d8e9793bb SHA512 93ed88caa8246286907b9744383487391412b52be534cf085a6090c390bab181dc617721bb9216f29fd8314a40f65e27630d699ac6cb1657e0641a3d472eb22e WHIRLPOOL 5962e6a5cf96aeb7c4fdf920901f3ed461189fa9ce32bff427762a2f99b38fe4239b7129b5f669d46c256a4e7bf1fedf62ee966f05f65547e6921f364d8ff0d2
 DIST keybinder-3.0-0.3.0.tar.gz 346383 SHA256 982a6a5bc0fe1487862814b368e98211b9ec93fb5df3c9c0a88be526e0d2268e SHA512 6c5509b196fea848cda7e600edba2a59f7f65cbd7147e1d8ad2755aca8bb9b34ec68df1c90a456a7be800f049de0c2a4fc635adb60496a6aa32dea25f23dd86a WHIRLPOOL b378e7f2cc17cbe9bec9212df07e268377aea4979ab491d21092a6915fe219014686dbc188474daa2f21d1d48e016a657ae4d54d5c86407fc956c2c17d0398f0
diff --git a/dev-libs/keybinder/keybinder-0.2.2.ebuild b/dev-libs/keybinder/keybinder-0.2.2.ebuild
deleted file mode 100644
index 91f73c11a254..000000000000
--- a/dev-libs/keybinder/keybinder-0.2.2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/keybinder/keybinder-0.2.2.ebuild,v 1.5 2012/05/04 18:35:55 jdhore Exp $
-
-EAPI=3
-
-PYTHON_DEPEND="python? 2:2.5"
-
-inherit python
-
-DESCRIPTION="A library for registering global keyboard shortcuts"
-HOMEPAGE="http://kaizer.se/wiki/keybinder/"
-SRC_URI="http://kaizer.se/publicfiles/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="lua python"
-
-RDEPEND=">=x11-libs/gtk+-2.20:2
-	x11-libs/libXext
-	x11-libs/libXrender
-	x11-libs/libX11
-	lua? ( >=dev-lang/lua-5.1 )
-	python? ( >=dev-python/pygobject-2.15.3:2
-		>=dev-python/pygtk-2.12 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-pkg_setup() {
-	if use python; then
-		python_set_active_version 2
-		python_pkg_setup
-	fi
-}
-
-src_prepare() {
-	rm -f py-compile
-	ln -s $(type -P true) py-compile
-}
-
-src_configure() {
-	local myconf
-	use lua || myconf="--disable-lua"
-
-	econf \
-		--disable-dependency-tracking \
-		$(use_enable python) \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS NEWS README
-
-	find "${D}" -name '*.la' -exec rm -f '{}' +
-}
-
-pkg_postinst() {
-	use python && python_mod_optimize keybinder
-}
-
-pkg_postrm() {
-	use python && python_mod_cleanup keybinder
-}
diff --git a/dev-libs/sord/Manifest b/dev-libs/sord/Manifest
index aa31c0a5e6e3..d9425cdacfac 100644
--- a/dev-libs/sord/Manifest
+++ b/dev-libs/sord/Manifest
@@ -1,3 +1,4 @@
 DIST sord-0.10.0.tar.bz2 272243 SHA256 d8233b3f1386d9ab6c7735a65f41cd75f7f97d68eeeb38985e77087acd81f1b5 SHA512 4550f3d0fb5f61582b59a708d0f556ae686e3a6c3e29c0ce1011b0543217943325905b00d2851ff485c1139863704134818baeeb71d530d0f1509f3167857d82 WHIRLPOOL b88b94746474f41becb54c8fcfaac67d706094160f6320405d29f6b4028a40e8ff302c55c29f26c562d34037d8d147f14a0e62aac62fe5c2d80c25c0d2c135a5
+DIST sord-0.10.4.tar.bz2 275574 SHA256 188b8b22c6aa05a36989093e771264676e8d4f3c43592e805bf26f8422d20f3f SHA512 7e4797631f8a16600eeaddd945418607de504c0c0c15a11f2124240095edcddbd314f96f06cc41045d9cf62b5a683b9759917de54ea96e1eaaf376141e3c1265 WHIRLPOOL 03c9f282a3d333d9c54332cfdc84ac4f2d8b01e38cc78ca3f799ee1c255fb666bf5416f9e3b4200486c58c2cf41233025922cdf7f54b53a4c4301c1a4334b54f
 DIST sord-0.5.0.tar.bz2 279917 SHA256 0f18879ed9d5c4d056cddb5af9057090d1de874d3f3996386cf716d8060625ef SHA512 620d6bab583f91c60fb635f2470bf73ab1e55912cbe1a8a97c6e51ea281e8dd78f3e480696fc7c0c5170594c75715b1778e94a11192fd8a3604bf16d1b192360 WHIRLPOOL 311aebae8f8540f0974571f6c0c455712b0c0042d55e62e10d39e9ab0ad56572704f7fd45a4149d1bffcdfd8795c281fccf981fdcf13f9c97c8d0fe1a1dbbde9
 DIST sord-0.8.0.tar.bz2 286325 SHA256 99df73a0a859fbfc6423a7d5930d019c8c0e17e04ed101114c54f1911dbd8a59 SHA512 d8b2110851c653806b27e052884f4d6260e24ffffba6f2fdf4164629f867eca50d3e28ee411f8fc6881a016e2277b9891700ccb6aa8895caeb3a3fcf457d2b41 WHIRLPOOL 7ed9f3f43d55f4416644bcc799a06b8e9438b002f71cec91c347c47c4a9e7bb255816d51f5df6e150b229b1c246cce0bc39c066d827d5ff6654a97e7a29eb09b
diff --git a/dev-libs/sord/sord-0.10.4.ebuild b/dev-libs/sord/sord-0.10.4.ebuild
new file mode 100644
index 000000000000..374c24cb154c
--- /dev/null
+++ b/dev-libs/sord/sord-0.10.4.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/sord/sord-0.10.4.ebuild,v 1.1 2012/10/20 22:47:15 aballier Exp $
+
+EAPI=4
+
+inherit waf-utils
+
+DESCRIPTION="Library for storing RDF data in memory"
+HOMEPAGE="http://drobilla.net/software/sord/"
+SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc static-libs test"
+
+RDEPEND=">=dev-libs/serd-0.14.0"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )
+	virtual/pkgconfig"
+
+DOCS=( "AUTHORS" "NEWS" "README" )
+
+src_prepare() {
+	sed -i -e 's/^.*run_ldconfig/#\0/' wscript || die
+}
+
+src_configure() {
+	waf-utils_src_configure \
+		--docdir=/usr/share/doc/${PF} \
+		$(use test && echo "--test") \
+		$(use doc && echo "--docs") \
+		$(use static-libs && echo "--static")
+}
+
+src_test() {
+	./waf test || die
+}
diff --git a/dev-libs/ucommon/ucommon-5.2.2-r3.ebuild b/dev-libs/ucommon/ucommon-5.2.2-r3.ebuild
index 4c2b625dd80b..ee0232f0ebbe 100644
--- a/dev-libs/ucommon/ucommon-5.2.2-r3.ebuild
+++ b/dev-libs/ucommon/ucommon-5.2.2-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/ucommon/ucommon-5.2.2-r3.ebuild,v 1.3 2012/10/16 02:38:01 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/ucommon/ucommon-5.2.2-r3.ebuild,v 1.4 2012/10/21 13:23:53 pinkbyte Exp $
 
 EAPI="4"
 
@@ -15,7 +15,8 @@ SLOT="0"
 KEYWORDS="~amd64 ppc ppc64 ~x86 ~amd64-linux"
 IUSE="doc static-libs socks +cxx debug ssl gnutls"
 
-RDEPEND="ssl? ( dev-libs/openssl )"
+RDEPEND="ssl? ( dev-libs/openssl )
+	gnutls? ( net-libs/gnutls )"
 
 DEPEND="virtual/pkgconfig
 	doc? ( app-doc/doxygen )
@@ -26,6 +27,8 @@ PATCHES=( "${FILESDIR}"/disable_rtf_gen_doxy.patch
 		  "${FILESDIR}/${P}-address.patch")
 AUTOTOOLS_IN_SOURCE_BUILD=1
 
+REQUIRED_USE="^^ ( ssl gnutls )"
+
 src_configure() {
 	local myconf=""
 	if ! use ssl && ! use gnutls; then
@@ -34,6 +37,12 @@ src_configure() {
 
 	if use ssl; then
 		myconf=" --with-sslstack=ssl "
+		ewarn "Using openssl for ssl stack"
+	fi
+
+	if use gnutls; then
+		myconf=" --with-sslstack=gnu "
+		ewarn "Using gnutls for ssl stack"
 	fi
 
 	local myeconfargs=(
diff --git a/dev-lua/luadbi/luadbi-0.5-r1.ebuild b/dev-lua/luadbi/luadbi-0.5-r1.ebuild
index b80b93750b51..ba9a71a88357 100644
--- a/dev-lua/luadbi/luadbi-0.5-r1.ebuild
+++ b/dev-lua/luadbi/luadbi-0.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lua/luadbi/luadbi-0.5-r1.ebuild,v 1.4 2012/09/30 11:57:08 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lua/luadbi/luadbi-0.5-r1.ebuild,v 1.5 2012/10/21 09:10:04 maekke Exp $
 
 EAPI=4
 
@@ -12,7 +12,7 @@ SRC_URI="http://luadbi.googlecode.com/files/${PN}.${PV}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="mysql postgres sqlite"
 REQUIRED_USE="|| ( mysql postgres sqlite )"
 
diff --git a/dev-perl/Expect/Expect-1.210.0.ebuild b/dev-perl/Expect/Expect-1.210.0.ebuild
index 6466e09f1ab4..7e1e487c5627 100644
--- a/dev-perl/Expect/Expect-1.210.0.ebuild
+++ b/dev-perl/Expect/Expect-1.210.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Expect/Expect-1.210.0.ebuild,v 1.2 2011/09/03 21:04:44 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Expect/Expect-1.210.0.ebuild,v 1.3 2012/10/21 08:56:36 maekke Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Expect for Perl"
 
 SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 sparc x86"
+KEYWORDS="amd64 ~arm ppc ~ppc64 sparc x86"
 IUSE=""
 
 RDEPEND=">=dev-perl/IO-Tty-1.03"
diff --git a/dev-perl/Net-SSLeay/Net-SSLeay-1.480.0-r1.ebuild b/dev-perl/Net-SSLeay/Net-SSLeay-1.480.0-r1.ebuild
index 292362cda000..9b187527b1cb 100644
--- a/dev-perl/Net-SSLeay/Net-SSLeay-1.480.0-r1.ebuild
+++ b/dev-perl/Net-SSLeay/Net-SSLeay-1.480.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Net-SSLeay/Net-SSLeay-1.480.0-r1.ebuild,v 1.7 2012/10/20 16:00:44 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Net-SSLeay/Net-SSLeay-1.480.0-r1.ebuild,v 1.8 2012/10/20 18:57:25 armin76 Exp $
 
 EAPI=4
 
@@ -12,7 +12,7 @@ DESCRIPTION="Net::SSLeay module for perl"
 
 LICENSE="openssl"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="dev-libs/openssl"
diff --git a/dev-perl/SDL/SDL-2.540.ebuild b/dev-perl/SDL/SDL-2.540.ebuild
index 8a007932baf7..04a602a59824 100644
--- a/dev-perl/SDL/SDL-2.540.ebuild
+++ b/dev-perl/SDL/SDL-2.540.ebuild
@@ -1,9 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/SDL/SDL-2.540.ebuild,v 1.1 2012/06/02 16:37:08 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/SDL/SDL-2.540.ebuild,v 1.2 2012/10/21 03:10:08 mr_bones_ Exp $
 
 EAPI=4
-
 MODULE_AUTHOR=JTPALMER
 inherit perl-module
 
@@ -33,7 +32,7 @@ RDEPEND=">=dev-perl/Alien-SDL-1.434
 	virtual/jpeg
 	virtual/opengl
 	virtual/perl-ExtUtils-CBuilder
-	virtual/perl-Module-Build
+	>=virtual/perl-Module-Build-0.400.0
 	virtual/perl-Scalar-List-Utils
 	virtual/perl-Test-Simple"
 DEPEND=${RDEPEND}
diff --git a/dev-php/igbinary/igbinary-1.1.1-r1.ebuild b/dev-php/igbinary/igbinary-1.1.1-r1.ebuild
index 352afc5d9685..633a1bb055d3 100644
--- a/dev-php/igbinary/igbinary-1.1.1-r1.ebuild
+++ b/dev-php/igbinary/igbinary-1.1.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/igbinary/igbinary-1.1.1-r1.ebuild,v 1.1 2011/11/11 19:59:16 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/igbinary/igbinary-1.1.1-r1.ebuild,v 1.2 2012/10/21 09:13:12 maekke Exp $
 
 EAPI="2"
 PHP_EXT_NAME="igbinary"
@@ -12,7 +12,7 @@ USE_PHP="php5-3 php5-4"
 
 inherit php-ext-source-r2
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 
 DESCRIPTION="A fast drop in replacement for the standard PHP serialize"
 HOMEPAGE="http://opensource.dynamoid.com/"
diff --git a/dev-php/pecl-crack/pecl-crack-0.4-r2.ebuild b/dev-php/pecl-crack/pecl-crack-0.4-r2.ebuild
index 4054586fb9cf..175bc92babdc 100644
--- a/dev-php/pecl-crack/pecl-crack-0.4-r2.ebuild
+++ b/dev-php/pecl-crack/pecl-crack-0.4-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/pecl-crack/pecl-crack-0.4-r2.ebuild,v 1.3 2012/08/24 05:00:58 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/pecl-crack/pecl-crack-0.4-r2.ebuild,v 1.4 2012/10/21 09:16:39 maekke Exp $
 
 EAPI="4"
 
@@ -13,7 +13,7 @@ USE_PHP="php5-3 php5-4"
 
 inherit php-ext-pecl-r2
 
-KEYWORDS="amd64 ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ~ppc64 x86"
 
 DESCRIPTION="PHP interface to the cracklib libraries."
 LICENSE="PHP-3 CRACKLIB"
diff --git a/dev-php/pecl-http/pecl-http-1.7.4.ebuild b/dev-php/pecl-http/pecl-http-1.7.4.ebuild
index 0ac16ed80345..7e9a45e899a0 100644
--- a/dev-php/pecl-http/pecl-http-1.7.4.ebuild
+++ b/dev-php/pecl-http/pecl-http-1.7.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/pecl-http/pecl-http-1.7.4.ebuild,v 1.2 2012/08/22 11:26:58 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/pecl-http/pecl-http-1.7.4.ebuild,v 1.3 2012/10/21 09:03:42 maekke Exp $
 
 EAPI="4"
 
@@ -14,7 +14,7 @@ USE_PHP="php5-3 php5-4"
 
 inherit php-ext-pecl-r2 php-ext-source-r2
 
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DESCRIPTION="Extended HTTP Support for PHP."
 LICENSE="BSD-2 MIT"
diff --git a/dev-php/pecl-mailparse/pecl-mailparse-2.1.6.ebuild b/dev-php/pecl-mailparse/pecl-mailparse-2.1.6.ebuild
index 1e9a9762d96a..0a8db42d3e51 100644
--- a/dev-php/pecl-mailparse/pecl-mailparse-2.1.6.ebuild
+++ b/dev-php/pecl-mailparse/pecl-mailparse-2.1.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/pecl-mailparse/pecl-mailparse-2.1.6.ebuild,v 1.3 2012/08/24 05:00:09 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/pecl-mailparse/pecl-mailparse-2.1.6.ebuild,v 1.4 2012/10/21 09:15:49 maekke Exp $
 
 EAPI=4
 
@@ -13,7 +13,7 @@ USE_PHP="php5-3 php5-4"
 
 inherit php-ext-pecl-r2
 
-KEYWORDS="amd64 ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ~ppc64 x86"
 
 DESCRIPTION="A PHP extension for parsing and working with RFC822 and RFC2045 (MIME) compliant messages."
 LICENSE="PHP-2.02"
diff --git a/dev-php/pecl-memcached/pecl-memcached-2.0.1.ebuild b/dev-php/pecl-memcached/pecl-memcached-2.0.1.ebuild
index 6d593eace89e..61a53b0df790 100644
--- a/dev-php/pecl-memcached/pecl-memcached-2.0.1.ebuild
+++ b/dev-php/pecl-memcached/pecl-memcached-2.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/pecl-memcached/pecl-memcached-2.0.1.ebuild,v 1.2 2012/08/22 11:27:27 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/pecl-memcached/pecl-memcached-2.0.1.ebuild,v 1.3 2012/10/21 09:13:49 maekke Exp $
 
 EAPI="4"
 PHP_EXT_NAME="memcached"
@@ -12,7 +12,7 @@ USE_PHP="php5-3 php5-4"
 
 inherit php-ext-pecl-r2
 
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DESCRIPTION="PHP extension for interfacing with memcached via libmemcached library"
 LICENSE="PHP-3"
diff --git a/dev-php/pecl-ssh2/pecl-ssh2-0.11.3-r1.ebuild b/dev-php/pecl-ssh2/pecl-ssh2-0.11.3-r1.ebuild
index 67a37ce8b9b6..22bcd8eeb1ad 100644
--- a/dev-php/pecl-ssh2/pecl-ssh2-0.11.3-r1.ebuild
+++ b/dev-php/pecl-ssh2/pecl-ssh2-0.11.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/pecl-ssh2/pecl-ssh2-0.11.3-r1.ebuild,v 1.2 2012/08/22 11:27:55 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/pecl-ssh2/pecl-ssh2-0.11.3-r1.ebuild,v 1.3 2012/10/21 09:14:24 maekke Exp $
 
 EAPI=4
 
@@ -17,6 +17,6 @@ DESCRIPTION="Provides bindings to the functions of libssh2 which implements the
 LICENSE="PHP-3"
 SLOT="0"
 IUSE=""
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 DEPEND=">=net-libs/libssh2-0.18"
 RDEPEND="${DEPEND}"
diff --git a/dev-php/xcache/xcache-2.0.0.ebuild b/dev-php/xcache/xcache-2.0.0.ebuild
index 62e14862885a..fee99738447a 100644
--- a/dev-php/xcache/xcache-2.0.0.ebuild
+++ b/dev-php/xcache/xcache-2.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/xcache/xcache-2.0.0.ebuild,v 1.3 2012/08/22 11:28:24 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/xcache/xcache-2.0.0.ebuild,v 1.4 2012/10/21 09:15:01 maekke Exp $
 
 EAPI="4"
 PHP_EXT_NAME="xcache"
@@ -17,7 +17,7 @@ SRC_URI="http://xcache.lighttpd.net/pub/Releases/${PV}/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 # make test would just run php's test and as such need the full php source
diff --git a/dev-php/xdebug/xdebug-2.2.0.ebuild b/dev-php/xdebug/xdebug-2.2.0.ebuild
index d7c494412db7..29c3ea114c06 100644
--- a/dev-php/xdebug/xdebug-2.2.0.ebuild
+++ b/dev-php/xdebug/xdebug-2.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/xdebug/xdebug-2.2.0.ebuild,v 1.4 2012/09/09 17:36:50 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/xdebug/xdebug-2.2.0.ebuild,v 1.5 2012/10/21 09:03:04 maekke Exp $
 
 EAPI="4"
 PHP_EXT_NAME="xdebug"
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-${MY_PV}"
 
 inherit php-ext-source-r2
 
-KEYWORDS="amd64 ~hppa ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~hppa ppc ~ppc64 x86"
 
 DESCRIPTION="A PHP debugging and profiling extension"
 HOMEPAGE="http://www.xdebug.org/"
diff --git a/dev-python/cssselect/cssselect-0.7.1.ebuild b/dev-python/cssselect/cssselect-0.7.1.ebuild
index 429bf9ada3f7..397377e5aafe 100644
--- a/dev-python/cssselect/cssselect-0.7.1.ebuild
+++ b/dev-python/cssselect/cssselect-0.7.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/cssselect/cssselect-0.7.1.ebuild,v 1.4 2012/10/13 17:34:14 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cssselect/cssselect-0.7.1.ebuild,v 1.5 2012/10/20 19:00:54 ago Exp $
 
 EAPI=4
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="doc test"
 
 DEPEND="dev-python/setuptools
diff --git a/dev-python/python-exec/python-exec-0.1.ebuild b/dev-python/python-exec/python-exec-0.1.ebuild
index f6aea2ef51d5..e7276d8e3606 100644
--- a/dev-python/python-exec/python-exec-0.1.ebuild
+++ b/dev-python/python-exec/python-exec-0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-exec/python-exec-0.1.ebuild,v 1.7 2012/10/20 16:49:48 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-exec/python-exec-0.1.ebuild,v 1.8 2012/10/21 06:46:11 ryao Exp $
 
 EAPI=4
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://bitbucket/mgorny/${PN}/downloads/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 append_impl() {
diff --git a/dev-python/sympy/Manifest b/dev-python/sympy/Manifest
index add5cee8a8d4..31a0c9236cac 100644
--- a/dev-python/sympy/Manifest
+++ b/dev-python/sympy/Manifest
@@ -1,3 +1,4 @@
 DIST sympy-0.6.7.tar.gz 2939278 SHA256 802264fea36b9e3bd42df18422f1b26e6d4d962764bd2ab10f4b8b6a0b189791 SHA512 da37ce0475915f4498581cedd834a89a9f5d7b7f6fa75534e3e00c02cfaeea13692579a8f83c7e587745f7b299e920366ba71972633bd3d99f76cd2a8db19941 WHIRLPOOL 3d8c9ee086b4bf2f8b5fbc358c12d70f4066777781ea9cd43912dd6144c8bdc07dd0a2b722f4413b183ad26fdea456a43d2037a5516fbf4b1600dc36ab77e932
 DIST sympy-0.7.0.tar.gz 4126131 SHA256 d204407cfdbeeed476243625d836fe751bf134ca97820b70cd9972ad7589a63e SHA512 38e1bd36557543b42930cfb5e7d206757ce651203eb3ab89728a3224391b358f62e3faf3e557696c12c1b58b4785b0df42c4129bed7270ba4d0a7d00440ac064 WHIRLPOOL 004f5969de3abf8cc2d28152915ee184aee644951a1288302debcb538d08b137348730881a1914eaa654fb17e4c4d537ceb129754babf773cf01d4379f122dcb
 DIST sympy-0.7.1.tar.gz 3573079 SHA256 b4ad418d4301a8a26999f91eb816a0136ffae92007f6deb14eb329b6fbd7350b SHA512 3c6362e4aecefc6346c3089bb5fc3175068d643eacb2ba8e50a852fdc6ee8876e5fe69206f6daf646b5b62a580b24e35570076aa2d253e158d88a3d7d3604a53 WHIRLPOOL b17d0cd555c561d32cd292c30081c50f4b65b9985de895496bbd37592408b8bdc3b193b7ea83dbc1470c2e9229aedb36e751a78943d4bb238fd0a91c5fac421b
+DIST sympy-0.7.2.tar.gz 5487284 SHA256 2304aebd298d8bd467273a32b90fd66a24ee61cbea7e892a9ddc759d50a087fc SHA512 ffc602eb346717286b3d0a6770c60b03b578b3cf70ebd12f9e8b1c8c39cdb12ef219ddaa041d7929351a6b02dbb8caf1821b5452d95aae95034cbf4bc9904a7a WHIRLPOOL 7a5cbcc7d8f22a41fa3a78c9670d623bc13775b665a1a1a408f059642a9c600c0a8f283da5d314dacb527f8bbb56d6e5162d2e09d796a7ec4515993125fe355c
diff --git a/dev-python/sympy/files/sympy-0.7.2-mpmath.patch b/dev-python/sympy/files/sympy-0.7.2-mpmath.patch
new file mode 100644
index 000000000000..7d4f0b0e7962
--- /dev/null
+++ b/dev-python/sympy/files/sympy-0.7.2-mpmath.patch
@@ -0,0 +1,15 @@
+diff -r -U1 sympy-0.7.2.orig/setup.py sympy-0.7.2/setup.py
+--- sympy-0.7.2.orig/setup.py	2012-10-17 09:30:33.000000000 +0700
++++ sympy-0.7.2/setup.py	2012-10-20 23:07:53.000000000 +0700
+@@ -67,7 +67,2 @@
+     'sympy.matrices.expressions',
+-    'sympy.mpmath',
+-    'sympy.mpmath.calculus',
+-    'sympy.mpmath.functions',
+-    'sympy.mpmath.libmp',
+-    'sympy.mpmath.matrices',
+     'sympy.ntheory',
+@@ -222,3 +217,2 @@
+     'sympy.matrices.tests',
+-    'sympy.mpmath.tests',
+     'sympy.ntheory.tests',
diff --git a/dev-python/sympy/sympy-0.7.2.ebuild b/dev-python/sympy/sympy-0.7.2.ebuild
new file mode 100644
index 000000000000..e85309d907cc
--- /dev/null
+++ b/dev-python/sympy/sympy-0.7.2.ebuild
@@ -0,0 +1,153 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sympy/sympy-0.7.2.ebuild,v 1.1 2012/10/20 18:17:24 grozin Exp $
+
+EAPI="3"
+
+PYTHON_DEPEND="2:2.5"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="2.4 3.* *-jython *-pypy-*"
+DISTUTILS_SRC_TEST="setup.py"
+
+inherit distutils eutils
+
+DESCRIPTION="Computer algebra system (CAS) in Python"
+HOMEPAGE="http://code.google.com/p/sympy/"
+SRC_URI="http://sympy.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-macos"
+IUSE="doc examples gtk imaging ipython latex mathml opengl pdf png pyglet test texmacs"
+
+RDEPEND="
+	mathml? (
+		dev-libs/libxml2:2[python]
+		dev-libs/libxslt[python]
+		gtk? ( x11-libs/gtkmathview[gtk] ) )
+	latex? (
+		virtual/latex-base
+		dev-texlive/texlive-fontsextra
+		png? ( app-text/dvipng )
+		pdf? ( app-text/ghostscript-gpl ) )
+	texmacs? ( app-office/texmacs )
+	ipython? ( dev-python/ipython )
+	opengl? ( dev-python/pyopengl )
+	imaging? ( dev-python/imaging )
+	pyglet? ( dev-python/pyglet )
+	>=dev-python/pexpect-2.0
+	~dev-python/mpmath-0.17"
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx )
+	test? ( dev-python/pytest )"
+
+pkg_setup() {
+	python_pkg_setup
+	export DOT_SAGE="${S}"
+}
+
+src_prepare() {
+	# Remove mpmath
+	rm -rf sympy/mpmath/*
+	sed -i \
+		-e "s:sympy\.mpmath:mpmath:g" \
+		-e "s:from sympy import mpmath:import mpmath:g" \
+		sympy/combinatorics/permutations.py \
+		sympy/core/containers.py \
+		sympy/core/evalf.py \
+		sympy/core/expr.py \
+		sympy/core/function.py \
+		sympy/core/numbers.py \
+		sympy/core/power.py \
+		sympy/core/sets.py \
+		sympy/core/tests/test_evalf.py \
+		sympy/core/tests/test_numbers.py \
+		sympy/core/tests/test_sets.py \
+		sympy/core/tests/test_sympify.py \
+		sympy/external/tests/test_numpy.py \
+		sympy/functions/combinatorial/numbers.py \
+		sympy/functions/combinatorial/tests/test_comb_numbers.py \
+		sympy/functions/special/bessel.py \
+		sympy/functions/special/gamma_functions.py \
+		sympy/functions/special/hyper.py \
+		sympy/functions/special/tests/test_hyper.py \
+		sympy/matrices/matrices.py \
+		sympy/ntheory/partitions_.py \
+		sympy/physics/quantum/constants.py \
+		sympy/physics/quantum/qubit.py \
+		sympy/plotting/experimental_lambdify.py \
+		sympy/plotting/intervalmath/interval_arithmetic.py \
+		sympy/polys/numberfields.py \
+		sympy/polys/polytools.py \
+		sympy/polys/rootoftools.py \
+		sympy/polys/domains/__init__.py \
+		sympy/polys/domains/algebraicfield.py \
+		sympy/polys/domains/domain.py \
+		sympy/polys/domains/expressiondomain.py \
+		sympy/polys/domains/finitefield.py \
+		sympy/polys/domains/fractionfield.py \
+		sympy/polys/domains/gmpyintegerring.py \
+		sympy/polys/domains/gmpyrationalfield.py \
+		sympy/polys/domains/groundtypes.py \
+		sympy/polys/domains/mpmathcomplexdomain.py \
+		sympy/polys/domains/mpmathrealdomain.py \
+		sympy/polys/domains/polynomialring.py \
+		sympy/polys/domains/pythoncomplexdomain.py \
+		sympy/polys/domains/pythonintegerring.py \
+		sympy/polys/domains/pythonrationalfield.py \
+		sympy/polys/domains/pythonrealdomain.py \
+		sympy/polys/domains/quotientring.py \
+		sympy/polys/domains/sympyintegerring.py \
+		sympy/polys/domains/sympyrationalfield.py \
+		sympy/polys/domains/sympyrealdomain.py \
+		sympy/polys/tests/test_domains.py \
+		sympy/printing/latex.py \
+		sympy/printing/repr.py \
+		sympy/printing/str.py \
+		sympy/simplify/simplify.py \
+		sympy/simplify/tests/test_hyperexpand.py \
+		sympy/solvers/solvers.py \
+		sympy/solvers/tests/test_numeric.py \
+		sympy/statistics/distributions.py \
+		sympy/statistics/tests/test_statistics.py \
+		sympy/utilities/decorator.py \
+		sympy/utilities/lambdify.py \
+		sympy/utilities/runtests.py \
+		sympy/utilities/tests/test_code_quality.py \
+		sympy/utilities/tests/test_lambdify.py \
+		examples/advanced/pidigits.py \
+		examples/advanced/autowrap_ufuncify.py \
+		|| die "failed to patch mpmath imports"
+	epatch "${FILESDIR}"/${P}-mpmath.patch
+}
+
+src_compile() {
+	PYTHONPATH="." distutils_src_compile
+
+	if use doc; then
+		cd doc
+		emake html || die "emake html failed"
+	fi
+}
+
+src_install() {
+	PYTHONPATH="." distutils_src_install
+
+	rm -f "${ED}usr/bin/"{doctest,test} || die "rm doctest test failed"
+
+	if use doc; then
+		dohtml -r doc/_build/html/*
+	fi
+
+	if use examples; then
+		insinto /usr/share/doc/${P}
+	    doins -r examples
+	fi
+
+	if use texmacs; then
+		exeinto /usr/libexec/TeXmacs/bin/
+		doexe data/TeXmacs/bin/tm_sympy
+		insinto /usr/share/TeXmacs/plugins/sympy/
+		doins -r data/TeXmacs/progs
+	fi
+}
diff --git a/dev-util/boost-build/boost-build-1.49.0.ebuild b/dev-util/boost-build/boost-build-1.49.0.ebuild
index d624a8d503f1..073225549421 100644
--- a/dev-util/boost-build/boost-build-1.49.0.ebuild
+++ b/dev-util/boost-build/boost-build-1.49.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/boost-build/boost-build-1.49.0.ebuild,v 1.7 2012/09/23 12:28:53 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/boost-build/boost-build-1.49.0.ebuild,v 1.8 2012/10/21 09:07:19 maekke Exp $
 
 EAPI="4"
 PYTHON_DEPEND="python? *"
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/boost/boost_${MY_PV}.tar.bz2"
 
 LICENSE="Boost-1.0"
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="examples python"
 
 DEPEND="!<dev-libs/boost-1.34.0
diff --git a/dev-util/d-feet/Manifest b/dev-util/d-feet/Manifest
index a10329e74e09..b79f26fcdd7f 100644
--- a/dev-util/d-feet/Manifest
+++ b/dev-util/d-feet/Manifest
@@ -1,2 +1,3 @@
 DIST d-feet-0.1.12.tar.bz2 34701 SHA256 11b247e39fd0b0077df8f5dffd9dadbe2becef2c0dfa0df50688d41bdcba5307 SHA512 199100b93ae2df82ddfbc71d7fcea67303ba9666c092d92e6f2132b38d5da9aeb3983de78eff7ab9a675eb418cae95008882b6e634dbadb200aa362e86d92009 WHIRLPOOL 55ba0784fedcbfdc3ffe7d2f9db17e312b3db4634e896221658e09a42a94ade598bad737d3f591ba2a076b5581e195da3910c28190f389fe2c882327650673a2
 DIST d-feet-0.1.14.tar.xz 107312 SHA256 3f289333f45928beb7d56d2a9d7b9a6fcf666fb2d8e557faf8b90230897cab82 SHA512 ef0b2ea9a996e8a04969cfd57527944b9521febe32d9403d607cfb9c5cd16debbc9f1b94640989728ad2a2bf20d5953fe057fc135ebe0adb36f27e1de9a2132c WHIRLPOOL 79288ce082401d7a9005adbcb6879efc7067dd7e2787c8de9f6c3073f25234b1c07738b662cbdd2a3eaae6a0a12ef96acb2aee073183879e514d1156355cf627
+DIST d-feet-0.1.15.tar.xz 98296 SHA256 1250d353ded2c2635fb97d26a7fb9e68aba0f851a7f2d5608de651fa14f8eb0a SHA512 2b13ad674d6899c95081af9a0dd00766aa7dc3266204f850f1c4e256a9afe0c29b6bd1b3063c110b2308b8185d3a80dc046fc06412300778020a4c0da1a7d339 WHIRLPOOL 2502b5a381a7730473aee6cd9d9930eea71c8c90fda5b3efd2c64d573708dfc146c42029b08a1b14bbebb82d1969bff4941e1dd917510b2227923cdc17581d0d
diff --git a/dev-util/d-feet/d-feet-0.1.15.ebuild b/dev-util/d-feet/d-feet-0.1.15.ebuild
new file mode 100644
index 000000000000..9ef4ad193b17
--- /dev/null
+++ b/dev-util/d-feet/d-feet-0.1.15.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/d-feet/d-feet-0.1.15.ebuild,v 1.1 2012/10/21 11:32:51 eva Exp $
+
+EAPI="4"
+GCONF_DEBUG="no"
+PYTHON_COMPAT=( python2_5 python2_6 python2_7 )
+
+inherit gnome2 distutils-r1
+
+DESCRIPTION="D-Feet is a powerful D-Bus debugger"
+HOMEPAGE="http://live.gnome.org/DFeet"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gnome"
+
+RDEPEND="
+	>=sys-apps/dbus-1.0
+	>=dev-python/dbus-python-0.82.3
+	dev-python/pygtk:2
+	gnome? ( dev-python/libwnck-python )
+"
+DEPEND="
+	dev-python/setuptools
+"
+
+DOCS=( NEWS )
+
+src_prepare() {
+	# Do not run scrollkeeper tools, it is eclass job
+	sed "s:scrollkeeper-\(preinstall\|update\):$(type -P true):" \
+		-i setup.py || die "sed failed"
+
+	distutils-r1_src_prepare
+}
diff --git a/dev-util/oprofile/files/oprofile-0.9.7-bfd.h-1.patch b/dev-util/oprofile/files/oprofile-0.9.7-bfd.h-1.patch
new file mode 100644
index 000000000000..0da937207d9d
--- /dev/null
+++ b/dev-util/oprofile/files/oprofile-0.9.7-bfd.h-1.patch
@@ -0,0 +1,92 @@
+From 0fa5fc43ca2004546864051a584367a50413f190 Mon Sep 17 00:00:00 2001
+From: Maynard Johnson <maynardj@us.ibm.com>
+Date: Fri, 15 Jun 2012 13:55:33 -0500
+Subject: [PATCH] Add #include "config.h" before bfd.h for perf-events branch
+
+While building oprofile against a current CVS snapshot of binutils,
+I received the following error:
+
+-----------------------------------------
+make[2]: Entering directory `/home/cseo/at5.0/at5.0-5/src/oprofile/libopagent'
+/bin/sh ../libtool --tag=CC   --mode=compile /opt/at5.0-5-rc1/bin/gcc -DHAVE_CONFIG_H -I. -I.. -I/home/cseo/at5.0/at5.0-5/src/oprofile/libopagent    -fPIC -I /home/cseo/at5.0/at5.0-5/src/oprofile/libop -I /home/cseo/at5.0/at5.0-5/src/oprofile/libutil -g -MT libopagent_la-opagent.lo -MD -MP -MF .deps/libopagent_la-opagent.Tpo -c -o libopagent_la-opagent.lo `test -f 'opagent.c' || echo '/home/cseo/at5.0/at5.0-5/src/oprofile/libopagent/'`opagent.c
+libtool: compile:  /opt/at5.0-5-rc1/bin/gcc -DHAVE_CONFIG_H -I. -I.. -I/home/cseo/at5.0/at5.0-5/src/oprofile/libopagent -fPIC -I /home/cseo/at5.0/at5.0-5/src/oprofile/libop -I /home/cseo/at5.0/at5.0-5/src/oprofile/libutil -g -MT libopagent_la-opagent.lo -MD -MP -MF .deps/libopagent_la-opagent.Tpo -c opagent.c  -fPIC -DPIC -o .libs/libopagent_la-opagent.o
+In file included from opagent.c:63:0:
+/opt/at5.0-5-rc1/include/bfd.h:37:2: error: #error config.h must be included before this header
+-----------------------------------------
+
+I opened a bug against binutils for this (see http://sourceware.org/bugzilla/show_bug.cgi?id=14243),
+but the rationale for this error was explained to me thusly:
+
+"This is a correctness issue.  bfd.h and the headers that bfd.h #include test at
+least one HAVE_* macro.  So you need to include the file that defines those
+HAVE_* macros before bfd.h. [sic] It is a really good idea to always include
+config.h (or sysdep.h or alloca-conf.h that include config.h) before any other
+files, including system headers."
+
+This patch is a minimal patch that addresses the build failure with binutils,
+ensuring that our config.h is #include'd before bfd.h
+
+Since my work on the perf-events branch has involved testing on newer
+binutils, I want to get this fix committed into the perf-events branch now
+so I don't need to be adding a private patch for those times when I build
+with new binutils.
+
+Signed-off-by: Maynard Johnson <maynardj@us.ibm.com>
+---
+ libopagent/opagent.c   |    1 +
+ libpp/symbol.h         |    1 +
+ opjitconv/debug_line.c |    1 +
+ opjitconv/opjitconv.h  |    1 +
+ 4 files changed, 4 insertions(+), 0 deletions(-)
+
+diff --git a/libopagent/opagent.c b/libopagent/opagent.c
+index 2db1477..860413f 100644
+--- a/libopagent/opagent.c
++++ b/libopagent/opagent.c
+@@ -50,6 +50,7 @@
+  *   See libopagent/Makefile.am for more information.
+  *******************************************************************/
+ 
++#include "config.h"
+ #include <stdio.h>
+ #include <errno.h>
+ #include <string.h>
+diff --git a/libpp/symbol.h b/libpp/symbol.h
+index ea2724d..8041cb9 100644
+--- a/libpp/symbol.h
++++ b/libpp/symbol.h
+@@ -12,6 +12,7 @@
+ #ifndef SYMBOL_H
+ #define SYMBOL_H
+ 
++#include "config.h"
+ #include "name_storage.h"
+ #include "growable_vector.h"
+ #include "sparse_array.h"
+diff --git a/opjitconv/debug_line.c b/opjitconv/debug_line.c
+index d7db8ec..babb943 100644
+--- a/opjitconv/debug_line.c
++++ b/opjitconv/debug_line.c
+@@ -8,6 +8,7 @@
+  * @author Philippe Elie
+  */
+ 
++#include "config.h"
+ #include <stdint.h>
+ #include <stdlib.h>
+ #include <string.h>
+diff --git a/opjitconv/opjitconv.h b/opjitconv/opjitconv.h
+index 9562256..3f4919a 100644
+--- a/opjitconv/opjitconv.h
++++ b/opjitconv/opjitconv.h
+@@ -26,6 +26,7 @@
+ #define OP_JIT_CONV_ALREADY_DONE 5
+ #define OP_JIT_CONV_TMPDIR_NOT_REMOVED 6
+ 
++#include "config.h"
+ #include <bfd.h>
+ #include <stddef.h>
+ #include <sys/stat.h>
+-- 
+1.7.4.1
+
diff --git a/dev-util/oprofile/files/oprofile-0.9.7-bfd.h-2.patch b/dev-util/oprofile/files/oprofile-0.9.7-bfd.h-2.patch
new file mode 100644
index 000000000000..3113d40f5849
--- /dev/null
+++ b/dev-util/oprofile/files/oprofile-0.9.7-bfd.h-2.patch
@@ -0,0 +1,28 @@
+From f0a6ef67e1b944e2032ce777994257075f6ba107 Mon Sep 17 00:00:00 2001
+From: Antonio Rosales <antonio.rosales@canonical.com>
+Date: Mon, 6 Aug 2012 09:21:07 -0500
+Subject: [PATCH] Fix compile error on Ubuntu 12.10
+
+This is related to an earlier fix made under commit #
+0fa5fc43ca2004546864051a584367a50413f190.  Apparently
+a newer compiler finds yet another file that required
+our config.h to be included prior to any system header
+files.
+
+Signed-off-by: Maynard Johnson <maynardj@us.ibm.com>
+---
+ libutil++/bfd_support.h |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/libutil++/bfd_support.h b/libutil++/bfd_support.h
+index 4f6a369..ab448d1 100644
+--- a/libutil++/bfd_support.h
++++ b/libutil++/bfd_support.h
+@@ -11,6 +11,7 @@
+ #ifndef BFD_SUPPORT_H
+ #define BFD_SUPPORT_H
+
++#include "config.h"
+ #include "utility.h"
+ #include "op_types.h"
+ #include "locate_images.h"
diff --git a/dev-util/oprofile/oprofile-0.9.7.ebuild b/dev-util/oprofile/oprofile-0.9.7.ebuild
index ac3335b7dc46..40e866f518f9 100644
--- a/dev-util/oprofile/oprofile-0.9.7.ebuild
+++ b/dev-util/oprofile/oprofile-0.9.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/oprofile/oprofile-0.9.7.ebuild,v 1.4 2012/09/03 13:36:43 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/oprofile/oprofile-0.9.7.ebuild,v 1.5 2012/10/20 22:49:11 slyfox Exp $
 
 EAPI=2
 inherit eutils linux-info multilib user java-pkg-opt-2
@@ -40,6 +40,10 @@ pkg_setup() {
 	use java && java-pkg_init
 }
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-bfd.h-{1,2}.patch # bug 428506
+}
+
 src_configure() {
 	econf \
 		--with-kernel-support \
diff --git a/eclass/gst-plugins-base.eclass b/eclass/gst-plugins-base.eclass
index b63e97cbce82..471c1187b5fc 100644
--- a/eclass/gst-plugins-base.eclass
+++ b/eclass/gst-plugins-base.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gst-plugins-base.eclass,v 1.22 2012/06/02 19:02:42 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gst-plugins-base.eclass,v 1.23 2012/10/21 07:48:32 tetromino Exp $
 
 # Author : foser <foser@gentoo.org>
 
@@ -17,7 +17,10 @@
 inherit eutils gst-plugins10 multilib
 
 GST_EXPF="src_unpack src_compile src_install"
+GST_TARBALL_SUFFIX="bz2"
 case ${EAPI:-0} in
+	4)	GST_EXPF="${GST_EXPF} src_prepare src_configure"
+		GST_TARBALL_SUFFIX="xz" ;;
 	2|3) GST_EXPF="${GST_EXPF} src_prepare src_configure" ;;
 	1|0) ;;
 	*) die "Unknown EAPI" ;;
@@ -38,7 +41,8 @@ gio libvisual ogg oggtest theora ivorbis vorbis vorbistest examples
 freetypetest pango"
 
 #SRC_URI="mirror://gnome/sources/gst-plugins/${PV_MAJ_MIN}/${MY_P}.tar.bz2"
-SRC_URI="http://gstreamer.freedesktop.org/src/gst-plugins-base/${MY_P}.tar.bz2"
+SRC_URI="http://gstreamer.freedesktop.org/src/gst-plugins-base/${MY_P}.tar.${GST_TARBALL_SUFFIX}"
+[[ ${GST_TARBALL_SUFFIX} = "xz" ]] && DEPEND="${DEPEND} app-arch/xz-utils"
 
 S=${WORKDIR}/${MY_P}
 
@@ -47,6 +51,7 @@ S=${WORKDIR}/${MY_P}
 if [ "${PN}" != "${MY_PN}" ]; then
 RDEPEND=">=media-libs/gst-plugins-base-${PV}"
 DEPEND="${RDEPEND}
+	${DEPEND}
 	~media-libs/gst-plugins-base-${PV}
 	>=sys-apps/sed-4
 	virtual/pkgconfig"
diff --git a/games-action/moon-buggy/Manifest b/games-action/moon-buggy/Manifest
index 99b94c54b2ec..eb9f973a6322 100644
--- a/games-action/moon-buggy/Manifest
+++ b/games-action/moon-buggy/Manifest
@@ -1 +1 @@
-DIST moon-buggy-1.0.51.tar.gz 263572 RMD160 c04f2e12e3de515be15e49a8738b61f6af25d76b SHA1 7f1c5df99944acfe98eeb5f8d5ab6f28ef61ee7e SHA256 352dc16ccae4c66f1e87ab071e6a4ebeb94ff4e4f744ce1b12a769d02fe5d23f
+DIST moon-buggy-1.0.51.tar.gz 263572 SHA256 352dc16ccae4c66f1e87ab071e6a4ebeb94ff4e4f744ce1b12a769d02fe5d23f SHA512 34da2ca8b79d4f95a762cb7142586d176fd1b58ea6f4375de424d73d6046c2dc3dbae30dddb3a78c8c2563fbfec01d9eaafe27b79cc78ffa22121ad5a2e9dc77 WHIRLPOOL 52d0a375af71d345e3ec3464a1d862c1a03212fc189dac89f5410753d9ae1487085d1b72d2cbf778b749883a201c0b165fcb08c85e114851b20e282d493089ed
diff --git a/games-action/moon-buggy/moon-buggy-1.0.51.ebuild b/games-action/moon-buggy/moon-buggy-1.0.51.ebuild
index 7acb3610096b..3537de250dd1 100644
--- a/games-action/moon-buggy/moon-buggy-1.0.51.ebuild
+++ b/games-action/moon-buggy/moon-buggy-1.0.51.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/moon-buggy/moon-buggy-1.0.51.ebuild,v 1.6 2012/05/03 03:02:33 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/moon-buggy/moon-buggy-1.0.51.ebuild,v 1.7 2012/10/21 08:52:04 maekke Exp $
 
 EAPI=2
 inherit autotools eutils games
@@ -11,7 +11,7 @@ SRC_URI="http://www.seehuhn.de/data/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 ~arm ppc x86"
 IUSE=""
 
 RDEPEND="sys-libs/ncurses"
diff --git a/games-arcade/tomatoes/Manifest b/games-arcade/tomatoes/Manifest
index 43090efe8234..c3a9ac763320 100644
--- a/games-arcade/tomatoes/Manifest
+++ b/games-arcade/tomatoes/Manifest
@@ -1,2 +1,2 @@
-DIST tomatoes-linux-1.5.tar.bz2 8807421 RMD160 454591162df5266a6ecb88b0b67914a5c0348a04 SHA1 8dc306617800f7ccc1e8610fb39e87d8181c482d SHA256 69a3af1994cb58409be9b469e1aa4bdb91c405d99071c7431526640ec53d1300
-DIST tomatoes-linux-src-1.55.tar.bz2 62947 RMD160 a57881902e3c917733058e3b9c936d2db5ca0e3a SHA1 aa123a5fa9c8c0223c602c0cffe8a5bb0ebad60c SHA256 126d001532ee5b81cc95e1a86a274d11669b8c8f65c8235ae2e9b8fbdfab4a60
+DIST tomatoes-linux-1.5.tar.bz2 8807421 SHA256 69a3af1994cb58409be9b469e1aa4bdb91c405d99071c7431526640ec53d1300 SHA512 517f592bb3c3fb43cb740c58011f06b7a71c96eaff74ce1088db8dbd4aafa3463bba516547cd010e9ef2ca947fd36962c3d13ece6e979cab8adf01ffa991c308 WHIRLPOOL 62fd7eca64cd4ddf41de8a02fb80c3f114ff69f3b322f7f904592dca6109fba3856df1cd6bbb9162a22f78dd98e7c353756f1b5682f2128e5cc4f64e7c239001
+DIST tomatoes-linux-src-1.55.tar.bz2 62947 SHA256 126d001532ee5b81cc95e1a86a274d11669b8c8f65c8235ae2e9b8fbdfab4a60 SHA512 b5a6287659746179f0418630c55d34dc34897b532687007386b0b540ec728cc2492813f0d454314994a26a3629a24c802630085f64b969d1e6ea9ec936f5fe35 WHIRLPOOL 845ad2e84ad035d2f678c8465360439f057a323a020e01cd20f19fc5fb643b7372a963afdbe0b717edd230e3d7eb5f922a7fcc16affe4ec7ccd3d3696a4955ae
diff --git a/games-arcade/tomatoes/tomatoes-1.55-r2.ebuild b/games-arcade/tomatoes/tomatoes-1.55-r2.ebuild
index 1ab98105fa42..b9c119942c6e 100644
--- a/games-arcade/tomatoes/tomatoes-1.55-r2.ebuild
+++ b/games-arcade/tomatoes/tomatoes-1.55-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/tomatoes/tomatoes-1.55-r2.ebuild,v 1.8 2011/06/18 15:41:59 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/tomatoes/tomatoes-1.55-r2.ebuild,v 1.9 2012/10/20 19:14:10 mr_bones_ Exp $
 
 EAPI=2
 inherit eutils games
@@ -20,7 +20,7 @@ DEPEND="virtual/opengl
 	virtual/glu
 	media-libs/libsdl[audio,video]
 	media-libs/sdl-image[jpeg,png]
-	media-libs/sdl-mixer[mikmod]"
+	media-libs/sdl-mixer[mod]"
 
 src_prepare() {
 	mv ../tomatoes-1.5/* . || die "mv failed"
diff --git a/games-board/gnono/Manifest b/games-board/gnono/Manifest
index 5fbc4d6e52f9..384f89121b2f 100644
--- a/games-board/gnono/Manifest
+++ b/games-board/gnono/Manifest
@@ -1 +1 @@
-DIST gnono-1.9.1.tar.bz2 421461 RMD160 2e86cf671e409f5c96cd5df904b3ea795d363547 SHA1 367a73e70182c1b4f0807353d7ba1aae8d8943d7 SHA256 1fd8ddcd2da5333210046ae1d6e710b597193c6f550ae1c82f729a0473bde60c
+DIST gnono-1.9.1.tar.bz2 421461 SHA256 1fd8ddcd2da5333210046ae1d6e710b597193c6f550ae1c82f729a0473bde60c SHA512 de67453cab0177d633b674ab2cf99b606373dc01e6d821478e8aa6adf9f0f40b04538e5d564df990739a62fb47225f83eff13ab6c12af26fe05afba309632d62 WHIRLPOOL 8b950b96c16e7c6290b5f4f6156404d96521e124516234fdf561ba4f55c63bd93366676ad0184e6c43f10e7dceef85e076dd999cf6c3c03595c75f9eade3ff8b
diff --git a/games-board/gnono/files/gnono-1.9.1-glib-single-include.patch b/games-board/gnono/files/gnono-1.9.1-glib-single-include.patch
new file mode 100644
index 000000000000..edf5238c1475
--- /dev/null
+++ b/games-board/gnono/files/gnono-1.9.1-glib-single-include.patch
@@ -0,0 +1,151 @@
+Index: gnono-1.9.1/src/ai.c
+===================================================================
+--- gnono-1.9.1.orig/src/ai.c
++++ gnono-1.9.1/src/ai.c
+@@ -24,9 +24,7 @@
+ #include <config.h>
+ #endif
+ 
+-#include <glib/garray.h>
+-#include <glib/gmessages.h>
+-#include <glib/gtypes.h>
++#include <glib.h>
+ 
+ #include "cards.h"
+ #include "game.h"
+Index: gnono-1.9.1/src/ai.h
+===================================================================
+--- gnono-1.9.1.orig/src/ai.h
++++ gnono-1.9.1/src/ai.h
+@@ -23,7 +23,7 @@
+ #ifndef __GN_AI_H__
+ #define __GN_AI_H__
+ 
+-#include <glib/gtypes.h>
++#include <glib.h>
+ 
+ void computer_play (gboolean pickup);
+ 
+Index: gnono-1.9.1/src/cards.c
+===================================================================
+--- gnono-1.9.1.orig/src/cards.c
++++ gnono-1.9.1/src/cards.c
+@@ -25,9 +25,7 @@
+ #endif
+ 
+ #include <stdlib.h>			/* for rand() */
+-#include <glib/garray.h>
+-#include <glib/gmem.h>
+-#include <glib/gtypes.h>
++#include <glib.h>
+ #include <gdk-pixbuf/gdk-pixbuf-core.h>
+ 
+ #include "cards.h"
+Index: gnono-1.9.1/src/cards.h
+===================================================================
+--- gnono-1.9.1.orig/src/cards.h
++++ gnono-1.9.1/src/cards.h
+@@ -23,7 +23,7 @@
+ #ifndef __GN_CARDS_H__
+ #define __GN_CARDS_H__
+ 
+-#include <glib/gtypes.h>
++#include <glib.h>
+ #include <gdk-pixbuf/gdk-pixbuf-core.h>
+ 
+ static const gdouble GN_CARD_HEIGHT = 98.0;
+Index: gnono-1.9.1/src/game.c
+===================================================================
+--- gnono-1.9.1.orig/src/game.c
++++ gnono-1.9.1/src/game.c
+@@ -24,9 +24,7 @@
+ #include <config.h>
+ #endif
+ 
+-#include <glib/garray.h>
+-#include <glib/gmessages.h>
+-#include <glib/gtypes.h>
++#include <glib.h>
+ #include <gtk/gtkmain.h>
+ #include <libgnome/gnome-config.h>
+ 
+Index: gnono-1.9.1/src/game.h
+===================================================================
+--- gnono-1.9.1.orig/src/game.h
++++ gnono-1.9.1/src/game.h
+@@ -23,7 +23,7 @@
+ #ifndef __GN_GAME_H__
+ #define __GN_GAME_H__
+ 
+-#include <glib/gtypes.h>
++#include <glib.h>
+ 
+ /*#define GN_DEBUG*/
+ 
+Index: gnono-1.9.1/src/interface.h
+===================================================================
+--- gnono-1.9.1.orig/src/interface.h
++++ gnono-1.9.1/src/interface.h
+@@ -23,7 +23,7 @@
+ #ifndef __GN_INTERFACE_H__
+ #define __GN_INTERFACE_H__
+ 
+-#include <glib/gtypes.h>
++#include <glib.h>
+ #include <gtk/gtkwidget.h>
+ #include <gtk/gtkwindow.h>
+ 
+Index: gnono-1.9.1/src/main.c
+===================================================================
+--- gnono-1.9.1.orig/src/main.c
++++ gnono-1.9.1/src/main.c
+@@ -26,7 +26,7 @@
+ 
+ #include <unistd.h>
+ #include <glib/gi18n.h>
+-#include <glib/gmain.h>
++#include <glib.h>
+ #include <gtk/gtkmain.h>
+ 
+ #include "interface.h"
+Index: gnono-1.9.1/src/players.c
+===================================================================
+--- gnono-1.9.1.orig/src/players.c
++++ gnono-1.9.1/src/players.c
+@@ -24,8 +24,7 @@
+ #include <config.h>
+ #endif
+ 
+-#include <glib/garray.h>
+-#include <glib/gtypes.h>
++#include <glib.h>
+ #include <glib/gi18n.h>
+ #include <gtk/gtklabel.h>
+ #include <gtk/gtkwidget.h>
+Index: gnono-1.9.1/src/players.h
+===================================================================
+--- gnono-1.9.1.orig/src/players.h
++++ gnono-1.9.1/src/players.h
+@@ -23,8 +23,7 @@
+ #ifndef __GN_PLAYERS_H__
+ #define __GN_PLAYERS_H__
+ 
+-#include <glib/garray.h>
+-#include <glib/gtypes.h>
++#include <glib.h>
+ 
+ #include "cards.h"
+ 
+Index: gnono-1.9.1/src/preferences.h
+===================================================================
+--- gnono-1.9.1.orig/src/preferences.h
++++ gnono-1.9.1/src/preferences.h
+@@ -23,7 +23,7 @@
+ #ifndef __GN_PREFERENCES_H__
+ #define __GN_PREFERENCES_H__
+ 
+-#include <glib/gtypes.h>
++#include <glib.h>
+ #include <gtk/gtkwidget.h>
+ 
+ void dlg_preferences (GtkWidget *caller, gpointer data);
diff --git a/games-board/gnono/gnono-1.9.1.ebuild b/games-board/gnono/gnono-1.9.1.ebuild
index 76aa948f5af8..475fd159b478 100644
--- a/games-board/gnono/gnono-1.9.1.ebuild
+++ b/games-board/gnono/gnono-1.9.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/gnono/gnono-1.9.1.ebuild,v 1.5 2009/11/23 14:32:31 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/gnono/gnono-1.9.1.ebuild,v 1.6 2012/10/21 10:33:28 pacho Exp $
 
-EAPI=2
+EAPI=4
 inherit autotools eutils gnome2-utils games
 
 DESCRIPTION="A rewrite for GNOME of the Windows card game WUNO"
@@ -21,12 +21,12 @@ DEPEND="${RDEPEND}
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-gentoo.patch
+	epatch "${FILESDIR}"/${P}-glib-single-include.patch
 	eautoreconf
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog NEWS README TODO
+	default
 	prepgamesdirs
 }
 
diff --git a/games-board/kcheckers/Manifest b/games-board/kcheckers/Manifest
index 689a566a8ad2..c2b7cb405066 100644
--- a/games-board/kcheckers/Manifest
+++ b/games-board/kcheckers/Manifest
@@ -1 +1 @@
-DIST kcheckers-0.8.1.tar.gz 81431 RMD160 d5f60526913c35a4d3fc01cda87d1fa64b9dd0b4 SHA1 d2ea352469aa07b9549e6664f5d34dcc7e9bb772 SHA256 444080f0554a1d65db32231ee18f9a662bfa6148a15cb006eba838c2463e7a2f
+DIST kcheckers-0.8.1.tar.gz 81431 SHA256 444080f0554a1d65db32231ee18f9a662bfa6148a15cb006eba838c2463e7a2f SHA512 c5febbcc7f0362169879a29a159c86aa4f3d859ee3bebea243535ca07949366078406b87e5e5534586485601b92a79b621cef7ba96f2224acc5331e3624d1b73 WHIRLPOOL b040a382c6bfc09071c67cd89b0717f3287b3bc880b31988dec579f51cb716d67e7aaab7d640488152c570d6eb005d1e769e2dd300acc04919fd4365469ce3d9
diff --git a/games-board/kcheckers/kcheckers-0.8.1.ebuild b/games-board/kcheckers/kcheckers-0.8.1.ebuild
index 99bdd1b138f2..a4b6aa02bafe 100644
--- a/games-board/kcheckers/kcheckers-0.8.1.ebuild
+++ b/games-board/kcheckers/kcheckers-0.8.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/kcheckers/kcheckers-0.8.1.ebuild,v 1.8 2011/10/19 17:14:43 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/kcheckers/kcheckers-0.8.1.ebuild,v 1.9 2012/10/21 08:53:17 maekke Exp $
 
 EAPI=2
 inherit eutils qt4-r2 games
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
+KEYWORDS="~amd64 ~arm ~ppc x86"
 IUSE=""
 
 DEPEND="x11-libs/qt-gui:4"
diff --git a/games-fps/warsow/Manifest b/games-fps/warsow/Manifest
index eac3698494ac..c5ef1954bd2c 100644
--- a/games-fps/warsow/Manifest
+++ b/games-fps/warsow/Manifest
@@ -6,5 +6,7 @@ DIST warsow_0.62_sdk.zip 36600605 SHA256 e1a86c355307539b8f427a76fc54e7279f39567
 DIST warsow_0.62_update.zip 11553787 SHA256 d16309bfc39929a47efe71d5dd28a790c16a7de07232f68fc9672407bebda278 SHA512 568d8523103c23679128dfd2cb8ecd5b47a5b14e26b33e837268e10d8e4fe04b8cb5addd51031f2d90938a0b35f82adbfcf910146a7c40d32ae8e912a7e78a8c WHIRLPOOL e4881c58533b1810bdf45af9610c8f076f0511f22b940727db840aef14be53b259b9751d5aa7e6e6064ccd2ab2441f440cd6fd143751ed91eedd56fdaa1c0c6e
 DIST warsow_1.01_sdk.tar.gz 56537475 SHA256 a9c7766f96290e58e0707fbbed412162af7a4711eae988744e61861cf7db5a91 SHA512 e1f6526176535c61e9d270672a340d11d7861ca398e0af0c13049b162615dfaf71799d73079d9179e90411ef2e3fce013b15a2e2d9a5098a461571a87b8ef468 WHIRLPOOL 040020995f1319ef69d7ba54788396f3e4ed0a272f6d244688702fd4e4d05ce1c586255f02d54998e27116b2ec20a40f61382fed28fc09af0dc5d216ade00456
 DIST warsow_1.01_update.tar.gz 14557600 SHA256 f09696c4a4a13a9e3da0a0499bbe471a8c552be8524574c78a9946f7776e6586 SHA512 c80a18c00db9a9bce137cfef74fef79f8cc4e4c534cdfecf737a6caef682e0532aa8d6a6455600ed9549cb46720abba41f17b81d02e75a51f0cfb8a4129df7c1 WHIRLPOOL 8a23ea53d1b4fe5be80c5327529d7c3dd4094adbaf72f53de1fe1c2e917a4c14f8771417dfc8bc96c56a20dd6a87d82c5822607d30433e32de7abace8eb01057
+DIST warsow_1.02_sdk.tar.gz 56541955 SHA256 bec1f0ec26c39defad393578b28eb955504f054599142b096773c28889cabb2c SHA512 d62399baa13341bc87863d123a9d852ec688d0aa279eb626b8c95bda28b7ac1d602c7571e02dfda7dd8ea83a231cd8c3310a0126c1235968291e9e700679fbca WHIRLPOOL 7c44fb252b95b400e829c752c58a4d715b695d56f7e9b35504be9c1e1566c513f101090f7bbe0eabba5aef11ff3f320106fe7ce1d4b7b17e7368979b0b193621
+DIST warsow_1.02_update.zip 20582996 SHA256 23efd46590be99140b836125335dc973f606625785926377b60bd1467e661ac1 SHA512 4f0985c9a17e4562d46d289bfc78bf44fa544bdc30af3b0b670572e819966a2fa8f38902cb6810b09ce38a49f7de956177f31bf2858883ad2b3f27d41e6c2276 WHIRLPOOL 978987c70aa8b82a4252505fab95717056701a599d8e52a308206aee59a4cd36520be4f6b202411733d22dcca82f64919423bbd4bcd227d71b6e59cf6859e5b2
 DIST warsow_1.0_sdk.tar.gz 56525636 SHA256 2e394b5c50ad206723a59636ab93448f69d8602e710ab334451badf746870e22 SHA512 dee6591fb5ed7150e3e18db20b18366777dbacd4a465074eb3c978a04b7df5140e8a7817a5248542af06d2a6eb972ad986690f16e57ac08f753cccb2470d7bfe WHIRLPOOL e30772b49f37dede19d54e129cc1ca05bf9f01c9a10f372c9c420ceba25514c6a928c12ba61e140efc5ea8d46cbd6db403ca03aee215964173662127b9dbfd59
 DIST warsow_1.0_unified.tar.gz 518459004 SHA256 f933d251de4c92b6107d4db1eef5326baf4873d32a6e2f1c3daae14bc92e85ec SHA512 78706093fb4b8684893d9b497fd10f1ce3ef096b68bbf7d36ed2bc775fa649738f0153a723b2788ef6a54d30826ec96bc36899d2e5c230bf09022b98cc105aad WHIRLPOOL efdffd7f358c704a6c08eb1d8c91543db3b76805edba775f88570debfa1b4a9ac64772958831fff7d0be4d72f2d29abbb7610d115e92cdb0fd897a8e31b1059c
diff --git a/games-fps/warsow/files/warsow-1.02-build.patch b/games-fps/warsow/files/warsow-1.02-build.patch
new file mode 100644
index 000000000000..003c391f6721
--- /dev/null
+++ b/games-fps/warsow/files/warsow-1.02-build.patch
@@ -0,0 +1,546 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Thu Oct 11 15:00:18 UTC 2012
+Subject: build system
+
+a) respect flags/linker
+b) don't take ARCH from env (we set BASE_ARCH in the ebuild)
+c) split LDFLAGS and LDFLAGS_COMMON as per bug
+  http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=347650
+d) don't remove angel-lib (compilation fails, why is this?)
+e) make output verbose
+f) remove start-scripts
+g) address parallel make issues
+
+--- source/Makefile
++++ source/Makefile
+@@ -50,10 +50,10 @@
+ else
+ CC?=gcc
+ CXX?=g++
+-LD=gcc
+-LXX?=g++
+-AR=ar
+-RANLIB=ranlib
++LD=$(CC)
++LXX=$(CXX)
++AR?=ar
++RANLIB?=ranlib
+ 
+ # this nice line comes from the linux kernel makefile
+ BASE_ARCH:=$(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc/ -e s/sparc64/sparc/ -e s/arm.*/arm/ -e s/sa110/arm/ -e s/alpha/axp/)
+@@ -62,7 +62,7 @@
+ ifeq ($(OS),FreeBSD)
+ ARCH?=freebsd_$(BASE_ARCH)
+ else
+-ARCH?=$(BASE_ARCH)
++ARCH=$(BASE_ARCH)
+ endif
+ 
+ SHARED_LIBRARY_EXTENSION=so
+@@ -72,7 +72,7 @@
+ 
+ ifeq ($(DEBUG_BUILD), YES)
+ BINDIR=debug
+-CFLAGS_DEBUG=-O0 -ggdb -D_DEBUG
++CFLAGS_DEBUG=-D_DEBUG
+ else
+ BINDIR=release
+ endif
+@@ -196,8 +196,8 @@
+ X11BASE?=/usr/X11R6
+ 
+ CFLAGS_COMMON=$(CFLAGS) -pipe -I. -I$(LOCALBASE)/include -I$(X11BASE)/include -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -Wall -Wno-unused-function -fvisibility=hidden
+-CFLAGS_RELEASE=-O2 -fno-strict-aliasing -ffast-math -funroll-loops -DNDEBUG -msse2
+-CFLAGS_DEBUG=-O0 -ggdb -D_DEBUG
++CFLAGS_RELEASE=-fno-strict-aliasing -ffast-math -funroll-loops -DNDEBUG
++CFLAGS_DEBUG=-D_DEBUG
+ ifeq ($(DEBUG_BUILD),YES)
+ CFLAGS_COMMON+=$(CFLAGS_DEBUG)
+ else
+@@ -209,18 +209,18 @@
+ CFLAGS_MODULE=-DPIC -fPIC
+ CFLAGS_TV_SERVER=-DDEDICATED_ONLY -DTV_SERVER_ONLY -DC_ONLY -DTV_MODULE_HARD_LINKED
+ 
+-LDFLAGS_COMMON=$(LDFLAGS)
+-LXXFLAGS_COMMON=$(LDFLAGS) -lstdc++ -lsupc++
++LDFLAGS_COMMON=
++LXXFLAGS_COMMON=-lstdc++ -lsupc++
+ 
+ ifeq ($(OS),FreeBSD)
+ LDFLAGS_COMMON+= -L/usr/local/lib -lm -pthread
+ else
+-LDFLAGS_COMMON+= -L/usr/local/lib -ldl -lm -O1 -Wl,--as-needed
++LDFLAGS_COMMON+= -ldl -lm
+ endif
+ 
+ ifneq ($(DEBUG_BUILD),YES)
+-LDFLAGS_COMMON+= -s
+-LXXFLAGS_COMMON+= -s
++LDFLAGS_COMMON+=
++LXXFLAGS_COMMON+=
+ endif
+ 
+ ifeq ($(ARCH),x86_64)
+@@ -298,12 +298,9 @@
+ ######################################################################################################
+ # Helper functions
+ ######################################################################################################
+-DO_CC=echo "  > Compiling $<" && \
+-	$(CC) $(CFLAGS_COMMON) -c $< -o $@
+-DO_CXX=echo "  > Compiling (c++) $<" && \
+-	$(CXX) $(CFLAGS_COMMON) $(CXXFLAGS_COMMON) -c $< -o $@
+-DO_RES=echo "  > Compiling resource $<" && \
+-	$(RES) $(RESFLAGS_COMMON) -i $< -o $@
++DO_CC=$(CC) $(CFLAGS_COMMON) -c $< -o $@
++DO_CXX=$(CXX) $(CFLAGS_COMMON) $(CXXFLAGS_COMMON) -c $< -o $@
++DO_RES=$(RES) $(RESFLAGS_COMMON) -i $< -o $@
+ 
+ DO_CC_CLIENT=$(DO_CC) $(CFLAGS_CLIENT)
+ DO_CC_DED=$(DO_CC) $(CFLAGS_DED)
+@@ -505,17 +502,17 @@
+ 
+ all: client openal qf ded cgame game ui irc cin angelwrap tv_server
+ 
+-client: $(BUILDDIRS) message-client compile-client link-client start-script-client
++client: $(BUILDDIRS) message-client compile-client link-client
+ openal: $(BUILDDIRS) message-openal compile-openal link-openal
+ qf: $(BUILDDIRS) message-qf compile-qf link-qf
+-ded: $(BUILDDIRS) message-ded compile-ded link-ded start-script-ded
++ded: $(BUILDDIRS) message-ded compile-ded link-ded
+ cgame: $(BUILDDIRS) message-cgame compile-cgame link-cgame
+ game: $(BUILDDIRS) message-game compile-game link-game
+ ui: $(BUILDDIRS) message-ui compile-ui link-ui
+ irc: $(BUILDDIRS) message-irc compile-irc link-irc
+ cin: $(BUILDDIRS) message-cin compile-cin link-cin
+ angelwrap: $(BUILDDIRS) message-angelwrap compile-angelwrap link-angelwrap
+-tv_server: $(BUILDDIRS) message-tv_server compile-tv_server link-tv_server start-script-tv_server
++tv_server: $(BUILDDIRS) message-tv_server compile-tv_server link-tv_server
+ 
+ clean: clean-msg clean-depend clean-client clean-openal clean-qf clean-ded clean-cgame clean-game clean-ui clean-librocket clean-irc clean-cin clean-angelwrap clean-tv_server
+ 
+@@ -611,13 +608,14 @@
+ 	@echo "> *********************************************************"
+ compile-ui: $(OBJS_UI_ROCKET) $(LIBROCKET_LIB)
+ link-ui: $(BINDIR)/basewsw $(BINDIR)/basewsw/ui_$(ARCH).$(SHARED_LIBRARY_EXTENSION)
++$(BINDIR)/basewsw/ui_$(ARCH).$(SHARED_LIBRARY_EXTENSION): $(LIBROCKET_LIB)
+ clean-ui:
+ 	@echo "  > Removing ui objects" && \
+ 	$(RM) $(OBJS_UI_ROCKET)
+ 
+ $(LIBROCKET_LIB):
+ 	@echo "> * Building Rocket library"
+-	@CXX=$(CXX) AR=$(AR) RANLIB=$(RANLIB) CXXFLAGS="$(CFLAGS)" DEBUG_BUILD=$(DEBUG_BUILD) USE_MINGW=$(USE_MINGW) $(MAKE) -C $(LIBROCKET_DIR) -f $(LIBROCKET_MAKEFILE) DEBUG_BUILD=$(DEBUG_BUILD)
++	@CXX=$(CXX) AR=$(AR) RANLIB=$(RANLIB) CXXFLAGS="$(CXXFLAGS)" DEBUG_BUILD=$(DEBUG_BUILD) USE_MINGW=$(USE_MINGW) $(MAKE) -C $(LIBROCKET_DIR) -f $(LIBROCKET_MAKEFILE) DEBUG_BUILD=$(DEBUG_BUILD)
+ 	@echo "> * Done building RocketCore library."
+ 	@echo "> *********************************************************"
+ 	@echo "> * Continuing ui building..."
+@@ -656,7 +654,6 @@
+ 	@echo "> *********************************************************"
+ 	@echo "> * Building angelwrap"
+ 	@echo "> *********************************************************"
+-	-@rm $(ANGELSCRIPT_LIB)
+ $(ANGELSCRIPT_INC)/angelscript.h:
+ 	@echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+ 	@echo "!!!"
+@@ -668,7 +665,7 @@
+ 
+ $(ANGELSCRIPT_LIB): $(ANGELSCRIPT_INC)/angelscript.h
+ 	@echo "> * Building Angelscript library first"
+-	@CXX=$(CXX) AR=$(AR) RANLIB=$(RANLIB) CXXFLAGS="$(CFLAGS)" $(MAKE) -C $(ANGELSCRIPT_PROJECT_DIR)
++	@CXX=$(CXX) AR=$(AR) RANLIB=$(RANLIB) CXXFLAGS="$(CXXFLAGS)" $(MAKE) -C $(ANGELSCRIPT_PROJECT_DIR)
+ 	@echo "> * Done building angelscript library."
+ 	@echo "> *********************************************************"
+ 	@echo "> * Continuing angelwrap building..."
+@@ -702,69 +699,57 @@
+ # DED
+ ########
+ $(BINDIR)/$(SERVER_EXE): $(OBJS_DED)
+-	@echo "  > Linking $@" && \
+-	$(LD) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_DED)
++	$(LD) $(LDFLAGS) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_DED)
+ 
+ #########
+ # CLIENT
+ #########
+ ifeq ($(OS),Darwin)
+ $(BINDIR)/$(CLIENT_EXE): $(OBJS_CLIENT)
+-	@echo "  > Linking $@" && \
+-	$(LD) -o $@ $(OBJS_CLIENT) mac/SDLMain.m $(LDFLAGS_COMMON) $(LDFLAGS_CLIENT)
++	$(LD) $(LDFLAGS) -o $@ $(OBJS_CLIENT) mac/SDLMain.m $(LDFLAGS_COMMON) $(LDFLAGS_CLIENT)
+ else
+ $(BINDIR)/$(CLIENT_EXE): $(OBJS_CLIENT)
+-	@echo "  > Linking $@" && \
+-	$(LD) -o $@ $(OBJS_CLIENT) $(LDFLAGS_COMMON) $(LDFLAGS_CLIENT)
++	$(LD) $(LDFLAGS) -o $@ $(OBJS_CLIENT) $(LDFLAGS_COMMON) $(LDFLAGS_CLIENT)
+ endif
+ 
+ #########
+ # OPENAL
+ #########
+ $(BINDIR)/libs/snd_openal_$(ARCH).$(SHARED_LIBRARY_EXTENSION): $(OBJS_OPENAL)
+-	@echo "  > Linking $@" && \
+-	$(LD) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_OPENAL)
++	$(LD) $(LDFLAGS) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_OPENAL)
+ 
+ #########
+ # QF
+ #########
+ $(BINDIR)/libs/snd_qf_$(ARCH).$(SHARED_LIBRARY_EXTENSION): $(OBJS_QF)
+-	@echo "  > Linking $@" && \
+-	$(LD) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_QF)
++	$(LD) $(LDFLAGS) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_QF)
+ 
+ ########
+ # .SO
+ ########
+ $(BINDIR)/basewsw/cgame_$(ARCH).$(SHARED_LIBRARY_EXTENSION): $(OBJS_CGAME)
+-	@echo "  > Linking $@" && \
+-	$(LD) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE)
++	$(LD) $(LDFLAGS) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE)
+ 
+ $(BINDIR)/basewsw/game_$(ARCH).$(SHARED_LIBRARY_EXTENSION): $(OBJS_GAME)
+-	@echo "  > Linking $@" && \
+-	$(LD) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE)
++	$(LD) $(LDFLAGS) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE)
+ 
+ $(BINDIR)/basewsw/ui_$(ARCH).$(SHARED_LIBRARY_EXTENSION): $(OBJS_UI_ROCKET)
+-	@echo "  > Linking $@" && \
+-	$(LXX) -o $@ $^ $(LXXFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_ROCKET)
++	$(LXX) $(LDFLAGS) -o $@ $^ $(LXXFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_ROCKET)
+ 
+ $(BINDIR)/libs/irc_$(ARCH).$(SHARED_LIBRARY_EXTENSION): $(OBJS_IRC)
+-	@echo "  > Linking $@" && \
+-	$(LD) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_IRC)
++	$(LD) $(LDFLAGS) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_IRC)
+ 
+ $(BINDIR)/libs/cin_$(ARCH).$(SHARED_LIBRARY_EXTENSION): $(OBJS_CIN)
+-	@echo "  > Linking $@" && \
+-	$(LD) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_CIN)
++	$(LD) $(LDFLAGS) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_CIN)
+ 
+ $(BINDIR)/libs/angelwrap_$(ARCH).$(SHARED_LIBRARY_EXTENSION): $(OBJS_ANGELWRAP)
+-	@echo "  > Linking $@" && \
+-	$(LXX) -o $@ $^ $(LXXFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_ANGELWRAP)
++	$(LXX) $(LDFLAGS) -o $@ $^ $(LXXFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_ANGELWRAP)
+ 
+ ########
+ # TV
+ ########
+ $(BINDIR)/$(TV_SERVER_EXE): $(OBJS_TV_SERVER)
+-	@echo "  > Linking $@" && \
+-	$(LD) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_TV_SERVER)
++	$(LD) $(LDFLAGS) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_TV_SERVER)
+ 
+ ######################################################################################################
+ # Meta Rules
+@@ -776,49 +761,48 @@
+ # CLIENT
+ ########
+ $(BUILDDIR)/client/%.o: qcommon/%.c
+-	@$(DO_CC_CLIENT)
++	$(DO_CC_CLIENT)
+ 
+ $(BUILDDIR)/client/%.o: server/%.c
+-	@$(DO_CC_CLIENT)
++	$(DO_CC_CLIENT)
+ 
+ $(BUILDDIR)/client/%.o: client/%.c
+-	@$(DO_CC_CLIENT)
++	$(DO_CC_CLIENT)
+ 
+ $(BUILDDIR)/client/%.o: ref_gl/%.c
+-	@$(DO_CC_CLIENT)
++	$(DO_CC_CLIENT)
+ 
+ $(BUILDDIR)/client/%.o: null/%.c
+-	@$(DO_CC_CLIENT)
++	$(DO_CC_CLIENT)
+ 
+ $(BUILDDIR)/client/%.o: matchmaker/%.c
+-	@$(DO_CC_CLIENT)
++	$(DO_CC_CLIENT)
+ 
+ ifeq ($(USE_MINGW),YES)
+ $(BUILDDIR)/client/%.o: win32/%.c
+-	@$(DO_CC_CLIENT)
++	$(DO_CC_CLIENT)
+ 
+ $(BUILDDIR)/client/%.o: win32/%.rc
+-	@$(DO_RES_CLIENT)
++	$(DO_RES_CLIENT)
+ else
+ ifeq ($(OS),Darwin)
+ $(BUILDDIR)/client/%.o: mac/%.c
+-	@$(DO_CC_CLIENT)
++	$(DO_CC_CLIENT)
+ $(BUILDDIR)/client/%.o: unix/%.c
+-	@$(DO_CC_CLIENT)
++	$(DO_CC_CLIENT)
+ else
+ $(BUILDDIR)/client/%.o: unix/%.c
+-	@$(DO_CC_CLIENT)
++	$(DO_CC_CLIENT)
+ endif
+ endif
+ 
+ $(BUILDDIR)/client/%.o: game/%.c
+-	@$(DO_CC_CLIENT)
++	$(DO_CC_CLIENT)
+ 
+ $(BUILDDIR)/client/%.o: gameshared/%.c
+-	@$(DO_CC_DED)
++	$(DO_CC_DED)
+ 
+ $(BINDIR)/warsow: unix/start_script.sh
+-	@echo "  > Installing client start script" && \
+ 	cp $< $@ && \
+ 	chmod a+x $@
+ 
+@@ -826,60 +810,59 @@
+ # OPENAL
+ ########
+ $(BUILDDIR)/openal/%.o: snd_openal/%.c
+-	@$(DO_CC_MODULE) $(CFLAGS_OPENAL)
++	$(DO_CC_MODULE) $(CFLAGS_OPENAL)
+ 
+ $(BUILDDIR)/openal/%.o: gameshared/%.c
+-	@$(DO_CC_MODULE)
++	$(DO_CC_MODULE)
+ 
+ ########
+ # QF
+ ########
+ $(BUILDDIR)/qf/%.o: snd_qf/%.c
+-	@$(DO_CC_MODULE) $(CFLAGS_QF)
++	$(DO_CC_MODULE) $(CFLAGS_QF)
+ 
+ ifeq ($(USE_MINGW),YES)
+ $(BUILDDIR)/qf/win_snd.o: win32/win_snd.c
+-	@$(DO_CC_MODULE) $(CFLAGS_DSOUND)
++	$(DO_CC_MODULE) $(CFLAGS_DSOUND)
+ else
+ $(BUILDDIR)/qf/unix_snd.o: unix/unix_snd.c
+-	@$(DO_CC_MODULE) $(CFLAGS_SDL)
++	$(DO_CC_MODULE) $(CFLAGS_SDL)
+ endif
+ 
+ $(BUILDDIR)/qf/%.o: gameshared/%.c
+-	@$(DO_CC_MODULE)
++	$(DO_CC_MODULE)
+ 
+ 
+ ########
+ # DED
+ ########
+ $(BUILDDIR)/ded/%.o: qcommon/%.c
+-	@$(DO_CC_DED)
++	$(DO_CC_DED)
+ 
+ $(BUILDDIR)/ded/%.o: server/%.c
+-	@$(DO_CC_DED)
++	$(DO_CC_DED)
+ 
+ ifeq ($(USE_MINGW),YES)
+ $(BUILDDIR)/ded/%.o: win32/%.c
+-	@$(DO_CC_DED)
++	$(DO_CC_DED)
+ else
+ $(BUILDDIR)/ded/%.o: unix/%.c
+-	@$(DO_CC_DED)
++	$(DO_CC_DED)
+ endif
+ 
+ $(BUILDDIR)/ded/%.o: null/%.c
+-	@$(DO_CC_DED)
++	$(DO_CC_DED)
+ 
+ $(BUILDDIR)/ded/%.o: game/%.c
+-	@$(DO_CC_DED)
++	$(DO_CC_DED)
+ 
+ $(BUILDDIR)/ded/%.o: gameshared/%.c
+-	@$(DO_CC_DED)
++	$(DO_CC_DED)
+ 
+ $(BUILDDIR)/ded/%.o: matchmaker/%.c
+-	@$(DO_CC_DED)
++	$(DO_CC_DED)
+ 
+ $(BINDIR)/wsw_server: unix/start_script.sh
+-	@echo "  > Installing dedicated server start script" && \
+ 	cp $< $@ && \
+ 	chmod a+x $@
+ 
+@@ -887,117 +870,116 @@
+ # CGAME
+ ########
+ $(BUILDDIR)/cgame/%.o: cgame/%.c
+-	@$(DO_CC_MODULE)
++	$(DO_CC_MODULE)
+ 
+ $(BUILDDIR)/cgame/%.o: gameshared/%.c
+-	@$(DO_CC_MODULE)
++	$(DO_CC_MODULE)
+ 
+ ########
+ # GAME
+ ########
+ $(BUILDDIR)/game/%.o: game/%.c
+-	@$(DO_CC_MODULE)
++	$(DO_CC_MODULE)
+ 
+ $(BUILDDIR)/game/%.o: game/ai/%.c
+-	@$(DO_CC_MODULE)
++	$(DO_CC_MODULE)
+ 
+ $(BUILDDIR)/game/%.o: gameshared/%.c
+-	@$(DO_CC_MODULE)
++	$(DO_CC_MODULE)
+ 
+ $(BUILDDIR)/game/%.o: matchmaker/%.c
+-	@$(DO_CC_MODULE)
++	$(DO_CC_MODULE)
+ 
+ ########
+ # UI.ROCKET
+ ########
+ $(BUILDDIR)/ui/%.o: gameshared/%.c
+-	@$(DO_CC_MODULE)
++	$(DO_CC_MODULE)
+ 
+ $(BUILDDIR)/ui/%.o: ui/%.cpp
+-	@$(DO_CXX_MODULE) $(CFLAGS_ROCKET)
++	$(DO_CXX_MODULE) $(CFLAGS_ROCKET)
+ 
+ $(BUILDDIR)/ui/%.o: ui/kernel/%.cpp
+-	@$(DO_CXX_MODULE) $(CFLAGS_ROCKET)
++	$(DO_CXX_MODULE) $(CFLAGS_ROCKET)
+ 
+ $(BUILDDIR)/ui/%.o: ui/as/%.cpp
+-	@$(DO_CXX_MODULE) $(CFLAGS_ROCKET)
++	$(DO_CXX_MODULE) $(CFLAGS_ROCKET)
+ 
+ $(BUILDDIR)/ui/%.o: ui/datasources/%.cpp
+-	@$(DO_CXX_MODULE) $(CFLAGS_ROCKET)
++	$(DO_CXX_MODULE) $(CFLAGS_ROCKET)
+ 
+ $(BUILDDIR)/ui/%.o: ui/widgets/%.cpp
+-	@$(DO_CXX_MODULE) $(CFLAGS_ROCKET)
++	$(DO_CXX_MODULE) $(CFLAGS_ROCKET)
+ 
+ $(BUILDDIR)/ui/%.o: ui/decorators/%.cpp
+-	@$(DO_CXX_MODULE) $(CFLAGS_ROCKET)
++	$(DO_CXX_MODULE) $(CFLAGS_ROCKET)
+ 
+ #$(BUILDDIR)/ui.as/%.o: matchmaker/%.c
+-#	@$(DO_CC_MODULE)
++#	$(DO_CC_MODULE)
+ 
+ ########
+ # IRC
+ ########
+ $(BUILDDIR)/irc/%.o: gameshared/%.c
+-	@$(DO_CC_MODULE)
++	$(DO_CC_MODULE)
+ 
+ $(BUILDDIR)/irc/%.o: irc/%.c
+-	@$(DO_CC_MODULE)
++	$(DO_CC_MODULE)
+ 
+ ########
+ # CIN
+ ########
+ $(BUILDDIR)/cin/%.o: gameshared/%.c
+-	@$(DO_CC_MODULE)
++	$(DO_CC_MODULE)
+ 
+ $(BUILDDIR)/cin/%.o: cin/%.c
+-	@$(DO_CC_MODULE) $(CFLAGS_CIN)
++	$(DO_CC_MODULE) $(CFLAGS_CIN)
+ 
+ ########
+ # ANGELWRAP
+ ########
+ $(BUILDDIR)/angelwrap/%.o: gameshared/%.c
+-	@$(DO_CC_MODULE) $(CFLAGS_ANGELWRAP)
++	$(DO_CC_MODULE) $(CFLAGS_ANGELWRAP)
+ 
+ $(BUILDDIR)/angelwrap/%.o: angelwrap/%.c
+-	@$(DO_CC_MODULE) $(CFLAGS_ANGELWRAP)
++	$(DO_CC_MODULE) $(CFLAGS_ANGELWRAP)
+ 
+ $(BUILDDIR)/angelwrap/%.o: angelwrap/%.cpp
+-	@$(DO_CXX_MODULE) $(CFLAGS_ANGELWRAP)
++	$(DO_CXX_MODULE) $(CFLAGS_ANGELWRAP)
+ 
+ $(BUILDDIR)/angelwrap/%.o : angelwrap/addon/%.cpp
+-	@$(DO_CXX_MODULE) $(CFLAGS_ANGELWRAP)
++	$(DO_CXX_MODULE) $(CFLAGS_ANGELWRAP)
+ 
+ ########
+ # TV SERVER
+ ########
+ $(BUILDDIR)/tv_server/%.o: qcommon/%.c
+-	@$(DO_CC_TV_SERVER)
++	$(DO_CC_TV_SERVER)
+ 
+ $(BUILDDIR)/tv_server/%.o: client/%.c
+-	@$(DO_CC_TV_SERVER)
++	$(DO_CC_TV_SERVER)
+ 
+ $(BUILDDIR)/tv_server/%.o: tv_server/tv_module/%.c
+-	@$(DO_CC_TV_SERVER)
++	$(DO_CC_TV_SERVER)
+ 
+ $(BUILDDIR)/tv_server/%.o: tv_server/%.c
+-	@$(DO_CC_TV_SERVER)
++	$(DO_CC_TV_SERVER)
+ 
+ ifeq ($(USE_MINGW),YES)
+ $(BUILDDIR)/tv_server/%.o: win32/%.c
+-	@$(DO_CC_TV_SERVER)
++	$(DO_CC_TV_SERVER)
+ else
+ $(BUILDDIR)/tv_server/%.o: unix/%.c
+-	@$(DO_CC_TV_SERVER)
++	$(DO_CC_TV_SERVER)
+ endif
+ 
+ $(BUILDDIR)/tv_server/%.o: null/%.c
+-	@$(DO_CC_TV_SERVER)
++	$(DO_CC_TV_SERVER)
+ 
+ $(BUILDDIR)/tv_server/%.o: gameshared/%.c
+-	@$(DO_CC_TV_SERVER)
++	$(DO_CC_TV_SERVER)
+ 
+ $(BINDIR)/wswtv_server: unix/start_script.sh
+-	@echo "  > Installing TV server start script" && \
+ 	cp $< $@ && \
+ 	chmod a+x $@
+ 
+--- libsrcs/libRocket/libRocket/Makefile.warsow
++++ libsrcs/libRocket/libRocket/Makefile.warsow
+@@ -13,9 +13,9 @@
+ endif
+ 
+ ifeq ($(DEBUG_BUILD),YES)
+-	CXXFLAGS += -g -DROCKET_DEBUG
++	CXXFLAGS += -DROCKET_DEBUG
+ else
+-	CXXFLAGS += -O2
++	CXXFLAGS += 
+ endif
+ 
+ BUILDDIR=Build/obj
+--- libsrcs/angelscript/angelSVN/sdk/angelscript/projects/gnuc/makefile
++++ libsrcs/angelscript/angelSVN/sdk/angelscript/projects/gnuc/makefile
+@@ -47,7 +47,7 @@
+ 	CXX ?= gcc
+ 	# On i686 architecture you may need to add -march=i686 if you get 
+ 	# an undefined symbol for __sync_sub_and_fetch_4 in as_atomic.cpp.
+-	CXXFLAGS += -g -Wall -fPIC -fno-strict-aliasing
++	CXXFLAGS += -Wall -fPIC -fno-strict-aliasing
+ endif
+ 
+ AR ?= ar
diff --git a/games-fps/warsow/warsow-1.02.ebuild b/games-fps/warsow/warsow-1.02.ebuild
new file mode 100644
index 000000000000..fefcc65c521a
--- /dev/null
+++ b/games-fps/warsow/warsow-1.02.ebuild
@@ -0,0 +1,176 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-fps/warsow/warsow-1.02.ebuild,v 1.1 2012/10/21 00:37:24 hasufell Exp $
+
+EAPI=4
+inherit eutils check-reqs gnome2-utils games
+
+MY_P=${PN}_${PV}
+DESCRIPTION="Multiplayer FPS based on the QFusion engine (evolved from Quake 2)"
+HOMEPAGE="http://www.warsow.net/"
+SRC_URI="http://funpark.warsow-esport.net/~${PN}/1.0/${PN}_1.0_unified.tar.gz
+	http://funpark.warsow-esport.net/~${PN}/${PV}/${MY_P}_sdk.tar.gz
+	http://funpark.warsow-esport.net/~${PN}/${PV}/${MY_P}_update.zip
+	mirror://gentoo/${PN}.png"
+
+LICENSE="GPL-2 warsow"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+angelscript debug dedicated irc openal server"
+
+RDEPEND="media-libs/freetype
+	net-misc/curl
+	sys-libs/zlib
+	!dedicated? (
+		media-libs/libpng:0
+		media-libs/libsdl
+		media-libs/libtheora
+		media-libs/libvorbis
+		x11-libs/libX11
+		x11-libs/libXinerama
+		x11-libs/libXrandr
+		x11-libs/libXxf86dga
+		x11-libs/libXxf86vm
+		virtual/jpeg
+		virtual/opengl
+		openal? ( media-libs/openal )
+	)"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	x11-misc/makedepend
+	!dedicated? (
+		x11-proto/xineramaproto
+		x11-proto/xf86dgaproto
+		x11-proto/xf86vidmodeproto
+	)
+	openal? ( virtual/pkgconfig )"
+
+S=${WORKDIR}/${MY_P}_sdk/source
+S_U=${WORKDIR}/${PN}_1.0
+S_UPDATE=${WORKDIR}/${MY_P}_update
+
+CHECKREQS_DISK_BUILD="1G"
+CHECKREQS_DISK_USR="500M"
+
+src_unpack() {
+	unpack ${PN}_1.0_unified.tar.gz ${MY_P}_sdk.tar.gz
+	mkdir "${S_UPDATE}" || die
+	cd "${S_UPDATE}" || die
+	unpack ${MY_P}_update.zip
+}
+
+src_prepare() {
+	sed -i \
+		-e "/fs_basepath =/ s:\.:${GAMES_DATADIR}/${PN}:" \
+		qcommon/files.c \
+		|| die "sed files.c failed"
+
+	sed -i \
+		-e "s:q_jpeg_mem_src:_&:" \
+		ref_gl/r_image.c || die "sed r_image.c failed"
+
+	rm -r "${S_U}"/docs/old* || die
+
+	cd "${WORKDIR}"/${MY_P}_sdk || die
+	epatch "${FILESDIR}"/${P}-build.patch \
+		"${FILESDIR}"/${PN}-0.5-pic.patch
+	epatch_user
+}
+
+src_compile() {
+	yesno() { use ${1} && echo YES || echo NO ; }
+
+	use angelscript &&
+		emake -C ../libsrcs/angelscript/angelSVN/sdk/angelscript/projects/gnuc
+
+	local arch
+	if use amd64 ; then
+		arch=x86_64
+	elif use x86 ; then
+		arch=i386
+	fi
+
+	local myconf
+	if use dedicated ; then
+		myconf=(
+			BUILD_CLIENT=NO
+			BUILD_IRC=NO
+			BUILD_SND_OPENAL=NO
+			BUILD_SND_QF=NO
+			BUILD_CIN=NO
+			BUILD_SERVER=YES
+			BUILD_TV_SERVER=YES
+		)
+	else
+		myconf=(
+			BUILD_CLIENT=YES
+			BUILD_IRC=$(yesno irc)
+			BUILD_SND_OPENAL=$(yesno openal)
+			BUILD_SND_QF=YES
+			BUILD_CIN=YES
+			BUILD_SERVER=$(yesno server)
+			BUILD_TV_SERVER=$(yesno server)
+		)
+	fi
+
+	emake \
+		BASE_ARCH=${arch} \
+		BINDIR=lib \
+		BUILD_ANGELWRAP=$(yesno angelscript) \
+		DEBUG_BUILD=$(yesno debug) \
+		${myconf[@]}
+}
+
+src_install() {
+	cd lib
+
+	if ! use dedicated ; then
+		newgamesbin ${PN}.* ${PN}
+		doicon -s 48 "${DISTDIR}"/${PN}.png
+		make_desktop_entry ${PN} Warsow
+	fi
+
+	if use dedicated || use server ; then
+		newgamesbin wsw_server.* ${PN}-ded
+		newgamesbin wswtv_server.* ${PN}-tv
+	fi
+
+	exeinto "$(games_get_libdir)"/${PN}
+	doexe */*.so
+
+	insinto "${GAMES_DATADIR}"/${PN}
+	doins -r "${S_U}"/basewsw
+	doins -r "${S_UPDATE}"/basewsw
+
+	local so
+	for so in basewsw/*.so ; do
+		dosym "$(games_get_libdir)"/${PN}/${so##*/} \
+			"${GAMES_DATADIR}"/${PN}/${so}
+	done
+
+	if [[ -e libs ]] ; then
+		dodir "${GAMES_DATADIR}"/${PN}/libs
+		for so in libs/*.so ; do
+			dosym "$(games_get_libdir)"/${PN}/${so##*/} \
+				"${GAMES_DATADIR}"/${PN}/${so}
+		done
+	fi
+
+	dodoc "${S_U}"/docs/*
+	dodoc "${S_UPDATE}"/docs/*
+	prepgamesdirs
+}
+
+pkg_preinst() {
+	games_pkg_preinst
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/games-misc/fortune-mod-gentoo-ru/Manifest b/games-misc/fortune-mod-gentoo-ru/Manifest
index ff992d4f0587..717e9a45f920 100644
--- a/games-misc/fortune-mod-gentoo-ru/Manifest
+++ b/games-misc/fortune-mod-gentoo-ru/Manifest
@@ -1,2 +1,2 @@
-DIST gentoo-ru-0.25.gz 74751 RMD160 feb0a871492db8d09476aa3bd605d97c4fe31db1 SHA1 3bfb061f81fc44a9b72303976c7546a6815efa8c SHA256 2c73ea65ca841fd35a38a8f9aa0d890f12865dd6ae79d24c2333501c54e52cdf
-DIST gentoo-ru-0.26.gz 77812 RMD160 86535954ad46107efae8717a2866965cc011d63a SHA1 682e6612dc2cd6829789817e3747eff612b3fd4f SHA256 1ce7e038c5a97ec226f38ded4070fa4bab363b6ff6649bf91daa3ce327cb68d9
+DIST gentoo-ru-0.25.gz 74751 SHA256 2c73ea65ca841fd35a38a8f9aa0d890f12865dd6ae79d24c2333501c54e52cdf
+DIST gentoo-ru-0.26.gz 77812 SHA256 1ce7e038c5a97ec226f38ded4070fa4bab363b6ff6649bf91daa3ce327cb68d9
diff --git a/games-misc/fortune-mod-gentoo-ru/fortune-mod-gentoo-ru-0.25.ebuild b/games-misc/fortune-mod-gentoo-ru/fortune-mod-gentoo-ru-0.25.ebuild
index 5ff5c38c45c6..15c5a001fcf9 100644
--- a/games-misc/fortune-mod-gentoo-ru/fortune-mod-gentoo-ru-0.25.ebuild
+++ b/games-misc/fortune-mod-gentoo-ru/fortune-mod-gentoo-ru-0.25.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-misc/fortune-mod-gentoo-ru/fortune-mod-gentoo-ru-0.25.ebuild,v 1.3 2012/02/16 18:22:24 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-misc/fortune-mod-gentoo-ru/fortune-mod-gentoo-ru-0.25.ebuild,v 1.4 2012/10/20 17:32:08 pinkbyte Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ SRC_URI="http://slepnoga.googlecode.com/files/gentoo-ru-${PV}.gz
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="games-misc/fortune-mod"
diff --git a/games-misc/fortune-mod-gentoo-ru/fortune-mod-gentoo-ru-0.26.ebuild b/games-misc/fortune-mod-gentoo-ru/fortune-mod-gentoo-ru-0.26.ebuild
index c26cf2455252..fb2be2289ce6 100644
--- a/games-misc/fortune-mod-gentoo-ru/fortune-mod-gentoo-ru-0.26.ebuild
+++ b/games-misc/fortune-mod-gentoo-ru/fortune-mod-gentoo-ru-0.26.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-misc/fortune-mod-gentoo-ru/fortune-mod-gentoo-ru-0.26.ebuild,v 1.3 2012/06/01 22:53:33 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-misc/fortune-mod-gentoo-ru/fortune-mod-gentoo-ru-0.26.ebuild,v 1.4 2012/10/20 17:32:08 pinkbyte Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ SRC_URI="http://slepnoga.googlecode.com/files/gentoo-ru-${PV}.gz
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="games-misc/fortune-mod"
diff --git a/games-simulation/openttd/openttd-1.2.2.ebuild b/games-simulation/openttd/openttd-1.2.2.ebuild
index c2b6a6728ea2..dbf293ae3572 100644
--- a/games-simulation/openttd/openttd-1.2.2.ebuild
+++ b/games-simulation/openttd/openttd-1.2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-simulation/openttd/openttd-1.2.2.ebuild,v 1.3 2012/09/14 05:10:46 ferringb Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/openttd/openttd-1.2.2.ebuild,v 1.4 2012/10/20 18:39:48 ago Exp $
 
 EAPI=3
 inherit eutils gnome2-utils games
@@ -11,7 +11,7 @@ SRC_URI="http://binaries.openttd.org/releases/${PV}/${P}-source.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE="aplaymidi debug dedicated iconv icu lzo +openmedia +png +timidity +truetype zlib"
 RESTRICT="test" # needs a graphics set in order to test
 
diff --git a/games-strategy/openra/Manifest b/games-strategy/openra/Manifest
index d8b87d516c35..b4aa97386a5b 100644
--- a/games-strategy/openra/Manifest
+++ b/games-strategy/openra/Manifest
@@ -1 +1,2 @@
 DIST openra-20120630.tar.gz 10330304 SHA256 f95b9d41ea4b4094ea61519f6fb0185fa242af156e2ec26dc1f2d55197470a3c SHA512 ab5996a3f48d8be227edc029d3fa7948a80756a64bca65d1936c3f4480ef5258cb62365d079cc28ba2be59796db91326c4f8c8d500ea4d2bbf3a8439d783fceb WHIRLPOOL 390b5fa57ef322e6204a23006fc3a7755178d28e115fd52fa4ca5b46ecf58f8df61b44a90ba2fe143a7fadd0be42aaf3488c3b938eaea11171636b562dfe344d
+DIST openra-20121019.tar.gz 11338976 SHA256 016dd79f759c539889c290e7bd90b3faa92e88c35c6cd20789803b30135978e9 SHA512 199a88b2a34c05787e1d5ebced15975c76b2fb45d70c613db679e7faaa158942a7ddc842ff8e0f912e4e70beb3dab4f281e62dee76899fc67582ec8c067b3556 WHIRLPOOL bf694d4e94d35dd31343b127e7c4855b3bcf56cd6559d5f6a3c3f4ee9e40f627880e79ba599d5929d8c5b49643b93c09ee9d55f35c426d08526736190a9029a2
diff --git a/games-strategy/openra/openra-20121019.ebuild b/games-strategy/openra/openra-20121019.ebuild
new file mode 100644
index 000000000000..98596cf8e56f
--- /dev/null
+++ b/games-strategy/openra/openra-20121019.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/openra/openra-20121019.ebuild,v 1.1 2012/10/21 00:09:36 hasufell Exp $
+
+EAPI=4
+
+inherit eutils mono gnome2-utils vcs-snapshot games
+
+DESCRIPTION="A free RTS engine supporting games like Command & Conquer and Red Alert"
+HOMEPAGE="http://open-ra.org/"
+SRC_URI="https://github.com/OpenRA/OpenRA/tarball/release-${PV} -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cg"
+
+DEPEND="dev-dotnet/libgdiplus
+	dev-lang/mono
+	media-libs/freetype:2[X]
+	media-libs/libsdl[X,opengl,video]
+	media-libs/openal
+	virtual/jpeg
+	virtual/opengl
+	cg? ( >=media-gfx/nvidia-cg-toolkit-2.1.0017 )"
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+	vcs-snapshot_src_unpack
+}
+
+src_prepare() {
+	# register game-version
+	sed \
+		-e "/Version/s/{DEV_VERSION}/release-${PV}/" \
+		-i mods/{ra,cnc,d2k}/mod.yaml || die
+}
+
+src_install() {
+	emake \
+		datadir="${GAMES_DATADIR}" \
+		bindir="${GAMES_BINDIR}" \
+		libdir="$(games_get_libdir)/${PN}" \
+		DESTDIR="${D}" \
+		install
+
+	# icons
+	insinto /usr/share/icons/
+	doins -r packaging/linux/hicolor
+
+	# desktop entries
+	local myrenderer=$(usex cg Cg Gl)
+	make_desktop_entry "${PN} Game.Mods=cnc Graphics.Renderer=${myrenderer}" \
+		"OpenRA CNC" ${PN}
+	make_desktop_entry "${PN} Game.Mods=ra Graphics.Renderer=${myrenderer}" \
+		"OpenRA RA" ${PN}
+	make_desktop_entry "${PN} Game.Mods=d2k Graphics.Renderer=${myrenderer}" \
+		"OpenRA Dune2k" ${PN}
+	make_desktop_entry "${PN}-editor" "OpenRA Map Editor" ${PN}
+
+	dodoc "${FILESDIR}"/README.gentoo README HACKING CHANGELOG
+
+	# file permissions
+	prepgamesdirs
+}
+
+pkg_preinst() {
+	games_pkg_preinst
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+	gnome2_icon_cache_update
+
+	if ! use cg ; then
+		elog "If you have problems starting the game consider switching"
+		elog "to Graphics.Renderer=Cg in openra*.desktop or manually"
+		elog "run:"
+		elog "${PN} Game.Mods=\$mod Graphics.Renderer=Cg"
+	fi
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/gnome-extra/gnome-media/Manifest b/gnome-extra/gnome-media/Manifest
index 63f80bcb4e51..18332177f413 100644
--- a/gnome-extra/gnome-media/Manifest
+++ b/gnome-extra/gnome-media/Manifest
@@ -1,2 +1,2 @@
-DIST gnome-media-2.30.0.tar.bz2 2707711 RMD160 9ba6f6fdc25afa34072e80ca4102800d7d75e2bc SHA1 c077f1c0a4ef97908c7bb36e41477c77069fdcd0 SHA256 994cd9b88ff22e4815585629b14efc828a95284900809b0b4f8ebcde0c6e2926
-DIST gnome-media-2.32.0.tar.bz2 2814365 RMD160 c24ec7d76ca1c63610ca78f6291b2abb19f05a3c SHA1 63fd51515338e4a67d0bd2871ff4d554245bc57c SHA256 2b0ad4decd75406398f46e82a170e53bcbc6e1bdc3363f03a07b00f59c2fe5e6
+DIST gnome-media-2.32.0.tar.bz2 2814365 SHA256 2b0ad4decd75406398f46e82a170e53bcbc6e1bdc3363f03a07b00f59c2fe5e6 SHA512 c43aa3d88811dbd5e8f4aa0f44c6efbc5aa3576170280c27ed95a1f45cb5f18bf40b4c2cfcc27db1a97b7e216070255e74f15cf39d66af5a70c4065f4e609592 WHIRLPOOL 18fe0424a40b5692ae9925c3cb4d9e2ec0238f866a67d76f0484a605b6ff9236fbb2716d4a7e011722ffeb6a20bacc8e5d07ce4a6f2f9d74512bbcecc022a47a
+DIST gnome-media-3.4.0.tar.xz 1832200 SHA256 a76fac286f24d3836137ddbaab66f05e19eb5fb83cca6e375dbef040765a1d1f SHA512 6466b7f451a6c6fb2dd3569bb3a83fb7b7826593cb09b6608daf8e99bee6afec628a547e63d1139d2a4358cf9ceb4891bb02b503ea04c88de874a16ea6a1babb WHIRLPOOL 5fd481f7d38ee67aa32c3eb9b4c473b86297b7b6f89d6605fda53a813da11d5ab0a133e5523d3dded3d3e2b567cc9de76fd693a51f18ebdd94f61d2585261b66
diff --git a/gnome-extra/gnome-media/gnome-media-2.30.0-r1.ebuild b/gnome-extra/gnome-media/gnome-media-2.30.0-r1.ebuild
deleted file mode 100644
index 259038a445a8..000000000000
--- a/gnome-extra/gnome-media/gnome-media-2.30.0-r1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-media/gnome-media-2.30.0-r1.ebuild,v 1.13 2012/05/05 06:25:24 jdhore Exp $
-
-EAPI="2"
-GCONF_DEBUG="no"
-
-inherit eutils gnome2
-
-DESCRIPTION="Multimedia related programs for the GNOME desktop"
-HOMEPAGE="http://ronald.bitfreak.net/gnome-media.php"
-
-LICENSE="LGPL-2 GPL-2 FDL-1.1"
-SLOT="2"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="pulseaudio"
-
-# FIXME: automagic dev-util/glade:3 support
-RDEPEND=">=dev-libs/glib-2.18.2:2
-	>=x11-libs/gtk+-2.15.1:2
-	>=gnome-base/gconf-2.6.1:2
-	>=media-libs/gstreamer-0.10.23:0.10
-	>=media-libs/gst-plugins-base-0.10.23:0.10
-	>=media-libs/gst-plugins-good-0.10:0.10
-	dev-libs/libunique:1
-
-	pulseaudio? ( >=media-sound/pulseaudio-0.9.15[glib] )
-	>=media-libs/libcanberra-0.4[gtk]
-	dev-libs/libxml2:2
-	>=media-libs/gst-plugins-base-0.10.23:0.10
-	>=media-plugins/gst-plugins-meta-0.10-r2:0.10
-	>=media-plugins/gst-plugins-gconf-0.10.1:0.10"
-DEPEND="${RDEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	virtual/pkgconfig
-	>=app-text/scrollkeeper-0.3.11
-	>=app-text/gnome-doc-utils-0.3.2
-	>=dev-util/intltool-0.35.0"
-
-DOCS="AUTHORS ChangeLog* NEWS MAINTAINERS README"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-static
-		--disable-scrollkeeper
-		--disable-schemas-install
-		--enable-gstprops
-		--enable-grecord
-		--enable-profiles
-		$(use_enable pulseaudio)
-		$(use_enable !pulseaudio gstmix)"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Use lamemp3enc and xingmux instead of the deprecated lame element
-	epatch "${FILESDIR}/${P}-lamemp3enc.patch"
-
-	# Show a microphone icon even if the stream has no ID
-	epatch "${FILESDIR}/${P}-microphone-icon.patch"
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	ewarn
-	ewarn "If you cannot play some music format, please check your"
-	ewarn "USE flags on media-plugins/gst-plugins-meta"
-	ewarn
-	if use pulseaudio; then
-		ewarn "You have enabled pulseaudio support, gstmixer will not be built"
-		ewarn "If you do not use pulseaudio, you do not want this"
-	fi
-}
diff --git a/gnome-extra/gnome-media/gnome-media-2.32.0.ebuild b/gnome-extra/gnome-media/gnome-media-2.32.0.ebuild
deleted file mode 100644
index ee384b8c79ac..000000000000
--- a/gnome-extra/gnome-media/gnome-media-2.32.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-media/gnome-media-2.32.0.ebuild,v 1.11 2012/05/05 06:25:24 jdhore Exp $
-
-EAPI="3"
-GCONF_DEBUG="no"
-
-inherit eutils gnome2
-
-DESCRIPTION="Multimedia related programs for the GNOME desktop"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="LGPL-2 GPL-2 FDL-1.1"
-SLOT="2"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="pulseaudio"
-
-# FIXME: automagic dev-util/glade:3 support
-RDEPEND=">=dev-libs/glib-2.18.2:2
-	>=x11-libs/gtk+-2.18.0:2
-	>=gnome-base/gconf-2.6.1:2
-	>=media-libs/gstreamer-0.10.23:0.10
-	>=media-libs/gst-plugins-base-0.10.23:0.10
-	>=media-libs/gst-plugins-good-0.10:0.10
-	dev-libs/libunique:1
-
-	pulseaudio? ( >=media-sound/pulseaudio-0.9.16[glib] )
-	>=media-libs/libcanberra-0.13[gtk]
-	dev-libs/libxml2:2
-	>=media-libs/gst-plugins-base-0.10.23:0.10
-	>=media-plugins/gst-plugins-meta-0.10-r2:0.10
-	>=media-plugins/gst-plugins-gconf-0.10.1:0.10"
-DEPEND="${RDEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	virtual/pkgconfig
-	>=app-text/scrollkeeper-0.3.11
-	>=app-text/gnome-doc-utils-0.3.2
-	>=dev-util/intltool-0.35.0"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-static
-		--disable-scrollkeeper
-		--disable-schemas-install
-		--enable-gstprops
-		--enable-grecord
-		--enable-profiles
-		$(use_enable pulseaudio)
-		$(use_enable !pulseaudio gstmix)"
-	DOCS="AUTHORS ChangeLog* NEWS MAINTAINERS README"
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	ewarn
-	ewarn "If you cannot play some music format, please check your"
-	ewarn "USE flags on media-plugins/gst-plugins-meta"
-	ewarn
-	if use pulseaudio; then
-		ewarn "You have enabled pulseaudio support, gstmixer will not be built"
-		ewarn "If you do not use pulseaudio, you do not want this"
-	fi
-}
diff --git a/gnome-extra/gnome-media/gnome-media-3.4.0.ebuild b/gnome-extra/gnome-media/gnome-media-3.4.0.ebuild
new file mode 100644
index 000000000000..9b7a6da6622a
--- /dev/null
+++ b/gnome-extra/gnome-media/gnome-media-3.4.0.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-media/gnome-media-3.4.0.ebuild,v 1.1 2012/10/21 11:03:25 eva Exp $
+
+EAPI="4"
+GCONF_DEBUG="no"
+
+inherit gnome2
+
+DESCRIPTION="Multimedia related programs for the GNOME desktop"
+HOMEPAGE="http://ronald.bitfreak.net/gnome-media.php"
+
+LICENSE="LGPL-2 GPL-2 FDL-1.1"
+SLOT="2"
+KEYWORDS="~amd64 ~sh ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE=""
+
+# NOTE: This package provides the following:
+#  * libgnome-media-profiles.so.0
+#  * gstreamer-properties
+#  * gnome-sound-recorder
+#  * gnome-audio-profiles
+RDEPEND="
+	dev-libs/libxml2:2
+	>=dev-libs/glib-2.18.2:2
+	>=x11-libs/gtk+-2.91:3
+	>=gnome-base/gconf-2.6.1:2
+	>=media-libs/gstreamer-0.10.23:0.10
+	>=media-libs/gst-plugins-base-0.10.23:0.10
+	>=media-libs/gst-plugins-good-0.10:0.10
+	>=media-libs/libcanberra-0.13[gtk3]
+	media-libs/libgnome-media-profiles:3
+	>=media-plugins/gst-plugins-gconf-0.10.1:0.10
+	>=media-plugins/gst-plugins-meta-0.10-r2:0.10
+"
+DEPEND="${RDEPEND}
+	app-text/docbook-xml-dtd:4.1.2
+	>=app-text/gnome-doc-utils-0.3.2
+	app-text/rarian
+	>=dev-util/intltool-0.35.0
+	gnome-base/gnome-common
+	virtual/pkgconfig
+"
+
+src_configure() {
+	G2CONF="${G2CONF}
+		--disable-static
+		--disable-schemas-install
+		--enable-gstprops
+		--enable-grecord
+		--disable-gstmix
+	"
+	DOCS="AUTHORS ChangeLog* NEWS MAINTAINERS README"
+
+	gnome2_src_configure
+}
+
+src_install() {
+	gnome2_src_install
+
+	# These files are now provided by gnome-control-center-2.91's sound applet
+	# These won't be used if gnome-volume-control is not installed
+	rm -v "${ED}"/usr/share/gnome-media/sounds/gnome-sounds-default.xml
+	rm -v "${ED}"/usr/share/sounds/gnome/default/alerts/*.ogg || die
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	ewarn
+	ewarn "If you cannot play some music format, please check your"
+	ewarn "USE flags on media-plugins/gst-plugins-meta"
+	ewarn
+}
diff --git a/gnome-extra/gnome-user-share/Manifest b/gnome-extra/gnome-user-share/Manifest
index 01d444b351e9..ef9caa4b8066 100644
--- a/gnome-extra/gnome-user-share/Manifest
+++ b/gnome-extra/gnome-user-share/Manifest
@@ -1,3 +1,3 @@
-DIST gnome-user-share-2.30.1.tar.bz2 959747 RMD160 f54ba99544bbf3f8a71486462837f99afb24de97 SHA1 1051de28334991f270b4abb67a2e7ddb01bc80ea SHA256 30ba07420a495450f80b4be001601150453ddc3504ff23c486fd1541ff5a1bfe
-DIST gnome-user-share-3.0.1.tar.xz 1000640 RMD160 6c416802a642d2ebb78ef37cd7cc9e5852cd8fb7 SHA1 af097b99e4a12f680118699c804eca19c0341ba0 SHA256 9d1188c316e536ad6f84b595f118040474f8b9017acd492e80bce30d0c5d54ea
-DIST gnome-user-share-3.0.2.tar.xz 1008128 RMD160 69ee7f1138488dd94d69fe0b18e7c9f27ee2cacb SHA1 c554c40e24db36abc983a92a19e7216bad62f8f4 SHA256 34a5b6e340025e8466233f374898a6e293839f6785c0abf14eed86d1f3d22ffd
+DIST gnome-user-share-2.30.1.tar.bz2 959747 SHA256 30ba07420a495450f80b4be001601150453ddc3504ff23c486fd1541ff5a1bfe
+DIST gnome-user-share-3.0.2.tar.xz 1008128 SHA256 34a5b6e340025e8466233f374898a6e293839f6785c0abf14eed86d1f3d22ffd SHA512 c2c5217669bb521512a9ca70fe2b361f50333ec9c9787277ec771318ff2b7e5c52bc6d59099a10239564ac383aa6158ebd1405935d2f4e18bda67a9485f65363 WHIRLPOOL 4b596dbb3e3879595b083923277f3e70876ba384daef36ec4bfb3c6c0c1422f0653564d97e83a3b61eb9f0d44883dbfb439df054d349fb5b4146fd138371ee12
+DIST gnome-user-share-3.0.3.tar.xz 1011496 SHA256 0196c22fd339922922b2f2558942ef5aac1a0896e7327cf5ab4399ad9f1f1347 SHA512 8ce142c937e1407163f0936a028e1f03e90fb2c91a1c67c568b5df2cfe6d459c7af3723a4b30a9f75f22e4823369833032432a66de8ef3c8a97bd4553d771dc0 WHIRLPOOL 5899d70e2d42802660fa4328f116f9ce9895a3e41fc1b12df7c23705e7caf6e4d80a491b72ac7201672a0798df504e676ef766feefec01786bd7c205eeb7af4e
diff --git a/gnome-extra/gnome-user-share/gnome-user-share-3.0.1.ebuild b/gnome-extra/gnome-user-share/gnome-user-share-3.0.3.ebuild
similarity index 76%
rename from gnome-extra/gnome-user-share/gnome-user-share-3.0.1.ebuild
rename to gnome-extra/gnome-user-share/gnome-user-share-3.0.3.ebuild
index ffe5c6df625b..4bb102728d4c 100644
--- a/gnome-extra/gnome-user-share/gnome-user-share-3.0.1.ebuild
+++ b/gnome-extra/gnome-user-share/gnome-user-share-3.0.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-user-share/gnome-user-share-3.0.1.ebuild,v 1.3 2012/05/06 05:39:00 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-user-share/gnome-user-share-3.0.3.ebuild,v 1.1 2012/10/21 13:28:19 eva Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -19,12 +19,11 @@ IUSE=""
 # FIXME: could libnotify be made optional ?
 # FIXME: gnome-bluetooth is a hard-dep
 # bluetooth is pure runtime dep (dbus)
-RDEPEND=">=dev-libs/glib-2.16.0:2
-	>=x11-libs/gtk+-3.0.0:3
+# FIXME selinux automagic support
+RDEPEND=">=dev-libs/glib-2.28:2
+	>=x11-libs/gtk+-3:3
 	>=app-mobilephone/obex-data-server-0.4
 	>=dev-libs/dbus-glib-0.70
-	dev-libs/libunique:3
-	>=gnome-base/gconf-2.10:2
 	>=gnome-base/nautilus-2.91.7
 	media-libs/libcanberra[gtk3]
 	>=net-wireless/gnome-bluetooth-2.91.5:2
@@ -32,17 +31,23 @@ RDEPEND=">=dev-libs/glib-2.16.0:2
 	>=sys-apps/dbus-1.1.1
 	>=www-apache/mod_dnssd-0.6
 	=www-servers/apache-2.2*[apache2_modules_dav,apache2_modules_dav_fs,apache2_modules_authn_file,apache2_modules_auth_digest,apache2_modules_authz_groupfile]
-	>=x11-libs/libnotify-0.7"
+	>=x11-libs/libnotify-0.7
+"
 DEPEND="${RDEPEND}
-	sys-devel/gettext
+	app-text/yelp-tools
+	app-text/docbook-xml-dtd:4.1.2
 	>=dev-util/intltool-0.35
+	sys-devel/gettext
 	virtual/pkgconfig
-	app-text/gnome-doc-utils
-	app-text/docbook-xml-dtd:4.1.2"
+"
 
-pkg_setup() {
+src_prepare() {
 	DOCS="AUTHORS ChangeLog NEWS README"
 	G2CONF="${G2CONF}
 		--with-httpd=apache2
 		--with-modules-path=/usr/$(get_libdir)/apache2/modules/"
+
+	# Rebuild marshalers for <glib-2.31 compatibility
+	rm -v src/marshal.{c,h} || die
+	gnome2_src_prepare
 }
diff --git a/kde-misc/plasma-lionmail/Manifest b/kde-misc/plasma-lionmail/Manifest
new file mode 100644
index 000000000000..bd23926aeae2
--- /dev/null
+++ b/kde-misc/plasma-lionmail/Manifest
@@ -0,0 +1 @@
+DIST plasma-lionmail-0_p20121020.tar.xz 38840 SHA256 30c773a274bff567ba9b1b4cc6a2acbb2587f7665a407125b5e004afa822e765 SHA512 f66d7a1b71a357c06bca0a7057ba6f0b15e6ea59d3bf3639baabf89de6d87ecbd2ba77199fa1a430f4a65fabb279c30d7bbea78796445098a2f24527897a89e3 WHIRLPOOL 653bfef94498ac246e66be656b38aa40cbdbb90eba1b34fbcf1c4602adfad6854046446a61a843d0ba06c1e02fd7a9928ec2924bd9a7bec50a35b819787eae30
diff --git a/kde-misc/plasma-lionmail/metadata.xml b/kde-misc/plasma-lionmail/metadata.xml
new file mode 100644
index 000000000000..a23f444b67d6
--- /dev/null
+++ b/kde-misc/plasma-lionmail/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>kde</herd>
+</pkgmetadata>
diff --git a/kde-misc/plasma-lionmail/plasma-lionmail-0_p20121020.ebuild b/kde-misc/plasma-lionmail/plasma-lionmail-0_p20121020.ebuild
new file mode 100644
index 000000000000..6334daee3d5c
--- /dev/null
+++ b/kde-misc/plasma-lionmail/plasma-lionmail-0_p20121020.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/plasma-lionmail/plasma-lionmail-0_p20121020.ebuild,v 1.1 2012/10/21 01:29:45 creffett Exp $
+
+EAPI=4
+
+inherit kde4-base
+
+DESCRIPTION="A Plasma widget displaying new and important email"
+HOMEPAGE="http://www.kde.org http://www.vizzzion.org"
+SRC_URI="http://dev.gentoo.org/~creffett/distfiles/${P}.tar.xz"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="4"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+DEPEND="
+	$(add_kdebase_dep kdelibs)
+	$(add_kdebase_dep kdepimlibs)
+	app-office/akonadi-server
+	x11-libs/qt-core:4
+	x11-libs/qt-gui:4
+	x11-libs/qt-webkit:4
+"
+RDEPEND="${DEPEND}
+	$(add_kdebase_dep kdepim-runtime)
+"
diff --git a/kde-misc/polkit-kde-kcmodules/polkit-kde-kcmodules-0.98_pre20120917.ebuild b/kde-misc/polkit-kde-kcmodules/polkit-kde-kcmodules-0.98_pre20120917.ebuild
index 72e8782e66c3..53769c72d6b4 100644
--- a/kde-misc/polkit-kde-kcmodules/polkit-kde-kcmodules-0.98_pre20120917.ebuild
+++ b/kde-misc/polkit-kde-kcmodules/polkit-kde-kcmodules-0.98_pre20120917.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/polkit-kde-kcmodules/polkit-kde-kcmodules-0.98_pre20120917.ebuild,v 1.2 2012/10/18 08:19:24 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/polkit-kde-kcmodules/polkit-kde-kcmodules-0.98_pre20120917.ebuild,v 1.3 2012/10/21 08:53:51 maekke Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.kde.org"
 SRC_URI="http://dev.gentoo.org/~johu/distfiles/${P}.tar.xz"
 
 LICENSE="GPL-2"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
 SLOT="4"
 IUSE="debug"
 
diff --git a/mail-client/postler/Manifest b/mail-client/postler/Manifest
index 467a6f6503f2..142326205766 100644
--- a/mail-client/postler/Manifest
+++ b/mail-client/postler/Manifest
@@ -1 +1 @@
-DIST postler-0.1.1.tar.bz2 251521 RMD160 f5b3facdc8a16942a0ff1fb2e6bc1b7f8f17602e SHA1 f5c73c0219844d4092860eb4d8aa36223027b298 SHA256 2b40889161442a02863e992841253001901e25caf7e992d4f0f588966ea79223
+DIST postler-0.1.1.tar.bz2 251521 SHA256 2b40889161442a02863e992841253001901e25caf7e992d4f0f588966ea79223 SHA512 3e293f6da17c19f4906a3baba2b50ec4602fb34a56f8e8163b463b91114a24f2b6b4606b837a6bae6a91f772710187229aefd84500a2f57bacfd69a47db54b9f WHIRLPOOL be5df56012d848f8ad620fa008c8789a88726d3ab8e33b4ba7a97db8cfc18fbc8917d2ba659151d0dcb0d0e688a79431ba151b54957afa01975f6521d1b35013
diff --git a/mail-client/postler/postler-0.1.1.ebuild b/mail-client/postler/postler-0.1.1.ebuild
index e99e34b5fa1c..9708189741a6 100644
--- a/mail-client/postler/postler-0.1.1.ebuild
+++ b/mail-client/postler/postler-0.1.1.ebuild
@@ -1,55 +1,64 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/postler/postler-0.1.1.ebuild,v 1.2 2011/03/21 21:58:55 nirbheek Exp $
-
-EAPI=3
+# $Header: /var/cvsroot/gentoo-x86/mail-client/postler/postler-0.1.1.ebuild,v 1.3 2012/10/21 11:49:49 ssuominen Exp $
 
+EAPI=4
 inherit gnome2-utils python waf-utils
 
+POSTLER_VALA_VERSION=0.10
+
 DESCRIPTION="A super sexy, ultra simple desktop mail client built in vala"
-HOMEPAGE="https://launchpad.net/postler"
-SRC_URI="http://git.xfce.org/apps/${PN}/snapshot/${P}.tar.bz2"
+HOMEPAGE="http://launchpad.net/postler"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64"
-IUSE="ayatana"
+KEYWORDS="~amd64 ~x86"
+IUSE="" # ayatana, disabled because we only support GTK+-3.x with ayatana libs in purpose
 
-RDEPEND=">=dev-libs/glib-2.26:2
+RDEPEND=">=dev-libs/glib-2.26
 	dev-libs/libunique:1
-	dev-libs/openssl
+	dev-libs/openssl:0
 	mail-mta/msmtp
 	media-libs/libcanberra
 	net-libs/webkit-gtk:2
+	sys-libs/db
 	>=x11-libs/gtk+-2.18:2
-	x11-libs/libnotify
-	ayatana? ( dev-libs/libindicate )"
+	>=x11-libs/libnotify-0.7"
+# ayatana? ( dev-libs/libindicate )"
 DEPEND="${RDEPEND}
-	|| ( dev-lang/python:2.6 dev-lang/python:2.7 )
-	dev-lang/vala:0.10
+	|| ( dev-lang/python:2.7 dev-lang/python:2.6 )
+	dev-lang/vala:${POSTLER_VALA_VERSION}
 	dev-util/intltool
 	sys-devel/gettext"
 
 pkg_setup() {
 	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	sed -i -e 's:Categories=.*:&Office;:' data/${PN}.desktop.in || die
+	base_src_prepare
 }
 
 src_configure() {
-	VALAC="$(type -p valac-0.10)" \
+	VALAC="$(type -P valac-${POSTLER_VALA_VERSION})" \
 		   waf-utils_src_configure \
 		   --disable-docs \
-		   $(use_enable ayatana libindicate)
+		   --disable-libindicate
+# $(use_enable ayatana libindicate)
 }
 
 src_install() {
 	waf-utils_src_install
-	dodoc ChangeLog README || die "dodoc failed"
+	dodoc ChangeLog README
 }
 
 src_test() {
-	"${WAF_BINARY}" check || die "check failed"
+	"${WAF_BINARY}" check || die
 }
 
-pkg_preinst() { gnome2_icon_savelist ; }
-pkg_postinst() { gnome2_icon_cache_update ; }
-pkg_postrm() { gnome2_icon_cache_update ; }
+pkg_preinst() { gnome2_icon_savelist; }
+pkg_postinst() { gnome2_icon_cache_update; }
+pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/mail-filter/postgrey/metadata.xml b/mail-filter/postgrey/metadata.xml
index b5a13fe1ba59..ce51aa971c11 100644
--- a/mail-filter/postgrey/metadata.xml
+++ b/mail-filter/postgrey/metadata.xml
@@ -7,7 +7,7 @@
 	 <name>Andreis Vinogradovs</name>
   </maintainer>
   <maintainer>
-	  <email>alexander.vershilov@gmail.com</email>
+	  <email>qnikst@gentoo.org</email>
 	  <name>Alexander Vershilov</name>
   </maintainer>
 <longdescription>Postgrey is a Postfix policy server implementing greylisting developed by David Schweikert at the ISG.EE.</longdescription>
diff --git a/media-gfx/qrencode/qrencode-3.3.1.ebuild b/media-gfx/qrencode/qrencode-3.3.1.ebuild
index aaf2154ff6ea..cb302e8a4547 100644
--- a/media-gfx/qrencode/qrencode-3.3.1.ebuild
+++ b/media-gfx/qrencode/qrencode-3.3.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/qrencode/qrencode-3.3.1.ebuild,v 1.4 2012/08/08 20:18:05 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/qrencode/qrencode-3.3.1.ebuild,v 1.5 2012/10/21 00:05:31 blueness Exp $
 
 EAPI=4
 
@@ -14,7 +14,7 @@ SRC_URI="http://fukuchi.org/works/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc x86"
+KEYWORDS="amd64 arm ppc x86"
 IUSE=""
 
 RDEPEND="media-libs/libpng"
diff --git a/media-gfx/ristretto/Manifest b/media-gfx/ristretto/Manifest
index 5c6fb59d2084..447c8402a391 100644
--- a/media-gfx/ristretto/Manifest
+++ b/media-gfx/ristretto/Manifest
@@ -1,3 +1,2 @@
 DIST ristretto-0.6.0.tar.bz2 497791 SHA256 fa810d0b0fc6e7f4c58e458fcd5c1ac983f5cfcb7cedbe08fad878b729990c29 SHA512 a49980115f4036f752a8991bbf102a95b585e66c1a2e54f4c2bed6c5ec6c0df7973d4ae00a30fb60eaf3adda574752fd7e8c0c09443d10ae7b7f3ab37b41fb80 WHIRLPOOL 1367632ebea67ea760b4702cf29c1ce4aa6a4fd22dba5f31c22716d7dbe8eaad13a8815d153d9b4592c07824031c99b1c83f43f42c9a4dff49da30d6c63ee348
-DIST ristretto-0.6.2.tar.bz2 499071 SHA256 09d2ad2d4e35f02ce485fc79ab1a3328e7fe711331c7b604abee9a01201114e6 SHA512 d9e66fd302401660605bf3265edbbc071801fbd7af452e9a44c85c1cbf4ebae253acd35fe2b8166011acf0de71011cc0d1f6ff752ece8badcb080001528814ff WHIRLPOOL b17690a51a85fcaf5a722b0be1fbdfee85fcf175a6cbfe565fe11a393ebd3cce8b07195b21780a5967717792561878a1c8850af863a1eeaf7e81265701f8b21a
 DIST ristretto-0.6.3.tar.bz2 499323 SHA256 2b6816de298e9a0d9b95662664690713c4123a9ac813a27bdde4727a03472d79 SHA512 996ed14ab749efd2df702a87e559711791bad71226e8b097c630e9c425059805ca52523ef68e8757849837e89a59bbb580459cc45b4e207785aedcfbaf733166 WHIRLPOOL 402b1f1747dc47b39bc08772e8169130aea2e1826fb0fe01b5a40bc669d1d3d37bdf7f1a21ef19108f70382c9843cdc66d99ce21b5def3eadb83dd3dd8f356c3
diff --git a/media-gfx/ristretto/ristretto-0.6.2.ebuild b/media-gfx/ristretto/ristretto-0.6.2.ebuild
deleted file mode 100644
index 06e681350654..000000000000
--- a/media-gfx/ristretto/ristretto-0.6.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/ristretto/ristretto-0.6.2.ebuild,v 1.1 2012/07/29 21:54:35 angelos Exp $
-
-EAPI=4
-inherit xfconf
-
-DESCRIPTION="A fast and lightweight picture viewer for the Xfce desktop environment"
-HOMEPAGE="http://goodies.xfce.org/projects/applications/ristretto"
-SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug"
-
-RDEPEND=">=dev-libs/dbus-glib-0.98
-	>=dev-libs/glib-2.24
-	media-libs/libexif
-	x11-libs/cairo
-	>=x11-libs/gtk+-2.20:2
-	x11-libs/libX11
-	>=xfce-base/libxfce4ui-4.10
-	>=xfce-base/libxfce4util-4.10
-	>=xfce-base/xfconf-4.10"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig
-	sys-devel/gettext"
-
-pkg_setup() {
-	XFCONF=(
-		$(xfconf_use_debug)
-		)
-
-	DOCS=( AUTHORS ChangeLog NEWS TODO )
-}
diff --git a/media-gfx/splashutils/Manifest b/media-gfx/splashutils/Manifest
index 34bb9fb83f79..e25ac227957e 100644
--- a/media-gfx/splashutils/Manifest
+++ b/media-gfx/splashutils/Manifest
@@ -1,9 +1,9 @@
-DIST freetype-2.3.12.tar.bz2 1453034 RMD160 57437a2bc0d85859cff2ca1253b36e64629397a1 SHA1 ebf0438429c0bedd310059326d91646c3c91016b SHA256 3b96438f016a62b676c1d2089c00ca777f710d19f6aefa66ccf068d360db3e92
-DIST jpegsrc.v8a.tar.gz 962018 RMD160 cdf6c356ea1a631e37256893e80206ad6ecc3fab SHA1 78077fb22f0b526a506c21199fbca941d5c671a9 SHA256 bf86a5eaafa79b5d60feb27bee08df2db4c9ca2fb40d453e7a2080f7663a713b
-DIST libpng-1.4.3.tar.bz2 658335 RMD160 ad0abc000e0a338d94ff7f8fe2b862d5944ec7bb SHA1 82eda95439daaef6ed564b1532cf805b01759557 SHA256 2b022f39f4788505ad62a4b1f4a33286228d544719680da40f3626393ecde4a2
-DIST miscsplashutils-0.1.8.tar.bz2 91997 RMD160 5efe2bfb8ae409d3e59e82b473454d94e44149ab SHA1 d3d0df74b4f613e505d662134a7af5c0cc488108 SHA256 38e8434c7266126477237c4d9e6cbeca152089ab33c14a7761089b7970f8d336
-DIST splashutils-gentoo-1.0.16.tar.bz2 15568 RMD160 f4831c381ac875b5bf9ad9ff527ae2e6cfd2b5d5 SHA1 6756807056c94f4dcc99f73489039dced6aecf4b SHA256 f9c51f442b5a638ac68a731925da57c3402d9506f160681fc01bf80e396d409d
-DIST splashutils-gentoo-1.0.17.tar.bz2 15814 RMD160 283baea7b24cd5cc41c63da9fd8f3120fa51e40c SHA1 128d7f5cadc16d486f3a1e4836b9c248169a61f8 SHA256 6877263d0b6f5a3532db0d6a531cd4d41fbc6c45a16c5d10050e9048ecc1af81
-DIST splashutils-lite-1.5.4.3.tar.bz2 426935 RMD160 e15b1c52d8c9c2886951fa7a674a9fc1707a0316 SHA1 943ffaae0b96305809ffb52f417a0fca2651a742 SHA256 3f21bd57ac67bd7426caa3ff5791d3609567db3bcd4319da29867ec42cadb362
-DIST splashutils-lite-1.5.4.4.tar.bz2 441340 RMD160 f67a93aa38bcbda7131c8570533aa021d43bb77f SHA1 46c5aa6e25d7623f46ca2158c10c5ba5d0774744 SHA256 bc0e22293d4550281d2289672da3acb42594c18a75b9d00ba75526e05162ec6b
-DIST zlib-1.2.3.tar.bz2 425209 RMD160 cfba9984b354dcc38da49331457e6bfc861c6f51 SHA1 967e280f284d02284b0cd8872a8e2e04bfdc7283 SHA256 e3b9950851a19904d642c4dec518623382cf4d2ac24f70a76510c944330d28ca
+DIST freetype-2.3.12.tar.bz2 1453034 SHA256 3b96438f016a62b676c1d2089c00ca777f710d19f6aefa66ccf068d360db3e92 SHA512 becb0f138ee13181513d3f03b943f0a474e492cab151992fa78d0c84127819dc91ec6d2bd1528af7e111ab150b3a29104f2f7ab79650cebc35ce4d966b19f34b WHIRLPOOL 1a7363b8e1cc1b4597077e6cdf7e978b80cc76e1428124312d139ee81fe5247eed5ec0243352b721c28a25a179bceb901700d0766c1a5110b19f8fe53c303a89
+DIST jpegsrc.v8a.tar.gz 962018 SHA256 bf86a5eaafa79b5d60feb27bee08df2db4c9ca2fb40d453e7a2080f7663a713b SHA512 4020e82e16b99189b1a50bad18b09616775559740b94a988692aa33f9302d4b5abe3ccaa30895b49e6950fb3d9a830deeb7df750d128ec5c7e1844583db4524d WHIRLPOOL 46e0c98f30c8d975b85b8e86b69e9c5c64632f579502b1b3c54902706d7e08b86582a85b49a0d3bfffd03cd90946fbd20171324504a5ff521eb89e6ce11d568b
+DIST libpng-1.4.3.tar.bz2 658335 SHA256 2b022f39f4788505ad62a4b1f4a33286228d544719680da40f3626393ecde4a2 SHA512 aaa137ebc2312805d58caf19702d24a34ee81593d4250c4e807ce66ba7edb829926919cd0a2b0e5975421451c8eb6674798c06dbaf745175b16c9d3c92b63f61 WHIRLPOOL d383e01e6080166816991650183b47d15938aa269c0a85e234846b9c5a7ec04a1ba7620779b4ddae639ca64440772ce8dd1b3a596f6eb32124c4d6c55592fb0a
+DIST miscsplashutils-0.1.8.tar.bz2 91997 SHA256 38e8434c7266126477237c4d9e6cbeca152089ab33c14a7761089b7970f8d336 SHA512 fa017e264249feda45839030728e90c82f775354c3f2c29a88362938c4a31b19e6d61f967512305642f8b96575f4d756ba197e672a361760e40080c23ec0442a WHIRLPOOL c418ee425bf323fc0e00388be4547232207fd6cac10a2e8cafeef8c8aabcd014052307533bd015e61dc483ab45edd9fbd59a3005549b7bee4a4b90bf3297394a
+DIST splashutils-gentoo-1.0.16.tar.bz2 15568 SHA256 f9c51f442b5a638ac68a731925da57c3402d9506f160681fc01bf80e396d409d SHA512 7b3b5d590ba1a8f94dad6ee8e580cf1c601fa31ae4cde44288a3ef822dc93b8c28c7102ea117fc238197d96384f25b3e44076e0c44d6c8e043804f195b854be2 WHIRLPOOL 7082c6d42dedb45fbeacca96c4c6ce4cbb00896e5fe0432b9e74a2c3246d4a8a2dd92a52b54c75754f1c823a8fdb2e9131b18db7849aa385348ba812e26745a3
+DIST splashutils-gentoo-1.0.17.tar.bz2 15814 SHA256 6877263d0b6f5a3532db0d6a531cd4d41fbc6c45a16c5d10050e9048ecc1af81 SHA512 75f1fbfdf165f571b0bf09235235827f370e1b940f1717c4faf5b223caba0b80f853a910ba492c776512aecfafa6e74fd964239bbc6cf412620143d5ffc74167 WHIRLPOOL de9e1ca86a87c169f0a2f7844ab9a68b29cc46c208daca4d13cf7d552b35c05b6e266d66724078cf1f6eea3d41496fdf4fd7b3219697b2032520ad2b9a5ec5c9
+DIST splashutils-lite-1.5.4.3.tar.bz2 426935 SHA256 3f21bd57ac67bd7426caa3ff5791d3609567db3bcd4319da29867ec42cadb362 SHA512 7f7d55507af7facf7418a5077b39931b7a026667ab519531850be931a8a5cc905d95f66f6bd1731e3b06c4c30eb3edc926df378003613da5e8d395016ebd41a6 WHIRLPOOL d13510a0f3bd30df04557861346a284af2c5ad85a8a4304a0b9e501489aca95b4216e4376b42ce0d2677434a0186edb79eabd0d6f7d5f8a634b1336d41369607
+DIST splashutils-lite-1.5.4.4.tar.bz2 441340 SHA256 bc0e22293d4550281d2289672da3acb42594c18a75b9d00ba75526e05162ec6b SHA512 1a78216a1de1fdccff514494d7301640e447c65466e1fe02428e5114485507f67fe4394094880d927d074a8ab2d9c786ba03f9fb0371eb7ab6ef4e3b01aa4613 WHIRLPOOL f861a1673fd9e1fe32e417da48be8c472c5c3cc06844eb0886a66b498ca38cb04a6e51708821eefe3e15f66004bb6a4ef76df7242643b34090035bffdf1f87d7
+DIST zlib-1.2.3.tar.bz2 425209 SHA256 e3b9950851a19904d642c4dec518623382cf4d2ac24f70a76510c944330d28ca SHA512 edae735960279d92acf58e1f4095c6392a7c2059b8f1d2c46648fc608a0fb06b392db2d073f4973f5762c034ea66596e769b95b3d26ad963a086b9b2d09825f2 WHIRLPOOL e874b123296f5d77daf60617501b30f4beebccb64b3910c2539f75f6c194a2cf4885dc7a3904bf790e1651120ec33b55c48e95970dd6bfd6c4d0a2ea48d7d0f4
diff --git a/media-gfx/splashutils/splashutils-1.5.4.4-r1.ebuild b/media-gfx/splashutils/splashutils-1.5.4.4-r1.ebuild
index e450c4c192b3..3ea99361e2b3 100644
--- a/media-gfx/splashutils/splashutils-1.5.4.4-r1.ebuild
+++ b/media-gfx/splashutils/splashutils-1.5.4.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/splashutils-1.5.4.4-r1.ebuild,v 1.2 2012/05/24 15:07:44 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/splashutils-1.5.4.4-r1.ebuild,v 1.3 2012/10/21 08:58:19 maekke Exp $
 
 EAPI="2"
 
@@ -33,7 +33,7 @@ SRC_URI="mirror://berlios/fbsplash/${PN}-lite-${PV}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc x86"
 RDEPEND="gpm? ( sys-libs/gpm )
 	truetype? ( >=media-libs/freetype-2[static-libs]
 		|| ( <app-arch/bzip2-1.0.6-r3 app-arch/bzip2[static-libs] )
diff --git a/media-libs/gst-plugins-base/Manifest b/media-libs/gst-plugins-base/Manifest
index c80b1026b32d..4caaf109eb00 100644
--- a/media-libs/gst-plugins-base/Manifest
+++ b/media-libs/gst-plugins-base/Manifest
@@ -1,2 +1,3 @@
-DIST gst-plugins-base-0.10.32.tar.bz2 2720103 RMD160 b267e3138e40e3646efed0baa662d40775eca1ea SHA1 c1c149272b7ab6cbe5f648532f74525c6541eea5 SHA256 e9aabfac83f6480896da0686e9c911989f896fbad634821b7771ed84a446172b
-DIST gst-plugins-base-0.10.35.tar.bz2 2782902 RMD160 877e6b1c5439ef71262037b7a1aced07d37f4d49 SHA1 6d7dc463fed5dd43f79a53ad523fcbd6d0916303 SHA256 cd24f01bb5258a1f400bc4f2c212bb7cee9ee23c9ffb80d537a24ef366d17103
+DIST gst-plugins-base-0.10.32.tar.bz2 2720103 SHA256 e9aabfac83f6480896da0686e9c911989f896fbad634821b7771ed84a446172b SHA512 34d32ca0ae46615d3258dd6656a044162d93c146c2747ac0784cb1a11e4c270d0197efffc0f4d82468dd4175e59cd95b2c37d7003aefe4e861fa018a9449eeab WHIRLPOOL 2d616b5ee07833d79c4c5304fc327cf15626c55c4635a0ed7e6eb2db8afcad9b54bea51ae201c3d7bb54190714456874ef8073e8b4296464b9aba11e2c07f353
+DIST gst-plugins-base-0.10.35.tar.bz2 2782902 SHA256 cd24f01bb5258a1f400bc4f2c212bb7cee9ee23c9ffb80d537a24ef366d17103 SHA512 3959c7fd5f091313887810c6377dcbfd4d154ddccb01603f9ded2ee1279c0a91f9d3a956596856f103f50a3613498c55d3c9a913e776ca4ea20594ed83c37004 WHIRLPOOL 508b17026a170fb0586e534b84a06cceb5dbd22c2c68d18f095fd14fbfe1a1f576b954f05c7e42838136c047a344fc3e83e211e29e1d1833ca0fc3bcf23f880c
+DIST gst-plugins-base-0.10.36.tar.xz 2364108 SHA256 1fe45c3894903001d4d008b0713dab089f53726dcb5842d5b40c2595a984e64a SHA512 ea77778e073515df58229a641b4363df31f0b80204a5a43a8feb31f0b03a5a4b9b79d6e07e1615c773a59927a9b649f1b1d782def1120d581d09a090be8363b8 WHIRLPOOL e455f2a1aafd60078080735108e4ac336bc4764ed92b9579d83a453f75491331d16b48e5983f3c9712b6edb28ec379e696f06f6910c93168b019d6077c28fb6d
diff --git a/media-libs/gst-plugins-base/gst-plugins-base-0.10.32.ebuild b/media-libs/gst-plugins-base/gst-plugins-base-0.10.32.ebuild
index b98ff6134183..fe56bd646308 100644
--- a/media-libs/gst-plugins-base/gst-plugins-base-0.10.32.ebuild
+++ b/media-libs/gst-plugins-base/gst-plugins-base-0.10.32.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gst-plugins-base/gst-plugins-base-0.10.32.ebuild,v 1.12 2012/05/05 08:02:30 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gst-plugins-base/gst-plugins-base-0.10.32.ebuild,v 1.13 2012/10/21 07:51:23 tetromino Exp $
 
 EAPI=1
 
@@ -12,7 +12,7 @@ DESCRIPTION="Basepack of plugins for gstreamer"
 HOMEPAGE="http://gstreamer.freedesktop.org/"
 SRC_URI="http://gstreamer.freedesktop.org/src/${PN}/${P}.tar.bz2"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+ LGPL-2+"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="+introspection nls +orc"
 
diff --git a/media-libs/gst-plugins-base/gst-plugins-base-0.10.35.ebuild b/media-libs/gst-plugins-base/gst-plugins-base-0.10.35.ebuild
index 0b235fa29a7d..bdf85cbba444 100644
--- a/media-libs/gst-plugins-base/gst-plugins-base-0.10.35.ebuild
+++ b/media-libs/gst-plugins-base/gst-plugins-base-0.10.35.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gst-plugins-base/gst-plugins-base-0.10.35.ebuild,v 1.15 2012/05/12 16:36:34 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gst-plugins-base/gst-plugins-base-0.10.35.ebuild,v 1.16 2012/10/21 07:51:23 tetromino Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
@@ -13,7 +13,7 @@ DESCRIPTION="Basepack of plugins for gstreamer"
 HOMEPAGE="http://gstreamer.freedesktop.org/"
 SRC_URI="http://gstreamer.freedesktop.org/src/${PN}/${P}.tar.bz2"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+ LGPL-2+"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="+introspection nls +orc"
 
diff --git a/media-libs/gst-plugins-base/gst-plugins-base-0.10.36.ebuild b/media-libs/gst-plugins-base/gst-plugins-base-0.10.36.ebuild
new file mode 100644
index 000000000000..fe732bfb77d6
--- /dev/null
+++ b/media-libs/gst-plugins-base/gst-plugins-base-0.10.36.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gst-plugins-base/gst-plugins-base-0.10.36.ebuild,v 1.1 2012/10/21 07:51:23 tetromino Exp $
+
+EAPI="4"
+GCONF_DEBUG="no"
+
+# order is important, gnome2 after gst-plugins
+inherit gst-plugins-base gst-plugins10 gnome2 eutils
+# libtool
+
+DESCRIPTION="Basepack of plugins for gstreamer"
+HOMEPAGE="http://gstreamer.freedesktop.org/"
+SRC_URI="http://gstreamer.freedesktop.org/src/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2+ LGPL-2+"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="+introspection nls +orc"
+
+RDEPEND=">=dev-libs/glib-2.22:2
+	>=media-libs/gstreamer-${PV}:0.10[introspection?]
+	dev-libs/libxml2:2
+	sys-libs/zlib
+	app-text/iso-codes
+	introspection? ( >=dev-libs/gobject-introspection-0.9.12 )
+	orc? ( >=dev-lang/orc-0.4.11 )
+	!<media-libs/gst-plugins-bad-0.10.10"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	dev-util/gtk-doc-am
+	virtual/pkgconfig
+	nls? ( >=sys-devel/gettext-0.11.5 )"
+
+GST_PLUGINS_BUILD=""
+
+DOCS="AUTHORS NEWS README RELEASE"
+
+src_configure() {
+	gst-plugins-base_src_configure \
+		$(use_enable introspection) \
+		$(use_enable nls) \
+		$(use_enable orc) \
+		--disable-static \
+		--disable-examples \
+		--disable-debug
+
+	# bug #366931, flag-o-matic for the whole thing is overkill
+	if [[ ${CHOST} == *86-*-darwin* ]] ; then
+		sed -i \
+			-e '/FLAGS = /s|-O[23]|-O1|g' \
+			gst/audioconvert/Makefile \
+			gst/volume/Makefile || die
+	fi
+}
+
+src_install() {
+	gnome2_src_install
+}
diff --git a/media-libs/gstreamer/Manifest b/media-libs/gstreamer/Manifest
index 7c5cde092f0e..a1fcef067d70 100644
--- a/media-libs/gstreamer/Manifest
+++ b/media-libs/gstreamer/Manifest
@@ -1,2 +1,3 @@
-DIST gstreamer-0.10.32.tar.bz2 3529980 RMD160 447fa2b8b4c622a628763805cb65006d54919e54 SHA1 95477044ed23cf94669e56ea43607de05c2a0cb3 SHA256 3bf4e46a186ee9a1f5e212aaf651d67cffb4f5f05345a7c99ae71d5d992be133
-DIST gstreamer-0.10.35.tar.bz2 3606254 RMD160 5a08c07cb5c99b5a031ca6be5a6ac1d576593d33 SHA1 ad03b8aca7b2415929b6ecc4c140b178acef39de SHA256 817bfea2cd46e2487b97e2ed9218f0299b32a3de1e5e80b4c7868d17e9089786
+DIST gstreamer-0.10.32.tar.bz2 3529980 SHA256 3bf4e46a186ee9a1f5e212aaf651d67cffb4f5f05345a7c99ae71d5d992be133 SHA512 5c88b456cd7ab2e8c09fdf1d8655b6f37e73fb87bf9081eb22c8e21939d1bb956e7a317cbe6506f915b811cea92380e9a8c6b1cfff1ac35eb193e4f5f97eaa15 WHIRLPOOL c6ae2d79c5ef2efaf57c794d591746ecc83cfcb255b646a2527f3e541924318ab73e82b300c4226094ecc506e27f9e8ad56e3c619d40cd926eb638d1c6ebff0f
+DIST gstreamer-0.10.35.tar.bz2 3606254 SHA256 817bfea2cd46e2487b97e2ed9218f0299b32a3de1e5e80b4c7868d17e9089786 SHA512 14aca3a1687699d8758353eb40f0bee6246d3616f37062c2cd3bad50afdddf99d22fb753b25cfa4586bf1b6c62956de39b1ae29a63180f38d7beacac5c2993b2 WHIRLPOOL d6e8fc9ca91c7e28665b4bd955de1091c2d3f98ec0cd867d080c9c67fe544da9da9c1ecc5b8206d7981490d568530456d124561cdaec1c46904dcc7ef66a9a1f
+DIST gstreamer-0.10.36.tar.xz 3025876 SHA256 9151aa108c177054387885763fa0e433e76780f7c5655c70a5390f2a6c6871da SHA512 7468abb578398681d2adb0e9bbc9ee8ae25aaef72369d45a66ada6c67d1759afdce606cb32e68d9e30ae813196bdfef3d4d33202bc77839cc1fbf5fc436c1bd8 WHIRLPOOL 03b841624552be860d4bf824bde9d6d5d6afc629048244b02037c96370c88191f34a6d09f02af61f295a9d6f84952efec2c5d4b0a28e8e70cd17966ed1b01d93
diff --git a/media-libs/gstreamer/files/gstreamer-0.10.36-disable-test_fail_abstract_new.patch b/media-libs/gstreamer/files/gstreamer-0.10.36-disable-test_fail_abstract_new.patch
new file mode 100644
index 000000000000..8162478232ae
--- /dev/null
+++ b/media-libs/gstreamer/files/gstreamer-0.10.36-disable-test_fail_abstract_new.patch
@@ -0,0 +1,35 @@
+From e4707bfb24a8175018975a542f6e1c3b84ac02dd Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Sun, 21 Oct 2012 00:26:24 -0400
+Subject: [PATCH] test: disable test_fail_abstract_new
+
+Depending on how glib is configured, whether there are systemwide
+debugging tools running, etc., this test can produce other signals, not
+necessarily signal 11.
+---
+ tests/check/gst/gstobject.c | 9 ---------
+ 1 file changed, 9 deletions(-)
+
+diff --git a/tests/check/gst/gstobject.c b/tests/check/gst/gstobject.c
+index d5956db..25995bf 100644
+--- a/tests/check/gst/gstobject.c
++++ b/tests/check/gst/gstobject.c
+@@ -531,15 +531,6 @@ gst_object_suite (void)
+ 
+   /* FIXME: GLib shouldn't crash here, but issue a warning and return a NULL
+    * object, or at least g_error() and then abort properly ... (tpm) */
+-#ifndef HAVE_OSX
+-  /* Disabled for OS/X because a) it's a pretty silly test anyway and
+-   * b) different OS/X versions raise different signals and it isn't worth
+-   * the effort to try and detect which one should be producing which
+-   */
+-  /* SEGV tests go last so we can debug the others */
+-  if (g_getenv ("CK_FORK") == NULL || strcmp (g_getenv ("CK_FORK"), "no") != 0)
+-    tcase_add_test_raise_signal (tc_chain, test_fail_abstract_new, SIGSEGV);
+-#endif
+ 
+   return s;
+ }
+-- 
+1.7.12.3
+
diff --git a/media-libs/gstreamer/gstreamer-0.10.32-r1.ebuild b/media-libs/gstreamer/gstreamer-0.10.32-r1.ebuild
index a58f537d7f7e..0de1f65fed81 100644
--- a/media-libs/gstreamer/gstreamer-0.10.32-r1.ebuild
+++ b/media-libs/gstreamer/gstreamer-0.10.32-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gstreamer/gstreamer-0.10.32-r1.ebuild,v 1.11 2012/05/05 08:02:28 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gstreamer/gstreamer-0.10.32-r1.ebuild,v 1.12 2012/10/21 07:49:51 tetromino Exp $
 
 EAPI=2
 
@@ -10,10 +10,10 @@ inherit eutils multilib versionator
 PV_MAJ_MIN=$(get_version_component_range '1-2')
 
 DESCRIPTION="Streaming media framework"
-HOMEPAGE="http://gstreamer.sourceforge.net"
+HOMEPAGE="http://gstreamer.freedesktop.org/"
 SRC_URI="http://${PN}.freedesktop.org/src/${PN}/${P}.tar.bz2"
 
-LICENSE="LGPL-2"
+LICENSE="LGPL-2+"
 SLOT=${PV_MAJ_MIN}
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
 IUSE="+introspection nls test"
diff --git a/media-libs/gstreamer/gstreamer-0.10.35.ebuild b/media-libs/gstreamer/gstreamer-0.10.35.ebuild
index b44d47d61d6e..20b01e1e098f 100644
--- a/media-libs/gstreamer/gstreamer-0.10.35.ebuild
+++ b/media-libs/gstreamer/gstreamer-0.10.35.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gstreamer/gstreamer-0.10.35.ebuild,v 1.16 2012/05/12 16:24:39 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gstreamer/gstreamer-0.10.35.ebuild,v 1.17 2012/10/21 07:49:51 tetromino Exp $
 
 EAPI=3
 
@@ -10,10 +10,10 @@ inherit eutils multilib versionator
 PV_MAJ_MIN=$(get_version_component_range '1-2')
 
 DESCRIPTION="Streaming media framework"
-HOMEPAGE="http://gstreamer.sourceforge.net"
+HOMEPAGE="http://gstreamer.freedesktop.org/"
 SRC_URI="http://${PN}.freedesktop.org/src/${PN}/${P}.tar.bz2"
 
-LICENSE="LGPL-2"
+LICENSE="LGPL-2+"
 SLOT=${PV_MAJ_MIN}
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="+introspection nls test"
diff --git a/media-libs/gstreamer/gstreamer-0.10.36.ebuild b/media-libs/gstreamer/gstreamer-0.10.36.ebuild
new file mode 100644
index 000000000000..64d50849d708
--- /dev/null
+++ b/media-libs/gstreamer/gstreamer-0.10.36.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gstreamer/gstreamer-0.10.36.ebuild,v 1.1 2012/10/21 07:49:51 tetromino Exp $
+
+EAPI=4
+
+inherit eutils multilib pax-utils versionator
+
+# Create a major/minor combo for our SLOT and executables suffix
+PV_MAJ_MIN=$(get_version_component_range '1-2')
+
+DESCRIPTION="Streaming media framework"
+HOMEPAGE="http://gstreamer.freedesktop.org/"
+SRC_URI="http://${PN}.freedesktop.org/src/${PN}/${P}.tar.xz"
+
+LICENSE="LGPL-2+"
+SLOT=${PV_MAJ_MIN}
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="+introspection nls test"
+
+RDEPEND=">=dev-libs/glib-2.24:2
+	dev-libs/libxml2
+	introspection? ( >=dev-libs/gobject-introspection-0.6.8 )
+	!<media-libs/gst-plugins-base-0.10.26"
+	# ^^ queue2 move, mustn't have both libgstcoreleements.so and libgstqueue2.so at runtime providing the element at once
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	dev-util/gtk-doc-am
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+# gtk-doc-am to install API docs
+
+src_prepare() {
+	# Disable silly test that's not guaranteed to pass on an arbitrary machine
+	epatch "${FILESDIR}/${PN}-0.10.36-disable-test_fail_abstract_new.patch"
+}
+
+src_configure() {
+	if [[ ${CHOST} == *-interix* ]] ; then
+		export ac_cv_lib_dl_dladdr=no
+		export ac_cv_func_poll=no
+	fi
+	if [[ ${CHOST} == powerpc-apple-darwin* ]] ; then
+		# GCC groks this, but then refers to an implementation (___multi3,
+		# ___udivti3) that don't exist (at least I can't find it), so force
+		# this one to be off, such that we use 2x64bit emulation code.
+		export gst_cv_uint128_t=no
+	fi
+
+	# Disable static archives, dependency tracking and examples
+	# to speed up build time
+	# Disable debug, as it only affects -g passing (debugging symbols), this must done through make.conf in gentoo
+	econf \
+		--disable-static \
+		--disable-dependency-tracking \
+		$(use_enable nls) \
+		--disable-valgrind \
+		--disable-examples \
+		--disable-debug \
+		--enable-check \
+		$(use_enable introspection) \
+		$(use_enable test tests) \
+		--with-package-name="GStreamer ebuild for Gentoo" \
+		--with-package-origin="http://packages.gentoo.org/package/media-libs/gstreamer"
+}
+
+src_install() {
+	DOCS="AUTHORS ChangeLog NEWS MAINTAINERS README RELEASE"
+	default
+
+	# Remove unversioned binaries to allow SLOT installations in future
+	cd "${ED}"/usr/bin || die
+	local gst_bins
+	for gst_bins in $(ls *-${PV_MAJ_MIN}); do
+		rm -f ${gst_bins/-${PV_MAJ_MIN}/}
+	done
+
+	# Punt useless .la files
+	prune_libtool_files --modules
+
+	# Needed for certain gst plugins on hardened/PaX systems, bug #421579
+	pax-mark -m "${ED}usr/libexec/gstreamer-0.10/gst-plugin-scanner"
+}
diff --git a/media-libs/libwebp/libwebp-0.2.0.ebuild b/media-libs/libwebp/libwebp-0.2.0.ebuild
index c485a3812f65..3f8e9d4ed8bd 100644
--- a/media-libs/libwebp/libwebp-0.2.0.ebuild
+++ b/media-libs/libwebp/libwebp-0.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libwebp/libwebp-0.2.0.ebuild,v 1.6 2012/10/13 12:00:18 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libwebp/libwebp-0.2.0.ebuild,v 1.7 2012/10/20 18:52:37 armin76 Exp $
 
 EAPI=4
 inherit eutils
@@ -11,7 +11,7 @@ SRC_URI="http://webp.googlecode.com/files/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 x86 ~amd64-fbsd"
 IUSE="experimental static-libs"
 
 RDEPEND="media-libs/libpng:0
diff --git a/media-libs/sdl-mixer/sdl-mixer-1.2.12-r1.ebuild b/media-libs/sdl-mixer/sdl-mixer-1.2.12-r1.ebuild
index dd6ca3ae9cf2..0f9ea8251bf6 100644
--- a/media-libs/sdl-mixer/sdl-mixer-1.2.12-r1.ebuild
+++ b/media-libs/sdl-mixer/sdl-mixer-1.2.12-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl-mixer/sdl-mixer-1.2.12-r1.ebuild,v 1.10 2012/08/24 06:56:06 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl-mixer/sdl-mixer-1.2.12-r1.ebuild,v 1.11 2012/10/20 18:48:42 armin76 Exp $
 
 EAPI=4
 inherit eutils
@@ -12,7 +12,7 @@ SRC_URI="http://www.libsdl.org/projects/SDL_mixer/release/${MY_P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="flac fluidsynth mad midi mikmod mod modplug mp3 playtools smpeg static-libs timidity vorbis +wav"
 REQUIRED_USE="
 	midi? ( || ( timidity fluidsynth ) )
diff --git a/media-plugins/gst-plugins-alsa/Manifest b/media-plugins/gst-plugins-alsa/Manifest
index c80b1026b32d..4caaf109eb00 100644
--- a/media-plugins/gst-plugins-alsa/Manifest
+++ b/media-plugins/gst-plugins-alsa/Manifest
@@ -1,2 +1,3 @@
-DIST gst-plugins-base-0.10.32.tar.bz2 2720103 RMD160 b267e3138e40e3646efed0baa662d40775eca1ea SHA1 c1c149272b7ab6cbe5f648532f74525c6541eea5 SHA256 e9aabfac83f6480896da0686e9c911989f896fbad634821b7771ed84a446172b
-DIST gst-plugins-base-0.10.35.tar.bz2 2782902 RMD160 877e6b1c5439ef71262037b7a1aced07d37f4d49 SHA1 6d7dc463fed5dd43f79a53ad523fcbd6d0916303 SHA256 cd24f01bb5258a1f400bc4f2c212bb7cee9ee23c9ffb80d537a24ef366d17103
+DIST gst-plugins-base-0.10.32.tar.bz2 2720103 SHA256 e9aabfac83f6480896da0686e9c911989f896fbad634821b7771ed84a446172b SHA512 34d32ca0ae46615d3258dd6656a044162d93c146c2747ac0784cb1a11e4c270d0197efffc0f4d82468dd4175e59cd95b2c37d7003aefe4e861fa018a9449eeab WHIRLPOOL 2d616b5ee07833d79c4c5304fc327cf15626c55c4635a0ed7e6eb2db8afcad9b54bea51ae201c3d7bb54190714456874ef8073e8b4296464b9aba11e2c07f353
+DIST gst-plugins-base-0.10.35.tar.bz2 2782902 SHA256 cd24f01bb5258a1f400bc4f2c212bb7cee9ee23c9ffb80d537a24ef366d17103 SHA512 3959c7fd5f091313887810c6377dcbfd4d154ddccb01603f9ded2ee1279c0a91f9d3a956596856f103f50a3613498c55d3c9a913e776ca4ea20594ed83c37004 WHIRLPOOL 508b17026a170fb0586e534b84a06cceb5dbd22c2c68d18f095fd14fbfe1a1f576b954f05c7e42838136c047a344fc3e83e211e29e1d1833ca0fc3bcf23f880c
+DIST gst-plugins-base-0.10.36.tar.xz 2364108 SHA256 1fe45c3894903001d4d008b0713dab089f53726dcb5842d5b40c2595a984e64a SHA512 ea77778e073515df58229a641b4363df31f0b80204a5a43a8feb31f0b03a5a4b9b79d6e07e1615c773a59927a9b649f1b1d782def1120d581d09a090be8363b8 WHIRLPOOL e455f2a1aafd60078080735108e4ac336bc4764ed92b9579d83a453f75491331d16b48e5983f3c9712b6edb28ec379e696f06f6910c93168b019d6077c28fb6d
diff --git a/media-plugins/gst-plugins-alsa/gst-plugins-alsa-0.10.36.ebuild b/media-plugins/gst-plugins-alsa/gst-plugins-alsa-0.10.36.ebuild
new file mode 100644
index 000000000000..2b3658f8c45f
--- /dev/null
+++ b/media-plugins/gst-plugins-alsa/gst-plugins-alsa-0.10.36.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-alsa/gst-plugins-alsa-0.10.36.ebuild,v 1.1 2012/10/21 07:59:21 tetromino Exp $
+
+EAPI=4
+
+inherit gst-plugins-base
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND=">=media-libs/alsa-lib-0.9.1"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-cdparanoia/Manifest b/media-plugins/gst-plugins-cdparanoia/Manifest
index c80b1026b32d..4caaf109eb00 100644
--- a/media-plugins/gst-plugins-cdparanoia/Manifest
+++ b/media-plugins/gst-plugins-cdparanoia/Manifest
@@ -1,2 +1,3 @@
-DIST gst-plugins-base-0.10.32.tar.bz2 2720103 RMD160 b267e3138e40e3646efed0baa662d40775eca1ea SHA1 c1c149272b7ab6cbe5f648532f74525c6541eea5 SHA256 e9aabfac83f6480896da0686e9c911989f896fbad634821b7771ed84a446172b
-DIST gst-plugins-base-0.10.35.tar.bz2 2782902 RMD160 877e6b1c5439ef71262037b7a1aced07d37f4d49 SHA1 6d7dc463fed5dd43f79a53ad523fcbd6d0916303 SHA256 cd24f01bb5258a1f400bc4f2c212bb7cee9ee23c9ffb80d537a24ef366d17103
+DIST gst-plugins-base-0.10.32.tar.bz2 2720103 SHA256 e9aabfac83f6480896da0686e9c911989f896fbad634821b7771ed84a446172b SHA512 34d32ca0ae46615d3258dd6656a044162d93c146c2747ac0784cb1a11e4c270d0197efffc0f4d82468dd4175e59cd95b2c37d7003aefe4e861fa018a9449eeab WHIRLPOOL 2d616b5ee07833d79c4c5304fc327cf15626c55c4635a0ed7e6eb2db8afcad9b54bea51ae201c3d7bb54190714456874ef8073e8b4296464b9aba11e2c07f353
+DIST gst-plugins-base-0.10.35.tar.bz2 2782902 SHA256 cd24f01bb5258a1f400bc4f2c212bb7cee9ee23c9ffb80d537a24ef366d17103 SHA512 3959c7fd5f091313887810c6377dcbfd4d154ddccb01603f9ded2ee1279c0a91f9d3a956596856f103f50a3613498c55d3c9a913e776ca4ea20594ed83c37004 WHIRLPOOL 508b17026a170fb0586e534b84a06cceb5dbd22c2c68d18f095fd14fbfe1a1f576b954f05c7e42838136c047a344fc3e83e211e29e1d1833ca0fc3bcf23f880c
+DIST gst-plugins-base-0.10.36.tar.xz 2364108 SHA256 1fe45c3894903001d4d008b0713dab089f53726dcb5842d5b40c2595a984e64a SHA512 ea77778e073515df58229a641b4363df31f0b80204a5a43a8feb31f0b03a5a4b9b79d6e07e1615c773a59927a9b649f1b1d782def1120d581d09a090be8363b8 WHIRLPOOL e455f2a1aafd60078080735108e4ac336bc4764ed92b9579d83a453f75491331d16b48e5983f3c9712b6edb28ec379e696f06f6910c93168b019d6077c28fb6d
diff --git a/media-plugins/gst-plugins-cdparanoia/gst-plugins-cdparanoia-0.10.36.ebuild b/media-plugins/gst-plugins-cdparanoia/gst-plugins-cdparanoia-0.10.36.ebuild
new file mode 100644
index 000000000000..55b6a1fc3ecf
--- /dev/null
+++ b/media-plugins/gst-plugins-cdparanoia/gst-plugins-cdparanoia-0.10.36.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-cdparanoia/gst-plugins-cdparanoia-0.10.36.ebuild,v 1.1 2012/10/21 07:59:36 tetromino Exp $
+
+EAPI=4
+
+inherit gst-plugins-base
+
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND=">=media-sound/cdparanoia-3.10.2-r3"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-faac/Manifest b/media-plugins/gst-plugins-faac/Manifest
index a9b0904ef199..19c42545058a 100644
--- a/media-plugins/gst-plugins-faac/Manifest
+++ b/media-plugins/gst-plugins-faac/Manifest
@@ -1,3 +1,3 @@
-DIST gst-plugins-bad-0.10.19.tar.bz2 3009513 RMD160 f28beddcfc33d02da590271403385f06eacfe1c4 SHA1 3d5ca09f99371fb569ed029dcaef8119f0841821 SHA256 7b6c49f22caad3b573aee481381355b38ac9f2077f291d9f33a9a808a2568888
-DIST gst-plugins-bad-0.10.21.tar.bz2 3429224 RMD160 b12f7a26fdbef06a1914d9a4192d2114855f41a1 SHA1 5bc4e5a1edff4bf22cbabc32cb87dc055b55c65a SHA256 422badacbda37ac33cb446c6751dabcd0b223c308dbb01024a34ded682fa47e3
-DIST gst-plugins-bad-0.10.22.tar.bz2 3539722 RMD160 a3cf707a42d49b4285a57adaa07dc87591f18403 SHA1 66f4b9c40eb2ea43f093802e673effabee600a9b SHA256 d8f7102f43ffea076646427115ffdccb3975954f1e9367bd304f7ee01e12070c
+DIST gst-plugins-bad-0.10.19.tar.bz2 3009513 SHA256 7b6c49f22caad3b573aee481381355b38ac9f2077f291d9f33a9a808a2568888 SHA512 5753c65206d82f5ea3b06169419bbd2322ad1a1a8ca516ea40f0aa5777f41635ff26df20403e1e684aa7bda4c9d5749e0c93588668ee628fc3d9086a94b21f26 WHIRLPOOL f8565ead9d395fa8be0f2a4104939eda24f2b867c85b227f92d3ca325851ad14da6011a28bb490afac4f1a219c070a121a822729725bb9a674d9181dca7fef72
+DIST gst-plugins-bad-0.10.21.tar.bz2 3429224 SHA256 422badacbda37ac33cb446c6751dabcd0b223c308dbb01024a34ded682fa47e3 SHA512 110ad431530c8e29282d5fddffc3c07dc9632884a99e58362b9b7b91c3cb6cb5e2c17b0fcd2b7ed9d976de27350764f14f49b920106477be04c86ec228f9ee05 WHIRLPOOL ea213a2cfefc7542eba77ab564a835385509464b3f6b4627c13da7acbb0fa4710dff6b85f7d823283cd58bb6202e5a8ec6a766acc8d9f3b0ee517d2b8b48187a
+DIST gst-plugins-bad-0.10.22.tar.bz2 3539722 SHA256 d8f7102f43ffea076646427115ffdccb3975954f1e9367bd304f7ee01e12070c SHA512 5a5df41df5899a2578a7d4cf03789080db028af78229254183c36f6bb094c4351c13bae4e893c6aad8e2385bafba292d7a7702436dd163cc4c53604df481349e WHIRLPOOL f028207602b652e60c9dd7fade3ca67a7e7b0173dea84602865ea66402fcb8e275529baceae416bea1a1f7bb4074e4b6d66bc0b87e15f9fedb9f4831e1820eef
diff --git a/media-plugins/gst-plugins-faac/gst-plugins-faac-0.10.22.ebuild b/media-plugins/gst-plugins-faac/gst-plugins-faac-0.10.22.ebuild
index 9c6bdbdcf4c6..0c15c2fa07c5 100644
--- a/media-plugins/gst-plugins-faac/gst-plugins-faac-0.10.22.ebuild
+++ b/media-plugins/gst-plugins-faac/gst-plugins-faac-0.10.22.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-faac/gst-plugins-faac-0.10.22.ebuild,v 1.5 2011/10/15 18:35:21 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-faac/gst-plugins-faac-0.10.22.ebuild,v 1.6 2012/10/21 08:57:31 maekke Exp $
 
 inherit gst-plugins-bad
 
-KEYWORDS="alpha amd64 ppc ppc64 x86"
+KEYWORDS="alpha amd64 ~arm ppc ppc64 x86"
 IUSE=""
 
 RDEPEND="media-libs/faac
diff --git a/media-plugins/gst-plugins-gio/Manifest b/media-plugins/gst-plugins-gio/Manifest
index c80b1026b32d..4caaf109eb00 100644
--- a/media-plugins/gst-plugins-gio/Manifest
+++ b/media-plugins/gst-plugins-gio/Manifest
@@ -1,2 +1,3 @@
-DIST gst-plugins-base-0.10.32.tar.bz2 2720103 RMD160 b267e3138e40e3646efed0baa662d40775eca1ea SHA1 c1c149272b7ab6cbe5f648532f74525c6541eea5 SHA256 e9aabfac83f6480896da0686e9c911989f896fbad634821b7771ed84a446172b
-DIST gst-plugins-base-0.10.35.tar.bz2 2782902 RMD160 877e6b1c5439ef71262037b7a1aced07d37f4d49 SHA1 6d7dc463fed5dd43f79a53ad523fcbd6d0916303 SHA256 cd24f01bb5258a1f400bc4f2c212bb7cee9ee23c9ffb80d537a24ef366d17103
+DIST gst-plugins-base-0.10.32.tar.bz2 2720103 SHA256 e9aabfac83f6480896da0686e9c911989f896fbad634821b7771ed84a446172b SHA512 34d32ca0ae46615d3258dd6656a044162d93c146c2747ac0784cb1a11e4c270d0197efffc0f4d82468dd4175e59cd95b2c37d7003aefe4e861fa018a9449eeab WHIRLPOOL 2d616b5ee07833d79c4c5304fc327cf15626c55c4635a0ed7e6eb2db8afcad9b54bea51ae201c3d7bb54190714456874ef8073e8b4296464b9aba11e2c07f353
+DIST gst-plugins-base-0.10.35.tar.bz2 2782902 SHA256 cd24f01bb5258a1f400bc4f2c212bb7cee9ee23c9ffb80d537a24ef366d17103 SHA512 3959c7fd5f091313887810c6377dcbfd4d154ddccb01603f9ded2ee1279c0a91f9d3a956596856f103f50a3613498c55d3c9a913e776ca4ea20594ed83c37004 WHIRLPOOL 508b17026a170fb0586e534b84a06cceb5dbd22c2c68d18f095fd14fbfe1a1f576b954f05c7e42838136c047a344fc3e83e211e29e1d1833ca0fc3bcf23f880c
+DIST gst-plugins-base-0.10.36.tar.xz 2364108 SHA256 1fe45c3894903001d4d008b0713dab089f53726dcb5842d5b40c2595a984e64a SHA512 ea77778e073515df58229a641b4363df31f0b80204a5a43a8feb31f0b03a5a4b9b79d6e07e1615c773a59927a9b649f1b1d782def1120d581d09a090be8363b8 WHIRLPOOL e455f2a1aafd60078080735108e4ac336bc4764ed92b9579d83a453f75491331d16b48e5983f3c9712b6edb28ec379e696f06f6910c93168b019d6077c28fb6d
diff --git a/media-plugins/gst-plugins-gio/gst-plugins-gio-0.10.36.ebuild b/media-plugins/gst-plugins-gio/gst-plugins-gio-0.10.36.ebuild
new file mode 100644
index 000000000000..103ac797a11c
--- /dev/null
+++ b/media-plugins/gst-plugins-gio/gst-plugins-gio-0.10.36.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-gio/gst-plugins-gio-0.10.36.ebuild,v 1.1 2012/10/21 07:59:49 tetromino Exp $
+
+EAPI=4
+
+inherit gst-plugins-base
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=dev-libs/glib-2.16:2"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-gnomevfs/Manifest b/media-plugins/gst-plugins-gnomevfs/Manifest
index c80b1026b32d..4caaf109eb00 100644
--- a/media-plugins/gst-plugins-gnomevfs/Manifest
+++ b/media-plugins/gst-plugins-gnomevfs/Manifest
@@ -1,2 +1,3 @@
-DIST gst-plugins-base-0.10.32.tar.bz2 2720103 RMD160 b267e3138e40e3646efed0baa662d40775eca1ea SHA1 c1c149272b7ab6cbe5f648532f74525c6541eea5 SHA256 e9aabfac83f6480896da0686e9c911989f896fbad634821b7771ed84a446172b
-DIST gst-plugins-base-0.10.35.tar.bz2 2782902 RMD160 877e6b1c5439ef71262037b7a1aced07d37f4d49 SHA1 6d7dc463fed5dd43f79a53ad523fcbd6d0916303 SHA256 cd24f01bb5258a1f400bc4f2c212bb7cee9ee23c9ffb80d537a24ef366d17103
+DIST gst-plugins-base-0.10.32.tar.bz2 2720103 SHA256 e9aabfac83f6480896da0686e9c911989f896fbad634821b7771ed84a446172b SHA512 34d32ca0ae46615d3258dd6656a044162d93c146c2747ac0784cb1a11e4c270d0197efffc0f4d82468dd4175e59cd95b2c37d7003aefe4e861fa018a9449eeab WHIRLPOOL 2d616b5ee07833d79c4c5304fc327cf15626c55c4635a0ed7e6eb2db8afcad9b54bea51ae201c3d7bb54190714456874ef8073e8b4296464b9aba11e2c07f353
+DIST gst-plugins-base-0.10.35.tar.bz2 2782902 SHA256 cd24f01bb5258a1f400bc4f2c212bb7cee9ee23c9ffb80d537a24ef366d17103 SHA512 3959c7fd5f091313887810c6377dcbfd4d154ddccb01603f9ded2ee1279c0a91f9d3a956596856f103f50a3613498c55d3c9a913e776ca4ea20594ed83c37004 WHIRLPOOL 508b17026a170fb0586e534b84a06cceb5dbd22c2c68d18f095fd14fbfe1a1f576b954f05c7e42838136c047a344fc3e83e211e29e1d1833ca0fc3bcf23f880c
+DIST gst-plugins-base-0.10.36.tar.xz 2364108 SHA256 1fe45c3894903001d4d008b0713dab089f53726dcb5842d5b40c2595a984e64a SHA512 ea77778e073515df58229a641b4363df31f0b80204a5a43a8feb31f0b03a5a4b9b79d6e07e1615c773a59927a9b649f1b1d782def1120d581d09a090be8363b8 WHIRLPOOL e455f2a1aafd60078080735108e4ac336bc4764ed92b9579d83a453f75491331d16b48e5983f3c9712b6edb28ec379e696f06f6910c93168b019d6077c28fb6d
diff --git a/media-plugins/gst-plugins-gnomevfs/gst-plugins-gnomevfs-0.10.36.ebuild b/media-plugins/gst-plugins-gnomevfs/gst-plugins-gnomevfs-0.10.36.ebuild
new file mode 100644
index 000000000000..21e3650490dc
--- /dev/null
+++ b/media-plugins/gst-plugins-gnomevfs/gst-plugins-gnomevfs-0.10.36.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-gnomevfs/gst-plugins-gnomevfs-0.10.36.ebuild,v 1.1 2012/10/21 08:00:07 tetromino Exp $
+
+EAPI=4
+
+inherit gst-plugins-base
+
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-solaris"
+IUSE=""
+
+RDEPEND=">=gnome-base/gnome-vfs-2:2"
+DEPEND="${RDEPEND}"
+
+GST_PLUGINS_BUILD="gnome_vfs"
diff --git a/media-plugins/gst-plugins-lame/Manifest b/media-plugins/gst-plugins-lame/Manifest
index cc8b91e10c91..8105f24a3ab9 100644
--- a/media-plugins/gst-plugins-lame/Manifest
+++ b/media-plugins/gst-plugins-lame/Manifest
@@ -1,3 +1,3 @@
-DIST gst-plugins-ugly-0.10.16.tar.bz2 1041297 RMD160 7ac2ada6b33eb6752bdebe018454beee61ee2366 SHA1 83bfa47691dd8cba07b96db305943c459bafba12 SHA256 d7fc7636001e78736540c628ad889888cb85ea722f08d1c6813b16682dd9c09c
-DIST gst-plugins-ugly-0.10.17.tar.bz2 1050400 RMD160 8e6f5cd203e00ad9c2646f5975fd666dea6b4100 SHA1 6e637d8e7927f7fb8d4c4ffe8b0120257dfb073c SHA256 0cbd4aa8dceafea21ddd547dfde686a8836f68ba547afa5575a52b64cfa0b369
-DIST gst-plugins-ugly-0.10.18.tar.bz2 1070222 RMD160 3e4eca6077995645fc9b0239bcf9ade53699e54e SHA1 2814a59673506b063240d3c18c96138931efdc33 SHA256 f9c16748cd9269fae86422d8254a579fa6db073797a5a19a9dc5c72cd66c8e14
+DIST gst-plugins-ugly-0.10.16.tar.bz2 1041297 SHA256 d7fc7636001e78736540c628ad889888cb85ea722f08d1c6813b16682dd9c09c SHA512 d89309db87064b0722daa727974a865d76923de98044161322da85d2679e4ee901b24fc04a050ed7627904c6e5d1114b60378aecc50a4ef55e7354bd5b7ae7a9 WHIRLPOOL 47de2aaf63fa58cc1352ffbbc4d0f27277efc3a90b571bc1636cbeb09d339af7660714b75a54810bc862c9fca0e7e97c088261302370209e2cda01ea10b9bd47
+DIST gst-plugins-ugly-0.10.17.tar.bz2 1050400 SHA256 0cbd4aa8dceafea21ddd547dfde686a8836f68ba547afa5575a52b64cfa0b369 SHA512 bb69060a14e1d6c7f31b203068d37e84dfc2c0b8ee83af67a125b5c7275e2ba8b594fbe98e595fdf5696e8547a02b498b163113e39b21e486cef12036429ff25 WHIRLPOOL afc62c2fb267b87ea8dde81ce215c8b73ca96154388fe2a1f522f7c6f5329f53e41245896eccb3d0dfefe12b13cb68a3bfd11e9acb743f82c715fbaa13af215c
+DIST gst-plugins-ugly-0.10.18.tar.bz2 1070222 SHA256 f9c16748cd9269fae86422d8254a579fa6db073797a5a19a9dc5c72cd66c8e14 SHA512 af4657e3d4c4b8a323078c7aeadaa7e5e8ea95660a20975770930f576f28cb9b85176b06066fd168f91ae17e68ff1525ed55b4546d041bc0d9a4bd83cf3fdb2e WHIRLPOOL 84b2b35a7ad40699aab20168321a38606ae1f1ded9c6dd7506abe343ef0d524f741096196dc404ed86e4af62a475cb47ab12674be133add187a9c085d3aa7740
diff --git a/media-plugins/gst-plugins-lame/gst-plugins-lame-0.10.18.ebuild b/media-plugins/gst-plugins-lame/gst-plugins-lame-0.10.18.ebuild
index 2f7dd6dc2509..ba65f7a5f875 100644
--- a/media-plugins/gst-plugins-lame/gst-plugins-lame-0.10.18.ebuild
+++ b/media-plugins/gst-plugins-lame/gst-plugins-lame-0.10.18.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-lame/gst-plugins-lame-0.10.18.ebuild,v 1.7 2012/05/17 14:43:32 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-lame/gst-plugins-lame-0.10.18.ebuild,v 1.8 2012/10/21 08:58:32 maekke Exp $
 
 inherit gst-plugins-ugly
 
-KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm hppa ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=media-sound/lame-3.95
diff --git a/media-plugins/gst-plugins-libvisual/Manifest b/media-plugins/gst-plugins-libvisual/Manifest
index c80b1026b32d..4caaf109eb00 100644
--- a/media-plugins/gst-plugins-libvisual/Manifest
+++ b/media-plugins/gst-plugins-libvisual/Manifest
@@ -1,2 +1,3 @@
-DIST gst-plugins-base-0.10.32.tar.bz2 2720103 RMD160 b267e3138e40e3646efed0baa662d40775eca1ea SHA1 c1c149272b7ab6cbe5f648532f74525c6541eea5 SHA256 e9aabfac83f6480896da0686e9c911989f896fbad634821b7771ed84a446172b
-DIST gst-plugins-base-0.10.35.tar.bz2 2782902 RMD160 877e6b1c5439ef71262037b7a1aced07d37f4d49 SHA1 6d7dc463fed5dd43f79a53ad523fcbd6d0916303 SHA256 cd24f01bb5258a1f400bc4f2c212bb7cee9ee23c9ffb80d537a24ef366d17103
+DIST gst-plugins-base-0.10.32.tar.bz2 2720103 SHA256 e9aabfac83f6480896da0686e9c911989f896fbad634821b7771ed84a446172b SHA512 34d32ca0ae46615d3258dd6656a044162d93c146c2747ac0784cb1a11e4c270d0197efffc0f4d82468dd4175e59cd95b2c37d7003aefe4e861fa018a9449eeab WHIRLPOOL 2d616b5ee07833d79c4c5304fc327cf15626c55c4635a0ed7e6eb2db8afcad9b54bea51ae201c3d7bb54190714456874ef8073e8b4296464b9aba11e2c07f353
+DIST gst-plugins-base-0.10.35.tar.bz2 2782902 SHA256 cd24f01bb5258a1f400bc4f2c212bb7cee9ee23c9ffb80d537a24ef366d17103 SHA512 3959c7fd5f091313887810c6377dcbfd4d154ddccb01603f9ded2ee1279c0a91f9d3a956596856f103f50a3613498c55d3c9a913e776ca4ea20594ed83c37004 WHIRLPOOL 508b17026a170fb0586e534b84a06cceb5dbd22c2c68d18f095fd14fbfe1a1f576b954f05c7e42838136c047a344fc3e83e211e29e1d1833ca0fc3bcf23f880c
+DIST gst-plugins-base-0.10.36.tar.xz 2364108 SHA256 1fe45c3894903001d4d008b0713dab089f53726dcb5842d5b40c2595a984e64a SHA512 ea77778e073515df58229a641b4363df31f0b80204a5a43a8feb31f0b03a5a4b9b79d6e07e1615c773a59927a9b649f1b1d782def1120d581d09a090be8363b8 WHIRLPOOL e455f2a1aafd60078080735108e4ac336bc4764ed92b9579d83a453f75491331d16b48e5983f3c9712b6edb28ec379e696f06f6910c93168b019d6077c28fb6d
diff --git a/media-plugins/gst-plugins-libvisual/gst-plugins-libvisual-0.10.36.ebuild b/media-plugins/gst-plugins-libvisual/gst-plugins-libvisual-0.10.36.ebuild
new file mode 100644
index 000000000000..ba766e15901d
--- /dev/null
+++ b/media-plugins/gst-plugins-libvisual/gst-plugins-libvisual-0.10.36.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-libvisual/gst-plugins-libvisual-0.10.36.ebuild,v 1.1 2012/10/21 08:00:18 tetromino Exp $
+
+EAPI=4
+
+inherit gst-plugins-base
+
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd"
+IUSE=""
+
+RDEPEND=">=media-libs/libvisual-0.4
+	>=media-plugins/libvisual-plugins-0.4"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-ogg/Manifest b/media-plugins/gst-plugins-ogg/Manifest
index f26309cfea95..4caaf109eb00 100644
--- a/media-plugins/gst-plugins-ogg/Manifest
+++ b/media-plugins/gst-plugins-ogg/Manifest
@@ -1,2 +1,3 @@
-DIST gst-plugins-base-0.10.32.tar.bz2 2720103 SHA256 e9aabfac83f6480896da0686e9c911989f896fbad634821b7771ed84a446172b
+DIST gst-plugins-base-0.10.32.tar.bz2 2720103 SHA256 e9aabfac83f6480896da0686e9c911989f896fbad634821b7771ed84a446172b SHA512 34d32ca0ae46615d3258dd6656a044162d93c146c2747ac0784cb1a11e4c270d0197efffc0f4d82468dd4175e59cd95b2c37d7003aefe4e861fa018a9449eeab WHIRLPOOL 2d616b5ee07833d79c4c5304fc327cf15626c55c4635a0ed7e6eb2db8afcad9b54bea51ae201c3d7bb54190714456874ef8073e8b4296464b9aba11e2c07f353
 DIST gst-plugins-base-0.10.35.tar.bz2 2782902 SHA256 cd24f01bb5258a1f400bc4f2c212bb7cee9ee23c9ffb80d537a24ef366d17103 SHA512 3959c7fd5f091313887810c6377dcbfd4d154ddccb01603f9ded2ee1279c0a91f9d3a956596856f103f50a3613498c55d3c9a913e776ca4ea20594ed83c37004 WHIRLPOOL 508b17026a170fb0586e534b84a06cceb5dbd22c2c68d18f095fd14fbfe1a1f576b954f05c7e42838136c047a344fc3e83e211e29e1d1833ca0fc3bcf23f880c
+DIST gst-plugins-base-0.10.36.tar.xz 2364108 SHA256 1fe45c3894903001d4d008b0713dab089f53726dcb5842d5b40c2595a984e64a SHA512 ea77778e073515df58229a641b4363df31f0b80204a5a43a8feb31f0b03a5a4b9b79d6e07e1615c773a59927a9b649f1b1d782def1120d581d09a090be8363b8 WHIRLPOOL e455f2a1aafd60078080735108e4ac336bc4764ed92b9579d83a453f75491331d16b48e5983f3c9712b6edb28ec379e696f06f6910c93168b019d6077c28fb6d
diff --git a/media-plugins/gst-plugins-ogg/gst-plugins-ogg-0.10.36.ebuild b/media-plugins/gst-plugins-ogg/gst-plugins-ogg-0.10.36.ebuild
new file mode 100644
index 000000000000..f87de9ec60b4
--- /dev/null
+++ b/media-plugins/gst-plugins-ogg/gst-plugins-ogg-0.10.36.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-ogg/gst-plugins-ogg-0.10.36.ebuild,v 1.1 2012/10/21 08:00:35 tetromino Exp $
+
+EAPI=4
+
+inherit gst-plugins-base
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos"
+IUSE=""
+
+RDEPEND=">=media-libs/libogg-1.0"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-pango/Manifest b/media-plugins/gst-plugins-pango/Manifest
index c80b1026b32d..4caaf109eb00 100644
--- a/media-plugins/gst-plugins-pango/Manifest
+++ b/media-plugins/gst-plugins-pango/Manifest
@@ -1,2 +1,3 @@
-DIST gst-plugins-base-0.10.32.tar.bz2 2720103 RMD160 b267e3138e40e3646efed0baa662d40775eca1ea SHA1 c1c149272b7ab6cbe5f648532f74525c6541eea5 SHA256 e9aabfac83f6480896da0686e9c911989f896fbad634821b7771ed84a446172b
-DIST gst-plugins-base-0.10.35.tar.bz2 2782902 RMD160 877e6b1c5439ef71262037b7a1aced07d37f4d49 SHA1 6d7dc463fed5dd43f79a53ad523fcbd6d0916303 SHA256 cd24f01bb5258a1f400bc4f2c212bb7cee9ee23c9ffb80d537a24ef366d17103
+DIST gst-plugins-base-0.10.32.tar.bz2 2720103 SHA256 e9aabfac83f6480896da0686e9c911989f896fbad634821b7771ed84a446172b SHA512 34d32ca0ae46615d3258dd6656a044162d93c146c2747ac0784cb1a11e4c270d0197efffc0f4d82468dd4175e59cd95b2c37d7003aefe4e861fa018a9449eeab WHIRLPOOL 2d616b5ee07833d79c4c5304fc327cf15626c55c4635a0ed7e6eb2db8afcad9b54bea51ae201c3d7bb54190714456874ef8073e8b4296464b9aba11e2c07f353
+DIST gst-plugins-base-0.10.35.tar.bz2 2782902 SHA256 cd24f01bb5258a1f400bc4f2c212bb7cee9ee23c9ffb80d537a24ef366d17103 SHA512 3959c7fd5f091313887810c6377dcbfd4d154ddccb01603f9ded2ee1279c0a91f9d3a956596856f103f50a3613498c55d3c9a913e776ca4ea20594ed83c37004 WHIRLPOOL 508b17026a170fb0586e534b84a06cceb5dbd22c2c68d18f095fd14fbfe1a1f576b954f05c7e42838136c047a344fc3e83e211e29e1d1833ca0fc3bcf23f880c
+DIST gst-plugins-base-0.10.36.tar.xz 2364108 SHA256 1fe45c3894903001d4d008b0713dab089f53726dcb5842d5b40c2595a984e64a SHA512 ea77778e073515df58229a641b4363df31f0b80204a5a43a8feb31f0b03a5a4b9b79d6e07e1615c773a59927a9b649f1b1d782def1120d581d09a090be8363b8 WHIRLPOOL e455f2a1aafd60078080735108e4ac336bc4764ed92b9579d83a453f75491331d16b48e5983f3c9712b6edb28ec379e696f06f6910c93168b019d6077c28fb6d
diff --git a/media-plugins/gst-plugins-pango/gst-plugins-pango-0.10.36.ebuild b/media-plugins/gst-plugins-pango/gst-plugins-pango-0.10.36.ebuild
new file mode 100644
index 000000000000..1729efce0025
--- /dev/null
+++ b/media-plugins/gst-plugins-pango/gst-plugins-pango-0.10.36.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-pango/gst-plugins-pango-0.10.36.ebuild,v 1.1 2012/10/21 08:00:48 tetromino Exp $
+
+EAPI=4
+
+inherit gst-plugins-base
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=x11-libs/pango-1.16"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-theora/Manifest b/media-plugins/gst-plugins-theora/Manifest
index c80b1026b32d..4caaf109eb00 100644
--- a/media-plugins/gst-plugins-theora/Manifest
+++ b/media-plugins/gst-plugins-theora/Manifest
@@ -1,2 +1,3 @@
-DIST gst-plugins-base-0.10.32.tar.bz2 2720103 RMD160 b267e3138e40e3646efed0baa662d40775eca1ea SHA1 c1c149272b7ab6cbe5f648532f74525c6541eea5 SHA256 e9aabfac83f6480896da0686e9c911989f896fbad634821b7771ed84a446172b
-DIST gst-plugins-base-0.10.35.tar.bz2 2782902 RMD160 877e6b1c5439ef71262037b7a1aced07d37f4d49 SHA1 6d7dc463fed5dd43f79a53ad523fcbd6d0916303 SHA256 cd24f01bb5258a1f400bc4f2c212bb7cee9ee23c9ffb80d537a24ef366d17103
+DIST gst-plugins-base-0.10.32.tar.bz2 2720103 SHA256 e9aabfac83f6480896da0686e9c911989f896fbad634821b7771ed84a446172b SHA512 34d32ca0ae46615d3258dd6656a044162d93c146c2747ac0784cb1a11e4c270d0197efffc0f4d82468dd4175e59cd95b2c37d7003aefe4e861fa018a9449eeab WHIRLPOOL 2d616b5ee07833d79c4c5304fc327cf15626c55c4635a0ed7e6eb2db8afcad9b54bea51ae201c3d7bb54190714456874ef8073e8b4296464b9aba11e2c07f353
+DIST gst-plugins-base-0.10.35.tar.bz2 2782902 SHA256 cd24f01bb5258a1f400bc4f2c212bb7cee9ee23c9ffb80d537a24ef366d17103 SHA512 3959c7fd5f091313887810c6377dcbfd4d154ddccb01603f9ded2ee1279c0a91f9d3a956596856f103f50a3613498c55d3c9a913e776ca4ea20594ed83c37004 WHIRLPOOL 508b17026a170fb0586e534b84a06cceb5dbd22c2c68d18f095fd14fbfe1a1f576b954f05c7e42838136c047a344fc3e83e211e29e1d1833ca0fc3bcf23f880c
+DIST gst-plugins-base-0.10.36.tar.xz 2364108 SHA256 1fe45c3894903001d4d008b0713dab089f53726dcb5842d5b40c2595a984e64a SHA512 ea77778e073515df58229a641b4363df31f0b80204a5a43a8feb31f0b03a5a4b9b79d6e07e1615c773a59927a9b649f1b1d782def1120d581d09a090be8363b8 WHIRLPOOL e455f2a1aafd60078080735108e4ac336bc4764ed92b9579d83a453f75491331d16b48e5983f3c9712b6edb28ec379e696f06f6910c93168b019d6077c28fb6d
diff --git a/media-plugins/gst-plugins-theora/gst-plugins-theora-0.10.36.ebuild b/media-plugins/gst-plugins-theora/gst-plugins-theora-0.10.36.ebuild
new file mode 100644
index 000000000000..a58c45c24c57
--- /dev/null
+++ b/media-plugins/gst-plugins-theora/gst-plugins-theora-0.10.36.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-theora/gst-plugins-theora-0.10.36.ebuild,v 1.1 2012/10/21 08:01:01 tetromino Exp $
+
+EAPI=4
+
+inherit gst-plugins-base
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=media-libs/libtheora-1.1[encode]
+	media-libs/libogg"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-twolame/Manifest b/media-plugins/gst-plugins-twolame/Manifest
index cc8b91e10c91..8105f24a3ab9 100644
--- a/media-plugins/gst-plugins-twolame/Manifest
+++ b/media-plugins/gst-plugins-twolame/Manifest
@@ -1,3 +1,3 @@
-DIST gst-plugins-ugly-0.10.16.tar.bz2 1041297 RMD160 7ac2ada6b33eb6752bdebe018454beee61ee2366 SHA1 83bfa47691dd8cba07b96db305943c459bafba12 SHA256 d7fc7636001e78736540c628ad889888cb85ea722f08d1c6813b16682dd9c09c
-DIST gst-plugins-ugly-0.10.17.tar.bz2 1050400 RMD160 8e6f5cd203e00ad9c2646f5975fd666dea6b4100 SHA1 6e637d8e7927f7fb8d4c4ffe8b0120257dfb073c SHA256 0cbd4aa8dceafea21ddd547dfde686a8836f68ba547afa5575a52b64cfa0b369
-DIST gst-plugins-ugly-0.10.18.tar.bz2 1070222 RMD160 3e4eca6077995645fc9b0239bcf9ade53699e54e SHA1 2814a59673506b063240d3c18c96138931efdc33 SHA256 f9c16748cd9269fae86422d8254a579fa6db073797a5a19a9dc5c72cd66c8e14
+DIST gst-plugins-ugly-0.10.16.tar.bz2 1041297 SHA256 d7fc7636001e78736540c628ad889888cb85ea722f08d1c6813b16682dd9c09c SHA512 d89309db87064b0722daa727974a865d76923de98044161322da85d2679e4ee901b24fc04a050ed7627904c6e5d1114b60378aecc50a4ef55e7354bd5b7ae7a9 WHIRLPOOL 47de2aaf63fa58cc1352ffbbc4d0f27277efc3a90b571bc1636cbeb09d339af7660714b75a54810bc862c9fca0e7e97c088261302370209e2cda01ea10b9bd47
+DIST gst-plugins-ugly-0.10.17.tar.bz2 1050400 SHA256 0cbd4aa8dceafea21ddd547dfde686a8836f68ba547afa5575a52b64cfa0b369 SHA512 bb69060a14e1d6c7f31b203068d37e84dfc2c0b8ee83af67a125b5c7275e2ba8b594fbe98e595fdf5696e8547a02b498b163113e39b21e486cef12036429ff25 WHIRLPOOL afc62c2fb267b87ea8dde81ce215c8b73ca96154388fe2a1f522f7c6f5329f53e41245896eccb3d0dfefe12b13cb68a3bfd11e9acb743f82c715fbaa13af215c
+DIST gst-plugins-ugly-0.10.18.tar.bz2 1070222 SHA256 f9c16748cd9269fae86422d8254a579fa6db073797a5a19a9dc5c72cd66c8e14 SHA512 af4657e3d4c4b8a323078c7aeadaa7e5e8ea95660a20975770930f576f28cb9b85176b06066fd168f91ae17e68ff1525ed55b4546d041bc0d9a4bd83cf3fdb2e WHIRLPOOL 84b2b35a7ad40699aab20168321a38606ae1f1ded9c6dd7506abe343ef0d524f741096196dc404ed86e4af62a475cb47ab12674be133add187a9c085d3aa7740
diff --git a/media-plugins/gst-plugins-twolame/gst-plugins-twolame-0.10.18.ebuild b/media-plugins/gst-plugins-twolame/gst-plugins-twolame-0.10.18.ebuild
index 10d426ce6399..1aaa0201b80f 100644
--- a/media-plugins/gst-plugins-twolame/gst-plugins-twolame-0.10.18.ebuild
+++ b/media-plugins/gst-plugins-twolame/gst-plugins-twolame-0.10.18.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-twolame/gst-plugins-twolame-0.10.18.ebuild,v 1.5 2011/10/15 18:35:20 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-twolame/gst-plugins-twolame-0.10.18.ebuild,v 1.6 2012/10/21 08:59:29 maekke Exp $
 
 inherit gst-plugins-ugly
 
-KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 ~arm ppc ppc64 sparc x86"
 IUSE=""
 
 RDEPEND=">=media-sound/twolame-0.3.10
diff --git a/media-plugins/gst-plugins-vorbis/Manifest b/media-plugins/gst-plugins-vorbis/Manifest
index f26309cfea95..4caaf109eb00 100644
--- a/media-plugins/gst-plugins-vorbis/Manifest
+++ b/media-plugins/gst-plugins-vorbis/Manifest
@@ -1,2 +1,3 @@
-DIST gst-plugins-base-0.10.32.tar.bz2 2720103 SHA256 e9aabfac83f6480896da0686e9c911989f896fbad634821b7771ed84a446172b
+DIST gst-plugins-base-0.10.32.tar.bz2 2720103 SHA256 e9aabfac83f6480896da0686e9c911989f896fbad634821b7771ed84a446172b SHA512 34d32ca0ae46615d3258dd6656a044162d93c146c2747ac0784cb1a11e4c270d0197efffc0f4d82468dd4175e59cd95b2c37d7003aefe4e861fa018a9449eeab WHIRLPOOL 2d616b5ee07833d79c4c5304fc327cf15626c55c4635a0ed7e6eb2db8afcad9b54bea51ae201c3d7bb54190714456874ef8073e8b4296464b9aba11e2c07f353
 DIST gst-plugins-base-0.10.35.tar.bz2 2782902 SHA256 cd24f01bb5258a1f400bc4f2c212bb7cee9ee23c9ffb80d537a24ef366d17103 SHA512 3959c7fd5f091313887810c6377dcbfd4d154ddccb01603f9ded2ee1279c0a91f9d3a956596856f103f50a3613498c55d3c9a913e776ca4ea20594ed83c37004 WHIRLPOOL 508b17026a170fb0586e534b84a06cceb5dbd22c2c68d18f095fd14fbfe1a1f576b954f05c7e42838136c047a344fc3e83e211e29e1d1833ca0fc3bcf23f880c
+DIST gst-plugins-base-0.10.36.tar.xz 2364108 SHA256 1fe45c3894903001d4d008b0713dab089f53726dcb5842d5b40c2595a984e64a SHA512 ea77778e073515df58229a641b4363df31f0b80204a5a43a8feb31f0b03a5a4b9b79d6e07e1615c773a59927a9b649f1b1d782def1120d581d09a090be8363b8 WHIRLPOOL e455f2a1aafd60078080735108e4ac336bc4764ed92b9579d83a453f75491331d16b48e5983f3c9712b6edb28ec379e696f06f6910c93168b019d6077c28fb6d
diff --git a/media-plugins/gst-plugins-vorbis/gst-plugins-vorbis-0.10.36.ebuild b/media-plugins/gst-plugins-vorbis/gst-plugins-vorbis-0.10.36.ebuild
new file mode 100644
index 000000000000..84bd31ee910c
--- /dev/null
+++ b/media-plugins/gst-plugins-vorbis/gst-plugins-vorbis-0.10.36.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-vorbis/gst-plugins-vorbis-0.10.36.ebuild,v 1.1 2012/10/21 08:01:52 tetromino Exp $
+
+EAPI=4
+
+inherit gst-plugins-base
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos"
+IUSE=""
+
+RDEPEND=">=media-libs/libvorbis-1.0
+	>=media-libs/libogg-1.0"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-x/Manifest b/media-plugins/gst-plugins-x/Manifest
index f26309cfea95..4caaf109eb00 100644
--- a/media-plugins/gst-plugins-x/Manifest
+++ b/media-plugins/gst-plugins-x/Manifest
@@ -1,2 +1,3 @@
-DIST gst-plugins-base-0.10.32.tar.bz2 2720103 SHA256 e9aabfac83f6480896da0686e9c911989f896fbad634821b7771ed84a446172b
+DIST gst-plugins-base-0.10.32.tar.bz2 2720103 SHA256 e9aabfac83f6480896da0686e9c911989f896fbad634821b7771ed84a446172b SHA512 34d32ca0ae46615d3258dd6656a044162d93c146c2747ac0784cb1a11e4c270d0197efffc0f4d82468dd4175e59cd95b2c37d7003aefe4e861fa018a9449eeab WHIRLPOOL 2d616b5ee07833d79c4c5304fc327cf15626c55c4635a0ed7e6eb2db8afcad9b54bea51ae201c3d7bb54190714456874ef8073e8b4296464b9aba11e2c07f353
 DIST gst-plugins-base-0.10.35.tar.bz2 2782902 SHA256 cd24f01bb5258a1f400bc4f2c212bb7cee9ee23c9ffb80d537a24ef366d17103 SHA512 3959c7fd5f091313887810c6377dcbfd4d154ddccb01603f9ded2ee1279c0a91f9d3a956596856f103f50a3613498c55d3c9a913e776ca4ea20594ed83c37004 WHIRLPOOL 508b17026a170fb0586e534b84a06cceb5dbd22c2c68d18f095fd14fbfe1a1f576b954f05c7e42838136c047a344fc3e83e211e29e1d1833ca0fc3bcf23f880c
+DIST gst-plugins-base-0.10.36.tar.xz 2364108 SHA256 1fe45c3894903001d4d008b0713dab089f53726dcb5842d5b40c2595a984e64a SHA512 ea77778e073515df58229a641b4363df31f0b80204a5a43a8feb31f0b03a5a4b9b79d6e07e1615c773a59927a9b649f1b1d782def1120d581d09a090be8363b8 WHIRLPOOL e455f2a1aafd60078080735108e4ac336bc4764ed92b9579d83a453f75491331d16b48e5983f3c9712b6edb28ec379e696f06f6910c93168b019d6077c28fb6d
diff --git a/media-plugins/gst-plugins-x/gst-plugins-x-0.10.35.ebuild b/media-plugins/gst-plugins-x/gst-plugins-x-0.10.35.ebuild
index 2d34d1f022aa..de40bd9a75b3 100644
--- a/media-plugins/gst-plugins-x/gst-plugins-x-0.10.35.ebuild
+++ b/media-plugins/gst-plugins-x/gst-plugins-x-0.10.35.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-x/gst-plugins-x-0.10.35.ebuild,v 1.8 2012/05/12 18:10:33 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-x/gst-plugins-x-0.10.35.ebuild,v 1.9 2012/10/21 08:02:19 tetromino Exp $
 
 inherit gst-plugins-base
 
@@ -8,7 +8,12 @@ KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x8
 IUSE=""
 
 RDEPEND="x11-libs/libX11
-	x11-libs/libXext"
+	x11-libs/libXext
+
+	x11-libs/libSM
+	x11-libs/libICE"
+# libSM and libICE are not used, but the build system links to them anyway
+# Fixed in >=0.10.35-r1
 DEPEND="${RDEPEND}
 	x11-proto/xproto
 	x11-proto/xextproto"
diff --git a/media-plugins/gst-plugins-x/gst-plugins-x-0.10.36.ebuild b/media-plugins/gst-plugins-x/gst-plugins-x-0.10.36.ebuild
new file mode 100644
index 000000000000..5df07081202b
--- /dev/null
+++ b/media-plugins/gst-plugins-x/gst-plugins-x-0.10.36.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-x/gst-plugins-x-0.10.36.ebuild,v 1.1 2012/10/21 08:02:19 tetromino Exp $
+
+EAPI=4
+
+inherit gst-plugins-base
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext"
+DEPEND="${RDEPEND}
+	x11-proto/xproto
+	x11-proto/xextproto"
+
+# xshm is a compile time option of ximage, which is in libXext
+GST_PLUGINS_BUILD="x xshm"
+GST_PLUGINS_BUILD_DIR="ximage"
+
+src_prepare() {
+	gst-plugins-base_src_prepare
+
+	# The AC_PATH_XTRA macro unnecessarily pulls in libSM and libICE even
+	# though they are not actually used. This needs to be fixed upstream by
+	# replacing AC_PATH_XTRA with PKG_CONFIG calls.
+	sed -i -e 's:X_PRE_LIBS -lSM -lICE:X_PRE_LIBS:' "${S}"/configure
+}
diff --git a/media-plugins/gst-plugins-xvideo/Manifest b/media-plugins/gst-plugins-xvideo/Manifest
index f26309cfea95..4caaf109eb00 100644
--- a/media-plugins/gst-plugins-xvideo/Manifest
+++ b/media-plugins/gst-plugins-xvideo/Manifest
@@ -1,2 +1,3 @@
-DIST gst-plugins-base-0.10.32.tar.bz2 2720103 SHA256 e9aabfac83f6480896da0686e9c911989f896fbad634821b7771ed84a446172b
+DIST gst-plugins-base-0.10.32.tar.bz2 2720103 SHA256 e9aabfac83f6480896da0686e9c911989f896fbad634821b7771ed84a446172b SHA512 34d32ca0ae46615d3258dd6656a044162d93c146c2747ac0784cb1a11e4c270d0197efffc0f4d82468dd4175e59cd95b2c37d7003aefe4e861fa018a9449eeab WHIRLPOOL 2d616b5ee07833d79c4c5304fc327cf15626c55c4635a0ed7e6eb2db8afcad9b54bea51ae201c3d7bb54190714456874ef8073e8b4296464b9aba11e2c07f353
 DIST gst-plugins-base-0.10.35.tar.bz2 2782902 SHA256 cd24f01bb5258a1f400bc4f2c212bb7cee9ee23c9ffb80d537a24ef366d17103 SHA512 3959c7fd5f091313887810c6377dcbfd4d154ddccb01603f9ded2ee1279c0a91f9d3a956596856f103f50a3613498c55d3c9a913e776ca4ea20594ed83c37004 WHIRLPOOL 508b17026a170fb0586e534b84a06cceb5dbd22c2c68d18f095fd14fbfe1a1f576b954f05c7e42838136c047a344fc3e83e211e29e1d1833ca0fc3bcf23f880c
+DIST gst-plugins-base-0.10.36.tar.xz 2364108 SHA256 1fe45c3894903001d4d008b0713dab089f53726dcb5842d5b40c2595a984e64a SHA512 ea77778e073515df58229a641b4363df31f0b80204a5a43a8feb31f0b03a5a4b9b79d6e07e1615c773a59927a9b649f1b1d782def1120d581d09a090be8363b8 WHIRLPOOL e455f2a1aafd60078080735108e4ac336bc4764ed92b9579d83a453f75491331d16b48e5983f3c9712b6edb28ec379e696f06f6910c93168b019d6077c28fb6d
diff --git a/media-plugins/gst-plugins-xvideo/gst-plugins-xvideo-0.10.35.ebuild b/media-plugins/gst-plugins-xvideo/gst-plugins-xvideo-0.10.35.ebuild
index bd15f8221afd..d9a923098c13 100644
--- a/media-plugins/gst-plugins-xvideo/gst-plugins-xvideo-0.10.35.ebuild
+++ b/media-plugins/gst-plugins-xvideo/gst-plugins-xvideo-0.10.35.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-xvideo/gst-plugins-xvideo-0.10.35.ebuild,v 1.8 2012/05/17 15:26:29 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-xvideo/gst-plugins-xvideo-0.10.35.ebuild,v 1.9 2012/10/21 08:02:38 tetromino Exp $
 
 inherit gst-plugins-base
 
@@ -8,7 +8,12 @@ KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x8
 IUSE=""
 
 RDEPEND="x11-libs/libXv
-	x11-libs/libXext"
+	x11-libs/libXext
+
+	x11-libs/libSM
+	x11-libs/libICE"
+# libSM and libICE are not used, but the build system links to them anyway
+# Fixed in >=0.10.35-r1
 DEPEND="${RDEPEND}
 	x11-proto/videoproto
 	x11-proto/xproto
diff --git a/media-plugins/gst-plugins-xvideo/gst-plugins-xvideo-0.10.36.ebuild b/media-plugins/gst-plugins-xvideo/gst-plugins-xvideo-0.10.36.ebuild
new file mode 100644
index 000000000000..cfef8228c745
--- /dev/null
+++ b/media-plugins/gst-plugins-xvideo/gst-plugins-xvideo-0.10.36.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-xvideo/gst-plugins-xvideo-0.10.36.ebuild,v 1.1 2012/10/21 08:02:38 tetromino Exp $
+
+EAPI=4
+
+inherit gst-plugins-base
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND="x11-libs/libXv
+	x11-libs/libXext"
+DEPEND="${RDEPEND}
+	x11-proto/videoproto
+	x11-proto/xproto
+	x11-proto/xextproto"
+
+# xshm is a compile time option of xvideo
+# x is needed to build any X plugins, but we build/install only xv anyway
+GST_PLUGINS_BUILD="x xvideo xshm"
+GST_PLUGINS_BUILD_DIR="xvimage"
+
+src_prepare() {
+	gst-plugins-base_src_prepare
+
+	# The AC_PATH_XTRA macro unnecessarily pulls in libSM and libICE even
+	# though they are not actually used. This needs to be fixed upstream by
+	# replacing AC_PATH_XTRA with PKG_CONFIG calls.
+	sed -i -e 's:X_PRE_LIBS -lSM -lICE:X_PRE_LIBS:' "${S}"/configure
+}
diff --git a/media-plugins/vdr-graphtft/Manifest b/media-plugins/vdr-graphtft/Manifest
index 3535ff7ac802..ded8a7777e63 100644
--- a/media-plugins/vdr-graphtft/Manifest
+++ b/media-plugins/vdr-graphtft/Manifest
@@ -1,2 +1,3 @@
-DIST vdr-graphtft-0.3.2.24.tar.bz2 145047 RMD160 2c767a7bf0cfa76592499953fe22141073e653ac SHA1 cc80e8b86865ec2547ad8103cac03d4ac7840a9b SHA256 86c8432c12b5a8cd8818e2b9e5f326547218bbd89d165895b95d51405b4a72d7
-DIST vdr-graphtft-0.3.4.tar.gz 176477 RMD160 5dcb4d6890cb6e7262dafc2a44a2b33db926d0e8 SHA1 d05647f1256ec07047507fba15645374c3bde06a SHA256 e4a6a4ebcce8aad161962a148ecb813609c838e4e9324a605934606dc1d87313
+DIST vdr-graphtft-0.3.2.24.tar.bz2 145047 SHA256 86c8432c12b5a8cd8818e2b9e5f326547218bbd89d165895b95d51405b4a72d7
+DIST vdr-graphtft-0.3.4.tar.gz 176477 SHA256 e4a6a4ebcce8aad161962a148ecb813609c838e4e9324a605934606dc1d87313 SHA512 37621b0a6ab846d4c823b7d1f13d1b4f3f5181d5949da968086d471e1a877d1b737242e1adee5c290424eb1100db9ebf260a76e7f41080f359a561d800af6f01 WHIRLPOOL 1c7cdd8358124f1c920da0261d79269240393ebb9b61d50e0cc99c37a220389971c7965cafd4191e3221c7dc56aef382537c5a61464c3ce2d879a87ec476528d
+DIST vdr-graphtft-0.3.6.tar.bz2 153320 SHA256 43d2b7579e90ef69c451d10b70f57a71a3ef6c13d894258981f785049392c4fc SHA512 0409b9cc62747bebcbe056afc1d632e6c5a4d11cec691a63154bb3ddfd506502577c76fda797a3b707b5f4285e0da604164dff14f782f25800bc8562736ac3b2 WHIRLPOOL a45c86445435a069753de0e5471781344f7aa8aaa61975f0c3b27c8bb05970bc55cd7e6ec1ea45810ffbbdc6f45eaa2a503ce808d620003847014e8cc6d2a8f0
diff --git a/media-plugins/vdr-graphtft/files/vdr-graphtft-0.3.6_gcc-4.4.x.diff b/media-plugins/vdr-graphtft/files/vdr-graphtft-0.3.6_gcc-4.4.x.diff
new file mode 100644
index 000000000000..4e32c187ac10
--- /dev/null
+++ b/media-plugins/vdr-graphtft/files/vdr-graphtft-0.3.6_gcc-4.4.x.diff
@@ -0,0 +1,22 @@
+diff -Naur graphtft-30.orig/graphtft-fe/common.cc graphtft-30/graphtft-fe/common.cc
+--- graphtft-30.orig/graphtft-fe/common.cc	2012-03-12 02:10:38.000000000 +0100
++++ graphtft-30/graphtft-fe/common.cc	2012-03-12 02:30:16.000000000 +0100
+@@ -11,6 +11,7 @@
+ #include <time.h>
+ #include <stdio.h>
+ #include <string.h>
++#include <stdint.h>
+ 
+ #include <graphtft.hpp>
+ 
+diff -Naur graphtft-30.orig/graphtft-fe/graphtft.hpp graphtft-30/graphtft-fe/graphtft.hpp
+--- graphtft-30.orig/graphtft-fe/graphtft.hpp	2012-03-12 02:10:38.000000000 +0100
++++ graphtft-30/graphtft-fe/graphtft.hpp	2012-03-12 02:30:57.000000000 +0100
+@@ -16,6 +16,7 @@
+ #include <X11/Xlib.h>
+ #include <Imlib2.h>
+ #include <string.h>
++#include <stdint.h>
+ 
+ #define __FRONTEND
+ #include <../common.h>
diff --git a/media-plugins/vdr-graphtft/files/vdr-graphtft-0.3.6_gentoo.diff b/media-plugins/vdr-graphtft/files/vdr-graphtft-0.3.6_gentoo.diff
new file mode 100644
index 000000000000..ea0e7ad3d748
--- /dev/null
+++ b/media-plugins/vdr-graphtft/files/vdr-graphtft-0.3.6_gentoo.diff
@@ -0,0 +1,139 @@
+diff -Naur graphtft-30.orig/dfbrenderer/dfbrenderer.c graphtft-30/dfbrenderer/dfbrenderer.c
+--- graphtft-30.orig/dfbrenderer/dfbrenderer.c	2012-03-12 03:27:38.000000000 +0100
++++ graphtft-30/dfbrenderer/dfbrenderer.c	2012-03-12 03:29:35.000000000 +0100
+@@ -257,7 +257,7 @@
+       {
+          // make path relative to the themes directory
+ 
+-         asprintf(&path, "%s/graphTFT/themes/%s/%s", 
++         asprintf(&path, "%s/themes/%s/%s", 
+                   confPath.c_str(), themePath.c_str(), p.c_str());
+       }
+       else
+@@ -281,7 +281,7 @@
+    
+    // at least add the default path
+ 
+-   asprintf(&path, "%s/graphTFT/fonts/", confPath.c_str());
++   asprintf(&path, "%s/fonts/", confPath.c_str());
+    tell(0, "Info: Adding font path '%s'", path);
+    fontPaths[count] = path;
+    free(path);
+@@ -483,7 +483,7 @@
+    else
+    {
+       const char* tmp = themePath.c_str();
+-      asprintf(&fpath, "%s/graphTFT/themes/%s/%s", confPath.c_str(), tmp, fname);
++      asprintf(&fpath, "%s/themes/%s/%s", confPath.c_str(), tmp, fname);
+    }
+ 
+    tell(4,"creating imageprovider for %s", fpath);
+@@ -561,7 +561,7 @@
+    else
+    {
+       const char* tmp = themePath.c_str();
+-      asprintf(&fpath, "%s/graphTFT/themes/%s/%s", confPath.c_str(), tmp, fname);
++      asprintf(&fpath, "%s/themes/%s/%s", confPath.c_str(), tmp, fname);
+    }
+ 
+    tell(4,"creating imageprovider for %s", fpath);
+diff -Naur graphtft-30.orig/dspitems.c graphtft-30/dspitems.c
+--- graphtft-30.orig/dspitems.c	2012-03-12 03:27:38.000000000 +0100
++++ graphtft-30/dspitems.c	2012-03-12 03:30:16.000000000 +0100
+@@ -107,7 +107,7 @@
+       if (p[0] != '/')
+       {
+          p = string(GraphTFTSetup.PluginConfPath) 
+-            + "/graphTFT/themes/" 
++            + "/themes/" 
+             + string(Thms::theTheme->getDir()) 
+             + "/" + p;
+       }
+diff -Naur graphtft-30.orig/graphtft.c graphtft-30/graphtft.c
+--- graphtft-30.orig/graphtft.c	2012-03-12 03:27:38.000000000 +0100
++++ graphtft-30/graphtft.c	2012-03-12 03:32:48.000000000 +0100
+@@ -22,6 +22,8 @@
+ #include <graphtft.h>
+ #include <span.h>
+ 
++#define DATA_DIR "/usr/share/vdr/graphTFT"
++
+ //***************************************************************************
+ // cGraphTFTMenu
+ //***************************************************************************
+@@ -300,13 +302,13 @@
+ 
+    // try to get the config dir
+ 
+-   if (!ConfigDirectory())
+-      return false;
++//   if (!ConfigDirectory())
++//      return false;
+ 
+    // init 
+ 
+    GraphTFTSetup.setClient(this);
+-   GraphTFTSetup.PluginConfPath = strdup(ConfigDirectory());
++   GraphTFTSetup.PluginConfPath = strdup(DATA_DIR);
+ 
+ #if APIVERSNUM < 10507
+    RegisterI18n(Phrases);
+@@ -322,7 +324,7 @@
+    if (loadThemes() != 0)
+       return false;
+ 
+-   if (display->Init(_dev, ConfigDirectory(), port) != success)
++   if (display->Init(_dev, DATA_DIR, port) != success)
+    {
+       tell(0, "Error: Initializing graphTFT device faild, aborting!");
+ 
+@@ -355,8 +357,8 @@
+ 
+    // look for the themes in the config directory
+ 
+-   asprintf(&buffer, "find %s/graphTFT/themes -follow -type f -name '*.theme' | sort", 
+-            ConfigDirectory());
++   asprintf(&buffer, "find %s/themes -follow -type f -name '*.theme' | sort", 
++            DATA_DIR);
+ 
+    p = popen(buffer, "r");
+ 
+diff -Naur graphtft-30.orig/imlibrenderer/imlibrenderer.c graphtft-30/imlibrenderer/imlibrenderer.c
+--- graphtft-30.orig/imlibrenderer/imlibrenderer.c	2012-03-12 03:27:38.000000000 +0100
++++ graphtft-30/imlibrenderer/imlibrenderer.c	2012-03-12 03:33:54.000000000 +0100
+@@ -123,7 +123,7 @@
+       {
+          // make path relative to the themes directory
+ 
+-         asprintf(&path, "%s/graphTFT/themes/%s/%s", 
++         asprintf(&path, "%s/themes/%s/%s", 
+                   confPath.c_str(), themePath.c_str(), p.c_str());
+       }
+       else
+@@ -146,7 +146,7 @@
+    
+    // at least add the default path
+ 
+-   asprintf(&path, "%s/graphTFT/fonts/", confPath.c_str());
++   asprintf(&path, "%s/fonts/", confPath.c_str());
+    tell(0, "Info: Adding font path '%s'", path);
+    imlib_add_path_to_font_path(path);
+    free(path);
+@@ -217,7 +217,7 @@
+    if (fname[0] == '/')
+       path << fname;
+    else
+-      path << confPath << "/graphTFT/themes/" << themePath << "/" << fname; 
++      path << confPath << "/themes/" << themePath << "/" << fname; 
+ 
+    if (!fileExists(path.str().c_str()))
+    { 
+@@ -291,7 +291,7 @@
+    if (fname[0] == '/')
+       path << fname;
+    else
+-      path << confPath << "/graphTFT/themes/" << themePath << "/" << fname; 
++      path << confPath << "/themes/" << themePath << "/" << fname; 
+ 
+    if (!fileExists(path.str().c_str()))
+    { 
diff --git a/media-plugins/vdr-graphtft/files/vdr-graphtft-0.3.6_makefile.diff b/media-plugins/vdr-graphtft/files/vdr-graphtft-0.3.6_makefile.diff
new file mode 100644
index 000000000000..f638be630069
--- /dev/null
+++ b/media-plugins/vdr-graphtft/files/vdr-graphtft-0.3.6_makefile.diff
@@ -0,0 +1,67 @@
+Joerg Bornkessel <hd_brummy@g.o> 22 Okt 2009
+Matthias Schwarzott <zzam@g.o> 23 Okt 2009
+diff -Naur graphtft-24.orig/Makefile graphtft-24/Makefile
+--- graphtft-24.orig/Makefile	2009-10-21 21:53:56.000000000 +0200
++++ graphtft-24/Makefile	2009-10-21 21:57:24.000000000 +0200
+@@ -158,10 +158,10 @@
+ DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
+ 
+ ifdef HAVE_IMLIB
+-  LIBS += `imlib2-config --libs`
++  LIBS += $(shell imlib2-config --libs)
+ 
+   ifdef HAVE_IMAGE_MAGICK
+-    LIBS += `Magick++-config --libs`
++    LIBS += $(shell Magick++-config --libs)
+     DEFINES += -DHAVE_IMAGE_MAGICK
+   endif
+ 
+@@ -170,8 +170,8 @@
+ endif
+ 
+ ifdef HAVE_GTOP
+-  GTOP_INC = `pkg-config libgtop-2.0 --cflags`
+-  GTOP_LIB = `pkg-config libgtop-2.0 --libs`
++  GTOP_INC = $(shell pkg-config libgtop-2.0 --cflags)
++  GTOP_LIB = $(shell pkg-config libgtop-2.0 --libs)
+ 
+   DEFINES += -DWITH_SYSINFO
+   LIBS += $(GTOP_LIB)
+@@ -186,8 +186,8 @@
+ endif
+ 
+ ifdef HAVE_DFB
+-  INCLUDES += `directfb-config --cflags`
+-  LIBS += `directfb-config --libs`
++  INCLUDES += $(shell directfb-config --cflags)
++  LIBS += $(shell directfb-config --libs)
+   DEFINES += -DHAVE_DFB
+ endif
+ 
+diff -Naur graphtft-24.orig/graphtft-fe/Makefile graphtft-24/graphtft-fe/Makefile
+--- graphtft-24.orig/graphtft-fe/Makefile	2009-10-22 17:39:55.000000000 +0200
++++ graphtft-24/graphtft-fe/Makefile	2009-10-22 17:41:29.000000000 +0200
+@@ -1,9 +1,9 @@
+ 
+ CXX           = g++
+ CXXFLAGS      = -pipe -ggdb -O2 -Wall -W -D_REENTRANT -fPIC
+-INCPATH       = -I. `Magick++-config --cppflags`
++INCPATH       = -I. $(shell Magick++-config --cppflags)
+ LFLAGS        = -Wl,--no-undefined
+-LIBS          = -lpthread `imlib2-config --libs` `Magick++-config --libs`
++LIBS          = -lpthread $(shell imlib2-config --libs) $(shell Magick++-config --libs)
+ AR            = ar
+ 
+ TARGET = graphtft-fe
+diff -Naur graphtft-24.orig/graphtft-fe/Makefile graphtft-24/graphtft-fe/Makefile
+--- graphtft-24.orig/graphtft-fe/Makefile	2009-10-23 16:20:43.000000000 +0200
++++ graphtft-24/graphtft-fe/Makefile	2009-10-23 16:21:20.000000000 +0200
+@@ -17,7 +17,7 @@
+ 
+ all: 
+ 	echo Build graphTFT Frontend
+-	@(make $(TARGET))
++	@$(MAKE) $(TARGET)
+ 
+ 
+ $(TARGET): $(OBJECTS)
diff --git a/media-plugins/vdr-graphtft/vdr-graphtft-0.3.6.ebuild b/media-plugins/vdr-graphtft/vdr-graphtft-0.3.6.ebuild
new file mode 100644
index 000000000000..4f0c4e47c1c2
--- /dev/null
+++ b/media-plugins/vdr-graphtft/vdr-graphtft-0.3.6.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-graphtft/vdr-graphtft-0.3.6.ebuild,v 1.1 2012/10/20 17:46:20 hd_brummy Exp $
+
+EAPI="4"
+
+inherit vdr-plugin-2 flag-o-matic
+
+RESTRICT="test"
+
+DESCRIPTION="VDR plugin: GraphTFT"
+HOMEPAGE="http://www.vdr-wiki.de/wiki/index.php/Graphtft-plugin"
+SRC_URI="http://www.jwendel.de/vdr/${P}.tar.bz2"
+
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+LICENSE="GPL-2 LGPL-2.1"
+
+IUSE_THEMES="+theme_deepblue theme_avp theme_deeppurple theme_poetter"
+IUSE="${IUSE_THEMES} directfb graphtft-fe imagemagick touchscreen"
+
+DEPEND=">=media-video/vdr-1.6.0_p2-r1[graphtft]
+		media-libs/imlib2[png,jpeg]
+		gnome-base/libgtop
+		>=virtual/ffmpeg-0.4.8_p20090201
+		imagemagick? ( media-gfx/imagemagick[png,jpeg,cxx] )
+		directfb? ( dev-libs/DirectFB )
+		graphtft-fe? ( media-libs/imlib2[png,jpeg,X] )"
+
+RDEPEND="${DEPEND}"
+
+PDEPEND="theme_deepblue? ( =x11-themes/vdrgraphtft-deepblue-0.3.1 )
+		theme_avp? ( =x11-themes/vdrgraphtft-avp-0.3.1 )
+		theme_deeppurple? ( =x11-themes/vdrgraphtft-deeppurple-0.3.2 )
+		theme_poetter? ( =x11-themes/vdrgraphtft-poetter-0.3.2 )"
+
+PATCHES=("${FILESDIR}/${P}_gentoo.diff"
+		"${FILESDIR}/${P}_makefile.diff"
+		"${FILESDIR}/${P}_gcc-4.4.x.diff")
+
+src_prepare() {
+
+	sed -i Makefile -e "s:  WITH_X_COMM = 1:#WITH_X_COMM = 1:"
+
+	! use touchscreen && sed -i Makefile  \
+		-e "s:WITH_TOUCH = 1:#WITH_TOUCH = 1:"
+
+	use graphtft-fe && sed -i Makefile \
+		-e "s:#WITH_X_COMM:WITH_X_COMM:"
+
+	vdr-plugin-2_src_prepare
+
+	remove_i18n_include graphtft.h setup.h
+
+	# UINT64_C is needed by ffmpeg headers
+	append-cxxflags -D__STDC_CONSTANT_MACROS
+}
+
+src_compile() {
+	vdr-plugin-2_src_compile
+
+	if use graphtft-fe; then
+		cd "${S}"/graphtft-fe
+		emake
+	fi
+}
+
+src_install() {
+	vdr-plugin-2_src_install
+
+	dodoc "${S}"/documents/{README,HISTORY,HOWTO.Themes,INSTALL}
+
+	if use graphtft-fe; then
+		cd "${S}"/graphtft-fe && dobin graphtft-fe
+		doinit graphtft-fe
+	fi
+}
+
+pkg_postinst() {
+	vdr-plugin-2_pkg_postinst
+
+	if use graphtft-fe; then
+		echo
+		elog "Graphtft-fe user:"
+		elog "Edit /etc/conf.d/vdr.graphtft"
+		elog "/etc/init.d/graphtft-fe start"
+		echo
+	fi
+}
diff --git a/media-plugins/vdr-osdpip/Manifest b/media-plugins/vdr-osdpip/Manifest
index 0d9dc09cde9d..5c6f66a80cbb 100644
--- a/media-plugins/vdr-osdpip/Manifest
+++ b/media-plugins/vdr-osdpip/Manifest
@@ -1,3 +1 @@
-DIST vdr-osdpip-0.0.10.tgz 32703 RMD160 70e2fbffd15ea4d0b1b8899cbf27d93c5591751f SHA1 1a4d02236dd021d522a32e2d9863e4d6950f7ad7 SHA256 b324f99d178c30dc13b56d522998dd666eafa2f65a67c90d6221fe8e4058e378
-DIST vdr-osdpip-0.1.0.tgz 52090 RMD160 e49cf4cf85541cca02f60dc01b4cc62eb2b06554 SHA1 e91e40c94ea1fade4072c76a21f08997766c68d3 SHA256 40f5e8acc57c82d922b0a415bb0f12ac3cb68c014f9bafd090b71ded6a25a821
-DIST vdr-osdpip-0.1.1.tgz 53272 RMD160 eee8eaeefcdf4f5b47d6dd2aff993a50156440c1 SHA1 b2b18746abf30bf3e8fe0bdca21a793057f7a3af SHA256 777f5fd9abbfbf43227c78eb2b363d3bdade2b368425ed78caa836d4c38bfef4
+DIST vdr-osdpip-0.1.1.tgz 53272 SHA256 777f5fd9abbfbf43227c78eb2b363d3bdade2b368425ed78caa836d4c38bfef4 SHA512 176243cf8512abad764e3a35b7fb04dc023179c7b405596adbba36e8116831e9ff562f127d822a52d261576e2a166929af58852c6bff523c9796c22f93226420 WHIRLPOOL 25409c2d4e5b64dd9c8bbd9b3e389647810d710673891aecae80418b14775a10cadc117e0f63c32d46972d5b88ebad6207dc1a449654f319533661f1dc75a271
diff --git a/media-plugins/vdr-osdpip/files/vdr-osdpip-0.0.10-avutil50.patch b/media-plugins/vdr-osdpip/files/vdr-osdpip-0.0.10-avutil50.patch
deleted file mode 100644
index 822957030442..000000000000
--- a/media-plugins/vdr-osdpip/files/vdr-osdpip-0.0.10-avutil50.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Index: osdpip-0.0.10/decoder.c
-===================================================================
---- osdpip-0.0.10.orig/decoder.c
-+++ osdpip-0.0.10/decoder.c
-@@ -27,10 +27,10 @@ int cDecoder::Open()
-     }
-     m_PicDecoded = avcodec_alloc_frame();
-     m_PicResample = avcodec_alloc_frame();
--    m_BufferResample = new unsigned char[400 * 300 * 4]; // size for RGBA32
-+    m_BufferResample = new unsigned char[400 * 300 * 4]; // size for RGB32
- #ifndef USE_SWSCALE
-     m_PicConvert = avcodec_alloc_frame();
--    m_BufferConvert = new unsigned char[400 * 300 * 4]; // size for RGBA32
-+    m_BufferConvert = new unsigned char[400 * 300 * 4]; // size for RGB32
- #endif
- 
-     return 0;
-@@ -82,14 +82,14 @@ int cDecoder::Resample(int width, int he
-     context = sws_getContext(m_Context->width - (OsdPipSetup.CropLeft + OsdPipSetup.CropRight),
-                              m_Context->height - (OsdPipSetup.CropTop + OsdPipSetup.CropBottom),
-                              PIX_FMT_YUV420P,
--                             m_Width, m_Height, ConvertToRGB ? PIX_FMT_RGBA32 : PIX_FMT_YUV420P,
-+                             m_Width, m_Height, ConvertToRGB ? PIX_FMT_RGB32 : PIX_FMT_YUV420P,
-                              SWS_LANCZOS, NULL, NULL, NULL);
-     if (!context) {
-         printf("Error initializing scale context.\n");
-         return -1;
-     }
-     avpicture_fill((AVPicture *) m_PicResample, m_BufferResample,
--                   ConvertToRGB ? PIX_FMT_RGBA32 : PIX_FMT_YUV420P,
-+                   ConvertToRGB ? PIX_FMT_RGB32 : PIX_FMT_YUV420P,
-                    m_Width, m_Height);
-     sws_scale(context, pic_crop.data, pic_crop.linesize,
-               0, m_Context->height - (OsdPipSetup.CropTop + OsdPipSetup.CropBottom),
-@@ -121,8 +121,8 @@ int cDecoder::Resample(int width, int he
-     if (ConvertToRGB)
-     {
-         avpicture_fill((AVPicture *) m_PicConvert, m_BufferConvert,
--                PIX_FMT_RGBA32, m_Width, m_Height);
--        img_convert((AVPicture *) m_PicConvert, PIX_FMT_RGBA32,
-+                PIX_FMT_RGB32, m_Width, m_Height);
-+        img_convert((AVPicture *) m_PicConvert, PIX_FMT_RGB32,
-                 (AVPicture *) m_PicResample, PIX_FMT_YUV420P,
-                 m_Width, m_Height);
-     }
diff --git a/media-plugins/vdr-osdpip/vdr-osdpip-0.0.10.ebuild b/media-plugins/vdr-osdpip/vdr-osdpip-0.0.10.ebuild
deleted file mode 100644
index e1a5c95dfc76..000000000000
--- a/media-plugins/vdr-osdpip/vdr-osdpip-0.0.10.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-osdpip/vdr-osdpip-0.0.10.ebuild,v 1.5 2011/04/06 17:16:53 idl0r Exp $
-
-inherit vdr-plugin flag-o-matic
-
-DESCRIPTION="VDR plugin: Show another channel in the OSD"
-HOMEPAGE="http://www.magoa.net/linux"
-SRC_URI="http://home.arcor.de/andreas.regel/files/osdpip/${P}.tgz"
-
-KEYWORDS="~amd64 x86"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE=""
-
-DEPEND=">=media-video/vdr-1.4.0
-	>=media-libs/libmpeg2-0.4.0
-	>=virtual/ffmpeg-0.4.9"
-RDEPEND="${DEPEND}"
-
-#PATCHES=("${FILESDIR}/${P}-vdr-1.5.0.diff")
-PATCHES=( "${FILESDIR}/${P}-avutil50.patch" )
-
-src_unpack() {
-	vdr-plugin_src_unpack
-
-	sed -i Makefile \
-	  -e 's+^FFMDIR.*$+FFMDIR = /usr/include/ffmpeg+' \
-	  -e 's+-I\$(FFMDIR)/libavcodec+-I$(FFMDIR)+' \
-	  -e 's+-L\$(FFMDIR)/libavcodec++'
-
-	if has_version ">=virtual/ffmpeg-0.4.9_p20080326" ; then
-		#epatch "${FILESDIR}/${P}-ffmpeg-0.4.9_p20080326-new_header.diff"
-		sed -i Makefile -e 's/#WITH_NEW_FFMPEG_HEADERS/WITH_NEW_FFMPEG_HEADERS/'
-	fi
-	# UINT64_C is needed by ffmpeg headers
-	append-flags -D__STDC_CONSTANT_MACROS
-}
diff --git a/media-plugins/vdr-osdpip/vdr-osdpip-0.1.0.ebuild b/media-plugins/vdr-osdpip/vdr-osdpip-0.1.1-r1.ebuild
similarity index 65%
rename from media-plugins/vdr-osdpip/vdr-osdpip-0.1.0.ebuild
rename to media-plugins/vdr-osdpip/vdr-osdpip-0.1.1-r1.ebuild
index 70cd4e979218..b82ad4783a05 100644
--- a/media-plugins/vdr-osdpip/vdr-osdpip-0.1.0.ebuild
+++ b/media-plugins/vdr-osdpip/vdr-osdpip-0.1.1-r1.ebuild
@@ -1,14 +1,16 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-osdpip/vdr-osdpip-0.1.0.ebuild,v 1.2 2012/02/21 22:58:26 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-osdpip/vdr-osdpip-0.1.1-r1.ebuild,v 1.1 2012/10/20 18:02:23 hd_brummy Exp $
 
-EAPI=3
+EAPI="4"
 
-inherit vdr-plugin flag-o-matic
+VERSION="880" # every bump, new version
+
+inherit vdr-plugin-2 flag-o-matic
 
 DESCRIPTION="VDR plugin: Show another channel in the OSD"
 HOMEPAGE="http://projects.vdr-developer.org/projects/plg-osdpip"
-SRC_URI="mirror://vdr-developerorg/download/267/${P}.tgz"
+SRC_URI="mirror://vdr-developerorg/${VERSION}/${P}.tgz"
 
 KEYWORDS="~amd64 ~x86"
 SLOT="0"
@@ -21,8 +23,8 @@ DEPEND=">=media-video/vdr-1.6.0_p2-r5
 RDEPEND="${DEPEND}"
 
 src_prepare() {
-	vdr-plugin_src_prepare
+	vdr-plugin-2_src_prepare
 
 	# UINT64_C is needed by ffmpeg headers
-	append-flags -D__STDC_CONSTANT_MACROS
+	append-cxxflags -D__STDC_CONSTANT_MACROS
 }
diff --git a/media-tv/me-tv/Manifest b/media-tv/me-tv/Manifest
new file mode 100644
index 000000000000..b64babaa8aab
--- /dev/null
+++ b/media-tv/me-tv/Manifest
@@ -0,0 +1 @@
+DIST me-tv-1.4.0.10.tar.gz 549653 SHA256 a0ee03feb3271c5cd68e5d36f938d2f967db462d28627d39b1d57be60b02f38c SHA512 98988a343f900c6b7a276ada47025f9a703a490eb499f3aad9fb7163c73113061dc205a29b454f06e817ef24d44ae58981fd5a19dfb0a48be669394e91bd5ee8 WHIRLPOOL 8f263ed8ed1dec94b67d607052ce04f2c2d62607d8fdddf1703888905512a9ced76372c81dd210552b3df512adb6b4876e131bf2d288b51444775edbe28ce119
diff --git a/media-tv/me-tv/me-tv-1.4.0.10.ebuild b/media-tv/me-tv/me-tv-1.4.0.10.ebuild
new file mode 100644
index 000000000000..5bd5ed080ff8
--- /dev/null
+++ b/media-tv/me-tv/me-tv-1.4.0.10.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-tv/me-tv/me-tv-1.4.0.10.ebuild,v 1.1 2012/10/21 15:30:03 lordvan Exp $
+
+EAPI="4"
+
+inherit eutils versionator autotools gnome2
+
+DESCRIPTION="Me TV is a GTK desktop application for watching digital television."
+HOMEPAGE="http://me-tv.sourceforge.net/"
+SRC_URI="http://launchpad.net/${PN}/$(get_version_component_range 1-2)/$(get_version_component_range 1-3)/+download/${P}.tar.gz"
+RESTRICT="mirror"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE="http"
+RDEPEND=">=dev-cpp/gconfmm-2.6
+	dev-cpp/gtkmm:2.4
+	dev-cpp/libxmlpp:2.6
+	dev-libs/libunique:1
+	>=dev-libs/dbus-glib-0.92
+	net-libs/gnet:2
+	=dev-db/sqlite-3*
+	>=media-video/vlc-1.1.8
+	media-libs/gstreamer:0.10
+	media-plugins/gst-plugins-xvideo:0.10
+	media-libs/gst-plugins-base:0.10"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	eautoreconf
+}
+
+src_install() {
+	gnome2_src_install
+	if use http; then
+		dodoc -r http/
+	fi
+}
+
+pkg_postinst() {
+	if use http; then
+		elog "The HTTP server port, .. are hardcoded"
+	fi
+	elog "Please note that Version 1.4 has a new DB so you"
+	elog "have to re-import your channels."
+}
diff --git a/media-tv/me-tv/metadata.xml b/media-tv/me-tv/metadata.xml
new file mode 100644
index 000000000000..e36b2841ccad
--- /dev/null
+++ b/media-tv/me-tv/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>media-tv</herd>
+  <maintainer>
+    <email>lordvan@gentoo.org</email>
+    <name>Thomas Raschbacher</name>
+  </maintainer>
+  <longdescription>Me TV is a GTK desktop application for watching digital television services that use the DVB standard.
+
+Me TV works with DVB-T, DVB-S, DVB-C and ATSC devices that are supported by Linux kernel drivers.</longdescription>
+  <use>
+    <flag name="http">Installation of Web-frontend</flag>
+  </use>
+</pkgmetadata>
diff --git a/media-video/parole/Manifest b/media-video/parole/Manifest
index b387e775ddda..ddd8de2a4642 100644
--- a/media-video/parole/Manifest
+++ b/media-video/parole/Manifest
@@ -1,4 +1,2 @@
 DIST parole-0.2.0.6.tar.bz2 652946 SHA256 1bfcb6ca34eb496bc08ce3ac803a20b4fea566bddca4ce4400d3edf7b25804b6 SHA512 7cfa55f6044416df86628f44fe0696c1753d4bce04b42ad44963d3d6387c6a239f3055f7ae2bdb2e2b37ed737558ff2ba386cba32f9cbe0903ccfbee7e61e30e WHIRLPOOL 455fa0179c715499c63f895c42508c3296ef8e54435aa14d5ed281d3be3acaba28bc24340c3a2022908dba2d2e7026719427d4b374dc2ba17a7a8bc7a987ecfb
-DIST parole-0.2.90_pre20120720.tar.bz2 605272 SHA256 2498f8d2b9613923bbafedcb870f828d33796118e7f1776ec00135f365142927 SHA512 6315f9c05d2e10ec198c49d4e208cc5f0c49752daf9a4781201108cb48a906bce3bbe827c1423e4b373a0b4ef384b52d3c859b729f4cac7e906e982ceaff07c3 WHIRLPOOL 77c0ca901d7dc5b272c356f1ad98d75ca8b3e30495d7e2633a269df334d4b0cffbdf922245806cd973f4f38cfb0ddb88864977e93bbbb7c6a8a219f71e1ddd63
 DIST parole-0.3.0.3.tar.bz2 622735 SHA256 e02925a51321f6e413d608d36aa1a886d78938967664c178386c4c618e883661 SHA512 ea079a07f5ae713d0dcf0b0d00fb62383db05983650192891bf767fe5dda0d76f808ae763e795978da68e4981cc34bf772fc1aaf6c4f940f484de296a4b11438 WHIRLPOOL 5f940a00cfb3037b18e93b80a255d7f7d132b6e7d4bc2b52191296b5d78a762ca1c7f06cb5815ba896915daff2b80d4e30c7da5bb8294c6229b625cfc6db9674
-DIST parole-0.3.0.tar.bz2 620227 SHA256 4e96524bfbfaa8f81f3a6e655edb0ce58d62543531609ba10cffdf2dc894a840 SHA512 13cb9158b8dddc391a943bc09f99c45d3d5e0f665cc8963e3a013b145b0b06668ca05d1d0ad43ad4bfeca95f7de553038a00accaafe7077d9fbf768a60800118 WHIRLPOOL 9fad273888a92951a84ec343f20ac8c8b4bdb54b6f7c0aa3786a60fcd88771ff6362ed4720d8c01d3852a68d34d62d8cc277a9a0b10606b8005ac6386197a0e4
diff --git a/media-video/parole/parole-0.2.90_pre20120720.ebuild b/media-video/parole/parole-0.2.90_pre20120720.ebuild
deleted file mode 100644
index 26ff7feb316d..000000000000
--- a/media-video/parole/parole-0.2.90_pre20120720.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/parole/parole-0.2.90_pre20120720.ebuild,v 1.2 2012/07/23 22:47:11 blueness Exp $
-
-EAPI=4
-inherit xfconf
-
-DESCRIPTION="a simple media player based on the GStreamer framework for the Xfce4 desktop"
-HOMEPAGE="http://goodies.xfce.org/projects/applications/parole/"
-SRC_URI="http://dev.gentoo.org/~angelos/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~mips ~x86"
-IUSE="debug libnotify taglib"
-
-COMMON_DEPEND=">=x11-libs/gtk+-2.16:2
-	>=dev-libs/glib-2.16:2
-	>=xfce-base/libxfce4util-4.8
-	>=xfce-base/libxfce4ui-4.8
-	>=dev-libs/dbus-glib-0.88
-	>=media-libs/gstreamer-0.10.11:0.10
-	>=media-libs/gst-plugins-base-0.10.11:0.10
-	libnotify? ( >=x11-libs/libnotify-0.4.5 )
-	taglib? ( >=media-libs/taglib-1.4 )"
-RDEPEND="${COMMON_DEPEND}
-	media-plugins/gst-plugins-meta:0.10"
-DEPEND="${COMMON_DEPEND}
-	dev-util/intltool
-	virtual/pkgconfig
-	x11-proto/xproto"
-
-pkg_setup() {
-	XFCONF=(
-		$(use_enable libnotify)
-		$(use_enable taglib)
-		$(xfconf_use_debug)
-		)
-
-	DOCS=( AUTHORS ChangeLog README THANKS TODO )
-}
diff --git a/media-video/parole/parole-0.3.0.ebuild b/media-video/parole/parole-0.3.0.ebuild
deleted file mode 100644
index 07fef36524fa..000000000000
--- a/media-video/parole/parole-0.3.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/parole/parole-0.3.0.ebuild,v 1.1 2012/08/09 20:18:36 angelos Exp $
-
-EAPI=4
-inherit xfconf
-
-DESCRIPTION="a simple media player based on the GStreamer framework for the Xfce4 desktop"
-HOMEPAGE="http://goodies.xfce.org/projects/applications/parole/"
-SRC_URI="mirror://xfce/src/apps/${PN}/0.3/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~mips ~x86"
-IUSE="debug libnotify taglib"
-
-COMMON_DEPEND=">=x11-libs/gtk+-2.20:2
-	>=dev-libs/glib-2.24:2
-	>=xfce-base/libxfce4util-4.8
-	>=xfce-base/libxfce4ui-4.8
-	>=dev-libs/dbus-glib-0.88
-	>=media-libs/gstreamer-0.10.11:0.10
-	>=media-libs/gst-plugins-base-0.10.11:0.10
-	libnotify? ( >=x11-libs/libnotify-0.4.5 )
-	taglib? ( >=media-libs/taglib-1.4 )"
-RDEPEND="${COMMON_DEPEND}
-	media-plugins/gst-plugins-meta:0.10"
-DEPEND="${COMMON_DEPEND}
-	dev-util/intltool
-	virtual/pkgconfig
-	x11-proto/xproto"
-
-pkg_setup() {
-	XFCONF=(
-		$(use_enable libnotify)
-		$(use_enable taglib)
-		$(xfconf_use_debug)
-		)
-
-	DOCS=( AUTHORS ChangeLog README THANKS TODO )
-}
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index ef26a7f0dd67..e7e454b0b8d1 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Sat, 20 Oct 2012 17:37:00 +0000
+Sun, 21 Oct 2012 16:07:01 +0000
diff --git a/metadata/glsa/glsa-201210-07.xml b/metadata/glsa/glsa-201210-07.xml
new file mode 100644
index 000000000000..4eed61b02c4e
--- /dev/null
+++ b/metadata/glsa/glsa-201210-07.xml
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet href="/xsl/glsa.xsl" type="text/xsl"?>
+<?xml-stylesheet href="/xsl/guide.xsl" type="text/xsl"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="201210-07">
+  <title>Chromium: Multiple vulnerabilities</title>
+  <synopsis>Multiple vulnerabilities have been reported in Chromium, some of
+    which may allow execution of arbitrary code.
+  </synopsis>
+  <product type="ebuild">chromium</product>
+  <announced>October 21, 2012</announced>
+  <revised>October 21, 2012: 1</revised>
+  <bug>433551</bug>
+  <bug>436234</bug>
+  <bug>437664</bug>
+  <bug>437984</bug>
+  <access>remote</access>
+  <affected>
+    <package name="www-client/chromium" auto="yes" arch="*">
+      <unaffected range="ge">22.0.1229.94</unaffected>
+      <vulnerable range="lt">22.0.1229.94</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>Chromium is an open source web browser project.</p>
+  </background>
+  <description>
+    <p>Multiple vulnerabilities have been discovered in Chromium. Please review
+      the CVE identifiers and release notes referenced below for details.
+    </p>
+  </description>
+  <impact type="normal">
+    <p>A remote attacker could entice a user to open a specially crafted web
+      site using Chromium, possibly resulting in the execution of arbitrary
+      code with the privileges of the process, arbitrary file write, a Denial
+      of Service condition, Cross-Site Scripting in SSL interstitial and
+      various Universal Cross-Site Scripting attacks.
+    </p>
+  </impact>
+  <workaround>
+    <p>There is no known workaround at this time.</p>
+  </workaround>
+  <resolution>
+    <p>All Chromium users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose
+      "&gt;=www-client/chromium-22.0.1229.94"
+    </code>
+  </resolution>
+  <references>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2012-2859">CVE-2012-2859</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2012-2860">CVE-2012-2860</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2012-2865">CVE-2012-2865</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2012-2866">CVE-2012-2866</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2012-2867">CVE-2012-2867</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2012-2868">CVE-2012-2868</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2012-2869">CVE-2012-2869</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2012-2872">CVE-2012-2872</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2012-2874">CVE-2012-2874</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2012-2876">CVE-2012-2876</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2012-2877">CVE-2012-2877</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2012-2878">CVE-2012-2878</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2012-2879">CVE-2012-2879</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2012-2880">CVE-2012-2880</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2012-2881">CVE-2012-2881</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2012-2882">CVE-2012-2882</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2012-2883">CVE-2012-2883</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2012-2884">CVE-2012-2884</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2012-2885">CVE-2012-2885</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2012-2886">CVE-2012-2886</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2012-2887">CVE-2012-2887</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2012-2888">CVE-2012-2888</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2012-2889">CVE-2012-2889</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2012-2891">CVE-2012-2891</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2012-2892">CVE-2012-2892</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2012-2894">CVE-2012-2894</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2012-2896">CVE-2012-2896</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2012-2900">CVE-2012-2900</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2012-5108">CVE-2012-5108</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2012-5110">CVE-2012-5110</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2012-5111">CVE-2012-5111</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2012-5112">CVE-2012-5112</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2012-5376">CVE-2012-5376</uri>
+    <uri link="http://googlechromereleases.blogspot.com/2012/08/stable-channel-update_30.html">
+      Release Notes 21.0.1180.89
+    </uri>
+    <uri link="http://googlechromereleases.blogspot.com/2012/09/stable-channel-update_25.html">
+      Release Notes 22.0.1229.79
+    </uri>
+    <uri link="http://googlechromereleases.blogspot.com/2012/10/stable-channel-update.html">
+      Release Notes 22.0.1229.92
+    </uri>
+    <uri link="http://googlechromereleases.blogspot.com/2012/10/stable-channel-update_6105.html">
+      Release Notes 22.0.1229.94
+    </uri>
+  </references>
+  <metadata tag="requester" timestamp="Thu, 06 Sep 2012 13:01:44 +0000">
+    phajdan.jr
+  </metadata>
+  <metadata tag="submitter" timestamp="Sun, 21 Oct 2012 15:03:00 +0000">
+    phajdan.jr
+  </metadata>
+</glsa>
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index ef26a7f0dd67..e7e454b0b8d1 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Sat, 20 Oct 2012 17:37:00 +0000
+Sun, 21 Oct 2012 16:07:01 +0000
diff --git a/metadata/md5-cache/app-admin/ansible-0.7 b/metadata/md5-cache/app-admin/ansible-0.7.1
similarity index 82%
rename from metadata/md5-cache/app-admin/ansible-0.7
rename to metadata/md5-cache/app-admin/ansible-0.7.1
index 3bd4063f5560..821f1cb62aea 100644
--- a/metadata/md5-cache/app-admin/ansible-0.7
+++ b/metadata/md5-cache/app-admin/ansible-0.7.1
@@ -2,13 +2,13 @@ DEFINED_PHASES=compile install postinst postrm prepare setup
 DEPEND=dev-lang/python
 DESCRIPTION=Radically simple deployment, model-driven configuration management, and command execution framework
 EAPI=4
-HOMEPAGE=http://ansible.github.com/
+HOMEPAGE=http://ansible.cc/
 IUSE=examples paramiko +sudo
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=dev-python/jinja dev-python/pyyaml paramiko? ( dev-python/paramiko ) !paramiko? ( virtual/ssh ) sudo? ( app-admin/sudo ) dev-lang/python
 RESTRICT=test
 SLOT=0
-SRC_URI=mirror://github/ansible/ansible/ansible-0.7.tar.gz
+SRC_URI=mirror://github/ansible/ansible/ansible-0.7.1.tar.gz
 _eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	multilib	9aa8a023e062fca0ba79362d9d0cc488	python	3db636724bc2886c6425058e210067d2	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4
-_md5_=fd50e6c2787bda17c875926f483f5deb
+_md5_=c6e0d8307be054ec956abf6732ca6dac
diff --git a/metadata/md5-cache/app-admin/ansible-9999 b/metadata/md5-cache/app-admin/ansible-9999
index 737d88b6d006..4d5bb85b65d9 100644
--- a/metadata/md5-cache/app-admin/ansible-9999
+++ b/metadata/md5-cache/app-admin/ansible-9999
@@ -2,10 +2,10 @@ DEFINED_PHASES=compile install postinst postrm prepare setup test unpack
 DEPEND=test? ( dev-python/nose dev-vcs/git ) dev-lang/python dev-vcs/git
 DESCRIPTION=Radically simple deployment, model-driven configuration management, and command execution framework
 EAPI=4
-HOMEPAGE=http://ansible.github.com/
+HOMEPAGE=http://ansible.cc/
 IUSE=examples paramiko +sudo test
 LICENSE=GPL-3
 RDEPEND=dev-python/jinja dev-python/pyyaml paramiko? ( dev-python/paramiko ) !paramiko? ( virtual/ssh ) sudo? ( app-admin/sudo ) dev-lang/python
 SLOT=0
 _eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	git-2	15733ab6a6feb34af9837b41623c2bad	multilib	9aa8a023e062fca0ba79362d9d0cc488	python	3db636724bc2886c6425058e210067d2	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4
-_md5_=f0f031fead9f7a8b18b0e6ab4da80ef2
+_md5_=ac9e1606884d53d25ef364a68f7033b8
diff --git a/metadata/md5-cache/app-admin/eclean-kernel-0.3.1 b/metadata/md5-cache/app-admin/eclean-kernel-0.3.1
index b5704158368e..7e81d71d6b01 100644
--- a/metadata/md5-cache/app-admin/eclean-kernel-0.3.1
+++ b/metadata/md5-cache/app-admin/eclean-kernel-0.3.1
@@ -4,11 +4,11 @@ DESCRIPTION=Remove outdated built kernels
 EAPI=4
 HOMEPAGE=https://bitbucket.org/mgorny/eclean-kernel/
 IUSE=python_targets_python2_6 python_targets_python2_7 python_targets_python3_1 python_targets_python3_2
-KEYWORDS=~amd64 ~mips ~x86
+KEYWORDS=~amd64 ~mips ~x86 ~x86-fbsd
 LICENSE=BSD
 RDEPEND=kernel_linux? ( dev-python/pymountboot[python_targets_python2_6?,python_targets_python2_7?,python_targets_python3_1?,python_targets_python3_2?] ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_1? ( dev-lang/python:3.1 ) python_targets_python3_2? ( dev-lang/python:3.2 ) dev-python/python-exec
 REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targets_python3_1 python_targets_python3_2 )
 SLOT=0
 SRC_URI=mirror://bitbucket/mgorny/eclean-kernel/downloads/eclean-kernel-0.3.1.tar.bz2
 _eclasses_=distutils-r1	22c60088f733cfcb478699b798834fff	eutils	5a98daf52f7430a4a6f46cee24cfe3e2	multilib	9aa8a023e062fca0ba79362d9d0cc488	python-r1	6e75302653c50fe2b10deb30ba36ff0d	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=2e91a18ab0910193aced6c94981fdf48
+_md5_=32f4630c60dcd15a14cbf0e85da122b4
diff --git a/metadata/md5-cache/app-admin/usbview-1.1-r1 b/metadata/md5-cache/app-admin/usbview-1.1-r1
new file mode 100644
index 000000000000..39ac418f077c
--- /dev/null
+++ b/metadata/md5-cache/app-admin/usbview-1.1-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare
+DEPEND=x11-libs/gtk+:2 virtual/pkgconfig
+DESCRIPTION=Display the topology of devices on the USB bus
+EAPI=4
+HOMEPAGE=http://www.kroah.com/linux-usb/
+KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=x11-libs/gtk+:2
+SLOT=0
+SRC_URI=http://www.kroah.com/linux-usb/usbview-1.1.tar.gz
+_eclasses_=eutils	5a98daf52f7430a4a6f46cee24cfe3e2	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=e119eb2824853f6e8b49333ce4e64449
diff --git a/metadata/md5-cache/app-cdr/xfburn-0.4.3-r3 b/metadata/md5-cache/app-cdr/xfburn-0.4.3-r3
deleted file mode 100644
index f612a1914967..000000000000
--- a/metadata/md5-cache/app-cdr/xfburn-0.4.3-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=dev-libs/glib-2.22 >=dev-libs/libburn-0.4.2 >=dev-libs/libisofs-0.6.2 >=x11-libs/gtk+-2.10:2 >=xfce-base/exo-0.6 >=xfce-base/libxfce4ui-4.8 gstreamer? ( >=media-libs/gst-plugins-base-0.10.20:0.10 ) udev? ( || ( >=sys-fs/udev-171-r1[gudev] <sys-fs/udev-171-r1[extras] ) ) virtual/pkgconfig dev-util/intltool sys-devel/gettext >=sys-apps/sed-4 >=dev-util/xfce4-dev-tools-4.10 || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
-DESCRIPTION=GTK+ based CD and DVD burning application
-EAPI=4
-HOMEPAGE=http://goodies.xfce.org/projects/applications/xfburn
-IUSE=debug gstreamer udev
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.22 >=dev-libs/libburn-0.4.2 >=dev-libs/libisofs-0.6.2 >=x11-libs/gtk+-2.10:2 >=xfce-base/exo-0.6 >=xfce-base/libxfce4ui-4.8 gstreamer? ( >=media-libs/gst-plugins-base-0.10.20:0.10 ) udev? ( || ( >=sys-fs/udev-171-r1[gudev] <sys-fs/udev-171-r1[extras] ) )
-SLOT=0
-SRC_URI=mirror://xfce/src/apps/xfburn/0.4/xfburn-0.4.3.tar.bz2 mirror://debian/pool/main/x/xfburn/xfburn_0.4.3-4.debian.tar.gz
-_eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	5a98daf52f7430a4a6f46cee24cfe3e2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	0d2178d7f87923f3c110366ece3c930f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	679cee9d5e9bd6a822db1af0d0074d7a
-_md5_=cbaac27fd4649a9254cf216a36a90458
diff --git a/metadata/md5-cache/app-cdr/xfburn-0.4.3_p20121021 b/metadata/md5-cache/app-cdr/xfburn-0.4.3_p20121021
new file mode 100644
index 000000000000..967fe84decb3
--- /dev/null
+++ b/metadata/md5-cache/app-cdr/xfburn-0.4.3_p20121021
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
+DEPEND=>=dev-libs/glib-2.30 >=dev-libs/libburn-0.4.2 >=dev-libs/libisofs-0.6.2 >=x11-libs/gtk+-2.24:2 >=xfce-base/exo-0.6 >=xfce-base/libxfce4ui-4.10 gstreamer? ( >=media-libs/gst-plugins-base-0.10.20:0.10 ) udev? ( || ( >=sys-fs/udev-171-r6[gudev] <sys-fs/udev-171[extras] ) ) dev-libs/libxslt dev-util/intltool >=dev-util/xfce4-dev-tools-4.10 sys-devel/gettext virtual/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+DESCRIPTION=GTK+ based CD and DVD burning application
+EAPI=4
+HOMEPAGE=http://goodies.xfce.org/projects/applications/xfburn
+IUSE=debug gstreamer udev
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/glib-2.30 >=dev-libs/libburn-0.4.2 >=dev-libs/libisofs-0.6.2 >=x11-libs/gtk+-2.24:2 >=xfce-base/exo-0.6 >=xfce-base/libxfce4ui-4.10 gstreamer? ( >=media-libs/gst-plugins-base-0.10.20:0.10 ) udev? ( || ( >=sys-fs/udev-171-r6[gudev] <sys-fs/udev-171[extras] ) )
+SLOT=0
+SRC_URI=http://dev.gentoo.org/~ssuominen/xfburn-0.4.3_p20121021.tar.xz
+_eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	5a98daf52f7430a4a6f46cee24cfe3e2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	0d2178d7f87923f3c110366ece3c930f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	679cee9d5e9bd6a822db1af0d0074d7a
+_md5_=4a124756878cee0c116fd9c71df3e14e
diff --git a/metadata/md5-cache/app-dicts/eblook-1.6.1 b/metadata/md5-cache/app-dicts/eblook-1.6.1
index e60b11bcd2a5..e6e105df7aaa 100644
--- a/metadata/md5-cache/app-dicts/eblook-1.6.1
+++ b/metadata/md5-cache/app-dicts/eblook-1.6.1
@@ -3,9 +3,9 @@ DEPEND=>=dev-libs/eb-3.3.4
 DESCRIPTION=Interactive search utility for electronic dictionaries
 EAPI=4
 HOMEPAGE=http://openlab.ring.gr.jp/edict/eblook/
-KEYWORDS=x86 ppc
+KEYWORDS=~amd64 ppc x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/eb-3.3.4
 SLOT=0
 SRC_URI=http://openlab.ring.gr.jp/edict/eblook/dist/eblook-1.6.1.tar.gz
-_md5_=75ce8325454ed15743ff52b253847b4b
+_md5_=61b36fb9b505144edacbc760de9e535f
diff --git a/metadata/md5-cache/app-dicts/wnn-ldic-1.04 b/metadata/md5-cache/app-dicts/wnn-ldic-1.04
index 9653b731e198..1a9d811bd07b 100644
--- a/metadata/md5-cache/app-dicts/wnn-ldic-1.04
+++ b/metadata/md5-cache/app-dicts/wnn-ldic-1.04
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile install postinst unpack
 DEPEND=app-i18n/freewnn
 DESCRIPTION=Wnn dictionary for librarian
 HOMEPAGE=http://www.tulips.tsukuba.ac.jp/misc/export/cat/ldic/
-KEYWORDS=~x86
+KEYWORDS=~amd64 ~x86
 LICENSE=as-is
 RDEPEND=app-i18n/freewnn
 SLOT=0
 SRC_URI=http://www.tulips.tsukuba.ac.jp/misc/export/cat/ldic/ldic-1.04-wnn.txt
-_md5_=cf9d4b514f72b950eb3f6ef518c29340
+_md5_=b34ba5b660cc2b32d5cbc93eaaee0579
diff --git a/metadata/md5-cache/app-emulation/emul-linux-x86-java-1.6.0.37 b/metadata/md5-cache/app-emulation/emul-linux-x86-java-1.6.0.37
index 774d392547ff..b2cc2667aa15 100644
--- a/metadata/md5-cache/app-emulation/emul-linux-x86-java-1.6.0.37
+++ b/metadata/md5-cache/app-emulation/emul-linux-x86-java-1.6.0.37
@@ -4,11 +4,11 @@ DESCRIPTION=Oracle's Java SE Runtime Environment (32bit)
 EAPI=4
 HOMEPAGE=http://www.oracle.com/technetwork/java/javase/
 IUSE=X alsa nsplugin pax_kernel
-KEYWORDS=-* ~amd64
+KEYWORDS=-* amd64
 LICENSE=Oracle-BCLA-JavaSE
 RDEPEND=X? ( app-emulation/emul-linux-x86-xlibs ) alsa? ( app-emulation/emul-linux-x86-soundlibs ) =dev-java/java-config-2* || ( app-admin/eselect-java <dev-java/java-config-2.2 )
 RESTRICT=fetch strip
 SLOT=1.6
 SRC_URI=jre-6u37-linux-i586.bin
 _eclasses_=eutils	5a98daf52f7430a4a6f46cee24cfe3e2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	java-vm-2	7dc6db7d110230640003e30e63a0b2bc	multilib	9aa8a023e062fca0ba79362d9d0cc488	pax-utils	0ace932c4045349c7fc1af0fe7091acf	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=b8454376fe0983412201ff292a346a99
+_md5_=f9408b529a73125b155472d15a89418c
diff --git a/metadata/md5-cache/app-emulation/qemu-1.1.2 b/metadata/md5-cache/app-emulation/qemu-1.1.2
deleted file mode 100644
index a743ff8b3614..000000000000
--- a/metadata/md5-cache/app-emulation/qemu-1.1.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare pretend setup
-DEPEND=!static? ( >=dev-libs/glib-2.0 sys-apps/pciutils sys-libs/zlib aio? ( dev-libs/libaio ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.2.0 ) jpeg? ( virtual/jpeg ) ncurses? ( sys-libs/ncurses ) png? ( media-libs/libpng ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( >=media-libs/libsdl-1.2.11 ) spice? ( >=app-emulation/spice-0.9.0 ) tls? ( net-libs/gnutls ) uuid? ( >=sys-apps/util-linux-2.16.0 ) vde? ( net-misc/vde ) xattr? ( sys-apps/attr ) xfs? ( sys-fs/xfsprogs ) ) !app-emulation/kqemu !app-emulation/qemu !<app-emulation/qemu-1.0 >=sys-firmware/seabios-1.7.0 sys-firmware/sgabios sys-firmware/vgabios alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) brltty? ( app-accessibility/brltty ) opengl? ( virtual/opengl ) pulseaudio? ( media-sound/pulseaudio ) python? ( =dev-lang/python-2*[ncurses] ) sdl? ( media-libs/libsdl[X] ) smartcard? ( dev-libs/nss ) spice? ( >=app-emulation/spice-protocol-0.8.1 ) systemtap? ( dev-util/systemtap ) usbredir? ( sys-apps/usbredir ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools ) virtual/pkgconfig doc? ( app-text/texi2html ) kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 ) static? ( >=dev-libs/glib-2.0[static-libs(+)] sys-apps/pciutils[static-libs(+)] sys-libs/zlib[static-libs(+)] aio? ( dev-libs/libaio[static-libs(+)] ) caps? ( sys-libs/libcap-ng[static-libs(+)] ) curl? ( >=net-misc/curl-7.15.4[static-libs(+)] ) fdt? ( >=sys-apps/dtc-1.2.0[static-libs(+)] ) jpeg? ( virtual/jpeg[static-libs(+)] ) ncurses? ( sys-libs/ncurses[static-libs(+)] ) png? ( media-libs/libpng[static-libs(+)] ) rbd? ( sys-cluster/ceph[static-libs(+)] ) sasl? ( dev-libs/cyrus-sasl[static-libs(+)] ) sdl? ( >=media-libs/libsdl-1.2.11[static-libs(+)] ) spice? ( >=app-emulation/spice-0.9.0[static-libs(+)] ) tls? ( net-libs/gnutls[static-libs(+)] ) uuid? ( >=sys-apps/util-linux-2.16.0[static-libs(+)] ) vde? ( net-misc/vde[static-libs(+)] ) xattr? ( sys-apps/attr[static-libs(+)] ) xfs? ( sys-fs/xfsprogs[static-libs(+)] ) ) =dev-lang/python-2*
-DESCRIPTION=QEMU + Kernel-based Virtual Machine userland tools
-EAPI=4
-HOMEPAGE=http://www.linux-kvm.org
-IUSE=+aio alsa bluetooth brltty +caps +curl debug doc fdt +jpeg kernel_linux kernel_FreeBSD mixemu ncurses opengl +png pulseaudio python rbd sasl sdl smartcard spice static systemtap tci +threads tls usbredir +uuid vde +vhost-net virtfs +vnc xattr xen xfs qemu_softmmu_targets_i386 qemu_softmmu_targets_x86_64 qemu_softmmu_targets_alpha qemu_softmmu_targets_arm qemu_softmmu_targets_cris qemu_softmmu_targets_m68k qemu_softmmu_targets_microblaze qemu_softmmu_targets_microblazeel qemu_softmmu_targets_mips qemu_softmmu_targets_mipsel qemu_softmmu_targets_ppc qemu_softmmu_targets_ppc64 qemu_softmmu_targets_sh4 qemu_softmmu_targets_sh4eb qemu_softmmu_targets_sparc qemu_softmmu_targets_sparc64 qemu_softmmu_targets_s390x qemu_softmmu_targets_lm32 qemu_softmmu_targets_mips64 qemu_softmmu_targets_mips64el qemu_softmmu_targets_ppcemb qemu_softmmu_targets_xtensa qemu_softmmu_targets_xtensaeb qemu_user_targets_i386 qemu_user_targets_x86_64 qemu_user_targets_alpha qemu_user_targets_arm qemu_user_targets_cris qemu_user_targets_m68k qemu_user_targets_microblaze qemu_user_targets_microblazeel qemu_user_targets_mips qemu_user_targets_mipsel qemu_user_targets_ppc qemu_user_targets_ppc64 qemu_user_targets_sh4 qemu_user_targets_sh4eb qemu_user_targets_sparc qemu_user_targets_sparc64 qemu_user_targets_s390x qemu_user_targets_armeb qemu_user_targets_ppc64abi32 qemu_user_targets_sparc32plus qemu_user_targets_unicore32
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd
-LICENSE=GPL-2 LGPL-2 BSD-2
-RDEPEND=!static? ( >=dev-libs/glib-2.0 sys-apps/pciutils sys-libs/zlib aio? ( dev-libs/libaio ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.2.0 ) jpeg? ( virtual/jpeg ) ncurses? ( sys-libs/ncurses ) png? ( media-libs/libpng ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( >=media-libs/libsdl-1.2.11 ) spice? ( >=app-emulation/spice-0.9.0 ) tls? ( net-libs/gnutls ) uuid? ( >=sys-apps/util-linux-2.16.0 ) vde? ( net-misc/vde ) xattr? ( sys-apps/attr ) xfs? ( sys-fs/xfsprogs ) ) !app-emulation/kqemu !app-emulation/qemu !<app-emulation/qemu-1.0 >=sys-firmware/seabios-1.7.0 sys-firmware/sgabios sys-firmware/vgabios alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) brltty? ( app-accessibility/brltty ) opengl? ( virtual/opengl ) pulseaudio? ( media-sound/pulseaudio ) python? ( =dev-lang/python-2*[ncurses] ) sdl? ( media-libs/libsdl[X] ) smartcard? ( dev-libs/nss ) spice? ( >=app-emulation/spice-protocol-0.8.1 ) systemtap? ( dev-util/systemtap ) usbredir? ( sys-apps/usbredir ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools ) =dev-lang/python-2*
-REQUIRED_USE=|| ( qemu_softmmu_targets_i386 qemu_softmmu_targets_x86_64 qemu_softmmu_targets_alpha qemu_softmmu_targets_arm qemu_softmmu_targets_cris qemu_softmmu_targets_m68k qemu_softmmu_targets_microblaze qemu_softmmu_targets_microblazeel qemu_softmmu_targets_mips qemu_softmmu_targets_mipsel qemu_softmmu_targets_ppc qemu_softmmu_targets_ppc64 qemu_softmmu_targets_sh4 qemu_softmmu_targets_sh4eb qemu_softmmu_targets_sparc qemu_softmmu_targets_sparc64 qemu_softmmu_targets_s390x qemu_softmmu_targets_lm32 qemu_softmmu_targets_mips64 qemu_softmmu_targets_mips64el qemu_softmmu_targets_ppcemb qemu_softmmu_targets_xtensa qemu_softmmu_targets_xtensaeb ) static? ( !alsa !pulseaudio ) virtfs? ( xattr )
-SLOT=0
-SRC_URI=mirror://sourceforge/kvm/qemu-kvm/qemu-kvm-1.1.2.tar.gz
-_eclasses_=eutils	5a98daf52f7430a4a6f46cee24cfe3e2	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	linux-info	0b7adf68a2edb4e5a32b07bb6e68121c	multilib	9aa8a023e062fca0ba79362d9d0cc488	python	3db636724bc2886c6425058e210067d2	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=212aa7bf14fc822ca2f593acad601d64
diff --git a/metadata/md5-cache/app-misc/empty-0.6.18b b/metadata/md5-cache/app-misc/empty-0.6.18b
index fa20547a322c..de82137ee994 100644
--- a/metadata/md5-cache/app-misc/empty-0.6.18b
+++ b/metadata/md5-cache/app-misc/empty-0.6.18b
@@ -9,4 +9,4 @@ RDEPEND=virtual/logger
 SLOT=0
 SRC_URI=mirror://sourceforge/empty/empty-0.6.18b.tgz
 _eclasses_=eutils	5a98daf52f7430a4a6f46cee24cfe3e2	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=7fa5d2145879a6ee05e3783845e88c12
+_md5_=9e3c71ea7c41519dbe9a87bd0a280cfa
diff --git a/metadata/md5-cache/app-misc/empty-0.6.19b b/metadata/md5-cache/app-misc/empty-0.6.19b
new file mode 100644
index 000000000000..0fb9a7b29451
--- /dev/null
+++ b/metadata/md5-cache/app-misc/empty-0.6.19b
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare
+DESCRIPTION=Small shell utility, similar to expect(1)
+EAPI=4
+HOMEPAGE=http://empty.sourceforge.net
+IUSE=examples
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=virtual/logger
+SLOT=0
+SRC_URI=mirror://sourceforge/empty/empty-0.6.19b.tgz
+_eclasses_=eutils	5a98daf52f7430a4a6f46cee24cfe3e2	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=84fb52962db4dacbe2a90c42241e9525
diff --git a/metadata/md5-cache/app-misc/hivex-1.3.7 b/metadata/md5-cache/app-misc/hivex-1.3.7
new file mode 100644
index 000000000000..6ddd14b028fb
--- /dev/null
+++ b/metadata/md5-cache/app-misc/hivex-1.3.7
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=virtual/libiconv virtual/libintl dev-libs/libxml2:2 ocaml? ( dev-lang/ocaml[ocamlopt] dev-ml/findlib[ocamlopt] ) readline? ( sys-libs/readline ) perl? ( dev-perl/IO-stringy ) dev-lang/perl perl? ( test? ( dev-perl/Pod-Coverage dev-perl/Test-Pod-Coverage ) ) ruby? ( dev-ruby/rake ) dev-lang/perl[-build] python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) )
+DESCRIPTION=Library for reading and writing Windows Registry 'hive' binary files
+EAPI=4
+HOMEPAGE=http://libguestfs.org
+IUSE=ocaml readline +perl python test static-libs ruby
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=virtual/libiconv virtual/libintl dev-libs/libxml2:2 ocaml? ( dev-lang/ocaml[ocamlopt] dev-ml/findlib[ocamlopt] ) readline? ( sys-libs/readline ) perl? ( dev-perl/IO-stringy ) dev-lang/perl[-build] python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) )
+SLOT=0
+SRC_URI=http://libguestfs.org/download/hivex/hivex-1.3.7.tar.gz
+_eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	autotools-utils	b65ac5ba56a20f3d7a01c67b7b3c9b01	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	5a98daf52f7430a4a6f46cee24cfe3e2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-app	20b0a51a72b6d2c8ac53ccab1605737f	perl-module	825d3d7654c88c5c4dec7400d3612578	python	3db636724bc2886c6425058e210067d2	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=3a9ac0cf70904e5590d358d1846d3b57
diff --git a/metadata/md5-cache/app-portage/diffmask-0.3.3-r2 b/metadata/md5-cache/app-portage/diffmask-0.3.3-r2
index d14ba85b01f2..9d0480e1ef06 100644
--- a/metadata/md5-cache/app-portage/diffmask-0.3.3-r2
+++ b/metadata/md5-cache/app-portage/diffmask-0.3.3-r2
@@ -4,11 +4,11 @@ DESCRIPTION=A utility to maintain package.unmask entries up-to-date with masks
 EAPI=4
 HOMEPAGE=https://bitbucket.org/mgorny/diffmask/
 IUSE=python_targets_python2_6 python_targets_python2_7 python_targets_python3_1 python_targets_python3_2
-KEYWORDS=~amd64 ~mips ~x86
+KEYWORDS=~amd64 ~mips ~x86 ~x86-fbsd
 LICENSE=BSD
 RDEPEND=>=sys-apps/portage-2.1.8.3 python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_1? ( dev-lang/python:3.1 ) python_targets_python3_2? ( dev-lang/python:3.2 ) dev-python/python-exec
 REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targets_python3_1 python_targets_python3_2 )
 SLOT=0
 SRC_URI=mirror://bitbucket/mgorny/diffmask/downloads/diffmask-0.3.3.tar.bz2
 _eclasses_=distutils-r1	22c60088f733cfcb478699b798834fff	eutils	5a98daf52f7430a4a6f46cee24cfe3e2	multilib	9aa8a023e062fca0ba79362d9d0cc488	python-r1	6e75302653c50fe2b10deb30ba36ff0d	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=960c20a6123676a77a746d437c5e4d98
+_md5_=ee82510865fe5bd8155eeb58303f1606
diff --git a/metadata/md5-cache/app-portage/flaggie-0.2-r2 b/metadata/md5-cache/app-portage/flaggie-0.2-r2
index ad7998eec732..d7a5bff0f5dd 100644
--- a/metadata/md5-cache/app-portage/flaggie-0.2-r2
+++ b/metadata/md5-cache/app-portage/flaggie-0.2-r2
@@ -4,11 +4,11 @@ DESCRIPTION=A smart CLI mangler for package.* files
 EAPI=4
 HOMEPAGE=https://bitbucket.org/mgorny/flaggie/
 IUSE=python_targets_python2_6 python_targets_python2_7 python_targets_python3_1 python_targets_python3_2
-KEYWORDS=~amd64 ~arm ~hppa ~mips ~x86
+KEYWORDS=~amd64 ~arm ~hppa ~mips ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=BSD
 RDEPEND=>=sys-apps/portage-2.1.8.3 python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_1? ( dev-lang/python:3.1 ) python_targets_python3_2? ( dev-lang/python:3.2 ) dev-python/python-exec
 REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targets_python3_1 python_targets_python3_2 )
 SLOT=0
 SRC_URI=mirror://bitbucket/mgorny/flaggie/downloads/flaggie-0.2.tar.bz2
 _eclasses_=bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	distutils-r1	22c60088f733cfcb478699b798834fff	eutils	5a98daf52f7430a4a6f46cee24cfe3e2	multilib	9aa8a023e062fca0ba79362d9d0cc488	python-r1	6e75302653c50fe2b10deb30ba36ff0d	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=5a0b70c92b266d7b1ad00cd57078ff7c
+_md5_=49f43dd1d558c4a5554ad6d780ac870a
diff --git a/metadata/md5-cache/app-portage/gentoopm-0.2.6 b/metadata/md5-cache/app-portage/gentoopm-0.2.6
index b80bd30c1142..63f659c88303 100644
--- a/metadata/md5-cache/app-portage/gentoopm-0.2.6
+++ b/metadata/md5-cache/app-portage/gentoopm-0.2.6
@@ -4,7 +4,7 @@ DESCRIPTION=A common interface to Gentoo package managers
 EAPI=4
 HOMEPAGE=https://bitbucket.org/mgorny/gentoopm/
 IUSE=doc python_targets_python2_6 python_targets_python2_7 python_targets_python3_1 python_targets_python3_2
-KEYWORDS=~amd64 ~mips ~x86
+KEYWORDS=~amd64 ~mips ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=BSD-2
 PDEPEND=app-admin/eselect-package-manager
 RDEPEND=|| ( sys-apps/pkgcore >=sys-apps/portage-2.1.10.3 >=sys-apps/paludis-0.64.2[python-bindings] ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_1? ( dev-lang/python:3.1 ) python_targets_python3_2? ( dev-lang/python:3.2 ) dev-python/python-exec
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://bitbucket/mgorny/gentoopm/downloads/gentoopm-0.2.6.tar.bz2
 _eclasses_=distutils-r1	22c60088f733cfcb478699b798834fff	eutils	5a98daf52f7430a4a6f46cee24cfe3e2	multilib	9aa8a023e062fca0ba79362d9d0cc488	python-r1	6e75302653c50fe2b10deb30ba36ff0d	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=93ead0b32d04750957ca2cb43a03474a
+_md5_=47294678776b17579cef50dc32584279
diff --git a/metadata/md5-cache/app-portage/install-mask-0.0.2-r2 b/metadata/md5-cache/app-portage/install-mask-0.0.2-r2
index fb4c80ee3c92..111ef7752c28 100644
--- a/metadata/md5-cache/app-portage/install-mask-0.0.2-r2
+++ b/metadata/md5-cache/app-portage/install-mask-0.0.2-r2
@@ -4,11 +4,11 @@ DESCRIPTION=Handle INSTALL_MASK setting in make.conf
 EAPI=4
 HOMEPAGE=https://bitbucket.org/mgorny/install-mask/
 IUSE=python_targets_python2_6 python_targets_python2_7 python_targets_python3_1 python_targets_python3_2
-KEYWORDS=~amd64 ~mips ~x86
+KEYWORDS=~amd64 ~mips ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=BSD
 RDEPEND=app-portage/flaggie[python_targets_python2_6?,python_targets_python2_7?,python_targets_python3_1?,python_targets_python3_2?] dev-python/lxml python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_1? ( dev-lang/python:3.1 ) python_targets_python3_2? ( dev-lang/python:3.2 ) dev-python/python-exec
 REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targets_python3_1 python_targets_python3_2 )
 SLOT=0
 SRC_URI=mirror://bitbucket/mgorny/install-mask/downloads/install-mask-0.0.2.tar.bz2
 _eclasses_=distutils-r1	22c60088f733cfcb478699b798834fff	eutils	5a98daf52f7430a4a6f46cee24cfe3e2	multilib	9aa8a023e062fca0ba79362d9d0cc488	python-r1	6e75302653c50fe2b10deb30ba36ff0d	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=9b4c0b756c6b155d6045e7e6611baffc
+_md5_=ac678d4c25aafbdb8090077e2a6f7a24
diff --git a/metadata/md5-cache/app-portage/layman-2.0.0_rc4 b/metadata/md5-cache/app-portage/layman-2.0.0_rc4
new file mode 100644
index 000000000000..b18f342d9ffa
--- /dev/null
+++ b/metadata/md5-cache/app-portage/layman-2.0.0_rc4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst postrm prepare setup test
+DEPEND=dev-lang/python test? ( dev-vcs/subversion ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) || ( =dev-lang/python-2.7*[xml] =dev-lang/python-2.6*[xml] )
+DESCRIPTION=Tool to manage Gentoo overlays
+EAPI=3
+HOMEPAGE=http://layman.sourceforge.net/
+IUSE=bazaar cvs darcs +git mercurial subversion test
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=dev-lang/python bazaar? ( dev-vcs/bzr ) cvs? ( dev-vcs/cvs ) darcs? ( dev-vcs/darcs ) git? ( dev-vcs/git ) mercurial? ( dev-vcs/mercurial ) subversion? ( || ( >=dev-vcs/subversion-1.5.4[webdav-neon] >=dev-vcs/subversion-1.5.4[webdav-serf] ) ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) || ( =dev-lang/python-2.7*[xml] =dev-lang/python-2.6*[xml] )
+SLOT=0
+SRC_URI=mirror://sourceforge/layman/layman-2.0.0_rc4.tar.gz
+_eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	5a98daf52f7430a4a6f46cee24cfe3e2	multilib	9aa8a023e062fca0ba79362d9d0cc488	prefix	21058c21ca48453d771df15500873ede	python	3db636724bc2886c6425058e210067d2	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=3ca4be1a62ae5d78cbc62586206ba716
diff --git a/metadata/md5-cache/app-portage/layman-9999 b/metadata/md5-cache/app-portage/layman-9999
index 2d07fcaecdb6..3f84edd05e4b 100644
--- a/metadata/md5-cache/app-portage/layman-9999
+++ b/metadata/md5-cache/app-portage/layman-9999
@@ -8,4 +8,4 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/python bazaar? ( dev-vcs/bzr ) cvs? ( dev-vcs/cvs ) darcs? ( dev-vcs/darcs ) git? ( dev-vcs/git ) mercurial? ( dev-vcs/mercurial ) subversion? ( || ( >=dev-vcs/subversion-1.5.4[webdav-neon] >=dev-vcs/subversion-1.5.4[webdav-serf] ) ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) || ( =dev-lang/python-2.7*[xml] =dev-lang/python-2.6*[xml] )
 SLOT=0
 _eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	5a98daf52f7430a4a6f46cee24cfe3e2	git-2	15733ab6a6feb34af9837b41623c2bad	multilib	9aa8a023e062fca0ba79362d9d0cc488	prefix	21058c21ca48453d771df15500873ede	python	3db636724bc2886c6425058e210067d2	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=755c5039d2bc716b3eea9a58c36109f8
+_md5_=b0a17c9f8ffd29a832013769f83099ff
diff --git a/metadata/md5-cache/app-text/calibre-0.9.1 b/metadata/md5-cache/app-text/calibre-0.9.1
index 467b7d52ccb0..bb624073ccea 100644
--- a/metadata/md5-cache/app-text/calibre-0.9.1
+++ b/metadata/md5-cache/app-text/calibre-0.9.1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=install postinst postrm prepare setup
-DEPEND=>=app-text/podofo-0.8.2 >=app-text/poppler-0.12.3-r3[qt4,xpdf-headers(+)] >=dev-libs/chmlib-0.40 >=dev-libs/icu-4.4 >=dev-python/beautifulsoup-3.0.5:python-2 dev-python/netifaces dev-python/python-dateutil >=dev-python/dnspython-1.6.0 >=dev-python/cssutils-0.9.9 >=dev-python/dbus-python-0.82.2 >=dev-python/imaging-1.1.6 >=dev-python/lxml-2.2.1 >=dev-python/mechanize-0.1.11 >=dev-python/python-dateutil-1.4.1 >=dev-python/PyQt4-4.9.1[X,svg,webkit] media-fonts/liberation-fonts >=media-gfx/imagemagick-6.5.9[jpeg,png] >=media-libs/libwmf-0.2.8 >=media-libs/libmtp-1.1.4 virtual/libusb:1 x11-libs/qt-dbus:4 x11-libs/qt-svg:4 >=x11-misc/xdg-utils-1.0.2-r2 >=dev-python/setuptools-0.6_rc5 =dev-lang/python-2.7* =dev-lang/python-2.7*[ssl,sqlite]
+DEPEND=>=app-text/podofo-0.8.2 >=app-text/poppler-0.12.3-r3[qt4,xpdf-headers(+)] >=dev-libs/chmlib-0.40 >=dev-libs/icu-4.4 >=dev-python/beautifulsoup-3.0.5:python-2 dev-python/netifaces dev-python/python-dateutil >=dev-python/dnspython-1.6.0 >=dev-python/cssselect-0.7.1 >=dev-python/cssutils-0.9.9 >=dev-python/dbus-python-0.82.2 >=dev-python/imaging-1.1.6 >=dev-python/lxml-2.2.1 >=dev-python/mechanize-0.1.11 >=dev-python/python-dateutil-1.4.1 >=dev-python/PyQt4-4.9.1[X,svg,webkit] media-fonts/liberation-fonts >=media-gfx/imagemagick-6.5.9[jpeg,png] >=media-libs/libwmf-0.2.8 >=media-libs/libmtp-1.1.4 virtual/libusb:1 x11-libs/qt-dbus:4 x11-libs/qt-svg:4 >=x11-misc/xdg-utils-1.0.2-r2 >=dev-python/setuptools-0.6_rc5 =dev-lang/python-2.7* =dev-lang/python-2.7*[ssl,sqlite]
 DESCRIPTION=Ebook management application.
 EAPI=4
 HOMEPAGE=http://calibre-ebook.com/
 IUSE=+udisks
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
-RDEPEND=>=app-text/podofo-0.8.2 >=app-text/poppler-0.12.3-r3[qt4,xpdf-headers(+)] >=dev-libs/chmlib-0.40 >=dev-libs/icu-4.4 >=dev-python/beautifulsoup-3.0.5:python-2 dev-python/netifaces dev-python/python-dateutil >=dev-python/dnspython-1.6.0 >=dev-python/cssutils-0.9.9 >=dev-python/dbus-python-0.82.2 >=dev-python/imaging-1.1.6 >=dev-python/lxml-2.2.1 >=dev-python/mechanize-0.1.11 >=dev-python/python-dateutil-1.4.1 >=dev-python/PyQt4-4.9.1[X,svg,webkit] media-fonts/liberation-fonts >=media-gfx/imagemagick-6.5.9[jpeg,png] >=media-libs/libwmf-0.2.8 >=media-libs/libmtp-1.1.4 virtual/libusb:1 x11-libs/qt-dbus:4 x11-libs/qt-svg:4 >=x11-misc/xdg-utils-1.0.2-r2 udisks? ( sys-fs/udisks:0 ) =dev-lang/python-2.7* =dev-lang/python-2.7*[ssl,sqlite]
+RDEPEND=>=app-text/podofo-0.8.2 >=app-text/poppler-0.12.3-r3[qt4,xpdf-headers(+)] >=dev-libs/chmlib-0.40 >=dev-libs/icu-4.4 >=dev-python/beautifulsoup-3.0.5:python-2 dev-python/netifaces dev-python/python-dateutil >=dev-python/dnspython-1.6.0 >=dev-python/cssselect-0.7.1 >=dev-python/cssutils-0.9.9 >=dev-python/dbus-python-0.82.2 >=dev-python/imaging-1.1.6 >=dev-python/lxml-2.2.1 >=dev-python/mechanize-0.1.11 >=dev-python/python-dateutil-1.4.1 >=dev-python/PyQt4-4.9.1[X,svg,webkit] media-fonts/liberation-fonts >=media-gfx/imagemagick-6.5.9[jpeg,png] >=media-libs/libwmf-0.2.8 >=media-libs/libmtp-1.1.4 virtual/libusb:1 x11-libs/qt-dbus:4 x11-libs/qt-svg:4 >=x11-misc/xdg-utils-1.0.2-r2 udisks? ( sys-fs/udisks:0 ) =dev-lang/python-2.7* =dev-lang/python-2.7*[ssl,sqlite]
 SLOT=0
 SRC_URI=http://sourceforge.net/projects/calibre/files/0.9.1/calibre-0.9.1.tar.xz
 _eclasses_=bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	5a98daf52f7430a4a6f46cee24cfe3e2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	multilib	9aa8a023e062fca0ba79362d9d0cc488	python	3db636724bc2886c6425058e210067d2	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=3d0d7e1bd2b62fc5c870e50d756b0a84
+_md5_=beba359dac80041dc484e019426cec38
diff --git a/metadata/md5-cache/app-text/calibre-0.9.2 b/metadata/md5-cache/app-text/calibre-0.9.2
index 009a193fc649..c8323d3d9172 100644
--- a/metadata/md5-cache/app-text/calibre-0.9.2
+++ b/metadata/md5-cache/app-text/calibre-0.9.2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=install postinst postrm prepare setup
-DEPEND=>=app-text/podofo-0.8.2 >=app-text/poppler-0.12.3-r3[qt4,xpdf-headers(+)] >=dev-libs/chmlib-0.40 >=dev-libs/icu-4.4 >=dev-python/beautifulsoup-3.0.5:python-2 dev-python/netifaces dev-python/python-dateutil >=dev-python/dnspython-1.6.0 >=dev-python/cssutils-0.9.9 >=dev-python/dbus-python-0.82.2 >=dev-python/imaging-1.1.6 >=dev-python/lxml-2.2.1 >=dev-python/mechanize-0.1.11 >=dev-python/python-dateutil-1.4.1 >=dev-python/PyQt4-4.9.1[X,svg,webkit] media-fonts/liberation-fonts >=media-gfx/imagemagick-6.5.9[jpeg,png] >=media-libs/libwmf-0.2.8 >=media-libs/libmtp-1.1.4 virtual/libusb:1 x11-libs/qt-dbus:4 x11-libs/qt-svg:4 >=x11-misc/xdg-utils-1.0.2-r2 >=dev-python/setuptools-0.6_rc5 =dev-lang/python-2.7* =dev-lang/python-2.7*[ssl,sqlite]
+DEPEND=>=app-text/podofo-0.8.2 >=app-text/poppler-0.12.3-r3[qt4,xpdf-headers(+)] >=dev-libs/chmlib-0.40 >=dev-libs/icu-4.4 >=dev-python/beautifulsoup-3.0.5:python-2 dev-python/netifaces dev-python/python-dateutil >=dev-python/dnspython-1.6.0 >=dev-python/cssselect-0.7.1 >=dev-python/cssutils-0.9.9 >=dev-python/dbus-python-0.82.2 >=dev-python/imaging-1.1.6 >=dev-python/lxml-2.2.1 >=dev-python/mechanize-0.1.11 >=dev-python/python-dateutil-1.4.1 >=dev-python/PyQt4-4.9.1[X,svg,webkit] media-fonts/liberation-fonts >=media-gfx/imagemagick-6.5.9[jpeg,png] >=media-libs/libwmf-0.2.8 >=media-libs/libmtp-1.1.4 virtual/libusb:1 x11-libs/qt-dbus:4 x11-libs/qt-svg:4 >=x11-misc/xdg-utils-1.0.2-r2 >=dev-python/setuptools-0.6_rc5 =dev-lang/python-2.7* =dev-lang/python-2.7*[ssl,sqlite]
 DESCRIPTION=Ebook management application.
 EAPI=4
 HOMEPAGE=http://calibre-ebook.com/
 IUSE=+udisks
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=app-text/podofo-0.8.2 >=app-text/poppler-0.12.3-r3[qt4,xpdf-headers(+)] >=dev-libs/chmlib-0.40 >=dev-libs/icu-4.4 >=dev-python/beautifulsoup-3.0.5:python-2 dev-python/netifaces dev-python/python-dateutil >=dev-python/dnspython-1.6.0 >=dev-python/cssutils-0.9.9 >=dev-python/dbus-python-0.82.2 >=dev-python/imaging-1.1.6 >=dev-python/lxml-2.2.1 >=dev-python/mechanize-0.1.11 >=dev-python/python-dateutil-1.4.1 >=dev-python/PyQt4-4.9.1[X,svg,webkit] media-fonts/liberation-fonts >=media-gfx/imagemagick-6.5.9[jpeg,png] >=media-libs/libwmf-0.2.8 >=media-libs/libmtp-1.1.4 virtual/libusb:1 x11-libs/qt-dbus:4 x11-libs/qt-svg:4 >=x11-misc/xdg-utils-1.0.2-r2 udisks? ( sys-fs/udisks:0 ) =dev-lang/python-2.7* =dev-lang/python-2.7*[ssl,sqlite]
+RDEPEND=>=app-text/podofo-0.8.2 >=app-text/poppler-0.12.3-r3[qt4,xpdf-headers(+)] >=dev-libs/chmlib-0.40 >=dev-libs/icu-4.4 >=dev-python/beautifulsoup-3.0.5:python-2 dev-python/netifaces dev-python/python-dateutil >=dev-python/dnspython-1.6.0 >=dev-python/cssselect-0.7.1 >=dev-python/cssutils-0.9.9 >=dev-python/dbus-python-0.82.2 >=dev-python/imaging-1.1.6 >=dev-python/lxml-2.2.1 >=dev-python/mechanize-0.1.11 >=dev-python/python-dateutil-1.4.1 >=dev-python/PyQt4-4.9.1[X,svg,webkit] media-fonts/liberation-fonts >=media-gfx/imagemagick-6.5.9[jpeg,png] >=media-libs/libwmf-0.2.8 >=media-libs/libmtp-1.1.4 virtual/libusb:1 x11-libs/qt-dbus:4 x11-libs/qt-svg:4 >=x11-misc/xdg-utils-1.0.2-r2 udisks? ( sys-fs/udisks:0 ) =dev-lang/python-2.7* =dev-lang/python-2.7*[ssl,sqlite]
 SLOT=0
 SRC_URI=http://sourceforge.net/projects/calibre/files/0.9.2/calibre-0.9.2.tar.xz
 _eclasses_=bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	5a98daf52f7430a4a6f46cee24cfe3e2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	multilib	9aa8a023e062fca0ba79362d9d0cc488	python	3db636724bc2886c6425058e210067d2	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=b401d8e76e5952639ae39eb0ef25fd84
+_md5_=7338661905c24e3f4a457c5d9199a769
diff --git a/metadata/md5-cache/app-text/calibre-0.9.3 b/metadata/md5-cache/app-text/calibre-0.9.3
index 58faf5eba05f..b34c84ad6fc0 100644
--- a/metadata/md5-cache/app-text/calibre-0.9.3
+++ b/metadata/md5-cache/app-text/calibre-0.9.3
@@ -1,13 +1,13 @@
 DEFINED_PHASES=install postinst postrm prepare setup
-DEPEND=>=app-text/podofo-0.8.2 >=app-text/poppler-0.12.3-r3[qt4,xpdf-headers(+)] >=dev-libs/chmlib-0.40 >=dev-libs/icu-4.4 >=dev-python/beautifulsoup-3.0.5:python-2 dev-python/netifaces dev-python/python-dateutil >=dev-python/dnspython-1.6.0 >=dev-python/cssutils-0.9.9 >=dev-python/dbus-python-0.82.2 >=dev-python/imaging-1.1.6 >=dev-python/lxml-2.2.1 >=dev-python/mechanize-0.1.11 >=dev-python/python-dateutil-1.4.1 >=dev-python/PyQt4-4.9.1[X,svg,webkit] media-fonts/liberation-fonts >=media-gfx/imagemagick-6.5.9[jpeg,png] >=media-libs/libwmf-0.2.8 >=media-libs/libmtp-1.1.4 virtual/libusb:1 x11-libs/qt-dbus:4 x11-libs/qt-svg:4 >=x11-misc/xdg-utils-1.0.2-r2 >=dev-python/setuptools-0.6_rc5 =dev-lang/python-2.7* =dev-lang/python-2.7*[ssl,sqlite]
+DEPEND=>=app-text/podofo-0.8.2 >=app-text/poppler-0.12.3-r3[qt4,xpdf-headers(+)] >=dev-libs/chmlib-0.40 >=dev-libs/icu-4.4 >=dev-python/beautifulsoup-3.0.5:python-2 dev-python/netifaces dev-python/python-dateutil >=dev-python/dnspython-1.6.0 >=dev-python/cssselect-0.7.1 >=dev-python/cssutils-0.9.9 >=dev-python/dbus-python-0.82.2 >=dev-python/imaging-1.1.6 >=dev-python/lxml-2.2.1 >=dev-python/mechanize-0.1.11 >=dev-python/python-dateutil-1.4.1 >=dev-python/PyQt4-4.9.1[X,svg,webkit] media-fonts/liberation-fonts >=media-gfx/imagemagick-6.5.9[jpeg,png] >=media-libs/libwmf-0.2.8 >=media-libs/libmtp-1.1.4 virtual/libusb:1 x11-libs/qt-dbus:4 x11-libs/qt-svg:4 >=x11-misc/xdg-utils-1.0.2-r2 >=dev-python/setuptools-0.6_rc5 =dev-lang/python-2.7* =dev-lang/python-2.7*[ssl,sqlite]
 DESCRIPTION=Ebook management application.
 EAPI=4
 HOMEPAGE=http://calibre-ebook.com/
 IUSE=+udisks
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=app-text/podofo-0.8.2 >=app-text/poppler-0.12.3-r3[qt4,xpdf-headers(+)] >=dev-libs/chmlib-0.40 >=dev-libs/icu-4.4 >=dev-python/beautifulsoup-3.0.5:python-2 dev-python/netifaces dev-python/python-dateutil >=dev-python/dnspython-1.6.0 >=dev-python/cssutils-0.9.9 >=dev-python/dbus-python-0.82.2 >=dev-python/imaging-1.1.6 >=dev-python/lxml-2.2.1 >=dev-python/mechanize-0.1.11 >=dev-python/python-dateutil-1.4.1 >=dev-python/PyQt4-4.9.1[X,svg,webkit] media-fonts/liberation-fonts >=media-gfx/imagemagick-6.5.9[jpeg,png] >=media-libs/libwmf-0.2.8 >=media-libs/libmtp-1.1.4 virtual/libusb:1 x11-libs/qt-dbus:4 x11-libs/qt-svg:4 >=x11-misc/xdg-utils-1.0.2-r2 udisks? ( sys-fs/udisks:0 ) =dev-lang/python-2.7* =dev-lang/python-2.7*[ssl,sqlite]
+RDEPEND=>=app-text/podofo-0.8.2 >=app-text/poppler-0.12.3-r3[qt4,xpdf-headers(+)] >=dev-libs/chmlib-0.40 >=dev-libs/icu-4.4 >=dev-python/beautifulsoup-3.0.5:python-2 dev-python/netifaces dev-python/python-dateutil >=dev-python/dnspython-1.6.0 >=dev-python/cssselect-0.7.1 >=dev-python/cssutils-0.9.9 >=dev-python/dbus-python-0.82.2 >=dev-python/imaging-1.1.6 >=dev-python/lxml-2.2.1 >=dev-python/mechanize-0.1.11 >=dev-python/python-dateutil-1.4.1 >=dev-python/PyQt4-4.9.1[X,svg,webkit] media-fonts/liberation-fonts >=media-gfx/imagemagick-6.5.9[jpeg,png] >=media-libs/libwmf-0.2.8 >=media-libs/libmtp-1.1.4 virtual/libusb:1 x11-libs/qt-dbus:4 x11-libs/qt-svg:4 >=x11-misc/xdg-utils-1.0.2-r2 udisks? ( sys-fs/udisks:0 ) =dev-lang/python-2.7* =dev-lang/python-2.7*[ssl,sqlite]
 SLOT=0
 SRC_URI=http://sourceforge.net/projects/calibre/files/0.9.3/calibre-0.9.3.tar.xz
 _eclasses_=bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	5a98daf52f7430a4a6f46cee24cfe3e2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	multilib	9aa8a023e062fca0ba79362d9d0cc488	python	3db636724bc2886c6425058e210067d2	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=d37870388582602c1680ede04384a348
+_md5_=46d4c234d72a8c866771590541da0823
diff --git a/metadata/md5-cache/dev-haskell/haddock-2.10.0 b/metadata/md5-cache/dev-haskell/haddock-2.10.0
index e437299b38aa..d0489491bb3f 100644
--- a/metadata/md5-cache/dev-haskell/haddock-2.10.0
+++ b/metadata/md5-cache/dev-haskell/haddock-2.10.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare prerm setup test
-DEPEND=dev-haskell/ghc-paths[profile?] =dev-haskell/xhtml-3000.2*[profile?] >=dev-lang/ghc-7.4 >=dev-haskell/cabal-1.14 hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
+DEPEND=dev-haskell/ghc-paths[profile?] =dev-haskell/xhtml-3000.2*[profile?] >=dev-lang/ghc-7.4 >=dev-haskell/cabal-1.14 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=A documentation-generation tool for Haskell libraries
 EAPI=4
 HOMEPAGE=http://www.haskell.org/haddock/
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/haddock/2.10.0/haddock-2.10.0.tar.gz
 _eclasses_=eutils	5a98daf52f7430a4a6f46cee24cfe3e2	ghc-package	49c8afbe010577bcb717aae35002d003	haskell-cabal	567d71e667537f5be69c09d321053420	multilib	9aa8a023e062fca0ba79362d9d0cc488	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=3a6dad50030aa7a6a74ec73f06091389
+_md5_=7a698332b9812001153d0e75cb4e60b6
diff --git a/metadata/md5-cache/dev-haskell/haddock-2.10.0-r1 b/metadata/md5-cache/dev-haskell/haddock-2.10.0-r2
similarity index 91%
rename from metadata/md5-cache/dev-haskell/haddock-2.10.0-r1
rename to metadata/md5-cache/dev-haskell/haddock-2.10.0-r2
index 3adc4dd5fc4a..4f4a6fabcb67 100644
--- a/metadata/md5-cache/dev-haskell/haddock-2.10.0-r1
+++ b/metadata/md5-cache/dev-haskell/haddock-2.10.0-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare prerm setup test
-DEPEND=dev-haskell/ghc-paths[profile?] =dev-haskell/xhtml-3000.2*[profile?] >=dev-lang/ghc-7.4 >=dev-haskell/cabal-1.14 hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
+DEPEND=dev-haskell/ghc-paths[profile?] =dev-haskell/xhtml-3000.2*[profile?] >=dev-lang/ghc-7.4 >=dev-haskell/cabal-1.14 hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=A documentation-generation tool for Haskell libraries
 EAPI=4
 HOMEPAGE=http://www.haskell.org/haddock/
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/haddock/2.10.0/haddock-2.10.0.tar.gz
 _eclasses_=eutils	5a98daf52f7430a4a6f46cee24cfe3e2	ghc-package	49c8afbe010577bcb717aae35002d003	haskell-cabal	567d71e667537f5be69c09d321053420	multilib	9aa8a023e062fca0ba79362d9d0cc488	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=75766e95b6325a50d072ecb7a165f265
+_md5_=0fcfb9f869b80439654c3eb3b71e019e
diff --git a/metadata/md5-cache/dev-java/icedtea-bin-6.1.11.5 b/metadata/md5-cache/dev-java/icedtea-bin-6.1.11.5
new file mode 100644
index 000000000000..b180f2704f38
--- /dev/null
+++ b/metadata/md5-cache/dev-java/icedtea-bin-6.1.11.5
@@ -0,0 +1,15 @@
+DEFINED_PHASES=install postinst postrm preinst prerm setup
+DEPEND==dev-java/java-config-2* || ( app-admin/eselect-java <dev-java/java-config-2.2 )
+DESCRIPTION=A Gentoo-made binary build of the IcedTea JDK
+EAPI=4
+HOMEPAGE=http://icedtea.classpath.org
+IUSE=+X +alsa cjk +cups doc examples nsplugin source
+KEYWORDS=-* amd64 ~x86
+LICENSE=GPL-2-with-linking-exception
+RDEPEND=>=media-libs/giflib-4.1.6-r1 >=media-libs/libpng-1.5 >=sys-devel/gcc-4.3 >=sys-libs/glibc-2.11.2 >=sys-libs/zlib-1.2.3-r1 virtual/jpeg nsplugin? ( >=dev-libs/atk-1.30.0 >=dev-libs/glib-2.20.5:2 >=dev-libs/nspr-4.8 >=x11-libs/cairo-1.8.8 >=x11-libs/pango-1.24.5 ) X? ( dev-libs/glib >=media-libs/freetype-2.3.9:2 >=x11-libs/gtk+-2.20.1:2 >=x11-libs/libX11-1.3 >=x11-libs/libXext-1.1 >=x11-libs/libXi-1.3 >=x11-libs/libXtst-1.1 media-fonts/dejavu cjk? ( media-fonts/arphicfonts media-fonts/baekmuk-fonts media-fonts/lklug media-fonts/lohit-fonts media-fonts/sazanami ) ) alsa? ( >=media-libs/alsa-lib-1.0.20 ) cups? ( >=net-print/cups-1.4 ) =dev-java/java-config-2* || ( app-admin/eselect-java <dev-java/java-config-2.2 )
+REQUIRED_USE=nsplugin? ( X )
+RESTRICT=strip
+SLOT=6
+SRC_URI=amd64? ( http://dev.gentoo.org/~caster/distfiles//icedtea-bin-core-6.1.11.5-amd64.tar.bz2 ) x86? ( http://dev.gentoo.org/~caster/distfiles//icedtea-bin-core-6.1.11.5-x86.tar.bz2 ) doc? ( http://dev.gentoo.org/~caster/distfiles//icedtea-bin-doc-6.1.11.5.tar.bz2 ) examples? ( amd64? ( http://dev.gentoo.org/~caster/distfiles//icedtea-bin-examples-6.1.11.5-amd64.tar.bz2 ) x86? ( http://dev.gentoo.org/~caster/distfiles//icedtea-bin-examples-6.1.11.5-x86.tar.bz2 ) ) nsplugin? ( amd64? ( http://dev.gentoo.org/~caster/distfiles//icedtea-bin-nsplugin-6.1.11.5-amd64.tar.bz2 ) x86? ( http://dev.gentoo.org/~caster/distfiles//icedtea-bin-nsplugin-6.1.11.5-x86.tar.bz2 ) ) source? ( http://dev.gentoo.org/~caster/distfiles//icedtea-bin-src-6.1.11.5.tar.bz2 )
+_eclasses_=eutils	5a98daf52f7430a4a6f46cee24cfe3e2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	java-vm-2	7dc6db7d110230640003e30e63a0b2bc	multilib	9aa8a023e062fca0ba79362d9d0cc488	pax-utils	0ace932c4045349c7fc1af0fe7091acf	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=637f2fbd1fc4954924f8c4fb7249d796
diff --git a/metadata/md5-cache/dev-java/icedtea-bin-7.2.3.3 b/metadata/md5-cache/dev-java/icedtea-bin-7.2.3.3
new file mode 100644
index 000000000000..773e671aad29
--- /dev/null
+++ b/metadata/md5-cache/dev-java/icedtea-bin-7.2.3.3
@@ -0,0 +1,15 @@
+DEFINED_PHASES=install postinst postrm prerm setup
+DEPEND==dev-java/java-config-2* || ( app-admin/eselect-java <dev-java/java-config-2.2 )
+DESCRIPTION=A Gentoo-made binary build of the IcedTea JDK
+EAPI=4
+HOMEPAGE=http://icedtea.classpath.org
+IUSE=+X +alsa cjk +cups doc examples nsplugin source
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=GPL-2-with-linking-exception
+RDEPEND=>=media-libs/giflib-4.1.6-r1 media-libs/lcms:2 >=media-libs/libpng-1.5 >=sys-devel/gcc-4.3 >=sys-libs/glibc-2.11.2 >=sys-libs/zlib-1.2.3-r1 virtual/jpeg X? ( >=net-print/cups-1.4 >=dev-libs/atk-1.30.0 >=dev-libs/glib-2.20.5:2 >=media-libs/fontconfig-2.6.0-r2:1.0 >=media-libs/freetype-2.3.9:2 >=x11-libs/cairo-1.8.8 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.20.1:2 >=x11-libs/libX11-1.3 >=x11-libs/libXext-1.1 >=x11-libs/libXi-1.3 x11-libs/libXrender >=x11-libs/libXtst-1.1 >=x11-libs/pango-1.24.5 media-fonts/dejavu cjk? ( media-fonts/arphicfonts media-fonts/baekmuk-fonts media-fonts/lklug media-fonts/lohit-fonts media-fonts/sazanami ) ) alsa? ( >=media-libs/alsa-lib-1.0.20 ) cups? ( >=net-print/cups-1.4 ) =dev-java/java-config-2* || ( app-admin/eselect-java <dev-java/java-config-2.2 )
+REQUIRED_USE=nsplugin? ( X )
+RESTRICT=strip
+SLOT=7
+SRC_URI=amd64? ( http://dev.gentoo.org/~caster/distfiles//icedtea-bin-core-7.2.3.3-amd64.tar.bz2 ) x86? ( http://dev.gentoo.org/~caster/distfiles//icedtea-bin-core-7.2.3.3-x86.tar.bz2 ) doc? ( http://dev.gentoo.org/~caster/distfiles//icedtea-bin-doc-7.2.3.3.tar.bz2 ) examples? ( amd64? ( http://dev.gentoo.org/~caster/distfiles//icedtea-bin-examples-7.2.3.3-amd64.tar.bz2 ) x86? ( http://dev.gentoo.org/~caster/distfiles//icedtea-bin-examples-7.2.3.3-x86.tar.bz2 ) ) nsplugin? ( amd64? ( http://dev.gentoo.org/~caster/distfiles//icedtea-bin-nsplugin-7.2.3.3-amd64.tar.bz2 ) x86? ( http://dev.gentoo.org/~caster/distfiles//icedtea-bin-nsplugin-7.2.3.3-x86.tar.bz2 ) ) source? ( http://dev.gentoo.org/~caster/distfiles//icedtea-bin-src-7.2.3.3.tar.bz2 )
+_eclasses_=eutils	5a98daf52f7430a4a6f46cee24cfe3e2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	java-vm-2	7dc6db7d110230640003e30e63a0b2bc	multilib	9aa8a023e062fca0ba79362d9d0cc488	pax-utils	0ace932c4045349c7fc1af0fe7091acf	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=7be44bbf3ef0cb84fe558708a5615f86
diff --git a/metadata/md5-cache/dev-java/sun-jdk-1.6.0.37 b/metadata/md5-cache/dev-java/sun-jdk-1.6.0.37
index f05f53440b5b..c3161f8aa6f4 100644
--- a/metadata/md5-cache/dev-java/sun-jdk-1.6.0.37
+++ b/metadata/md5-cache/dev-java/sun-jdk-1.6.0.37
@@ -4,11 +4,11 @@ DESCRIPTION=Oracle's Java SE Development Kit
 EAPI=4
 HOMEPAGE=http://www.oracle.com/technetwork/java/javase/
 IUSE=X alsa derby doc examples jce kernel_SunOS nsplugin pax_kernel +source
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Oracle-BCLA-JavaSE examples? ( BSD )
 RDEPEND=X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXt x11-libs/libXtst ) alsa? ( media-libs/alsa-lib ) doc? ( dev-java/java-sdk-docs:1.6.0 ) jce? ( dev-java/sun-jce-bin:1.6 ) kernel_SunOS? ( app-arch/unzip ) !prefix? ( sys-libs/glibc ) =dev-java/java-config-2* || ( app-admin/eselect-java <dev-java/java-config-2.2 )
 RESTRICT=fetch strip
 SLOT=1.6
 SRC_URI=x86? ( jdk-6u37-linux-i586.bin examples? ( jdk-6u37-linux-i586-demos.tar.gz ) ) amd64? ( jdk-6u37-linux-x64.bin examples? ( jdk-6u37-linux-x64-demos.tar.gz ) ) ia64? ( jdk-6u37-linux-ia64.bin examples? ( jdk-6u37-linux-ia64-demos.tar.gz ) ) x86-solaris? ( jdk-6u37-solaris-i586.sh examples? ( jdk-6u37-solaris-i586-demos.tar.Z ) ) x64-solaris? ( jdk-6u37-solaris-i586.sh jdk-6u37-solaris-x64.sh examples? ( jdk-6u37-solaris-i586-demos.tar.Z jdk-6u37-solaris-x64-demos.tar.Z ) ) sparc-solaris? ( jdk-6u37-solaris-sparc.sh examples? ( jdk-6u37-solaris-sparc-demos.tar.Z ) ) sparc64-solaris? ( jdk-6u37-solaris-sparc.sh jdk-6u37-solaris-sparcv9.sh examples? ( jdk-6u37-solaris-sparc-demos.tar.Z jdk-6u37-solaris-sparcv9-demos.tar.Z ) )
 _eclasses_=eutils	5a98daf52f7430a4a6f46cee24cfe3e2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	java-vm-2	7dc6db7d110230640003e30e63a0b2bc	multilib	9aa8a023e062fca0ba79362d9d0cc488	pax-utils	0ace932c4045349c7fc1af0fe7091acf	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=f5fea71274ae437edf6f888124e60018
+_md5_=d2ec989b8a3a636e99c06a28825c54b0
diff --git a/metadata/md5-cache/dev-java/sun-jre-bin-1.6.0.37 b/metadata/md5-cache/dev-java/sun-jre-bin-1.6.0.37
index c938d0901fd0..f74490805d8d 100644
--- a/metadata/md5-cache/dev-java/sun-jre-bin-1.6.0.37
+++ b/metadata/md5-cache/dev-java/sun-jre-bin-1.6.0.37
@@ -4,11 +4,11 @@ DESCRIPTION=Oracle's Java SE Runtime Environment
 EAPI=4
 HOMEPAGE=http://www.oracle.com/technetwork/java/javase/
 IUSE=X alsa jce nsplugin pax_kernel
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=Oracle-BCLA-JavaSE
 RDEPEND=X? ( x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXtst x11-libs/libX11 ) alsa? ( media-libs/alsa-lib ) jce? ( dev-java/sun-jce-bin:1.6 ) !prefix? ( sys-libs/glibc ) =dev-java/java-config-2* || ( app-admin/eselect-java <dev-java/java-config-2.2 )
 RESTRICT=fetch strip
 SLOT=1.6
 SRC_URI=amd64? ( jre-6u37-linux-x64.bin ) ia64? ( jre-6u37-linux-ia64.bin ) x86? ( jre-6u37-linux-i586.bin )
 _eclasses_=eutils	5a98daf52f7430a4a6f46cee24cfe3e2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	java-vm-2	7dc6db7d110230640003e30e63a0b2bc	multilib	9aa8a023e062fca0ba79362d9d0cc488	pax-utils	0ace932c4045349c7fc1af0fe7091acf	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=d166d865093b8cab9c8cf23c0a0c598d
+_md5_=4171e267a1d501611bd378f514b21811
diff --git a/metadata/md5-cache/dev-lang/php-5.4.6 b/metadata/md5-cache/dev-lang/php-5.4.6
index 156827a63e8b..8e89442aff43 100644
--- a/metadata/md5-cache/dev-lang/php-5.4.6
+++ b/metadata/md5-cache/dev-lang/php-5.4.6
@@ -4,7 +4,7 @@ DESCRIPTION=The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and
 EAPI=4
 HOMEPAGE=http://php.net/
 IUSE=kolab embed +cli cgi fpm apache2 threads bcmath berkdb bzip2 calendar cdb cjk crypt +ctype curl curlwrappers debug doc enchant exif frontbase +fileinfo +filter firebird flatfile ftp gd gdbm gmp +hash +iconv imap inifile intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash mssql mysql mysqlnd mysqli nls oci8-instant-client odbc pcntl pdo +phar pic +posix postgres qdbm readline recode +session sharedmem +simplexml snmp soap sockets spell sqlite3 ssl sybase-ct sysvipc tidy +tokenizer truetype unicode wddx +xml xmlreader xmlwriter xmlrpc xpm xsl zip zlib apache2
-KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd
 LICENSE=PHP-3
 PDEPEND=doc? ( app-doc/php-docs )
 RDEPEND=>=app-admin/eselect-php-0.6.2 >=dev-libs/libpcre-8.12[unicode] apache2? ( www-servers/apache[threads=] ) berkdb? ( =sys-libs/db-4* ) bzip2? ( app-arch/bzip2 ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) cjk? ( !gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib ) ) crypt? ( >=dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) exif? ( !gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib ) ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) gmp? ( >=dev-libs/gmp-4.1.2 ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[ssl=] ) intl? ( dev-libs/icu ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) kolab? ( >=net-libs/c-client-2004g-r1 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) !mysqlnd? ( mysql? ( virtual/mysql ) mysqli? ( >=virtual/mysql-4.1 ) ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql-base ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite3? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( >=dev-libs/openssl-0.9.7 ) sybase-ct? ( dev-db/freetds ) tidy? ( app-text/htmltidy ) truetype? ( =media-libs/freetype-2* >=media-libs/t1lib-5.0.0 !gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib ) ) unicode? ( dev-libs/oniguruma ) wddx? ( >=dev-libs/libxml2-2.6.8 ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm virtual/jpeg media-libs/libpng sys-libs/zlib ) xsl? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib ) zlib? ( sys-libs/zlib ) virtual/mta apache2? ( =www-servers/apache-2* )
@@ -12,4 +12,4 @@ REQUIRED_USE=truetype? ( gd ) cjk? ( gd ) exif? ( gd ) xpm? ( gd ) gd? ( zlib )
 SLOT=5.4
 SRC_URI=http://www.php.net/distributions/php-5.4.6.tar.bz2 http://dev.gentoo.org/~olemarkus/php/php-patchset-5.4-2.tar.bz2
 _eclasses_=apache-module	1f60370f9dceba046ec036cd6bbb0c8b	autotools	f4bee52a728da1f76470f4b8d246c50f	db-use	2f5d6a2718559b90a51648d8ff58be83	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	5a98daf52f7430a4a6f46cee24cfe3e2	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=b4a4f5048d6446288f61ffa14837b6ad
+_md5_=f82436a67075807aeaad7730b1755ac4
diff --git a/metadata/md5-cache/dev-libs/boost-1.49.0-r1 b/metadata/md5-cache/dev-libs/boost-1.49.0-r1
index a04879809e36..3f87e1708694 100644
--- a/metadata/md5-cache/dev-libs/boost-1.49.0-r1
+++ b/metadata/md5-cache/dev-libs/boost-1.49.0-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Boost Libraries for C++
 EAPI=4
 HOMEPAGE=http://www.boost.org/
 IUSE=debug doc +eselect icu mpi python static-libs test tools
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=Boost-1.0
 RDEPEND=icu? ( >=dev-libs/icu-3.3 ) mpi? ( || ( sys-cluster/openmpi[cxx] sys-cluster/mpich2[cxx,threads] ) ) sys-libs/zlib !!<=dev-libs/boost-1.35.0-r2 >=app-admin/eselect-boost-0.4 python? ( dev-lang/python )
 SLOT=1.49
 SRC_URI=mirror://sourceforge/boost/boost_1_49_0.tar.bz2
 _eclasses_=check-reqs	0efdf29c9002a1995388968bf54e9d3d	eutils	5a98daf52f7430a4a6f46cee24cfe3e2	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	9aa8a023e062fca0ba79362d9d0cc488	python	3db636724bc2886c6425058e210067d2	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=81756ed9fdb32d88ea0b4f822094009f
+_md5_=1858c2fd83a6ba8721ac1e3787da4466
diff --git a/metadata/md5-cache/dev-libs/keybinder-0.2.2 b/metadata/md5-cache/dev-libs/keybinder-0.2.2
deleted file mode 100644
index f427ae8fb954..000000000000
--- a/metadata/md5-cache/dev-libs/keybinder-0.2.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm prepare setup
-DEPEND=>=x11-libs/gtk+-2.20:2 x11-libs/libXext x11-libs/libXrender x11-libs/libX11 lua? ( >=dev-lang/lua-5.1 ) python? ( >=dev-python/pygobject-2.15.3:2 >=dev-python/pygtk-2.12 ) virtual/pkgconfig python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) )
-DESCRIPTION=A library for registering global keyboard shortcuts
-EAPI=3
-HOMEPAGE=http://kaizer.se/wiki/keybinder/
-IUSE=lua python
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=x11-libs/gtk+-2.20:2 x11-libs/libXext x11-libs/libXrender x11-libs/libX11 lua? ( >=dev-lang/lua-5.1 ) python? ( >=dev-python/pygobject-2.15.3:2 >=dev-python/pygtk-2.12 ) python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) )
-SLOT=0
-SRC_URI=http://kaizer.se/publicfiles/keybinder/keybinder-0.2.2.tar.gz
-_eclasses_=multilib	9aa8a023e062fca0ba79362d9d0cc488	python	3db636724bc2886c6425058e210067d2	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4
-_md5_=07ad80a7a423cd11435772e94bcdb1b7
diff --git a/metadata/md5-cache/dev-libs/sord-0.10.4 b/metadata/md5-cache/dev-libs/sord-0.10.4
new file mode 100644
index 000000000000..d6e008a3e6b4
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/sord-0.10.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=>=dev-libs/serd-0.14.0 doc? ( app-doc/doxygen ) virtual/pkgconfig dev-lang/python !dev-lang/python[-threads]
+DESCRIPTION=Library for storing RDF data in memory
+EAPI=4
+HOMEPAGE=http://drobilla.net/software/sord/
+IUSE=doc static-libs test
+KEYWORDS=~amd64 ~x86
+LICENSE=ISC
+RDEPEND=>=dev-libs/serd-0.14.0
+SLOT=0
+SRC_URI=http://download.drobilla.net/sord-0.10.4.tar.bz2
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	5a98daf52f7430a4a6f46cee24cfe3e2	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	waf-utils	a8143e8b36b5b11cac7151905b89ad57
+_md5_=151aa1eb096fa767089c1cbf1afe38ab
diff --git a/metadata/md5-cache/dev-libs/ucommon-5.2.2-r3 b/metadata/md5-cache/dev-libs/ucommon-5.2.2-r3
index e6231ffbf3c3..f1f25c11cc80 100644
--- a/metadata/md5-cache/dev-libs/ucommon-5.2.2-r3
+++ b/metadata/md5-cache/dev-libs/ucommon-5.2.2-r3
@@ -1,13 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/pkgconfig doc? ( app-doc/doxygen ) ssl? ( dev-libs/openssl )
+DEPEND=virtual/pkgconfig doc? ( app-doc/doxygen ) ssl? ( dev-libs/openssl ) gnutls? ( net-libs/gnutls )
 DESCRIPTION=Portable C++ runtime for threads and sockets
 EAPI=4
 HOMEPAGE=http://www.gnu.org/software/commoncpp
 IUSE=doc static-libs socks +cxx debug ssl gnutls
 KEYWORDS=~amd64 ppc ppc64 ~x86 ~amd64-linux
 LICENSE=LGPL-3
-RDEPEND=ssl? ( dev-libs/openssl )
+RDEPEND=ssl? ( dev-libs/openssl ) gnutls? ( net-libs/gnutls )
+REQUIRED_USE=^^ ( ssl gnutls )
 SLOT=0
 SRC_URI=mirror://gnu/commoncpp/ucommon-5.2.2.tar.gz
 _eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	autotools-utils	b65ac5ba56a20f3d7a01c67b7b3c9b01	eutils	5a98daf52f7430a4a6f46cee24cfe3e2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=2bab60cf9598873bb1611e2fe2a57f44
+_md5_=ca5f208696fd283bbd5833ee0d9ed13c
diff --git a/metadata/md5-cache/dev-lua/luadbi-0.5-r1 b/metadata/md5-cache/dev-lua/luadbi-0.5-r1
index 9fa229961855..9bf8eabd3f67 100644
--- a/metadata/md5-cache/dev-lua/luadbi-0.5-r1
+++ b/metadata/md5-cache/dev-lua/luadbi-0.5-r1
@@ -4,11 +4,11 @@ DESCRIPTION=DBI module for Lua
 EAPI=4
 HOMEPAGE=http://code.google.com/p/luadbi/
 IUSE=mysql postgres sqlite
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=MIT
 RDEPEND=>=dev-lang/lua-5.1 mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) sqlite? ( >=dev-db/sqlite-3 )
 REQUIRED_USE=|| ( mysql postgres sqlite )
 SLOT=0
 SRC_URI=http://luadbi.googlecode.com/files/luadbi.0.5.tar.gz
 _eclasses_=eutils	5a98daf52f7430a4a6f46cee24cfe3e2	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=1c10b2951cf48474ec3e981a96d07dc8
+_md5_=8bd3a12b94c423009ade1c616d013e94
diff --git a/metadata/md5-cache/dev-perl/Expect-1.210.0 b/metadata/md5-cache/dev-perl/Expect-1.210.0
index f55bc4f821a4..2268f4c1bfd3 100644
--- a/metadata/md5-cache/dev-perl/Expect-1.210.0
+++ b/metadata/md5-cache/dev-perl/Expect-1.210.0
@@ -3,10 +3,10 @@ DEPEND=>=dev-perl/IO-Tty-1.03 dev-lang/perl[-build]
 DESCRIPTION=Expect for Perl
 EAPI=4
 HOMEPAGE=http://search.cpan.org/dist/Expect/
-KEYWORDS=amd64 ppc ~ppc64 sparc x86
+KEYWORDS=amd64 ~arm ppc ~ppc64 sparc x86
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=>=dev-perl/IO-Tty-1.03 dev-lang/perl[-build]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RG/RGIERSIG/Expect-1.21.tar.gz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	5a98daf52f7430a4a6f46cee24cfe3e2	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	825d3d7654c88c5c4dec7400d3612578	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=0868f3e520062d6b1229c397ea0b5bcb
+_md5_=08dd5968d1b6871ae45ecbf6b334608f
diff --git a/metadata/md5-cache/dev-perl/Net-SSLeay-1.480.0-r1 b/metadata/md5-cache/dev-perl/Net-SSLeay-1.480.0-r1
index 97f3450b6c9b..82e08f42d95f 100644
--- a/metadata/md5-cache/dev-perl/Net-SSLeay-1.480.0-r1
+++ b/metadata/md5-cache/dev-perl/Net-SSLeay-1.480.0-r1
@@ -3,10 +3,10 @@ DEPEND=dev-libs/openssl dev-lang/perl[-build]
 DESCRIPTION=Net::SSLeay module for perl
 EAPI=4
 HOMEPAGE=http://search.cpan.org/dist/Net-SSLeay/
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=openssl
 RDEPEND=dev-libs/openssl dev-lang/perl[-build]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MI/MIKEM/Net-SSLeay-1.48.tar.gz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	5a98daf52f7430a4a6f46cee24cfe3e2	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	825d3d7654c88c5c4dec7400d3612578	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=d4aa48af36e1e3a5c2c938c28ace8c36
+_md5_=ccdf356ac95727d5006a206d13e9f9f5
diff --git a/metadata/md5-cache/dev-perl/SDL-2.540 b/metadata/md5-cache/dev-perl/SDL-2.540
index 4f028ec4d4b3..e90d4baf4904 100644
--- a/metadata/md5-cache/dev-perl/SDL-2.540
+++ b/metadata/md5-cache/dev-perl/SDL-2.540
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-perl/Alien-SDL-1.434 dev-perl/Capture-Tiny dev-perl/File-ShareDir dev-perl/Test-Most dev-perl/Tie-Simple media-libs/libpng:0 media-libs/libsdl media-libs/sdl-gfx media-libs/sdl-image media-libs/sdl-mixer media-libs/sdl-pango media-libs/sdl-ttf media-libs/smpeg media-libs/tiff:0 virtual/glu virtual/jpeg virtual/opengl virtual/perl-ExtUtils-CBuilder virtual/perl-Module-Build virtual/perl-Scalar-List-Utils virtual/perl-Test-Simple dev-lang/perl[-build]
+DEPEND=>=dev-perl/Alien-SDL-1.434 dev-perl/Capture-Tiny dev-perl/File-ShareDir dev-perl/Test-Most dev-perl/Tie-Simple media-libs/libpng:0 media-libs/libsdl media-libs/sdl-gfx media-libs/sdl-image media-libs/sdl-mixer media-libs/sdl-pango media-libs/sdl-ttf media-libs/smpeg media-libs/tiff:0 virtual/glu virtual/jpeg virtual/opengl virtual/perl-ExtUtils-CBuilder >=virtual/perl-Module-Build-0.400.0 virtual/perl-Scalar-List-Utils virtual/perl-Test-Simple dev-lang/perl[-build]
 DESCRIPTION=Simple DirectMedia Layer (SDL) bindings for perl
 EAPI=4
 HOMEPAGE=http://sdl.perl.org/ http://search.cpan.org/dist/SDL/ http://github.com/PerlGameDev/SDL
 KEYWORDS=~amd64 ~hppa ~x86
 LICENSE=GPL-2 OFL-1.1
-RDEPEND=>=dev-perl/Alien-SDL-1.434 dev-perl/Capture-Tiny dev-perl/File-ShareDir dev-perl/Test-Most dev-perl/Tie-Simple media-libs/libpng:0 media-libs/libsdl media-libs/sdl-gfx media-libs/sdl-image media-libs/sdl-mixer media-libs/sdl-pango media-libs/sdl-ttf media-libs/smpeg media-libs/tiff:0 virtual/glu virtual/jpeg virtual/opengl virtual/perl-ExtUtils-CBuilder virtual/perl-Module-Build virtual/perl-Scalar-List-Utils virtual/perl-Test-Simple dev-lang/perl[-build]
+RDEPEND=>=dev-perl/Alien-SDL-1.434 dev-perl/Capture-Tiny dev-perl/File-ShareDir dev-perl/Test-Most dev-perl/Tie-Simple media-libs/libpng:0 media-libs/libsdl media-libs/sdl-gfx media-libs/sdl-image media-libs/sdl-mixer media-libs/sdl-pango media-libs/sdl-ttf media-libs/smpeg media-libs/tiff:0 virtual/glu virtual/jpeg virtual/opengl virtual/perl-ExtUtils-CBuilder >=virtual/perl-Module-Build-0.400.0 virtual/perl-Scalar-List-Utils virtual/perl-Test-Simple dev-lang/perl[-build]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JT/JTPALMER/SDL-2.540.tar.gz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	5a98daf52f7430a4a6f46cee24cfe3e2	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	825d3d7654c88c5c4dec7400d3612578	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=3cf9187f23596785b58559a7b7b7c531
+_md5_=70cb64aa742515305eefb67655feab80
diff --git a/metadata/md5-cache/dev-php/igbinary-1.1.1-r1 b/metadata/md5-cache/dev-php/igbinary-1.1.1-r1
index 8451340c4b22..9a2a678fb2a3 100644
--- a/metadata/md5-cache/dev-php/igbinary-1.1.1-r1
+++ b/metadata/md5-cache/dev-php/igbinary-1.1.1-r1
@@ -4,10 +4,10 @@ DESCRIPTION=A fast drop in replacement for the standard PHP serialize
 EAPI=2
 HOMEPAGE=http://opensource.dynamoid.com/
 IUSE=php_targets_php5-3 php_targets_php5-4
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=BSD
 RDEPEND=|| ( =dev-php/igbinary-1.1.1-r1[php_targets_php5-3] =dev-php/igbinary-1.1.1-r1[php_targets_php5-4] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
 SLOT=0
 SRC_URI=http://opensource.dynamoid.com/igbinary-1.1.1.tar.gz
 _eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	eutils	5a98daf52f7430a4a6f46cee24cfe3e2	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-source-r2	fdd92230a8379a1fcebd1a8978703083	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=6ffc2cc9f864708390d19f928aaa3b39
+_md5_=4fc0f2647b0434649e937de62e21e898
diff --git a/metadata/md5-cache/dev-php/pecl-crack-0.4-r2 b/metadata/md5-cache/dev-php/pecl-crack-0.4-r2
index 8df34a9acb85..b9d8b26e48e5 100644
--- a/metadata/md5-cache/dev-php/pecl-crack-0.4-r2
+++ b/metadata/md5-cache/dev-php/pecl-crack-0.4-r2
@@ -4,10 +4,10 @@ DESCRIPTION=PHP interface to the cracklib libraries.
 EAPI=4
 HOMEPAGE=http://pecl.php.net/crack
 IUSE=php_targets_php5-3 php_targets_php5-4
-KEYWORDS=amd64 ppc ~ppc64 ~x86
+KEYWORDS=amd64 ppc ~ppc64 x86
 LICENSE=PHP-3 CRACKLIB
 RDEPEND=|| ( =dev-php/pecl-crack-0.4-r2[php_targets_php5-3] =dev-php/pecl-crack-0.4-r2[php_targets_php5-4] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/crack-0.4.tgz
 _eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	eutils	5a98daf52f7430a4a6f46cee24cfe3e2	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	fdd92230a8379a1fcebd1a8978703083	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=ed12c8f136e080becdd9423c9ce52861
+_md5_=9010684b5a14bb2e35116669ceb25953
diff --git a/metadata/md5-cache/dev-php/pecl-http-1.7.4 b/metadata/md5-cache/dev-php/pecl-http-1.7.4
index 938d1288401a..78d9ef7e693c 100644
--- a/metadata/md5-cache/dev-php/pecl-http-1.7.4
+++ b/metadata/md5-cache/dev-php/pecl-http-1.7.4
@@ -4,10 +4,10 @@ DESCRIPTION=Extended HTTP Support for PHP.
 EAPI=4
 HOMEPAGE=http://pecl.php.net/pecl_http
 IUSE=php_targets_php5-3 php_targets_php5-4 php_targets_php5-3 php_targets_php5-4
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD-2 MIT
 RDEPEND=>=net-misc/curl-7.19.4 sys-libs/zlib dev-libs/libevent >=dev-lang/php-5[hash,session,iconv] || ( =dev-php/pecl-http-1.7.4[php_targets_php5-3] =dev-php/pecl-http-1.7.4[php_targets_php5-4] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 ) || ( =dev-php/pecl-http-1.7.4[php_targets_php5-3] =dev-php/pecl-http-1.7.4[php_targets_php5-4] =dev-php/pecl-http-1.7.4[php_targets_php5-3] =dev-php/pecl-http-1.7.4[php_targets_php5-4] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/pecl_http-1.7.4.tgz
 _eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	eutils	5a98daf52f7430a4a6f46cee24cfe3e2	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	fdd92230a8379a1fcebd1a8978703083	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=1cbfdad9e67a9091a15d5535e4cc8a42
+_md5_=bbf413f94736f864d290673ed058590c
diff --git a/metadata/md5-cache/dev-php/pecl-mailparse-2.1.6 b/metadata/md5-cache/dev-php/pecl-mailparse-2.1.6
index 84d78b9b53cc..636198f4742e 100644
--- a/metadata/md5-cache/dev-php/pecl-mailparse-2.1.6
+++ b/metadata/md5-cache/dev-php/pecl-mailparse-2.1.6
@@ -4,10 +4,10 @@ DESCRIPTION=A PHP extension for parsing and working with RFC822 and RFC2045 (MIM
 EAPI=4
 HOMEPAGE=http://pecl.php.net/mailparse
 IUSE=php_targets_php5-3 php_targets_php5-4
-KEYWORDS=amd64 ppc ~ppc64 ~x86
+KEYWORDS=amd64 ppc ~ppc64 x86
 LICENSE=PHP-2.02
 RDEPEND=dev-lang/php[unicode] || ( =dev-php/pecl-mailparse-2.1.6[php_targets_php5-3] =dev-php/pecl-mailparse-2.1.6[php_targets_php5-4] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/mailparse-2.1.6.tgz
 _eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	eutils	5a98daf52f7430a4a6f46cee24cfe3e2	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	fdd92230a8379a1fcebd1a8978703083	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=1105b2faa1df7d7842fd887ba89dbb37
+_md5_=7dc77703bd5085875f6ab16101ce163b
diff --git a/metadata/md5-cache/dev-php/pecl-memcached-2.0.1 b/metadata/md5-cache/dev-php/pecl-memcached-2.0.1
index 2037dd07fc0f..619d73aec1c7 100644
--- a/metadata/md5-cache/dev-php/pecl-memcached-2.0.1
+++ b/metadata/md5-cache/dev-php/pecl-memcached-2.0.1
@@ -4,10 +4,10 @@ DESCRIPTION=PHP extension for interfacing with memcached via libmemcached librar
 EAPI=4
 HOMEPAGE=http://pecl.php.net/memcached
 IUSE=+session igbinary php_targets_php5-3 php_targets_php5-4
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=PHP-3
 RDEPEND=>=dev-libs/libmemcached-0.38 sys-libs/zlib dev-lang/php[session?] igbinary? ( dev-php/igbinary[php_targets_php5-4?,php_targets_php5-3?] ) || ( =dev-php/pecl-memcached-2.0.1[php_targets_php5-3] =dev-php/pecl-memcached-2.0.1[php_targets_php5-4] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/memcached-2.0.1.tgz
 _eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	eutils	5a98daf52f7430a4a6f46cee24cfe3e2	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	fdd92230a8379a1fcebd1a8978703083	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=a74332b08356f6d8108f216ecae10b55
+_md5_=1686cbea33dc0325fe8f1fec8d41fa38
diff --git a/metadata/md5-cache/dev-php/pecl-ssh2-0.11.3-r1 b/metadata/md5-cache/dev-php/pecl-ssh2-0.11.3-r1
index c41f91a5aab1..b92d002270cd 100644
--- a/metadata/md5-cache/dev-php/pecl-ssh2-0.11.3-r1
+++ b/metadata/md5-cache/dev-php/pecl-ssh2-0.11.3-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Provides bindings to the functions of libssh2 which implements the S
 EAPI=4
 HOMEPAGE=http://pecl.php.net/ssh2
 IUSE=php_targets_php5-3 php_targets_php5-4
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=PHP-3
 RDEPEND=>=net-libs/libssh2-0.18 || ( =dev-php/pecl-ssh2-0.11.3-r1[php_targets_php5-3] =dev-php/pecl-ssh2-0.11.3-r1[php_targets_php5-4] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/ssh2-0.11.3.tgz
 _eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	eutils	5a98daf52f7430a4a6f46cee24cfe3e2	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	fdd92230a8379a1fcebd1a8978703083	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=99f956f11e70c3c8e3776bc09edd0dda
+_md5_=fe1a27e3c30dc82d1b90787a73c4fb38
diff --git a/metadata/md5-cache/dev-php/xcache-2.0.0 b/metadata/md5-cache/dev-php/xcache-2.0.0
index ed4455e2d79d..27e65f352a5c 100644
--- a/metadata/md5-cache/dev-php/xcache-2.0.0
+++ b/metadata/md5-cache/dev-php/xcache-2.0.0
@@ -4,11 +4,11 @@ DESCRIPTION=A fast and stable PHP opcode cacher
 EAPI=4
 HOMEPAGE=http://xcache.lighttpd.net/
 IUSE=php_targets_php5-3 php_targets_php5-4
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=virtual/httpd-php !dev-php/eaccelerator !dev-php/pecl-apc || ( =dev-php/xcache-2.0.0[php_targets_php5-3] =dev-php/xcache-2.0.0[php_targets_php5-4] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://xcache.lighttpd.net/pub/Releases/2.0.0/xcache-2.0.0.tar.bz2
 _eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	confutils	2ab69b52fa6ea0c0669a47fb94b354b4	eutils	5a98daf52f7430a4a6f46cee24cfe3e2	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-source-r2	fdd92230a8379a1fcebd1a8978703083	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=9058e74409384edfc7a33c82820a6221
+_md5_=633d22f6c9b90989d84bbd8d9092a90e
diff --git a/metadata/md5-cache/dev-php/xdebug-2.2.0 b/metadata/md5-cache/dev-php/xdebug-2.2.0
index 4379155ea6c8..5432dd9df919 100644
--- a/metadata/md5-cache/dev-php/xdebug-2.2.0
+++ b/metadata/md5-cache/dev-php/xdebug-2.2.0
@@ -4,10 +4,10 @@ DESCRIPTION=A PHP debugging and profiling extension
 EAPI=4
 HOMEPAGE=http://www.xdebug.org/
 IUSE=php_targets_php5-3 php_targets_php5-4
-KEYWORDS=amd64 ~hppa ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~hppa ppc ~ppc64 x86
 LICENSE=Xdebug
 RDEPEND=!dev-php/ZendOptimizer ~dev-php/xdebug-client-2.2.0 || ( =dev-php/xdebug-2.2.0[php_targets_php5-3] =dev-php/xdebug-2.2.0[php_targets_php5-4] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/xdebug-2.2.0.tgz
 _eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	eutils	5a98daf52f7430a4a6f46cee24cfe3e2	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-source-r2	fdd92230a8379a1fcebd1a8978703083	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=1dda209c3ba316185f22568625a208c5
+_md5_=fc7df75b332d330f63da217a3d62ff24
diff --git a/metadata/md5-cache/dev-python/cssselect-0.7.1 b/metadata/md5-cache/dev-python/cssselect-0.7.1
index ffbc7bb10355..29f332426fae 100644
--- a/metadata/md5-cache/dev-python/cssselect-0.7.1
+++ b/metadata/md5-cache/dev-python/cssselect-0.7.1
@@ -4,10 +4,10 @@ DESCRIPTION=parses CSS3 Selectors and translates them to XPath 1.0
 EAPI=4
 HOMEPAGE=http://packages.python.org/cssselect/ http://pypi.python.org/pypi/cssselect
 IUSE=doc test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
 LICENSE=BSD
 RDEPEND=dev-lang/python
 SLOT=0
 SRC_URI=mirror://pypi/c/cssselect/cssselect-0.7.1.tar.gz
 _eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	multilib	9aa8a023e062fca0ba79362d9d0cc488	python	3db636724bc2886c6425058e210067d2	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4
-_md5_=8477f74f7edd5ba1151a3df21efe1b36
+_md5_=2a4496c228198c5972a58b786e1cabab
diff --git a/metadata/md5-cache/dev-python/python-exec-0.1 b/metadata/md5-cache/dev-python/python-exec-0.1
index f06b7d847a0e..9430cffd53d9 100644
--- a/metadata/md5-cache/dev-python/python-exec-0.1
+++ b/metadata/md5-cache/dev-python/python-exec-0.1
@@ -3,10 +3,10 @@ DESCRIPTION=Python script wrapper
 EAPI=4
 HOMEPAGE=https://bitbucket.org/mgorny/python-exec/
 IUSE=python_targets_jython2_5 python_targets_pypy1_8 python_targets_pypy1_9 python_targets_python3_1 python_targets_python3_2 python_targets_python2_5 python_targets_python2_6 python_targets_python2_7
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=BSD
 REQUIRED_USE=|| ( python_targets_jython2_5 python_targets_pypy1_8 python_targets_pypy1_9 python_targets_python3_1 python_targets_python3_2 python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://bitbucket/mgorny/python-exec/downloads/python-exec-0.1.tar.bz2
 _eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	autotools-utils	b65ac5ba56a20f3d7a01c67b7b3c9b01	eutils	5a98daf52f7430a4a6f46cee24cfe3e2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	6e75302653c50fe2b10deb30ba36ff0d	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=e09d1ac6aaf71030ecb86b045dce1456
+_md5_=72a3e986f5b375813028a2c1b1a6ab27
diff --git a/metadata/md5-cache/dev-python/sympy-0.7.2 b/metadata/md5-cache/dev-python/sympy-0.7.2
new file mode 100644
index 000000000000..5a6eb4275a4c
--- /dev/null
+++ b/metadata/md5-cache/dev-python/sympy-0.7.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst postrm prepare setup test
+DEPEND=mathml? ( dev-libs/libxml2:2[python] dev-libs/libxslt[python] gtk? ( x11-libs/gtkmathview[gtk] ) ) latex? ( virtual/latex-base dev-texlive/texlive-fontsextra png? ( app-text/dvipng ) pdf? ( app-text/ghostscript-gpl ) ) texmacs? ( app-office/texmacs ) ipython? ( dev-python/ipython ) opengl? ( dev-python/pyopengl ) imaging? ( dev-python/imaging ) pyglet? ( dev-python/pyglet ) >=dev-python/pexpect-2.0 ~dev-python/mpmath-0.17 doc? ( dev-python/sphinx ) test? ( dev-python/pytest ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
+DESCRIPTION=Computer algebra system (CAS) in Python
+EAPI=3
+HOMEPAGE=http://code.google.com/p/sympy/
+IUSE=doc examples gtk imaging ipython latex mathml opengl pdf png pyglet test texmacs
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-macos
+LICENSE=BSD
+RDEPEND=mathml? ( dev-libs/libxml2:2[python] dev-libs/libxslt[python] gtk? ( x11-libs/gtkmathview[gtk] ) ) latex? ( virtual/latex-base dev-texlive/texlive-fontsextra png? ( app-text/dvipng ) pdf? ( app-text/ghostscript-gpl ) ) texmacs? ( app-office/texmacs ) ipython? ( dev-python/ipython ) opengl? ( dev-python/pyopengl ) imaging? ( dev-python/imaging ) pyglet? ( dev-python/pyglet ) >=dev-python/pexpect-2.0 ~dev-python/mpmath-0.17 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
+SLOT=0
+SRC_URI=http://sympy.googlecode.com/files/sympy-0.7.2.tar.gz
+_eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	5a98daf52f7430a4a6f46cee24cfe3e2	multilib	9aa8a023e062fca0ba79362d9d0cc488	python	3db636724bc2886c6425058e210067d2	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=01a9d2170a2e8c5e4fbfbca2dbaca807
diff --git a/metadata/md5-cache/dev-util/boost-build-1.49.0 b/metadata/md5-cache/dev-util/boost-build-1.49.0
index 7a9870521f5d..28445efafbcd 100644
--- a/metadata/md5-cache/dev-util/boost-build-1.49.0
+++ b/metadata/md5-cache/dev-util/boost-build-1.49.0
@@ -4,10 +4,10 @@ DESCRIPTION=A system for large project software construction, which is simple to
 EAPI=4
 HOMEPAGE=http://www.boost.org/doc/tools/build/index.html
 IUSE=examples python
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=Boost-1.0
 RDEPEND=!<dev-libs/boost-1.34.0 !<=dev-util/boost-build-1.35.0-r1 python? ( dev-lang/python )
 SLOT=1.49
 SRC_URI=mirror://sourceforge/boost/boost_1_49_0.tar.bz2
 _eclasses_=eutils	5a98daf52f7430a4a6f46cee24cfe3e2	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	9aa8a023e062fca0ba79362d9d0cc488	python	3db636724bc2886c6425058e210067d2	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=ef7cdb8f808b98ae82721eb62902eb2d
+_md5_=054d09496983f24ebe8b3129fb877b90
diff --git a/metadata/md5-cache/dev-util/d-feet-0.1.15 b/metadata/md5-cache/dev-util/d-feet-0.1.15
new file mode 100644
index 000000000000..f761182301f3
--- /dev/null
+++ b/metadata/md5-cache/dev-util/d-feet-0.1.15
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
+DEPEND=dev-python/setuptools app-arch/xz-utils >=sys-apps/sed-4 python_targets_python2_5? ( dev-lang/python:2.5 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 )
+DESCRIPTION=D-Feet is a powerful D-Bus debugger
+EAPI=4
+HOMEPAGE=http://live.gnome.org/DFeet
+IUSE=gnome python_targets_python2_5 python_targets_python2_6 python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/dbus-1.0 >=dev-python/dbus-python-0.82.3 dev-python/pygtk:2 gnome? ( dev-python/libwnck-python ) python_targets_python2_5? ( dev-lang/python:2.5 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec
+REQUIRED_USE=|| ( python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 )
+SLOT=0
+SRC_URI=mirror://gnome/sources/d-feet/0.1/d-feet-0.1.15.tar.xz
+_eclasses_=distutils-r1	22c60088f733cfcb478699b798834fff	eutils	5a98daf52f7430a4a6f46cee24cfe3e2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	45847910ffbe4d8bfb814e3527de1920	gnome2-utils	0d2178d7f87923f3c110366ece3c930f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	python-r1	6e75302653c50fe2b10deb30ba36ff0d	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=4248d9af996ce536fd75ee0cd165f516
diff --git a/metadata/md5-cache/dev-util/oprofile-0.9.7 b/metadata/md5-cache/dev-util/oprofile-0.9.7
index 76b7c0f32d9e..9ebc6fa3fab6 100644
--- a/metadata/md5-cache/dev-util/oprofile-0.9.7
+++ b/metadata/md5-cache/dev-util/oprofile-0.9.7
@@ -10,4 +10,4 @@ RDEPEND=>=dev-libs/popt-1.7-r1 >=sys-devel/binutils-2.14.90.0.6-r3 >=sys-libs/gl
 SLOT=0
 SRC_URI=mirror://sourceforge/oprofile/oprofile-0.9.7.tar.gz
 _eclasses_=eutils	5a98daf52f7430a4a6f46cee24cfe3e2	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	2d9eb3508fa5d6759e39354b74545567	linux-info	0b7adf68a2edb4e5a32b07bb6e68121c	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=538b475f1895127225e67883a8df91ed
+_md5_=d014795229001359c7b71ce7957b996b
diff --git a/metadata/md5-cache/games-action/moon-buggy-1.0.51 b/metadata/md5-cache/games-action/moon-buggy-1.0.51
index 700ce63ebaa6..7fb9e3d37407 100644
--- a/metadata/md5-cache/games-action/moon-buggy-1.0.51
+++ b/metadata/md5-cache/games-action/moon-buggy-1.0.51
@@ -3,10 +3,10 @@ DEPEND=sys-libs/ncurses virtual/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11
 DESCRIPTION=A simple console game, where you drive a car across the moon's surface
 EAPI=2
 HOMEPAGE=http://www.seehuhn.de/comp/moon-buggy.html
-KEYWORDS=amd64 ppc x86
+KEYWORDS=amd64 ~arm ppc x86
 LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses
 SLOT=0
 SRC_URI=http://www.seehuhn.de/data/moon-buggy-1.0.51.tar.gz
 _eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	5a98daf52f7430a4a6f46cee24cfe3e2	games	e0a83e3f3f024b8c8ef7a8217d716cbf	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=d30b32bab7c43a04e6cf35c93ed7cdef
+_md5_=47647b6c81f0d22754f26eb767afeb0d
diff --git a/metadata/md5-cache/games-arcade/tomatoes-1.55-r2 b/metadata/md5-cache/games-arcade/tomatoes-1.55-r2
index eca7dd9d356b..91cafa8eabab 100644
--- a/metadata/md5-cache/games-arcade/tomatoes-1.55-r2
+++ b/metadata/md5-cache/games-arcade/tomatoes-1.55-r2
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=virtual/opengl virtual/glu media-libs/libsdl[audio,video] media-libs/sdl-image[jpeg,png] media-libs/sdl-mixer[mikmod]
+DEPEND=virtual/opengl virtual/glu media-libs/libsdl[audio,video] media-libs/sdl-image[jpeg,png] media-libs/sdl-mixer[mod]
 DESCRIPTION=How many tomatoes can you smash in ten short minutes?
 EAPI=2
 HOMEPAGE=http://tomatoes.sourceforge.net/about.html
 KEYWORDS=amd64 ia64 ppc ~ppc64 x86
 LICENSE=ZLIB
-RDEPEND=virtual/opengl virtual/glu media-libs/libsdl[audio,video] media-libs/sdl-image[jpeg,png] media-libs/sdl-mixer[mikmod]
+RDEPEND=virtual/opengl virtual/glu media-libs/libsdl[audio,video] media-libs/sdl-image[jpeg,png] media-libs/sdl-mixer[mod]
 SLOT=0
 SRC_URI=mirror://sourceforge/tomatoes/tomatoes-linux-src-1.55.tar.bz2 mirror://sourceforge/tomatoes/tomatoes-linux-1.5.tar.bz2
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	5a98daf52f7430a4a6f46cee24cfe3e2	games	e0a83e3f3f024b8c8ef7a8217d716cbf	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=62706fdd6590a36a436053fc26f4e1aa
+_md5_=0b57b5bc048347f97987c728955d16db
diff --git a/metadata/md5-cache/games-board/gnono-1.9.1 b/metadata/md5-cache/games-board/gnono-1.9.1
index 50f4875b9d5d..7ef532f495e7 100644
--- a/metadata/md5-cache/games-board/gnono-1.9.1
+++ b/metadata/md5-cache/games-board/gnono-1.9.1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
 DEPEND=gnome-base/libgnomeui virtual/libintl sys-devel/gettext || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 DESCRIPTION=A rewrite for GNOME of the Windows card game WUNO
-EAPI=2
+EAPI=4
 HOMEPAGE=http://sourceforge.net/projects/gnono/
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
@@ -9,4 +9,4 @@ RDEPEND=gnome-base/libgnomeui virtual/libintl
 SLOT=0
 SRC_URI=mirror://sourceforge/gnono/gnono-1.9.1.tar.bz2
 _eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	5a98daf52f7430a4a6f46cee24cfe3e2	games	e0a83e3f3f024b8c8ef7a8217d716cbf	gnome2-utils	0d2178d7f87923f3c110366ece3c930f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=f4f5720d9ed0d44741225ece186c7eeb
+_md5_=632c08c209a9840de3c14f5727151817
diff --git a/metadata/md5-cache/games-board/kcheckers-0.8.1 b/metadata/md5-cache/games-board/kcheckers-0.8.1
index 7538fc044527..7d62de497c28 100644
--- a/metadata/md5-cache/games-board/kcheckers-0.8.1
+++ b/metadata/md5-cache/games-board/kcheckers-0.8.1
@@ -3,10 +3,10 @@ DEPEND=x11-libs/qt-gui:4
 DESCRIPTION=Qt version of the classic boardgame checkers
 EAPI=2
 HOMEPAGE=http://qcheckers.sourceforge.net/
-KEYWORDS=~amd64 ~ppc x86
+KEYWORDS=~amd64 ~arm ~ppc x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/qt-gui:4
 SLOT=0
 SRC_URI=mirror://gentoo/kcheckers-0.8.1.tar.gz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	5a98daf52f7430a4a6f46cee24cfe3e2	games	e0a83e3f3f024b8c8ef7a8217d716cbf	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-r2	75aa32643ef22632eb9b45989b4c03fc	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=81802bc728e07d0f43ff4e2cb8e9d29a
+_md5_=e82881dcd49431aef430bd04e67ea5ff
diff --git a/metadata/md5-cache/games-fps/warsow-1.02 b/metadata/md5-cache/games-fps/warsow-1.02
new file mode 100644
index 000000000000..cb384b47f52b
--- /dev/null
+++ b/metadata/md5-cache/games-fps/warsow-1.02
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup unpack
+DEPEND=media-libs/freetype net-misc/curl sys-libs/zlib !dedicated? ( media-libs/libpng:0 media-libs/libsdl media-libs/libtheora media-libs/libvorbis x11-libs/libX11 x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXxf86dga x11-libs/libXxf86vm virtual/jpeg virtual/opengl openal? ( media-libs/openal ) ) app-arch/unzip x11-misc/makedepend !dedicated? ( x11-proto/xineramaproto x11-proto/xf86dgaproto x11-proto/xf86vidmodeproto ) openal? ( virtual/pkgconfig ) >=sys-apps/sed-4
+DESCRIPTION=Multiplayer FPS based on the QFusion engine (evolved from Quake 2)
+EAPI=4
+HOMEPAGE=http://www.warsow.net/
+IUSE=+angelscript debug dedicated irc openal server
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 warsow
+RDEPEND=media-libs/freetype net-misc/curl sys-libs/zlib !dedicated? ( media-libs/libpng:0 media-libs/libsdl media-libs/libtheora media-libs/libvorbis x11-libs/libX11 x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXxf86dga x11-libs/libXxf86vm virtual/jpeg virtual/opengl openal? ( media-libs/openal ) )
+SLOT=0
+SRC_URI=http://funpark.warsow-esport.net/~warsow/1.0/warsow_1.0_unified.tar.gz http://funpark.warsow-esport.net/~warsow/1.02/warsow_1.02_sdk.tar.gz http://funpark.warsow-esport.net/~warsow/1.02/warsow_1.02_update.zip mirror://gentoo/warsow.png
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	check-reqs	0efdf29c9002a1995388968bf54e9d3d	eutils	5a98daf52f7430a4a6f46cee24cfe3e2	games	e0a83e3f3f024b8c8ef7a8217d716cbf	gnome2-utils	0d2178d7f87923f3c110366ece3c930f	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=498665bd6fdd4d0cac5e3f2f6c275fd0
diff --git a/metadata/md5-cache/games-misc/fortune-mod-gentoo-ru-0.25 b/metadata/md5-cache/games-misc/fortune-mod-gentoo-ru-0.25
index 229a3b7dab86..a7b75051f8a2 100644
--- a/metadata/md5-cache/games-misc/fortune-mod-gentoo-ru-0.25
+++ b/metadata/md5-cache/games-misc/fortune-mod-gentoo-ru-0.25
@@ -3,9 +3,9 @@ DEPEND=games-misc/fortune-mod
 DESCRIPTION=Fortune database of quotes from gentoo.ru forum and gentoo@conference.gentoo.ru
 EAPI=4
 HOMEPAGE=http://marsoft.dyndns.info/fortunes-gentoo-ru/
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=as-is
 RDEPEND=games-misc/fortune-mod
 SLOT=0
 SRC_URI=http://slepnoga.googlecode.com/files/gentoo-ru-0.25.gz http://marsoft.dyndns.info/fortunes-gentoo-ru/gentoo-ru-0.25.gz
-_md5_=c769b9f1314465774878b0d3f617eb96
+_md5_=528d27869b679d36ccbce5f235660a64
diff --git a/metadata/md5-cache/games-misc/fortune-mod-gentoo-ru-0.26 b/metadata/md5-cache/games-misc/fortune-mod-gentoo-ru-0.26
index da74d86db7ff..cd8727144b82 100644
--- a/metadata/md5-cache/games-misc/fortune-mod-gentoo-ru-0.26
+++ b/metadata/md5-cache/games-misc/fortune-mod-gentoo-ru-0.26
@@ -3,9 +3,9 @@ DEPEND=games-misc/fortune-mod
 DESCRIPTION=Fortune database of quotes from gentoo.ru forum and gentoo@conference.gentoo.ru
 EAPI=4
 HOMEPAGE=http://marsoft.dyndns.info/fortunes-gentoo-ru/
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=as-is
 RDEPEND=games-misc/fortune-mod
 SLOT=0
 SRC_URI=http://slepnoga.googlecode.com/files/gentoo-ru-0.26.gz http://maryasin.name/fortunes-gentoo-ru/gentoo-ru-0.26.gz
-_md5_=2e9b9110aa05b6e04d3c35a858c81f82
+_md5_=fdf67f59d0bdaaf8cf998276b138a034
diff --git a/metadata/md5-cache/games-simulation/openttd-1.2.2 b/metadata/md5-cache/games-simulation/openttd-1.2.2
index c7b686026f37..9fcc04103965 100644
--- a/metadata/md5-cache/games-simulation/openttd-1.2.2
+++ b/metadata/md5-cache/games-simulation/openttd-1.2.2
@@ -4,7 +4,7 @@ DESCRIPTION=OpenTTD is a clone of Transport Tycoon Deluxe
 EAPI=3
 HOMEPAGE=http://www.openttd.org/
 IUSE=aplaymidi debug dedicated iconv icu lzo +openmedia +png +timidity +truetype zlib
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc ~x86
 LICENSE=GPL-2
 PDEPEND=!dedicated? ( openmedia? ( games-misc/openmsx games-misc/opensfx ) aplaymidi? ( media-sound/alsa-utils ) !aplaymidi? ( timidity? ( media-sound/timidity++ ) ) ) openmedia? ( >=games-misc/opengfx-0.4.4 )
 RDEPEND=!dedicated? ( media-libs/libsdl[audio,X,video] icu? ( dev-libs/icu ) truetype? ( media-libs/fontconfig media-libs/freetype:2 sys-libs/zlib ) ) lzo? ( dev-libs/lzo:2 ) iconv? ( virtual/libiconv ) png? ( media-libs/libpng ) zlib? ( sys-libs/zlib )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://binaries.openttd.org/releases/1.2.2/openttd-1.2.2-source.tar.gz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	5a98daf52f7430a4a6f46cee24cfe3e2	games	e0a83e3f3f024b8c8ef7a8217d716cbf	gnome2-utils	0d2178d7f87923f3c110366ece3c930f	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=9e364db7d870cb8c1573fe58b779fc34
+_md5_=bc2ad5adc44b12575d0d66c71a492e9d
diff --git a/metadata/md5-cache/games-strategy/openra-20121019 b/metadata/md5-cache/games-strategy/openra-20121019
new file mode 100644
index 000000000000..adb4bfd5968d
--- /dev/null
+++ b/metadata/md5-cache/games-strategy/openra-20121019
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
+DEPEND=dev-dotnet/libgdiplus dev-lang/mono media-libs/freetype:2[X] media-libs/libsdl[X,opengl,video] media-libs/openal virtual/jpeg virtual/opengl cg? ( >=media-gfx/nvidia-cg-toolkit-2.1.0017 ) >=sys-apps/sed-4
+DESCRIPTION=A free RTS engine supporting games like Command & Conquer and Red Alert
+EAPI=4
+HOMEPAGE=http://open-ra.org/
+IUSE=cg
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-dotnet/libgdiplus dev-lang/mono media-libs/freetype:2[X] media-libs/libsdl[X,opengl,video] media-libs/openal virtual/jpeg virtual/opengl cg? ( >=media-gfx/nvidia-cg-toolkit-2.1.0017 )
+SLOT=0
+SRC_URI=https://github.com/OpenRA/OpenRA/tarball/release-20121019 -> openra-20121019.tar.gz
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	5a98daf52f7430a4a6f46cee24cfe3e2	games	e0a83e3f3f024b8c8ef7a8217d716cbf	gnome2-utils	0d2178d7f87923f3c110366ece3c930f	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	vcs-snapshot	d7572a392e0bd8e207deae5414f6a887
+_md5_=d6271bdd82cf56f94d66e6b22aec6c31
diff --git a/metadata/md5-cache/gnome-extra/gnome-media-2.30.0-r1 b/metadata/md5-cache/gnome-extra/gnome-media-2.30.0-r1
deleted file mode 100644
index 0087846a8b2b..000000000000
--- a/metadata/md5-cache/gnome-extra/gnome-media-2.30.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=dev-libs/glib-2.18.2:2 >=x11-libs/gtk+-2.15.1:2 >=gnome-base/gconf-2.6.1:2 >=media-libs/gstreamer-0.10.23:0.10 >=media-libs/gst-plugins-base-0.10.23:0.10 >=media-libs/gst-plugins-good-0.10:0.10 dev-libs/libunique:1 pulseaudio? ( >=media-sound/pulseaudio-0.9.15[glib] ) >=media-libs/libcanberra-0.4[gtk] dev-libs/libxml2:2 >=media-libs/gst-plugins-base-0.10.23:0.10 >=media-plugins/gst-plugins-meta-0.10-r2:0.10 >=media-plugins/gst-plugins-gconf-0.10.1:0.10 app-text/docbook-xml-dtd:4.1.2 virtual/pkgconfig >=app-text/scrollkeeper-0.3.11 >=app-text/gnome-doc-utils-0.3.2 >=dev-util/intltool-0.35.0 >=sys-apps/sed-4
-DESCRIPTION=Multimedia related programs for the GNOME desktop
-EAPI=2
-HOMEPAGE=http://ronald.bitfreak.net/gnome-media.php
-IUSE=pulseaudio
-KEYWORDS=alpha amd64 arm ia64 ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=LGPL-2 GPL-2 FDL-1.1
-RDEPEND=>=dev-libs/glib-2.18.2:2 >=x11-libs/gtk+-2.15.1:2 >=gnome-base/gconf-2.6.1:2 >=media-libs/gstreamer-0.10.23:0.10 >=media-libs/gst-plugins-base-0.10.23:0.10 >=media-libs/gst-plugins-good-0.10:0.10 dev-libs/libunique:1 pulseaudio? ( >=media-sound/pulseaudio-0.9.15[glib] ) >=media-libs/libcanberra-0.4[gtk] dev-libs/libxml2:2 >=media-libs/gst-plugins-base-0.10.23:0.10 >=media-plugins/gst-plugins-meta-0.10-r2:0.10 >=media-plugins/gst-plugins-gconf-0.10.1:0.10
-SLOT=2
-SRC_URI=mirror://gnome/sources/gnome-media/2.30/gnome-media-2.30.0.tar.bz2
-_eclasses_=eutils	5a98daf52f7430a4a6f46cee24cfe3e2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	45847910ffbe4d8bfb814e3527de1920	gnome2-utils	0d2178d7f87923f3c110366ece3c930f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=799ef68936b04ddebeda97ee250674f6
diff --git a/metadata/md5-cache/gnome-extra/gnome-media-2.32.0 b/metadata/md5-cache/gnome-extra/gnome-media-2.32.0
deleted file mode 100644
index a7ce07e0baa2..000000000000
--- a/metadata/md5-cache/gnome-extra/gnome-media-2.32.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=dev-libs/glib-2.18.2:2 >=x11-libs/gtk+-2.18.0:2 >=gnome-base/gconf-2.6.1:2 >=media-libs/gstreamer-0.10.23:0.10 >=media-libs/gst-plugins-base-0.10.23:0.10 >=media-libs/gst-plugins-good-0.10:0.10 dev-libs/libunique:1 pulseaudio? ( >=media-sound/pulseaudio-0.9.16[glib] ) >=media-libs/libcanberra-0.13[gtk] dev-libs/libxml2:2 >=media-libs/gst-plugins-base-0.10.23:0.10 >=media-plugins/gst-plugins-meta-0.10-r2:0.10 >=media-plugins/gst-plugins-gconf-0.10.1:0.10 app-text/docbook-xml-dtd:4.1.2 virtual/pkgconfig >=app-text/scrollkeeper-0.3.11 >=app-text/gnome-doc-utils-0.3.2 >=dev-util/intltool-0.35.0 >=sys-apps/sed-4
-DESCRIPTION=Multimedia related programs for the GNOME desktop
-EAPI=3
-HOMEPAGE=http://www.gnome.org/
-IUSE=pulseaudio
-KEYWORDS=alpha amd64 arm ia64 ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=LGPL-2 GPL-2 FDL-1.1
-RDEPEND=>=dev-libs/glib-2.18.2:2 >=x11-libs/gtk+-2.18.0:2 >=gnome-base/gconf-2.6.1:2 >=media-libs/gstreamer-0.10.23:0.10 >=media-libs/gst-plugins-base-0.10.23:0.10 >=media-libs/gst-plugins-good-0.10:0.10 dev-libs/libunique:1 pulseaudio? ( >=media-sound/pulseaudio-0.9.16[glib] ) >=media-libs/libcanberra-0.13[gtk] dev-libs/libxml2:2 >=media-libs/gst-plugins-base-0.10.23:0.10 >=media-plugins/gst-plugins-meta-0.10-r2:0.10 >=media-plugins/gst-plugins-gconf-0.10.1:0.10
-SLOT=2
-SRC_URI=mirror://gnome/sources/gnome-media/2.32/gnome-media-2.32.0.tar.bz2
-_eclasses_=eutils	5a98daf52f7430a4a6f46cee24cfe3e2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	45847910ffbe4d8bfb814e3527de1920	gnome2-utils	0d2178d7f87923f3c110366ece3c930f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=2a788a65b052e4f4c7295cdfc69328d9
diff --git a/metadata/md5-cache/gnome-extra/gnome-media-3.4.0 b/metadata/md5-cache/gnome-extra/gnome-media-3.4.0
new file mode 100644
index 000000000000..30ed2e029dce
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/gnome-media-3.4.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
+DEPEND=dev-libs/libxml2:2 >=dev-libs/glib-2.18.2:2 >=x11-libs/gtk+-2.91:3 >=gnome-base/gconf-2.6.1:2 >=media-libs/gstreamer-0.10.23:0.10 >=media-libs/gst-plugins-base-0.10.23:0.10 >=media-libs/gst-plugins-good-0.10:0.10 >=media-libs/libcanberra-0.13[gtk3] media-libs/libgnome-media-profiles:3 >=media-plugins/gst-plugins-gconf-0.10.1:0.10 >=media-plugins/gst-plugins-meta-0.10-r2:0.10 app-text/docbook-xml-dtd:4.1.2 >=app-text/gnome-doc-utils-0.3.2 app-text/rarian >=dev-util/intltool-0.35.0 gnome-base/gnome-common virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4
+DESCRIPTION=Multimedia related programs for the GNOME desktop
+EAPI=4
+HOMEPAGE=http://ronald.bitfreak.net/gnome-media.php
+KEYWORDS=~amd64 ~sh ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=LGPL-2 GPL-2 FDL-1.1
+RDEPEND=dev-libs/libxml2:2 >=dev-libs/glib-2.18.2:2 >=x11-libs/gtk+-2.91:3 >=gnome-base/gconf-2.6.1:2 >=media-libs/gstreamer-0.10.23:0.10 >=media-libs/gst-plugins-base-0.10.23:0.10 >=media-libs/gst-plugins-good-0.10:0.10 >=media-libs/libcanberra-0.13[gtk3] media-libs/libgnome-media-profiles:3 >=media-plugins/gst-plugins-gconf-0.10.1:0.10 >=media-plugins/gst-plugins-meta-0.10-r2:0.10
+SLOT=2
+SRC_URI=mirror://gnome/sources/gnome-media/3.4/gnome-media-3.4.0.tar.xz
+_eclasses_=eutils	5a98daf52f7430a4a6f46cee24cfe3e2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	45847910ffbe4d8bfb814e3527de1920	gnome2-utils	0d2178d7f87923f3c110366ece3c930f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=1d19824f7e67be4f641d127d5d119212
diff --git a/metadata/md5-cache/gnome-extra/gnome-user-share-3.0.1 b/metadata/md5-cache/gnome-extra/gnome-user-share-3.0.1
deleted file mode 100644
index ce1b2146b78b..000000000000
--- a/metadata/md5-cache/gnome-extra/gnome-user-share-3.0.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=dev-libs/glib-2.16.0:2 >=x11-libs/gtk+-3.0.0:3 >=app-mobilephone/obex-data-server-0.4 >=dev-libs/dbus-glib-0.70 dev-libs/libunique:3 >=gnome-base/gconf-2.10:2 >=gnome-base/nautilus-2.91.7 media-libs/libcanberra[gtk3] >=net-wireless/gnome-bluetooth-2.91.5:2 >=net-wireless/bluez-4.18 >=sys-apps/dbus-1.1.1 >=www-apache/mod_dnssd-0.6 =www-servers/apache-2.2*[apache2_modules_dav,apache2_modules_dav_fs,apache2_modules_authn_file,apache2_modules_auth_digest,apache2_modules_authz_groupfile] >=x11-libs/libnotify-0.7 sys-devel/gettext >=dev-util/intltool-0.35 virtual/pkgconfig app-text/gnome-doc-utils app-text/docbook-xml-dtd:4.1.2 app-arch/xz-utils >=sys-apps/sed-4
-DESCRIPTION=Personal file sharing for the GNOME desktop
-EAPI=4
-HOMEPAGE=http://www.gnome.org/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.16.0:2 >=x11-libs/gtk+-3.0.0:3 >=app-mobilephone/obex-data-server-0.4 >=dev-libs/dbus-glib-0.70 dev-libs/libunique:3 >=gnome-base/gconf-2.10:2 >=gnome-base/nautilus-2.91.7 media-libs/libcanberra[gtk3] >=net-wireless/gnome-bluetooth-2.91.5:2 >=net-wireless/bluez-4.18 >=sys-apps/dbus-1.1.1 >=www-apache/mod_dnssd-0.6 =www-servers/apache-2.2*[apache2_modules_dav,apache2_modules_dav_fs,apache2_modules_authn_file,apache2_modules_auth_digest,apache2_modules_authz_groupfile] >=x11-libs/libnotify-0.7
-SLOT=0
-SRC_URI=mirror://gnome/sources/gnome-user-share/3.0/gnome-user-share-3.0.1.tar.xz
-_eclasses_=eutils	5a98daf52f7430a4a6f46cee24cfe3e2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	45847910ffbe4d8bfb814e3527de1920	gnome2-utils	0d2178d7f87923f3c110366ece3c930f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=2fa1a14f9a501732988768860485ace6
diff --git a/metadata/md5-cache/gnome-extra/gnome-user-share-3.0.3 b/metadata/md5-cache/gnome-extra/gnome-user-share-3.0.3
new file mode 100644
index 000000000000..446447c8c335
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/gnome-user-share-3.0.3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
+DEPEND=>=dev-libs/glib-2.28:2 >=x11-libs/gtk+-3:3 >=app-mobilephone/obex-data-server-0.4 >=dev-libs/dbus-glib-0.70 >=gnome-base/nautilus-2.91.7 media-libs/libcanberra[gtk3] >=net-wireless/gnome-bluetooth-2.91.5:2 >=net-wireless/bluez-4.18 >=sys-apps/dbus-1.1.1 >=www-apache/mod_dnssd-0.6 =www-servers/apache-2.2*[apache2_modules_dav,apache2_modules_dav_fs,apache2_modules_authn_file,apache2_modules_auth_digest,apache2_modules_authz_groupfile] >=x11-libs/libnotify-0.7 app-text/yelp-tools app-text/docbook-xml-dtd:4.1.2 >=dev-util/intltool-0.35 sys-devel/gettext virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4
+DESCRIPTION=Personal file sharing for the GNOME desktop
+EAPI=4
+HOMEPAGE=http://www.gnome.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/glib-2.28:2 >=x11-libs/gtk+-3:3 >=app-mobilephone/obex-data-server-0.4 >=dev-libs/dbus-glib-0.70 >=gnome-base/nautilus-2.91.7 media-libs/libcanberra[gtk3] >=net-wireless/gnome-bluetooth-2.91.5:2 >=net-wireless/bluez-4.18 >=sys-apps/dbus-1.1.1 >=www-apache/mod_dnssd-0.6 =www-servers/apache-2.2*[apache2_modules_dav,apache2_modules_dav_fs,apache2_modules_authn_file,apache2_modules_auth_digest,apache2_modules_authz_groupfile] >=x11-libs/libnotify-0.7
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-user-share/3.0/gnome-user-share-3.0.3.tar.xz
+_eclasses_=eutils	5a98daf52f7430a4a6f46cee24cfe3e2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	45847910ffbe4d8bfb814e3527de1920	gnome2-utils	0d2178d7f87923f3c110366ece3c930f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=07e454dd4294f9bda2a39ed3a242d7af
diff --git a/metadata/md5-cache/kde-misc/plasma-lionmail-0_p20121020 b/metadata/md5-cache/kde-misc/plasma-lionmail-0_p20121020
new file mode 100644
index 000000000000..1191c0b09d72
--- /dev/null
+++ b/metadata/md5-cache/kde-misc/plasma-lionmail-0_p20121020
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-base/kdelibs-4.4:4[aqua=] >=kde-base/kdepimlibs-4.4:4[aqua=] app-office/akonadi-server x11-libs/qt-core:4 x11-libs/qt-gui:4 x11-libs/qt-webkit:4 >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
+DESCRIPTION=A Plasma widget displaying new and important email
+EAPI=4
+HOMEPAGE=http://www.kde.org http://www.vizzzion.org
+IUSE=debug aqua
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 LGPL-2
+RDEPEND=>=kde-base/kdelibs-4.4:4[aqua=] >=kde-base/kdepimlibs-4.4:4[aqua=] app-office/akonadi-server x11-libs/qt-core:4 x11-libs/qt-gui:4 x11-libs/qt-webkit:4 >=kde-base/kdepim-runtime-4.4:4[aqua=] >=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
+SLOT=4
+SRC_URI=http://dev.gentoo.org/~creffett/distfiles/plasma-lionmail-0_p20121020.tar.xz
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	1f7278c51de5e0898f73c97fbf622701	eutils	5a98daf52f7430a4a6f46cee24cfe3e2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	0d2178d7f87923f3c110366ece3c930f	kde4-base	6e4e3fc3a36f43b71c84ad615e804a83	kde4-functions	37767566f9ffa88075c4d392a59100a9	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_md5_=48286992dc42fb6abbc075447d93b4c5
diff --git a/metadata/md5-cache/kde-misc/polkit-kde-kcmodules-0.98_pre20120917 b/metadata/md5-cache/kde-misc/polkit-kde-kcmodules-0.98_pre20120917
index 66a1c76a3ae2..a2a9c0038d7f 100644
--- a/metadata/md5-cache/kde-misc/polkit-kde-kcmodules-0.98_pre20120917
+++ b/metadata/md5-cache/kde-misc/polkit-kde-kcmodules-0.98_pre20120917
@@ -4,10 +4,10 @@ DESCRIPTION=PolKit agent module for KDE.
 EAPI=4
 HOMEPAGE=http://www.kde.org
 IUSE=debug aqua
-KEYWORDS=amd64 ~arm ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~ppc ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=sys-auth/polkit-kde-agent-0.99 >=sys-auth/polkit-qt-0.103 >=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=http://dev.gentoo.org/~johu/distfiles/polkit-kde-kcmodules-0.98_pre20120917.tar.xz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	1f7278c51de5e0898f73c97fbf622701	eutils	5a98daf52f7430a4a6f46cee24cfe3e2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	0d2178d7f87923f3c110366ece3c930f	kde4-base	6e4e3fc3a36f43b71c84ad615e804a83	kde4-functions	37767566f9ffa88075c4d392a59100a9	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=0fc8b7716cf8520e062f7c0cc23ba7a2
+_md5_=8e8193f4b52e5cd127fdf39530e337ff
diff --git a/metadata/md5-cache/mail-client/postler-0.1.1 b/metadata/md5-cache/mail-client/postler-0.1.1
index d3f541211a33..d7c3dc97e105 100644
--- a/metadata/md5-cache/mail-client/postler-0.1.1
+++ b/metadata/md5-cache/mail-client/postler-0.1.1
@@ -1,13 +1,12 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-libs/glib-2.26:2 dev-libs/libunique:1 dev-libs/openssl mail-mta/msmtp media-libs/libcanberra net-libs/webkit-gtk:2 >=x11-libs/gtk+-2.18:2 x11-libs/libnotify ayatana? ( dev-libs/libindicate ) || ( dev-lang/python:2.6 dev-lang/python:2.7 ) dev-lang/vala:0.10 dev-util/intltool sys-devel/gettext >=sys-apps/sed-4 dev-lang/python !dev-lang/python[-threads]
+DEPEND=>=dev-libs/glib-2.26 dev-libs/libunique:1 dev-libs/openssl:0 mail-mta/msmtp media-libs/libcanberra net-libs/webkit-gtk:2 sys-libs/db >=x11-libs/gtk+-2.18:2 >=x11-libs/libnotify-0.7 || ( dev-lang/python:2.7 dev-lang/python:2.6 ) dev-lang/vala:0.10 dev-util/intltool sys-devel/gettext >=sys-apps/sed-4 dev-lang/python !dev-lang/python[-threads]
 DESCRIPTION=A super sexy, ultra simple desktop mail client built in vala
-EAPI=3
-HOMEPAGE=https://launchpad.net/postler
-IUSE=ayatana
-KEYWORDS=~amd64
+EAPI=4
+HOMEPAGE=http://launchpad.net/postler
+KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1
-RDEPEND=>=dev-libs/glib-2.26:2 dev-libs/libunique:1 dev-libs/openssl mail-mta/msmtp media-libs/libcanberra net-libs/webkit-gtk:2 >=x11-libs/gtk+-2.18:2 x11-libs/libnotify ayatana? ( dev-libs/libindicate )
+RDEPEND=>=dev-libs/glib-2.26 dev-libs/libunique:1 dev-libs/openssl:0 mail-mta/msmtp media-libs/libcanberra net-libs/webkit-gtk:2 sys-libs/db >=x11-libs/gtk+-2.18:2 >=x11-libs/libnotify-0.7
 SLOT=0
-SRC_URI=http://git.xfce.org/apps/postler/snapshot/postler-0.1.1.tar.bz2
+SRC_URI=mirror://gentoo/postler-0.1.1.tar.bz2
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	5a98daf52f7430a4a6f46cee24cfe3e2	gnome2-utils	0d2178d7f87923f3c110366ece3c930f	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	3db636724bc2886c6425058e210067d2	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	waf-utils	a8143e8b36b5b11cac7151905b89ad57
-_md5_=18276eaa5df8e8dda461015424b19c03
+_md5_=d43604b210d4e54e0d8a64e50d088ce9
diff --git a/metadata/md5-cache/media-gfx/qrencode-3.3.1 b/metadata/md5-cache/media-gfx/qrencode-3.3.1
index 3367d2f0bf97..d2a2115af8b8 100644
--- a/metadata/md5-cache/media-gfx/qrencode-3.3.1
+++ b/metadata/md5-cache/media-gfx/qrencode-3.3.1
@@ -3,10 +3,10 @@ DEPEND=media-libs/libpng virtual/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11
 DESCRIPTION=C library for encoding data in a QR Code symbol
 EAPI=4
 HOMEPAGE=http://fukuchi.org/works/qrencode/
-KEYWORDS=amd64 ~arm ppc x86
+KEYWORDS=amd64 arm ppc x86
 LICENSE=LGPL-2
 RDEPEND=media-libs/libpng
 SLOT=0
 SRC_URI=http://fukuchi.org/works/qrencode/qrencode-3.3.1.tar.bz2
 _eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	autotools-utils	b65ac5ba56a20f3d7a01c67b7b3c9b01	eutils	5a98daf52f7430a4a6f46cee24cfe3e2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=b88b7dee0358a0c8257d187a9470c2d2
+_md5_=71660c6c857986f7a216c6114b348695
diff --git a/metadata/md5-cache/media-gfx/ristretto-0.6.2 b/metadata/md5-cache/media-gfx/ristretto-0.6.2
deleted file mode 100644
index 5973d2d95263..000000000000
--- a/metadata/md5-cache/media-gfx/ristretto-0.6.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=dev-libs/dbus-glib-0.98 >=dev-libs/glib-2.24 media-libs/libexif x11-libs/cairo >=x11-libs/gtk+-2.20:2 x11-libs/libX11 >=xfce-base/libxfce4ui-4.10 >=xfce-base/libxfce4util-4.10 >=xfce-base/xfconf-4.10 dev-util/intltool virtual/pkgconfig sys-devel/gettext >=sys-apps/sed-4
-DESCRIPTION=A fast and lightweight picture viewer for the Xfce desktop environment
-EAPI=4
-HOMEPAGE=http://goodies.xfce.org/projects/applications/ristretto
-IUSE=debug
-KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/dbus-glib-0.98 >=dev-libs/glib-2.24 media-libs/libexif x11-libs/cairo >=x11-libs/gtk+-2.20:2 x11-libs/libX11 >=xfce-base/libxfce4ui-4.10 >=xfce-base/libxfce4util-4.10 >=xfce-base/xfconf-4.10
-SLOT=0
-SRC_URI=mirror://xfce/src/apps/ristretto/0.6/ristretto-0.6.2.tar.bz2
-_eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	5a98daf52f7430a4a6f46cee24cfe3e2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	0d2178d7f87923f3c110366ece3c930f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	679cee9d5e9bd6a822db1af0d0074d7a
-_md5_=f7447501f07f2afb5dc8ba99691f5357
diff --git a/metadata/md5-cache/media-gfx/splashutils-1.5.4.4-r1 b/metadata/md5-cache/media-gfx/splashutils-1.5.4.4-r1
index 3e172435155d..0a9e6be6e293 100644
--- a/metadata/md5-cache/media-gfx/splashutils-1.5.4.4-r1
+++ b/metadata/md5-cache/media-gfx/splashutils-1.5.4.4-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Framebuffer splash utilities.
 EAPI=2
 HOMEPAGE=http://fbsplash.berlios.de
 IUSE=hardened +png +truetype +mng gpm fbcondecor
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=~amd64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND=gpm? ( sys-libs/gpm ) truetype? ( >=media-libs/freetype-2[static-libs] || ( <app-arch/bzip2-1.0.6-r3 app-arch/bzip2[static-libs] ) || ( <sys-libs/zlib-1.2.5.1-r2 sys-libs/zlib[static-libs] ) ) png? ( >=media-libs/libpng-1.4.3[static-libs] ) mng? ( media-libs/lcms:0[static-libs] || ( media-libs/libmng[static-libs] <media-libs/libmng-1.0.10-r1 ) ) virtual/jpeg[static-libs] >=sys-apps/baselayout-1.9.4-r5 app-arch/cpio media-gfx/fbgrab !sys-apps/lcdsplash
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://berlios/fbsplash/splashutils-lite-1.5.4.4.tar.bz2 mirror://berlios/fbsplash/splashutils-gentoo-1.0.17.tar.bz2 mirror://gentoo/miscsplashutils-0.1.8.tar.bz2 mirror://sourceforge/libpng/libpng-1.4.3.tar.bz2 ftp://ftp.uu.net/graphics/jpeg/jpegsrc.v8a.tar.gz mirror://sourceforge/freetype/freetype-2.3.12.tar.bz2 http://www.gzip.org/zlib/zlib-1.2.3.tar.bz2
 _eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	eutils	5a98daf52f7430a4a6f46cee24cfe3e2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=f831b0f201e8c4c0efda95915a8bd4aa
+_md5_=b47e5226f0463893ad231ede73486ee0
diff --git a/metadata/md5-cache/media-libs/gst-plugins-base-0.10.32 b/metadata/md5-cache/media-libs/gst-plugins-base-0.10.32
index 3e656eba4c5e..c13dbfd0dd0e 100644
--- a/metadata/md5-cache/media-libs/gst-plugins-base-0.10.32
+++ b/metadata/md5-cache/media-libs/gst-plugins-base-0.10.32
@@ -5,9 +5,9 @@ EAPI=1
 HOMEPAGE=http://gstreamer.freedesktop.org/
 IUSE=+introspection nls +orc debug
 KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
+LICENSE=GPL-2+ LGPL-2+
 RDEPEND=>=dev-libs/glib-2.22 >=media-libs/gstreamer-0.10.32 dev-libs/libxml2 app-text/iso-codes orc? ( >=dev-lang/orc-0.4.11 ) !<media-libs/gst-plugins-bad-0.10.10
 SLOT=0.10
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-0.10.32.tar.bz2
-_eclasses_=eutils	5a98daf52f7430a4a6f46cee24cfe3e2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	45847910ffbe4d8bfb814e3527de1920	gnome2-utils	0d2178d7f87923f3c110366ece3c930f	gst-plugins-base	f54aa7972b6084703cffa04d818342a3	gst-plugins10	cdf76f89776a74425daf6cd80706ab65	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=bb4daa9a3ee824b6af8c08b8b69447b0
+_eclasses_=eutils	5a98daf52f7430a4a6f46cee24cfe3e2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	45847910ffbe4d8bfb814e3527de1920	gnome2-utils	0d2178d7f87923f3c110366ece3c930f	gst-plugins-base	721313f5c8b78f8c8c6a9d8ea3ee486a	gst-plugins10	cdf76f89776a74425daf6cd80706ab65	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=72ab17bfbb80489017bcb27827da76b8
diff --git a/metadata/md5-cache/media-libs/gst-plugins-base-0.10.35 b/metadata/md5-cache/media-libs/gst-plugins-base-0.10.35
index 102c241d9c41..af8b4c55ee29 100644
--- a/metadata/md5-cache/media-libs/gst-plugins-base-0.10.35
+++ b/metadata/md5-cache/media-libs/gst-plugins-base-0.10.35
@@ -5,9 +5,9 @@ EAPI=3
 HOMEPAGE=http://gstreamer.freedesktop.org/
 IUSE=+introspection nls +orc
 KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
+LICENSE=GPL-2+ LGPL-2+
 RDEPEND=>=dev-libs/glib-2.22:2 >=media-libs/gstreamer-0.10.34:0.10[introspection?] dev-libs/libxml2:2 app-text/iso-codes introspection? ( >=dev-libs/gobject-introspection-0.9.12 ) orc? ( >=dev-lang/orc-0.4.11 ) !<media-libs/gst-plugins-bad-0.10.10
 SLOT=0.10
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-0.10.35.tar.bz2
-_eclasses_=eutils	5a98daf52f7430a4a6f46cee24cfe3e2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	45847910ffbe4d8bfb814e3527de1920	gnome2-utils	0d2178d7f87923f3c110366ece3c930f	gst-plugins-base	f54aa7972b6084703cffa04d818342a3	gst-plugins10	cdf76f89776a74425daf6cd80706ab65	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=bebcbe960d1b5597ca6d19ae70671fbf
+_eclasses_=eutils	5a98daf52f7430a4a6f46cee24cfe3e2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	45847910ffbe4d8bfb814e3527de1920	gnome2-utils	0d2178d7f87923f3c110366ece3c930f	gst-plugins-base	721313f5c8b78f8c8c6a9d8ea3ee486a	gst-plugins10	cdf76f89776a74425daf6cd80706ab65	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=8141d06ecd19969467e491cd26dc04ba
diff --git a/metadata/md5-cache/media-libs/gst-plugins-base-0.10.36 b/metadata/md5-cache/media-libs/gst-plugins-base-0.10.36
new file mode 100644
index 000000000000..2d8a9957e873
--- /dev/null
+++ b/metadata/md5-cache/media-libs/gst-plugins-base-0.10.36
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
+DEPEND=>=dev-libs/glib-2.22:2 >=media-libs/gstreamer-0.10.36:0.10[introspection?] dev-libs/libxml2:2 sys-libs/zlib app-text/iso-codes introspection? ( >=dev-libs/gobject-introspection-0.9.12 ) orc? ( >=dev-lang/orc-0.4.11 ) !<media-libs/gst-plugins-bad-0.10.10 app-arch/xz-utils dev-util/gtk-doc-am virtual/pkgconfig nls? ( >=sys-devel/gettext-0.11.5 ) app-arch/xz-utils app-arch/xz-utils >=sys-apps/sed-4
+DESCRIPTION=Basepack of plugins for gstreamer
+EAPI=4
+HOMEPAGE=http://gstreamer.freedesktop.org/
+IUSE=+introspection nls +orc
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2+ LGPL-2+
+RDEPEND=>=dev-libs/glib-2.22:2 >=media-libs/gstreamer-0.10.36:0.10[introspection?] dev-libs/libxml2:2 sys-libs/zlib app-text/iso-codes introspection? ( >=dev-libs/gobject-introspection-0.9.12 ) orc? ( >=dev-lang/orc-0.4.11 ) !<media-libs/gst-plugins-bad-0.10.10
+SLOT=0.10
+SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-0.10.36.tar.xz
+_eclasses_=eutils	5a98daf52f7430a4a6f46cee24cfe3e2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	45847910ffbe4d8bfb814e3527de1920	gnome2-utils	0d2178d7f87923f3c110366ece3c930f	gst-plugins-base	721313f5c8b78f8c8c6a9d8ea3ee486a	gst-plugins10	cdf76f89776a74425daf6cd80706ab65	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=c1567661fe4cc707e9e24dd29b2a33fa
diff --git a/metadata/md5-cache/media-libs/gstreamer-0.10.32-r1 b/metadata/md5-cache/media-libs/gstreamer-0.10.32-r1
index fb02a65222bf..07e352de62b4 100644
--- a/metadata/md5-cache/media-libs/gstreamer-0.10.32-r1
+++ b/metadata/md5-cache/media-libs/gstreamer-0.10.32-r1
@@ -2,12 +2,12 @@ DEFINED_PHASES=configure install prepare
 DEPEND=>=dev-libs/glib-2.22:2 dev-libs/libxml2 introspection? ( >=dev-libs/gobject-introspection-0.6.3 ) !<media-libs/gst-plugins-base-0.10.26 sys-devel/bison sys-devel/flex virtual/pkgconfig nls? ( sys-devel/gettext )
 DESCRIPTION=Streaming media framework
 EAPI=2
-HOMEPAGE=http://gstreamer.sourceforge.net
+HOMEPAGE=http://gstreamer.freedesktop.org/
 IUSE=+introspection nls test
 KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd
-LICENSE=LGPL-2
+LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.22:2 dev-libs/libxml2 introspection? ( >=dev-libs/gobject-introspection-0.6.3 ) !<media-libs/gst-plugins-base-0.10.26
 SLOT=0.10
 SRC_URI=http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-0.10.32.tar.bz2
 _eclasses_=eutils	5a98daf52f7430a4a6f46cee24cfe3e2	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=3b186b84f62b46c558828ceddd623a8b
+_md5_=239193267094957daa780b4786ea0e41
diff --git a/metadata/md5-cache/media-libs/gstreamer-0.10.35 b/metadata/md5-cache/media-libs/gstreamer-0.10.35
index 8f697778c3fd..db96d80734dc 100644
--- a/metadata/md5-cache/media-libs/gstreamer-0.10.35
+++ b/metadata/md5-cache/media-libs/gstreamer-0.10.35
@@ -2,12 +2,12 @@ DEFINED_PHASES=configure install
 DEPEND=>=dev-libs/glib-2.22:2 dev-libs/libxml2 introspection? ( >=dev-libs/gobject-introspection-0.6.3 ) !<media-libs/gst-plugins-base-0.10.26 virtual/pkgconfig sys-devel/bison sys-devel/flex nls? ( sys-devel/gettext )
 DESCRIPTION=Streaming media framework
 EAPI=3
-HOMEPAGE=http://gstreamer.sourceforge.net
+HOMEPAGE=http://gstreamer.freedesktop.org/
 IUSE=+introspection nls test
 KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=LGPL-2
+LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.22:2 dev-libs/libxml2 introspection? ( >=dev-libs/gobject-introspection-0.6.3 ) !<media-libs/gst-plugins-base-0.10.26
 SLOT=0.10
 SRC_URI=http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-0.10.35.tar.bz2
 _eclasses_=eutils	5a98daf52f7430a4a6f46cee24cfe3e2	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=bab3c292dd38f1fbdc9ce7789e08c752
+_md5_=e5fa801c65d32a49124b5db31f92486c
diff --git a/metadata/md5-cache/media-libs/gstreamer-0.10.36 b/metadata/md5-cache/media-libs/gstreamer-0.10.36
new file mode 100644
index 000000000000..4684a40dbc42
--- /dev/null
+++ b/metadata/md5-cache/media-libs/gstreamer-0.10.36
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=>=dev-libs/glib-2.24:2 dev-libs/libxml2 introspection? ( >=dev-libs/gobject-introspection-0.6.8 ) !<media-libs/gst-plugins-base-0.10.26 app-arch/xz-utils dev-util/gtk-doc-am sys-devel/bison sys-devel/flex virtual/pkgconfig nls? ( sys-devel/gettext )
+DESCRIPTION=Streaming media framework
+EAPI=4
+HOMEPAGE=http://gstreamer.freedesktop.org/
+IUSE=+introspection nls test
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=LGPL-2+
+RDEPEND=>=dev-libs/glib-2.24:2 dev-libs/libxml2 introspection? ( >=dev-libs/gobject-introspection-0.6.8 ) !<media-libs/gst-plugins-base-0.10.26
+SLOT=0.10
+SRC_URI=http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-0.10.36.tar.xz
+_eclasses_=eutils	5a98daf52f7430a4a6f46cee24cfe3e2	multilib	9aa8a023e062fca0ba79362d9d0cc488	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=eac6f192fc00cc13b0e532b3353ca7d6
diff --git a/metadata/md5-cache/media-libs/libwebp-0.2.0 b/metadata/md5-cache/media-libs/libwebp-0.2.0
index afbf03f028f1..452bb50b1d6f 100644
--- a/metadata/md5-cache/media-libs/libwebp-0.2.0
+++ b/metadata/md5-cache/media-libs/libwebp-0.2.0
@@ -4,10 +4,10 @@ DESCRIPTION=A lossy image compression format
 EAPI=4
 HOMEPAGE=http://code.google.com/p/webp/
 IUSE=experimental static-libs
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ppc ppc64 x86 ~amd64-fbsd
+KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 x86 ~amd64-fbsd
 LICENSE=BSD
 RDEPEND=media-libs/libpng:0 media-libs/tiff:0 virtual/jpeg
 SLOT=0
 SRC_URI=http://webp.googlecode.com/files/libwebp-0.2.0.tar.gz
 _eclasses_=eutils	5a98daf52f7430a4a6f46cee24cfe3e2	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=ac7472e1b3f9fbc9424f983ac284301c
+_md5_=3384b46cd57a87cdfa5abf199f5b3e5a
diff --git a/metadata/md5-cache/media-libs/sdl-mixer-1.2.12-r1 b/metadata/md5-cache/media-libs/sdl-mixer-1.2.12-r1
index 07aff7276ae1..68e7fabcca79 100644
--- a/metadata/md5-cache/media-libs/sdl-mixer-1.2.12-r1
+++ b/metadata/md5-cache/media-libs/sdl-mixer-1.2.12-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Simple Direct Media Layer Mixer Library
 EAPI=4
 HOMEPAGE=http://www.libsdl.org/projects/SDL_mixer/
 IUSE=flac fluidsynth mad midi mikmod mod modplug mp3 playtools smpeg static-libs timidity vorbis +wav
-KEYWORDS=alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=ZLIB
 RDEPEND=>=media-libs/libsdl-1.2.10 flac? ( media-libs/flac ) midi? ( fluidsynth? ( media-sound/fluidsynth ) timidity? ( media-sound/timidity++ ) ) mp3? ( mad? ( media-libs/libmad ) smpeg? ( >=media-libs/smpeg-0.4.4-r1 ) ) mod? ( modplug? ( media-libs/libmodplug ) mikmod? ( >=media-libs/libmikmod-3.1.10 ) ) vorbis? ( >=media-libs/libvorbis-1.0_beta4 media-libs/libogg )
 REQUIRED_USE=midi? ( || ( timidity fluidsynth ) ) timidity? ( midi ) fluidsynth? ( midi ) mp3? ( || ( smpeg mad ) ) smpeg? ( mp3 ) mad? ( mp3 ) mod? ( || ( mikmod modplug ) ) mikmod? ( mod ) modplug? ( mod )
 SLOT=0
 SRC_URI=http://www.libsdl.org/projects/SDL_mixer/release/SDL_mixer-1.2.12.tar.gz
 _eclasses_=eutils	5a98daf52f7430a4a6f46cee24cfe3e2	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=823fb7c09c411255165c30420018a3bb
+_md5_=e099e6ad6ed242e76fa81481db45f424
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-alsa-0.10.32 b/metadata/md5-cache/media-plugins/gst-plugins-alsa-0.10.32
index ea4831c45714..46a75a929f20 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-alsa-0.10.32
+++ b/metadata/md5-cache/media-plugins/gst-plugins-alsa-0.10.32
@@ -8,5 +8,5 @@ RDEPEND=>=media-libs/alsa-lib-0.9.1 >=media-libs/gst-plugins-base-0.10.32
 RESTRICT=test
 SLOT=0.10
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-0.10.32.tar.bz2
-_eclasses_=eutils	5a98daf52f7430a4a6f46cee24cfe3e2	gst-plugins-base	f54aa7972b6084703cffa04d818342a3	gst-plugins10	cdf76f89776a74425daf6cd80706ab65	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	5a98daf52f7430a4a6f46cee24cfe3e2	gst-plugins-base	721313f5c8b78f8c8c6a9d8ea3ee486a	gst-plugins10	cdf76f89776a74425daf6cd80706ab65	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5b1c4fc1fd9a5d38df80c2a86fc7cc5e
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-alsa-0.10.35 b/metadata/md5-cache/media-plugins/gst-plugins-alsa-0.10.35
index f97e2d06cc80..132439cee979 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-alsa-0.10.35
+++ b/metadata/md5-cache/media-plugins/gst-plugins-alsa-0.10.35
@@ -8,5 +8,5 @@ RDEPEND=>=media-libs/alsa-lib-0.9.1 >=media-libs/gst-plugins-base-0.10.35
 RESTRICT=test
 SLOT=0.10
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-0.10.35.tar.bz2
-_eclasses_=eutils	5a98daf52f7430a4a6f46cee24cfe3e2	gst-plugins-base	f54aa7972b6084703cffa04d818342a3	gst-plugins10	cdf76f89776a74425daf6cd80706ab65	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	5a98daf52f7430a4a6f46cee24cfe3e2	gst-plugins-base	721313f5c8b78f8c8c6a9d8ea3ee486a	gst-plugins10	cdf76f89776a74425daf6cd80706ab65	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b28382bb508f20e0603d98f577405299
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-alsa-0.10.36 b/metadata/md5-cache/media-plugins/gst-plugins-alsa-0.10.36
new file mode 100644
index 000000000000..5564cbb1fbf3
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-alsa-0.10.36
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare unpack
+DEPEND=>=media-libs/alsa-lib-0.9.1 >=media-libs/gst-plugins-base-0.10.36 app-arch/xz-utils ~media-libs/gst-plugins-base-0.10.36 >=sys-apps/sed-4 virtual/pkgconfig
+DESCRIPTION=plugin for gstreamer
+EAPI=4
+HOMEPAGE=http://gstreamer.freedesktop.org/
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=>=media-libs/alsa-lib-0.9.1 >=media-libs/gst-plugins-base-0.10.36
+RESTRICT=test
+SLOT=0.10
+SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-0.10.36.tar.xz
+_eclasses_=eutils	5a98daf52f7430a4a6f46cee24cfe3e2	gst-plugins-base	721313f5c8b78f8c8c6a9d8ea3ee486a	gst-plugins10	cdf76f89776a74425daf6cd80706ab65	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=d0768c1c3991ac51f99c2fcd43278a54
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-cdparanoia-0.10.32 b/metadata/md5-cache/media-plugins/gst-plugins-cdparanoia-0.10.32
index 66858fcc6e4e..adbe9c0ee7d5 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-cdparanoia-0.10.32
+++ b/metadata/md5-cache/media-plugins/gst-plugins-cdparanoia-0.10.32
@@ -8,5 +8,5 @@ RDEPEND=>=media-sound/cdparanoia-3.10.2-r3 >=media-libs/gst-plugins-base-0.10.32
 RESTRICT=test
 SLOT=0.10
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-0.10.32.tar.bz2
-_eclasses_=eutils	5a98daf52f7430a4a6f46cee24cfe3e2	gst-plugins-base	f54aa7972b6084703cffa04d818342a3	gst-plugins10	cdf76f89776a74425daf6cd80706ab65	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	5a98daf52f7430a4a6f46cee24cfe3e2	gst-plugins-base	721313f5c8b78f8c8c6a9d8ea3ee486a	gst-plugins10	cdf76f89776a74425daf6cd80706ab65	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4b2ea6db2ac4ae85867cc7ca1ab94d28
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-cdparanoia-0.10.35 b/metadata/md5-cache/media-plugins/gst-plugins-cdparanoia-0.10.35
index 784f64a3d134..72cd3b07da24 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-cdparanoia-0.10.35
+++ b/metadata/md5-cache/media-plugins/gst-plugins-cdparanoia-0.10.35
@@ -8,5 +8,5 @@ RDEPEND=>=media-sound/cdparanoia-3.10.2-r3 >=media-libs/gst-plugins-base-0.10.35
 RESTRICT=test
 SLOT=0.10
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-0.10.35.tar.bz2
-_eclasses_=eutils	5a98daf52f7430a4a6f46cee24cfe3e2	gst-plugins-base	f54aa7972b6084703cffa04d818342a3	gst-plugins10	cdf76f89776a74425daf6cd80706ab65	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	5a98daf52f7430a4a6f46cee24cfe3e2	gst-plugins-base	721313f5c8b78f8c8c6a9d8ea3ee486a	gst-plugins10	cdf76f89776a74425daf6cd80706ab65	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d3de7f7987a9535f55cef39bdc34d919
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-cdparanoia-0.10.36 b/metadata/md5-cache/media-plugins/gst-plugins-cdparanoia-0.10.36
new file mode 100644
index 000000000000..325716a1ea5a
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-cdparanoia-0.10.36
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare unpack
+DEPEND=>=media-sound/cdparanoia-3.10.2-r3 >=media-libs/gst-plugins-base-0.10.36 app-arch/xz-utils ~media-libs/gst-plugins-base-0.10.36 >=sys-apps/sed-4 virtual/pkgconfig
+DESCRIPTION=plugin for gstreamer
+EAPI=4
+HOMEPAGE=http://gstreamer.freedesktop.org/
+KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=media-sound/cdparanoia-3.10.2-r3 >=media-libs/gst-plugins-base-0.10.36
+RESTRICT=test
+SLOT=0.10
+SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-0.10.36.tar.xz
+_eclasses_=eutils	5a98daf52f7430a4a6f46cee24cfe3e2	gst-plugins-base	721313f5c8b78f8c8c6a9d8ea3ee486a	gst-plugins10	cdf76f89776a74425daf6cd80706ab65	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=a32aaecbe4c6e52559879c17fa534c91
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-faac-0.10.22 b/metadata/md5-cache/media-plugins/gst-plugins-faac-0.10.22
index b6f23c0ab79f..a504f74b514e 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-faac-0.10.22
+++ b/metadata/md5-cache/media-plugins/gst-plugins-faac-0.10.22
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile install unpack
 DEPEND=media-libs/faac >=media-libs/gst-plugins-base-0.10.33 =media-libs/gstreamer-0.10* =media-libs/gst-plugins-base-0.10* >=dev-libs/glib-2.6 sys-apps/sed virtual/pkgconfig sys-devel/gettext
 DESCRIPTION=plugin for gstreamer
 HOMEPAGE=http://gstreamer.freedesktop.org/
-KEYWORDS=alpha amd64 ppc ppc64 x86
+KEYWORDS=alpha amd64 ~arm ppc ppc64 x86
 LICENSE=GPL-2
 RDEPEND=media-libs/faac >=media-libs/gst-plugins-base-0.10.33 =media-libs/gstreamer-0.10* =media-libs/gst-plugins-base-0.10* >=dev-libs/glib-2.6
 RESTRICT=test
 SLOT=0.10
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-0.10.22.tar.bz2
 _eclasses_=eutils	5a98daf52f7430a4a6f46cee24cfe3e2	gst-plugins-bad	6ae20fe5c472344fe2d4e8b6ecf9eb11	gst-plugins10	cdf76f89776a74425daf6cd80706ab65	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=b4b0cfd00544c2cd300c7c452f73956d
+_md5_=70819bac62900ff379a585fcc4531280
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-gio-0.10.32 b/metadata/md5-cache/media-plugins/gst-plugins-gio-0.10.32
index 72823765cd11..cce88657e685 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-gio-0.10.32
+++ b/metadata/md5-cache/media-plugins/gst-plugins-gio-0.10.32
@@ -8,5 +8,5 @@ RDEPEND=>=dev-libs/glib-2.16 >=media-libs/gst-plugins-base-0.10.32
 RESTRICT=test
 SLOT=0.10
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-0.10.32.tar.bz2
-_eclasses_=eutils	5a98daf52f7430a4a6f46cee24cfe3e2	gst-plugins-base	f54aa7972b6084703cffa04d818342a3	gst-plugins10	cdf76f89776a74425daf6cd80706ab65	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	5a98daf52f7430a4a6f46cee24cfe3e2	gst-plugins-base	721313f5c8b78f8c8c6a9d8ea3ee486a	gst-plugins10	cdf76f89776a74425daf6cd80706ab65	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7742485470d42765796f698f70d96dc5
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-gio-0.10.35 b/metadata/md5-cache/media-plugins/gst-plugins-gio-0.10.35
index 35bc5e16c3e4..d457e589e3c4 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-gio-0.10.35
+++ b/metadata/md5-cache/media-plugins/gst-plugins-gio-0.10.35
@@ -8,5 +8,5 @@ RDEPEND=>=dev-libs/glib-2.16 >=media-libs/gst-plugins-base-0.10.35
 RESTRICT=test
 SLOT=0.10
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-0.10.35.tar.bz2
-_eclasses_=eutils	5a98daf52f7430a4a6f46cee24cfe3e2	gst-plugins-base	f54aa7972b6084703cffa04d818342a3	gst-plugins10	cdf76f89776a74425daf6cd80706ab65	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	5a98daf52f7430a4a6f46cee24cfe3e2	gst-plugins-base	721313f5c8b78f8c8c6a9d8ea3ee486a	gst-plugins10	cdf76f89776a74425daf6cd80706ab65	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b3840e065b1c3ea27bc770eacc640f4a
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-gio-0.10.36 b/metadata/md5-cache/media-plugins/gst-plugins-gio-0.10.36
new file mode 100644
index 000000000000..3e2dd527863e
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-gio-0.10.36
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare unpack
+DEPEND=>=dev-libs/glib-2.16:2 >=media-libs/gst-plugins-base-0.10.36 app-arch/xz-utils ~media-libs/gst-plugins-base-0.10.36 >=sys-apps/sed-4 virtual/pkgconfig
+DESCRIPTION=plugin for gstreamer
+EAPI=4
+HOMEPAGE=http://gstreamer.freedesktop.org/
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/glib-2.16:2 >=media-libs/gst-plugins-base-0.10.36
+RESTRICT=test
+SLOT=0.10
+SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-0.10.36.tar.xz
+_eclasses_=eutils	5a98daf52f7430a4a6f46cee24cfe3e2	gst-plugins-base	721313f5c8b78f8c8c6a9d8ea3ee486a	gst-plugins10	cdf76f89776a74425daf6cd80706ab65	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=529fe770d0ebd2cfba62fa2dcdee826c
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-gnomevfs-0.10.32 b/metadata/md5-cache/media-plugins/gst-plugins-gnomevfs-0.10.32
index 92e8aa546047..3d15097afa08 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-gnomevfs-0.10.32
+++ b/metadata/md5-cache/media-plugins/gst-plugins-gnomevfs-0.10.32
@@ -8,5 +8,5 @@ RDEPEND=>=gnome-base/gnome-vfs-2 >=media-libs/gst-plugins-base-0.10.32
 RESTRICT=test
 SLOT=0.10
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-0.10.32.tar.bz2
-_eclasses_=eutils	5a98daf52f7430a4a6f46cee24cfe3e2	gst-plugins-base	f54aa7972b6084703cffa04d818342a3	gst-plugins10	cdf76f89776a74425daf6cd80706ab65	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	5a98daf52f7430a4a6f46cee24cfe3e2	gst-plugins-base	721313f5c8b78f8c8c6a9d8ea3ee486a	gst-plugins10	cdf76f89776a74425daf6cd80706ab65	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b3c3e4417c44cbd61f0ee1cecc546bf9
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-gnomevfs-0.10.35 b/metadata/md5-cache/media-plugins/gst-plugins-gnomevfs-0.10.35
index 4028ad07af9d..f90fe36b583b 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-gnomevfs-0.10.35
+++ b/metadata/md5-cache/media-plugins/gst-plugins-gnomevfs-0.10.35
@@ -8,5 +8,5 @@ RDEPEND=>=gnome-base/gnome-vfs-2 >=media-libs/gst-plugins-base-0.10.35
 RESTRICT=test
 SLOT=0.10
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-0.10.35.tar.bz2
-_eclasses_=eutils	5a98daf52f7430a4a6f46cee24cfe3e2	gst-plugins-base	f54aa7972b6084703cffa04d818342a3	gst-plugins10	cdf76f89776a74425daf6cd80706ab65	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	5a98daf52f7430a4a6f46cee24cfe3e2	gst-plugins-base	721313f5c8b78f8c8c6a9d8ea3ee486a	gst-plugins10	cdf76f89776a74425daf6cd80706ab65	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7dfa414cc403fd743f65a0af2cc878f4
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-gnomevfs-0.10.36 b/metadata/md5-cache/media-plugins/gst-plugins-gnomevfs-0.10.36
new file mode 100644
index 000000000000..c0294f1454d7
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-gnomevfs-0.10.36
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare unpack
+DEPEND=>=gnome-base/gnome-vfs-2:2 >=media-libs/gst-plugins-base-0.10.36 app-arch/xz-utils ~media-libs/gst-plugins-base-0.10.36 >=sys-apps/sed-4 virtual/pkgconfig
+DESCRIPTION=plugin for gstreamer
+EAPI=4
+HOMEPAGE=http://gstreamer.freedesktop.org/
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=>=gnome-base/gnome-vfs-2:2 >=media-libs/gst-plugins-base-0.10.36
+RESTRICT=test
+SLOT=0.10
+SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-0.10.36.tar.xz
+_eclasses_=eutils	5a98daf52f7430a4a6f46cee24cfe3e2	gst-plugins-base	721313f5c8b78f8c8c6a9d8ea3ee486a	gst-plugins10	cdf76f89776a74425daf6cd80706ab65	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=46b586fb53a5786758d0821faff18156
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-lame-0.10.18 b/metadata/md5-cache/media-plugins/gst-plugins-lame-0.10.18
index 6359ceb5e0a2..ee3906d8abba 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-lame-0.10.18
+++ b/metadata/md5-cache/media-plugins/gst-plugins-lame-0.10.18
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile install unpack
 DEPEND=>=media-sound/lame-3.95 >=media-libs/gstreamer-0.10.26 >=media-libs/gst-plugins-base-0.10.26 =media-libs/gst-plugins-base-0.10* >=sys-apps/sed-4 virtual/pkgconfig
 DESCRIPTION=plugin for gstreamer
 HOMEPAGE=http://gstreamer.freedesktop.org/
-KEYWORDS=alpha amd64 hppa ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 ~arm hppa ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=media-sound/lame-3.95 >=media-libs/gstreamer-0.10.26 >=media-libs/gst-plugins-base-0.10.26 =media-libs/gst-plugins-base-0.10*
 RESTRICT=test
 SLOT=0.10
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-0.10.18.tar.bz2
 _eclasses_=eutils	5a98daf52f7430a4a6f46cee24cfe3e2	gst-plugins-ugly	880ab5c0b66df7c4feaff2cc97c8174c	gst-plugins10	cdf76f89776a74425daf6cd80706ab65	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=f5492e95444731b067783eca9969c7f3
+_md5_=35419bf24c85a52cb400d0af80e3566c
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-libvisual-0.10.32 b/metadata/md5-cache/media-plugins/gst-plugins-libvisual-0.10.32
index 8a0271ebb1f4..9d853c55e5eb 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-libvisual-0.10.32
+++ b/metadata/md5-cache/media-plugins/gst-plugins-libvisual-0.10.32
@@ -8,5 +8,5 @@ RDEPEND=>=media-libs/libvisual-0.4 >=media-plugins/libvisual-plugins-0.4 >=media
 RESTRICT=test
 SLOT=0.10
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-0.10.32.tar.bz2
-_eclasses_=eutils	5a98daf52f7430a4a6f46cee24cfe3e2	gst-plugins-base	f54aa7972b6084703cffa04d818342a3	gst-plugins10	cdf76f89776a74425daf6cd80706ab65	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	5a98daf52f7430a4a6f46cee24cfe3e2	gst-plugins-base	721313f5c8b78f8c8c6a9d8ea3ee486a	gst-plugins10	cdf76f89776a74425daf6cd80706ab65	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=883a8202fa6138be9cee62f294d2973e
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-libvisual-0.10.35 b/metadata/md5-cache/media-plugins/gst-plugins-libvisual-0.10.35
index 64ea8d36c29e..899b4b7fdc36 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-libvisual-0.10.35
+++ b/metadata/md5-cache/media-plugins/gst-plugins-libvisual-0.10.35
@@ -8,5 +8,5 @@ RDEPEND=>=media-libs/libvisual-0.4 >=media-plugins/libvisual-plugins-0.4 >=media
 RESTRICT=test
 SLOT=0.10
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-0.10.35.tar.bz2
-_eclasses_=eutils	5a98daf52f7430a4a6f46cee24cfe3e2	gst-plugins-base	f54aa7972b6084703cffa04d818342a3	gst-plugins10	cdf76f89776a74425daf6cd80706ab65	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	5a98daf52f7430a4a6f46cee24cfe3e2	gst-plugins-base	721313f5c8b78f8c8c6a9d8ea3ee486a	gst-plugins10	cdf76f89776a74425daf6cd80706ab65	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=87f62950301649990b0be6d4387ece81
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-libvisual-0.10.36 b/metadata/md5-cache/media-plugins/gst-plugins-libvisual-0.10.36
new file mode 100644
index 000000000000..ff338cc11efc
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-libvisual-0.10.36
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare unpack
+DEPEND=>=media-libs/libvisual-0.4 >=media-plugins/libvisual-plugins-0.4 >=media-libs/gst-plugins-base-0.10.36 app-arch/xz-utils ~media-libs/gst-plugins-base-0.10.36 >=sys-apps/sed-4 virtual/pkgconfig
+DESCRIPTION=plugin for gstreamer
+EAPI=4
+HOMEPAGE=http://gstreamer.freedesktop.org/
+KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd
+LICENSE=GPL-2
+RDEPEND=>=media-libs/libvisual-0.4 >=media-plugins/libvisual-plugins-0.4 >=media-libs/gst-plugins-base-0.10.36
+RESTRICT=test
+SLOT=0.10
+SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-0.10.36.tar.xz
+_eclasses_=eutils	5a98daf52f7430a4a6f46cee24cfe3e2	gst-plugins-base	721313f5c8b78f8c8c6a9d8ea3ee486a	gst-plugins10	cdf76f89776a74425daf6cd80706ab65	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=14419516d83e5cdfca4d28efd471c1d9
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-ogg-0.10.32 b/metadata/md5-cache/media-plugins/gst-plugins-ogg-0.10.32
index c6499f019ec2..1765d3c2a4f0 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-ogg-0.10.32
+++ b/metadata/md5-cache/media-plugins/gst-plugins-ogg-0.10.32
@@ -8,5 +8,5 @@ RDEPEND=>=media-libs/libogg-1.0 >=media-libs/gst-plugins-base-0.10.32
 RESTRICT=test
 SLOT=0.10
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-0.10.32.tar.bz2
-_eclasses_=eutils	5a98daf52f7430a4a6f46cee24cfe3e2	gst-plugins-base	f54aa7972b6084703cffa04d818342a3	gst-plugins10	cdf76f89776a74425daf6cd80706ab65	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	5a98daf52f7430a4a6f46cee24cfe3e2	gst-plugins-base	721313f5c8b78f8c8c6a9d8ea3ee486a	gst-plugins10	cdf76f89776a74425daf6cd80706ab65	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6ff1df7c251df2ff2d88069d410f3c4d
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-ogg-0.10.35 b/metadata/md5-cache/media-plugins/gst-plugins-ogg-0.10.35
index 7b5ede80a7e3..21a1a9f1cd94 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-ogg-0.10.35
+++ b/metadata/md5-cache/media-plugins/gst-plugins-ogg-0.10.35
@@ -8,5 +8,5 @@ RDEPEND=>=media-libs/libogg-1.0 >=media-libs/gst-plugins-base-0.10.35
 RESTRICT=test
 SLOT=0.10
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-0.10.35.tar.bz2
-_eclasses_=eutils	5a98daf52f7430a4a6f46cee24cfe3e2	gst-plugins-base	f54aa7972b6084703cffa04d818342a3	gst-plugins10	cdf76f89776a74425daf6cd80706ab65	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	5a98daf52f7430a4a6f46cee24cfe3e2	gst-plugins-base	721313f5c8b78f8c8c6a9d8ea3ee486a	gst-plugins10	cdf76f89776a74425daf6cd80706ab65	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5c370289cb516ca5f4cfd3405ef3e4ea
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-ogg-0.10.36 b/metadata/md5-cache/media-plugins/gst-plugins-ogg-0.10.36
new file mode 100644
index 000000000000..0971996a8ef0
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-ogg-0.10.36
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare unpack
+DEPEND=>=media-libs/libogg-1.0 >=media-libs/gst-plugins-base-0.10.36 app-arch/xz-utils ~media-libs/gst-plugins-base-0.10.36 >=sys-apps/sed-4 virtual/pkgconfig
+DESCRIPTION=plugin for gstreamer
+EAPI=4
+HOMEPAGE=http://gstreamer.freedesktop.org/
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos
+LICENSE=GPL-2
+RDEPEND=>=media-libs/libogg-1.0 >=media-libs/gst-plugins-base-0.10.36
+RESTRICT=test
+SLOT=0.10
+SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-0.10.36.tar.xz
+_eclasses_=eutils	5a98daf52f7430a4a6f46cee24cfe3e2	gst-plugins-base	721313f5c8b78f8c8c6a9d8ea3ee486a	gst-plugins10	cdf76f89776a74425daf6cd80706ab65	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=a3abff7aec350bd0ba9ada3a175b998c
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-pango-0.10.32 b/metadata/md5-cache/media-plugins/gst-plugins-pango-0.10.32
index 5ac9905ccfbb..4676d32c54f0 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-pango-0.10.32
+++ b/metadata/md5-cache/media-plugins/gst-plugins-pango-0.10.32
@@ -8,5 +8,5 @@ RDEPEND=>=x11-libs/pango-1.16 >=media-libs/gst-plugins-base-0.10.32
 RESTRICT=test
 SLOT=0.10
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-0.10.32.tar.bz2
-_eclasses_=eutils	5a98daf52f7430a4a6f46cee24cfe3e2	gst-plugins-base	f54aa7972b6084703cffa04d818342a3	gst-plugins10	cdf76f89776a74425daf6cd80706ab65	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	5a98daf52f7430a4a6f46cee24cfe3e2	gst-plugins-base	721313f5c8b78f8c8c6a9d8ea3ee486a	gst-plugins10	cdf76f89776a74425daf6cd80706ab65	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=879abdece3471149dabf0ee0a1fb3f3a
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-pango-0.10.35 b/metadata/md5-cache/media-plugins/gst-plugins-pango-0.10.35
index 9f6c6fac7fd2..0a1593b936c3 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-pango-0.10.35
+++ b/metadata/md5-cache/media-plugins/gst-plugins-pango-0.10.35
@@ -8,5 +8,5 @@ RDEPEND=>=x11-libs/pango-1.16 >=media-libs/gst-plugins-base-0.10.35
 RESTRICT=test
 SLOT=0.10
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-0.10.35.tar.bz2
-_eclasses_=eutils	5a98daf52f7430a4a6f46cee24cfe3e2	gst-plugins-base	f54aa7972b6084703cffa04d818342a3	gst-plugins10	cdf76f89776a74425daf6cd80706ab65	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	5a98daf52f7430a4a6f46cee24cfe3e2	gst-plugins-base	721313f5c8b78f8c8c6a9d8ea3ee486a	gst-plugins10	cdf76f89776a74425daf6cd80706ab65	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c5b0a5e2600f180a8c4d587502d01e70
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-pango-0.10.36 b/metadata/md5-cache/media-plugins/gst-plugins-pango-0.10.36
new file mode 100644
index 000000000000..04e8143ddf00
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-pango-0.10.36
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare unpack
+DEPEND=>=x11-libs/pango-1.16 >=media-libs/gst-plugins-base-0.10.36 app-arch/xz-utils ~media-libs/gst-plugins-base-0.10.36 >=sys-apps/sed-4 virtual/pkgconfig
+DESCRIPTION=plugin for gstreamer
+EAPI=4
+HOMEPAGE=http://gstreamer.freedesktop.org/
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=>=x11-libs/pango-1.16 >=media-libs/gst-plugins-base-0.10.36
+RESTRICT=test
+SLOT=0.10
+SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-0.10.36.tar.xz
+_eclasses_=eutils	5a98daf52f7430a4a6f46cee24cfe3e2	gst-plugins-base	721313f5c8b78f8c8c6a9d8ea3ee486a	gst-plugins10	cdf76f89776a74425daf6cd80706ab65	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=aae0351ce7b23892143530a30ebe902f
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-theora-0.10.32 b/metadata/md5-cache/media-plugins/gst-plugins-theora-0.10.32
index b36d6f5d4d19..5e0aa10f77ae 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-theora-0.10.32
+++ b/metadata/md5-cache/media-plugins/gst-plugins-theora-0.10.32
@@ -9,5 +9,5 @@ RDEPEND=>=media-libs/libtheora-1.1[encode] media-libs/libogg >=media-libs/gst-pl
 RESTRICT=test
 SLOT=0.10
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-0.10.32.tar.bz2
-_eclasses_=eutils	5a98daf52f7430a4a6f46cee24cfe3e2	gst-plugins-base	f54aa7972b6084703cffa04d818342a3	gst-plugins10	cdf76f89776a74425daf6cd80706ab65	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	5a98daf52f7430a4a6f46cee24cfe3e2	gst-plugins-base	721313f5c8b78f8c8c6a9d8ea3ee486a	gst-plugins10	cdf76f89776a74425daf6cd80706ab65	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6802aa723f8dabd217bfe172ac77edca
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-theora-0.10.35 b/metadata/md5-cache/media-plugins/gst-plugins-theora-0.10.35
index 7dfab9284af6..4cd9f231d5ac 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-theora-0.10.35
+++ b/metadata/md5-cache/media-plugins/gst-plugins-theora-0.10.35
@@ -9,5 +9,5 @@ RDEPEND=>=media-libs/libtheora-1.1[encode] media-libs/libogg >=media-libs/gst-pl
 RESTRICT=test
 SLOT=0.10
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-0.10.35.tar.bz2
-_eclasses_=eutils	5a98daf52f7430a4a6f46cee24cfe3e2	gst-plugins-base	f54aa7972b6084703cffa04d818342a3	gst-plugins10	cdf76f89776a74425daf6cd80706ab65	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	5a98daf52f7430a4a6f46cee24cfe3e2	gst-plugins-base	721313f5c8b78f8c8c6a9d8ea3ee486a	gst-plugins10	cdf76f89776a74425daf6cd80706ab65	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5a3cf8afb5fa2ca1c6a8189a19d0b862
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-theora-0.10.36 b/metadata/md5-cache/media-plugins/gst-plugins-theora-0.10.36
new file mode 100644
index 000000000000..cd6280d5cab0
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-theora-0.10.36
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare unpack
+DEPEND=>=media-libs/libtheora-1.1[encode] media-libs/libogg >=media-libs/gst-plugins-base-0.10.36 app-arch/xz-utils ~media-libs/gst-plugins-base-0.10.36 >=sys-apps/sed-4 virtual/pkgconfig
+DESCRIPTION=plugin for gstreamer
+EAPI=4
+HOMEPAGE=http://gstreamer.freedesktop.org/
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=>=media-libs/libtheora-1.1[encode] media-libs/libogg >=media-libs/gst-plugins-base-0.10.36
+RESTRICT=test
+SLOT=0.10
+SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-0.10.36.tar.xz
+_eclasses_=eutils	5a98daf52f7430a4a6f46cee24cfe3e2	gst-plugins-base	721313f5c8b78f8c8c6a9d8ea3ee486a	gst-plugins10	cdf76f89776a74425daf6cd80706ab65	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=33d78460d594fbd449802987065a2a10
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-twolame-0.10.18 b/metadata/md5-cache/media-plugins/gst-plugins-twolame-0.10.18
index e2cb399f0a76..22c2be5d56c9 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-twolame-0.10.18
+++ b/metadata/md5-cache/media-plugins/gst-plugins-twolame-0.10.18
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile install unpack
 DEPEND=>=media-sound/twolame-0.3.10 >=media-libs/gstreamer-0.10.26 >=media-libs/gst-plugins-base-0.10.26 =media-libs/gst-plugins-base-0.10* >=sys-apps/sed-4 virtual/pkgconfig
 DESCRIPTION=plugin for gstreamer
 HOMEPAGE=http://gstreamer.freedesktop.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
+KEYWORDS=alpha amd64 ~arm ppc ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=>=media-sound/twolame-0.3.10 >=media-libs/gstreamer-0.10.26 >=media-libs/gst-plugins-base-0.10.26 =media-libs/gst-plugins-base-0.10*
 RESTRICT=test
 SLOT=0.10
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-0.10.18.tar.bz2
 _eclasses_=eutils	5a98daf52f7430a4a6f46cee24cfe3e2	gst-plugins-ugly	880ab5c0b66df7c4feaff2cc97c8174c	gst-plugins10	cdf76f89776a74425daf6cd80706ab65	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=eae1b11a4a3fcd4668d29cf5a48a5c23
+_md5_=5e53e1421eaed3f2c7bc90fd062a2acb
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-vorbis-0.10.32 b/metadata/md5-cache/media-plugins/gst-plugins-vorbis-0.10.32
index 3fd558555705..99c6f20fc1ee 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-vorbis-0.10.32
+++ b/metadata/md5-cache/media-plugins/gst-plugins-vorbis-0.10.32
@@ -8,5 +8,5 @@ RDEPEND=>=media-libs/libvorbis-1.0 >=media-libs/libogg-1.0 >=media-libs/gst-plug
 RESTRICT=test
 SLOT=0.10
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-0.10.32.tar.bz2
-_eclasses_=eutils	5a98daf52f7430a4a6f46cee24cfe3e2	gst-plugins-base	f54aa7972b6084703cffa04d818342a3	gst-plugins10	cdf76f89776a74425daf6cd80706ab65	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	5a98daf52f7430a4a6f46cee24cfe3e2	gst-plugins-base	721313f5c8b78f8c8c6a9d8ea3ee486a	gst-plugins10	cdf76f89776a74425daf6cd80706ab65	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=13d7b513deb3a314869ae0c84af63603
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-vorbis-0.10.35 b/metadata/md5-cache/media-plugins/gst-plugins-vorbis-0.10.35
index 3b3f2ede5399..7b087e2a764e 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-vorbis-0.10.35
+++ b/metadata/md5-cache/media-plugins/gst-plugins-vorbis-0.10.35
@@ -8,5 +8,5 @@ RDEPEND=>=media-libs/libvorbis-1.0 >=media-libs/libogg-1.0 >=media-libs/gst-plug
 RESTRICT=test
 SLOT=0.10
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-0.10.35.tar.bz2
-_eclasses_=eutils	5a98daf52f7430a4a6f46cee24cfe3e2	gst-plugins-base	f54aa7972b6084703cffa04d818342a3	gst-plugins10	cdf76f89776a74425daf6cd80706ab65	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	5a98daf52f7430a4a6f46cee24cfe3e2	gst-plugins-base	721313f5c8b78f8c8c6a9d8ea3ee486a	gst-plugins10	cdf76f89776a74425daf6cd80706ab65	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=be6c41ecc3b180764e8ede6a4e5883c2
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-vorbis-0.10.36 b/metadata/md5-cache/media-plugins/gst-plugins-vorbis-0.10.36
new file mode 100644
index 000000000000..d44e6a88de4b
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-vorbis-0.10.36
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare unpack
+DEPEND=>=media-libs/libvorbis-1.0 >=media-libs/libogg-1.0 >=media-libs/gst-plugins-base-0.10.36 app-arch/xz-utils ~media-libs/gst-plugins-base-0.10.36 >=sys-apps/sed-4 virtual/pkgconfig
+DESCRIPTION=plugin for gstreamer
+EAPI=4
+HOMEPAGE=http://gstreamer.freedesktop.org/
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos
+LICENSE=GPL-2
+RDEPEND=>=media-libs/libvorbis-1.0 >=media-libs/libogg-1.0 >=media-libs/gst-plugins-base-0.10.36
+RESTRICT=test
+SLOT=0.10
+SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-0.10.36.tar.xz
+_eclasses_=eutils	5a98daf52f7430a4a6f46cee24cfe3e2	gst-plugins-base	721313f5c8b78f8c8c6a9d8ea3ee486a	gst-plugins10	cdf76f89776a74425daf6cd80706ab65	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=e684be4782c4e0d6acaa9e1efae8c687
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-x-0.10.32 b/metadata/md5-cache/media-plugins/gst-plugins-x-0.10.32
index 78c118ee5b7e..6e20d91971ef 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-x-0.10.32
+++ b/metadata/md5-cache/media-plugins/gst-plugins-x-0.10.32
@@ -8,5 +8,5 @@ RDEPEND=x11-libs/libX11 x11-libs/libXext >=media-libs/gst-plugins-base-0.10.32
 RESTRICT=test
 SLOT=0.10
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-0.10.32.tar.bz2
-_eclasses_=eutils	5a98daf52f7430a4a6f46cee24cfe3e2	gst-plugins-base	f54aa7972b6084703cffa04d818342a3	gst-plugins10	cdf76f89776a74425daf6cd80706ab65	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	5a98daf52f7430a4a6f46cee24cfe3e2	gst-plugins-base	721313f5c8b78f8c8c6a9d8ea3ee486a	gst-plugins10	cdf76f89776a74425daf6cd80706ab65	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9ecb9c2a458ce193d0970ebe785d5725
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-x-0.10.35 b/metadata/md5-cache/media-plugins/gst-plugins-x-0.10.35
index bb2b5b16bf30..147990c70be0 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-x-0.10.35
+++ b/metadata/md5-cache/media-plugins/gst-plugins-x-0.10.35
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=x11-libs/libX11 x11-libs/libXext x11-proto/xproto x11-proto/xextproto >=media-libs/gst-plugins-base-0.10.35 ~media-libs/gst-plugins-base-0.10.35 >=sys-apps/sed-4 virtual/pkgconfig
+DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libSM x11-libs/libICE x11-proto/xproto x11-proto/xextproto >=media-libs/gst-plugins-base-0.10.35 ~media-libs/gst-plugins-base-0.10.35 >=sys-apps/sed-4 virtual/pkgconfig
 DESCRIPTION=plugin for gstreamer
 HOMEPAGE=http://gstreamer.freedesktop.org/
 KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=GPL-2
-RDEPEND=x11-libs/libX11 x11-libs/libXext >=media-libs/gst-plugins-base-0.10.35
+RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libSM x11-libs/libICE >=media-libs/gst-plugins-base-0.10.35
 RESTRICT=test
 SLOT=0.10
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-0.10.35.tar.bz2
-_eclasses_=eutils	5a98daf52f7430a4a6f46cee24cfe3e2	gst-plugins-base	f54aa7972b6084703cffa04d818342a3	gst-plugins10	cdf76f89776a74425daf6cd80706ab65	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=6f923a50fce1b4ba4f2a8f62c868d23c
+_eclasses_=eutils	5a98daf52f7430a4a6f46cee24cfe3e2	gst-plugins-base	721313f5c8b78f8c8c6a9d8ea3ee486a	gst-plugins10	cdf76f89776a74425daf6cd80706ab65	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=3bd418524830dbac02365a5c6434a1b5
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-x-0.10.35-r1 b/metadata/md5-cache/media-plugins/gst-plugins-x-0.10.35-r1
index 035788b76b19..2eb8dc32e6ff 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-x-0.10.35-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-x-0.10.35-r1
@@ -9,5 +9,5 @@ RDEPEND=x11-libs/libX11 x11-libs/libXext >=media-libs/gst-plugins-base-0.10.35
 RESTRICT=test
 SLOT=0.10
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-0.10.35.tar.bz2
-_eclasses_=eutils	5a98daf52f7430a4a6f46cee24cfe3e2	gst-plugins-base	f54aa7972b6084703cffa04d818342a3	gst-plugins10	cdf76f89776a74425daf6cd80706ab65	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	5a98daf52f7430a4a6f46cee24cfe3e2	gst-plugins-base	721313f5c8b78f8c8c6a9d8ea3ee486a	gst-plugins10	cdf76f89776a74425daf6cd80706ab65	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8753887a2d3fd1dc34d4cca6cfcccd24
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-x-0.10.36 b/metadata/md5-cache/media-plugins/gst-plugins-x-0.10.36
new file mode 100644
index 000000000000..d38828404a44
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-x-0.10.36
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare unpack
+DEPEND=x11-libs/libX11 x11-libs/libXext x11-proto/xproto x11-proto/xextproto >=media-libs/gst-plugins-base-0.10.36 app-arch/xz-utils ~media-libs/gst-plugins-base-0.10.36 >=sys-apps/sed-4 virtual/pkgconfig
+DESCRIPTION=plugin for gstreamer
+EAPI=4
+HOMEPAGE=http://gstreamer.freedesktop.org/
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=x11-libs/libX11 x11-libs/libXext >=media-libs/gst-plugins-base-0.10.36
+RESTRICT=test
+SLOT=0.10
+SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-0.10.36.tar.xz
+_eclasses_=eutils	5a98daf52f7430a4a6f46cee24cfe3e2	gst-plugins-base	721313f5c8b78f8c8c6a9d8ea3ee486a	gst-plugins10	cdf76f89776a74425daf6cd80706ab65	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=21e0c015924a3ea1a8d76566c12bc867
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-xvideo-0.10.32 b/metadata/md5-cache/media-plugins/gst-plugins-xvideo-0.10.32
index 91fad7487d5a..8989ae9ac62c 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-xvideo-0.10.32
+++ b/metadata/md5-cache/media-plugins/gst-plugins-xvideo-0.10.32
@@ -8,5 +8,5 @@ RDEPEND=x11-libs/libXv x11-libs/libXext >=media-libs/gst-plugins-base-0.10.32
 RESTRICT=test
 SLOT=0.10
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-0.10.32.tar.bz2
-_eclasses_=eutils	5a98daf52f7430a4a6f46cee24cfe3e2	gst-plugins-base	f54aa7972b6084703cffa04d818342a3	gst-plugins10	cdf76f89776a74425daf6cd80706ab65	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	5a98daf52f7430a4a6f46cee24cfe3e2	gst-plugins-base	721313f5c8b78f8c8c6a9d8ea3ee486a	gst-plugins10	cdf76f89776a74425daf6cd80706ab65	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7c22ee6659fc4bbb8d27a60a5f30b8bd
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-xvideo-0.10.35 b/metadata/md5-cache/media-plugins/gst-plugins-xvideo-0.10.35
index dfebb4500f13..6053172ad287 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-xvideo-0.10.35
+++ b/metadata/md5-cache/media-plugins/gst-plugins-xvideo-0.10.35
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=x11-libs/libXv x11-libs/libXext x11-proto/videoproto x11-proto/xproto x11-proto/xextproto >=media-libs/gst-plugins-base-0.10.35 ~media-libs/gst-plugins-base-0.10.35 >=sys-apps/sed-4 virtual/pkgconfig
+DEPEND=x11-libs/libXv x11-libs/libXext x11-libs/libSM x11-libs/libICE x11-proto/videoproto x11-proto/xproto x11-proto/xextproto >=media-libs/gst-plugins-base-0.10.35 ~media-libs/gst-plugins-base-0.10.35 >=sys-apps/sed-4 virtual/pkgconfig
 DESCRIPTION=plugin for gstreamer
 HOMEPAGE=http://gstreamer.freedesktop.org/
 KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
-RDEPEND=x11-libs/libXv x11-libs/libXext >=media-libs/gst-plugins-base-0.10.35
+RDEPEND=x11-libs/libXv x11-libs/libXext x11-libs/libSM x11-libs/libICE >=media-libs/gst-plugins-base-0.10.35
 RESTRICT=test
 SLOT=0.10
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-0.10.35.tar.bz2
-_eclasses_=eutils	5a98daf52f7430a4a6f46cee24cfe3e2	gst-plugins-base	f54aa7972b6084703cffa04d818342a3	gst-plugins10	cdf76f89776a74425daf6cd80706ab65	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=4f152c28ef01de0175703d5d1084dad9
+_eclasses_=eutils	5a98daf52f7430a4a6f46cee24cfe3e2	gst-plugins-base	721313f5c8b78f8c8c6a9d8ea3ee486a	gst-plugins10	cdf76f89776a74425daf6cd80706ab65	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=ca2f548ef2a4c7aabbf1cf1473f9d6d5
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-xvideo-0.10.35-r1 b/metadata/md5-cache/media-plugins/gst-plugins-xvideo-0.10.35-r1
index 414d833ceaa7..e6336924af08 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-xvideo-0.10.35-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-xvideo-0.10.35-r1
@@ -9,5 +9,5 @@ RDEPEND=x11-libs/libXv x11-libs/libXext >=media-libs/gst-plugins-base-0.10.35
 RESTRICT=test
 SLOT=0.10
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-0.10.35.tar.bz2
-_eclasses_=eutils	5a98daf52f7430a4a6f46cee24cfe3e2	gst-plugins-base	f54aa7972b6084703cffa04d818342a3	gst-plugins10	cdf76f89776a74425daf6cd80706ab65	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	5a98daf52f7430a4a6f46cee24cfe3e2	gst-plugins-base	721313f5c8b78f8c8c6a9d8ea3ee486a	gst-plugins10	cdf76f89776a74425daf6cd80706ab65	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c8118ed87307ca107dc64e00a03b6b19
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-xvideo-0.10.36 b/metadata/md5-cache/media-plugins/gst-plugins-xvideo-0.10.36
new file mode 100644
index 000000000000..99daeccfe90b
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-xvideo-0.10.36
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare unpack
+DEPEND=x11-libs/libXv x11-libs/libXext x11-proto/videoproto x11-proto/xproto x11-proto/xextproto >=media-libs/gst-plugins-base-0.10.36 app-arch/xz-utils ~media-libs/gst-plugins-base-0.10.36 >=sys-apps/sed-4 virtual/pkgconfig
+DESCRIPTION=plugin for gstreamer
+EAPI=4
+HOMEPAGE=http://gstreamer.freedesktop.org/
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=x11-libs/libXv x11-libs/libXext >=media-libs/gst-plugins-base-0.10.36
+RESTRICT=test
+SLOT=0.10
+SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-0.10.36.tar.xz
+_eclasses_=eutils	5a98daf52f7430a4a6f46cee24cfe3e2	gst-plugins-base	721313f5c8b78f8c8c6a9d8ea3ee486a	gst-plugins10	cdf76f89776a74425daf6cd80706ab65	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=872dd6fa056279975ddcb8065f9f0a36
diff --git a/metadata/md5-cache/media-plugins/vdr-graphtft-0.3.6 b/metadata/md5-cache/media-plugins/vdr-graphtft-0.3.6
new file mode 100644
index 000000000000..1d530365dd23
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/vdr-graphtft-0.3.6
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile config configure install postinst postrm prepare setup unpack
+DEPEND=>=media-video/vdr-1.6.0_p2-r1[graphtft] media-libs/imlib2[png,jpeg] gnome-base/libgtop >=virtual/ffmpeg-0.4.8_p20090201 imagemagick? ( media-gfx/imagemagick[png,jpeg,cxx] ) directfb? ( dev-libs/DirectFB ) graphtft-fe? ( media-libs/imlib2[png,jpeg,X] ) >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+DESCRIPTION=VDR plugin: GraphTFT
+EAPI=4
+HOMEPAGE=http://www.vdr-wiki.de/wiki/index.php/Graphtft-plugin
+IUSE=+theme_deepblue theme_avp theme_deeppurple theme_poetter directfb graphtft-fe imagemagick touchscreen
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 LGPL-2.1
+PDEPEND=theme_deepblue? ( =x11-themes/vdrgraphtft-deepblue-0.3.1 ) theme_avp? ( =x11-themes/vdrgraphtft-avp-0.3.1 ) theme_deeppurple? ( =x11-themes/vdrgraphtft-deeppurple-0.3.2 ) theme_poetter? ( =x11-themes/vdrgraphtft-poetter-0.3.2 )
+RDEPEND=>=media-video/vdr-1.6.0_p2-r1[graphtft] media-libs/imlib2[png,jpeg] gnome-base/libgtop >=virtual/ffmpeg-0.4.8_p20090201 imagemagick? ( media-gfx/imagemagick[png,jpeg,cxx] ) directfb? ( dev-libs/DirectFB ) graphtft-fe? ( media-libs/imlib2[png,jpeg,X] ) >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
+RESTRICT=test
+SLOT=0
+SRC_URI=http://www.jwendel.de/vdr/vdr-graphtft-0.3.6.tar.bz2
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	5a98daf52f7430a4a6f46cee24cfe3e2	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin-2	b2eb2ff2d0cba816c8968a8d51ba322d
+_md5_=a8be4c09e707d5e096dcc74ad5e37341
diff --git a/metadata/md5-cache/media-plugins/vdr-osdpip-0.0.10 b/metadata/md5-cache/media-plugins/vdr-osdpip-0.0.10
deleted file mode 100644
index c99c03d04312..000000000000
--- a/metadata/md5-cache/media-plugins/vdr-osdpip-0.0.10
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile config install postinst postrm setup unpack
-DEPEND=>=media-video/vdr-1.4.0 >=media-libs/libmpeg2-0.4.0 >=virtual/ffmpeg-0.4.9 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
-DESCRIPTION=VDR plugin: Show another channel in the OSD
-HOMEPAGE=http://www.magoa.net/linux
-KEYWORDS=~amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=media-video/vdr-1.4.0 >=media-libs/libmpeg2-0.4.0 >=virtual/ffmpeg-0.4.9 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
-SLOT=0
-SRC_URI=http://home.arcor.de/andreas.regel/files/osdpip/vdr-osdpip-0.0.10.tgz
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	5a98daf52f7430a4a6f46cee24cfe3e2	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	88e7b7a88e5cf50f6e63acee39afaae2
-_md5_=b659f20a44fdcfdb787988c9bf39de8a
diff --git a/metadata/md5-cache/media-plugins/vdr-osdpip-0.1.0 b/metadata/md5-cache/media-plugins/vdr-osdpip-0.1.1-r1
similarity index 83%
rename from metadata/md5-cache/media-plugins/vdr-osdpip-0.1.0
rename to metadata/md5-cache/media-plugins/vdr-osdpip-0.1.1-r1
index 6b0c37ee81f7..fbdcb8307766 100644
--- a/metadata/md5-cache/media-plugins/vdr-osdpip-0.1.0
+++ b/metadata/md5-cache/media-plugins/vdr-osdpip-0.1.1-r1
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile config configure install postinst postrm prepare setup unpack
 DEPEND=>=media-video/vdr-1.6.0_p2-r5 >=media-libs/libmpeg2-0.5.1 >=virtual/ffmpeg-0.6.90 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
 DESCRIPTION=VDR plugin: Show another channel in the OSD
-EAPI=3
+EAPI=4
 HOMEPAGE=http://projects.vdr-developer.org/projects/plg-osdpip
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.6.0_p2-r5 >=media-libs/libmpeg2-0.5.1 >=virtual/ffmpeg-0.6.90 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
-SRC_URI=mirror://vdr-developerorg/download/267/vdr-osdpip-0.1.0.tgz
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	5a98daf52f7430a4a6f46cee24cfe3e2	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin	88e7b7a88e5cf50f6e63acee39afaae2
-_md5_=0e8d651409b36a2b3a0888fb75f2feab
+SRC_URI=mirror://vdr-developerorg/880/vdr-osdpip-0.1.1.tgz
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	5a98daf52f7430a4a6f46cee24cfe3e2	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin-2	b2eb2ff2d0cba816c8968a8d51ba322d
+_md5_=04d18f5593d82f4e641c81a76b1ffb79
diff --git a/metadata/md5-cache/media-tv/me-tv-1.4.0.10 b/metadata/md5-cache/media-tv/me-tv-1.4.0.10
new file mode 100644
index 000000000000..4e35615da02c
--- /dev/null
+++ b/metadata/md5-cache/media-tv/me-tv-1.4.0.10
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
+DEPEND=>=dev-cpp/gconfmm-2.6 dev-cpp/gtkmm:2.4 dev-cpp/libxmlpp:2.6 dev-libs/libunique:1 >=dev-libs/dbus-glib-0.92 net-libs/gnet:2 =dev-db/sqlite-3* >=media-video/vlc-1.1.8 media-libs/gstreamer:0.10 media-plugins/gst-plugins-xvideo:0.10 media-libs/gst-plugins-base:0.10 virtual/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
+DESCRIPTION=Me TV is a GTK desktop application for watching digital television.
+EAPI=4
+HOMEPAGE=http://me-tv.sourceforge.net/
+IUSE=http debug
+KEYWORDS=~x86 ~amd64
+LICENSE=GPL-3
+RDEPEND=>=dev-cpp/gconfmm-2.6 dev-cpp/gtkmm:2.4 dev-cpp/libxmlpp:2.6 dev-libs/libunique:1 >=dev-libs/dbus-glib-0.92 net-libs/gnet:2 =dev-db/sqlite-3* >=media-video/vlc-1.1.8 media-libs/gstreamer:0.10 media-plugins/gst-plugins-xvideo:0.10 media-libs/gst-plugins-base:0.10
+RESTRICT=mirror
+SLOT=0
+SRC_URI=http://launchpad.net/me-tv/1.4/1.4.0/+download/me-tv-1.4.0.10.tar.gz
+_eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	eutils	5a98daf52f7430a4a6f46cee24cfe3e2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	45847910ffbe4d8bfb814e3527de1920	gnome2-utils	0d2178d7f87923f3c110366ece3c930f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=d5ede09d9a2d644f880c9504b179b3d4
diff --git a/metadata/md5-cache/media-video/parole-0.2.90_pre20120720 b/metadata/md5-cache/media-video/parole-0.2.90_pre20120720
deleted file mode 100644
index 7149a43b0915..000000000000
--- a/metadata/md5-cache/media-video/parole-0.2.90_pre20120720
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=x11-libs/gtk+-2.16:2 >=dev-libs/glib-2.16:2 >=xfce-base/libxfce4util-4.8 >=xfce-base/libxfce4ui-4.8 >=dev-libs/dbus-glib-0.88 >=media-libs/gstreamer-0.10.11:0.10 >=media-libs/gst-plugins-base-0.10.11:0.10 libnotify? ( >=x11-libs/libnotify-0.4.5 ) taglib? ( >=media-libs/taglib-1.4 ) dev-util/intltool virtual/pkgconfig x11-proto/xproto >=sys-apps/sed-4
-DESCRIPTION=a simple media player based on the GStreamer framework for the Xfce4 desktop
-EAPI=4
-HOMEPAGE=http://goodies.xfce.org/projects/applications/parole/
-IUSE=debug libnotify taglib
-KEYWORDS=~amd64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=x11-libs/gtk+-2.16:2 >=dev-libs/glib-2.16:2 >=xfce-base/libxfce4util-4.8 >=xfce-base/libxfce4ui-4.8 >=dev-libs/dbus-glib-0.88 >=media-libs/gstreamer-0.10.11:0.10 >=media-libs/gst-plugins-base-0.10.11:0.10 libnotify? ( >=x11-libs/libnotify-0.4.5 ) taglib? ( >=media-libs/taglib-1.4 ) media-plugins/gst-plugins-meta:0.10
-SLOT=0
-SRC_URI=http://dev.gentoo.org/~angelos/parole-0.2.90_pre20120720.tar.bz2
-_eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	5a98daf52f7430a4a6f46cee24cfe3e2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	0d2178d7f87923f3c110366ece3c930f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	679cee9d5e9bd6a822db1af0d0074d7a
-_md5_=f3250ffccfdd59c3d7f9bc89e146c154
diff --git a/metadata/md5-cache/media-video/parole-0.3.0 b/metadata/md5-cache/media-video/parole-0.3.0
deleted file mode 100644
index e6760b7cc471..000000000000
--- a/metadata/md5-cache/media-video/parole-0.3.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=x11-libs/gtk+-2.20:2 >=dev-libs/glib-2.24:2 >=xfce-base/libxfce4util-4.8 >=xfce-base/libxfce4ui-4.8 >=dev-libs/dbus-glib-0.88 >=media-libs/gstreamer-0.10.11:0.10 >=media-libs/gst-plugins-base-0.10.11:0.10 libnotify? ( >=x11-libs/libnotify-0.4.5 ) taglib? ( >=media-libs/taglib-1.4 ) dev-util/intltool virtual/pkgconfig x11-proto/xproto >=sys-apps/sed-4
-DESCRIPTION=a simple media player based on the GStreamer framework for the Xfce4 desktop
-EAPI=4
-HOMEPAGE=http://goodies.xfce.org/projects/applications/parole/
-IUSE=debug libnotify taglib
-KEYWORDS=~amd64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=x11-libs/gtk+-2.20:2 >=dev-libs/glib-2.24:2 >=xfce-base/libxfce4util-4.8 >=xfce-base/libxfce4ui-4.8 >=dev-libs/dbus-glib-0.88 >=media-libs/gstreamer-0.10.11:0.10 >=media-libs/gst-plugins-base-0.10.11:0.10 libnotify? ( >=x11-libs/libnotify-0.4.5 ) taglib? ( >=media-libs/taglib-1.4 ) media-plugins/gst-plugins-meta:0.10
-SLOT=0
-SRC_URI=mirror://xfce/src/apps/parole/0.3/parole-0.3.0.tar.bz2
-_eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	5a98daf52f7430a4a6f46cee24cfe3e2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	0d2178d7f87923f3c110366ece3c930f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	679cee9d5e9bd6a822db1af0d0074d7a
-_md5_=623fff886f331dc0f713ecede9a4ebeb
diff --git a/metadata/md5-cache/net-analyzer/munin-2.0.7-r2 b/metadata/md5-cache/net-analyzer/munin-2.0.7-r4
similarity index 96%
rename from metadata/md5-cache/net-analyzer/munin-2.0.7-r2
rename to metadata/md5-cache/net-analyzer/munin-2.0.7-r4
index c591a6bd5b1c..ea1c7fd7767a 100644
--- a/metadata/md5-cache/net-analyzer/munin-2.0.7-r2
+++ b/metadata/md5-cache/net-analyzer/munin-2.0.7-r4
@@ -9,6 +9,6 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl sys-process/procps doc? ( dev-python/sphinx ) asterisk? ( dev-perl/Net-Telnet ) irc? ( dev-perl/Net-IRC ) mysql? ( virtual/mysql dev-perl/Cache-Cache dev-perl/DBD-mysql ) ssl? ( dev-perl/Net-SSLeay ) postgres? ( dev-perl/DBD-Pg dev-db/postgresql-base ) memcached? ( dev-perl/Cache-Memcached ) cgi? ( dev-perl/FCGI ) syslog? ( virtual/perl-Sys-Syslog ) http? ( dev-perl/libwww-perl ) dhcpd? ( >=net-misc/dhcp-3[server] dev-perl/Net-IP dev-perl/HTTP-Date ) dev-perl/DBI dev-perl/DateManip dev-perl/File-Copy-Recursive dev-perl/Log-Log4perl dev-perl/Net-CIDR dev-perl/Net-Netmask dev-perl/Net-SNMP dev-perl/net-server[ipv6(-)?] virtual/perl-Digest-MD5 virtual/perl-Getopt-Long virtual/perl-MIME-Base64 virtual/perl-Storable virtual/perl-Text-Balanced virtual/perl-Time-HiRes !minimal? ( dev-perl/HTML-Template dev-perl/IO-Socket-INET6 dev-perl/URI >=net-analyzer/rrdtool-1.3[perl] ) virtual/awk ipmi? ( >=sys-libs/freeipmi-1.1.6-r1 ) java? ( >=virtual/jre-1.5 || ( net-analyzer/netcat6 net-analyzer/netcat ) ) !minimal? ( virtual/cron media-fonts/dejavu ) java? ( >=dev-java/java-config-2.1.9-r1 )
 REQUIRED_USE=cgi? ( !minimal )
 SLOT=0
-SRC_URI=mirror://sourceforge/munin/munin-2.0.7.tar.gz http://dev.gentoo.org/~flameeyes/munin/munin-2.0.7-patches-2.tar.xz
+SRC_URI=mirror://sourceforge/munin/munin-2.0.7.tar.gz http://dev.gentoo.org/~flameeyes/munin/munin-2.0.7-patches-3.tar.xz
 _eclasses_=eutils	5a98daf52f7430a4a6f46cee24cfe3e2	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	2d9eb3508fa5d6759e39354b74545567	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=4dae8f93181e9081debc3f6e4cdb6302
+_md5_=536d6217e7a4c13c58887cf27de0816c
diff --git a/metadata/md5-cache/net-dns/knot-1.1.0 b/metadata/md5-cache/net-dns/knot-1.1.0
index 62ca733d5e87..f6d93ad49848 100644
--- a/metadata/md5-cache/net-dns/knot-1.1.0
+++ b/metadata/md5-cache/net-dns/knot-1.1.0
@@ -10,4 +10,4 @@ RDEPEND=dev-libs/openssl dev-libs/userspace-rcu
 SLOT=0
 SRC_URI=http://public.nic.cz/files/knot-dns/knot-1.1.0.tar.gz
 _eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	eutils	5a98daf52f7430a4a6f46cee24cfe3e2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=767613fad69fb7ce0e9e85f8250d3494
+_md5_=aea5fbb16800919f75f27017d995f53d
diff --git a/metadata/md5-cache/net-firewall/shorewall-4.5.8.2-r1 b/metadata/md5-cache/net-firewall/shorewall-4.5.8.2-r1
new file mode 100644
index 000000000000..c8bc8855d341
--- /dev/null
+++ b/metadata/md5-cache/net-firewall/shorewall-4.5.8.2-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst
+DEPEND=>=net-firewall/iptables-1.2.4 sys-apps/iproute2[-minimal] dev-lang/perl =net-firewall/shorewall-core-4.5.8.2
+DESCRIPTION=Shoreline Firewall is an iptables-based firewall for Linux.
+EAPI=4
+HOMEPAGE=http://www.shorewall.net/
+IUSE=doc
+KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=net-firewall/iptables-1.2.4 sys-apps/iproute2[-minimal] dev-lang/perl =net-firewall/shorewall-core-4.5.8.2
+SLOT=0
+SRC_URI=http://www1.shorewall.net/pub/shorewall/4.5/shorewall-4.5.8/shorewall-4.5.8.2.tar.bz2 doc? ( http://www1.shorewall.net/pub/shorewall/4.5/shorewall-4.5.8/shorewall-docs-html-4.5.8.2.tar.bz2 )
+_eclasses_=eutils	5a98daf52f7430a4a6f46cee24cfe3e2	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=d1859a58ccfcdb235744ac1c63adb60e
diff --git a/metadata/md5-cache/net-firewall/shorewall6-4.5.8.2-r1 b/metadata/md5-cache/net-firewall/shorewall6-4.5.8.2-r1
new file mode 100644
index 000000000000..9d5c4777b56e
--- /dev/null
+++ b/metadata/md5-cache/net-firewall/shorewall6-4.5.8.2-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install pretend setup
+DESCRIPTION=Shoreline Firewall with IPv6 support.
+EAPI=4
+HOMEPAGE=http://www.shorewall.net/
+IUSE=doc
+KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=net-firewall/iptables-1.4.0 sys-apps/iproute2 >=net-firewall/shorewall-4.5.8 dev-perl/Socket6
+SLOT=0
+SRC_URI=http://www1.shorewall.net/pub/shorewall/4.5/shorewall-4.5.8/shorewall6-4.5.8.2.tar.bz2 doc? ( http://www1.shorewall.net/pub/shorewall6/4.5/shorewall-4.5.8/shorewall-docs-html-4.5.8.2.tar.bz2 )
+_eclasses_=eutils	5a98daf52f7430a4a6f46cee24cfe3e2	linux-info	0b7adf68a2edb4e5a32b07bb6e68121c	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=237657fe7c60c322fa70efc2e0b07063
diff --git a/metadata/md5-cache/net-im/prosody-0.8.2 b/metadata/md5-cache/net-im/prosody-0.8.2
index ba284980906a..8ef5e41338ec 100644
--- a/metadata/md5-cache/net-im/prosody-0.8.2
+++ b/metadata/md5-cache/net-im/prosody-0.8.2
@@ -4,10 +4,10 @@ DESCRIPTION=Prosody is a flexible communications server for Jabber/XMPP written
 EAPI=2
 HOMEPAGE=http://prosody.im/
 IUSE=libevent mysql postgres sqlite ssl zlib
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=MIT
 RDEPEND=net-im/jabber-base >=dev-lang/lua-5.1 >=net-dns/libidn-1.1 >=dev-libs/openssl-0.9.8 dev-lua/luasocket ssl? ( dev-lua/luasec ) dev-lua/luaexpat dev-lua/luafilesystem mysql? ( >=dev-lua/luadbi-0.5[mysql] ) postgres? ( >=dev-lua/luadbi-0.5[postgres] ) sqlite? ( >=dev-lua/luadbi-0.5[sqlite] ) libevent? ( dev-lua/luaevent ) zlib? ( dev-lua/lua-zlib )
 SLOT=0
 SRC_URI=http://prosody.im/downloads/source/prosody-0.8.2.tar.gz
 _eclasses_=eutils	5a98daf52f7430a4a6f46cee24cfe3e2	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=20b8a907ffcc37381a809aff2317267e
+_md5_=ad45efd712787e19a811f9fff92be12b
diff --git a/metadata/md5-cache/net-libs/libgsasl-1.8.0-r1 b/metadata/md5-cache/net-libs/libgsasl-1.8.0-r1
index 644788f220f2..ffd2e9262a2f 100644
--- a/metadata/md5-cache/net-libs/libgsasl-1.8.0-r1
+++ b/metadata/md5-cache/net-libs/libgsasl-1.8.0-r1
@@ -4,10 +4,10 @@ DESCRIPTION=The GNU SASL library
 EAPI=4
 HOMEPAGE=http://www.gnu.org/software/gsasl/
 IUSE=idn gcrypt kerberos nls ntlm static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
 LICENSE=GPL-3 LGPL-3
 RDEPEND=gcrypt? ( dev-libs/libgcrypt ) idn? ( net-dns/libidn ) kerberos? ( virtual/krb5 ) nls? ( >=sys-devel/gettext-0.18.1 ) ntlm? ( net-libs/libntlm ) !net-misc/gsasl
 SLOT=0
 SRC_URI=mirror://gnu/gsasl/libgsasl-1.8.0.tar.gz
 _eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	eutils	5a98daf52f7430a4a6f46cee24cfe3e2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=3a6c9fb014a60c61f8ca914c0829cce5
+_md5_=39469b29f7ec9630a796745b259c9726
diff --git a/metadata/md5-cache/net-libs/libircclient-1.6-r1 b/metadata/md5-cache/net-libs/libircclient-1.6-r1
index 34bde3d5aae4..e98c832b3118 100644
--- a/metadata/md5-cache/net-libs/libircclient-1.6-r1
+++ b/metadata/md5-cache/net-libs/libircclient-1.6-r1
@@ -4,9 +4,9 @@ DESCRIPTION=Small but powerful library implementing the client-server IRC protoc
 EAPI=4
 HOMEPAGE=http://www.ulduzsoft.com/libircclient/
 IUSE=doc ipv6 ssl static-libs threads
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=LGPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/libircclient/libircclient-1.6.tar.gz
 _eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	eutils	5a98daf52f7430a4a6f46cee24cfe3e2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=e90579bf1ab8a7bb03865fd6396e46f9
+_md5_=00921161addf49950292b4a0672e143c
diff --git a/metadata/md5-cache/net-libs/libproxy-0.4.10 b/metadata/md5-cache/net-libs/libproxy-0.4.10
index ea78b9d0019e..2ad37871a839 100644
--- a/metadata/md5-cache/net-libs/libproxy-0.4.10
+++ b/metadata/md5-cache/net-libs/libproxy-0.4.10
@@ -10,4 +10,4 @@ RDEPEND=gnome? ( >=dev-libs/glib-2.26:2 ) kde? ( >=kde-base/kdelibs-4.4.5 ) mono
 SLOT=0
 SRC_URI=http://libproxy.googlecode.com/files/libproxy-0.4.10.tar.gz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	1f7278c51de5e0898f73c97fbf622701	eutils	5a98daf52f7430a4a6f46cee24cfe3e2	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	9aa8a023e062fca0ba79362d9d0cc488	python	3db636724bc2886c6425058e210067d2	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=7b84742d0254d0daaa0814bdab7a5fa7
+_md5_=9760512dc119b8ff81df9f89d90b269c
diff --git a/metadata/md5-cache/net-libs/libproxy-0.4.10-r1 b/metadata/md5-cache/net-libs/libproxy-0.4.10-r1
new file mode 100644
index 000000000000..237769e1c0a8
--- /dev/null
+++ b/metadata/md5-cache/net-libs/libproxy-0.4.10-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DEPEND=gnome? ( >=dev-libs/glib-2.26:2 ) kde? ( >=kde-base/kdelibs-4.4.5 ) mono? ( dev-lang/mono ) networkmanager? ( net-misc/networkmanager ) perl? ( dev-lang/perl ) spidermonkey? ( >=dev-lang/spidermonkey-1.8.5 ) webkit? ( >=net-libs/webkit-gtk-1.6:3 ) kde? ( dev-util/automoc ) virtual/pkgconfig >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) )
+DESCRIPTION=Library for automatic proxy configuration management
+EAPI=4
+HOMEPAGE=http://code.google.com/p/libproxy/
+IUSE=gnome kde mono networkmanager perl python spidermonkey test webkit
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-linux
+LICENSE=LGPL-2.1+
+RDEPEND=gnome? ( >=dev-libs/glib-2.26:2 ) kde? ( >=kde-base/kdelibs-4.4.5 ) mono? ( dev-lang/mono ) networkmanager? ( net-misc/networkmanager ) perl? ( dev-lang/perl ) spidermonkey? ( >=dev-lang/spidermonkey-1.8.5 ) webkit? ( >=net-libs/webkit-gtk-1.6:3 ) python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) )
+SLOT=0
+SRC_URI=http://libproxy.googlecode.com/files/libproxy-0.4.10.tar.gz
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	1f7278c51de5e0898f73c97fbf622701	eutils	5a98daf52f7430a4a6f46cee24cfe3e2	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	9aa8a023e062fca0ba79362d9d0cc488	python	3db636724bc2886c6425058e210067d2	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=2063bfe6d9e4535002b6bf1e744e25e8
diff --git a/metadata/md5-cache/net-libs/libsocialweb-0.25.21 b/metadata/md5-cache/net-libs/libsocialweb-0.25.21
index 181011b0b18e..feeea4218080 100644
--- a/metadata/md5-cache/net-libs/libsocialweb-0.25.21
+++ b/metadata/md5-cache/net-libs/libsocialweb-0.25.21
@@ -4,11 +4,11 @@ DESCRIPTION=Social web services integration framework
 EAPI=4
 HOMEPAGE=http://git.gnome.org/browse/libsocialweb
 IUSE=connman +gnome +introspection +networkmanager vala
-KEYWORDS=~amd64 ~ppc ~ppc64 x86
+KEYWORDS=amd64 ~ppc ~ppc64 x86
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/glib-2.14:2 >=net-libs/rest-0.7.10 gnome-base/gconf:2 gnome-base/libgnome-keyring dev-libs/dbus-glib dev-libs/json-glib net-libs/libsoup:2.4 gnome? ( >=net-libs/libsoup-gnome-2.25.1:2.4 ) introspection? ( >=dev-libs/gobject-introspection-0.9.6 ) networkmanager? ( net-misc/networkmanager ) !networkmanager? ( connman? ( net-misc/connman ) ) =dev-lang/python-2*
 REQUIRED_USE=vala? ( introspection )
 SLOT=0
 SRC_URI=mirror://gnome/sources/libsocialweb/0.25/libsocialweb-0.25.21.tar.xz
 _eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	eutils	5a98daf52f7430a4a6f46cee24cfe3e2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	45847910ffbe4d8bfb814e3527de1920	gnome2-utils	0d2178d7f87923f3c110366ece3c930f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	3db636724bc2886c6425058e210067d2	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	vala	8d9290c0233fe61cb94ba608007a0daa	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=cbee98ec30112e2b1db7101f04ab04be
+_md5_=8fae4181db25602c9181c153b2477288
diff --git a/metadata/md5-cache/net-mail/mailutils-2.99.97 b/metadata/md5-cache/net-mail/mailutils-2.99.97
index 15d5ce161123..55367bfe0de9 100644
--- a/metadata/md5-cache/net-mail/mailutils-2.99.97
+++ b/metadata/md5-cache/net-mail/mailutils-2.99.97
@@ -4,10 +4,10 @@ DESCRIPTION=A useful collection of mail servers, clients, and filters.
 EAPI=4
 HOMEPAGE=http://www.gnu.org/software/mailutils/mailutils.html
 IUSE=berkdb bidi +clients gdbm sasl guile ipv6 kerberos ldap mysql nls pam postgres python servers ssl static-libs +threads tcpd tokyocabinet
-KEYWORDS=~amd64 ~ppc ~x86 ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~amd64 ~hppa ~ppc ~x86 ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=!mail-client/nmh !mail-filter/libsieve !mail-client/mailx !mail-client/nail sys-libs/ncurses sys-libs/readline sys-devel/libtool virtual/mta berkdb? ( sys-libs/db ) bidi? ( dev-libs/fribidi ) gdbm? ( sys-libs/gdbm ) guile? ( dev-scheme/guile ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) mysql? ( virtual/mysql ) nls? ( sys-devel/gettext ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql-base ) sasl? ( virtual/gsasl ) ssl? ( net-libs/gnutls ) tcpd? ( sys-apps/tcp-wrappers ) tokyocabinet? ( dev-db/tokyocabinet ) python? ( =dev-lang/python-2* )
 SLOT=0
 SRC_URI=mirror://gnu-alpha/mailutils/mailutils-2.99.97.tar.xz
 _eclasses_=eutils	5a98daf52f7430a4a6f46cee24cfe3e2	multilib	9aa8a023e062fca0ba79362d9d0cc488	python	3db636724bc2886c6425058e210067d2	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=844835255a2cee53086aa3107eed8c8d
+_md5_=700c1724e379edf92422d22fefdcde8f
diff --git a/metadata/md5-cache/net-misc/l7-filter-userspace-0.12_beta1 b/metadata/md5-cache/net-misc/l7-filter-userspace-0.12_beta1
index 6eaf282c85e8..1679223ae806 100644
--- a/metadata/md5-cache/net-misc/l7-filter-userspace-0.12_beta1
+++ b/metadata/md5-cache/net-misc/l7-filter-userspace-0.12_beta1
@@ -3,10 +3,10 @@ DEPEND=>=net-libs/libnetfilter_conntrack-0.0.100 >=net-libs/libnetfilter_queue-1
 DESCRIPTION=Userspace utilities for layer 7 iptables QoS
 EAPI=4
 HOMEPAGE=http://l7-filter.clearfoundation.com/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-2
 RDEPEND=>=net-libs/libnetfilter_conntrack-0.0.100 >=net-libs/libnetfilter_queue-1.0.0 net-libs/libnfnetlink net-misc/l7-protocols
 SLOT=0
 SRC_URI=http://download.clearfoundation.com/l7-filter/l7-filter-userspace-0.12-beta1.tar.gz
 _eclasses_=eutils	5a98daf52f7430a4a6f46cee24cfe3e2	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=ee3a71aca9ce10c0954c4b422e03b093
+_md5_=59606538e0a61e3259db88419579eb1e
diff --git a/metadata/md5-cache/net-misc/pcapfix-0.7 b/metadata/md5-cache/net-misc/pcapfix-0.7
new file mode 100644
index 000000000000..c196ca66bf92
--- /dev/null
+++ b/metadata/md5-cache/net-misc/pcapfix-0.7
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install prepare
+DESCRIPTION=pcapfix tries to repair your broken pcap files by fixing the global header and recovering the packets by searching und guessing the packet headers.
+EAPI=4
+HOMEPAGE=http://f00l.de/pcapfix/
+KEYWORDS=~amd64
+LICENSE=GPL-3
+SLOT=0
+SRC_URI=http://f00l.de/pcapfix/pcapfix-0.7.tar.gz
+_md5_=33e0ca3eeafebaf8c48900d62ecf40ad
diff --git a/metadata/md5-cache/net-p2p/bitcoin-qt-0.6.3 b/metadata/md5-cache/net-p2p/bitcoin-qt-0.6.3
index a1c8e0a24c38..8f635e6a6601 100644
--- a/metadata/md5-cache/net-p2p/bitcoin-qt-0.6.3
+++ b/metadata/md5-cache/net-p2p/bitcoin-qt-0.6.3
@@ -4,10 +4,10 @@ DESCRIPTION=An end-user Qt4 GUI for the Bitcoin crypto-currency
 EAPI=4
 HOMEPAGE=http://bitcoin.org/
 IUSE=1stclassmsg dbus +eligius +qrcode upnp linguas_ca_ES linguas_cs linguas_da linguas_de linguas_en linguas_es linguas_es_CL linguas_et linguas_eu_ES linguas_fa linguas_fa_IR linguas_fi linguas_fr_CA linguas_fr_FR linguas_he linguas_hr linguas_hu linguas_it linguas_lt linguas_nb linguas_nl linguas_pl linguas_pt_BR linguas_ro_RO linguas_ru linguas_sk linguas_sr linguas_sv linguas_tr linguas_uk linguas_zh_CN linguas_zh_TW
-KEYWORDS=amd64 ~arm x86
+KEYWORDS=amd64 arm x86
 LICENSE=MIT ISC GPL-3 md2k7-asyouwish LGPL-2.1 public-domain
 RDEPEND=>=dev-libs/boost-1.41.0 dev-libs/openssl[-bindist] qrcode? ( media-gfx/qrencode ) upnp? ( net-libs/miniupnpc ) sys-libs/db:4.8[cxx] x11-libs/qt-gui:4 dbus? ( x11-libs/qt-dbus:4 )
 SLOT=0
 SRC_URI=https://nodeload.github.com/bitcoin/bitcoin/tarball/v0.6.3 -> bitcoin-v0.6.3.tgz eligius? ( http://luke.dashjr.org/programs/bitcoin/files/bitcoind/eligius/sendfee/0.6.1-eligius_sendfee.patch.xz )
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	5a98daf52f7430a4a6f46cee24cfe3e2	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-r2	75aa32643ef22632eb9b45989b4c03fc	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=b2513058e2cb1b7b0753d22210c3de26
+_md5_=eddce1ba6cc9ced064136e32f65b91a3
diff --git a/metadata/md5-cache/net-p2p/bitcoind-0.6.3 b/metadata/md5-cache/net-p2p/bitcoind-0.6.3
index e5c66d057228..ace267db715b 100644
--- a/metadata/md5-cache/net-p2p/bitcoind-0.6.3
+++ b/metadata/md5-cache/net-p2p/bitcoind-0.6.3
@@ -4,10 +4,10 @@ DESCRIPTION=Original Bitcoin crypto-currency wallet for automated services
 EAPI=4
 HOMEPAGE=http://bitcoin.org/
 IUSE=+eligius examples logrotate upnp
-KEYWORDS=amd64 ~arm x86
+KEYWORDS=amd64 arm x86
 LICENSE=MIT ISC GPL-2
 RDEPEND=>=dev-libs/boost-1.41.0 dev-libs/openssl[-bindist] logrotate? ( app-admin/logrotate ) upnp? ( net-libs/miniupnpc ) sys-libs/db:4.8[cxx]
 SLOT=0
 SRC_URI=https://nodeload.github.com/bitcoin/bitcoin/tarball/v0.6.3 -> bitcoin-v0.6.3.tgz eligius? ( http://luke.dashjr.org/programs/bitcoin/files/bitcoind/eligius/sendfee/0.6.1-eligius_sendfee.patch.xz ) logrotate? ( https://github.com/bitcoin/bitcoin/commit/9af080c351c40a4f56d37174253d33a9f4ffdb69.diff -> 0.6.3-reopen_log_file.patch )
 _eclasses_=db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	5a98daf52f7430a4a6f46cee24cfe3e2	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=9ae3540187603068d3222eafdaef2cea
+_md5_=25e2a67b9d797933641f0295a848980b
diff --git a/metadata/md5-cache/net-proxy/squidclamav-6.9 b/metadata/md5-cache/net-proxy/squidclamav-6.9
index ad4742b601a8..fde257178db1 100644
--- a/metadata/md5-cache/net-proxy/squidclamav-6.9
+++ b/metadata/md5-cache/net-proxy/squidclamav-6.9
@@ -3,10 +3,10 @@ DEPEND=net-proxy/c-icap || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automa
 DESCRIPTION=HTTP Antivirus for Squid based on ClamAv and ICAP
 EAPI=4
 HOMEPAGE=http://squidclamav.darold.net/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-3
 RDEPEND=net-proxy/c-icap
 SLOT=0
 SRC_URI=mirror://sourceforge/squidclamav/squidclamav-6.9.tar.gz
 _eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4
-_md5_=cfa39f82fba6b7ec08dbd8af4b261c9e
+_md5_=061933c920be67a2378026764ec7aeab
diff --git a/metadata/md5-cache/sci-electronics/gspeakers-0.11-r1 b/metadata/md5-cache/sci-electronics/gspeakers-0.11-r1
index ca79b24ca88d..0cd1e849bb21 100644
--- a/metadata/md5-cache/sci-electronics/gspeakers-0.11-r1
+++ b/metadata/md5-cache/sci-electronics/gspeakers-0.11-r1
@@ -1,7 +1,7 @@
-DEFINED_PHASES=compile install postinst postrm preinst unpack
-DEPEND=dev-cpp/gtkmm:2.4 dev-libs/libxml2:2 virtual/pkgconfig >=sys-apps/sed-4 || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
+DEPEND=dev-cpp/gtkmm:2.4 dev-libs/libxml2:2 virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4 || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=GTK based loudspeaker enclosure and crossovernetwork designer
-EAPI=1
+EAPI=4
 HOMEPAGE=http://gspeakers.sourceforge.net/
 IUSE=debug
 KEYWORDS=amd64 ppc x86
@@ -10,4 +10,4 @@ RDEPEND=dev-cpp/gtkmm:2.4 dev-libs/libxml2:2 || ( sci-electronics/gnucap sci-ele
 SLOT=0
 SRC_URI=mirror://sourceforge/gspeakers/gspeakers-0.11.tar.gz
 _eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	eutils	5a98daf52f7430a4a6f46cee24cfe3e2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	45847910ffbe4d8bfb814e3527de1920	gnome2-utils	0d2178d7f87923f3c110366ece3c930f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=0abcc3059c3934505697784bb499397e
+_md5_=eb3f5345c14c770619ad3e970038eea9
diff --git a/metadata/md5-cache/sys-apps/busybox-1.20.2 b/metadata/md5-cache/sys-apps/busybox-1.20.2
index 5830cafddb9e..c3cec21f0e61 100644
--- a/metadata/md5-cache/sys-apps/busybox-1.20.2
+++ b/metadata/md5-cache/sys-apps/busybox-1.20.2
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://www.busybox.net/downloads/busybox-1.20.2.tar.bz2
 _eclasses_=eutils	5a98daf52f7430a4a6f46cee24cfe3e2	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	9aa8a023e062fca0ba79362d9d0cc488	portability	536c5e70c5fb252ed3b769e04aa3f05b	savedconfig	973a6df1a0949eba28a185eac79de815	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=e5323ec1f27959908308903269bd9766
+_md5_=280f34e1ab035ffd717882115c0c13c7
diff --git a/metadata/md5-cache/sys-apps/openrc-0.11.1 b/metadata/md5-cache/sys-apps/openrc-0.11.1
index 893398530577..93cc9ec42349 100644
--- a/metadata/md5-cache/sys-apps/openrc-0.11.1
+++ b/metadata/md5-cache/sys-apps/openrc-0.11.1
@@ -10,4 +10,4 @@ RDEPEND=virtual/init kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sy
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~williamh/dist/openrc-0.11.1.tar.bz2
 _eclasses_=eutils	5a98daf52f7430a4a6f46cee24cfe3e2	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	9aa8a023e062fca0ba79362d9d0cc488	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=518c64024cbd19a51ded3e2e3e3bee4d
+_md5_=0b56557c7bc3b2ac8faeb524f008aaf0
diff --git a/metadata/md5-cache/sys-auth/consolekit-0.4.5_p20120320 b/metadata/md5-cache/sys-auth/consolekit-0.4.5_p20120320
index 4962b404a00c..0c8af5311606 100644
--- a/metadata/md5-cache/sys-auth/consolekit-0.4.5_p20120320
+++ b/metadata/md5-cache/sys-auth/consolekit-0.4.5_p20120320
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure install prepare setup
-DEPEND=>=dev-libs/dbus-glib-0.98 >=dev-libs/glib-2.22 sys-libs/zlib x11-libs/libX11 acl? ( sys-apps/acl >=sys-fs/udev-146-r1 !<sys-fs/udev-171-r6[extras] ) pam? ( virtual/pam ) policykit? ( >=sys-auth/polkit-0.104-r1 ) dev-libs/libxslt virtual/pkgconfig doc? ( app-text/xmlto ) test? ( app-text/docbook-xml-dtd:4.1.2 app-text/xmlto ) || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-libs/dbus-glib-0.98 >=dev-libs/glib-2.22 sys-libs/zlib x11-libs/libX11 acl? ( sys-apps/acl >=sys-fs/udev-146-r1 !<sys-fs/udev-171-r99[extras] ) pam? ( virtual/pam ) policykit? ( >=sys-auth/polkit-0.104-r1 ) dev-libs/libxslt virtual/pkgconfig doc? ( app-text/xmlto ) test? ( app-text/docbook-xml-dtd:4.1.2 app-text/xmlto ) || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Framework for defining and tracking users, login sessions and seats.
 EAPI=4
 HOMEPAGE=http://www.freedesktop.org/wiki/Software/ConsoleKit
 IUSE=acl debug doc kernel_linux pam policykit selinux test
 KEYWORDS=alpha amd64 arm ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux
 LICENSE=GPL-2
-RDEPEND=>=dev-libs/dbus-glib-0.98 >=dev-libs/glib-2.22 sys-libs/zlib x11-libs/libX11 acl? ( sys-apps/acl >=sys-fs/udev-146-r1 !<sys-fs/udev-171-r6[extras] ) pam? ( virtual/pam ) policykit? ( >=sys-auth/polkit-0.104-r1 ) kernel_linux? ( sys-apps/coreutils[acl?] ) selinux? ( sec-policy/selinux-consolekit )
+RDEPEND=>=dev-libs/dbus-glib-0.98 >=dev-libs/glib-2.22 sys-libs/zlib x11-libs/libX11 acl? ( sys-apps/acl >=sys-fs/udev-146-r1 !<sys-fs/udev-171-r99[extras] ) pam? ( virtual/pam ) policykit? ( >=sys-auth/polkit-0.104-r1 ) kernel_linux? ( sys-apps/coreutils[acl?] ) selinux? ( sec-policy/selinux-consolekit )
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~ssuominen/ConsoleKit-0.4.5_p20120320.tar.xz
 _eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	eutils	5a98daf52f7430a4a6f46cee24cfe3e2	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	0b7adf68a2edb4e5a32b07bb6e68121c	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	systemd	647a5a2d457d440371b3c86b4ccb9d38	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=7abfc0e2f52eb98548e28bf5cbc532dc
+_md5_=a8a1de31ea8ec74c68195d4dd876a1db
diff --git a/metadata/md5-cache/sys-auth/consolekit-0.4.5_p20120320-r1 b/metadata/md5-cache/sys-auth/consolekit-0.4.5_p20120320-r1
index eee283133827..4f441636f88b 100644
--- a/metadata/md5-cache/sys-auth/consolekit-0.4.5_p20120320-r1
+++ b/metadata/md5-cache/sys-auth/consolekit-0.4.5_p20120320-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure install prepare setup
-DEPEND=>=dev-libs/dbus-glib-0.98 >=dev-libs/glib-2.22 sys-libs/zlib x11-libs/libX11 acl? ( sys-apps/acl >=sys-fs/udev-146-r1 !<sys-fs/udev-171-r6[extras] ) pam? ( virtual/pam ) policykit? ( >=sys-auth/polkit-0.104-r1 ) dev-libs/libxslt virtual/pkgconfig doc? ( app-text/xmlto ) test? ( app-text/docbook-xml-dtd:4.1.2 app-text/xmlto ) || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-libs/dbus-glib-0.98 >=dev-libs/glib-2.22 sys-libs/zlib x11-libs/libX11 acl? ( sys-apps/acl >=sys-fs/udev-146-r1 !<sys-fs/udev-171-r99[extras] ) pam? ( virtual/pam ) policykit? ( >=sys-auth/polkit-0.104-r1 ) dev-libs/libxslt virtual/pkgconfig doc? ( app-text/xmlto ) test? ( app-text/docbook-xml-dtd:4.1.2 app-text/xmlto ) || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Framework for defining and tracking users, login sessions and seats.
 EAPI=4
 HOMEPAGE=http://www.freedesktop.org/wiki/Software/ConsoleKit
 IUSE=acl debug doc kernel_linux pam policykit selinux test
 KEYWORDS=~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux
 LICENSE=GPL-2
-RDEPEND=>=dev-libs/dbus-glib-0.98 >=dev-libs/glib-2.22 sys-libs/zlib x11-libs/libX11 acl? ( sys-apps/acl >=sys-fs/udev-146-r1 !<sys-fs/udev-171-r6[extras] ) pam? ( virtual/pam ) policykit? ( >=sys-auth/polkit-0.104-r1 ) kernel_linux? ( sys-apps/coreutils[acl?] ) selinux? ( sec-policy/selinux-consolekit )
+RDEPEND=>=dev-libs/dbus-glib-0.98 >=dev-libs/glib-2.22 sys-libs/zlib x11-libs/libX11 acl? ( sys-apps/acl >=sys-fs/udev-146-r1 !<sys-fs/udev-171-r99[extras] ) pam? ( virtual/pam ) policykit? ( >=sys-auth/polkit-0.104-r1 ) kernel_linux? ( sys-apps/coreutils[acl?] ) selinux? ( sec-policy/selinux-consolekit )
 SLOT=0
 SRC_URI=mirror://gentoo/ConsoleKit-0.4.5_p20120320.tar.xz
 _eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	eutils	5a98daf52f7430a4a6f46cee24cfe3e2	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	0b7adf68a2edb4e5a32b07bb6e68121c	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	systemd	647a5a2d457d440371b3c86b4ccb9d38	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=5a0f7b82de4e87ddce0632ff2ff3e689
+_md5_=b068a0411fd99a1511f8a3348c41153a
diff --git a/metadata/md5-cache/sys-auth/nss-myhostname-0.3 b/metadata/md5-cache/sys-auth/nss-myhostname-0.3
index 97ffca428753..144de6c737d3 100644
--- a/metadata/md5-cache/sys-auth/nss-myhostname-0.3
+++ b/metadata/md5-cache/sys-auth/nss-myhostname-0.3
@@ -3,7 +3,7 @@ DESCRIPTION=Name Service Switch module for resolving the local hostname
 EAPI=4
 HOMEPAGE=http://0pointer.de/lennart/projects/nss-myhostname/
 KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=LGPL-2.1
+LICENSE=LGPL-2.1+
 SLOT=0
 SRC_URI=http://0pointer.de/lennart/projects/nss-myhostname/nss-myhostname-0.3.tar.gz
-_md5_=d8021cd4dc72ba1ade2a69a2e5b1bcbf
+_md5_=4e11ad1f29ae2e3ba9a7e65bbffe33cb
diff --git a/metadata/md5-cache/sys-auth/pam_ldap-186 b/metadata/md5-cache/sys-auth/pam_ldap-186
index 49dd19c8b541..d409a2e3088e 100644
--- a/metadata/md5-cache/sys-auth/pam_ldap-186
+++ b/metadata/md5-cache/sys-auth/pam_ldap-186
@@ -3,10 +3,10 @@ DEPEND=>=sys-libs/glibc-2.1.3 >=sys-libs/pam-0.72 >=net-nds/openldap-2.1.30-r5 s
 DESCRIPTION=PAM LDAP Module
 HOMEPAGE=http://www.padl.com/OSS/pam_ldap.html
 IUSE=ssl sasl
-KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=|| ( GPL-2 LGPL-2 )
 RDEPEND=>=sys-libs/glibc-2.1.3 >=sys-libs/pam-0.72 >=net-nds/openldap-2.1.30-r5 sasl? ( dev-libs/cyrus-sasl )
 SLOT=0
 SRC_URI=http://www.padl.com/download/pam_ldap-186.tar.gz
 _eclasses_=eutils	5a98daf52f7430a4a6f46cee24cfe3e2	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	9aa8a023e062fca0ba79362d9d0cc488	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=0d851c662da5b2353dcf36e7ce7e0b2d
+_md5_=d30031a39e33d07b5be1e800a1a32904
diff --git a/metadata/md5-cache/sys-boot/grub-2.00-r1 b/metadata/md5-cache/sys-boot/grub-2.00-r1
index 03814597aadb..07edad100d69 100644
--- a/metadata/md5-cache/sys-boot/grub-2.00-r1
+++ b/metadata/md5-cache/sys-boot/grub-2.00-r1
@@ -1,4 +1,4 @@
-DEFINED_PHASES=compile configure install postinst prepare
+DEFINED_PHASES=compile configure install postinst prepare pretend
 DEPEND=app-arch/xz-utils >=sys-libs/ncurses-5.2-r5 debug? ( sdl? ( media-libs/libsdl ) ) device-mapper? ( >=sys-fs/lvm2-2.02.45 ) libzfs? ( sys-fs/zfs ) mount? ( sys-fs/fuse ) truetype? ( media-libs/freetype media-fonts/dejavu >=media-fonts/unifont-5 ) ppc? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils ) ppc64? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils ) >=dev-lang/python-2.5.2 sys-devel/flex sys-devel/bison sys-apps/help2man sys-apps/texinfo static? ( truetype? ( app-arch/bzip2[static-libs(+)] media-libs/freetype[static-libs(+)] sys-libs/zlib[static-libs(+)] ) ) >=sys-devel/autogen-5.10 || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=GNU GRUB boot loader
 EAPI=4
@@ -11,4 +11,4 @@ REQUIRED_USE=grub_platforms_qemu? ( truetype )
 SLOT=2
 SRC_URI=mirror://gnu/grub/grub-2.00.tar.xz mirror://gentoo/grub-2.00.tar.xz
 _eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	eutils	5a98daf52f7430a4a6f46cee24cfe3e2	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=0bc960a14473d818427722b2d9ddd9c4
+_md5_=d38330677ac1cedf87ffbe64843f5516
diff --git a/metadata/md5-cache/sys-boot/grub-9999 b/metadata/md5-cache/sys-boot/grub-9999
index cf2866254bce..4e5ed36a3aec 100644
--- a/metadata/md5-cache/sys-boot/grub-9999
+++ b/metadata/md5-cache/sys-boot/grub-9999
@@ -1,4 +1,4 @@
-DEFINED_PHASES=compile configure install postinst prepare unpack
+DEFINED_PHASES=compile configure install postinst prepare pretend unpack
 DEPEND=app-arch/xz-utils >=sys-libs/ncurses-5.2-r5 debug? ( sdl? ( media-libs/libsdl ) ) device-mapper? ( >=sys-fs/lvm2-2.02.45 ) libzfs? ( sys-fs/zfs ) mount? ( sys-fs/fuse ) truetype? ( media-libs/freetype media-fonts/dejavu >=media-fonts/unifont-5 ) ppc? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils ) ppc64? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils ) >=dev-lang/python-2.5.2 sys-devel/flex sys-devel/bison sys-apps/help2man sys-apps/texinfo static? ( truetype? ( app-arch/bzip2[static-libs(+)] media-libs/freetype[static-libs(+)] sys-libs/zlib[static-libs(+)] ) ) >=sys-devel/autogen-5.10 || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=dev-vcs/bzr-2.0.1
 DESCRIPTION=GNU GRUB boot loader
 EAPI=4
@@ -9,4 +9,4 @@ RDEPEND=app-arch/xz-utils >=sys-libs/ncurses-5.2-r5 debug? ( sdl? ( media-libs/l
 REQUIRED_USE=grub_platforms_qemu? ( truetype )
 SLOT=2
 _eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	bzr	876798528c0cd872742b74bf784738cf	eutils	5a98daf52f7430a4a6f46cee24cfe3e2	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	0ace932c4045349c7fc1af0fe7091acf	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=34c26e3b6a2847887de1660e52cd5504
+_md5_=fd7c1642fc11715c6388c0a91fae528c
diff --git a/metadata/md5-cache/sys-fs/cryptsetup-1.2.0-r1 b/metadata/md5-cache/sys-fs/cryptsetup-1.2.0-r1
index 8bea0d909bee..f705bad9c379 100644
--- a/metadata/md5-cache/sys-fs/cryptsetup-1.2.0-r1
+++ b/metadata/md5-cache/sys-fs/cryptsetup-1.2.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare setup test
-DEPEND=!static? ( >=dev-libs/libgcrypt-1.1.42 dev-libs/libgpg-error >=dev-libs/popt-1.7 >=sys-apps/util-linux-2.17.2 >=sys-fs/lvm2-2.02.64 ) >=sys-fs/udev-124 >=sys-libs/e2fsprogs-libs-1.41 selinux? ( sys-libs/libselinux ) !sys-fs/cryptsetup-luks static? ( >=dev-libs/libgpg-error-1.10[static-libs] >=dev-libs/popt-1.16-r1[static-libs] || ( >=sys-apps/util-linux-2.20[static-libs] <sys-apps/util-linux-2.20 ) dev-libs/libgcrypt[static-libs] || ( >=sys-fs/lvm2-2.02.88[static-libs] <sys-fs/lvm2-2.02.88 ) || ( >=sys-fs/udev-182[static-libs] <=sys-fs/udev-171-r6 ) )
+DEPEND=!static? ( >=dev-libs/libgcrypt-1.1.42 dev-libs/libgpg-error >=dev-libs/popt-1.7 >=sys-apps/util-linux-2.17.2 >=sys-fs/lvm2-2.02.64 ) >=sys-fs/udev-124 >=sys-libs/e2fsprogs-libs-1.41 selinux? ( sys-libs/libselinux ) !sys-fs/cryptsetup-luks static? ( >=dev-libs/libgpg-error-1.10[static-libs] >=dev-libs/popt-1.16-r1[static-libs] || ( >=sys-apps/util-linux-2.20[static-libs] <sys-apps/util-linux-2.20 ) dev-libs/libgcrypt[static-libs] || ( >=sys-fs/lvm2-2.02.88[static-libs] <sys-fs/lvm2-2.02.88 ) || ( >=sys-fs/udev-182[static-libs] <=sys-fs/udev-171-r8 =sys-fs/udev-171* ) )
 DESCRIPTION=Tool to setup encrypted devices with dm-crypt
 EAPI=2
 HOMEPAGE=http://code.google.com/p/cryptsetup/
@@ -10,4 +10,4 @@ RDEPEND=!static? ( >=dev-libs/libgcrypt-1.1.42 dev-libs/libgpg-error >=dev-libs/
 SLOT=0
 SRC_URI=http://cryptsetup.googlecode.com/files/cryptsetup-1.2.0.tar.bz2
 _eclasses_=eutils	5a98daf52f7430a4a6f46cee24cfe3e2	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	0b7adf68a2edb4e5a32b07bb6e68121c	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=24f510022cd41f98c29285ac562d5d88
+_md5_=e42b5850b1125e3ad9b1cc23c546bac0
diff --git a/metadata/md5-cache/sys-fs/cryptsetup-1.4.1 b/metadata/md5-cache/sys-fs/cryptsetup-1.4.1
index 3b3796128afa..df770670ab2a 100644
--- a/metadata/md5-cache/sys-fs/cryptsetup-1.4.1
+++ b/metadata/md5-cache/sys-fs/cryptsetup-1.4.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare setup test
-DEPEND=!<sys-apps/baselayout-2 !static? ( >=dev-libs/libgcrypt-1.1.42 dev-libs/libgpg-error >=dev-libs/popt-1.7 >=sys-apps/util-linux-2.17.2 >=sys-fs/lvm2-2.02.64 ) >=sys-fs/udev-124 >=sys-libs/e2fsprogs-libs-1.41 selinux? ( sys-libs/libselinux ) !sys-fs/cryptsetup-luks static? ( >=dev-libs/libgpg-error-1.10[static-libs] >=dev-libs/popt-1.16-r1[static-libs] || ( >=sys-apps/util-linux-2.20[static-libs] <sys-apps/util-linux-2.20 ) dev-libs/libgcrypt[static-libs] || ( >=sys-fs/lvm2-2.02.88[static-libs] <sys-fs/lvm2-2.02.88 ) || ( >=sys-fs/udev-182[static-libs] <=sys-fs/udev-171-r6 ) )
+DEPEND=!<sys-apps/baselayout-2 !static? ( >=dev-libs/libgcrypt-1.1.42 dev-libs/libgpg-error >=dev-libs/popt-1.7 >=sys-apps/util-linux-2.17.2 >=sys-fs/lvm2-2.02.64 ) >=sys-fs/udev-124 >=sys-libs/e2fsprogs-libs-1.41 selinux? ( sys-libs/libselinux ) !sys-fs/cryptsetup-luks static? ( >=dev-libs/libgpg-error-1.10[static-libs] >=dev-libs/popt-1.16-r1[static-libs] || ( >=sys-apps/util-linux-2.20[static-libs] <sys-apps/util-linux-2.20 ) dev-libs/libgcrypt[static-libs] || ( >=sys-fs/lvm2-2.02.88[static-libs] <sys-fs/lvm2-2.02.88 ) || ( >=sys-fs/udev-182[static-libs] <=sys-fs/udev-171-r8 =sys-fs/udev-171* ) )
 DESCRIPTION=Tool to setup encrypted devices with dm-crypt
 EAPI=2
 HOMEPAGE=http://code.google.com/p/cryptsetup/
@@ -10,4 +10,4 @@ RDEPEND=!<sys-apps/baselayout-2 !static? ( >=dev-libs/libgcrypt-1.1.42 dev-libs/
 SLOT=0
 SRC_URI=http://cryptsetup.googlecode.com/files/cryptsetup-1.4.1.tar.bz2
 _eclasses_=eutils	5a98daf52f7430a4a6f46cee24cfe3e2	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	0b7adf68a2edb4e5a32b07bb6e68121c	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=83a1987eb96860947bbf8e4d3ba1360a
+_md5_=a57d15947470aefdccc1865959cb6809
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-3.5.7 b/metadata/md5-cache/sys-kernel/gentoo-sources-3.5.7
index 4944357d7a93..889e761e1b80 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-3.5.7
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-3.5.7
@@ -4,7 +4,7 @@ DESCRIPTION=Full sources including the Gentoo patchset for the 3.5 kernel tree
 EAPI=3
 HOMEPAGE=http://dev.gentoo.org/~mpagano/genpatches
 IUSE=deblob symlink build deblob
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=GPL-2 !deblob? ( freedist )
 PDEPEND=!build? ( virtual/dev-manager )
 RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
@@ -12,4 +12,4 @@ RESTRICT=binchecks strip
 SLOT=3.5.7
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.5.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.5.N/deblob-3.5 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.5.N/deblob-check -> deblob-check-3.5 ) mirror://gentoo/genpatches-3.5-7.base.tar.bz2 mirror://gentoo/genpatches-3.5-7.extras.tar.bz2
 _eclasses_=eutils	5a98daf52f7430a4a6f46cee24cfe3e2	kernel-2	dd451098928ff900df7c254820871c00	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=1835866d95d1d9acc5edb515bb41a6fb
+_md5_=b80a1d82e886ebfff9c46657e8beab4b
diff --git a/metadata/md5-cache/sys-kernel/git-sources-3.6_rc1 b/metadata/md5-cache/sys-kernel/git-sources-3.6_rc1
deleted file mode 100644
index 37b928a36666..000000000000
--- a/metadata/md5-cache/sys-kernel/git-sources-3.6_rc1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=The very latest -git version of the Linux kernel
-EAPI=4
-HOMEPAGE=http://www.kernel.org
-IUSE=symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86
-LICENSE=GPL-2 freedist
-PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
-RESTRICT=binchecks strip
-SLOT=3.6_rc1
-SRC_URI=mirror://kernel/linux/kernel/v3.x/testing/patch-3.6-rc1.bz2 mirror://kernel/linux/kernel/v3.x/linux-3.5.tar.bz2
-_eclasses_=eutils	5a98daf52f7430a4a6f46cee24cfe3e2	kernel-2	dd451098928ff900df7c254820871c00	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=63e14ef52912f98b8f2a075cda1b2683
diff --git a/metadata/md5-cache/sys-kernel/git-sources-3.6_rc2 b/metadata/md5-cache/sys-kernel/git-sources-3.6_rc2
deleted file mode 100644
index b349a215b1a1..000000000000
--- a/metadata/md5-cache/sys-kernel/git-sources-3.6_rc2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=The very latest -git version of the Linux kernel
-EAPI=4
-HOMEPAGE=http://www.kernel.org
-IUSE=symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86
-LICENSE=GPL-2 freedist
-PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
-RESTRICT=binchecks strip
-SLOT=3.6_rc2
-SRC_URI=mirror://kernel/linux/kernel/v3.x/testing/patch-3.6-rc2.bz2 mirror://kernel/linux/kernel/v3.x/linux-3.5.tar.bz2
-_eclasses_=eutils	5a98daf52f7430a4a6f46cee24cfe3e2	kernel-2	dd451098928ff900df7c254820871c00	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=464cb4d0fe9087e983c10a9ad1541b05
diff --git a/metadata/md5-cache/sys-kernel/git-sources-3.6_rc4 b/metadata/md5-cache/sys-kernel/git-sources-3.6_rc4
deleted file mode 100644
index 98d4efac0f94..000000000000
--- a/metadata/md5-cache/sys-kernel/git-sources-3.6_rc4
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=The very latest -git version of the Linux kernel
-EAPI=4
-HOMEPAGE=http://www.kernel.org
-IUSE=symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86
-LICENSE=GPL-2 freedist
-PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
-RESTRICT=binchecks strip
-SLOT=3.6_rc4
-SRC_URI=mirror://kernel/linux/kernel/v3.x/testing/patch-3.6-rc4.bz2 mirror://kernel/linux/kernel/v3.x/linux-3.5.tar.bz2
-_eclasses_=eutils	5a98daf52f7430a4a6f46cee24cfe3e2	kernel-2	dd451098928ff900df7c254820871c00	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=2ea3f84b16349e583185e84989010014
diff --git a/metadata/md5-cache/sys-kernel/git-sources-3.6_rc5 b/metadata/md5-cache/sys-kernel/git-sources-3.6_rc5
deleted file mode 100644
index 63e239186fb5..000000000000
--- a/metadata/md5-cache/sys-kernel/git-sources-3.6_rc5
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=The very latest -git version of the Linux kernel
-EAPI=4
-HOMEPAGE=http://www.kernel.org
-IUSE=symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86
-LICENSE=GPL-2 freedist
-PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
-RESTRICT=binchecks strip
-SLOT=3.6_rc5
-SRC_URI=mirror://kernel/linux/kernel/v3.x/testing/patch-3.6-rc5.bz2 mirror://kernel/linux/kernel/v3.x/linux-3.5.tar.bz2
-_eclasses_=eutils	5a98daf52f7430a4a6f46cee24cfe3e2	kernel-2	dd451098928ff900df7c254820871c00	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=6aef6d093e044d90a9da5884888e60fe
diff --git a/metadata/md5-cache/sys-kernel/git-sources-3.6_rc6 b/metadata/md5-cache/sys-kernel/git-sources-3.6_rc6
deleted file mode 100644
index 497f022156ce..000000000000
--- a/metadata/md5-cache/sys-kernel/git-sources-3.6_rc6
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=The very latest -git version of the Linux kernel
-EAPI=4
-HOMEPAGE=http://www.kernel.org
-IUSE=symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86
-LICENSE=GPL-2 freedist
-PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
-RESTRICT=binchecks strip
-SLOT=3.6_rc6
-SRC_URI=mirror://kernel/linux/kernel/v3.x/testing/patch-3.6-rc6.bz2 mirror://kernel/linux/kernel/v3.x/linux-3.5.tar.bz2
-_eclasses_=eutils	5a98daf52f7430a4a6f46cee24cfe3e2	kernel-2	dd451098928ff900df7c254820871c00	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=92674fb396c74955eaf281d4f60abd2f
diff --git a/metadata/md5-cache/sys-kernel/git-sources-3.6_rc7 b/metadata/md5-cache/sys-kernel/git-sources-3.6_rc7
deleted file mode 100644
index 82cce404cddb..000000000000
--- a/metadata/md5-cache/sys-kernel/git-sources-3.6_rc7
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=The very latest -git version of the Linux kernel
-EAPI=4
-HOMEPAGE=http://www.kernel.org
-IUSE=symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86
-LICENSE=GPL-2 freedist
-PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
-RESTRICT=binchecks strip
-SLOT=3.6_rc7
-SRC_URI=mirror://kernel/linux/kernel/v3.x/testing/patch-3.6-rc7.bz2 mirror://kernel/linux/kernel/v3.x/linux-3.5.tar.bz2
-_eclasses_=eutils	5a98daf52f7430a4a6f46cee24cfe3e2	kernel-2	dd451098928ff900df7c254820871c00	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=e5877c14375e614a0f4aa063fc2f265a
diff --git a/metadata/md5-cache/sys-kernel/git-sources-3.6_rc3 b/metadata/md5-cache/sys-kernel/git-sources-3.7_rc2
similarity index 81%
rename from metadata/md5-cache/sys-kernel/git-sources-3.6_rc3
rename to metadata/md5-cache/sys-kernel/git-sources-3.7_rc2
index 1b03628ecb27..665a706fe1a7 100644
--- a/metadata/md5-cache/sys-kernel/git-sources-3.6_rc3
+++ b/metadata/md5-cache/sys-kernel/git-sources-3.7_rc2
@@ -9,7 +9,7 @@ LICENSE=GPL-2 freedist
 PDEPEND=!build? ( virtual/dev-manager )
 RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 RESTRICT=binchecks strip
-SLOT=3.6_rc3
-SRC_URI=mirror://kernel/linux/kernel/v3.x/testing/patch-3.6-rc3.bz2 mirror://kernel/linux/kernel/v3.x/linux-3.5.tar.bz2
+SLOT=3.7_rc2
+SRC_URI=mirror://kernel/linux/kernel/v3.x/testing/patch-3.7-rc2.bz2 mirror://kernel/linux/kernel/v3.x/linux-3.6.tar.bz2
 _eclasses_=eutils	5a98daf52f7430a4a6f46cee24cfe3e2	kernel-2	dd451098928ff900df7c254820871c00	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=c95d15b7ba059495aa07f02fb4397dbc
+_md5_=0a50f3773124eef37e3801a2c2ff5ae8
diff --git a/metadata/md5-cache/sys-kernel/mips-sources-3.4.14 b/metadata/md5-cache/sys-kernel/mips-sources-3.4.14
new file mode 100644
index 000000000000..81581267572c
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/mips-sources-3.4.14
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst postrm preinst setup test unpack
+DEPEND=>=sys-devel/gcc-4.1.1 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Linux-Mips GIT sources for MIPS-based machines, dated 20120623
+EAPI=4
+HOMEPAGE=http://www.linux-mips.org/ http://www.gentoo.org/
+IUSE=cobalt ip27 ip28 ip30 ip32r10k impactdebug odysseydebug symlink build
+KEYWORDS=-* ~mips
+LICENSE=GPL-2 freedist
+PDEPEND=!build? ( virtual/dev-manager )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
+RESTRICT=binchecks strip
+SLOT=3.4.14
+SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.4.14.bz2 mirror://kernel/linux/kernel/v3.x/linux-3.4.tar.bz2 mirror://gentoo/mipsgit-3.4.0-20120623.diff.xz mirror://gentoo/mips-sources-3.4.0-patches-v1.tar.xz
+_eclasses_=eutils	5a98daf52f7430a4a6f46cee24cfe3e2	kernel-2	dd451098928ff900df7c254820871c00	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=e78099a12cb9b573630d4e7e99c83858
diff --git a/metadata/md5-cache/sys-kernel/mips-sources-3.0.9-r1 b/metadata/md5-cache/sys-kernel/mips-sources-3.5.7
similarity index 74%
rename from metadata/md5-cache/sys-kernel/mips-sources-3.0.9-r1
rename to metadata/md5-cache/sys-kernel/mips-sources-3.5.7
index bcffb3293092..fe13f2d55e13 100644
--- a/metadata/md5-cache/sys-kernel/mips-sources-3.0.9-r1
+++ b/metadata/md5-cache/sys-kernel/mips-sources-3.5.7
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile install postinst postrm preinst setup test unpack
 DEPEND=>=sys-devel/gcc-4.1.1 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Linux-Mips GIT sources for MIPS-based machines, dated 20110821
+DESCRIPTION=Linux-Mips GIT sources for MIPS-based machines, dated 20120908
 EAPI=4
 HOMEPAGE=http://www.linux-mips.org/ http://www.gentoo.org/
 IUSE=cobalt ip27 ip28 ip30 ip32r10k impactdebug odysseydebug symlink build
@@ -9,7 +9,7 @@ LICENSE=GPL-2 freedist
 PDEPEND=!build? ( virtual/dev-manager )
 RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 RESTRICT=binchecks strip
-SLOT=3.0.9
-SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.0.9.bz2 mirror://kernel/linux/kernel/v3.x/linux-3.0.tar.bz2 mirror://gentoo/mipsgit-3.0.0-20110821.diff.xz mirror://gentoo/mips-sources-3.0.0-patches-v3.tar.xz
+SLOT=3.5.7
+SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.5.7.bz2 mirror://kernel/linux/kernel/v3.x/linux-3.5.tar.bz2 mirror://gentoo/mipsgit-3.5.0-20120908.diff.xz mirror://gentoo/mips-sources-3.5.0-patches-v1.tar.xz
 _eclasses_=eutils	5a98daf52f7430a4a6f46cee24cfe3e2	kernel-2	dd451098928ff900df7c254820871c00	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=1015bce8b828ccb9d3ca08e1627cd853
+_md5_=de862afce7272762642e26676eb20508
diff --git a/metadata/md5-cache/sys-kernel/mips-sources-3.1.6 b/metadata/md5-cache/sys-kernel/mips-sources-3.6.2
similarity index 74%
rename from metadata/md5-cache/sys-kernel/mips-sources-3.1.6
rename to metadata/md5-cache/sys-kernel/mips-sources-3.6.2
index e0131d16ea28..f36d8da2ae3d 100644
--- a/metadata/md5-cache/sys-kernel/mips-sources-3.1.6
+++ b/metadata/md5-cache/sys-kernel/mips-sources-3.6.2
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile install postinst postrm preinst setup test unpack
 DEPEND=>=sys-devel/gcc-4.1.1 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Linux-Mips GIT sources for MIPS-based machines, dated 20111216
+DESCRIPTION=Linux-Mips GIT sources for MIPS-based machines, dated 20121008
 EAPI=4
 HOMEPAGE=http://www.linux-mips.org/ http://www.gentoo.org/
 IUSE=cobalt ip27 ip28 ip30 ip32r10k impactdebug odysseydebug symlink build
@@ -9,7 +9,7 @@ LICENSE=GPL-2 freedist
 PDEPEND=!build? ( virtual/dev-manager )
 RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 RESTRICT=binchecks strip
-SLOT=3.1.6
-SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.1.6.bz2 mirror://kernel/linux/kernel/v3.x/linux-3.1.tar.bz2 mirror://gentoo/mipsgit-3.1.0-20111216.diff.xz mirror://gentoo/mips-sources-3.1.0-patches-v2.tar.xz
+SLOT=3.6.2
+SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.6.2.bz2 mirror://kernel/linux/kernel/v3.x/linux-3.6.tar.bz2 mirror://gentoo/mipsgit-3.6.0-20121008.diff.xz mirror://gentoo/mips-sources-3.6.0-patches-v1.tar.xz
 _eclasses_=eutils	5a98daf52f7430a4a6f46cee24cfe3e2	kernel-2	dd451098928ff900df7c254820871c00	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=aca1c5c22ee972e0636929240f856dc4
+_md5_=758c1bc2c9be7e79433e8e927d05a208
diff --git a/metadata/md5-cache/sys-kernel/mkinitcpio-0.9.2-r1 b/metadata/md5-cache/sys-kernel/mkinitcpio-0.9.2-r1
index 530acf768c09..baf30832067d 100644
--- a/metadata/md5-cache/sys-kernel/mkinitcpio-0.9.2-r1
+++ b/metadata/md5-cache/sys-kernel/mkinitcpio-0.9.2-r1
@@ -6,8 +6,8 @@ HOMEPAGE=http://www.archlinux.org/
 IUSE=cryptsetup device-mapper dmraid mdadm pcmcia udev
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=app-arch/cpio app-arch/gzip app-arch/libarchive app-shells/bash >=sys-apps/busybox-1.20[static] sys-apps/coreutils sys-apps/file sys-apps/findutils sys-apps/grep >=sys-apps/kmod-7 >=sys-apps/util-linux-2.21 udev? ( >sys-fs/udev-171-r6 ) device-mapper? ( sys-fs/lvm2[static] ) cryptsetup? ( sys-fs/cryptsetup[static] ) mdadm? ( sys-fs/mdadm[static] ) dmraid? ( sys-fs/dmraid[static] ) pcmcia? ( sys-apps/pcmciautils[static] )
+RDEPEND=app-arch/cpio app-arch/gzip app-arch/libarchive app-shells/bash >=sys-apps/busybox-1.20[static] sys-apps/coreutils sys-apps/file sys-apps/findutils sys-apps/grep >=sys-apps/kmod-7 >=sys-apps/util-linux-2.21 udev? ( >sys-fs/udev-171-r8 ) device-mapper? ( sys-fs/lvm2[static] ) cryptsetup? ( sys-fs/cryptsetup[static] ) mdadm? ( sys-fs/mdadm[static] ) dmraid? ( sys-fs/dmraid[static] ) pcmcia? ( sys-apps/pcmciautils[static] )
 SLOT=0
 SRC_URI=ftp://ftp.archlinux.org/other/mkinitcpio/mkinitcpio-0.9.2.tar.gz http://xmw.de/mirror/mkinitcpio-modules/mkinitcpio-modules-0_p20120704.tar.bz2
 _eclasses_=eutils	5a98daf52f7430a4a6f46cee24cfe3e2	linux-info	0b7adf68a2edb4e5a32b07bb6e68121c	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=b6c9ded87388124defba43f68cfb6028
+_md5_=b0deb6855b3bbf6523e4eba2028dffea
diff --git a/metadata/md5-cache/sys-kernel/tuxonice-sources-3.0.17-r1 b/metadata/md5-cache/sys-kernel/tuxonice-sources-3.0.17-r1
deleted file mode 100644
index 5ad04c6b37a8..000000000000
--- a/metadata/md5-cache/sys-kernel/tuxonice-sources-3.0.17-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=TuxOnIce + Gentoo patchset sources
-EAPI=4
-HOMEPAGE=http://dev.gentoo.org/~mpagano/genpatches/ http://www.tuxonice.net
-IUSE=symlink build
-KEYWORDS=amd64 x86
-LICENSE=GPL-2 freedist
-PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=>=sys-apps/tuxonice-userui-1.0 || ( >=sys-power/hibernate-script-2.0 sys-power/pm-utils ) !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
-RESTRICT=binchecks strip
-SLOT=3.0.17-r1
-SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.0.tar.bz2 mirror://gentoo/genpatches-3.0-18.base.tar.bz2 mirror://gentoo/genpatches-3.0-18.extras.tar.bz2 http://dev.gentoo.org/~pacho/tuxonice/current-tuxonice-for-3.0_20111012.patch.bz2
-_eclasses_=eutils	5a98daf52f7430a4a6f46cee24cfe3e2	kernel-2	dd451098928ff900df7c254820871c00	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=e86108f946589bacdc5ebc7d1e55fba6
diff --git a/metadata/md5-cache/sys-kernel/tuxonice-sources-3.0.43 b/metadata/md5-cache/sys-kernel/tuxonice-sources-3.0.43
deleted file mode 100644
index 78bf8e6c4c34..000000000000
--- a/metadata/md5-cache/sys-kernel/tuxonice-sources-3.0.43
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=TuxOnIce + Gentoo patchset sources
-EAPI=4
-HOMEPAGE=http://dev.gentoo.org/~mpagano/genpatches/ http://www.tuxonice.net
-IUSE=symlink build
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 freedist
-PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=>=sys-apps/tuxonice-userui-1.0 || ( >=sys-power/hibernate-script-2.0 sys-power/pm-utils ) !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
-RESTRICT=binchecks strip
-SLOT=3.0.43
-SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.0.tar.bz2 mirror://gentoo/genpatches-3.0-30.base.tar.bz2 mirror://gentoo/genpatches-3.0-30.extras.tar.bz2 http://dev.gentoo.org/~pacho/tuxonice/current-tuxonice-for-3.0_20111012.patch.bz2
-_eclasses_=eutils	5a98daf52f7430a4a6f46cee24cfe3e2	kernel-2	dd451098928ff900df7c254820871c00	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=9d422a821b9874222635e7ee8c1b0e7e
diff --git a/metadata/md5-cache/sys-kernel/tuxonice-sources-3.0.39 b/metadata/md5-cache/sys-kernel/tuxonice-sources-3.0.46
similarity index 83%
rename from metadata/md5-cache/sys-kernel/tuxonice-sources-3.0.39
rename to metadata/md5-cache/sys-kernel/tuxonice-sources-3.0.46
index bd258af7f7ac..a13508590d19 100644
--- a/metadata/md5-cache/sys-kernel/tuxonice-sources-3.0.39
+++ b/metadata/md5-cache/sys-kernel/tuxonice-sources-3.0.46
@@ -9,7 +9,7 @@ LICENSE=GPL-2 freedist
 PDEPEND=!build? ( virtual/dev-manager )
 RDEPEND=>=sys-apps/tuxonice-userui-1.0 || ( >=sys-power/hibernate-script-2.0 sys-power/pm-utils ) !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
 RESTRICT=binchecks strip
-SLOT=3.0.39
-SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.0.tar.bz2 mirror://gentoo/genpatches-3.0-28.base.tar.bz2 mirror://gentoo/genpatches-3.0-28.extras.tar.bz2 http://dev.gentoo.org/~pacho/tuxonice/current-tuxonice-for-3.0_20111012.patch.bz2
+SLOT=3.0.46
+SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.0.tar.bz2 mirror://gentoo/genpatches-3.0-32.base.tar.bz2 mirror://gentoo/genpatches-3.0-32.extras.tar.bz2 http://dev.gentoo.org/~pacho/tuxonice/current-tuxonice-for-3.0_20111012.patch.bz2
 _eclasses_=eutils	5a98daf52f7430a4a6f46cee24cfe3e2	kernel-2	dd451098928ff900df7c254820871c00	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=788c0caa46202a818061cf930043b46d
+_md5_=8bb193f7069bde81e78052337c5cc3e4
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-3.5.7 b/metadata/md5-cache/sys-kernel/vanilla-sources-3.5.7
index abdc04950fa3..d2d2dca0f195 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-3.5.7
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-3.5.7
@@ -4,7 +4,7 @@ DESCRIPTION=Full sources for the Linux kernel
 EAPI=2
 HOMEPAGE=http://www.kernel.org
 IUSE=deblob symlink build deblob
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=GPL-2 !deblob? ( freedist )
 PDEPEND=!build? ( virtual/dev-manager )
 RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl )
@@ -12,4 +12,4 @@ RESTRICT=binchecks strip
 SLOT=3.5.7
 SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.5.7.bz2 mirror://kernel/linux/kernel/v3.x/linux-3.5.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.5.N/deblob-3.5 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.5.N/deblob-check -> deblob-check-3.5 )
 _eclasses_=eutils	5a98daf52f7430a4a6f46cee24cfe3e2	kernel-2	dd451098928ff900df7c254820871c00	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=db88b867b8e991709ab3003dc48ad143
+_md5_=e9b0f61d83da8aaab96007b77b7ac35b
diff --git a/metadata/md5-cache/sys-libs/db-4.8.30 b/metadata/md5-cache/sys-libs/db-4.8.30
index 4165d592991b..dfdd52a90f99 100644
--- a/metadata/md5-cache/sys-libs/db-4.8.30
+++ b/metadata/md5-cache/sys-libs/db-4.8.30
@@ -3,10 +3,10 @@ DEPEND=tcl? ( >=dev-lang/tcl-8.4 ) test? ( >=dev-lang/tcl-8.4 ) java? ( >=virtua
 DESCRIPTION=Oracle Berkeley DB
 HOMEPAGE=http://www.oracle.com/technology/software/products/berkeley-db/index.html
 IUSE=doc java cxx tcl test doc test examples elibc_FreeBSD java
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
 LICENSE=OracleDB
 RDEPEND=tcl? ( dev-lang/tcl ) java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=4.8
 SRC_URI=http://download.oracle.com/berkeley-db/db-4.8.30.tar.gz
 _eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	db	a7f8fb8f91a0b36419fde4a257c2be39	eutils	5a98daf52f7430a4a6f46cee24cfe3e2	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	2d9eb3508fa5d6759e39354b74545567	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=eb3652d781e30d1c2105e870cc4bd0dc
+_md5_=a0e088791c9eae6eebe2f330cf9c58d9
diff --git a/metadata/md5-cache/sys-libs/glibc-2.15-r3 b/metadata/md5-cache/sys-libs/glibc-2.15-r3
index 601bcbad8151..f75998b93979 100644
--- a/metadata/md5-cache/sys-libs/glibc-2.15-r3
+++ b/metadata/md5-cache/sys-libs/glibc-2.15-r3
@@ -3,11 +3,11 @@ DEPEND=>=sys-devel/gcc-3.4.4 arm? ( >=sys-devel/binutils-2.16.90 >=sys-devel/gcc
 DESCRIPTION=GNU libc6 (also called glibc2) C library
 HOMEPAGE=http://www.gnu.org/software/libc/libc.html
 IUSE=debug gd hardened multilib selinux profile vanilla crosscompile_opts_headers-only
-KEYWORDS=~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86
 LICENSE=LGPL-2
 RDEPEND=!sys-kernel/ps3-sources selinux? ( sys-libs/libselinux ) !sys-libs/nss-db vanilla? ( !sys-libs/timezone-data ) !vanilla? ( sys-libs/timezone-data )
 RESTRICT=strip
 SLOT=2.2
 SRC_URI=mirror://gnu/glibc/glibc-2.15.tar.xz ftp://sources.redhat.com/pub/glibc/releases/glibc-2.15.tar.xz ftp://sources.redhat.com/pub/glibc/snapshots/glibc-2.15.tar.xz mirror://gentoo/glibc-2.15.tar.xz mirror://gnu/glibc/glibc-ports-2.15.tar.xz ftp://sources.redhat.com/pub/glibc/releases/glibc-ports-2.15.tar.xz ftp://sources.redhat.com/pub/glibc/snapshots/glibc-ports-2.15.tar.xz mirror://gentoo/glibc-ports-2.15.tar.xz mirror://gentoo/glibc-2.15-patches-23.tar.bz2 http://dev.gentoo.org/~vapier/dist/glibc-2.15-patches-23.tar.bz2 http://dev.gentoo.org/~azarah/glibc/glibc-2.15-patches-23.tar.bz2
 _eclasses_=eutils	5a98daf52f7430a4a6f46cee24cfe3e2	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnuconfig	c0f61749b1cea36288502e3497dcd6ac	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	unpacker	50e1227854e96469a19a63f053496328	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=acec3b33783ad06f766a823f3cfc7eda
+_md5_=48e246afb754668cb887f73c5df805af
diff --git a/metadata/md5-cache/sys-libs/libsmbios-2.2.28 b/metadata/md5-cache/sys-libs/libsmbios-2.2.28
index e1dea5eb52b9..5186f834bc33 100644
--- a/metadata/md5-cache/sys-libs/libsmbios-2.2.28
+++ b/metadata/md5-cache/sys-libs/libsmbios-2.2.28
@@ -4,10 +4,10 @@ DESCRIPTION=Provide access to (SM)BIOS information
 EAPI=2
 HOMEPAGE=http://linux.dell.com/libsmbios/main/index.html
 IUSE=doc graphviz nls python static-libs test
-KEYWORDS=amd64 ~ia64 x86
+KEYWORDS=amd64 ia64 x86
 LICENSE=GPL-2 OSL-2.0
 RDEPEND=dev-libs/libxml2 sys-libs/zlib nls? ( virtual/libintl ) python? ( || ( =dev-lang/python-3.3* =dev-lang/python-3.2* =dev-lang/python-3.1* =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) )
 SLOT=0
 SRC_URI=http://linux.dell.com/libsmbios/download/libsmbios/libsmbios-2.2.28/libsmbios-2.2.28.tar.bz2
 _eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	eutils	5a98daf52f7430a4a6f46cee24cfe3e2	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	3db636724bc2886c6425058e210067d2	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=516dbc3acf778d48ab3e19433d536303
+_md5_=4018e806445b49bdb94220b74c157130
diff --git a/metadata/md5-cache/virtual/gsasl-2 b/metadata/md5-cache/virtual/gsasl-2
index 252086c2cbd9..311175405966 100644
--- a/metadata/md5-cache/virtual/gsasl-2
+++ b/metadata/md5-cache/virtual/gsasl-2
@@ -2,7 +2,7 @@ DEFINED_PHASES=-
 DEPEND=|| ( net-libs/libgsasl net-misc/gsasl )
 DESCRIPTION=Virtual for the GNU SASL library
 EAPI=2
-KEYWORDS=alpha amd64 arm ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
+KEYWORDS=alpha amd64 arm ~hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
 RDEPEND=|| ( net-libs/libgsasl net-misc/gsasl )
 SLOT=0
-_md5_=6473f2b54f6f9779212f4f3aa5714714
+_md5_=7f70c94aa1001bc1a72c9dcc0630a7a5
diff --git a/metadata/md5-cache/virtual/httpd-php-5.4-r1 b/metadata/md5-cache/virtual/httpd-php-5.4-r1
index 63163270c804..faf775074b7e 100644
--- a/metadata/md5-cache/virtual/httpd-php-5.4-r1
+++ b/metadata/md5-cache/virtual/httpd-php-5.4-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual to provide PHP-enabled webservers
 EAPI=4
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 RDEPEND=|| ( dev-lang/php:5.4[apache2] dev-lang/php:5.4[cgi] dev-lang/php:5.4[fpm] )
 SLOT=5.4
-_md5_=cfed9a502bb8cff6338b9f2f7f68bbee
+_md5_=f54ad7cebd4311306f3b6aca7e6f9884
diff --git a/metadata/md5-cache/www-client/midori-0.4.3 b/metadata/md5-cache/www-client/midori-0.4.3
deleted file mode 100644
index eeb7964b0a64..000000000000
--- a/metadata/md5-cache/www-client/midori-0.4.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=dev-db/sqlite:3 >=dev-libs/glib-2.22 dev-libs/libxml2 net-libs/libsoup:2.4 net-libs/webkit-gtk:3 x11-libs/gtk+:3 x11-libs/libXScrnSaver gnome? ( net-libs/libsoup-gnome:2.4 ) libnotify? ( x11-libs/libnotify ) unique? ( dev-libs/libunique:3 ) || ( dev-lang/python:2.7 dev-lang/python:2.6 ) dev-lang/vala:0.14 dev-util/intltool gnome-base/librsvg doc? ( dev-util/gtk-doc ) nls? ( sys-devel/gettext ) >=sys-apps/sed-4 dev-lang/python !dev-lang/python[-threads]
-DESCRIPTION=A lightweight web browser based on WebKitGTK+
-EAPI=4
-HOMEPAGE=http://www.twotoasts.de/index.php?/pages/midori_summary.html
-IUSE=doc gnome libnotify nls +unique
-KEYWORDS=amd64 ~arm ~ppc x86 ~x86-fbsd
-LICENSE=LGPL-2.1 MIT
-RDEPEND=dev-db/sqlite:3 >=dev-libs/glib-2.22 dev-libs/libxml2 net-libs/libsoup:2.4 net-libs/webkit-gtk:3 x11-libs/gtk+:3 x11-libs/libXScrnSaver gnome? ( net-libs/libsoup-gnome:2.4 ) libnotify? ( x11-libs/libnotify ) unique? ( dev-libs/libunique:3 )
-SLOT=0
-SRC_URI=mirror://xfce/src/apps/midori/0.4/midori-0.4.3.tar.bz2
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	5a98daf52f7430a4a6f46cee24cfe3e2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	0d2178d7f87923f3c110366ece3c930f	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	3db636724bc2886c6425058e210067d2	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	waf-utils	a8143e8b36b5b11cac7151905b89ad57
-_md5_=c97add8e1e10262d6468d938960f4a24
diff --git a/metadata/md5-cache/www-client/midori-0.4.6 b/metadata/md5-cache/www-client/midori-0.4.6
deleted file mode 100644
index 0ebe1a148d0b..000000000000
--- a/metadata/md5-cache/www-client/midori-0.4.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=dev-db/sqlite:3 >=dev-libs/glib-2.22 dev-libs/libxml2 net-libs/libsoup:2.4 x11-libs/libXScrnSaver deprecated? ( net-libs/webkit-gtk:2 x11-libs/gtk+:2 unique? ( dev-libs/libunique:1 ) ) !deprecated? ( net-libs/webkit-gtk:3 x11-libs/gtk+:3 unique? ( dev-libs/libunique:3 ) ) gnome? ( net-libs/libsoup-gnome:2.4 ) libnotify? ( >=x11-libs/libnotify-0.7 ) || ( dev-lang/python:2.7 dev-lang/python:2.6 ) dev-lang/vala:0.14 dev-util/intltool gnome-base/librsvg doc? ( dev-util/gtk-doc ) nls? ( sys-devel/gettext ) >=sys-apps/sed-4 dev-lang/python !dev-lang/python[-threads]
-DESCRIPTION=A lightweight web browser based on WebKitGTK+
-EAPI=4
-HOMEPAGE=http://www.twotoasts.de/index.php?/pages/midori_summary.html
-IUSE=+deprecated doc gnome libnotify nls +unique
-KEYWORDS=amd64 ~arm ppc x86 ~x86-fbsd
-LICENSE=LGPL-2.1 MIT
-RDEPEND=dev-db/sqlite:3 >=dev-libs/glib-2.22 dev-libs/libxml2 net-libs/libsoup:2.4 x11-libs/libXScrnSaver deprecated? ( net-libs/webkit-gtk:2 x11-libs/gtk+:2 unique? ( dev-libs/libunique:1 ) ) !deprecated? ( net-libs/webkit-gtk:3 x11-libs/gtk+:3 unique? ( dev-libs/libunique:3 ) ) gnome? ( net-libs/libsoup-gnome:2.4 ) libnotify? ( >=x11-libs/libnotify-0.7 )
-SLOT=0
-SRC_URI=mirror://xfce/src/apps/midori/0.4/midori-0.4.6.tar.bz2
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	5a98daf52f7430a4a6f46cee24cfe3e2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	0d2178d7f87923f3c110366ece3c930f	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	3db636724bc2886c6425058e210067d2	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	waf-utils	a8143e8b36b5b11cac7151905b89ad57
-_md5_=63fc93e4132ea9ca6e00d6e7d95669da
diff --git a/metadata/md5-cache/www-client/midori-0.4.7 b/metadata/md5-cache/www-client/midori-0.4.7
index 8016ff6d877e..431d05d4bdea 100644
--- a/metadata/md5-cache/www-client/midori-0.4.7
+++ b/metadata/md5-cache/www-client/midori-0.4.7
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup u
 DEPEND=>=dev-db/sqlite-3.6.19:3 >=dev-libs/glib-2.22 dev-libs/libxml2 >=net-libs/libsoup-2.34:2.4 x11-libs/libXScrnSaver deprecated? ( net-libs/webkit-gtk:2 x11-libs/gtk+:2 unique? ( dev-libs/libunique:1 ) ) !deprecated? ( >=app-crypt/gcr-3 net-libs/webkit-gtk:3 x11-libs/gtk+:3 unique? ( dev-libs/libunique:3 ) ) gnome? ( >=net-libs/libsoup-gnome-2.34:2.4 ) libnotify? ( >=x11-libs/libnotify-0.7 ) zeitgeist? ( >=dev-libs/libzeitgeist-0.3.14 ) || ( dev-lang/python:2.7 dev-lang/python:2.6 ) dev-lang/vala:0.18 dev-util/intltool gnome-base/librsvg doc? ( dev-util/gtk-doc ) nls? ( sys-devel/gettext ) >=sys-apps/sed-4 dev-lang/python !dev-lang/python[-threads]
 DESCRIPTION=A lightweight web browser based on WebKitGTK+
 EAPI=4
-HOMEPAGE=http://www.twotoasts.de/index.php?/pages/midori_summary.html
+HOMEPAGE=http://twotoasts.de/index.php/midori/
 IUSE=+deprecated doc gnome libnotify nls +unique zeitgeist
 KEYWORDS=~amd64 ~arm ~ppc ~x86 ~x86-fbsd
 LICENSE=LGPL-2.1 MIT
@@ -10,4 +10,4 @@ RDEPEND=>=dev-db/sqlite-3.6.19:3 >=dev-libs/glib-2.22 dev-libs/libxml2 >=net-lib
 SLOT=0
 SRC_URI=mirror://xfce/src/apps/midori/0.4/midori-0.4.7.tar.bz2
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	5a98daf52f7430a4a6f46cee24cfe3e2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	0d2178d7f87923f3c110366ece3c930f	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	3db636724bc2886c6425058e210067d2	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	waf-utils	a8143e8b36b5b11cac7151905b89ad57
-_md5_=0a0938cb6c65f072a23f5550e7715e56
+_md5_=23b8b7e2fd602ecb3d2773aadbcc3e13
diff --git a/metadata/md5-cache/www-client/midori-9999 b/metadata/md5-cache/www-client/midori-9999
index 096f7614d7f7..f9b940d2e925 100644
--- a/metadata/md5-cache/www-client/midori-9999
+++ b/metadata/md5-cache/www-client/midori-9999
@@ -2,10 +2,10 @@ DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup u
 DEPEND=>=dev-db/sqlite-3.6.19:3 >=dev-libs/glib-2.22 dev-libs/libxml2 >=net-libs/libsoup-2.34:2.4 x11-libs/libXScrnSaver deprecated? ( net-libs/webkit-gtk:2 x11-libs/gtk+:2 unique? ( dev-libs/libunique:1 ) ) !deprecated? ( >=app-crypt/gcr-3 net-libs/webkit-gtk:3 x11-libs/gtk+:3 unique? ( dev-libs/libunique:3 ) ) gnome? ( >=net-libs/libsoup-gnome-2.34:2.4 ) libnotify? ( >=x11-libs/libnotify-0.7 ) zeitgeist? ( >=dev-libs/libzeitgeist-0.3.14 ) || ( dev-lang/python:2.7 dev-lang/python:2.6 ) dev-lang/vala:0.18 dev-util/intltool gnome-base/librsvg doc? ( dev-util/gtk-doc ) nls? ( sys-devel/gettext ) >=sys-apps/sed-4 dev-lang/python !dev-lang/python[-threads] dev-vcs/git
 DESCRIPTION=A lightweight web browser based on WebKitGTK+
 EAPI=4
-HOMEPAGE=http://www.twotoasts.de/index.php?/pages/midori_summary.html
+HOMEPAGE=http://twotoasts.de/index.php/midori/
 IUSE=+deprecated doc gnome libnotify nls +unique zeitgeist
 LICENSE=LGPL-2.1 MIT
 RDEPEND=>=dev-db/sqlite-3.6.19:3 >=dev-libs/glib-2.22 dev-libs/libxml2 >=net-libs/libsoup-2.34:2.4 x11-libs/libXScrnSaver deprecated? ( net-libs/webkit-gtk:2 x11-libs/gtk+:2 unique? ( dev-libs/libunique:1 ) ) !deprecated? ( >=app-crypt/gcr-3 net-libs/webkit-gtk:3 x11-libs/gtk+:3 unique? ( dev-libs/libunique:3 ) ) gnome? ( >=net-libs/libsoup-gnome-2.34:2.4 ) libnotify? ( >=x11-libs/libnotify-0.7 ) zeitgeist? ( >=dev-libs/libzeitgeist-0.3.14 )
 SLOT=0
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	5a98daf52f7430a4a6f46cee24cfe3e2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	git-2	15733ab6a6feb34af9837b41623c2bad	gnome2-utils	0d2178d7f87923f3c110366ece3c930f	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	3db636724bc2886c6425058e210067d2	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	waf-utils	a8143e8b36b5b11cac7151905b89ad57
-_md5_=67451740aed13e009b5bfebe0e540f69
+_md5_=35558daafc6ece94e75eb91a69405f71
diff --git a/metadata/md5-cache/x11-libs/libdrm-2.4.37 b/metadata/md5-cache/x11-libs/libdrm-2.4.37
index c45577cc6f59..bc9b83457647 100644
--- a/metadata/md5-cache/x11-libs/libdrm-2.4.37
+++ b/metadata/md5-cache/x11-libs/libdrm-2.4.37
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://dri.freedesktop.org/libdrm/libdrm-2.4.37.tar.bz2
 _eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	autotools-utils	b65ac5ba56a20f3d7a01c67b7b3c9b01	eutils	5a98daf52f7430a4a6f46cee24cfe3e2	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	ff8fcdb08e36af162e7cfd65dd10be44
-_md5_=36d19d1364fa86e77ca0be55fcc2d3d2
+_md5_=2596e3ff257b22e3bca6c42bab382bbe
diff --git a/metadata/md5-cache/x11-libs/libdrm-2.4.38 b/metadata/md5-cache/x11-libs/libdrm-2.4.38
index edec013ecf68..68421068a8cd 100644
--- a/metadata/md5-cache/x11-libs/libdrm-2.4.38
+++ b/metadata/md5-cache/x11-libs/libdrm-2.4.38
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://dri.freedesktop.org/libdrm/libdrm-2.4.38.tar.bz2
 _eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	autotools-utils	b65ac5ba56a20f3d7a01c67b7b3c9b01	eutils	5a98daf52f7430a4a6f46cee24cfe3e2	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	ff8fcdb08e36af162e7cfd65dd10be44
-_md5_=1578de242cd3ad71c538e5a7ecfcbf5e
+_md5_=833929aa7a3f5be33305c2a3d325510e
diff --git a/metadata/md5-cache/x11-libs/libdrm-2.4.39 b/metadata/md5-cache/x11-libs/libdrm-2.4.39
index bc91fd00de37..01f610d97ebc 100644
--- a/metadata/md5-cache/x11-libs/libdrm-2.4.39
+++ b/metadata/md5-cache/x11-libs/libdrm-2.4.39
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://dri.freedesktop.org/libdrm/libdrm-2.4.39.tar.bz2
 _eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	autotools-utils	b65ac5ba56a20f3d7a01c67b7b3c9b01	eutils	5a98daf52f7430a4a6f46cee24cfe3e2	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	ff8fcdb08e36af162e7cfd65dd10be44
-_md5_=d7125819b4dd633891f6d9d824dad46e
+_md5_=c56ec3774399446915e04c7a624d30e3
diff --git a/metadata/md5-cache/x11-libs/vdpau-video-0.7.4 b/metadata/md5-cache/x11-libs/vdpau-video-0.7.4
index 2e6b21e77e87..8e1cbb6a40bb 100644
--- a/metadata/md5-cache/x11-libs/vdpau-video-0.7.4
+++ b/metadata/md5-cache/x11-libs/vdpau-video-0.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=x11-libs/libva-1.1.0[X,opengl?] opengl? ( virtual/opengl ) x11-libs/libvdpau
 SLOT=0
 SRC_URI=http://www.freedesktop.org/software/vaapi/releases/libva-vdpau-driver/libva-vdpau-driver-0.7.4.tar.bz2
-_eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4
-_md5_=54a466dcbe0fef5c38249a11b82e911b
+_eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	eutils	5a98daf52f7430a4a6f46cee24cfe3e2	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=82327fe93eb41d40b37e3eb644153cba
diff --git a/metadata/md5-cache/x11-misc/rodent-4.6.4 b/metadata/md5-cache/x11-misc/rodent-4.6.4
deleted file mode 100644
index 41547a7ae268..000000000000
--- a/metadata/md5-cache/x11-misc/rodent-4.6.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst
-DEPEND=dev-libs/glib:2 dev-libs/libxml2:2 dev-libs/libzip gnome-base/librsvg:2 sys-apps/file x11-libs/cairo x11-libs/gtk+:2 x11-libs/libSM x11-libs/libX11 dev-util/intltool virtual/pkgconfig >=sys-apps/sed-4
-DESCRIPTION=a fast, small and powerful file manager and graphical shell
-EAPI=4
-HOMEPAGE=http://rodent.xffm.org
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-libs/glib:2 dev-libs/libxml2:2 dev-libs/libzip gnome-base/librsvg:2 sys-apps/file x11-libs/cairo x11-libs/gtk+:2 x11-libs/libSM x11-libs/libX11
-SLOT=0
-SRC_URI=mirror://sourceforge/project/xffm/4.6.4/rodent-4.6.4.tar.bz2
-_eclasses_=fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	0d2178d7f87923f3c110366ece3c930f
-_md5_=f50fccfc472e0bdd894b9d7d58a376e2
diff --git a/metadata/md5-cache/x11-misc/rodent-4.7.4 b/metadata/md5-cache/x11-misc/rodent-4.7.4
deleted file mode 100644
index 5204748216f4..000000000000
--- a/metadata/md5-cache/x11-misc/rodent-4.7.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=dev-libs/glib-2.20.5 dev-libs/libxml2 >=dev-libs/libzip-0.9 >=gnome-base/librsvg-2.26 sys-apps/file >=x11-libs/cairo-1.8.10 >=x11-libs/gtk+-2.20:2 x11-libs/libX11 x11-libs/libSM dev-util/intltool virtual/pkgconfig >=sys-apps/sed-4
-DESCRIPTION=A fast, small and powerful file manager and graphical shell
-EAPI=4
-HOMEPAGE=http://rodent.xffm.org/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=>=dev-libs/glib-2.20.5 dev-libs/libxml2 >=dev-libs/libzip-0.9 >=gnome-base/librsvg-2.26 sys-apps/file >=x11-libs/cairo-1.8.10 >=x11-libs/gtk+-2.20:2 x11-libs/libX11 x11-libs/libSM gnome-base/gvfs
-SLOT=0
-SRC_URI=mirror://sourceforge/xffm/rodent-4.7.4.tar.bz2
-_eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	5a98daf52f7430a4a6f46cee24cfe3e2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	0d2178d7f87923f3c110366ece3c930f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	679cee9d5e9bd6a822db1af0d0074d7a
-_md5_=6f10f9f7fc49b3b706c1767bead0d8f5
diff --git a/metadata/md5-cache/x11-misc/xscreensaver-5.19 b/metadata/md5-cache/x11-misc/xscreensaver-5.19
deleted file mode 100644
index 8c84d588c57e..000000000000
--- a/metadata/md5-cache/x11-misc/xscreensaver-5.19
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=dev-libs/libxml2 >=gnome-base/libglade-2 media-libs/netpbm x11-apps/appres x11-apps/xwininfo x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXmu x11-libs/libXrandr x11-libs/libXt x11-libs/libXxf86misc x11-libs/libXxf86vm jpeg? ( virtual/jpeg ) new-login? ( gdm? ( gnome-base/gdm ) !gdm? ( || ( x11-misc/lightdm kde-base/kdm ) ) ) opengl? ( virtual/opengl ) pam? ( virtual/pam ) selinux? ( sec-policy/selinux-xscreensaver ) xinerama? ( x11-libs/libXinerama ) dev-util/intltool virtual/pkgconfig sys-devel/bc sys-devel/gettext x11-proto/recordproto x11-proto/scrnsaverproto x11-proto/xextproto x11-proto/xf86miscproto x11-proto/xf86vidmodeproto xinerama? ( x11-proto/xineramaproto ) || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
-DESCRIPTION=A modular screen saver and locker for the X Window System
-EAPI=4
-HOMEPAGE=http://www.jwz.org/xscreensaver/
-IUSE=gdm jpeg new-login opengl pam +perl selinux suid xinerama
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
-LICENSE=BSD
-RDEPEND=dev-libs/libxml2 >=gnome-base/libglade-2 media-libs/netpbm x11-apps/appres x11-apps/xwininfo x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXmu x11-libs/libXrandr x11-libs/libXt x11-libs/libXxf86misc x11-libs/libXxf86vm jpeg? ( virtual/jpeg ) new-login? ( gdm? ( gnome-base/gdm ) !gdm? ( || ( x11-misc/lightdm kde-base/kdm ) ) ) opengl? ( virtual/opengl ) pam? ( virtual/pam ) selinux? ( sec-policy/selinux-xscreensaver ) xinerama? ( x11-libs/libXinerama ) perl? ( dev-lang/perl dev-perl/libwww-perl virtual/perl-Digest-MD5 )
-REQUIRED_USE=gdm? ( new-login )
-SLOT=0
-SRC_URI=http://www.jwz.org/xscreensaver/xscreensaver-5.19.tar.gz
-_eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	eutils	5a98daf52f7430a4a6f46cee24cfe3e2	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=025a9c0230f9b7e3c3a3c4fd4c10260a
diff --git a/metadata/md5-cache/x11-misc/xscreensaver-5.18 b/metadata/md5-cache/x11-misc/xscreensaver-5.20
similarity index 95%
rename from metadata/md5-cache/x11-misc/xscreensaver-5.18
rename to metadata/md5-cache/x11-misc/xscreensaver-5.20
index abcdfed10984..466c4a11a96c 100644
--- a/metadata/md5-cache/x11-misc/xscreensaver-5.18
+++ b/metadata/md5-cache/x11-misc/xscreensaver-5.20
@@ -9,6 +9,6 @@ LICENSE=BSD
 RDEPEND=dev-libs/libxml2 >=gnome-base/libglade-2 media-libs/netpbm x11-apps/appres x11-apps/xwininfo x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXmu x11-libs/libXrandr x11-libs/libXt x11-libs/libXxf86misc x11-libs/libXxf86vm jpeg? ( virtual/jpeg ) new-login? ( gdm? ( gnome-base/gdm ) !gdm? ( || ( x11-misc/lightdm kde-base/kdm ) ) ) opengl? ( virtual/opengl ) pam? ( virtual/pam ) selinux? ( sec-policy/selinux-xscreensaver ) xinerama? ( x11-libs/libXinerama ) perl? ( dev-lang/perl dev-perl/libwww-perl virtual/perl-Digest-MD5 )
 REQUIRED_USE=gdm? ( new-login )
 SLOT=0
-SRC_URI=http://www.jwz.org/xscreensaver/xscreensaver-5.18.tar.gz
+SRC_URI=http://www.jwz.org/xscreensaver/xscreensaver-5.20.tar.gz
 _eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	eutils	5a98daf52f7430a4a6f46cee24cfe3e2	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=eafeb7a3c9fb7c590e1d5740587bd303
+_md5_=b29f11bd3f481699c1bc8ec21b0edeb5
diff --git a/metadata/md5-cache/x11-themes/ubuntu-wallpapers-0.35.2 b/metadata/md5-cache/x11-themes/ubuntu-wallpapers-0.35.2
new file mode 100644
index 000000000000..30b72553c3b6
--- /dev/null
+++ b/metadata/md5-cache/x11-themes/ubuntu-wallpapers-0.35.2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=compile install test
+DESCRIPTION=Ubuntu wallpapers
+EAPI=4
+HOMEPAGE=https://launchpad.net/ubuntu/+source/ubuntu-wallpapers
+KEYWORDS=~amd64
+LICENSE=CCPL-Attribution-ShareAlike-3.0
+SLOT=0
+SRC_URI=https://launchpad.net/ubuntu/+archive/primary/+files/ubuntu-wallpapers_0.35.2.tar.gz
+_md5_=422dc1cb56e14455e2c17e769e18e1cb
diff --git a/metadata/md5-cache/xfce-extra/xfce4-embed-plugin-0.8.0 b/metadata/md5-cache/xfce-extra/xfce4-embed-plugin-0.8.0
deleted file mode 100644
index 260099f7e7d7..000000000000
--- a/metadata/md5-cache/xfce-extra/xfce4-embed-plugin-0.8.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=x11-libs/gtk+-2.20:2 x11-libs/libX11 >=xfce-base/libxfce4ui-4.8 >=xfce-base/libxfce4util-4.8 >=xfce-base/xfce4-panel-4.8 dev-util/intltool virtual/pkgconfig sys-devel/gettext >=sys-apps/sed-4
-DESCRIPTION=A plug-in for embedding arbitrary application windows into the Xfce panel
-EAPI=4
-HOMEPAGE=http://goodies.xfce.org/projects/panel-plugins/xfce4-embed-plugin
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 LGPL-2
-RDEPEND=>=x11-libs/gtk+-2.20:2 x11-libs/libX11 >=xfce-base/libxfce4ui-4.8 >=xfce-base/libxfce4util-4.8 >=xfce-base/xfce4-panel-4.8
-SLOT=0
-SRC_URI=mirror://xfce/src/panel-plugins/xfce4-embed-plugin/0.8/xfce4-embed-plugin-0.8.0.tar.bz2
-_eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	5a98daf52f7430a4a6f46cee24cfe3e2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	0d2178d7f87923f3c110366ece3c930f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	679cee9d5e9bd6a822db1af0d0074d7a
-_md5_=6845b5ba9c1e559a21d559c7d08015e8
diff --git a/metadata/md5-cache/xfce-extra/xfce4-mixer-4.9.0 b/metadata/md5-cache/xfce-extra/xfce4-mixer-4.9.0
deleted file mode 100644
index 6e3d76184f98..000000000000
--- a/metadata/md5-cache/xfce-extra/xfce4-mixer-4.9.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=dev-libs/glib-2.24 dev-libs/libunique:1 dev-libs/keybinder:0 media-libs/gst-plugins-base:0.10 >=x11-libs/gtk+-2.20:2 >=xfce-base/libxfce4ui-4.10 >=xfce-base/libxfce4util-4.10 >=xfce-base/xfce4-panel-4.10 >=xfce-base/xfconf-4.10 dev-util/intltool virtual/pkgconfig >=sys-apps/sed-4
-DESCRIPTION=A volume control application (and panel plug-in) for the Xfce desktop environment
-EAPI=4
-HOMEPAGE=http://www.xfce.org/projects/xfce4-mixer/
-IUSE=alsa debug oss
-KEYWORDS=~amd64 ~arm ~mips ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.24 dev-libs/libunique:1 dev-libs/keybinder:0 media-libs/gst-plugins-base:0.10 >=x11-libs/gtk+-2.20:2 >=xfce-base/libxfce4ui-4.10 >=xfce-base/libxfce4util-4.10 >=xfce-base/xfce4-panel-4.10 >=xfce-base/xfconf-4.10 alsa? ( media-plugins/gst-plugins-alsa:0.10 ) oss? ( media-plugins/gst-plugins-oss:0.10 ) !alsa? ( !oss? ( media-plugins/gst-plugins-meta:0.10 ) )
-SLOT=0
-SRC_URI=mirror://xfce/src/apps/xfce4-mixer/4.9/xfce4-mixer-4.9.0.tar.bz2
-_eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	5a98daf52f7430a4a6f46cee24cfe3e2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	0d2178d7f87923f3c110366ece3c930f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	679cee9d5e9bd6a822db1af0d0074d7a
-_md5_=08ca6fdfcf9268e61f86ccdbd4e9aa5f
diff --git a/metadata/md5-cache/xfce-extra/xfce4-places-plugin-1.4.0 b/metadata/md5-cache/xfce-extra/xfce4-places-plugin-1.4.0
deleted file mode 100644
index 6efd48c0c400..000000000000
--- a/metadata/md5-cache/xfce-extra/xfce4-places-plugin-1.4.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=dev-libs/glib-2.22 >=x11-libs/gtk+-2.14:2 x11-libs/libX11 >=xfce-base/exo-0.6 >=xfce-base/libxfce4ui-4.8 >=xfce-base/libxfce4util-4.8 >=xfce-base/xfce4-panel-4.8 libnotify? ( >=x11-libs/libnotify-0.7 ) dev-util/intltool virtual/pkgconfig >=sys-apps/sed-4
-DESCRIPTION=A panel plug-in to provide quick access to files, folders and removable media
-EAPI=4
-HOMEPAGE=http://goodies.xfce.org/projects/panel-plugins/xfce4-places-plugin
-IUSE=debug libnotify
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.22 >=x11-libs/gtk+-2.14:2 x11-libs/libX11 >=xfce-base/exo-0.6 >=xfce-base/libxfce4ui-4.8 >=xfce-base/libxfce4util-4.8 >=xfce-base/xfce4-panel-4.8 libnotify? ( >=x11-libs/libnotify-0.7 )
-SLOT=0
-SRC_URI=mirror://xfce/src/panel-plugins/xfce4-places-plugin/1.4/xfce4-places-plugin-1.4.0.tar.bz2
-_eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	5a98daf52f7430a4a6f46cee24cfe3e2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	0d2178d7f87923f3c110366ece3c930f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	679cee9d5e9bd6a822db1af0d0074d7a
-_md5_=e3f098969a6e3fa8b48c06c6a3714b10
diff --git a/metadata/md5-cache/xfce-extra/xfce4-weather-plugin-0.8.1 b/metadata/md5-cache/xfce-extra/xfce4-weather-plugin-0.8.1
deleted file mode 100644
index d510f6ac3c6e..000000000000
--- a/metadata/md5-cache/xfce-extra/xfce4-weather-plugin-0.8.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=dev-libs/glib-2 dev-libs/libxml2 x11-libs/gtk+:2 >=xfce-base/libxfce4ui-4.8 >=xfce-base/libxfce4util-4.8 >=xfce-base/xfce4-panel-4.8 dev-util/intltool virtual/pkgconfig >=sys-apps/sed-4
-DESCRIPTION=A weather plug-in for the Xfce desktop environment
-EAPI=4
-HOMEPAGE=http://goodies.xfce.org/projects/panel-plugins/xfce4-weather-plugin
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2 dev-libs/libxml2 x11-libs/gtk+:2 >=xfce-base/libxfce4ui-4.8 >=xfce-base/libxfce4util-4.8 >=xfce-base/xfce4-panel-4.8
-SLOT=0
-SRC_URI=mirror://xfce/src/panel-plugins/xfce4-weather-plugin/0.8/xfce4-weather-plugin-0.8.1.tar.bz2
-_eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	5a98daf52f7430a4a6f46cee24cfe3e2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	0d2178d7f87923f3c110366ece3c930f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	679cee9d5e9bd6a822db1af0d0074d7a
-_md5_=89c3f826ee618e25eaddd5091da815a1
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 7192c81cc5d6..f5d7fe6d2660 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Sat, 20 Oct 2012 17:37:02 +0000
+Sun, 21 Oct 2012 16:07:03 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index f22b514f5f13..e54f56146103 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Sat Oct 20 17:37:00 UTC 2012
+Sun Oct 21 16:07:00 UTC 2012
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 34920b2a7667..47f436a74f6a 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Sat, 20 Oct 2012 18:00:01 +0000
+Sun, 21 Oct 2012 16:30:01 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index dc315e26c568..5f6d1eb583bc 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1350754501 Sat Oct 20 17:35:01 2012 UTC
+1350835501 Sun Oct 21 16:05:01 2012 UTC
diff --git a/net-analyzer/munin/Manifest b/net-analyzer/munin/Manifest
index 460d8a45f665..27e45c1df8b0 100644
--- a/net-analyzer/munin/Manifest
+++ b/net-analyzer/munin/Manifest
@@ -1,5 +1,5 @@
 DIST munin-1.4.6.tar.gz 1238782 SHA256 1795812d9ad60e60f81c7f08c8be455ce44e1d4f966f7dd6be620e4c356de9c6 SHA512 f1ec1b79b4c90d899fc661656426b4cf7fdcc7f896d6de0938310b49b66e009cd1a85570005fd1a85a8168ce3568ea55c255c3511174cdf1d72bd88f162be5e0 WHIRLPOOL 43d2296bbbd476ffc0cf356fc5a191d723993735769e6f88f3581c0804b82781be38f78bfe34337e2b4e9680ade8c569a6006c0ea107e4a5c60a82b879e08404
 DIST munin-2.0.5-patches-2.tar.xz 9448 SHA256 9a58ff84e33cf5c912eb504f176d689fa8531da01b3541396a03f05fde19d079 SHA512 7f75c6f4a7034327a99820bd0c1fd2272f2cd2a5bc037096e6a142a317a068ffb4217b162578da089cb0f83667d35aee413ecaeb58fdb548dfbff78b97d36e07 WHIRLPOOL 0d128cbc9955e174902670c2a66e5e0c66d4262bd20832065ed220a227a9efba25a93e192a4cd08c85819df91d1552870e6dfc2cd1bd0f3870b0154d6c0f294a
 DIST munin-2.0.5.tar.gz 1319398 SHA256 927b9b557343ad031b55b401eb1542db03d78a48a64797f5fed6ad58fc2c8785 SHA512 e52ce2f44a4322000dc38d0b8ae6e5f406211b7a081e1f4300938dfe10bff1559d9e84f454885c70bae9aabfa4b7fde8c3b3d8b239d35596f678baaba6d7d7bc WHIRLPOOL 7751eee653a0b80a9a3283a8940a270db0c5ece7de67f1b253004901db2fd06f6d8c104497ced6d3659ac6a45f4d8e37bbb362f6dec6f7181cb2d30ca115f495
-DIST munin-2.0.7-patches-2.tar.xz 2392 SHA256 e439c3e019b64e71624b57c52d5716269829b742ab65b99ad7a573c812c4cf13 SHA512 4964b1ad3414e7f15f0b4931b3a34a1d7475385fa49f994c5a583baab1fe03069dbab0fd00d21bb007437e447b0bcccf60f17d4f98aacbbbe2f7f68effff8773 WHIRLPOOL 3f0fbec29b28ed926fb826b5aa66db328a5906631719e931098ea235eb991ee57ca8780a2aba44850564adba50826b25961b9081fda15c86a69faeff3033f27f
+DIST munin-2.0.7-patches-3.tar.xz 8584 SHA256 d2e15629d53b3bb3cca87692662b6ece90a21bc1b40cab28f0e0fcbe8e941ded SHA512 c77c188f5cdb8f7abc3d3a5c9eebcd0ad6d5ebb839c0fb67ed115db5141da0818cc94beb4c89979df407b165b082287ed77c7101891db368b8b60d31ea9eb796 WHIRLPOOL 2f14d594ae082cb873ca707d5db90c5683578d833587d19cd6fe713c9bf07275f3ec983e56640a9c44ae951d3b7dc5f29259bc8593937b8159cab7bccd1c114a
 DIST munin-2.0.7.tar.gz 1326773 SHA256 3daf42722ebd74a6269aa290b9f5821e2206df7b0fd6a39876863ff1a9b50c2e SHA512 51bf57fd5d8bdd92c091548dda540af6b355c8fe821db06ba92eb7402b623afcac570b3e1e0816580e6ec962a791835dd845734207556731636003d01b492c3f WHIRLPOOL bfc9de2ec0421ba66109ca77396a35bdf9c7ef6bd82dad1fe1c05144d79d0d9c923a641feca5d78e566015561172704898c1ec3a57da49d67492e335439ef982
diff --git a/net-analyzer/munin/files/munin-asyncd.init.2 b/net-analyzer/munin/files/munin-asyncd.init.2
index bf9e06bdaa7f..5c9981412295 100644
--- a/net-analyzer/munin/files/munin-asyncd.init.2
+++ b/net-analyzer/munin/files/munin-asyncd.init.2
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/files/munin-asyncd.init.2,v 1.2 2012/10/18 18:47:16 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/files/munin-asyncd.init.2,v 1.3 2012/10/21 06:00:13 flameeyes Exp $
 
 command=/usr/libexec/munin/munin-asyncd
 command_args="--fork"
@@ -14,7 +14,7 @@ depend() {
 }
 
 start_pre() {
-	checkpath -d -o munin-async -m 0700 /var/spool/munin
+	checkpath -d -o munin-async -m 0700 /var/spool/munin-async
 }
 
 # vim: filetype=gentoo-init-d:
diff --git a/net-analyzer/munin/files/munin.env b/net-analyzer/munin/files/munin.env
new file mode 100644
index 000000000000..d43d5177ad8a
--- /dev/null
+++ b/net-analyzer/munin/files/munin.env
@@ -0,0 +1 @@
+CONFIG_PROTECT=/var/lib/munin-async/.ssh
diff --git a/net-analyzer/munin/munin-2.0.7-r2.ebuild b/net-analyzer/munin/munin-2.0.7-r4.ebuild
similarity index 97%
rename from net-analyzer/munin/munin-2.0.7-r2.ebuild
rename to net-analyzer/munin/munin-2.0.7-r4.ebuild
index fc706741cad5..d7e577e5a988 100644
--- a/net-analyzer/munin/munin-2.0.7-r2.ebuild
+++ b/net-analyzer/munin/munin-2.0.7-r4.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/munin-2.0.7-r2.ebuild,v 1.2 2012/10/18 19:06:33 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/munin-2.0.7-r4.ebuild,v 1.1 2012/10/21 05:39:07 flameeyes Exp $
 
 EAPI=4
 
-PATCHSET=2
+PATCHSET=3
 
 inherit eutils user java-pkg-opt-2
 
@@ -94,7 +94,7 @@ S="${WORKDIR}/${MY_P}"
 pkg_setup() {
 	enewgroup munin
 	enewuser munin 177 -1 /var/lib/munin munin
-	enewuser munin-async -1 /bin/true /var/lib/munin-async
+	enewuser munin-async -1 /usr/libexec/munin/munin-async /var/lib/munin-async
 	java-pkg-opt-2_pkg_setup
 }
 
@@ -164,6 +164,8 @@ src_install() {
 
 	newinitd "${FILESDIR}"/munin-asyncd.init.2 munin-asyncd
 
+	newenvd "${FILESDIR}"/munin.env 50munin
+
 	dodoc README ChangeLog INSTALL
 	if use doc; then
 		cd "${S}"/doc/_build/html
@@ -190,7 +192,7 @@ src_install() {
 
 	keepdir /var/lib/munin-async/.ssh /var/spool/munin-async
 	touch "${D}"/var/lib/munin-async/.ssh/authorized_keys
-	fowners munin-async /var/lib/munin-async/.ssh/{,authorized_keys}
+	fowners munin-async /var/lib/munin-async/.ssh/{,authorized_keys} /var/spool/munin-async
 	fperms 0700 /var/lib/munin-async/.ssh /var/spool/munin-async
 	fperms 0600 /var/lib/munin-async/.ssh/authorized_keys
 
@@ -215,8 +217,10 @@ src_install() {
 		cat - >> "${D}"/var/lib/munin/.ssh/config <<EOF
 IdentityFile /var/lib/munin/.ssh/id_ecdsa
 IdentityFile /var/lib/munin/.ssh/id_rsa
+StrictHostKeyChecking no
 EOF
 
+		fowners munin:munin /var/lib/munin/.ssh/{,config}
 		fperms go-rwx /var/lib/munin/.ssh/{,config}
 
 		dodir /usr/share/${PN}
diff --git a/net-analyzer/nrpe/files/nrpe.xinetd.2 b/net-analyzer/nrpe/files/nrpe.xinetd.2
index d9f226eb2f96..dd0331a88149 100644
--- a/net-analyzer/nrpe/files/nrpe.xinetd.2
+++ b/net-analyzer/nrpe/files/nrpe.xinetd.2
@@ -1,4 +1,10 @@
-/nrpe
+service nrpe {
+	socket_type = stream
+	protocol    = tcp
+	wait        = no
+	user        = nagios
+	group       = nagios
+	server      = /usr/libexec/nrpe
 	server_args = -c /etc/nagios/nrpe.cfg --inetd
 #	only_from   = 127.0.0.1
 	disabled    = yes
diff --git a/net-dns/knot/knot-1.1.0.ebuild b/net-dns/knot/knot-1.1.0.ebuild
index 3d7258252c3a..7f9baa041935 100644
--- a/net-dns/knot/knot-1.1.0.ebuild
+++ b/net-dns/knot/knot-1.1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/knot/knot-1.1.0.ebuild,v 1.1 2012/09/04 09:28:36 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/knot/knot-1.1.0.ebuild,v 1.2 2012/10/21 15:42:31 scarabeus Exp $
 
 EAPI=4
 
@@ -54,9 +54,9 @@ src_install() {
 
 pkg_postinst() {
 	if [[ -n ${REPLACING_VERSIONS} ]] ; then
-		einfo "Remember to recompile all zones after update. Run:"
-		einfo "    # knotc stop"
-		einfo "    # knotc compile"
-		einfo "    # knotc start"
+		elog "Remember to recompile all zones after update. Run:"
+		elog "    # knotc stop"
+		elog "    # knotc compile"
+		elog "    # knotc start"
 	fi
 }
diff --git a/net-firewall/shorewall/files/shorewall.initd b/net-firewall/shorewall/files/shorewall.initd
index 66ba391823d2..01056729292d 100644
--- a/net-firewall/shorewall/files/shorewall.initd
+++ b/net-firewall/shorewall/files/shorewall.initd
@@ -1,11 +1,17 @@
 #!/sbin/runscript
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/files/shorewall.initd,v 1.2 2012/02/24 18:51:52 constanze Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/files/shorewall.initd,v 1.3 2012/10/21 12:54:54 constanze Exp $
 
 extra_commands="check clear"
 extra_started_commands="refresh reset"
 
+checkconfig() {
+	if [ ! -d /var/lock/subsys ] ; then
+		checkpath -d -m 755 /var/lock/subsys
+	fi
+}
+
 depend() {
 	need net
 	provide firewall
@@ -13,6 +19,7 @@ depend() {
 }
 
 start() {
+    checkconfig
 	ebegin "Starting firewall"
 	/sbin/shorewall -f start 1>/dev/null
 	eend $? 
@@ -25,6 +32,7 @@ stop() {
 }
 
 restart() {
+    checkconfig
 	# shorewall comes with its own control script that includes a
 	# restart function, so refrain from calling svc_stop/svc_start
 	# here.  Note that this comment is required to fix bug 55576;
diff --git a/net-firewall/shorewall/shorewall-4.5.8.2-r1.ebuild b/net-firewall/shorewall/shorewall-4.5.8.2-r1.ebuild
new file mode 100644
index 000000000000..bd5228e3b875
--- /dev/null
+++ b/net-firewall/shorewall/shorewall-4.5.8.2-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/shorewall-4.5.8.2-r1.ebuild,v 1.1 2012/10/21 12:54:54 constanze Exp $
+
+EAPI="4"
+
+inherit eutils versionator
+
+# Select version (stable, RC, Beta):
+MY_PV_TREE=$(get_version_component_range 1-2)   # for devel versions use "development/$(get_version_component_range 1-2)"
+MY_PV_BASE=$(get_version_component_range 1-3)
+
+MY_P="${PN}-${MY_PV_BASE}"
+MY_P_DOCS="${P/${PN}/${PN}-docs-html}"
+
+DESCRIPTION="Shoreline Firewall is an iptables-based firewall for Linux."
+HOMEPAGE="http://www.shorewall.net/"
+SRC_URI="http://www1.shorewall.net/pub/${PN}/${MY_PV_TREE}/${MY_P}/${P}.tar.bz2
+	doc? ( http://www1.shorewall.net/pub/${PN}/${MY_PV_TREE}/${MY_P}/${MY_P_DOCS}.tar.bz2 )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc"
+
+DEPEND=">=net-firewall/iptables-1.2.4
+	sys-apps/iproute2[-minimal]
+	dev-lang/perl
+	=net-firewall/shorewall-core-${PV}"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	:;
+}
+
+src_compile() {
+	:;
+}
+
+src_install() {
+	keepdir /var/lib/shorewall
+
+	cd "${WORKDIR}/${P}"
+	DESTDIR="${D}" ./install.sh "${FILESDIR}"/shorewallrc_new || die "install.sh failed"
+	newinitd "${FILESDIR}"/shorewall.initd shorewall
+
+	dodoc changelog.txt releasenotes.txt
+	if use doc; then
+		dodoc -r Samples
+		cd "${WORKDIR}/${MY_P_DOCS}"
+		dohtml -r *
+	fi
+	dodir /var/lock/subsys
+}
+
+pkg_postinst() {
+	elog "It is advised to copy the /usr/share/shorewall/configfiles dir to your"
+	elog "own 'export directories'. However, whenever you upgrade Shorewall you"
+	elog "should check for changes in configfiles and manually update your exports."
+	elog "Alternatively, if you only have one Shorewall-Lite system in your network"
+	elog "then you can use the configfiles dir but set CONFIG_PROTECT appropriately"
+	elog "in /etc/make.conf (man make.conf)."
+}
diff --git a/net-firewall/shorewall6/files/shorewall6.initd b/net-firewall/shorewall6/files/shorewall6.initd
index 5eccb81e41f0..299b02ef7d50 100644
--- a/net-firewall/shorewall6/files/shorewall6.initd
+++ b/net-firewall/shorewall6/files/shorewall6.initd
@@ -1,11 +1,17 @@
 #!/sbin/runscript
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall6/files/shorewall6.initd,v 1.2 2012/02/24 18:53:41 constanze Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall6/files/shorewall6.initd,v 1.3 2012/10/21 12:56:33 constanze Exp $
 
 extra_commands="check clear"
 extra_started_commands="refresh reset"
 
+checkconfig() {
+	if [ ! -d /var/lock/subsys ] ; then
+		checkpath -d -m 755 /var/lock/subsys
+	fi
+}
+
 depend() {
 	need net
 	provide firewall
@@ -13,6 +19,7 @@ depend() {
 }
 
 start() {
+    checkconfig
 	ebegin "Starting firewall"
 	/sbin/shorewall6 -f start 1>/dev/null
 	eend $? 
@@ -25,6 +32,7 @@ stop() {
 }
 
 restart() {
+    checkconfig
 	# shorewall comes with its own control script that includes a
 	# restart function, so refrain from calling svc_stop/svc_start
 	# here.  Note that this comment is required to fix bug 55576;
diff --git a/net-firewall/shorewall6/shorewall6-4.5.8.2-r1.ebuild b/net-firewall/shorewall6/shorewall6-4.5.8.2-r1.ebuild
new file mode 100644
index 000000000000..0253d98bb4f5
--- /dev/null
+++ b/net-firewall/shorewall6/shorewall6-4.5.8.2-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall6/shorewall6-4.5.8.2-r1.ebuild,v 1.1 2012/10/21 12:56:33 constanze Exp $
+
+EAPI="4"
+
+inherit versionator linux-info
+
+# Select version (stable, RC, Beta, upstream patched):
+MY_PV_TREE=$(get_version_component_range 1-2)	# for devel versions use "development/$(get_version_component_range 1-2)"
+MY_PV_BASE=$(get_version_component_range 1-3)	# which shorewall-common to use
+
+MY_PN="${PN/6/}"
+MY_P="${MY_PN}-${MY_PV_BASE}"
+MY_P_DOCS="${MY_PN}-docs-html-${PV}"
+
+DESCRIPTION="Shoreline Firewall with IPv6 support."
+HOMEPAGE="http://www.shorewall.net/"
+SRC_URI="http://www1.shorewall.net/pub/${MY_PN}/${MY_PV_TREE}/${MY_P}/${P}.tar.bz2
+	doc? ( http://www1.shorewall.net/pub/${PN}/${MY_PV_TREE}/${MY_P}/${MY_P_DOCS}.tar.bz2 )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+
+IUSE="doc"
+
+RDEPEND=">=net-firewall/iptables-1.4.0
+	sys-apps/iproute2
+	>=net-firewall/shorewall-${MY_PV_BASE}
+	dev-perl/Socket6"
+
+pkg_pretend() {
+	if kernel_is lt 2 6 25 ; then
+		die "${PN} requires at least kernel 2.6.25."
+	fi
+}
+
+src_configure() {
+	:;
+}
+
+src_compile() {
+	:;
+}
+
+src_install() {
+	keepdir /var/lib/${PN}
+
+	cd "${WORKDIR}/${P}"
+	DESTDIR="${D}" ./install.sh "${FILESDIR}"/shorewallrc_new || die "install.sh failed"
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+
+	dodoc changelog.txt releasenotes.txt
+	if use doc; then
+		dodoc -r  Samples6
+		cd "${WORKDIR}/${MY_P_DOCS}"
+		dohtml -r *
+	fi
+	keepdir /var/lock/subsys
+}
diff --git a/net-im/prosody/Manifest b/net-im/prosody/Manifest
index ecc4c71f29b9..f3e573fb22ce 100644
--- a/net-im/prosody/Manifest
+++ b/net-im/prosody/Manifest
@@ -1,2 +1,2 @@
 DIST prosody-0.8.1.tar.gz 211970 SHA256 6d6db07975f82adece05fb01fc6f448230d6b9c871d6f6d8259d68d4f2d72886
-DIST prosody-0.8.2.tar.gz 212170 SHA256 d0315150f8487fc960adf56ce057985428679975f9c6f3fcf424832d24eaae60
+DIST prosody-0.8.2.tar.gz 212170 SHA256 d0315150f8487fc960adf56ce057985428679975f9c6f3fcf424832d24eaae60 SHA512 7540d5ff36508158e45804ceb7db3148a6cdb90c7db6946af625d0ab9cbee96385e3c0387ea099446a7bfa11d582546060cf1e882ce08c8be5b165c277bedf6e WHIRLPOOL 5c63e36408483910810a04ad51565528948fec73dde3755c409e8263b86d6d9c3e1b142da5f7167a355624c98b6a3bbde3dac81cab0713335a62305696eac991
diff --git a/net-im/prosody/prosody-0.8.2.ebuild b/net-im/prosody/prosody-0.8.2.ebuild
index f71def32b0b0..b36a4d5e2fc7 100644
--- a/net-im/prosody/prosody-0.8.2.ebuild
+++ b/net-im/prosody/prosody-0.8.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/prosody/prosody-0.8.2.ebuild,v 1.3 2012/03/06 10:46:25 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/prosody/prosody-0.8.2.ebuild,v 1.4 2012/10/21 09:10:40 maekke Exp $
 
 EAPI="2"
 
@@ -13,7 +13,7 @@ SRC_URI="http://prosody.im/downloads/source/${PN}-${MY_PV}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="libevent mysql postgres sqlite ssl zlib"
 
 DEPEND="net-im/jabber-base
diff --git a/net-libs/libgsasl/libgsasl-1.8.0-r1.ebuild b/net-libs/libgsasl/libgsasl-1.8.0-r1.ebuild
index ff6d980a2412..5e8a252b9d61 100644
--- a/net-libs/libgsasl/libgsasl-1.8.0-r1.ebuild
+++ b/net-libs/libgsasl/libgsasl-1.8.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libgsasl/libgsasl-1.8.0-r1.ebuild,v 1.1 2012/08/22 13:51:51 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libgsasl/libgsasl-1.8.0-r1.ebuild,v 1.2 2012/10/20 17:47:47 jer Exp $
 
 EAPI="4"
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.gnu.org/software/gsasl/"
 SRC_URI="mirror://gnu/${PN/lib}/${P}.tar.gz"
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="idn gcrypt kerberos nls ntlm static-libs"
 DEPEND="
 	gcrypt? ( dev-libs/libgcrypt )
diff --git a/net-libs/libircclient/libircclient-1.6-r1.ebuild b/net-libs/libircclient/libircclient-1.6-r1.ebuild
index 4e9ad22e0a85..af18d45315c6 100644
--- a/net-libs/libircclient/libircclient-1.6-r1.ebuild
+++ b/net-libs/libircclient/libircclient-1.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libircclient/libircclient-1.6-r1.ebuild,v 1.4 2012/09/11 05:46:42 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libircclient/libircclient-1.6-r1.ebuild,v 1.5 2012/10/20 19:09:36 ago Exp $
 
 EAPI=4
 inherit autotools eutils
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/libircclient/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="doc ipv6 ssl static-libs threads"
 
 DEPEND="ssl? ( dev-libs/openssl )"
diff --git a/net-libs/libproxy/libproxy-0.4.10-r1.ebuild b/net-libs/libproxy/libproxy-0.4.10-r1.ebuild
new file mode 100644
index 000000000000..1c5a5d1920ee
--- /dev/null
+++ b/net-libs/libproxy/libproxy-0.4.10-r1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libproxy/libproxy-0.4.10-r1.ebuild,v 1.3 2012/10/21 03:57:33 tetromino Exp $
+
+EAPI=4
+PYTHON_DEPEND="python? 2:2.6"
+
+inherit cmake-utils eutils mono python
+
+DESCRIPTION="Library for automatic proxy configuration management"
+HOMEPAGE="http://code.google.com/p/libproxy/"
+SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-linux"
+IUSE="gnome kde mono networkmanager perl python spidermonkey test webkit"
+
+# NOTE: mozjs/spidermonkey might still cause problems like #373397 ?
+# NOTE: webkit-gtk:3, not :2, needed for libjavascriptcoregtk support
+RDEPEND="gnome? ( >=dev-libs/glib-2.26:2 )
+	kde? ( >=kde-base/kdelibs-4.4.5 )
+	mono? ( dev-lang/mono )
+	networkmanager? ( net-misc/networkmanager )
+	perl? (	dev-lang/perl )
+	spidermonkey? ( >=dev-lang/spidermonkey-1.8.5 )
+	webkit? ( >=net-libs/webkit-gtk-1.6:3 )"
+DEPEND="${RDEPEND}
+	kde? ( dev-util/automoc )
+	virtual/pkgconfig"
+
+pkg_setup() {
+	DOCS="AUTHORS ChangeLog NEWS README"
+
+	if use python; then
+		python_set_active_version 2
+		python_pkg_setup
+	fi
+}
+
+src_prepare() {
+	# Gentoo's spidermonkey doesn't set Version: in mozjs185.pc
+	epatch "${FILESDIR}/${PN}-0.4.10-mozjs185.pc.patch"
+
+	# get-pac-test freezes when run by the ebuild, succeeds when building
+	# manually; virtualx.eclass doesn't help :(
+	epatch "${FILESDIR}/${PN}-0.4.10-disable-pac-test.patch"
+}
+
+src_configure() {
+	# WITH_VALA just copies the .vapi file over and needs no deps,
+	# hence always enable it unconditionally
+	local mycmakeargs=(
+			-DPERL_VENDORINSTALL=ON
+			-DCMAKE_C_FLAGS="${CFLAGS}"
+			-DCMAKE_CXX_FLAGS="${CXXFLAGS}"
+			$(cmake-utils_use_with gnome GNOME3)
+			$(cmake-utils_use_with kde KDE4)
+			$(cmake-utils_use_with mono DOTNET)
+			$(cmake-utils_use_with networkmanager NM)
+			$(cmake-utils_use_with perl PERL)
+			$(cmake-utils_use_with python PYTHON)
+			$(cmake-utils_use_with spidermonkey MOZJS)
+			$(cmake-utils_use_with webkit WEBKIT)
+			$(cmake-utils_use_with webkit WEBKIT3)
+			-DWITH_VALA=ON
+			$(cmake-utils_use test BUILD_TESTING)
+	)
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	use python && python_mod_optimize ${PN}.py
+}
+
+pkg_postrm() {
+	use python && python_mod_cleanup ${PN}.py
+}
diff --git a/net-libs/libproxy/libproxy-0.4.10.ebuild b/net-libs/libproxy/libproxy-0.4.10.ebuild
index 75a1bb7a7afb..b0c7788661d9 100644
--- a/net-libs/libproxy/libproxy-0.4.10.ebuild
+++ b/net-libs/libproxy/libproxy-0.4.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libproxy/libproxy-0.4.10.ebuild,v 1.7 2012/10/19 06:35:28 nativemad Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libproxy/libproxy-0.4.10.ebuild,v 1.9 2012/10/21 03:57:33 tetromino Exp $
 
 EAPI=4
 PYTHON_DEPEND="python? 2:2.6"
diff --git a/net-libs/libsocialweb/libsocialweb-0.25.21.ebuild b/net-libs/libsocialweb/libsocialweb-0.25.21.ebuild
index 1ebb79cc4cd9..e704985e0bff 100644
--- a/net-libs/libsocialweb/libsocialweb-0.25.21.ebuild
+++ b/net-libs/libsocialweb/libsocialweb-0.25.21.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libsocialweb/libsocialweb-0.25.21.ebuild,v 1.2 2012/10/20 17:22:59 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libsocialweb/libsocialweb-0.25.21.ebuild,v 1.3 2012/10/20 18:39:27 ago Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -16,7 +16,7 @@ HOMEPAGE="http://git.gnome.org/browse/libsocialweb"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE="connman +gnome +introspection +networkmanager vala"
 
 # NOTE: coverage testing should not be enabled
diff --git a/net-mail/mailutils/mailutils-2.99.97.ebuild b/net-mail/mailutils/mailutils-2.99.97.ebuild
index c16430936003..4eda4eab7415 100644
--- a/net-mail/mailutils/mailutils-2.99.97.ebuild
+++ b/net-mail/mailutils/mailutils-2.99.97.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/mailutils/mailutils-2.99.97.ebuild,v 1.1 2012/10/20 08:49:03 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mailutils/mailutils-2.99.97.ebuild,v 1.2 2012/10/20 17:48:12 jer Exp $
 
 EAPI=4
 PYTHON_DEPEND="python? 2"
@@ -14,7 +14,7 @@ SRC_URI="mirror://gnu-alpha/mailutils/${P}.tar.xz"
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 
-KEYWORDS="~amd64 ~ppc ~x86 ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~hppa ~ppc ~x86 ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="berkdb bidi +clients gdbm sasl guile ipv6 kerberos ldap mysql nls pam postgres
 python servers ssl static-libs +threads tcpd tokyocabinet"
 
diff --git a/net-misc/l7-filter-userspace/Manifest b/net-misc/l7-filter-userspace/Manifest
index a31a7b3efd44..3b1f7469e06c 100644
--- a/net-misc/l7-filter-userspace/Manifest
+++ b/net-misc/l7-filter-userspace/Manifest
@@ -1,2 +1,2 @@
-DIST l7-filter-userspace-0.11.tar.gz 129986 RMD160 bdba2c64a0e84518a575552ae53115be47923f69 SHA1 56cc5eb14e7a07603ee18391496658d8344e4836 SHA256 008a62430f95a162fd209d4bf3d7359c588ca4b27f89c7bcaa7a10ff48591d97
-DIST l7-filter-userspace-0.12-beta1.tar.gz 130254 RMD160 458837b6308c6fcde59bb7ec60094a09bb561924 SHA1 e9628632ff55f5ef8c15041bc74eaa16e59f45d5 SHA256 1f4503c219334fba9c696c2243a3e926e5b299916baf1512ff6969da2d399d29
+DIST l7-filter-userspace-0.11.tar.gz 129986 SHA256 008a62430f95a162fd209d4bf3d7359c588ca4b27f89c7bcaa7a10ff48591d97
+DIST l7-filter-userspace-0.12-beta1.tar.gz 130254 SHA256 1f4503c219334fba9c696c2243a3e926e5b299916baf1512ff6969da2d399d29 SHA512 9c49b7e951ced6a44f8ee6f3a261ba14b1e3fe44a83e175f7f5a5821616ec8bc2b0a287f10b4485120e7783c9623c34aae2ee1d8997c258cdfb8230c1f87d137 WHIRLPOOL 719bd6fb3513a676fdd4de828095e847565040993676cadcc4e5dda46459edb578355a13086d5f8bb5575fe32e2df1e835029cfd0bb0e50884e75f37c409ccfc
diff --git a/net-misc/l7-filter-userspace/l7-filter-userspace-0.12_beta1.ebuild b/net-misc/l7-filter-userspace/l7-filter-userspace-0.12_beta1.ebuild
index f747fe9b467d..7ef1832347b0 100644
--- a/net-misc/l7-filter-userspace/l7-filter-userspace-0.12_beta1.ebuild
+++ b/net-misc/l7-filter-userspace/l7-filter-userspace-0.12_beta1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/l7-filter-userspace/l7-filter-userspace-0.12_beta1.ebuild,v 1.2 2012/05/18 15:55:35 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/l7-filter-userspace/l7-filter-userspace-0.12_beta1.ebuild,v 1.3 2012/10/21 08:54:04 maekke Exp $
 
 EAPI=4
 
@@ -13,7 +13,7 @@ HOMEPAGE="http://l7-filter.clearfoundation.com/"
 SRC_URI="http://download.clearfoundation.com/l7-filter/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE=""
 SLOT="0"
 
diff --git a/net-misc/pcapfix/Manifest b/net-misc/pcapfix/Manifest
new file mode 100644
index 000000000000..fbf7d0d44c6e
--- /dev/null
+++ b/net-misc/pcapfix/Manifest
@@ -0,0 +1 @@
+DIST pcapfix-0.7.tar.gz 25753 SHA256 246f44427c9fb0b82c469c6fc9406ca44520b96cc87f407cc65c90c8c5ee8332 SHA512 254eb5803bbcff4249f20af4cd1afa5b300eefb3448e3650899fa94329f38e298e4e7b1033836aa04434b1eadc67611204e3f67d41917c761d5cba424d789298 WHIRLPOOL 2ef59d5c12a34429818cc8d0e4dc0bf644196ec1ba477f96b5f3358fb32bd1b1b46b780de907ec92523577fb1486eea259c454517c7baef1d9b223ea12bc07e9
diff --git a/net-misc/pcapfix/metadata.xml b/net-misc/pcapfix/metadata.xml
new file mode 100644
index 000000000000..c6d862855eb5
--- /dev/null
+++ b/net-misc/pcapfix/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+  <email>robbat2@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/net-misc/pcapfix/pcapfix-0.7.ebuild b/net-misc/pcapfix/pcapfix-0.7.ebuild
new file mode 100644
index 000000000000..819bda990ebc
--- /dev/null
+++ b/net-misc/pcapfix/pcapfix-0.7.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/pcapfix/pcapfix-0.7.ebuild,v 1.1 2012/10/21 09:58:35 robbat2 Exp $
+
+EAPI=4
+
+DESCRIPTION="pcapfix tries to repair your broken pcap files by fixing the global
+header and recovering the packets by searching und guessing the packet headers."
+HOMEPAGE="http://f00l.de/pcapfix/"
+SRC_URI="http://f00l.de/pcapfix/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	sed -e 's/gcc/$(CC) $(CFLAGS)/g' -i Makefile
+}
+
+src_install() {
+	doman pcapfix.1
+	dobin pcapfix
+	dodoc README TODO Changelog
+}
+
diff --git a/net-p2p/bitcoin-qt/bitcoin-qt-0.6.3.ebuild b/net-p2p/bitcoin-qt/bitcoin-qt-0.6.3.ebuild
index 651c5aaa3399..f2304a5bbf6d 100644
--- a/net-p2p/bitcoin-qt/bitcoin-qt-0.6.3.ebuild
+++ b/net-p2p/bitcoin-qt/bitcoin-qt-0.6.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoin-qt/bitcoin-qt-0.6.3.ebuild,v 1.4 2012/09/18 20:46:58 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoin-qt/bitcoin-qt-0.6.3.ebuild,v 1.5 2012/10/21 00:06:15 blueness Exp $
 
 EAPI=4
 
@@ -17,7 +17,7 @@ SRC_URI="https://nodeload.github.com/bitcoin/bitcoin/tarball/v${PV/_/} -> bitcoi
 
 LICENSE="MIT ISC GPL-3 md2k7-asyouwish LGPL-2.1 public-domain"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="amd64 arm x86"
 IUSE="$IUSE 1stclassmsg dbus +eligius +qrcode upnp"
 
 RDEPEND="
diff --git a/net-p2p/bitcoind/bitcoind-0.6.3.ebuild b/net-p2p/bitcoind/bitcoind-0.6.3.ebuild
index 4d24909674ad..282602430836 100644
--- a/net-p2p/bitcoind/bitcoind-0.6.3.ebuild
+++ b/net-p2p/bitcoind/bitcoind-0.6.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoind/bitcoind-0.6.3.ebuild,v 1.4 2012/09/18 20:47:49 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoind/bitcoind-0.6.3.ebuild,v 1.5 2012/10/21 00:03:53 blueness Exp $
 
 EAPI="4"
 
@@ -17,7 +17,7 @@ SRC_URI="https://nodeload.github.com/bitcoin/bitcoin/tarball/v${PV/_/} -> bitcoi
 
 LICENSE="MIT ISC GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="amd64 arm x86"
 IUSE="+eligius examples logrotate upnp"
 
 RDEPEND="
diff --git a/net-proxy/squidclamav/squidclamav-6.9.ebuild b/net-proxy/squidclamav/squidclamav-6.9.ebuild
index 7d0b84818d3a..13bb6c94d8fc 100644
--- a/net-proxy/squidclamav/squidclamav-6.9.ebuild
+++ b/net-proxy/squidclamav/squidclamav-6.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squidclamav/squidclamav-6.9.ebuild,v 1.1 2012/08/29 01:47:22 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squidclamav/squidclamav-6.9.ebuild,v 1.2 2012/10/21 08:55:44 maekke Exp $
 
 EAPI=4
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE=""
 
 RDEPEND="net-proxy/c-icap"
diff --git a/profiles/hardened/linux/uclibc/packages.build b/profiles/hardened/linux/uclibc/packages.build
index c56e5c1331dd..859b685be5f8 100644
--- a/profiles/hardened/linux/uclibc/packages.build
+++ b/profiles/hardened/linux/uclibc/packages.build
@@ -1,82 +1,10 @@
-# This file describes the packages needed to build a
-# stage 1 based on this profile.
+# Copyright 1999-2012 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/uclibc/packages.build,v 1.2 2012/10/20 23:41:09 blueness Exp $
+
+# This file lists extra packages needed to build for
+# a stage 1 based on this profile.
 
-app-admin/eselect
-app-admin/eselect-python
-app-admin/perl-cleaner
-app-admin/python-updater
-app-arch/bzip2
-app-arch/gzip
-app-arch/tar
-app-editors/nano
-app-misc/editor-wrapper
-app-misc/pax-utils
-app-shells/bash
-dev-lang/perl
-dev-lang/python
-dev-libs/expat
-dev-libs/gmp
-dev-libs/libelf
-dev-libs/libffi
 dev-libs/libiconv
-dev-libs/libxml2
-dev-libs/mpc
-dev-libs/mpfr
-dev-libs/popt
-dev-python/pyxattr
-dev-python/setuptools
-dev-util/gtk-doc-am
-dev-util/pkgconfig
-net-misc/rsync
-net-misc/wget
 sys-apps/attr
-sys-apps/baselayout
-sys-apps/busybox
-sys-apps/coreutils
-sys-apps/diffutils
-sys-apps/file
-sys-apps/findutils
-sys-apps/gawk
-sys-apps/grep
-sys-apps/less
-sys-apps/net-tools
-sys-apps/openrc
-sys-apps/portage
-sys-apps/sandbox
-sys-apps/sed
-sys-apps/shadow
-sys-apps/sysvinit
-sys-apps/texinfo
-sys-apps/util-linux
-sys-devel/autoconf
-sys-devel/autoconf-wrapper
-sys-devel/automake
-sys-devel/automake-wrapper
-sys-devel/binutils
-sys-devel/binutils-config
-sys-devel/bison
-sys-devel/flex
-sys-devel/gcc
-sys-devel/gcc-config
-sys-devel/gettext
-sys-devel/gnuconfig
-sys-devel/libperl
-sys-devel/libtool
-sys-devel/m4
-sys-devel/make
-sys-devel/patch
-sys-fs/udev
-sys-kernel/linux-headers
-sys-libs/ncurses
-sys-libs/uclibc
-sys-libs/zlib
-sys-process/psmisc
-virtual/editor
-virtual/init
-virtual/libc
-virtual/libffi
-virtual/libiconv
-virtual/libintl
-virtual/os-headers
-virtual/package-manager
-virtual/shadow
+dev-python/pyxattr
diff --git a/profiles/package.mask b/profiles/package.mask
index 3cb08447f0a8..282b126cbe2b 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
 ####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.14145 2012/10/19 15:36:07 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.14147 2012/10/21 07:47:40 tetromino Exp $
 #
 # When you add an entry to the top of this file, add your name, the date, and
 # an explanation of why something is getting masked. Please be extremely
@@ -31,6 +31,28 @@
 
 #--- END OF EXAMPLES ---
 
+# Alexandre Rostovtsev <tetromino@gentoo.org> (21 Oct 2012)
+# gstreamer-0.10.36 bump: temporary mask to allow gradual addition to tree;
+# will be unmasked once all compatible plugins are in place.
+~media-libs/gstreamer-0.10.36
+~media-libs/gst-plugins-base-0.10.36
+~media-plugins/gst-plugins-alsa-0.10.36
+~media-plugins/gst-plugins-cdparanoia-0.10.36
+~media-plugins/gst-plugins-gio-0.10.36
+~media-plugins/gst-plugins-gnomevfs-0.10.36
+~media-plugins/gst-plugins-libvisual-0.10.36
+~media-plugins/gst-plugins-ogg-0.10.36
+~media-plugins/gst-plugins-pango-0.10.36
+~media-plugins/gst-plugins-theora-0.10.36
+~media-plugins/gst-plugins-vorbis-0.10.36
+~media-plugins/gst-plugins-x-0.10.36
+~media-plugins/gst-plugins-xvideo-0.10.36
+
+# Michael Sterrett <mr_bones_@gentoo.org> (20 Oct 2012)
+# Last version from 2009 and superseded by snes9x[gtk]
+# Masked for removal on 20121119
+games-emulation/snes9express
+
 # Michael Palimaka <kensington@gentoo.org> (19 Oct 2012)
 # New major release breaks almost all existing consumers.
 # Masked until each package can update its dependencies.
diff --git a/profiles/releases/freebsd-9.0/package.mask b/profiles/releases/freebsd-9.0/package.mask
index bce70748a1e9..12ffe049154d 100644
--- a/profiles/releases/freebsd-9.0/package.mask
+++ b/profiles/releases/freebsd-9.0/package.mask
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/releases/freebsd-9.0/package.mask,v 1.3 2012/05/12 00:08:09 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/releases/freebsd-9.0/package.mask,v 1.5 2012/10/20 23:44:27 ryao Exp $
 
 # Make sure we don't get wrong versions
 <sys-freebsd/freebsd-pam-modules-9.0_alpha
@@ -48,3 +48,13 @@ sys-process/fuser-bsd
 # via libulog.
 # this package does not build anymore as it requires utmp
 sys-libs/libutempter
+
+# Richard Yao <ryao@gentoo.org> (20 Oct 2012)
+# Newer versions of x11-libs/libdrm require KMS support that was introduced in
+# FreeBSD 9.1
+>=x11-libs/libdrm-2.4.37
+
+# Richard Yao <ryao@gentoo.org> (20 Oct 2012)
+# Newer versions of media-libs/mesa depend on newer versions of x11-libs/libdrm
+=media-libs/mesa-9*
+>=media-libs/mesa-9.0
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index cee87a6dcedd..39c77cb4fc65 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -836,9 +836,11 @@ app-portage/eix:strong-optimization - Adds several more agressive CXXFLAGS/LDFLA
 app-portage/eix:tools - Create separate binary for script helper tools; useful if they are called extremely often
 app-portage/gentoolkit:minimal - Install only the gentoolkit core code.
 app-portage/layman:bazaar - Support dev-vcs/bzr based overlays
+app-portage/layman:cvs - Support dev-vcs/cvs based overlays
 app-portage/layman:darcs - Support dev-vcs/darcs based overlays
 app-portage/layman:git - Support dev-vcs/git based overlays
 app-portage/layman:mercurial - Support dev-vcs/mercurial based overlays
+app-portage/layman:subversion - Support dev-vcs/subversion based overlays
 app-portage/pfl:network-cron - Adds a cron job which does a weekly submit of the package database
 app-portage/tatt:templates - Install template scripts to be used with tatt
 app-shells/bash:bashlogger - Log ALL commands typed into bash; should ONLY be used in restricted environments such as honeypots
@@ -3127,6 +3129,7 @@ media-tv/freevo:mixer - Enable support for adjusting volume via media-sound/aumi
 media-tv/freevo:tv - Enable support for the tv guide plugin
 media-tv/freevo:tvtime - Enables tvtime support, additional to tv use flag
 media-tv/gentoo-vdr-scripts:nvram - Add support for using nvram-wakeup to set wakeup time in bios
+media-tv/me-tv:http - Installation of Web-frontend
 media-tv/mythtv:alsa - Allows MythTV to directly output sound to ALSA devices, this is needed if you are using ALSA dmix or SPDIF. Note, you will have to physically type your device into the MythTV configuration since it will only give you /dev/dsp devices in the drop down.
 media-tv/mythtv:altivec - Builds ffmpeg's codec libraries with altivec support.
 media-tv/mythtv:autostart - Uses a custom autostart configuration gleaned from experience with MythTV since its early versions and discussed with other MythTV maintainers and users. Does not rely on KDE being installed like most methods do.
@@ -5529,7 +5532,6 @@ sys-kernel/mkinitcpio:cryptsetup - Add cryptsetup support
 sys-kernel/mkinitcpio:device-mapper - Add device-mapper support
 sys-kernel/mkinitcpio:dmraid - Add dmraid support
 sys-kernel/mkinitcpio:mdadm - Add mdadm support
-sys-kernel/mkinitcpio:plymouth - Add plymouth support
 sys-kernel/openvz-sources:deblob - Remove binary blobs from kernel sources to provide libre license compliance.
 sys-kernel/pf-sources:deblob - Remove binary blobs from kernel sources to provide libre license compliance.
 sys-kernel/pf-sources:experimental - Apply patches that are considered experimental. For more information, check out the ChangeLog or the ebuild that interests you.
diff --git a/sci-electronics/gspeakers/files/gspeakers-0.11-glib-single-include.patch b/sci-electronics/gspeakers/files/gspeakers-0.11-glib-single-include.patch
new file mode 100644
index 000000000000..344527abbeeb
--- /dev/null
+++ b/sci-electronics/gspeakers/files/gspeakers-0.11-glib-single-include.patch
@@ -0,0 +1,117 @@
+Index: gspeakers-0.11/src/box.cc
+===================================================================
+--- gspeakers-0.11.orig/src/box.cc
++++ gspeakers-0.11/src/box.cc
+@@ -17,7 +17,7 @@
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+ 
+-#include <glib/gstrfuncs.h>
++#include <glib.h>
+ #include <sstream>
+ #include "box.h"
+ #include "common.h"
+Index: gspeakers-0.11/src/boxlist.cc
+===================================================================
+--- gspeakers-0.11.orig/src/boxlist.cc
++++ gspeakers-0.11/src/boxlist.cc
+@@ -17,7 +17,7 @@
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+ 
+-#include <glib/gstrfuncs.h>
++#include <glib.h>
+ #include "boxlist.h"
+ #include "common.h"
+ 
+Index: gspeakers-0.11/src/cellitemcrossover.h
+===================================================================
+--- gspeakers-0.11.orig/src/cellitemcrossover.h
++++ gspeakers-0.11/src/cellitemcrossover.h
+@@ -22,7 +22,7 @@
+ #define __GSPEAKERS_CELLITEM_CROSSOVER
+ 
+ #include <glibmm/ustring.h>
+-#include <glib/gstring.h>
++#include <glib.h>
+ #include <vector>
+ #include "part.h"
+ 
+Index: gspeakers-0.11/src/crossover.cc
+===================================================================
+--- gspeakers-0.11.orig/src/crossover.cc
++++ gspeakers-0.11/src/crossover.cc
+@@ -15,7 +15,7 @@
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+ 
+-#include <glib/gstrfuncs.h>
++#include <glib.h>
+ #include <sstream>
+ #include "crossover.h"
+ 
+Index: gspeakers-0.11/src/crossoverlist.cc
+===================================================================
+--- gspeakers-0.11.orig/src/crossoverlist.cc
++++ gspeakers-0.11/src/crossoverlist.cc
+@@ -15,7 +15,7 @@
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+ 
+-#include <glib/gstrfuncs.h>
++#include <glib.h>
+ #include "crossoverlist.h"
+ 
+ CrossoverList::CrossoverList()
+Index: gspeakers-0.11/src/net.cc
+===================================================================
+--- gspeakers-0.11.orig/src/net.cc
++++ gspeakers-0.11/src/net.cc
+@@ -17,7 +17,7 @@
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+ 
+-#include <glib/gstrfuncs.h>
++#include <glib.h>
+ #include <sstream>
+ #include <fstream>
+ #include "net.h"
+Index: gspeakers-0.11/src/part.cc
+===================================================================
+--- gspeakers-0.11.orig/src/part.cc
++++ gspeakers-0.11/src/part.cc
+@@ -21,7 +21,7 @@
+ #include <iostream>
+ #include <sstream>
+ #include <stdlib.h>
+-#include <glib/gstrfuncs.h>
++#include <glib.h>
+ 
+ using namespace sigc;
+ using namespace std;
+Index: gspeakers-0.11/src/speaker.cc
+===================================================================
+--- gspeakers-0.11.orig/src/speaker.cc
++++ gspeakers-0.11/src/speaker.cc
+@@ -15,7 +15,7 @@
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+ 
+-#include <glib/gstrfuncs.h>
++#include <glib.h>
+ #include <sstream>
+ #include "speaker.h"
+ #include "common.h"
+Index: gspeakers-0.11/src/speakerlist.cc
+===================================================================
+--- gspeakers-0.11.orig/src/speakerlist.cc
++++ gspeakers-0.11/src/speakerlist.cc
+@@ -15,7 +15,7 @@
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+ 
+-#include <glib/gstrfuncs.h>
++#include <glib.h>
+ #include "speakerlist.h"
+ #include "common.h"
+ 
diff --git a/sci-electronics/gspeakers/gspeakers-0.11-r1.ebuild b/sci-electronics/gspeakers/gspeakers-0.11-r1.ebuild
index 053e73fd3791..676f0e8ad2d7 100644
--- a/sci-electronics/gspeakers/gspeakers-0.11-r1.ebuild
+++ b/sci-electronics/gspeakers/gspeakers-0.11-r1.ebuild
@@ -1,9 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/gspeakers/gspeakers-0.11-r1.ebuild,v 1.8 2012/07/06 05:12:52 tomjbe Exp $
-
-EAPI="1"
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/gspeakers/gspeakers-0.11-r1.ebuild,v 1.9 2012/10/21 10:28:01 pacho Exp $
 
+EAPI=4
 inherit eutils gnome2 autotools
 
 DESCRIPTION="GTK based loudspeaker enclosure and crossovernetwork designer"
@@ -15,8 +14,7 @@ SLOT="0"
 KEYWORDS="amd64 ppc x86"
 IUSE=""
 
-RDEPEND="
-	dev-cpp/gtkmm:2.4
+RDEPEND="dev-cpp/gtkmm:2.4
 	dev-libs/libxml2:2"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
@@ -27,9 +25,10 @@ RDEPEND="${RDEPEND}
 
 DOCS="AUTHORS ChangeLog NEWS README* TODO"
 
-src_unpack() {
-	gnome2_src_unpack
+src_prepare() {
 	sed -i -e "s/-O0//" src/Makefile.am
 	epatch "${FILESDIR}"/${P}-gcc43.patch
+	epatch "${FILESDIR}"/${P}-glib-single-include.patch
 	eautoreconf
+	gnome2_src_prepare
 }
diff --git a/sys-apps/busybox/busybox-1.20.2.ebuild b/sys-apps/busybox/busybox-1.20.2.ebuild
index d7db23597902..c355a70e9f73 100644
--- a/sys-apps/busybox/busybox-1.20.2.ebuild
+++ b/sys-apps/busybox/busybox-1.20.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.20.2.ebuild,v 1.10 2012/10/05 18:03:52 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.20.2.ebuild,v 1.11 2012/10/20 19:39:38 vapier Exp $
 
 EAPI="4"
 inherit eutils flag-o-matic savedconfig toolchain-funcs multilib
@@ -103,6 +103,7 @@ src_prepare() {
 		-e "/^AR\>/s:=.*:= $(tc-getAR):" \
 		-e "/^CC\>/s:=.*:= $(tc-getCC):" \
 		-e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \
+		-e "/^PKG_CONFIG\>/s:=.*:= $(tc-getPKG_CONFIG):" \
 		Makefile || die
 	sed -i \
 		-e 's:-static-libgcc::' \
diff --git a/sys-apps/busybox/files/busybox-1.20.2-selinux-pkg-config.patch b/sys-apps/busybox/files/busybox-1.20.2-selinux-pkg-config.patch
new file mode 100644
index 000000000000..5e9ef26d056e
--- /dev/null
+++ b/sys-apps/busybox/files/busybox-1.20.2-selinux-pkg-config.patch
@@ -0,0 +1,67 @@
+From 5694afd72a0a424fcdd2ac85838229a1a86b7e84 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Sat, 20 Oct 2012 15:01:26 -0400
+Subject: [PATCH] build system: use pkg-config to look up selinux libs
+
+Newer versions of libselinux has started linking against more libs.
+Rather than continuing hardcoding things, switch to using pkg-config
+to query for its dependencies.
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ Makefile       |  1 +
+ Makefile.flags | 12 +++++++++++-
+ 2 files changed, 12 insertions(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index b2e9477..8995ff5 100644
+--- a/Makefile
++++ b/Makefile
+@@ -297,6 +297,7 @@ NM		= $(CROSS_COMPILE)nm
+ STRIP		= $(CROSS_COMPILE)strip
+ OBJCOPY		= $(CROSS_COMPILE)objcopy
+ OBJDUMP		= $(CROSS_COMPILE)objdump
++PKG_CONFIG	?= $(CROSS_COMPILE)pkg-config
+ AWK		= awk
+ GENKSYMS	= scripts/genksyms/genksyms
+ DEPMOD		= /sbin/depmod
+diff --git a/Makefile.flags b/Makefile.flags
+index e77c0e5..307afa7 100644
+--- a/Makefile.flags
++++ b/Makefile.flags
+@@ -78,6 +78,12 @@ ARCH_FPIC ?= -fpic
+ ARCH_FPIE ?= -fpie
+ ARCH_PIE ?= -pie
+ 
++# Usage: $(eval $(call pkg_check_modules,VARIABLE-PREFIX,MODULES))
++define pkg_check_modules
++$(1)_CFLAGS := $(shell $(PKG_CONFIG) $(PKG_CONFIG_FLAGS) --cflags $(2))
++$(1)_LIBS := $(shell $(PKG_CONFIG) $(PKG_CONFIG_FLAGS) --libs $(2))
++endef
++
+ ifeq ($(CONFIG_BUILD_LIBBUSYBOX),y)
+ # on i386: 14% smaller libbusybox.so
+ # (code itself is 9% bigger, we save on relocs/PLT/GOT)
+@@ -89,6 +95,7 @@ endif
+ 
+ ifeq ($(CONFIG_STATIC),y)
+ CFLAGS_busybox += -static
++PKG_CONFIG_FLAGS += --static
+ endif
+ 
+ ifeq ($(CONFIG_PIE),y)
+@@ -131,7 +138,10 @@ LDLIBS += pam pam_misc pthread
+ endif
+ 
+ ifeq ($(CONFIG_SELINUX),y)
+-LDLIBS += selinux sepol
++SELINUX_PC_MODULES = libselinux libsepol
++$(eval $(call pkg_check_modules,SELINUX,$(SELINUX_PC_MODULES)))
++CPPFLAGS += $(SELINUX_CFLAGS)
++LDLIBS += $(if $(SELINUX_LIBS),$(SELINUX_LIBS:-l%=%),$(SELINUX_PC_MODULES:lib%=%))
+ endif
+ 
+ ifeq ($(CONFIG_EFENCE),y)
+-- 
+1.7.12
+
diff --git a/sys-apps/openrc/openrc-0.11.1.ebuild b/sys-apps/openrc/openrc-0.11.1.ebuild
index 7a522d85f342..8c7acf5986ed 100644
--- a/sys-apps/openrc/openrc-0.11.1.ebuild
+++ b/sys-apps/openrc/openrc-0.11.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-0.11.1.ebuild,v 1.1 2012/10/20 03:37:38 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-0.11.1.ebuild,v 1.3 2012/10/20 22:33:19 williamh Exp $
 
 EAPI=4
 
@@ -447,11 +447,19 @@ pkg_postinst() {
 
 	ewarn "In this version of OpenRC, the loopback interface no longer"
 	ewarn "satisfies the net virtual."
-	ewarn "If you are using rc_depend_strict=NO to allow servers to start"
-	ewarn "only for the loopback interface, this is no longer recommended."
-	ewarn "Instead, add this to the service's conf.d file and file a bug"
-	ewarn "requesting that  the need net dependency be dropped."
-	ewarn "rc_need=\"!net\""
+	ewarn "If you were depending on services that needed this, the quick fix is"
+	ewarn "to put this line in ${EROOT}/etc/conf.d/net:"
+	ewarn "rc_lo_provide=\"net\""
+	ewarn "You should also file a bug against the service asking that"
+	ewarn "need net be dropped from the dependencies."
+	ewarn "The bug you file should block the following tracker:"
+	ewarn "https://bugs.gentoo.org/show_bug.cgi?id=439092"
+
+	ewarn "This version of OpenRC doesn't enable nfs mounts automatically any"
+	ewarn "longer. In order to mount nfs file systems, you must use the"
+	ewarn "nfsmount service from the nfs-utils package."
+	ewarn "See bug https://bugs.gentoo.org/show_bug.cgi?id=427996 for"
+	ewarn "more information on this."
 
 	elog "You should now update all files in /etc, using etc-update"
 	elog "or equivalent before restarting any services or this host."
diff --git a/sys-auth/consolekit/consolekit-0.4.5_p20120320-r1.ebuild b/sys-auth/consolekit/consolekit-0.4.5_p20120320-r1.ebuild
index 0238cd545f8a..d918437b8683 100644
--- a/sys-auth/consolekit/consolekit-0.4.5_p20120320-r1.ebuild
+++ b/sys-auth/consolekit/consolekit-0.4.5_p20120320-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/consolekit/consolekit-0.4.5_p20120320-r1.ebuild,v 1.4 2012/10/15 18:47:09 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/consolekit/consolekit-0.4.5_p20120320-r1.ebuild,v 1.5 2012/10/21 13:39:37 ssuominen Exp $
 
 EAPI=4
 inherit autotools eutils linux-info pam systemd
@@ -29,7 +29,7 @@ COMMON_DEPEND=">=dev-libs/dbus-glib-0.98
 	acl? (
 		sys-apps/acl
 		>=sys-fs/udev-146-r1
-		!<sys-fs/udev-171-r6[extras]
+		!<sys-fs/udev-171-r99[extras]
 		)
 	pam? ( virtual/pam )
 	policykit? ( >=sys-auth/polkit-0.104-r1 )"
diff --git a/sys-auth/consolekit/consolekit-0.4.5_p20120320.ebuild b/sys-auth/consolekit/consolekit-0.4.5_p20120320.ebuild
index 49aec733d980..f9e279192483 100644
--- a/sys-auth/consolekit/consolekit-0.4.5_p20120320.ebuild
+++ b/sys-auth/consolekit/consolekit-0.4.5_p20120320.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/consolekit/consolekit-0.4.5_p20120320.ebuild,v 1.15 2012/10/15 18:47:09 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/consolekit/consolekit-0.4.5_p20120320.ebuild,v 1.16 2012/10/21 13:39:37 ssuominen Exp $
 
 EAPI=4
 inherit autotools eutils linux-info pam systemd
@@ -29,7 +29,7 @@ COMMON_DEPEND=">=dev-libs/dbus-glib-0.98
 	acl? (
 		sys-apps/acl
 		>=sys-fs/udev-146-r1
-		!<sys-fs/udev-171-r6[extras]
+		!<sys-fs/udev-171-r99[extras]
 		)
 	pam? ( virtual/pam )
 	policykit? ( >=sys-auth/polkit-0.104-r1 )"
diff --git a/sys-auth/nss-myhostname/Manifest b/sys-auth/nss-myhostname/Manifest
index aa530a544029..a0a0812e8282 100644
--- a/sys-auth/nss-myhostname/Manifest
+++ b/sys-auth/nss-myhostname/Manifest
@@ -1 +1 @@
-DIST nss-myhostname-0.3.tar.gz 330031 SHA256 2ba744ea8d578d1c57c85884e94a3042ee17843a5294434d3a7f6c4d67e7caf2
+DIST nss-myhostname-0.3.tar.gz 330031 SHA256 2ba744ea8d578d1c57c85884e94a3042ee17843a5294434d3a7f6c4d67e7caf2 SHA512 8f14091f887991532bc3cedcdee607c89f403c7869063919c299cdd7ee8207a9759ab9105093bae151a79e08944053598104a59e9987949ee146d742a12e8c34 WHIRLPOOL 9161372c1e5dea6ea925f96fadfbb955786e812a079fea621b3c212bafe6fcbb6a20f6979d3cb474ccba73ce9e2ebdd7d51ef7f994413dcdc20fb0f1572f6d9d
diff --git a/sys-auth/nss-myhostname/nss-myhostname-0.3.ebuild b/sys-auth/nss-myhostname/nss-myhostname-0.3.ebuild
index 19310186c8c6..1fca135cff17 100644
--- a/sys-auth/nss-myhostname/nss-myhostname-0.3.ebuild
+++ b/sys-auth/nss-myhostname/nss-myhostname-0.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/nss-myhostname/nss-myhostname-0.3.ebuild,v 1.3 2012/09/23 06:06:44 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/nss-myhostname/nss-myhostname-0.3.ebuild,v 1.4 2012/10/20 17:49:20 tetromino Exp $
 
 EAPI="4"
 
@@ -8,7 +8,7 @@ DESCRIPTION="Name Service Switch module for resolving the local hostname"
 HOMEPAGE="http://0pointer.de/lennart/projects/nss-myhostname/"
 SRC_URI="http://0pointer.de/lennart/projects/${PN}/${P}.tar.gz"
 
-LICENSE="LGPL-2.1"
+LICENSE="LGPL-2.1+"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
diff --git a/sys-auth/pam_ldap/Manifest b/sys-auth/pam_ldap/Manifest
index c7db79b97513..1b6e73edf099 100644
--- a/sys-auth/pam_ldap/Manifest
+++ b/sys-auth/pam_ldap/Manifest
@@ -1,3 +1,3 @@
-DIST pam_ldap-183.tar.gz 127500 RMD160 42c8622677c44b521569b906b1cf53d0e605ed39 SHA1 a41ae31a32f84cc9add59e4ac7502fcc94f0eb04 SHA256 aabce29413280efc992ba10f16ec8ab3c1bf06feebebf598d3b625ad36a715d0
-DIST pam_ldap-184.tar.gz 128053 RMD160 00f08117c72ec3af3b1e32856ffeaf3a8768cde9 SHA1 4fe29e57cc7f69eca3692fbaf88160aff2260939 SHA256 2dd4df6bfddd80580af599dbfb631f907d796df478c22949af4552eaf750c6f3
-DIST pam_ldap-186.tar.gz 163437 RMD160 54fb6da6560ef1d7082d1e00cfa96286801f40bf SHA1 abb37c92dde446687272849ed29eb5c0fe1a55a6 SHA256 c8fe22d559d5a3f528b24eb97175085f188c0f11ade337a868590ac0e0716453
+DIST pam_ldap-183.tar.gz 127500 SHA256 aabce29413280efc992ba10f16ec8ab3c1bf06feebebf598d3b625ad36a715d0 SHA512 ad1ec398904c54f31aa71d3b59ecbdf4af14c590077f9e683d87fa3940f4e20aab7e1bd59eac7a9bfb985e30c1ea04a1569aa2dc2dfc39d8ccec8b871cc032c7 WHIRLPOOL b20fc273e1b0c97e51d10d7e7f8f706b28e896842e3d65638aa2cc304fe88f1cadc6d76271e9e49fa17d4a8ca4ad8ef1c7bc44701a7bf6a6eddb81cf37c2d0b3
+DIST pam_ldap-184.tar.gz 128053 SHA256 2dd4df6bfddd80580af599dbfb631f907d796df478c22949af4552eaf750c6f3
+DIST pam_ldap-186.tar.gz 163437 SHA256 c8fe22d559d5a3f528b24eb97175085f188c0f11ade337a868590ac0e0716453 SHA512 aaa6fbc48150db53bf92dcf600bcb8f0526baa2e6124f46468f59958c8a91495eb003d16a45b659c8cbb2d3481c4732a0d1f5945a2c98c09549ef8a51ed18a3d WHIRLPOOL c5024e94a1c93eb701cc5b9694e401cd5e03d33ca8fa5043d70c1b35fa092e916e89c206d8c2eb635410e32a6a1059705d23ca541a0e4c47efa42605b88258d0
diff --git a/sys-auth/pam_ldap/pam_ldap-186.ebuild b/sys-auth/pam_ldap/pam_ldap-186.ebuild
index 979ab6b4653b..d896a4ea4f4c 100644
--- a/sys-auth/pam_ldap/pam_ldap-186.ebuild
+++ b/sys-auth/pam_ldap/pam_ldap-186.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_ldap/pam_ldap-186.ebuild,v 1.1 2010/11/25 20:28:10 constanze Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_ldap/pam_ldap-186.ebuild,v 1.2 2012/10/21 08:55:09 maekke Exp $
 
 inherit eutils pam
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.padl.com/download/${P}.tar.gz"
 
 LICENSE="|| ( GPL-2 LGPL-2 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="ssl sasl"
 DEPEND=">=sys-libs/glibc-2.1.3
 		>=sys-libs/pam-0.72
diff --git a/sys-boot/grub/grub-2.00-r1.ebuild b/sys-boot/grub/grub-2.00-r1.ebuild
index 9f7a6becacc6..15eee11c8010 100644
--- a/sys-boot/grub/grub-2.00-r1.ebuild
+++ b/sys-boot/grub/grub-2.00-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.00-r1.ebuild,v 1.2 2012/10/18 12:41:14 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.00-r1.ebuild,v 1.3 2012/10/20 21:46:34 floppym Exp $
 
 EAPI=4
 
@@ -216,6 +216,17 @@ grub_install_docs() {
 	emake -C docs DESTDIR="${D}" install-html
 }
 
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		# Bug 439082
+		if $(tc-getLD) --version | grep -q "GNU gold"; then
+			eerror "GRUB does not function correctly when built with the gold linker."
+			eerror "Please select the bfd linker with binutils-config."
+			die "GNU gold detected"
+		fi
+	fi
+}
+
 src_prepare() {
 	if [[ ${PV} != 9999 ]]; then
 		epatch "${FILESDIR}/${P}-parallel-make.patch" #424231
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index 31ca532cb99e..db2e902b8407 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v 1.84 2012/10/18 12:41:14 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v 1.85 2012/10/20 21:46:34 floppym Exp $
 
 EAPI=4
 
@@ -216,6 +216,17 @@ grub_install_docs() {
 	emake -C docs DESTDIR="${D}" install-html
 }
 
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		# Bug 439082
+		if $(tc-getLD) --version | grep -q "GNU gold"; then
+			eerror "GRUB does not function correctly when built with the gold linker."
+			eerror "Please select the bfd linker with binutils-config."
+			die "GNU gold detected"
+		fi
+	fi
+}
+
 src_prepare() {
 	if [[ ${PV} != 9999 ]]; then
 		epatch "${FILESDIR}/${P}-parallel-make.patch" #424231
diff --git a/sys-fs/cryptsetup/Manifest b/sys-fs/cryptsetup/Manifest
index dad0aa01fa59..7482838b0eae 100644
--- a/sys-fs/cryptsetup/Manifest
+++ b/sys-fs/cryptsetup/Manifest
@@ -1,7 +1,7 @@
-DIST cryptsetup-1.0.6.tar.bz2 405713 RMD160 7ec056cf80fd25a782d3f6cc345858cf4ea988ec SHA1 dd45ad6a29c2e9af83c2c1525b02d7af88ab7212 SHA256 df7fda80cfa01f063caf39140287a47d018dfe056fc71a3ba605e690ff0183fd
-DIST cryptsetup-1.1.2.tar.bz2 478501 RMD160 2488fb603edb73cfc99726c59d44530ac006b4d9 SHA1 270580572c413facee359b29e5886ff2b4e6de1c SHA256 45972839fbb169b3ad5649454c217b7f5b0b3c8bf07e32f51a334a88217c7293
-DIST cryptsetup-1.1.3.tar.bz2 499276 RMD160 bf2e724779174a3cd6ce9d592e17c70979f26e85 SHA1 6f8a4c9a80a0d25f8492dfce6db6abed221598f6 SHA256 9c8e68a272f6d9cfb6cd65cc0743f4c44a2096c61f74e0602bf40208b5e69c0a
-DIST cryptsetup-1.2.0.tar.bz2 523859 RMD160 8f1ce6d72a056e9c98996be85041569e96abff24 SHA1 fa9383eda40655311f2dfe751e061b0111c73908 SHA256 411129817ff29e6a957bcbdcd9a2c4c953c1539acd8af912c383262ba901b5ea
-DIST cryptsetup-1.4.1.tar.bz2 772971 RMD160 4c8a7e1a3a7bd7f2d52591c1b8de21a31edeb780 SHA1 32608be5b146a7bd3999129b086bad8b66c085b9 SHA256 82b143328c2b427ef2b89fb76c701d311c95b54093c21bbf22342f7b393bddcb
-DIST cryptsetup-1.4.2.tar.bz2 787016 RMD160 abb8daee54b76f752ce36274954333217d57d584 SHA1 7fa3fa89fe7904ffdd42d6031014cd819fbc8e7c SHA256 1fe80d7b19d24b3f65d2e446decfed859e2c4d17fdf7c19289d82dc7cd60dfe7
-DIST cryptsetup-1.4.3.tar.bz2 798101 RMD160 d88b72f4c938af3531d52b3651e57246eef782ea SHA1 90de7c413847f9da55c85ad8e50ba42c74b30078 SHA256 d5ff2c00f6f791d77fa5636a02ae43ddbb46c6c793bdeafdec5e38fd15f99d0a
+DIST cryptsetup-1.0.6.tar.bz2 405713 SHA256 df7fda80cfa01f063caf39140287a47d018dfe056fc71a3ba605e690ff0183fd
+DIST cryptsetup-1.1.2.tar.bz2 478501 SHA256 45972839fbb169b3ad5649454c217b7f5b0b3c8bf07e32f51a334a88217c7293
+DIST cryptsetup-1.1.3.tar.bz2 499276 SHA256 9c8e68a272f6d9cfb6cd65cc0743f4c44a2096c61f74e0602bf40208b5e69c0a
+DIST cryptsetup-1.2.0.tar.bz2 523859 SHA256 411129817ff29e6a957bcbdcd9a2c4c953c1539acd8af912c383262ba901b5ea
+DIST cryptsetup-1.4.1.tar.bz2 772971 SHA256 82b143328c2b427ef2b89fb76c701d311c95b54093c21bbf22342f7b393bddcb
+DIST cryptsetup-1.4.2.tar.bz2 787016 SHA256 1fe80d7b19d24b3f65d2e446decfed859e2c4d17fdf7c19289d82dc7cd60dfe7
+DIST cryptsetup-1.4.3.tar.bz2 798101 SHA256 d5ff2c00f6f791d77fa5636a02ae43ddbb46c6c793bdeafdec5e38fd15f99d0a
diff --git a/sys-fs/cryptsetup/cryptsetup-1.2.0-r1.ebuild b/sys-fs/cryptsetup/cryptsetup-1.2.0-r1.ebuild
index fd8a26f4ed7a..7fbf6b1584bf 100644
--- a/sys-fs/cryptsetup/cryptsetup-1.2.0-r1.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-1.2.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/cryptsetup-1.2.0-r1.ebuild,v 1.11 2012/05/21 07:55:41 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/cryptsetup-1.2.0-r1.ebuild,v 1.12 2012/10/21 13:37:06 ssuominen Exp $
 
 EAPI="2"
 
@@ -37,7 +37,7 @@ DEPEND="${RDEPEND}
 		|| ( >=sys-apps/util-linux-2.20[static-libs] <sys-apps/util-linux-2.20 )
 		dev-libs/libgcrypt[static-libs]
 		|| ( >=sys-fs/lvm2-2.02.88[static-libs] <sys-fs/lvm2-2.02.88 )
-		|| ( >=sys-fs/udev-182[static-libs] <=sys-fs/udev-171-r6 )
+		|| ( >=sys-fs/udev-182[static-libs] <=sys-fs/udev-171-r8 =sys-fs/udev-171* )
 	)"
 
 pkg_setup() {
diff --git a/sys-fs/cryptsetup/cryptsetup-1.4.1.ebuild b/sys-fs/cryptsetup/cryptsetup-1.4.1.ebuild
index 5792d2988744..bed34e076481 100644
--- a/sys-fs/cryptsetup/cryptsetup-1.4.1.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-1.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/cryptsetup-1.4.1.ebuild,v 1.10 2012/05/21 07:55:41 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/cryptsetup-1.4.1.ebuild,v 1.11 2012/10/21 13:37:06 ssuominen Exp $
 
 EAPI="2"
 
@@ -37,7 +37,7 @@ DEPEND="${RDEPEND}
 		|| ( >=sys-apps/util-linux-2.20[static-libs] <sys-apps/util-linux-2.20 )
 		dev-libs/libgcrypt[static-libs]
 		|| ( >=sys-fs/lvm2-2.02.88[static-libs] <sys-fs/lvm2-2.02.88 )
-		|| ( >=sys-fs/udev-182[static-libs] <=sys-fs/udev-171-r6 )
+		|| ( >=sys-fs/udev-182[static-libs] <=sys-fs/udev-171-r8 =sys-fs/udev-171* )
 	)"
 
 pkg_setup() {
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-3.5.7.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-3.5.7.ebuild
index 800e0440092b..11d7f910a427 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-3.5.7.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-3.5.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-3.5.7.ebuild,v 1.1 2012/10/13 23:42:38 mpagano Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-3.5.7.ebuild,v 1.2 2012/10/20 18:40:24 ago Exp $
 
 EAPI="3"
 ETYPE="sources"
@@ -11,7 +11,7 @@ inherit kernel-2
 detect_version
 detect_arch
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches"
 IUSE="deblob"
 
diff --git a/sys-kernel/git-sources/Manifest b/sys-kernel/git-sources/Manifest
index dddf2139403a..f66f97ec5da6 100644
--- a/sys-kernel/git-sources/Manifest
+++ b/sys-kernel/git-sources/Manifest
@@ -1,10 +1,3 @@
-DIST linux-3.5.tar.bz2 80978443 SHA256 6ab82beb8cbb895b7523daed7ec3ec5850cf460b96788056f1ef5135c852fd23 SHA512 f6de5aaff351097dbe4b7186baea63004ef9efb73a85ccfd718c5856b282c22fb1431dce8588cb823eb75d1f09cd89f20e4936501e2c536f53ea4aa705e09ecc WHIRLPOOL 227c73e187370f2f5be34041c99ff2ff1bc99de4685d29801558a96d7d128c6f09c4a2ce81ce33cd87148c301e43319b42a8a77443e5db37f604fd97d101b7e7
 DIST linux-3.6.tar.bz2 82296001 SHA256 88ae0a20fd39ecae79db0ce8f9397922fae33c8b06a54ed2c883c861126c9771 SHA512 cbaefc2c4c8ab2251c3345b7b2c88d55a49e3468d8b177b05dd6d96a802efa9a052b1a1ecab8b71298bac97f45259516d88253838332b4fdb4307780ebcddce9 WHIRLPOOL e17e3800951f0c3af21015d1a1c99698d0ef70815bd4f131dd60b30baef70d4c255988857533a9a7c058388c2febfcf02d12cde2a7ed46b24fa85aeb260c0251
-DIST patch-3.6-rc1.bz2 5882829 SHA256 d779915fd15e31b35a63a20c86eaa037493d97aa2a3684fa1f5cb5db178ca8c9 SHA512 b9530b08c89cf70a6d4acf4310557dad7fe1a3d9580b98c837a8f4a71dc358c53243e14577840a6be7230b9c4b7c611a53e9917830e373bfc3c67f0c8deccf44 WHIRLPOOL e38addde6abe6974348ad56fdb240520f7d164db4e3e8822e09d1ee3fe756f4123c6634b1aadb0dee0943e4d2216a0984ac1e54f0599e10af5775b075b7aa5ac
-DIST patch-3.6-rc2.bz2 5967996 SHA256 3d29e773b0b6e3bdb4bf2e26b2f6c406545fc8c437fb0c835c02111dccc7b9f5 SHA512 e1ad98da91357612a81382208daf3805d692d3029f62c2cdcf52eaf8ef95890fc91be89e889b7d86f5151f6a5e64577dd51c45540cb0ef00a6d9e4f4a0add821 WHIRLPOOL 3084a57da18ef0d03fc4d3dd0e3903715fb608b147a95141e550067c83c4a2a8f335b8363df9b533fb03465c2e5990f29aff87a672b72863425dabc268c7d0bb
-DIST patch-3.6-rc3.bz2 6090392 SHA256 95a758a71604ed732c458ff4f74b543001a847e62665c04875f8e817a8522e01 SHA512 3a286d80a102d55d3242ff216c01c664396a4689e9a42cbe5eccf34316b045a52c751e4a9c2020a402c828bae0ccf70602632153e64d7c2301b628ed8903e230 WHIRLPOOL 481321185c3dd8e862225b79feaf9a32f144a45a1be9567e6382c6fd2ec00e0f92e88c71aa5bda160cf1eb5124fff2c6ff7d75f5fdd66e6acbb86361679ad9fc
-DIST patch-3.6-rc4.bz2 6095417 SHA256 71d1ad9bd5a71275976efeac973bbc102b57e5c96fa30025fb9cdbadb12d861c SHA512 5fc79fda3811b143814ccaf1f4c375b5adbd1d628bd7ed0fa728ac06a6aae7a6731b135043187adab94081d471e867a04bc791bc9e5c265809cd78ad64ebfd81 WHIRLPOOL 95836061cdf82df1b5062d91becb9bf9486b4a2791cf5ca466d0614d419f2fa66f70e1a87a890af77219feaace9e75064213342241521f7f34aed8c0daa0790f
-DIST patch-3.6-rc5.bz2 6117712 SHA256 cab3a0c2dcc32448a558fd151b8161d5e2cf0440c1ca576aafd8d098becbd180 SHA512 8afe3dae981c829a96975d3502228ad5cc38af5576d975210603322ecb8dc3b9100542f53851f7c41941b49adde8e1b8d8fbb78a125f4cd32c26e595ecb4baca WHIRLPOOL 51a71cb6bfc45acdb5235528c64962d54277e45d0b08f20a7366e2c10d435f447ca7effa00712f4fac8340b435d72929a2ca6847a3ae7ee84063dc96c12c8097
-DIST patch-3.6-rc6.bz2 6187946 SHA256 3d3d43141bef4e210cd6e9525180a6576afed707a99f34f435e56260df506123 SHA512 4084c605f8bfdf553853bf581c4983f70bfad87787d8fc72b5a977a16d6133fec48cb833aadbc8b851912e09c48fed6c3b1d99c3acad60fca85739105c78b9fd WHIRLPOOL abadd04d05030b00fcb73778c5a3d7ba81e3759c1e2d9c0591ad7e9ea22b05adf749f7f524253078e307d60eed6d73271f25a2d92252ad26ad2897c6f1d71a66
-DIST patch-3.6-rc7.bz2 6209247 SHA256 e4fb74d689f5407765f3b319d484d593d37d547843c3d851c3bafb22cc6ae583 SHA512 670f9c9a43986cb4ec0d422f625c83f5ffbf132b0593e05616262fc4341edc70efc272ec03f4289f00ceba354b8171fc0213911c25e855d0e4add9d55e46ceee WHIRLPOOL 4eea3631c37ebec85ecdd09b75e3b86328767337bb9eb043cebf44822cbf5e0a644484828df187dd3029fbb70185f057a5fed8d5fbf8d24dd2c8e27fef9b3588
 DIST patch-3.7-rc1.bz2 16153213 SHA256 3792eab342bb397750ec5d3fb370fb9242f0931e0ab6716ac6034fa1a6fb422c SHA512 1794223acdb067d1071ed6fe603f19ac59a938cc4fe60b04464fc6eda09fb862247bd5d19fdfd271ae96487a027840cc59102c83350460f20c61ab10e2025163 WHIRLPOOL 303ef4a1a2b2ffe2baeca71a11418e1fae746bf7e80fecc7ba3d05e726f843e646d1b9ace927ca89595505ccb089fbc76b5454fbe810272da6ee702f3e324856
+DIST patch-3.7-rc2.bz2 16339855 SHA256 1c43ebaa8af1a4ed0fd34fbb789fa2cec44cedce22022f1f3bf5a2bc960c69f7 SHA512 e08a871c659e1b37c145ca49428e9cf2f2726aafc686107e2fffb6cf648d8625cbf7b556a065ab9c5f9f1dd3e692037c1a940d2437c64a69888437fcb4b3c8b0 WHIRLPOOL 85f2ef63fd954542f12ffec83240f7c1a7708a23998472aa5b432368ae855beb1f874ce2b5eda9305985b3292cf3439b283a50ef9dd02e23e77b4f2de31e2b1c
diff --git a/sys-kernel/git-sources/git-sources-3.6_rc1.ebuild b/sys-kernel/git-sources/git-sources-3.6_rc1.ebuild
deleted file mode 100644
index 87763c7926fc..000000000000
--- a/sys-kernel/git-sources/git-sources-3.6_rc1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/git-sources/git-sources-3.6_rc1.ebuild,v 1.1 2012/08/03 12:07:26 mpagano Exp $
-
-EAPI="4"
-UNIPATCH_STRICTORDER="yes"
-K_NOUSENAME="yes"
-K_NOSETEXTRAVERSION="yes"
-K_NOUSEPR="yes"
-K_SECURITY_UNSUPPORTED="yes"
-K_DEBLOB_AVAILABLE=0
-ETYPE="sources"
-CKV="${PVR/-r/-git}"
-
-# only use this if it's not an _rc/_pre release
-[ "${PV/_pre}" == "${PV}" ] && [ "${PV/_rc}" == "${PV}" ] && OKV="${PV}"
-inherit kernel-2
-detect_version
-
-DESCRIPTION="The very latest -git version of the Linux kernel"
-HOMEPAGE="http://www.kernel.org"
-SRC_URI="${KERNEL_URI}"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
-IUSE=""
-
-K_EXTRAEINFO="This kernel is not supported by Gentoo due to its unstable and
-experimental nature. If you have any issues, try a matching vanilla-sources
-ebuild -- if the problem is not there, please contact the upstream kernel
-developers at http://bugzilla.kernel.org and on the linux-kernel mailing list to
-report the problem so it can be fixed in time for the next kernel release."
-
-pkg_postinst() {
-	postinst_sources
-}
diff --git a/sys-kernel/git-sources/git-sources-3.6_rc3.ebuild b/sys-kernel/git-sources/git-sources-3.6_rc3.ebuild
deleted file mode 100644
index a6e450f8cfe3..000000000000
--- a/sys-kernel/git-sources/git-sources-3.6_rc3.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/git-sources/git-sources-3.6_rc3.ebuild,v 1.1 2012/08/23 13:36:58 mpagano Exp $
-
-EAPI="4"
-UNIPATCH_STRICTORDER="yes"
-K_NOUSENAME="yes"
-K_NOSETEXTRAVERSION="yes"
-K_NOUSEPR="yes"
-K_SECURITY_UNSUPPORTED="yes"
-K_DEBLOB_AVAILABLE=0
-ETYPE="sources"
-CKV="${PVR/-r/-git}"
-
-# only use this if it's not an _rc/_pre release
-[ "${PV/_pre}" == "${PV}" ] && [ "${PV/_rc}" == "${PV}" ] && OKV="${PV}"
-inherit kernel-2
-detect_version
-
-DESCRIPTION="The very latest -git version of the Linux kernel"
-HOMEPAGE="http://www.kernel.org"
-SRC_URI="${KERNEL_URI}"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
-IUSE=""
-
-K_EXTRAEINFO="This kernel is not supported by Gentoo due to its unstable and
-experimental nature. If you have any issues, try a matching vanilla-sources
-ebuild -- if the problem is not there, please contact the upstream kernel
-developers at http://bugzilla.kernel.org and on the linux-kernel mailing list to
-report the problem so it can be fixed in time for the next kernel release."
-
-pkg_postinst() {
-	postinst_sources
-}
diff --git a/sys-kernel/git-sources/git-sources-3.6_rc4.ebuild b/sys-kernel/git-sources/git-sources-3.6_rc4.ebuild
deleted file mode 100644
index bda7252273d6..000000000000
--- a/sys-kernel/git-sources/git-sources-3.6_rc4.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/git-sources/git-sources-3.6_rc4.ebuild,v 1.1 2012/09/04 14:10:49 mpagano Exp $
-
-EAPI="4"
-UNIPATCH_STRICTORDER="yes"
-K_NOUSENAME="yes"
-K_NOSETEXTRAVERSION="yes"
-K_NOUSEPR="yes"
-K_SECURITY_UNSUPPORTED="yes"
-K_DEBLOB_AVAILABLE=0
-ETYPE="sources"
-CKV="${PVR/-r/-git}"
-
-# only use this if it's not an _rc/_pre release
-[ "${PV/_pre}" == "${PV}" ] && [ "${PV/_rc}" == "${PV}" ] && OKV="${PV}"
-inherit kernel-2
-detect_version
-
-DESCRIPTION="The very latest -git version of the Linux kernel"
-HOMEPAGE="http://www.kernel.org"
-SRC_URI="${KERNEL_URI}"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
-IUSE=""
-
-K_EXTRAEINFO="This kernel is not supported by Gentoo due to its unstable and
-experimental nature. If you have any issues, try a matching vanilla-sources
-ebuild -- if the problem is not there, please contact the upstream kernel
-developers at http://bugzilla.kernel.org and on the linux-kernel mailing list to
-report the problem so it can be fixed in time for the next kernel release."
-
-pkg_postinst() {
-	postinst_sources
-}
diff --git a/sys-kernel/git-sources/git-sources-3.6_rc5.ebuild b/sys-kernel/git-sources/git-sources-3.6_rc5.ebuild
deleted file mode 100644
index 40b2b6d27c46..000000000000
--- a/sys-kernel/git-sources/git-sources-3.6_rc5.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/git-sources/git-sources-3.6_rc5.ebuild,v 1.1 2012/09/09 18:22:14 mpagano Exp $
-
-EAPI="4"
-UNIPATCH_STRICTORDER="yes"
-K_NOUSENAME="yes"
-K_NOSETEXTRAVERSION="yes"
-K_NOUSEPR="yes"
-K_SECURITY_UNSUPPORTED="yes"
-K_DEBLOB_AVAILABLE=0
-ETYPE="sources"
-CKV="${PVR/-r/-git}"
-
-# only use this if it's not an _rc/_pre release
-[ "${PV/_pre}" == "${PV}" ] && [ "${PV/_rc}" == "${PV}" ] && OKV="${PV}"
-inherit kernel-2
-detect_version
-
-DESCRIPTION="The very latest -git version of the Linux kernel"
-HOMEPAGE="http://www.kernel.org"
-SRC_URI="${KERNEL_URI}"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
-IUSE=""
-
-K_EXTRAEINFO="This kernel is not supported by Gentoo due to its unstable and
-experimental nature. If you have any issues, try a matching vanilla-sources
-ebuild -- if the problem is not there, please contact the upstream kernel
-developers at http://bugzilla.kernel.org and on the linux-kernel mailing list to
-report the problem so it can be fixed in time for the next kernel release."
-
-pkg_postinst() {
-	postinst_sources
-}
diff --git a/sys-kernel/git-sources/git-sources-3.6_rc6.ebuild b/sys-kernel/git-sources/git-sources-3.6_rc6.ebuild
deleted file mode 100644
index d2aaf4e70899..000000000000
--- a/sys-kernel/git-sources/git-sources-3.6_rc6.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/git-sources/git-sources-3.6_rc6.ebuild,v 1.1 2012/09/18 03:11:13 mpagano Exp $
-
-EAPI="4"
-UNIPATCH_STRICTORDER="yes"
-K_NOUSENAME="yes"
-K_NOSETEXTRAVERSION="yes"
-K_NOUSEPR="yes"
-K_SECURITY_UNSUPPORTED="yes"
-K_DEBLOB_AVAILABLE=0
-ETYPE="sources"
-CKV="${PVR/-r/-git}"
-
-# only use this if it's not an _rc/_pre release
-[ "${PV/_pre}" == "${PV}" ] && [ "${PV/_rc}" == "${PV}" ] && OKV="${PV}"
-inherit kernel-2
-detect_version
-
-DESCRIPTION="The very latest -git version of the Linux kernel"
-HOMEPAGE="http://www.kernel.org"
-SRC_URI="${KERNEL_URI}"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
-IUSE=""
-
-K_EXTRAEINFO="This kernel is not supported by Gentoo due to its unstable and
-experimental nature. If you have any issues, try a matching vanilla-sources
-ebuild -- if the problem is not there, please contact the upstream kernel
-developers at http://bugzilla.kernel.org and on the linux-kernel mailing list to
-report the problem so it can be fixed in time for the next kernel release."
-
-pkg_postinst() {
-	postinst_sources
-}
diff --git a/sys-kernel/git-sources/git-sources-3.6_rc7.ebuild b/sys-kernel/git-sources/git-sources-3.6_rc7.ebuild
deleted file mode 100644
index c7f706966dc4..000000000000
--- a/sys-kernel/git-sources/git-sources-3.6_rc7.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/git-sources/git-sources-3.6_rc7.ebuild,v 1.1 2012/09/24 15:56:48 mpagano Exp $
-
-EAPI="4"
-UNIPATCH_STRICTORDER="yes"
-K_NOUSENAME="yes"
-K_NOSETEXTRAVERSION="yes"
-K_NOUSEPR="yes"
-K_SECURITY_UNSUPPORTED="yes"
-K_DEBLOB_AVAILABLE=0
-ETYPE="sources"
-CKV="${PVR/-r/-git}"
-
-# only use this if it's not an _rc/_pre release
-[ "${PV/_pre}" == "${PV}" ] && [ "${PV/_rc}" == "${PV}" ] && OKV="${PV}"
-inherit kernel-2
-detect_version
-
-DESCRIPTION="The very latest -git version of the Linux kernel"
-HOMEPAGE="http://www.kernel.org"
-SRC_URI="${KERNEL_URI}"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
-IUSE=""
-
-K_EXTRAEINFO="This kernel is not supported by Gentoo due to its unstable and
-experimental nature. If you have any issues, try a matching vanilla-sources
-ebuild -- if the problem is not there, please contact the upstream kernel
-developers at http://bugzilla.kernel.org and on the linux-kernel mailing list to
-report the problem so it can be fixed in time for the next kernel release."
-
-pkg_postinst() {
-	postinst_sources
-}
diff --git a/sys-kernel/git-sources/git-sources-3.6_rc2.ebuild b/sys-kernel/git-sources/git-sources-3.7_rc2.ebuild
similarity index 94%
rename from sys-kernel/git-sources/git-sources-3.6_rc2.ebuild
rename to sys-kernel/git-sources/git-sources-3.7_rc2.ebuild
index 7c95d9251933..8d874e0cb760 100644
--- a/sys-kernel/git-sources/git-sources-3.6_rc2.ebuild
+++ b/sys-kernel/git-sources/git-sources-3.7_rc2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/git-sources/git-sources-3.6_rc2.ebuild,v 1.1 2012/08/16 23:39:06 mpagano Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/git-sources/git-sources-3.7_rc2.ebuild,v 1.1 2012/10/21 15:25:29 mpagano Exp $
 
 EAPI="4"
 UNIPATCH_STRICTORDER="yes"
diff --git a/sys-kernel/mips-sources/Manifest b/sys-kernel/mips-sources/Manifest
index b8399e993232..9a41e41aedba 100644
--- a/sys-kernel/mips-sources/Manifest
+++ b/sys-kernel/mips-sources/Manifest
@@ -1,14 +1,18 @@
-DIST deblob-2.6.29 76155 RMD160 b56288e338c16ec6aafd5d9146bd4dc8ae82d2ba SHA1 ab846a78ee43e2efd90417494cafe9dfa5b2d089 SHA256 ce0805a2767a1139fd952232eae04814c8910d0629963c2dc1e83449bc6a4987
-DIST deblob-check-2.6.29 247608 RMD160 840bf8a229ea79810519eee6241edb85b78a6562 SHA1 d45a24eb16e5ac956c0fcddbc1ac4d67e326c7b8 SHA256 da1aecdf3ab7f1207b90642d303e52262ccc2ed9e49739b729512b88950d17f3
-DIST linux-2.6.29.tar.bz2 56579370 RMD160 e0e8c0635665ed34618b04fe1140015a4b6ff806 SHA1 0640a2f4bea3fc272541f322b74ea365ad7f2349 SHA256 58a5ea16d499fe06f90fcbf1d687d1235d2cb9bc28bf979867bd3faadf38fc3f
-DIST linux-3.0.tar.bz2 76753134 RMD160 e20c9564ec0c8128e28a4c038986d4d93bbe34bb SHA1 45b64bffc860f70ab7956da4493c488010714650 SHA256 64b0228b54ce39b0b2df086109a7b737cde58e3df4f779506ddcaccee90356a0
-DIST linux-3.1.tar.bz2 77190238 RMD160 f9a3ce57b9f20a1402ef340792d3c223140ce1d2 SHA1 ac792701561b1cd4279302b8bb8f474731762ad1 SHA256 2573d2378c754b0c602b57586e9311e5b38c5d1e6c137f02873833633a4b9359
-DIST mips-sources-2.6.29-patches-v3.tar.bz2 74933 RMD160 37c21087351188f0300ff81e778ba86f33b10a3b SHA1 dc35f8d47928f1db450115bea3b6e2ccd18806de SHA256 d3c77c91b810824bcfbe25b96703e0b3a7f6200c71aa550c4abe9d296f5bbbff
-DIST mips-sources-3.0.0-patches-v3.tar.xz 84840 RMD160 07b04f0eb2e9529c02b962008971e1eb45fc3f2c SHA1 f1ae1a8cd601a8bfec02a1c5c70e29218b3d7b80 SHA256 4e39120b2b65b134a1ebf53525f78a576ce5a78e60a0b3494c2b5d3bd3cbd1b1
-DIST mips-sources-3.1.0-patches-v2.tar.xz 84852 RMD160 13a1ea15bfd60b061c4b68a86069845bfdf548e9 SHA1 6e0310a88a079e9a36b6e8d6b7f3e64da3ea5390 SHA256 fccc4ad9687f79fc04b75d5b943c14ce53280e2a5d40cb88ba07a84540f0d93b
-DIST mipsgit-2.6.29-20090324.diff.bz2 17991 RMD160 fc94317086c27111c2e43cd6c7ff7684e43160f9 SHA1 2f72a7057809d98eb15c08df1527a8147ed3b5eb SHA256 e5867f9e92a83734505d6865640af3e8dd117b448d371d1514cec94c182e4511
-DIST mipsgit-3.0.0-20110821.diff.xz 28224 RMD160 6f6b59bef1d2b15f3569a6a18445efeed762fc3d SHA1 43d02dd57acfa280c53703067b9b4656c08c097b SHA256 40b6c725451dd54532f5f13c8d531b23fd4d5ff729ed597ee71fd633bfabb3b2
-DIST mipsgit-3.1.0-20111216.diff.xz 22640 RMD160 688ab990eee8be863be392e00d6b2e057b7b1cc7 SHA1 7daca7fede0fcaa54549dfa39919050eac97300e SHA256 4fde4b69a5c758b333b560e60f4d0def6873bad20f550bc501637f754ac8625d
-DIST patch-2.6.29.1.bz2 14395 RMD160 78b2817db8a001750648ee4609a94de26829a4bc SHA1 de0c8efa7927fca5c95dce0e1a47e354527a6c52 SHA256 0c44a41816082602f9d2bd45524d85f6e5fa8e4a6a9a15861048ca2aaf068d8f
-DIST patch-3.0.9.bz2 284740 RMD160 bf495ce69ca11de235c4ee3fe0fedb48386b1f34 SHA1 5e85e1f1ec9c375896283f4b6e1bcfb476867745 SHA256 1f30e7e7ab556bd006e78515a62f7ec459c868ad61c24698af21a357081fa0c8
-DIST patch-3.1.6.bz2 163493 RMD160 0cd1eb8d162832d1bcc585330caafa3991173eb2 SHA1 c906930339d73538031cc7ffa9f7aa40232c7997 SHA256 33684faae341f1c48269caf17338c5dca35757d291761df580f2eed10bf8b47c
+DIST deblob-2.6.29 76155 SHA256 ce0805a2767a1139fd952232eae04814c8910d0629963c2dc1e83449bc6a4987 SHA512 1e0dced5ca74df620602cbef0076eaf677f9a715cac47fb37f6d2101339eaddcb4dc4f6b3d4449f7793a8679599b5a8ea80aa17036e22f05e25b33e06bb8714d WHIRLPOOL cee62a9bfd2a06b46c516dbce741bcdef8b807bf71fa44497399f0294ff87048230a8348bdebf6efec63d93357a3f275af78cc045c79fbc9b03d8d032d1acd69
+DIST deblob-check-2.6.29 247608 SHA256 da1aecdf3ab7f1207b90642d303e52262ccc2ed9e49739b729512b88950d17f3 SHA512 2ba5c7615164a96847afc40af9c9883dc39d8be633e8f07d0d4a6c16b1a22117faf68d5aa40c5aee843dc687a635e2195a4be3bfa40f87dc2b89554d869616b6 WHIRLPOOL ea5dcfd0ee58f1e9ff8dc16229401d37c0271fcae9d065ec648828088cd8d0b8eb8a80efc772d1ed0f075017485609ebf19c01156586728dd335af2dee2bbeff
+DIST linux-2.6.29.tar.bz2 56579370 SHA256 58a5ea16d499fe06f90fcbf1d687d1235d2cb9bc28bf979867bd3faadf38fc3f SHA512 2369207fd7fdb442b6d02576cfdd91809520dc981b1bf0445f5a4fbaa27daf6fc935f3a9aebab9a3ee2c0bb0a1d130ccbc0fec275cd2f2477fa3721a8f21ccab WHIRLPOOL 7cea1fb87fa26e4c6003a6b7cbdd4e8016c1139abd4baf31fdc1c799088b8271e2fbb1ba9be284d77ead534a983b4d23c20cd93ded2f177444bcceb0bf8dc990
+DIST linux-3.4.tar.bz2 80173484 SHA256 a797a15d0b6228381507c14ecf4eec4a6cc5c77cfd521ba3b3e1325e85b5b16d SHA512 597002fa82b70b5052f9e05c1d8547bc5f89d8e1aecfd1765f4033f6d2c5c02d51b6372dbeef12c2eb070ae318a04c39925050cb37a39399961c8b263479fca1 WHIRLPOOL 57e6dd7094db2bc41175d7bb551e8237ea96eacf3710a734e8413915c54304e84ca11455e41c7752882ce81048459555d44d1798bf0775b79c3d74b13aa3a9f2
+DIST linux-3.5.tar.bz2 80978443 SHA256 6ab82beb8cbb895b7523daed7ec3ec5850cf460b96788056f1ef5135c852fd23 SHA512 f6de5aaff351097dbe4b7186baea63004ef9efb73a85ccfd718c5856b282c22fb1431dce8588cb823eb75d1f09cd89f20e4936501e2c536f53ea4aa705e09ecc WHIRLPOOL 227c73e187370f2f5be34041c99ff2ff1bc99de4685d29801558a96d7d128c6f09c4a2ce81ce33cd87148c301e43319b42a8a77443e5db37f604fd97d101b7e7
+DIST linux-3.6.tar.bz2 82296001 SHA256 88ae0a20fd39ecae79db0ce8f9397922fae33c8b06a54ed2c883c861126c9771 SHA512 cbaefc2c4c8ab2251c3345b7b2c88d55a49e3468d8b177b05dd6d96a802efa9a052b1a1ecab8b71298bac97f45259516d88253838332b4fdb4307780ebcddce9 WHIRLPOOL e17e3800951f0c3af21015d1a1c99698d0ef70815bd4f131dd60b30baef70d4c255988857533a9a7c058388c2febfcf02d12cde2a7ed46b24fa85aeb260c0251
+DIST mips-sources-2.6.29-patches-v3.tar.bz2 74933 SHA256 d3c77c91b810824bcfbe25b96703e0b3a7f6200c71aa550c4abe9d296f5bbbff SHA512 dbe36b9d6739dcbf8864829c6b63bd08bdafc76d6d84438ca864d4bf2024dfd297addb857636bd7cec25e1d0ec2c9742e64436789a55668ffcd535f58ca6b88a WHIRLPOOL e1288928a8630452658452f0b4746475bf071ed4c3f9bc445ed0c3b14d70b665f86b297b9dd4ee45ee94649080cddb41daa004a6b611722aae6aed6619b76fa7
+DIST mips-sources-3.4.0-patches-v1.tar.xz 83924 SHA256 494c144127399ce77a8be1d4914e92e43c3f97276aa53a113518139bd0512f7f SHA512 8333bd8a5fa939f7160e6834b5e035f0273c452195f779961eff14ed9089c6fa2bcb33438111844792168172c353a6b77e1d651fa5515e574249783be01b6ac5 WHIRLPOOL 1764a0da629e835814cf938a745caa447e02018de1d4d92083c6d159f498856f14b89ed256a97ddf8ec10c0ba1e423d154d3ed855435955ad005cdfa220ab005
+DIST mips-sources-3.5.0-patches-v1.tar.xz 83984 SHA256 6df803f0c131862f6699db948188000063a4c1d128b684163b6ccdbf1e44343a SHA512 f17973d5d4f680b05c1a0604b5515937371d137bdeb63d0e76747a712336ec106a4fb25b48d8297d26c0f96d51ab94778b84066ce7413f78dc12de67f316d080 WHIRLPOOL 8308809a94c3d195a28aa5b2d896c9b7b1447bb0dc0421222de864eb9c999e9ae419d036e5f8b3cd4294c214691a4b042b69242a14ff867791939cddb60ba716
+DIST mips-sources-3.6.0-patches-v1.tar.xz 83968 SHA256 0815c686133a41b1c7f968c6e98083b7c21489a5825f38ba26ceb3b58e006524 SHA512 f0b48788b32e6a15c193057ea02ac50828bc03bd2d330a9085dd481de7dd35fd5101ab302453811e0e4855d3dc5f1ca989bae05dfe23bfea204c29de26b212a9 WHIRLPOOL 0fcf38ff0a3a7d2725b868c43069a44c917cc4704d7e9d162e8a159274246b331f637289a607e4ef6ed7be18eec54abcda46a2373942df0ed64c5cb964faedcc
+DIST mipsgit-2.6.29-20090324.diff.bz2 17991 SHA256 e5867f9e92a83734505d6865640af3e8dd117b448d371d1514cec94c182e4511 SHA512 299e3c3ca32071c279a838209fc2fc8632d5bb92f3a034905f645c36565afb64c0dead0f3a6ab15c195e4058e997bc106320051af2fc15e774eee80306db953f WHIRLPOOL 3bd9fb3bd1adbaabbf3a806cbddb3768e4777253d9e454092597451cb8a1bb3e34a6a8493e872e1c4b11f516861fd4672d45f9b704538b876b5f746f95025b7d
+DIST mipsgit-3.4.0-20120623.diff.xz 20692 SHA256 20ebd20240bc5d8dd55b653e3bf0f4eb9b0f40b2108ff69d762d3bd520c6d1da SHA512 206823470f1773860731b8fce1b36db4751c44508325f39daab9e527703ac858c469a5084d74b68bdaf69837dc2f703444f266f980561439094434628a0f2d1c WHIRLPOOL e6f66f6077896c2d49cf4ae06aeec2cd5036bb93d462735bc100a86a9893f167b978a283255e85cff7ab0abdc9fd74a7a8c5cacaeb25a003fcac0286bdfe412e
+DIST mipsgit-3.5.0-20120908.diff.xz 29128 SHA256 5bfc51bd200c620b6896dbcfb868b6798d74ccfcd349da377b83440cb10ddf6d SHA512 3d6de90f99961329b6a36c3a45b9880b6ede878edb1f712e4c9ba5d1605ed6fd1b918ce9f6b86c3bf7641571175ad6385ffea82446ef79a181cb164bca59d126 WHIRLPOOL 6434e1656cb15293fa999d449b397f4d12c74db0a33500ae48d7313075725e9d271009d7650351e7d2781f5a82b9c5e7ee51a6cdafa2a227a2610b6f0772a7f3
+DIST mipsgit-3.6.0-20121008.diff.xz 21940 SHA256 324381c18252901238fd9281371059433f632318ebdbd475e124c31c6dde7147 SHA512 03f84dd1eb961022a8ea2f4d1dc82ac4af7cbeb1337496afe09dbaa383a65be39566dce120bfabb3c757fc847799b2d8db725f7ed153518a556d30391924cbd9 WHIRLPOOL 3a50451d439e97cfa2c3d2f963ab5302b59b87d32d2f5c5e89dba139056266664c7ee46814876a6653ea80d67f738721194d3dc43f20727c97f868ea63c4b843
+DIST patch-2.6.29.1.bz2 14395 SHA256 0c44a41816082602f9d2bd45524d85f6e5fa8e4a6a9a15861048ca2aaf068d8f SHA512 110a1cbf969cd1b007073f33f5f27a8868a583764097a8cb4fd3d87301cd738f5dde6a253b20d582bc6db7278d55ef055265943c49e13c07354ba172643b21d1 WHIRLPOOL 224fe59e88c824c839feda6ac103055b4d746c76bef36a049c9f2223d47270a209d2ce793c19530c03242efdbee07963433417e4676c8265eeaaac48ca163312
+DIST patch-3.4.14.bz2 333485 SHA256 f5724a13e6c8b6adc214ab49b2dd2bacc561f235843241689e2cd6699f021bf3 SHA512 5120d03139e117c64e45ac3e33fc884f7a64dc6adee404fded254e49172b0deabfd276ded2d13dd8da21763fee1e4b306d2e7f6bf9dc36b283a099571922b9e7 WHIRLPOOL bb800174178489ab6df0c02029a806986afbb5bf08669956e37e4c35f451780a4a3e2a36169955c5a5f1bd1f750e91280cebeb76fe750c11670af7dbb11e553f
+DIST patch-3.5.7.bz2 241834 SHA256 c064888f2c815353b2ca483935a9e79572e2d033559b73971f7f32c8eaa4b66f SHA512 024bfbd23905805bf6ce8326b9e69b2d9cd539038cc8c00f3145b8a482caa6eec3993771c69800784ebab0d9c3d43910a9bd5e561012c67df44f663cfd61afc0 WHIRLPOOL 98239024aa4a702aa80fd53b2efb8614ab64eb23c2b35aeb75bc858ca3df4c05f986dd517f455c8fa04ce05079bd03ac1bc974b873e12f431fa773d7766f7015
+DIST patch-3.6.2.bz2 57709 SHA256 0a6e45dda40e3369d3c14d473651690f0c062f3acdcd69acd73b7b219b523b35 SHA512 54c7a4079656aad75596174829f8ec11eb9464473f6877c85828431bde0104874319ad76a7ac8d787a44e083a1afaec489833f03b23d0d7da1c451da54285db8 WHIRLPOOL 29330a88db84e47e9677a54b61d9e62367b4c2fcdcc047878efabd8fd29ea2487cda5c761f8c67221437b7c5adc35efdc3fcff9ece809997dd9b7e3548709805
diff --git a/sys-kernel/mips-sources/mips-sources-3.0.9-r1.ebuild b/sys-kernel/mips-sources/mips-sources-3.4.14.ebuild
similarity index 96%
rename from sys-kernel/mips-sources/mips-sources-3.0.9-r1.ebuild
rename to sys-kernel/mips-sources/mips-sources-3.4.14.ebuild
index 3aa953dd9591..71da4cb0f512 100644
--- a/sys-kernel/mips-sources/mips-sources-3.0.9-r1.ebuild
+++ b/sys-kernel/mips-sources/mips-sources-3.4.14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-3.0.9-r1.ebuild,v 1.2 2012/04/13 19:46:42 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-3.4.14.ebuild,v 1.1 2012/10/21 00:13:49 kumba Exp $
 
 # EAPI Version
 EAPI=4
@@ -18,8 +18,8 @@ EAPI=4
 
 # Version Data
 OKV=${PV/_/-}
-GITDATE="20110821"			# Date of diff between kernel.org and lmo GIT
-GENPATCHREV="3"				# Tarball revision for patches
+GITDATE="20120623"			# Date of diff between kernel.org and lmo GIT
+GENPATCHREV="1"				# Tarball revision for patches
 
 # Directories
 S="${WORKDIR}/linux-${OKV}-${GITDATE}"
diff --git a/sys-kernel/mips-sources/mips-sources-3.1.6.ebuild b/sys-kernel/mips-sources/mips-sources-3.5.7.ebuild
similarity index 96%
rename from sys-kernel/mips-sources/mips-sources-3.1.6.ebuild
rename to sys-kernel/mips-sources/mips-sources-3.5.7.ebuild
index 3507a5ffbb1f..a6ff3e103373 100644
--- a/sys-kernel/mips-sources/mips-sources-3.1.6.ebuild
+++ b/sys-kernel/mips-sources/mips-sources-3.5.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-3.1.6.ebuild,v 1.2 2012/04/13 19:46:42 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-3.5.7.ebuild,v 1.1 2012/10/21 00:13:49 kumba Exp $
 
 # EAPI Version
 EAPI=4
@@ -18,8 +18,8 @@ EAPI=4
 
 # Version Data
 OKV=${PV/_/-}
-GITDATE="20111216"			# Date of diff between kernel.org and lmo GIT
-GENPATCHREV="2"				# Tarball revision for patches
+GITDATE="20120908"			# Date of diff between kernel.org and lmo GIT
+GENPATCHREV="1"				# Tarball revision for patches
 
 # Directories
 S="${WORKDIR}/linux-${OKV}-${GITDATE}"
diff --git a/sys-kernel/mips-sources/mips-sources-3.6.2.ebuild b/sys-kernel/mips-sources/mips-sources-3.6.2.ebuild
new file mode 100644
index 000000000000..1e01bcf9054c
--- /dev/null
+++ b/sys-kernel/mips-sources/mips-sources-3.6.2.ebuild
@@ -0,0 +1,177 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-3.6.2.ebuild,v 1.1 2012/10/21 00:13:49 kumba Exp $
+
+# EAPI Version
+EAPI=4
+
+# INCLUDED:
+# 1) linux sources from kernel.org
+# 2) linux-mips.org GIT snapshot diff
+# 3) Generic Fixes
+# 4) Patch for the IOC3 Metadriver (IP27, IP30)
+# 5) Patch for IP30 Support
+# 6) Patch for IP28 Graphics Support (SolidImpact)
+# 7) Experimental patches (if needed)
+
+#//------------------------------------------------------------------------------
+
+# Version Data
+OKV=${PV/_/-}
+GITDATE="20121008"			# Date of diff between kernel.org and lmo GIT
+GENPATCHREV="1"				# Tarball revision for patches
+
+# Directories
+S="${WORKDIR}/linux-${OKV}-${GITDATE}"
+MIPS_PATCHES="${WORKDIR}/mips-patches"
+
+# Kernel-2 Vars
+K_SECURITY_UNSUPPORTED="1"
+K_NOUSENAME="0"
+K_NOUSEPR="0"
+K_USEPV="0"
+ETYPE="sources"
+
+# Inherit Eclasses
+inherit kernel-2 eutils
+detect_version
+
+# Version Data
+F_KV="${PVR}"
+BASE_KV="$(get_version_component_range 1-2).0"
+[[ "${EXTRAVERSION}" = -rc* ]] && KVE="${EXTRAVERSION}"
+
+# Portage Vars
+HOMEPAGE="http://www.linux-mips.org/ http://www.gentoo.org/"
+SLOT="${OKV}"
+KEYWORDS="-* ~mips"
+IUSE="cobalt ip27 ip28 ip30 ip32r10k impactdebug odysseydebug"
+DEPEND=">=sys-devel/gcc-4.1.1"
+RDEPEND=""
+
+# Machine Support Control Variables
+DO_IP22="yes"				# If "yes", enable IP22 support		(SGI Indy, Indigo2 R4x00)
+DO_IP27="test"				# 		   IP27 support		(SGI Origin)
+DO_IP28="yes"				# 		   IP28 support		(SGI Indigo2 Impact R10000)
+DO_IP30="test"				# 		   IP30 support		(SGI Octane)
+DO_IP32="yes"				# 		   IP32 support		(SGI O2, R5000/RM5200 Only)
+DO_CBLT="yes"				# 		   Cobalt Support	(Cobalt Microsystems)
+
+# Machine Stable Version Variables
+SV_IP22=""				# If set && DO_IP22 == "no", indicates last "good" IP22 version
+SV_IP27=""				# 	    DO_IP27 == "no", 			   IP27
+SV_IP28=""				# 	    DO_IP28 == "no", 			   IP28
+SV_IP30=""				# 	    DO_IP30 == "no", 			   IP30
+SV_IP32=""				# 	    DO_IP32 == "no", 			   IP32
+SV_CBLT=""				# 	    DO_CBLT == "no", 			   Cobalt
+
+DESCRIPTION="Linux-Mips GIT sources for MIPS-based machines, dated ${GITDATE}"
+SRC_URI="${KERNEL_URI}
+	 mirror://gentoo/mipsgit-${BASE_KV}${KVE}-${GITDATE}.diff.xz
+	 mirror://gentoo/${PN}-${BASE_KV}-patches-v${GENPATCHREV}.tar.xz"
+
+UNIPATCH_STRICTORDER="1"
+UNIPATCH_LIST="${DISTDIR}/mipsgit-${BASE_KV}${KVE}-${GITDATE}.diff.xz"
+
+#//------------------------------------------------------------------------------
+
+# Eblit Handling Functions
+#
+# They'll likely be superseded someday by better ideas, possibly elibs.
+
+# eblit-core
+# Usage: <function> [version]
+# Main eblit engine
+eblit-core() {
+	local e v func=$1 ver=$2
+	for v in ${ver:+-}${ver} -${PVR} -${PV} "" ; do
+		e="${FILESDIR}/eblits/${func}${v}.eblit"
+		if [[ -e ${e} ]] ; then
+			. "${e}"
+			[[ ${func} == pkg_* ]] && eval "${func}() { eblit-run ${func} ${ver} ; }"
+			return 0
+		fi
+	done
+	return 1
+}
+
+# eblit-include
+# Usage: [--skip] <function> [version]
+# Includes an "eblit" -- a chunk of common code among ebuilds in a given
+# package so that its functions can be sourced and utilized within the
+# ebuild.
+eblit-include() {
+	local skipable=false r=0
+	[[ $1 == "--skip" ]] && skipable=true && shift
+	[[ $1 == pkg_* ]] && skipable=true
+
+	[[ -z $1 ]] && die "Usage: eblit-include <function> [version]"
+	eblit-core $1 $2
+	r="$?"
+	${skipable} && return 0
+	[[ "$r" -gt "0" ]] && die "Could not locate requested eblit '$1' in ${FILESDIR}/eblits/"
+}
+
+# eblit-run-maybe
+# Usage: <function>
+# Runs a function if it is defined in an eblit
+eblit-run-maybe() {
+	[[ $(type -t "$@") == "function" ]] && "$@"
+}
+
+# eblit-run
+# Usage: <function> [version]
+# Runs a function defined in an eblit
+eblit-run() {
+	eblit-include --skip common "${*:2}"
+	eblit-include "$@"
+	eblit-run-maybe eblit-$1-pre
+	eblit-${PN}-$1
+	eblit-run-maybe eblit-$1-post
+}
+
+# eblit-pkg
+# Usage: <phase> [version]
+# Runs the pkg_* functions AND evals them so they're included in the binpkgs
+eblit-pkg() {
+	[[ -z $1 ]] && die "Usage: eblit-pkg <phase> [version]"
+	eblit-core pkg_$1 $2
+}
+
+#//------------------------------------------------------------------------------
+
+load_eblit_funcs() {
+	# This is a sanity check to avoid QA issues.  It prevents
+	# eblits from being referenced during metadata operations.
+	[ -n "${MIPS_SOURCES_EBLITS_LOADED}" ] && return
+
+	# All are in ${FILESDIR}/eblits
+	# If a message for a given machine needs to change,
+	# then we create a new eblit and increment the
+	# version and reference it here.
+	eblit-include err_disabled_mach v1
+	eblit-include err_only_one_mach_allowed v1
+	eblit-include show_ip22_info v3
+	eblit-include show_ip27_info v1
+	eblit-include show_ip28_info v1
+	eblit-include show_ip30_info v2
+	eblit-include show_ip32_info v3
+	eblit-include show_cobalt_info v1
+
+	# This makes sure pkg_setup & pkg_postinst gets into any binpkg.
+	# Neccessary because we can't guarantee FILESDIR is around for binpkgs.
+	eblit-pkg setup v1
+	eblit-pkg postinst v1
+
+	# Eblit load complete
+	MIPS_SOURCES_EBLITS_LOADED=1
+}
+
+pkg_setup() {
+	load_eblit_funcs
+	pkg_setup
+}
+
+src_unpack() { eblit-run src_unpack v3 ; }
+
+#//------------------------------------------------------------------------------
diff --git a/sys-kernel/mkinitcpio/Manifest b/sys-kernel/mkinitcpio/Manifest
index d13fd5fbc7f8..0e3cc978862b 100644
--- a/sys-kernel/mkinitcpio/Manifest
+++ b/sys-kernel/mkinitcpio/Manifest
@@ -1,2 +1,2 @@
-DIST mkinitcpio-0.9.2.tar.gz 38462 RMD160 6281f23efaa41110e06988e786a0de0c6c747b19 SHA1 08444c30a43769913fead9fdc873836d2b581841 SHA256 1c388ab1df4ecdf6204602c66220a79adc2c564956fdf68deb7dde9bab331c28
-DIST mkinitcpio-modules-0_p20120704.tar.bz2 4815 RMD160 8c0cf233c526982d4e25c2b2a64c4ab4b1f25344 SHA1 67dee8387d22dc3ceb24f09a1e9c4d6a5dc2af64 SHA256 3cf6c59de41c8c6ad2d8579c67c0c39c8364549083e8967b37f6003382e463f9
+DIST mkinitcpio-0.9.2.tar.gz 38462 SHA256 1c388ab1df4ecdf6204602c66220a79adc2c564956fdf68deb7dde9bab331c28
+DIST mkinitcpio-modules-0_p20120704.tar.bz2 4815 SHA256 3cf6c59de41c8c6ad2d8579c67c0c39c8364549083e8967b37f6003382e463f9
diff --git a/sys-kernel/mkinitcpio/metadata.xml b/sys-kernel/mkinitcpio/metadata.xml
index 193fbcfdcdbc..69103e042bf4 100644
--- a/sys-kernel/mkinitcpio/metadata.xml
+++ b/sys-kernel/mkinitcpio/metadata.xml
@@ -10,7 +10,6 @@
 	<flag name="device-mapper">Add device-mapper support</flag>
 	<flag name="dmraid">Add dmraid support</flag>
 	<flag name="mdadm">Add mdadm support</flag>
-	<flag name="plymouth">Add plymouth support</flag>
 </use>
 </pkgmetadata>
 
diff --git a/sys-kernel/mkinitcpio/mkinitcpio-0.9.2-r1.ebuild b/sys-kernel/mkinitcpio/mkinitcpio-0.9.2-r1.ebuild
index 7f65d04c94d8..e30301fea8e7 100644
--- a/sys-kernel/mkinitcpio/mkinitcpio-0.9.2-r1.ebuild
+++ b/sys-kernel/mkinitcpio/mkinitcpio-0.9.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mkinitcpio/mkinitcpio-0.9.2-r1.ebuild,v 1.2 2012/07/04 18:17:37 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mkinitcpio/mkinitcpio-0.9.2-r1.ebuild,v 1.3 2012/10/21 13:34:20 ssuominen Exp $
 
 EAPI=4
 
@@ -29,7 +29,7 @@ RDEPEND="app-arch/cpio
 	sys-apps/grep
 	>=sys-apps/kmod-7
 	>=sys-apps/util-linux-2.21
-	udev? ( >sys-fs/udev-171-r6 )
+	udev? ( >sys-fs/udev-171-r8 )
 	device-mapper? ( sys-fs/lvm2[static] )
 	cryptsetup? ( sys-fs/cryptsetup[static] )
 	mdadm? ( sys-fs/mdadm[static] )
diff --git a/sys-kernel/tuxonice-sources/Manifest b/sys-kernel/tuxonice-sources/Manifest
index 3d66ea8a9b18..2259d0f40d5c 100644
--- a/sys-kernel/tuxonice-sources/Manifest
+++ b/sys-kernel/tuxonice-sources/Manifest
@@ -1,14 +1,10 @@
 DIST 20120721-TuxOnIce-for-Linux-3.3.patch.bz2 132323 SHA256 1fc44400563591fccf060d9c6e1c69b557fb3f7f79f44c21e06a3cf2d64424b4 SHA512 1cbbaa773d3d0c4340d0aadadb47d96e59f5a28d354d30bb46b8fa5a160baf8ffa0e2b58f3c130bf6fe37ba4d04ed35aa07032f52e467e872df0d5a8dbabe420 WHIRLPOOL cd61da15dbf804e9dddcb651ef7baff2e7cb640ca4796308889b3d12b55c13388c5efe55f5d34284b1890cf0987bd8908805d049925127deb019c9c44fb28d5d
 DIST 20120721-TuxOnIce-for-Linux-3.4.patch.bz2 131502 SHA256 2055e27d00352feba4dd2816e274ef143952bfba25686c4086f5216942716fa5 SHA512 559d7fb1d78a48a54ae4f6d2197416416010f85f6ac78e6b6787175a20b251f783ee58e72079992812d4c7d83e4c8247d89042d246effd3017d49d08e9dca5e3 WHIRLPOOL 2df5606993e1b37376603b7cc9113556de946798f2c03dd7f491a70e627f4e5cd62d2b761a81b3e42a77504fd26c3a0ba09158d0a177dbbaa6fa31f70abee3a2
 DIST current-tuxonice-for-3.0_20111012.patch.bz2 130490 SHA256 80fcb7f5ea77f8f9b80f69217f8c2016252a89442c9718c0fbd71d1b716791c6 SHA512 4d00ace659c01e72f70c4e758f431e0f0707ee5b19352d207e428b4471de110594320700be4025955a29a01c6e32934b21797fa58205d211b372f6ff500b46b4 WHIRLPOOL d1d1ea98e96d82d0ef72b8e25e9f17c144ccbedc64b2bc3412c531a4668c82c0610f97b7964af4d510eb4591911d0f18d9d16a20e827f8d19bf6a1669cc67e70
-DIST genpatches-3.0-18.base.tar.bz2 418620 SHA256 f530f6caae05a06ae04817e4ce3e696154571f219446e20d404addc9208cce79 SHA512 98d1199353c7c5d1b035715f683489f4b3fad7b5b4bac5779bf867ee81f52abd82387251bc5945f1c841728bef5887bdc3f4c684c06d96f4dd482e4ed57ac86b WHIRLPOOL fd8e7a869d03d69ffaa7483ae53a3fc1d0a83cc659048c609c347035dd440395909a8318b1e8741056185dc8e3199f70a71b7d943fcf9b0fd008399ea58d29a2
-DIST genpatches-3.0-18.extras.tar.bz2 17193 SHA256 86c7a9d4ee419f21b63bfa23b52feb9c4b547a1b29498a752620336776aaff91 SHA512 881140d7c2f8a405a6dc99f99e7ca406877410e7fd19ecf04bc8776d9d594688f6f23a9fc473284c6ae78e44d0c825ef39e705eab70c2f3ec7b6b40feba4bd1a WHIRLPOOL f72f0bd1694369f1fa0a1d74a17447421cbcd9f499f658eb500b5a2405824ef4a36748a83d4164d34c5c9eaca85eb1f526f8604e31ceae1e7b32d305e21bd237
 DIST genpatches-3.0-26.base.tar.bz2 687952 SHA256 56974f956d582714b06bdc51f183ee6bae47a352c0c6ae0dd47de0b1f61f3764 SHA512 c858e961ea1cb74f50643e19ecb3602c8653b405e6dc8343b8298c2f308527821c3e00ca6093f15dd7e951f2e3ed7675183fd303abc8da2d346931cc0e233b9e WHIRLPOOL 0a5f45d0abd7725ee28c4908b81cc701f76463757ded81e5d46a5e38b31defa704582d8eaedf31632066aaac34e10b46a24b1b08ecb7ef89df71a441e8d59678
 DIST genpatches-3.0-26.extras.tar.bz2 17200 SHA256 259f669c55dfe9b9420b0e2875af0c404f333961b19e5cdd40d8df5f07fc698b SHA512 db922a9c5dfde235990a168ea97ad66f9c381f0502aa301023b71598c23ac0ac4a3dba97ab6b2637eac270da4cfdf5df31e111cf98a22edf1be130303f32fb9b WHIRLPOOL 987ac2a17d34cfd6c1020b461630fdd21a7ff075447229cfd8b8f7d6c54e8d3583d30a7cde60209c09ee6f1931806e85d3e6eb7a43c5bda067bcc9de1fe820cf
-DIST genpatches-3.0-28.base.tar.bz2 732299 SHA256 557c18ed5f0542135b15ccb8574eb11779402d42a47dee4f3e17a01a4506385b SHA512 161ab65b8f5d073e09183fff8d365b253ab3163973350811cba825481516b0584af05672b97fa05f7031c8d48bd442a1984e7b9292d2b709217936f850195eda WHIRLPOOL 812fb09392a0df6b30b45470d1183b58ff717963ff81df425668f6d89d2460e34411c7ce2694754a7ae2aa37ddbd86be8981b885048a769c94bbd022cce29f2d
-DIST genpatches-3.0-28.extras.tar.bz2 17193 SHA256 86c7a9d4ee419f21b63bfa23b52feb9c4b547a1b29498a752620336776aaff91 SHA512 881140d7c2f8a405a6dc99f99e7ca406877410e7fd19ecf04bc8776d9d594688f6f23a9fc473284c6ae78e44d0c825ef39e705eab70c2f3ec7b6b40feba4bd1a WHIRLPOOL f72f0bd1694369f1fa0a1d74a17447421cbcd9f499f658eb500b5a2405824ef4a36748a83d4164d34c5c9eaca85eb1f526f8604e31ceae1e7b32d305e21bd237
-DIST genpatches-3.0-30.base.tar.bz2 774711 SHA256 415c3128abd99e8286de7ba89ba2a855bdfde67676ebf993d42380478013ceaa SHA512 0cfcb1d66f423d7ebfed97de9f9c2fbe85dd82352ae0d91e510eba482dc9cf31b011d980d389cc2d8da4f488ac3df002ead83669179917dc24508e6c39aa8c43 WHIRLPOOL 3912df2ece529b26ddfb882cda6b6ec3c1fa53a7a2736d6fcb627b917715b0b44d33125a11b82c7570bc4347c6d11b0e31c8915caea9ff616f9fd49d4351ca84
-DIST genpatches-3.0-30.extras.tar.bz2 17200 SHA256 259f669c55dfe9b9420b0e2875af0c404f333961b19e5cdd40d8df5f07fc698b SHA512 db922a9c5dfde235990a168ea97ad66f9c381f0502aa301023b71598c23ac0ac4a3dba97ab6b2637eac270da4cfdf5df31e111cf98a22edf1be130303f32fb9b WHIRLPOOL 987ac2a17d34cfd6c1020b461630fdd21a7ff075447229cfd8b8f7d6c54e8d3583d30a7cde60209c09ee6f1931806e85d3e6eb7a43c5bda067bcc9de1fe820cf
+DIST genpatches-3.0-32.base.tar.bz2 836271 SHA256 70359ed69d98c3a88e231a071cc84cc631614702b6bd1edc89a3cafb863f5a72 SHA512 cb93e14960b94c41bccd6e61aac558ae5f46bf37c13740d7a006d74075f4844fe8e3408c4353cfe951717224ac4761b57f8b5964a312845556490336373698cd WHIRLPOOL 2c98ae9d97d6673f52799b54ad878f7675d19d2c0aa9b71c564175ab0fb375109abdafb10155a2cc14b4fe0d120a6e1536bd0a242ea2343a33568c56350455ae
+DIST genpatches-3.0-32.extras.tar.bz2 17200 SHA256 259f669c55dfe9b9420b0e2875af0c404f333961b19e5cdd40d8df5f07fc698b SHA512 db922a9c5dfde235990a168ea97ad66f9c381f0502aa301023b71598c23ac0ac4a3dba97ab6b2637eac270da4cfdf5df31e111cf98a22edf1be130303f32fb9b WHIRLPOOL 987ac2a17d34cfd6c1020b461630fdd21a7ff075447229cfd8b8f7d6c54e8d3583d30a7cde60209c09ee6f1931806e85d3e6eb7a43c5bda067bcc9de1fe820cf
 DIST genpatches-3.3-10.base.tar.bz2 220562 SHA256 b368ce182ed188b0f144fe05444e44af58e8ea268546ac7bb5f6dfff1dad98d9 SHA512 92a1e20ef3447e61056aedf5b2fab7d54fb6797f88b62dc828d06547da47dfccedb4a1b88987cbb4af4da12769a0f3a079a9e9f3f403d5915113bc3d4c0e2307 WHIRLPOOL 73974650ec892d34d580a24026a75a7d1a3a3858893c23253af0b9508df228d260dc0c22090562c0314329bf9b586f8a60f1850b01c2daeaae1f2d758d70d7b2
 DIST genpatches-3.3-10.extras.tar.bz2 17205 SHA256 9356a196eb8aa74110165bc9d04674785693393c34f4a088d60bb0091ceb1bdc SHA512 f3a3be26e3b262773ab214ff251eacd2c21ab6434c75a81b0ae2c725016aba234b858f40a4634a9a28c33868c15b544b5ddf8bf73153ffed79c382793f86d21a WHIRLPOOL af9f4c751c4be08d79fdd56f94153973f40d5e2c110e653c007af7763e384f4fa8d93f4ae1ed4d9324b116cc7b690d182e9e978161270294aa61d8cecf60fa9f
 DIST genpatches-3.4-11.base.tar.bz2 231160 SHA256 9c3d2063f2331de30841b24c3b8e1203a7f586efbe5b006f49987ffbc25203de SHA512 e220f91f47ebdf52a381f0b2cb057a7888409ca40761a55474784631a340ac0610029bef0de6afb63bc6acf8b8f6f674dd3bee49b9a01f78627b7bfbc0dd14c3 WHIRLPOOL 27db32a86905f32281a9b9faf2f2d48ac7272b5506ecaa0b829ecdfc39217cac08ae33961f696cc795ef1b47ec23ee2f69cdcbb569be1ee2947bbc8c90147e91
diff --git a/sys-kernel/tuxonice-sources/tuxonice-sources-3.0.17-r1.ebuild b/sys-kernel/tuxonice-sources/tuxonice-sources-3.0.17-r1.ebuild
deleted file mode 100644
index ef2ee5226bbd..000000000000
--- a/sys-kernel/tuxonice-sources/tuxonice-sources-3.0.17-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/tuxonice-sources/tuxonice-sources-3.0.17-r1.ebuild,v 1.3 2012/04/16 08:12:41 phajdan.jr Exp $
-
-EAPI="4"
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras"
-K_GENPATCHES_VER="18"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-DESCRIPTION="TuxOnIce + Gentoo patchset sources"
-HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches/ http://www.tuxonice.net"
-IUSE=""
-
-TUXONICE_SNAPSHOT="20111012"
-TUXONICE_VERSION=""
-TUXONICE_TARGET="3.0"
-
-# Because "current" patches can change without notifying, we need to supply them
-if [[ -n "${TUXONICE_SNAPSHOT}" ]]; then
-	TUXONICE_SRC="http://dev.gentoo.org/~pacho/tuxonice/current-tuxonice-for-${TUXONICE_TARGET}_${TUXONICE_SNAPSHOT}.patch"
-	UNIPATCH_LIST="${DISTDIR}/current-tuxonice-for-${TUXONICE_TARGET}_${TUXONICE_SNAPSHOT}.patch.bz2"
-else
-	TUXONICE_SRC="http://www.tuxonice.net/files/tuxonice-${TUXONICE_VERSION}-for-${TUXONICE_TARGET}.patch"
-	UNIPATCH_LIST="${DISTDIR}/tuxonice-${TUXONICE_VERSION}-for-${TUXONICE_TARGET}.patch.bz2"
-fi
-
-TUXONICE_URI="${TUXONICE_SRC}.bz2"
-
-UNIPATCH_STRICTORDER="yes"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${TUXONICE_URI}"
-
-KEYWORDS="amd64 x86"
-
-RDEPEND="${RDEPEND}
-	>=sys-apps/tuxonice-userui-1.0
-	|| ( >=sys-power/hibernate-script-2.0 sys-power/pm-utils )"
-
-K_EXTRAELOG="If there are issues with this kernel, please direct any
-queries to the tuxonice-users mailing list:
-http://lists.tuxonice.net/mailman/listinfo/tuxonice-users/"
-K_SECURITY_UNSUPPORTED="1"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
diff --git a/sys-kernel/tuxonice-sources/tuxonice-sources-3.0.43.ebuild b/sys-kernel/tuxonice-sources/tuxonice-sources-3.0.43.ebuild
deleted file mode 100644
index 9774cae88209..000000000000
--- a/sys-kernel/tuxonice-sources/tuxonice-sources-3.0.43.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/tuxonice-sources/tuxonice-sources-3.0.43.ebuild,v 1.1 2012/09/22 09:46:07 pacho Exp $
-
-EAPI="4"
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras"
-K_GENPATCHES_VER="30"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-DESCRIPTION="TuxOnIce + Gentoo patchset sources"
-HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches/ http://www.tuxonice.net"
-IUSE=""
-
-TUXONICE_SNAPSHOT="20111012"
-TUXONICE_VERSION=""
-TUXONICE_TARGET="3.0"
-
-# Because "current" patches can change without notifying, we need to supply them
-TUXONICE_SRC="http://dev.gentoo.org/~pacho/tuxonice/current-tuxonice-for-${TUXONICE_TARGET}_${TUXONICE_SNAPSHOT}.patch"
-UNIPATCH_LIST="${DISTDIR}/current-tuxonice-for-${TUXONICE_TARGET}_${TUXONICE_SNAPSHOT}.patch.bz2"
-TUXONICE_URI="${TUXONICE_SRC}.bz2"
-
-UNIPATCH_STRICTORDER="yes"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${TUXONICE_URI}"
-
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="${RDEPEND}
-	>=sys-apps/tuxonice-userui-1.0
-	|| ( >=sys-power/hibernate-script-2.0 sys-power/pm-utils )"
-
-K_EXTRAELOG="If there are issues with this kernel, please direct any
-queries to the tuxonice-users mailing list:
-http://lists.tuxonice.net/mailman/listinfo/tuxonice-users/"
-K_SECURITY_UNSUPPORTED="1"
diff --git a/sys-kernel/tuxonice-sources/tuxonice-sources-3.0.39.ebuild b/sys-kernel/tuxonice-sources/tuxonice-sources-3.0.46.ebuild
similarity index 93%
rename from sys-kernel/tuxonice-sources/tuxonice-sources-3.0.39.ebuild
rename to sys-kernel/tuxonice-sources/tuxonice-sources-3.0.46.ebuild
index 429293a08200..fdcc2de96a7b 100644
--- a/sys-kernel/tuxonice-sources/tuxonice-sources-3.0.39.ebuild
+++ b/sys-kernel/tuxonice-sources/tuxonice-sources-3.0.46.ebuild
@@ -1,12 +1,11 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/tuxonice-sources/tuxonice-sources-3.0.39.ebuild,v 1.1 2012/09/15 10:13:17 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/tuxonice-sources/tuxonice-sources-3.0.46.ebuild,v 1.1 2012/10/21 09:58:57 pacho Exp $
 
 EAPI="4"
-
 ETYPE="sources"
 K_WANT_GENPATCHES="base extras"
-K_GENPATCHES_VER="28"
+K_GENPATCHES_VER="32"
 
 inherit kernel-2
 detect_version
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-3.5.7.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-3.5.7.ebuild
index eb39bdaaddc8..1862b837c7e9 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-3.5.7.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-3.5.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/vanilla-sources/vanilla-sources-3.5.7.ebuild,v 1.1 2012/10/13 14:35:43 mpagano Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/vanilla-sources/vanilla-sources-3.5.7.ebuild,v 1.2 2012/10/20 18:40:46 ago Exp $
 
 EAPI="2"
 K_NOUSENAME="yes"
@@ -15,5 +15,5 @@ DESCRIPTION="Full sources for the Linux kernel"
 HOMEPAGE="http://www.kernel.org"
 SRC_URI="${KERNEL_URI}"
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="deblob"
diff --git a/sys-libs/db/db-4.8.30.ebuild b/sys-libs/db/db-4.8.30.ebuild
index 203f89947ac9..ccc20d7a455b 100644
--- a/sys-libs/db/db-4.8.30.ebuild
+++ b/sys-libs/db/db-4.8.30.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.8.30.ebuild,v 1.9 2012/05/29 08:18:33 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.8.30.ebuild,v 1.10 2012/10/21 00:03:09 blueness Exp $
 
 inherit eutils db flag-o-matic java-pkg-opt-2 autotools multilib
 
@@ -26,7 +26,7 @@ done
 
 LICENSE="OracleDB"
 SLOT="4.8"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE="doc java cxx tcl test"
 
 # the entire testsuite needs the TCL functionality
diff --git a/sys-libs/glibc/glibc-2.15-r3.ebuild b/sys-libs/glibc/glibc-2.15-r3.ebuild
index c16d7b2406ea..e18cd95cb4b7 100644
--- a/sys-libs/glibc/glibc-2.15-r3.ebuild
+++ b/sys-libs/glibc/glibc-2.15-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.15-r3.ebuild,v 1.4 2012/10/18 19:43:10 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.15-r3.ebuild,v 1.5 2012/10/20 21:50:26 blueness Exp $
 
 inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib unpacker multiprocessing
 
@@ -8,7 +8,7 @@ DESCRIPTION="GNU libc6 (also called glibc2) C library"
 HOMEPAGE="http://www.gnu.org/software/libc/libc.html"
 
 LICENSE="LGPL-2"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86"
 RESTRICT="strip" # strip ourself #46186
 EMULTILIB_PKG="true"
 
diff --git a/sys-libs/libsmbios/libsmbios-2.2.28.ebuild b/sys-libs/libsmbios/libsmbios-2.2.28.ebuild
index f0cbd4068b96..dc693e917d38 100644
--- a/sys-libs/libsmbios/libsmbios-2.2.28.ebuild
+++ b/sys-libs/libsmbios/libsmbios-2.2.28.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libsmbios/libsmbios-2.2.28.ebuild,v 1.9 2012/07/10 20:02:31 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libsmbios/libsmbios-2.2.28.ebuild,v 1.10 2012/10/20 18:54:56 armin76 Exp $
 
 EAPI=2
 PYTHON_DEPEND="python? *:2.5"
@@ -13,7 +13,7 @@ SRC_URI="http://linux.dell.com/libsmbios/download/libsmbios/${P}/${P}.tar.bz2"
 
 LICENSE="GPL-2 OSL-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~ia64 x86"
+KEYWORDS="amd64 ia64 x86"
 IUSE="doc graphviz nls python static-libs test"
 
 RDEPEND="dev-libs/libxml2
diff --git a/virtual/gsasl/gsasl-2.ebuild b/virtual/gsasl/gsasl-2.ebuild
index b3298d9d419a..b379ab443661 100644
--- a/virtual/gsasl/gsasl-2.ebuild
+++ b/virtual/gsasl/gsasl-2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/gsasl/gsasl-2.ebuild,v 1.3 2012/05/27 17:43:25 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/gsasl/gsasl-2.ebuild,v 1.4 2012/10/20 17:47:35 jer Exp $
 
 EAPI="2"
 
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 IUSE=""
 
 DEPEND="|| ( net-libs/libgsasl net-misc/gsasl )"
diff --git a/virtual/httpd-php/httpd-php-5.4-r1.ebuild b/virtual/httpd-php/httpd-php-5.4-r1.ebuild
index 8fcb3db78109..5059bceb2a0f 100644
--- a/virtual/httpd-php/httpd-php-5.4-r1.ebuild
+++ b/virtual/httpd-php/httpd-php-5.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/httpd-php/httpd-php-5.4-r1.ebuild,v 1.5 2012/09/17 23:28:43 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/httpd-php/httpd-php-5.4-r1.ebuild,v 1.6 2012/10/21 09:18:10 maekke Exp $
 
 EAPI="4"
 
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE=""
 
 RDEPEND="|| ( dev-lang/php:${SLOT}[apache2]
diff --git a/www-client/midori/Manifest b/www-client/midori/Manifest
index e5768c2a4c1e..c17b30010e6a 100644
--- a/www-client/midori/Manifest
+++ b/www-client/midori/Manifest
@@ -1,3 +1,2 @@
-DIST midori-0.4.3.tar.bz2 928660 SHA256 fca4a0eab03358f20d7700069dbf2faaf8fa5c11aaad97f4208aea608f4bed9f SHA512 98e08d85c3a2b1c0b52199967a2de1644580052f5e6bd0177714e71416e31a972b3dbd7d9791aa45731483c691d07f426796251d63e0c35ddebd93e61b9add82 WHIRLPOOL 365ce5ba7db3c7badfdc04db211e2abe1150f79d497c46d2f3a955b8a90bf349c2b4767b5c89a20ec284bd07bd786d4f7b09a057908e7df3791116a0a7f527eb
 DIST midori-0.4.6.tar.bz2 978570 SHA256 910f47bd2b5f2998cd4fce45c08f9e282318820b68562d0bade2096b9a17e3ea SHA512 8c46f2eed6dd0af237b6aa021f8fc2150bd4387f7de14c9265cf5b8c1a1a558ecf908c98389415100ca0eac9037d7df89c5a348ef9dcd397bb1d3421104a8e7a WHIRLPOOL 36a498e2fd22039816da7072c1a7d59c84548fc187480b33b7a12ddf2ecd41626bb5a80d28298f336148ff74e3ec6fd2dd6da7a19f466ea899849b2d0919c0b2
 DIST midori-0.4.7.tar.bz2 1015921 SHA256 65bf9976733597c405492ce91aa664fd10547cb7df16e0a70f260c7a3e97ea5d SHA512 2a943ef19cb21826b2239dbcd5180ad46240326bc8b5f87fbf6095ca99cea277cf92bb8ed9db8cf96761a8b1af31f4849c25a2bc27b80cd29d14f288875f9e9b WHIRLPOOL 7f7c94fefd3eae2c3d2a827da93b64d738db32d3cff4d27aeb8e7cdf511472943539392dbe62c55043aa41f53f507b0547d2af36898811f500963a42c1aa4ad7
diff --git a/www-client/midori/midori-0.4.3.ebuild b/www-client/midori/midori-0.4.3.ebuild
deleted file mode 100644
index 210799b175f7..000000000000
--- a/www-client/midori/midori-0.4.3.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/midori/midori-0.4.3.ebuild,v 1.3 2012/02/10 12:23:48 ssuominen Exp $
-
-EAPI=4
-inherit eutils fdo-mime gnome2-utils python waf-utils
-
-PV_vala_version=0.14
-
-DESCRIPTION="A lightweight web browser based on WebKitGTK+"
-HOMEPAGE="http://www.twotoasts.de/index.php?/pages/midori_summary.html"
-SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1 MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc x86 ~x86-fbsd"
-IUSE="doc gnome libnotify nls +unique"
-
-RDEPEND="dev-db/sqlite:3
-	>=dev-libs/glib-2.22
-	dev-libs/libxml2
-	net-libs/libsoup:2.4
-	net-libs/webkit-gtk:3
-	x11-libs/gtk+:3
-	x11-libs/libXScrnSaver
-	gnome? ( net-libs/libsoup-gnome:2.4 )
-	libnotify? ( x11-libs/libnotify )
-	unique? ( dev-libs/libunique:3 )"
-DEPEND="${RDEPEND}
-	|| ( dev-lang/python:2.7 dev-lang/python:2.6 )
-	dev-lang/vala:${PV_vala_version}
-	dev-util/intltool
-	gnome-base/librsvg
-	doc? ( dev-util/gtk-doc )
-	nls? ( sys-devel/gettext )"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-
-	DOCS=( AUTHORS ChangeLog HACKING INSTALL TODO TRANSLATE )
-	HTML_DOCS=( data/faq.html data/faq.css )
-}
-
-src_configure() {
-	strip-linguas -i po
-
-	VALAC="$(type -P valac-${PV_vala_version})" \
-	waf-utils_src_configure \
-		--disable-docs \
-		 $(use_enable doc apidocs) \
-		 $(use_enable unique) \
-		 $(use_enable libnotify) \
-		--enable-addons \
-		$(use_enable nls) \
-		--enable-gtk3
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-}
diff --git a/www-client/midori/midori-0.4.6.ebuild b/www-client/midori/midori-0.4.6.ebuild
deleted file mode 100644
index a019c7c805cc..000000000000
--- a/www-client/midori/midori-0.4.6.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/midori/midori-0.4.6.ebuild,v 1.4 2012/07/02 16:49:07 ssuominen Exp $
-
-EAPI=4
-
-unset _live_inherits
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="git://git.xfce.org/apps/${PN}"
-	_live_inherits=git-2
-else
-	KEYWORDS="amd64 ~arm ppc x86 ~x86-fbsd"
-	SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
-fi
-
-inherit eutils fdo-mime gnome2-utils python waf-utils ${_live_inherits}
-
-PV_vala_version=0.14
-
-DESCRIPTION="A lightweight web browser based on WebKitGTK+"
-HOMEPAGE="http://www.twotoasts.de/index.php?/pages/midori_summary.html"
-
-LICENSE="LGPL-2.1 MIT"
-SLOT="0"
-IUSE="+deprecated doc gnome libnotify nls +unique"
-
-RDEPEND="dev-db/sqlite:3
-	>=dev-libs/glib-2.22
-	dev-libs/libxml2
-	net-libs/libsoup:2.4
-	x11-libs/libXScrnSaver
-	deprecated? (
-		net-libs/webkit-gtk:2
-		x11-libs/gtk+:2
-		unique? ( dev-libs/libunique:1 )
-		)
-	!deprecated? (
-		net-libs/webkit-gtk:3
-		x11-libs/gtk+:3
-		unique? ( dev-libs/libunique:3 )
-		)
-	gnome? ( net-libs/libsoup-gnome:2.4 )
-	libnotify? ( >=x11-libs/libnotify-0.7 )"
-DEPEND="${RDEPEND}
-	|| ( dev-lang/python:2.7 dev-lang/python:2.6 )
-	dev-lang/vala:${PV_vala_version}
-	dev-util/intltool
-	gnome-base/librsvg
-	doc? ( dev-util/gtk-doc )
-	nls? ( sys-devel/gettext )"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-
-	DOCS=( AUTHORS ChangeLog HACKING INSTALL TODO TRANSLATE )
-	HTML_DOCS=( data/faq.html data/faq.css )
-}
-
-src_unpack() {
-	if [[ ${PV} == *9999* ]]; then
-		git-2_src_unpack
-	else
-		default
-	fi
-}
-
-src_configure() {
-	strip-linguas -i po
-
-	VALAC="$(type -P valac-${PV_vala_version})" \
-	waf-utils_src_configure \
-		--disable-docs \
-		 $(use_enable doc apidocs) \
-		 $(use_enable unique) \
-		 $(use_enable libnotify) \
-		--enable-addons \
-		$(use_enable nls) \
-		$(use_enable !deprecated gtk3) \
-		--disable-granite
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-}
diff --git a/www-client/midori/midori-0.4.7.ebuild b/www-client/midori/midori-0.4.7.ebuild
index 0c201f7afd71..a1d74b69622e 100644
--- a/www-client/midori/midori-0.4.7.ebuild
+++ b/www-client/midori/midori-0.4.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/midori/midori-0.4.7.ebuild,v 1.1 2012/09/20 08:30:56 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/midori/midori-0.4.7.ebuild,v 1.2 2012/10/21 12:00:16 ssuominen Exp $
 
 EAPI=4
 
@@ -19,7 +19,7 @@ inherit eutils fdo-mime gnome2-utils python waf-utils ${_live_inherits}
 VALA_VERSION=0.18
 
 DESCRIPTION="A lightweight web browser based on WebKitGTK+"
-HOMEPAGE="http://www.twotoasts.de/index.php?/pages/midori_summary.html"
+HOMEPAGE="http://twotoasts.de/index.php/midori/"
 
 LICENSE="LGPL-2.1 MIT"
 SLOT="0"
diff --git a/www-client/midori/midori-9999.ebuild b/www-client/midori/midori-9999.ebuild
index 4c94a72ffd13..49915ec276fe 100644
--- a/www-client/midori/midori-9999.ebuild
+++ b/www-client/midori/midori-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/midori/midori-9999.ebuild,v 1.43 2012/09/20 08:30:56 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/midori/midori-9999.ebuild,v 1.44 2012/10/21 12:00:16 ssuominen Exp $
 
 EAPI=4
 
@@ -19,7 +19,7 @@ inherit eutils fdo-mime gnome2-utils python waf-utils ${_live_inherits}
 VALA_VERSION=0.18
 
 DESCRIPTION="A lightweight web browser based on WebKitGTK+"
-HOMEPAGE="http://www.twotoasts.de/index.php?/pages/midori_summary.html"
+HOMEPAGE="http://twotoasts.de/index.php/midori/"
 
 LICENSE="LGPL-2.1 MIT"
 SLOT="0"
diff --git a/x11-libs/libdrm/libdrm-2.4.37.ebuild b/x11-libs/libdrm/libdrm-2.4.37.ebuild
index 74754832c6f9..2bf09321e311 100644
--- a/x11-libs/libdrm/libdrm-2.4.37.ebuild
+++ b/x11-libs/libdrm/libdrm-2.4.37.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libdrm/libdrm-2.4.37.ebuild,v 1.1 2012/07/05 15:17:35 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libdrm/libdrm-2.4.37.ebuild,v 1.3 2012/10/20 23:36:11 ryao Exp $
 
 EAPI=4
 inherit xorg-2
diff --git a/x11-libs/libdrm/libdrm-2.4.38.ebuild b/x11-libs/libdrm/libdrm-2.4.38.ebuild
index e0ffc2d13963..e47e0eb200ff 100644
--- a/x11-libs/libdrm/libdrm-2.4.38.ebuild
+++ b/x11-libs/libdrm/libdrm-2.4.38.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libdrm/libdrm-2.4.38.ebuild,v 1.1 2012/08/11 23:38:55 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libdrm/libdrm-2.4.38.ebuild,v 1.3 2012/10/20 23:36:11 ryao Exp $
 
 EAPI=4
 inherit xorg-2
diff --git a/x11-libs/libdrm/libdrm-2.4.39.ebuild b/x11-libs/libdrm/libdrm-2.4.39.ebuild
index 7fccb16ebc7e..93a85f14da1a 100644
--- a/x11-libs/libdrm/libdrm-2.4.39.ebuild
+++ b/x11-libs/libdrm/libdrm-2.4.39.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libdrm/libdrm-2.4.39.ebuild,v 1.1 2012/09/01 11:08:07 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libdrm/libdrm-2.4.39.ebuild,v 1.3 2012/10/20 23:36:11 ryao Exp $
 
 EAPI=4
 inherit xorg-2
diff --git a/x11-libs/vdpau-video/files/vdpau-video-0.7.4-glext-missing-definition.patch b/x11-libs/vdpau-video/files/vdpau-video-0.7.4-glext-missing-definition.patch
new file mode 100644
index 000000000000..221b9608fe44
--- /dev/null
+++ b/x11-libs/vdpau-video/files/vdpau-video-0.7.4-glext-missing-definition.patch
@@ -0,0 +1,16 @@
+--- ./src/utils_glx.h~	2012-10-05 16:02:58.000000000 +0100
++++ ./src/utils_glx.h	2012-10-19 08:44:12.469642440 +0100
+@@ -48,6 +48,13 @@
+ typedef void (*PFNGLXRELEASETEXIMAGEEXTPROC)(Display *, GLXDrawable, int);
+ #endif
+ 
++#if GL_GLEXT_VERSION >= 85
++/* XXX: PFNGLMULTITEXCOORD2FPROC got out of the GL_VERSION_1_3_DEPRECATED
++   block and is not defined if GL_VERSION_1_3 is defined in <GL/gl.h>
++   Redefine the type here as an interim solution */
++typedef void (*PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t);
++#endif
++                    
+ #ifndef GL_FRAMEBUFFER_BINDING
+ #define GL_FRAMEBUFFER_BINDING GL_FRAMEBUFFER_BINDING_EXT
+ #endif
diff --git a/x11-libs/vdpau-video/vdpau-video-0.7.4.ebuild b/x11-libs/vdpau-video/vdpau-video-0.7.4.ebuild
index 2800a1bd2017..bf812dc30d40 100644
--- a/x11-libs/vdpau-video/vdpau-video-0.7.4.ebuild
+++ b/x11-libs/vdpau-video/vdpau-video-0.7.4.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/vdpau-video/vdpau-video-0.7.4.ebuild,v 1.1 2012/10/11 12:51:00 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/vdpau-video/vdpau-video-0.7.4.ebuild,v 1.2 2012/10/20 22:07:45 aballier Exp $
 
 EAPI="2"
-inherit autotools
+inherit autotools eutils
 
 MY_P=libva-vdpau-driver-${PV}
 DESCRIPTION="VDPAU Backend for Video Acceleration (VA) API"
@@ -25,6 +25,7 @@ DEPEND="${DEPEND}
 S=${WORKDIR}/${MY_P}
 
 src_prepare() {
+	epatch "${FILESDIR}/${P}-glext-missing-definition.patch"
 	eautoreconf
 }
 
diff --git a/x11-misc/rodent/Manifest b/x11-misc/rodent/Manifest
index dba1c82c4337..35314067f28d 100644
--- a/x11-misc/rodent/Manifest
+++ b/x11-misc/rodent/Manifest
@@ -1,3 +1 @@
-DIST rodent-4.6.4.tar.bz2 3053528 RMD160 c2b8c82c7b6c23ea86527f1faa032357a40d4cdf SHA1 ed9d3d6b433faff5c2bed0b0b2544c184c822ee2 SHA256 4b3d2f85f98b260476839af9deec91f09a79cceec1e6652225b030e76aa78229
-DIST rodent-4.7.4.tar.bz2 5960442 RMD160 d092518603eeee35f69a61425269ab6251afb6f1 SHA1 e15d4c388079ac697a8338626bfa556408c78635 SHA256 f9a4d6216cfbd387f723121bd0a90cb62930de5d96746f5fdd771536023f17ff
-DIST rodent-4.8.0.tar.bz2 7519825 RMD160 64b750ab7284bbe7ff10d883ab1eea6f0b8fb814 SHA1 1a0208889db748610bb74835eb7940c817fa88ed SHA256 3ec27ce8f26c821601182ae2d8bca390ab4adaebb14d65929fde791588f09c33
+DIST rodent-4.8.0.tar.bz2 7519825 SHA256 3ec27ce8f26c821601182ae2d8bca390ab4adaebb14d65929fde791588f09c33
diff --git a/x11-misc/rodent/rodent-4.6.4.ebuild b/x11-misc/rodent/rodent-4.6.4.ebuild
deleted file mode 100644
index 324487888b58..000000000000
--- a/x11-misc/rodent/rodent-4.6.4.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/rodent/rodent-4.6.4.ebuild,v 1.3 2012/05/05 04:53:43 jdhore Exp $
-
-EAPI=4
-inherit fdo-mime gnome2-utils
-
-DESCRIPTION="a fast, small and powerful file manager and graphical shell"
-HOMEPAGE="http://rodent.xffm.org"
-SRC_URI="mirror://sourceforge/project/xffm/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-libs/glib:2
-	dev-libs/libxml2:2
-	dev-libs/libzip
-	gnome-base/librsvg:2
-	sys-apps/file
-	x11-libs/cairo
-	x11-libs/gtk+:2
-	x11-libs/libSM
-	x11-libs/libX11"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig"
-
-DOCS=( ChangeLog README TODO )
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -exec rm -f {} +
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-}
diff --git a/x11-misc/rodent/rodent-4.7.4.ebuild b/x11-misc/rodent/rodent-4.7.4.ebuild
deleted file mode 100644
index f445e1c2e8bc..000000000000
--- a/x11-misc/rodent/rodent-4.7.4.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/rodent/rodent-4.7.4.ebuild,v 1.2 2012/05/05 04:53:43 jdhore Exp $
-
-EAPI=4
-inherit xfconf
-
-DESCRIPTION="A fast, small and powerful file manager and graphical shell"
-HOMEPAGE="http://rodent.xffm.org/"
-SRC_URI="mirror://sourceforge/xffm/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-COMMON_DEPEND=">=dev-libs/glib-2.20.5
-	dev-libs/libxml2
-	>=dev-libs/libzip-0.9
-	>=gnome-base/librsvg-2.26
-	sys-apps/file
-	>=x11-libs/cairo-1.8.10
-	>=x11-libs/gtk+-2.20:2
-	x11-libs/libX11
-	x11-libs/libSM"
-RDEPEND="${COMMON_DEPEND}
-	gnome-base/gvfs"
-DEPEND="${COMMON_DEPEND}
-	dev-util/intltool
-	virtual/pkgconfig"
-
-pkg_setup() {
-	DOCS=( ChangeLog README TODO )
-}
-
-src_install() {
-	# Build/share/Makefile.am:docdir = $(datadir)/doc/@PLUGIN_DIR@
-	xfconf_src_install docdir=/usr/share/doc/${PF}
-}
diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index 8dad0574ea4b..4a56c3fbb932 100644
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -1,3 +1,2 @@
 DIST xscreensaver-5.15.tar.gz 5977594 SHA256 4f6d1f1e4c15dbb74e2296f8fe57a73d47d602515178c248bbc838f779d5082d SHA512 2013cf627908a3fa59a3e7d3e6e03b495497113828bf6c89d477fd84dca6867ddeafd572a5f23f12bbfd98fb32acbfc2bcb5d24ef4975c3c263439dbe6fa66b2 WHIRLPOOL 186719cc301ede656fd002f4eadafcec2fe488f60bc1323ca512cb0f49398dfcb3e08da4fd0e6028287438a24b92746a1972759a18b9f9e57bc9d61b5a50c852
-DIST xscreensaver-5.18.tar.gz 7363800 SHA256 3d70edb8f46511f5427f21b4ba4d8323f336888f60268d16731f5231c6883db9 SHA512 8efd4bc07eb05bb84ce669c2c3d9fd7d33c91920522916a09800d19e55bee8053a631565c996bf35355b275a02ace66b9d26c1d2140001a329b3bcd32b07bc1e WHIRLPOOL 680cb3b8d919c456100c9110aac1212f0f0188ed70b15385c3eb9979da9574d2b812c157e43d0c588b4883f208bd9b6a47304e06888fd02a3474ec24ce371838
-DIST xscreensaver-5.19.tar.gz 7373580 SHA256 fd62ea0f996abe1bea3770dd7141681454521b49302f9bced8af9c2ee428c0e0 SHA512 6f19bcb6a2b41312a45604958632b172d09e31f81d6a746002900b6a3973969b26671c17d390d43bfb4fcf24a1ae0f554ffe77572044a041b47a2eae1f3913a4 WHIRLPOOL 80ffc5bdf372fb5e7b9cbb29212989fb2227378b2de71395d5a3e3366e6acd6ab6b6d53a394ccd54171a149c3f57ebae7102d3fd9a7fb25f29a0796f724b7d63
+DIST xscreensaver-5.20.tar.gz 7380256 SHA256 a9cf9f745c6319db175d7e1e36545b01b9e099a89fd5c239689c982e0c10bcb1 SHA512 2867e081154e53c3d7e16bda1226c9682b296461f93b7565cbb0a267ac81489abefd947e0795f04e77632e108f428c7421e14fdd95894297a8a8da375914db74 WHIRLPOOL e3ffbb2dfbfabfa669276c9e624f9a88dfd4808533dcaa7b57b12cbe16e3da83c8d1ab38a19a370f2309a1ed7d266666ace5c65ed9357707fb9850d4f4ab290d
diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.18-sonar-compile.patch b/x11-misc/xscreensaver/files/xscreensaver-5.18-sonar-compile.patch
deleted file mode 100644
index b092b5e5b8e9..000000000000
--- a/x11-misc/xscreensaver/files/xscreensaver-5.18-sonar-compile.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-http://pkgs.fedoraproject.org/gitweb/?p=xscreensaver.git;a=commit;h=88b852d368c4c5ec8b798913e4856e9aed9ed936
-
-sonar-icmp.c:594:55: error: ‘AF_LINK’ undeclared (first use in this function)
-
---- hacks/glx/sonar-icmp.c
-+++ hacks/glx/sonar-icmp.c
-@@ -591,7 +591,9 @@
-                 fprintf (stderr, "%s:     if: %4s: %s\n", progname,
-                          ifa->ifa_name,
-                          (ifa->ifa_addr->sa_family == AF_UNIX  ? "local" :
-+#ifdef AF_LINK
-                           ifa->ifa_addr->sa_family == AF_LINK  ? "link"  :
-+#endif
-                           ifa->ifa_addr->sa_family == AF_INET6 ? "ipv6"  :
-                           "other"));
-               continue;
diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.20-blurb-hndl-test-passwd.patch b/x11-misc/xscreensaver/files/xscreensaver-5.20-blurb-hndl-test-passwd.patch
new file mode 100644
index 000000000000..bfd48d1cc96e
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-5.20-blurb-hndl-test-passwd.patch
@@ -0,0 +1,12 @@
+http://pkgs.fedoraproject.org/cgit/xscreensaver.git/tree/xscreensaver-5.17-blurb-hndl-test-passwd.patch
+
+--- driver/test-passwd.c
++++ driver/test-passwd.c
+@@ -66,6 +66,7 @@
+ Bool update_screen_layout (saver_info *si) { return 0; }
+ 
+ const char *blurb(void) { return progname; }
++Bool in_signal_handler_p = 0;
+ Atom XA_SCREENSAVER, XA_DEMO, XA_PREFS;
+ 
+ void
diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.20-check-largefile-support.patch b/x11-misc/xscreensaver/files/xscreensaver-5.20-check-largefile-support.patch
new file mode 100644
index 000000000000..b5e3ca92cc58
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-5.20-check-largefile-support.patch
@@ -0,0 +1,12 @@
+http://pkgs.fedoraproject.org/cgit/xscreensaver.git/tree/xscreensaver-5.19-check-largefile-support.patch
+
+--- configure.in
++++ configure.in
+@@ -1184,6 +1184,7 @@
+ AC_HEADER_SYS_WAIT
+ AC_HEADER_DIRENT
+ AC_GETTIMEOFDAY_ARGS
++AC_SYS_LARGEFILE
+ AC_CHECK_FUNCS(select fcntl uname nice setpriority getcwd getwd putenv sbrk)
+ AC_CHECK_FUNCS(sigaction syslog realpath setrlimit)
+ AC_CHECK_FUNCS(setlocale)
diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.20-conf264.patch b/x11-misc/xscreensaver/files/xscreensaver-5.20-conf264.patch
new file mode 100644
index 000000000000..77c5521bcb23
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-5.20-conf264.patch
@@ -0,0 +1,26 @@
+http://pkgs.fedoraproject.org/cgit/xscreensaver.git/tree/xscreensaver-5.11-conf264.patch
+
+--- Makefile.in
++++ Makefile.in
+@@ -99,8 +99,8 @@
+ # or later, feel free.  Personally, I can't be bothered.
+ #
+ configure::
+-	autoconf263
+-	autoheader263
++	autoconf
++	autoheader
+ 	@TMP=configure.$$$$ ;						     \
+ 	echo "munging configure's --help message..." ;			     \
+ 	( perl -e '							     \
+--- configure.in
++++ configure.in
+@@ -315,7 +315,7 @@
+ ###############################################################################
+ 
+ AC_DEFUN(AC_PROG_CC_ANSI,
+- [AC_PROG_CC
++ [AC_REQUIRE([AC_PROG_CC])
+ 
+   if test -z "$GCC"; then
+     # not using GCC
diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.20-test-passwd-segv-tty.patch b/x11-misc/xscreensaver/files/xscreensaver-5.20-test-passwd-segv-tty.patch
new file mode 100644
index 000000000000..ab5deebc424a
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-5.20-test-passwd-segv-tty.patch
@@ -0,0 +1,13 @@
+http://pkgs.fedoraproject.org/cgit/xscreensaver.git/tree/xscreensaver-5.12-test-passwd-segv-tty.patch
+
+--- driver/passwd.c
++++ driver/passwd.c
+@@ -205,7 +205,7 @@
+ {
+ # ifdef HAVE_SYSLOG
+   struct passwd *pw = getpwuid (getuid ());
+-  char *d = DisplayString (si->dpy);
++  char *d = (si->dpy ? DisplayString (si->dpy) : 0);
+   char *u = (pw && pw->pw_name ? pw->pw_name : "???");
+   int opt = 0;
+   int fac = 0;
diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.20-tests-miscfix.patch b/x11-misc/xscreensaver/files/xscreensaver-5.20-tests-miscfix.patch
new file mode 100644
index 000000000000..995b4ea89608
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-5.20-tests-miscfix.patch
@@ -0,0 +1,23 @@
+http://pkgs.fedoraproject.org/cgit/xscreensaver.git/tree/xscreensaver-5.12-tests-miscfix.patch
+
+--- driver/test-xdpms.c
++++ driver/test-xdpms.c
+@@ -29,7 +29,6 @@
+ 
+ #include <X11/Xproto.h>
+ #include <X11/extensions/dpms.h>
+-#include <X11/extensions/dpmsstr.h>
+ 
+ extern Bool DPMSQueryExtension (Display *dpy, int *event_ret, int *error_ret);
+ extern Bool DPMSCapable (Display *dpy);
+--- driver/Makefile.in
++++ driver/Makefile.in
+@@ -850,7 +850,7 @@
+ test-mlstring: test-mlstring.o
+ 	$(CC) -DTEST $(LDFLAGS) -o $@ test-mlstring.o $(SAVER_LIBS)
+ 
+-TEST_FADE_OBJS = test-fade.o $(UTILS_SRC)/fade.o $(DEMO_UTIL_OBJS)
++TEST_FADE_OBJS = test-fade.o $(UTILS_BIN)/fade.o $(DEMO_UTIL_OBJS)
+ test-fade: test-fade.o $(UTILS_BIN)/fade.o
+ 	$(CC) $(LDFLAGS) -o $@ $(TEST_FADE_OBJS) $(SAVER_LIBS)
+ 
diff --git a/x11-misc/xscreensaver/xscreensaver-5.19.ebuild b/x11-misc/xscreensaver/xscreensaver-5.19.ebuild
deleted file mode 100644
index 26e2a50064de..000000000000
--- a/x11-misc/xscreensaver/xscreensaver-5.19.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-5.19.ebuild,v 1.1 2012/07/27 18:27:34 ssuominen Exp $
-
-EAPI=4
-inherit autotools eutils flag-o-matic multilib pam
-
-DESCRIPTION="A modular screen saver and locker for the X Window System"
-HOMEPAGE="http://www.jwz.org/xscreensaver/"
-SRC_URI="http://www.jwz.org/xscreensaver/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-IUSE="gdm jpeg new-login opengl pam +perl selinux suid xinerama"
-
-COMMON_DEPEND="dev-libs/libxml2
-	>=gnome-base/libglade-2
-	media-libs/netpbm
-	x11-apps/appres
-	x11-apps/xwininfo
-	x11-libs/gtk+:2
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXi
-	x11-libs/libXmu
-	x11-libs/libXrandr
-	x11-libs/libXt
-	x11-libs/libXxf86misc
-	x11-libs/libXxf86vm
-	jpeg? ( virtual/jpeg )
-	new-login? (
-		gdm? ( gnome-base/gdm )
-		!gdm? ( || ( x11-misc/lightdm kde-base/kdm ) )
-		)
-	opengl? ( virtual/opengl )
-	pam? ( virtual/pam )
-	selinux? ( sec-policy/selinux-xscreensaver )
-	xinerama? ( x11-libs/libXinerama )"
-# For USE="perl" see output of `qlist xscreensaver | grep bin | xargs grep '::'`
-RDEPEND="${COMMON_DEPEND}
-	perl? (
-		dev-lang/perl
-		dev-perl/libwww-perl
-		virtual/perl-Digest-MD5
-		)"
-DEPEND="${COMMON_DEPEND}
-	dev-util/intltool
-	virtual/pkgconfig
-	sys-devel/bc
-	sys-devel/gettext
-	x11-proto/recordproto
-	x11-proto/scrnsaverproto
-	x11-proto/xextproto
-	x11-proto/xf86miscproto
-	x11-proto/xf86vidmodeproto
-	xinerama? ( x11-proto/xineramaproto )"
-
-REQUIRED_USE="gdm? ( new-login )"
-
-MAKEOPTS="${MAKEOPTS} -j1"
-
-src_prepare() {
-	if use new-login && ! use gdm; then #392967
-		sed -i \
-			-e "/default_l.*1/s:gdmflexiserver -ls:${EPREFIX}/usr/libexec/lightdm/&:" \
-			configure{,.in} || die
-	fi
-
-	epatch \
-		"${FILESDIR}"/${PN}-5.15-gentoo.patch \
-		"${FILESDIR}"/${PN}-5.05-interix.patch
-
-	eautoconf
-}
-
-src_configure() {
-	if use ppc || use ppc64; then
-		filter-flags -maltivec -mabi=altivec
-		append-flags -U__VEC__
-	fi
-
-	unset LINGUAS #113681
-	unset BC_ENV_ARGS #24568
-	export RPM_PACKAGE_VERSION=no #368025
-
-	econf \
-		--x-includes="${EPREFIX}"/usr/include \
-		--x-libraries="${EPREFIX}"/usr/$(get_libdir) \
-		--enable-locking \
-		--with-hackdir="${EPREFIX}"/usr/$(get_libdir)/misc/${PN} \
-		--with-configdir="${EPREFIX}"/usr/share/${PN}/config \
-		--with-x-app-defaults="${EPREFIX}"/usr/share/X11/app-defaults \
-		--with-dpms-ext \
-		$(use_with xinerama xinerama-ext) \
-		--with-xinput-ext \
-		--with-xf86vmode-ext \
-		--with-xf86gamma-ext \
-		--with-randr-ext \
-		--with-proc-interrupts \
-		$(use_with pam) \
-		--without-kerberos \
-		$(use_with new-login login-manager) \
-		--with-gtk \
-		$(use_with opengl gl) \
-		--without-gle \
-		--with-pixbuf \
-		$(use_with jpeg) \
-		--with-xshm-ext \
-		--with-xdbe-ext \
-		--with-text-file="${EPREFIX}"/etc/gentoo-release \
-		$(use_with suid setuid-hacks)
-}
-
-src_install() {
-	emake install_prefix="${D}" install
-	dodoc README{,.hacking}
-
-	use pam && fperms 755 /usr/bin/${PN}
-	pamd_mimic_system ${PN} auth
-
-	rm -f "${ED}"/usr/share/${PN}/config/{electricsheep,fireflies}.xml
-}
diff --git a/x11-misc/xscreensaver/xscreensaver-5.18.ebuild b/x11-misc/xscreensaver/xscreensaver-5.20.ebuild
similarity index 90%
rename from x11-misc/xscreensaver/xscreensaver-5.18.ebuild
rename to x11-misc/xscreensaver/xscreensaver-5.20.ebuild
index 8b2b48524a67..ebfc83624b2a 100644
--- a/x11-misc/xscreensaver/xscreensaver-5.18.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.20.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-5.18.ebuild,v 1.2 2012/07/23 15:29:25 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-5.20.ebuild,v 1.1 2012/10/21 10:39:23 ssuominen Exp $
 
 EAPI=4
 inherit autotools eutils flag-o-matic multilib pam
@@ -70,9 +70,14 @@ src_prepare() {
 	epatch \
 		"${FILESDIR}"/${PN}-5.15-gentoo.patch \
 		"${FILESDIR}"/${PN}-5.05-interix.patch \
-		"${FILESDIR}"/${PN}-5.18-sonar-compile.patch
+		"${FILESDIR}"/${PN}-5.20-blurb-hndl-test-passwd.patch \
+		"${FILESDIR}"/${PN}-5.20-check-largefile-support.patch \
+		"${FILESDIR}"/${PN}-5.20-conf264.patch \
+		"${FILESDIR}"/${PN}-5.20-test-passwd-segv-tty.patch \
+		"${FILESDIR}"/${PN}-5.20-tests-miscfix.patch
 
 	eautoconf
+	eautoheader
 }
 
 src_configure() {
diff --git a/x11-themes/ubuntu-wallpapers/Manifest b/x11-themes/ubuntu-wallpapers/Manifest
index c88368dcabaf..67344da6fbd5 100644
--- a/x11-themes/ubuntu-wallpapers/Manifest
+++ b/x11-themes/ubuntu-wallpapers/Manifest
@@ -1 +1,2 @@
 DIST ubuntu-wallpapers_0.34.1.tar.gz 19719676 SHA256 7ef704901a01e476d4f0829ab0d426aa5a8aa2de02c4b6375233dadfc8474677 SHA512 05cc6e28fe3d80723b4fc2361463bdc07e6e968dc29a0f71202222de990c0ecc0c24a13a8c13a9dbe3326f294de634fc899fddb9505d1db92d7bec2717254c9a WHIRLPOOL 63de9c8dc7ef25e34354f8100e003d519f2e5e54b37bbcb6b8159465e8ca29815cb4c61aa61305eca7840f9f63c5329f757bbaab1f6c06dd49087034f3de722d
+DIST ubuntu-wallpapers_0.35.2.tar.gz 23352720 SHA256 27b6706da4615ed064aaafc42542c6e675d1d569436266ffeea8e0ea9185f341 SHA512 a622c6009059d416953bcc9796e2f15a12097a615179404d61dbddc48599e495f941dc320728044c1da13ce4ff25dec5d313b7c2bfa5e3a495d02862575d9a9a WHIRLPOOL b67309e129231ae799339025964bed7c3edc290c29489b575f2d73d499736f1dc49de2f55f973a4c2536e45e4a37d94dee8bd93cf932e1ffe8c58a838f04ed53
diff --git a/x11-themes/ubuntu-wallpapers/ubuntu-wallpapers-0.35.2.ebuild b/x11-themes/ubuntu-wallpapers/ubuntu-wallpapers-0.35.2.ebuild
new file mode 100644
index 000000000000..f2ef57a52497
--- /dev/null
+++ b/x11-themes/ubuntu-wallpapers/ubuntu-wallpapers-0.35.2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/ubuntu-wallpapers/ubuntu-wallpapers-0.35.2.ebuild,v 1.1 2012/10/21 10:46:58 pacho Exp $
+
+EAPI=4
+
+DESCRIPTION="Ubuntu wallpapers"
+HOMEPAGE="https://launchpad.net/ubuntu/+source/ubuntu-wallpapers"
+SRC_URI="https://launchpad.net/ubuntu/+archive/primary/+files/${PN}_${PV}.tar.gz"
+
+LICENSE="CCPL-Attribution-ShareAlike-3.0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND=""
+DEPEND=""
+
+S="${WORKDIR}/${P/_/-}"
+
+SLOT=0
+
+src_compile() { :; }
+src_test() { :; }
+
+src_install() {
+	insinto /usr/share/backgrounds
+	doins *.jpg *.png
+
+	insinto /usr/share/backgrounds/contest
+	doins contest/*.xml
+
+	for i in *.xml.in; do
+		insinto /usr/share/gnome-background-properties
+		newins ${i} ${i/.in/}
+	done
+
+	dodoc AUTHORS debian/changelog
+}
diff --git a/xfce-extra/xfce4-embed-plugin/Manifest b/xfce-extra/xfce4-embed-plugin/Manifest
index 7a0864884a3c..dce768e7d79d 100644
--- a/xfce-extra/xfce4-embed-plugin/Manifest
+++ b/xfce-extra/xfce4-embed-plugin/Manifest
@@ -1,2 +1 @@
-DIST xfce4-embed-plugin-0.8.0.tar.bz2 306028 RMD160 390f1e5e43708e7fadae1cf0e75c846f2d2f1984 SHA1 20e63c249f0f92cba1309b7eefdf6e98b13516a3 SHA256 140affe75c7487dc7e1228eadd5e3070d67e1b74f2b86fbac1251c94bce32a4f
-DIST xfce4-embed-plugin-1.0.0.tar.bz2 325518 RMD160 8bdefefc5ab83ede0bfcdf7bd54fe38e8d4cebef SHA1 2dca4bb1c5fa1d68711ec1fde7ff50d8e1b2f55d SHA256 35d4c6c56dd6468c0e5afe66f657c1526f2d830a577105a51da43657651832e3
+DIST xfce4-embed-plugin-1.0.0.tar.bz2 325518 SHA256 35d4c6c56dd6468c0e5afe66f657c1526f2d830a577105a51da43657651832e3
diff --git a/xfce-extra/xfce4-embed-plugin/xfce4-embed-plugin-0.8.0.ebuild b/xfce-extra/xfce4-embed-plugin/xfce4-embed-plugin-0.8.0.ebuild
deleted file mode 100644
index 3407aa19682c..000000000000
--- a/xfce-extra/xfce4-embed-plugin/xfce4-embed-plugin-0.8.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-embed-plugin/xfce4-embed-plugin-0.8.0.ebuild,v 1.3 2012/05/05 07:14:39 mgorny Exp $
-
-EAPI=4
-inherit multilib xfconf
-
-DESCRIPTION="A plug-in for embedding arbitrary application windows into the Xfce panel"
-HOMEPAGE="http://goodies.xfce.org/projects/panel-plugins/xfce4-embed-plugin"
-SRC_URI="mirror://xfce/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-RDEPEND=">=x11-libs/gtk+-2.20:2
-	x11-libs/libX11
-	>=xfce-base/libxfce4ui-4.8
-	>=xfce-base/libxfce4util-4.8
-	>=xfce-base/xfce4-panel-4.8"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig
-	sys-devel/gettext"
-
-pkg_setup() {
-	XFCONF=(
-		--libexecdir="${EPREFIX}"/usr/$(get_libdir)
-		$(xfconf_use_debug)
-		)
-
-	DOCS=( AUTHORS ChangeLog NEWS README THANKS )
-}
diff --git a/xfce-extra/xfce4-mixer/Manifest b/xfce-extra/xfce4-mixer/Manifest
index 2abc5a38e3a1..3ad403483db6 100644
--- a/xfce-extra/xfce4-mixer/Manifest
+++ b/xfce-extra/xfce4-mixer/Manifest
@@ -1,4 +1,3 @@
 DIST xfce4-mixer-4.10.0.tar.bz2 461526 SHA256 a8c589001b438171ea5a6b46ce9895c3ffbc5081ab67805ab9870e540068dade SHA512 83c12101c034a71039f3a481c1026430cd9b23c3a3d1c6e57697eb4484700a2403143d94dfdd2bb28552e38b4637afb6370a6400571ec6cdb55cc59f5f7a67ae WHIRLPOOL 59959b48e7281a082784930d1bc5d6ae4b3732f1248847b188fd6116b3cf1ce764bfe5d4fc800589adad13cf168d7f6d167e29865196a5db385f6ca094815980
 DIST xfce4-mixer-4.8.0-LINGUAS.tar.bz2 4910 SHA256 33505bdef99634290e98c2b2254ac499791b7c721598c842a803b3afd043abc9 SHA512 52bece7b0a0108835fe3b3893023a9306bb226be1a9f028a9635ab73a2c525172f9e77a2048006d53386a67ef137975fabe6a4e06805a392ad33b4dc8cf26935 WHIRLPOOL 68b068a721deafc7e1337c4ee7d24d48b0df5d0fbe5453dd63f2dcaf506f1e635c581139c206830ec81acc9702ab09c3c6bb68979e74f3ca632e5c8bbbe3daba
 DIST xfce4-mixer-4.8.0.tar.bz2 494990 SHA256 9f9f48fdd0d3f6b1e46694b93a44d15b800db72a96d831b5111d9ac976970fab SHA512 4b41c36de26a72ece1fbd712409b471e74756939b08a6244e33972c5c5738ba2ab75227a0f200d7255bebf9489c63250d5f4384edd2aaaf71817b79945422a42 WHIRLPOOL e77f4384370465152979418cc013699576d308cc3f6cd338e97f503618818ab37915a08344c2aa7933fc35b86fa8be5910b70fe69e018b987a59dd8daa1cf971
-DIST xfce4-mixer-4.9.0.tar.bz2 457598 SHA256 928b48253c0a74875da08e8fd7243ddbd8971f4aeb97c3c5f50271f8cd5f1146 SHA512 0d4c35ca90e80692a64986352d08e2729ba751c189f7779aa44e696fb1f01bc7bb5de41760d84c3f58b3661b18e03efec04aa7d275fa6e6cbeca8df44f6d84ed WHIRLPOOL 4e6bb93633eff1077957f870bbc0174ecdc33f39b4f43668841fe1c2517be5fcfdabcb70fcce542811efe192f6ff19c929ac751800967e7a4afbf67a93570116
diff --git a/xfce-extra/xfce4-mixer/xfce4-mixer-4.9.0.ebuild b/xfce-extra/xfce4-mixer/xfce4-mixer-4.9.0.ebuild
deleted file mode 100644
index 0f234d78abd8..000000000000
--- a/xfce-extra/xfce4-mixer/xfce4-mixer-4.9.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-mixer/xfce4-mixer-4.9.0.ebuild,v 1.2 2012/10/16 21:53:28 maekke Exp $
-
-EAPI=4
-inherit xfconf
-
-DESCRIPTION="A volume control application (and panel plug-in) for the Xfce desktop environment"
-HOMEPAGE="http://www.xfce.org/projects/xfce4-mixer/"
-SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
-IUSE="alsa debug oss"
-
-COMMON_DEPEND=">=dev-libs/glib-2.24
-	dev-libs/libunique:1
-	dev-libs/keybinder:0
-	media-libs/gst-plugins-base:0.10
-	>=x11-libs/gtk+-2.20:2
-	>=xfce-base/libxfce4ui-4.10
-	>=xfce-base/libxfce4util-4.10
-	>=xfce-base/xfce4-panel-4.10
-	>=xfce-base/xfconf-4.10"
-RDEPEND="${COMMON_DEPEND}
-	alsa? ( media-plugins/gst-plugins-alsa:0.10 )
-	oss? ( media-plugins/gst-plugins-oss:0.10 )
-	!alsa? ( !oss? ( media-plugins/gst-plugins-meta:0.10 ) )"
-DEPEND="${COMMON_DEPEND}
-	dev-util/intltool
-	virtual/pkgconfig"
-
-pkg_setup() {
-	XFCONF=(
-		$(xfconf_use_debug)
-		)
-
-	DOCS=( AUTHORS ChangeLog NEWS README )
-}
diff --git a/xfce-extra/xfce4-places-plugin/Manifest b/xfce-extra/xfce4-places-plugin/Manifest
index 5ec0eb12fc49..5211f6b25731 100644
--- a/xfce-extra/xfce4-places-plugin/Manifest
+++ b/xfce-extra/xfce4-places-plugin/Manifest
@@ -1,3 +1,2 @@
 DIST xfce4-places-plugin-1.3.0.tar.bz2 335815 SHA256 0266e6bb9905b6af25f80cbb364d2710b6b95100382d2d540edf9f8408e09936 SHA512 0ae4ede8f0cb27240e89745289354eea5b30e5df2a870f96135fc6b05cddd092d782a3e81c496db6a98c0f142d2ab6a599116a1441a322ca724e1e9ce8980e9d WHIRLPOOL db26f779bb1b1524c71cdf1e5418d3b24cebcef6ea7d936fd830725d85e27b418865b2b38beefc053ddaf543c85df2c4017843b3a121e62f42ae45b4ea61efd8
-DIST xfce4-places-plugin-1.4.0.tar.bz2 342919 SHA256 d2a451a35096ecb8b6ca96ab0af3ebca3f163a7c8dc08627518940a633cce5e5 SHA512 a1a54a89d83ec1976e00a332fb2581854aad49c38ec75ccb9613ea08323ff8d59ed83f4d55e11810a9e0baa2a2ef641305a4ae8be6c279d9c1f0dd477aec39a6 WHIRLPOOL 0434730c00e4b6aa3edca7d5398bcccb7f99d129efcd87b558fb84712df9e55dc2682cf5490b7b3749ac50fc1d02346ec0d975249dfd7934c0ea537ad765d3de
 DIST xfce4-places-plugin-1.5.0.tar.bz2 344386 SHA256 6996051669a13d4791a5a453747801dc2f7f6fa5546785622d80b34966283d44 SHA512 ae10c0dc501ccd0749ed1b02d87b992cae4ab74f76e40787bc04fc0044fd0a156a35ed0aa9ba6ff32ec5db837d6c22c5ee5e36bc55bac66ceabb2e7dba1a641a WHIRLPOOL 8b4e9c0fc56ee95e59f5948c4839baaef221e4aacf43ee485c5681ce5b426dc7290fc97af4aadad6e96da10fdd56fc271dac5782346af79b44bda4369bbee8b2
diff --git a/xfce-extra/xfce4-places-plugin/xfce4-places-plugin-1.4.0.ebuild b/xfce-extra/xfce4-places-plugin/xfce4-places-plugin-1.4.0.ebuild
deleted file mode 100644
index cae8db3bcea0..000000000000
--- a/xfce-extra/xfce4-places-plugin/xfce4-places-plugin-1.4.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-places-plugin/xfce4-places-plugin-1.4.0.ebuild,v 1.1 2012/08/28 17:54:04 ssuominen Exp $
-
-EAPI=4
-inherit xfconf
-
-DESCRIPTION="A panel plug-in to provide quick access to files, folders and removable media"
-HOMEPAGE="http://goodies.xfce.org/projects/panel-plugins/xfce4-places-plugin"
-SRC_URI="mirror://xfce/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
-IUSE="debug libnotify"
-
-RDEPEND=">=dev-libs/glib-2.22
-	>=x11-libs/gtk+-2.14:2
-	x11-libs/libX11
-	>=xfce-base/exo-0.6
-	>=xfce-base/libxfce4ui-4.8
-	>=xfce-base/libxfce4util-4.8
-	>=xfce-base/xfce4-panel-4.8
-	libnotify? ( >=x11-libs/libnotify-0.7 )"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig"
-
-pkg_setup() {
-	XFCONF=(
-		$(use_enable libnotify notifications)
-		$(xfconf_use_debug)
-		)
-
-	DOCS=( AUTHORS ChangeLog NEWS README TODO )
-}
diff --git a/xfce-extra/xfce4-weather-plugin/Manifest b/xfce-extra/xfce4-weather-plugin/Manifest
index 4b6b9dcc2f30..dc9173774502 100644
--- a/xfce-extra/xfce4-weather-plugin/Manifest
+++ b/xfce-extra/xfce4-weather-plugin/Manifest
@@ -1,3 +1,2 @@
 DIST xfce4-weather-plugin-0.7.4.tar.bz2 686773 SHA256 3f76207b8a845d15bfec6825bd5300aedd086c455259c4dd8670a89a3c8ab382 SHA512 29dc5bf0ed2992236dd06b4b6315ecd11a5e2d82d26bc115e7ae2bf8a405d8a28ba8c974afbb97fc31a33c3baa069309c8f5d5641c8cf34722ca267bd2b8e78d WHIRLPOOL 6293a161cd8d494be30dad1ec78cb60c0b194cffd8ffbcad1ad0bf2dd5d1e6c5697a7733eba776f2ea9e4f6b1e6309792c7ef90e147af12b57acdffb2e3dce88
-DIST xfce4-weather-plugin-0.8.1.tar.bz2 662546 SHA256 a03a001065afdd8a167a44b96885d70013290b88d82e7deec45a2d294411077d SHA512 0bc44e91df83ff0459fb7ad74c470babe9d77532655aeb52e02737f2917fe1650715f772147f46b1427a17598a9cb2edc7db6484daf221c5f8ed2c58539643ba WHIRLPOOL 128a4289a7b34e414af87a944951fa1a06bb135d97ea92b0dae5028d9f58b65f12320a80680fe695400ee2528c6599f4dd4b88cbefc02bd78d06fd17833924c6
 DIST xfce4-weather-plugin-0.8.2.tar.bz2 730631 SHA256 9506a3b1c04992202790b1deac8bbef8ed4933a0becd5c8e61194118e7eb67fe SHA512 938c5ea7caa2f820d3a4324496da7550028224b058774dfd6551ec0488f284852f124a2f9c1c66112d39f4412ae669d7b36da72bcb3737727bc5d1657a61b564 WHIRLPOOL 2dfe87abdd7d89e882da1d7964ae7c1092e8b6a4e9238b3b7da48afc4edd12ac402805a884ae1233f04d5e3afdb68725f3c579265c72ea4f6af5d271620decd9
diff --git a/xfce-extra/xfce4-weather-plugin/xfce4-weather-plugin-0.8.1.ebuild b/xfce-extra/xfce4-weather-plugin/xfce4-weather-plugin-0.8.1.ebuild
deleted file mode 100644
index b2266f841b1a..000000000000
--- a/xfce-extra/xfce4-weather-plugin/xfce4-weather-plugin-0.8.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-weather-plugin/xfce4-weather-plugin-0.8.1.ebuild,v 1.1 2012/08/06 11:54:27 ssuominen Exp $
-
-EAPI=4
-inherit xfconf
-
-DESCRIPTION="A weather plug-in for the Xfce desktop environment"
-HOMEPAGE="http://goodies.xfce.org/projects/panel-plugins/xfce4-weather-plugin"
-SRC_URI="mirror://xfce/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-RDEPEND=">=dev-libs/glib-2
-	dev-libs/libxml2
-	x11-libs/gtk+:2
-	>=xfce-base/libxfce4ui-4.8
-	>=xfce-base/libxfce4util-4.8
-	>=xfce-base/xfce4-panel-4.8"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig"
-
-pkg_setup() {
-	XFCONF=(
-		$(xfconf_use_debug)
-		)
-
-	DOCS=( AUTHORS ChangeLog NEWS README TODO )
-}