diff --git a/dev-python/netifaces/Manifest b/dev-python/netifaces/Manifest
new file mode 100644
index 000000000000..210e82e3aeeb
--- /dev/null
+++ b/dev-python/netifaces/Manifest
@@ -0,0 +1 @@
+DIST netifaces-0.5.tar.gz 9069 RMD160 0cc9cfffdc1abd057aea2ed27403b269e92dba69 SHA1 8b79e65bc6871bbb5d8160ae52fa4983e97ed347 SHA256 6348530ac1ea3af93547ffe5af83776e1f107efa86e8af082ea8c05975986b46
diff --git a/dev-python/netifaces/metadata.xml b/dev-python/netifaces/metadata.xml
new file mode 100644
index 000000000000..01874fb19779
--- /dev/null
+++ b/dev-python/netifaces/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>python</herd>
+<maintainer>
+<email>xmw@gentoo.org</email>
+<name>Michael Weber</name>
+</maintainer>
+</pkgmetadata>
+
diff --git a/dev-python/netifaces/netifaces-0.5.ebuild b/dev-python/netifaces/netifaces-0.5.ebuild
new file mode 100644
index 000000000000..95f96a7109d0
--- /dev/null
+++ b/dev-python/netifaces/netifaces-0.5.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/netifaces/netifaces-0.5.ebuild,v 1.1 2011/11/11 01:22:43 xmw Exp $
+
+EAPI=3
+
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.*"
+
+inherit distutils python
+
+DESCRIPTION="Portable network interface information"
+HOMEPAGE="http://alastairs-place.net/netifaces/"
+SRC_URI="http://alastairs-place.net/2007/03/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools"
+RDEPEND=""
+
diff --git a/dev-util/valgrind/Manifest b/dev-util/valgrind/Manifest
index 3fcf632dafbc..25cd158d2ab3 100644
--- a/dev-util/valgrind/Manifest
+++ b/dev-util/valgrind/Manifest
@@ -4,3 +4,4 @@ DIST valgrind-3.4.1.tar.bz2 5183739 RMD160 425127a02b3707d8d8f2e1ff37e9609a2d0dc
 DIST valgrind-3.5.0.tar.bz2 5482423 RMD160 dd0ca80d73daac774b9352fe7a07ab72aae767c9 SHA1 76678c2617278cc9fbda1232e4e56fb2a96b0eb8 SHA256 743a5132bbebc247169aefae6e17657677fdf0961aba1668dd4ee7028d27ba80
 DIST valgrind-3.6.0.tar.bz2 5962204 RMD160 d7adc13bdafb1e5057d2e2a7a41076c1acabc368 SHA1 6f7ae88d36dfb45c337175a873aada7bed01c8c3 SHA256 bc0f0153b5a47b986f1d8efa2c488e0aea85a1cf2c4b11c52be127903080285f
 DIST valgrind-3.6.1.tar.bz2 5974836 RMD160 6f78ae50e2fb354547d90bf289abb1f56252043a SHA1 6116ddca2708f56e0a2851bdfbe88e01906fa300 SHA256 49bdcc4fbcf060049b5f0dcfd8a187a6e90e0b0e57309f633b64e44430726a0e
+DIST valgrind-3.7.0.tar.bz2 6624216 RMD160 6ffbf04a8ff4eb2555d1a6bd87c0656828830761 SHA1 b412f49895bb8a78fc314047119760b5d36e5b5e SHA256 5d62c0330f1481fe2c593249192fa68ff454c19c34343978cc9ce91aa324cbf6
diff --git a/dev-util/valgrind/files/valgrind-3.7.0-fix-gcc-regex.patch b/dev-util/valgrind/files/valgrind-3.7.0-fix-gcc-regex.patch
new file mode 100644
index 000000000000..3233333ce1b9
--- /dev/null
+++ b/dev-util/valgrind/files/valgrind-3.7.0-fix-gcc-regex.patch
@@ -0,0 +1,12 @@
+diff -Naur valgrind-3.7.0.orig//configure.in valgrind-3.7.0/configure.in
+--- valgrind-3.7.0.orig//configure.in	2011-11-05 07:13:30.000000000 -0400
++++ valgrind-3.7.0/configure.in	2011-11-10 18:13:39.000000000 -0500
+@@ -109,7 +109,7 @@
+              | head -n 1 \
+              | $SED 's/i686-apple-darwin10//' \
+              | $SED 's/i686-apple-darwin11//' \
+-             | $SED 's/^[^0-9]*\([0-9.]*\).*$/\1/'`]
++             | $SED 's/.*\s\([.0-9]*\)$/\1/'`]
+ 
+ is_clang="notclang"
+ if test "x`${CC} --version | head -n 1 | $SED 's/\(clang\) version.*/\1/'`" = "xclang" ; then
diff --git a/dev-util/valgrind/files/valgrind-3.7.0-fno-stack-protector.patch b/dev-util/valgrind/files/valgrind-3.7.0-fno-stack-protector.patch
new file mode 100644
index 000000000000..6af455319567
--- /dev/null
+++ b/dev-util/valgrind/files/valgrind-3.7.0-fno-stack-protector.patch
@@ -0,0 +1,12 @@
+diff -Naur valgrind-3.7.0.orig//Makefile.all.am valgrind-3.7.0/Makefile.all.am
+--- valgrind-3.7.0.orig//Makefile.all.am	2011-10-26 17:24:45.000000000 -0400
++++ valgrind-3.7.0/Makefile.all.am	2011-11-10 16:18:18.000000000 -0500
+@@ -82,7 +82,7 @@
+ # performance and get whatever useful warnings we can out of gcc.
+ # -fno-builtin is important for defeating LLVM's idiom recognition
+ # that somehow causes VG_(memset) to get into infinite recursion.
+-AM_CFLAGS_BASE = \
++AM_CFLAGS_BASE = -fno-stack-protector \
+ 	-O2 -g \
+ 	-Wall \
+ 	-Wmissing-prototypes \
diff --git a/dev-util/valgrind/files/valgrind-3.7.0-non-exec-stack.patch b/dev-util/valgrind/files/valgrind-3.7.0-non-exec-stack.patch
new file mode 100644
index 000000000000..d6cc26dab112
--- /dev/null
+++ b/dev-util/valgrind/files/valgrind-3.7.0-non-exec-stack.patch
@@ -0,0 +1,138 @@
+diff -Naur valgrind-3.7.0.orig//coregrind/Makefile.am valgrind-3.7.0/coregrind/Makefile.am
+--- valgrind-3.7.0.orig//coregrind/Makefile.am	2011-11-10 20:02:47.000000000 -0500
++++ valgrind-3.7.0/coregrind/Makefile.am	2011-11-10 20:03:00.000000000 -0500
+@@ -292,14 +292,6 @@
+ 	m_demangle/demangle.c \
+ 	m_demangle/dyn-string.c \
+ 	m_demangle/safe-ctype.c \
+-	m_dispatch/dispatch-x86-linux.S \
+-	m_dispatch/dispatch-amd64-linux.S \
+-	m_dispatch/dispatch-ppc32-linux.S \
+-	m_dispatch/dispatch-ppc64-linux.S \
+-	m_dispatch/dispatch-arm-linux.S \
+-	m_dispatch/dispatch-s390x-linux.S \
+-	m_dispatch/dispatch-x86-darwin.S \
+-	m_dispatch/dispatch-amd64-darwin.S \
+ 	m_gdbserver/m_gdbserver.c \
+ 	m_gdbserver/inferiors.c \
+ 	m_gdbserver/m_gdbserver.c \
+@@ -322,8 +314,6 @@
+ 	m_initimg/initimg-pathscan.c \
+ 	m_mach/mach_basics.c \
+ 	m_mach/mach_msg.c \
+-	m_mach/mach_traps-x86-darwin.S \
+-	m_mach/mach_traps-amd64-darwin.S \
+ 	m_replacemalloc/replacemalloc_core.c \
+ 	m_scheduler/scheduler.c \
+ 	m_scheduler/sema.c \
+@@ -335,14 +325,6 @@
+ 	m_sigframe/sigframe-s390x-linux.c \
+ 	m_sigframe/sigframe-x86-darwin.c \
+ 	m_sigframe/sigframe-amd64-darwin.c \
+-	m_syswrap/syscall-x86-linux.S \
+-	m_syswrap/syscall-amd64-linux.S \
+-	m_syswrap/syscall-ppc32-linux.S \
+-	m_syswrap/syscall-ppc64-linux.S \
+-	m_syswrap/syscall-arm-linux.S \
+-	m_syswrap/syscall-s390x-linux.S \
+-	m_syswrap/syscall-x86-darwin.S \
+-	m_syswrap/syscall-amd64-darwin.S \
+ 	m_syswrap/syswrap-main.c \
+ 	m_syswrap/syswrap-generic.c \
+ 	m_syswrap/syswrap-linux.c \
+@@ -361,6 +343,24 @@
+ 	m_ume/main.c \
+ 	m_ume/script.c
+ 
++COREGRIND_SOURCES_COMMON += \
++	m_dispatch/dispatch-@VGCONF_ARCH_PRI@-@VGCONF_OS@.S \
++	m_syswrap/syscall-@VGCONF_ARCH_PRI@-@VGCONF_OS@.S
++
++if VGCONF_HAVE_PLATFORM_SEC
++COREGRIND_SOURCES_COMMON += \
++	m_dispatch/dispatch-@VGCONF_ARCH_SEC@-@VGCONF_OS@.S \
++	m_syswrap/syscall-@VGCONF_ARCH_SEC@-@VGCONF_OS@.S
++endif
++
++if VGCONF_OS_IS_DARWIN
++COREGRIND_SOURCES_COMMON += \
++	m_start-@VGCONF_ARCH_PRI@-darwin.S \
++	m_start-@VGCONF_ARCH_SEC@-darwin.S \
++	m_mach/mach_traps-@VGCONF_ARCH_PRI@-darwin.S \
++	m_mach/mach_traps-@VGCONF_ARCH_SEC@-darwin.S
++endif
++
+ libcoregrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_a_SOURCES = \
+     $(COREGRIND_SOURCES_COMMON)
+ nodist_libcoregrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_a_SOURCES = \
+diff -Naur valgrind-3.7.0.orig//coregrind/m_dispatch/dispatch-amd64-linux.S valgrind-3.7.0/coregrind/m_dispatch/dispatch-amd64-linux.S
+--- valgrind-3.7.0.orig//coregrind/m_dispatch/dispatch-amd64-linux.S	2011-10-26 17:24:42.000000000 -0400
++++ valgrind-3.7.0/coregrind/m_dispatch/dispatch-amd64-linux.S	2011-11-10 20:07:40.000000000 -0500
+@@ -349,11 +349,11 @@
+ 	ret
+ .size VG_(run_a_noredir_translation), .-VG_(run_a_noredir_translation)
+ 
++#endif // defined(VGP_amd64_linux)
++
+ /* Let the linker know we don't need an executable stack */
+ .section .note.GNU-stack,"",@progbits
+ 
+-#endif // defined(VGP_amd64_linux)
+-
+ /*--------------------------------------------------------------------*/
+ /*--- end                                                          ---*/
+ /*--------------------------------------------------------------------*/
+diff -Naur valgrind-3.7.0.orig//coregrind/m_dispatch/dispatch-x86-linux.S valgrind-3.7.0/coregrind/m_dispatch/dispatch-x86-linux.S
+--- valgrind-3.7.0.orig//coregrind/m_dispatch/dispatch-x86-linux.S	2011-10-26 17:24:42.000000000 -0400
++++ valgrind-3.7.0/coregrind/m_dispatch/dispatch-x86-linux.S	2011-11-10 20:04:07.000000000 -0500
+@@ -320,12 +320,11 @@
+ 	ret
+ .size VG_(run_a_noredir_translation), .-VG_(run_a_noredir_translation)
+ 
+-			
++#endif // defined(VGP_x86_linux)
++
+ /* Let the linker know we don't need an executable stack */
+ .section .note.GNU-stack,"",@progbits
+ 
+-#endif // defined(VGP_x86_linux)
+-
+ /*--------------------------------------------------------------------*/
+ /*--- end                                                          ---*/
+ /*--------------------------------------------------------------------*/
+diff -Naur valgrind-3.7.0.orig//coregrind/m_syswrap/syscall-amd64-linux.S valgrind-3.7.0/coregrind/m_syswrap/syscall-amd64-linux.S
+--- valgrind-3.7.0.orig//coregrind/m_syswrap/syscall-amd64-linux.S	2011-11-10 20:02:47.000000000 -0500
++++ valgrind-3.7.0/coregrind/m_syswrap/syscall-amd64-linux.S	2011-11-10 20:03:00.000000000 -0500
+@@ -205,11 +205,11 @@
+ ML_(blksys_finished):	.quad 5b
+ .previous
+ 
++#endif // defined(VGP_amd64_linux)
++
+ /* Let the linker know we don't need an executable stack */
+ .section .note.GNU-stack,"",@progbits
+ 
+-#endif // defined(VGP_amd64_linux)
+-
+ /*--------------------------------------------------------------------*/
+ /*--- end                                                          ---*/
+ /*--------------------------------------------------------------------*/
+diff -Naur valgrind-3.7.0.orig//coregrind/m_syswrap/syscall-x86-linux.S valgrind-3.7.0/coregrind/m_syswrap/syscall-x86-linux.S
+--- valgrind-3.7.0.orig//coregrind/m_syswrap/syscall-x86-linux.S	2011-11-10 20:02:47.000000000 -0500
++++ valgrind-3.7.0/coregrind/m_syswrap/syscall-x86-linux.S	2011-11-10 20:03:00.000000000 -0500
+@@ -164,12 +164,12 @@
+ ML_(blksys_committed):	.long 4b
+ ML_(blksys_finished):	.long 5b
+ .previous
+-	
+-/* Let the linker know we don't need an executable stack */
+-.section .note.GNU-stack,"",@progbits
+ 
+ #endif // defined(VGP_x86_linux)
+ 
++/* Let the linker know we don't need an executable stack */
++.section .note.GNU-stack,"",@progbits
++
+ /*--------------------------------------------------------------------*/
+ /*--- end                                                          ---*/
+ /*--------------------------------------------------------------------*/
diff --git a/dev-util/valgrind/files/valgrind-3.7.0-respect-flags.patch b/dev-util/valgrind/files/valgrind-3.7.0-respect-flags.patch
new file mode 100644
index 000000000000..860e09c86ed3
--- /dev/null
+++ b/dev-util/valgrind/files/valgrind-3.7.0-respect-flags.patch
@@ -0,0 +1,13 @@
+diff -Naur valgrind-3.7.0.orig//mpi/Makefile.am valgrind-3.7.0/mpi/Makefile.am
+--- valgrind-3.7.0.orig//mpi/Makefile.am	2011-10-26 17:24:23.000000000 -0400
++++ valgrind-3.7.0/mpi/Makefile.am	2011-11-10 16:03:14.000000000 -0500
+@@ -7,9 +7,6 @@
+ CC = $(MPI_CC)
+ DEFS =
+ DEFAULT_INCLUDES =
+-CPPFLAGS =
+-CFLAGS =
+-LDFLAGS =
+ 
+ EXTRA_DIST = \
+ 	mpiwrap_type_test.c
diff --git a/dev-util/valgrind/valgrind-3.7.0.ebuild b/dev-util/valgrind/valgrind-3.7.0.ebuild
new file mode 100644
index 000000000000..5f5f18241da3
--- /dev/null
+++ b/dev-util/valgrind/valgrind-3.7.0.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/valgrind-3.7.0.ebuild,v 1.1 2011/11/11 01:40:06 blueness Exp $
+
+EAPI=4
+inherit autotools eutils flag-o-matic toolchain-funcs multilib pax-utils
+
+DESCRIPTION="An open-source memory debugger for GNU/Linux"
+HOMEPAGE="http://www.valgrind.org"
+SRC_URI="http://www.valgrind.org/downloads/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="mpi"
+
+DEPEND="mpi? ( virtual/mpi )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	# Correct hard coded doc location
+	sed -i -e "s:doc/valgrind:doc/${PF}:" docs/Makefile.am || die
+
+	# Respect CFLAGS, LDFLAGS
+	epatch "${FILESDIR}"/${PN}-3.7.0-respect-flags.patch
+
+	# Changing Makefile.all.am to disable SSP
+	epatch "${FILESDIR}"/${PN}-3.7.0-fno-stack-protector.patch
+
+	# Yet more local labels, this time for ppc32 & ppc64
+	epatch "${FILESDIR}"/${PN}-3.6.0-local-labels.patch
+
+	# Don't build in empty assembly files for other platforms or we'll get a QA
+	# warning about executable stacks.
+	epatch "${FILESDIR}"/${PN}-3.7.0-non-exec-stack.patch
+
+	# Fix the regex to get gcc's version
+	epatch "${FILESDIR}"/${PN}-3.7.0-fix-gcc-regex.patch
+
+	# Regenerate autotools files
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+
+	# -fomit-frame-pointer	"Assembler messages: Error: junk `8' after expression"
+	#                       while compiling insn_sse.c in none/tests/x86
+	# -fpie                 valgrind seemingly hangs when built with pie on
+	#                       amd64 (bug #102157)
+	# -fstack-protector     more undefined references to __guard and __stack_smash_handler
+	#                       because valgrind doesn't link to glibc (bug #114347)
+	# -ggdb3                segmentation fault on startup
+	filter-flags -fomit-frame-pointer
+	filter-flags -fpie
+	filter-flags -fstack-protector
+	replace-flags -ggdb3 -ggdb2
+
+	if use amd64 || use ppc64; then
+		! has_multilib_profile && myconf="${myconf} --enable-only64bit"
+	fi
+
+	# Don't use mpicc unless the user asked for it (bug #258832)
+	if ! use mpi; then
+		myconf="${myconf} --without-mpicc"
+	fi
+
+	econf ${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc AUTHORS FAQ.txt NEWS README*
+
+	pax-mark m "${D}"/usr/$(get_libdir)/valgrind/*-*-linux
+}
+
+pkg_postinst() {
+	ewarn "Valgrind will not work if glibc does not have debug symbols."
+	ewarn "To fix this you can add splitdebug to FEATURES in make.conf"
+	ewarn "and remerge glibc.  See:"
+	ewarn "https://bugs.gentoo.org/show_bug.cgi?id=214065"
+	ewarn "https://bugs.gentoo.org/show_bug.cgi?id=274771"
+	ewarn "https://bugs.gentoo.org/show_bug.cgi?id=388703"
+}
diff --git a/eclass/flag-o-matic.eclass b/eclass/flag-o-matic.eclass
index 217b736c0e2c..7ae62e14d3de 100644
--- a/eclass/flag-o-matic.eclass
+++ b/eclass/flag-o-matic.eclass
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/flag-o-matic.eclass,v 1.156 2011/10/08 18:37:30 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/flag-o-matic.eclass,v 1.157 2011/11/11 07:06:25 dirtyepic Exp $
 
 # @ECLASS: flag-o-matic.eclass
 # @MAINTAINER:
@@ -154,7 +154,7 @@ append-cppflags() {
 # Add extra <flags> to the current CFLAGS.
 append-cflags() {
 	[[ -z $* ]] && return 0
-	export CFLAGS="${CFLAGS} $*"
+	export CFLAGS=$(test-flags-CC ${CFLAGS} $*)
 	return 0
 }
 
@@ -164,7 +164,7 @@ append-cflags() {
 # Add extra <flags> to the current CXXFLAGS.
 append-cxxflags() {
 	[[ -z $* ]] && return 0
-	export CXXFLAGS="${CXXFLAGS} $*"
+	export CXXFLAGS=$(test-flags-CXX ${CXXFLAGS} $*)
 	return 0
 }
 
@@ -174,8 +174,8 @@ append-cxxflags() {
 # Add extra <flags> to the current {F,FC}FLAGS.
 append-fflags() {
 	[[ -z $* ]] && return 0
-	export FFLAGS="${FFLAGS} $*"
-	export FCFLAGS="${FCFLAGS} $*"
+	export FFLAGS=$(test-flags-F77 ${FFLAGS} $*)
+	export FCFLAGS=$(test-flags-FC ${FCFLAGS} $*)
 	return 0
 }
 
diff --git a/eclass/mozconfig-3.eclass b/eclass/mozconfig-3.eclass
index 7bda3e06eef4..ee8a3a51a9dc 100644
--- a/eclass/mozconfig-3.eclass
+++ b/eclass/mozconfig-3.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mozconfig-3.eclass,v 1.23 2011/08/20 21:51:25 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mozconfig-3.eclass,v 1.24 2011/11/11 01:37:44 anarchy Exp $
 #
 # mozconfig.eclass: the new mozilla.eclass
 
@@ -61,26 +61,24 @@ mozconfig_config() {
 		mozconfig_annotate 'mozjs' --enable-shared-js
 	fi
 
-	if [[ ${PN} != thunderbird ]]; then
-		if has +webm ${IUSE} && use webm; then
-			if ! use alsa; then
-				echo "Enabling alsa support due to webm request"
-				mozconfig_annotate '+webm -alsa' --enable-ogg
-				mozconfig_annotate '+webm -alsa' --enable-wave
-				mozconfig_annotate '+webm' --enable-webm
-				mozconfig_annotate '+webm' --with-system-libvpx="${EPREFIX}"/usr
-			else
-				mozconfig_use_enable webm
-				mozconfig_annotate '+webm' --with-system-libvpx="${EPREFIX}"/usr
-			fi
+	if has +webm ${IUSE} && use webm; then
+		if ! use alsa; then
+			echo "Enabling alsa support due to webm request"
+			mozconfig_annotate '+webm -alsa' --enable-ogg
+			mozconfig_annotate '+webm -alsa' --enable-wave
+			mozconfig_annotate '+webm' --enable-webm
+			mozconfig_annotate '+webm' --with-system-libvpx="${EPREFIX}"/usr
 		else
-			mozconfig_annotate '' --disable-webm
-			mozconfig_annotate '' --disable-system-libvpx
+			mozconfig_use_enable webm
+			mozconfig_annotate '+webm' --with-system-libvpx="${EPREFIX}"/usr
 		fi
+	else
+		mozconfig_annotate '' --disable-webm
+		mozconfig_annotate '' --disable-system-libvpx
+	fi
 
-		if use amd64 || use x86 || use arm || use sparc; then
-			mozconfig_annotate '' --enable-tracejit
-		fi
+	if use amd64 || use x86 || use arm || use sparc; then
+		mozconfig_annotate '' --enable-tracejit
 	fi
 
 	# These are enabled by default in all mozilla applications
diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest
index a3f45ce40af6..971597763bf9 100644
--- a/mail-client/thunderbird/Manifest
+++ b/mail-client/thunderbird/Manifest
@@ -1,5 +1,7 @@
 DIST enigmail-1.3.2.tar.gz 1371388 RMD160 f9320279e67767a8023ac863b8d089e370018201 SHA1 8bf39664f22e383d026c07d4acd714a1ccfd9d6d SHA256 46ffa074829472ba6714e1ada37b8cc083d0dd4e16c21ad0c2893c5eef68893d
+DIST enigmail-1.3.3.tar.gz 1367995 RMD160 4c7ab726052b566f913612cfbdd767714486bf9c SHA1 a6d61b6dbdcfdb0dc4eaa8aac1b6277fed65c8c5 SHA256 7110d2f0eea8a9a7580ddc13ab56c262bbd33776ebdc34ab19ec90143f010be6
 DIST firefox-7.0-patches-0.5.tar.xz 14652 RMD160 94593a3e01247b4e5fe9c01a80e902937ed3b32b SHA1 c9cfd5e46a18e4e6adfa8334936f854c3e14a687 SHA256 e2f1de9cfbb87cd982ed205b3b5f33e3bcd952b2093a9969281a761cc0a9e293
+DIST firefox-8.0-patches-0.2.tar.xz 8032 RMD160 221500ed4f56e9c139f563d598bf38df448e5652 SHA1 f41c04c659a253d464ab9bb2c169c1b99b22d443 SHA256 52d351133187dfb7b367950f4da543b06b9f0666f6c07b8bbb5b21cd3d40b0c3
 DIST thunderbird-3.1-patches-1.2.tar.bz2 3427 RMD160 354d9003e8132e0aaf7069aec84459ff28237f61 SHA1 36ad5f9af77eaacc02c7df744b5d2563fb54bed8 SHA256 6586cf569b035bd1b9179036678a0cbedbf3def88ca7d69852451542b52693a0
 DIST thunderbird-3.1.12-af.xpi 210617 RMD160 0d8a79d8066b6706090f6c0a55a0c89423542eab SHA1 abadfd892e896e87a8a394bdc5a1ee6c4aa7f65f SHA256 00d47a4b1443689a328d4903ccea06a058d2d847789442d4a044212bb6813b56
 DIST thunderbird-3.1.12-ar.xpi 230333 RMD160 a9ddde633984f2c431c960870e5d33eac78089ad SHA1 beeff8853f470b9c24f308ce0ad93a95686c7378 SHA256 706f67296c7058d694c712964239b44dcfc4a93ab1148b70fee22ed1056c6832
@@ -177,3 +179,42 @@ DIST thunderbird-7.0.1-tr.xpi 403127 RMD160 50dbfd65e13f604d0d88dc8c675fec9b36ba
 DIST thunderbird-7.0.1-uk.xpi 454368 RMD160 a3f00a485bd9236a02b466f34f1d0634df8a4499 SHA1 09163cc5347c1baf0c0b475a2c0b7b4a779f60a2 SHA256 b2d7ab67be708e4f3ed02d0701748c027250491f9aa41a0f60d150cd8fb41466
 DIST thunderbird-7.0.1-zh-TW.xpi 420847 RMD160 95095a3f45c4dd38983d9e5d9b6087e57600564e SHA1 defbc32b529699297e8f58642d0530ab2ee0d609 SHA256 7362f1cc5541006c06f1373d1cd90a4c04d496b5b79443524af7d1654a73d668
 DIST thunderbird-7.0.1.source.tar.bz2 87405591 RMD160 04d39464b5c7c3128a00b0eaff806b3307e0a22e SHA1 ccfc6fe3fe4ad07b214e20bc440d20e14d3ffbe5 SHA256 83f578bbfa0cb5d0f7faba6214993806050fab3e2039996344a11c9457525242
+DIST thunderbird-8.0-ar.xpi 429682 RMD160 ac02f62b746232efcbbf622e7d2a84269194441f SHA1 da148179119926bfb2305e2157ccbe6edee86e79 SHA256 ac50815d26c950b51a930239facf46c1225f8c052dc7610106fa74573b187b96
+DIST thunderbird-8.0-ca.xpi 407844 RMD160 f0860202c3b3ca2117373a657f08585e79b8fb23 SHA1 676c0b2904b282649323ee8287eede0fd011f31d SHA256 f9cbd66875016bf18e84d0ffcae1b394d020c6166f1626b95cdb04ea431c20b8
+DIST thunderbird-8.0-cs.xpi 410932 RMD160 efb7559493f30a25d0707b36240d28c4fb5e9647 SHA1 4a1efdaa8b7cc497a48dc91d35e69464cfa2695c SHA256 1fd879a3802d455a10db9b94c74449663920b6dd9e7dec487c9a782898fc4c6e
+DIST thunderbird-8.0-da.xpi 353524 RMD160 ef82b894d5c104f20a301f498e4ecb778343c50f SHA1 f60819da07a43405faf6d88a9163ed964ac5095f SHA256 db28f6e245304488923e153e5e692b3ade8d736bc42c2fd8c1af065c973370ef
+DIST thunderbird-8.0-de.xpi 409617 RMD160 65e0a6ff2e8f1dd192ae06235def1d269bef7202 SHA1 514cc2f40cca34be61a0e4287f1f01a00c96def8 SHA256 d8047dafbcf85f520ec268c633e0a704bd276b0e46d972302d54356f558883f2
+DIST thunderbird-8.0-en-GB.xpi 384202 RMD160 37331b2e48c0fc12c25d1e290c352187ab326332 SHA1 95dbc9cd72a58d6d2b6cc7e6d38846eef15ff6cc SHA256 77a53b255f1a526166415eb2c7398a6d7a07a23f46d2737714bfbded8972bb8f
+DIST thunderbird-8.0-es-AR.xpi 402208 RMD160 7f9cb8d89f54e5b8e022b152f69a542d978c3612 SHA1 83dba6b048b1fd6132bf9ff286e3e492208b1dc9 SHA256 3d23032bc87e257a749ce7a877897ee4e05c64930ebec9e743eec07c52ac26dc
+DIST thunderbird-8.0-es-ES.xpi 345966 RMD160 87b19f178bcd1dae36dc2896b1e751efb934a7af SHA1 9f9e2965fb1786f44a9e4998d4bbceb6ffb2eb30 SHA256 9e4d21fa3b1387977ae4a6bf69395b48de8560e0330ee964c210a06fbf0c0327
+DIST thunderbird-8.0-et.xpi 402614 RMD160 f8b05fbb5b6a84da11fd7827c3400b9d8fb91916 SHA1 c6c9d8a80d7bff3e909a955f7e8653a65b306439 SHA256 7e866bb4f163e8aac567266414e20877bb9c6d0525d6621d717cdef1a9715ed2
+DIST thunderbird-8.0-eu.xpi 398556 RMD160 71c8a71728fb9bfa9b71fcb682aa145d7e64ec7a SHA1 1fcb6c067f2d5355b6940fc9693ff584eca81741 SHA256 af1a9e5cd29befc818ab5b93ce3b5058766f80fe0feeaedd261a702e56d1853c
+DIST thunderbird-8.0-fi.xpi 403666 RMD160 0889d030e832d3f1a894bf3641ef3b98af3c7265 SHA1 fb984fbcbb0cbbc97779bc3abf87ebfefad24782 SHA256 e2c94b11072377e3ce6758a6f3b607e03fa7a0073e167b31ee097e0363b6c50c
+DIST thunderbird-8.0-fr.xpi 406258 RMD160 8e6684d7cb942b34c69d467619c42599dd1f02cd SHA1 55d3d5117f36bb5451cf3e040317cdd67b444487 SHA256 5384e5e75061ab504ea3f6284d9f6232826f596d6785c392e795dbf27a2139b2
+DIST thunderbird-8.0-fy-NL.xpi 406182 RMD160 18b02278929414909101c8d550a05ef5407484ac SHA1 b1df077e7fe68ebb69133655821f640915ea4a79 SHA256 fbf0e7e59f36aa2770ddc129b0da453c5ccec1fc26ab08c1d37bb2ea1baec890
+DIST thunderbird-8.0-ga-IE.xpi 414791 RMD160 5f5843a6fdfcbb47c84266ed57aa03bed0d197f0 SHA1 e8f77908d61f82796fa80c974b821aed7a82f421 SHA256 6f193c7ab8d86e01bd305cb480ce4d1d3c40952b29d451ad53a87f7d25c399db
+DIST thunderbird-8.0-he.xpi 429157 RMD160 cbcd11073637c0a8ffb4200ca7b93caf6a78f1fc SHA1 d58b666d5a7ec7cd8c3ea6215f9a48a84fde8316 SHA256 15049fbc3a1d41d4c69013ab18679994e6530a65c47051388dd51ec605e82562
+DIST thunderbird-8.0-hu.xpi 418308 RMD160 d5c39902eb580bfe74cb0d9f8fd50927c52418b3 SHA1 47bd74822aafe1326d4a86bc998edafcec9bf45e SHA256 2ba9485a7d3ed1fc7962f5776ab02856a7b6c847345b03fd54c6bb80e10a8e08
+DIST thunderbird-8.0-is.xpi 404491 RMD160 4b3f8f95b25bfcd49e1a58f90d0f1138a1134820 SHA1 88336dc416de62a1f021233fee8c66e9c88e07cc SHA256 60110ee7c61ccfeca0560a49eacb50423f73f183a964f58b74ae37d8e564443c
+DIST thunderbird-8.0-it.xpi 338611 RMD160 f5e5a492c30dcafa6d8858419dec3adb2f551d88 SHA1 acdba9e5a105d855e18e244b73c7e6c348421e33 SHA256 61c243264edee5bb95bc947b0732401f189b184863d2640128e00a19fac426b2
+DIST thunderbird-8.0-ja.xpi 450381 RMD160 71cafc3ebe76704b22a976d446cecd0c82fdecb9 SHA1 40f500176e13716c2f74ddb620be3d3681a89751 SHA256 1ffc9c291893601172be91f50b25b651c18ea008def94b858a12147872da2ce9
+DIST thunderbird-8.0-ko.xpi 362650 RMD160 9a55eea99af12cc333b3aceff54a6e2e1d45057a SHA1 5d55df5d8451c875ccafd8247f0e971102fae5c9 SHA256 b7063cad1f6ebe4c21dce881eb748a88aa906d23f248593d9bb53ba14381efba
+DIST thunderbird-8.0-lt.xpi 527185 RMD160 eab4cf6c9dba554aecd83647df27f79d217d9939 SHA1 727ae314f34aedbeda861ed3df7a93466810b901 SHA256 fcd2c44bdebe7866f087b088ce5103366e2241bc341cc24b771684bc1d06d253
+DIST thunderbird-8.0-nb-NO.xpi 399860 RMD160 b959cdbe5e5e5e061c9e414f5719c76e4f0e9d80 SHA1 a37e40e894e4f1dfaf5b77555d533c000087a667 SHA256 83b800ea6ddcf098f309a8e71f3de741973d0177c145be9b8bf896d23df5204d
+DIST thunderbird-8.0-nl.xpi 399870 RMD160 aa6068ebf5370de95b8118823b90e76d08b820ae SHA1 d9b71812e16505867c3d64a48d91cf203a3c6ed8 SHA256 bce99a6e95ae72bf6040d38c7fdfc5cd222b3362dd97e79e5af90f2e752adfcf
+DIST thunderbird-8.0-nn-NO.xpi 401462 RMD160 547fc9ea77a2e43c9c58f24f5c9299db9f793c50 SHA1 a91a42860fa6ab81e3ba381a2dd32bd16be8aa5a SHA256 7e93e1e0ed7c6e942c6858b4e003be1e9a7180822a251436cc8349be1784d5f9
+DIST thunderbird-8.0-patches-0.1.tar.xz 532 RMD160 4fd95b36f692fe6852eb65fe8bb8052913132047 SHA1 61eb8c40ad4b31025cd21b096c00a45ab8483193 SHA256 7dfee7ee0289645a5de7e3132d16412cd93713188d86a0a1ff4570a25cbe92c4
+DIST thunderbird-8.0-pl.xpi 386210 RMD160 9f393faab5504a98c876ac42fb6562a5115fd270 SHA1 5aa92c952156673ef354a2763f59430622447221 SHA256 040b62774df7f1e66b8af5d42031ac3bcd148c3646ee7815504aa2cc89322c4a
+DIST thunderbird-8.0-pt-BR.xpi 408964 RMD160 f53215aa67880eacea3108063b3ec0d14895c202 SHA1 eed871c5b8af96bc7c36391d3796ae6feb7acaeb SHA256 669f7ad7db9b02e8dd9e41be42cac56ff9a2826c971f656d17f0fee0a22bc397
+DIST thunderbird-8.0-pt-PT.xpi 405968 RMD160 29121ec74b43cd321a94eb83f761b091c4e272c2 SHA1 b2889c50eac0c0b583dd3f20e5d6d4f641f00397 SHA256 b2ff74fa2f888b8e29ae158d55ded0ce7660498460930ff0697f17e6e481a91f
+DIST thunderbird-8.0-ru.xpi 400687 RMD160 8ad0c810a54131cc344edf662c34b208f4e9c842 SHA1 823c97ed7a93c0c10c8cf2555ef4bb0556e0027a SHA256 a412dd6f6763972727007d76f837b5f1d8dd32ec35afc9490a3722437330dee6
+DIST thunderbird-8.0-si.xpi 448334 RMD160 7340edc0cf0326213dc7832931779f186fa76eaf SHA1 c48cace01c7659a87dfcf9beb045728b958767fc SHA256 fce2b953375d5b6fcf58d94bc4b676ae843103b5899fd3f5af5c5f7275e75631
+DIST thunderbird-8.0-sk.xpi 416338 RMD160 573654a59aa83e083182b00b4c81603d0ea5c83a SHA1 53b0146da50a8a5cbc3bbd9c4c3077c294e337af SHA256 e09edb3471eb06d3e21d85cbf2b889ccb041680150b28f43db2f46ae21ba6dff
+DIST thunderbird-8.0-sl.xpi 402625 RMD160 3da5c058d1953947b4fdb1f30371db296c3dc892 SHA1 34ac589a09b759507ef7a58e9e81d5a8fa367a66 SHA256 91c6151d3c9c74ff937539c2c59a4f04f381403d72e43402a9466fffbdda5a71
+DIST thunderbird-8.0-sq.xpi 351703 RMD160 9fe4bd4663d1c9eee57eb31feb98ff32e7e68f43 SHA1 775103b7eac89e52ad2600462146c20d16841da0 SHA256 f14b7ca5d4049ee6218fd6377759bd6cfc32d37d180204510737ad4814c56893
+DIST thunderbird-8.0-sv-SE.xpi 470499 RMD160 edfe10d92fec7767b62782f34d0148a89608721c SHA1 4ecb7e9462fd43bb2665d6ed8dbdb6dc3d1fa0f2 SHA256 c7cc27527961c0435fa8bb1563fe04edee234188b0abe001e10159c48bda8a2b
+DIST thunderbird-8.0-tr.xpi 405974 RMD160 4f80a26fc871135b850851bb06ddbd7b8de60574 SHA1 12c21c981fb65ee8c8d7a1720e567c1166da4177 SHA256 984f7bcae3a51a3dcbe83b2098037c43fe929d14713f8b0818c362122f507a2d
+DIST thunderbird-8.0-uk.xpi 456674 RMD160 95c1009e180d50940e8ecedc1d373c834c278bc1 SHA1 59cd3d8a0b47ba087d4493374bd6ba8b233758e8 SHA256 cdf663bdc0f85857cd41ead2c058abf01f6542089da94ada9f5a2bcf95214dbe
+DIST thunderbird-8.0-zh-CN.xpi 422519 RMD160 ef881e92de682aa3d807a53a7f536f51e6740b94 SHA1 564f90305e0458f57cd27a876f90e8c12b5ade8f SHA256 bb46c2b4d395488104528ac225f2c129e9c4ddb500e6f44082df549560013132
+DIST thunderbird-8.0-zh-TW.xpi 423019 RMD160 3326d286df45aee39ea4dc9303c6e4459b41dba2 SHA1 a81c24ab001eb521a1b4e49da16c8f6914676641 SHA256 a6c78df16a242b1731709fdacae8fcfde630fe10469abfd6a696b46076e9059a
+DIST thunderbird-8.0.source.tar.bz2 89435206 RMD160 373420ec009a7f28f12a64a0d55e9d959573974e SHA1 18b77e44f1653eb3d59056870f535e3c373d99fd SHA256 f728bd2dbc04e6c3a096d79a9ee320740f53794a28be307da8655c8fd90f77f5
diff --git a/mail-client/thunderbird/metadata.xml b/mail-client/thunderbird/metadata.xml
index 4322881dbfd0..7b99aacb386a 100644
--- a/mail-client/thunderbird/metadata.xml
+++ b/mail-client/thunderbird/metadata.xml
@@ -12,5 +12,7 @@
 		Allows for greater stability in case of plugin crashes</flag>
 	<flag name="crashreporter">Enable crash reporter for bugs</flag>
 	<flag name="gconf">Enable gnome2 gconf support</flag>
+	<flag name="webm">Use system <pkg>media-libs/libvpx</pkg> for HTML5 WebM
+		video support.</flag>
 </use>
 </pkgmetadata>
diff --git a/mail-client/thunderbird/thunderbird-8.0.ebuild b/mail-client/thunderbird/thunderbird-8.0.ebuild
new file mode 100644
index 000000000000..d91b2a560fad
--- /dev/null
+++ b/mail-client/thunderbird/thunderbird-8.0.ebuild
@@ -0,0 +1,305 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/thunderbird-8.0.ebuild,v 1.1 2011/11/11 01:46:45 anarchy Exp $
+
+EAPI="3"
+WANT_AUTOCONF="2.1"
+
+inherit flag-o-matic toolchain-funcs mozconfig-3 makeedit multilib mozextension autotools pax-utils python check-reqs
+
+TB_PV="${PV/_beta/b}"
+TB_P="${PN}-${TB_PV}"
+EMVER="1.3.3"
+
+DESCRIPTION="Thunderbird Mail Client"
+HOMEPAGE="http://www.mozilla.com/en-US/thunderbird/"
+
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+SLOT="0"
+LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
+IUSE="bindist gconf +crashreporter +crypt +ipc +lightning mozdom +webm"
+PATCH="${PN}-${PV}-patches-0.1"
+PATCHFF="firefox-${PV}-patches-0.2"
+
+FTP_URI="ftp://ftp.mozilla.org/pub/${PN}/releases/"
+SRC_URI="${FTP_URI}/${TB_PV}/source/${TB_P}.source.tar.bz2
+	crypt? ( http://www.mozilla-enigmail.org/download/source/enigmail-${EMVER}.tar.gz )
+	http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCH}.tar.xz
+	http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCHFF}.tar.xz"
+
+if ! [[ ${PV} =~ alpha|beta ]]; then
+	# This list can be updated using get_langs.sh from the mozilla overlay
+	# Not supported yet bn-BD ro id be af el pa-IN bg
+	LANGS="ar ca cs da de en en-GB en-US es-AR es-ES et eu fi fr \
+	fy-NL ga-IE he hu is it ja ko lt nb-NO nl nn-NO pl pt-BR pt-PT ru si \
+	sk sl sq sv-SE tr uk zh-TW zh-CN"
+	NOSHORTLANGS="en-GB es-AR pt-BR zh-TW zh-CN"
+
+	for X in ${LANGS} ; do
+		if [ "${X}" != "en" ] && [ "${X}" != "en-US" ]; then
+			SRC_URI="${SRC_URI}
+				linguas_${X/-/_}? ( ${FTP_URI}/${TB_PV}/linux-i686/xpi/${X}.xpi -> ${P}-${X}.xpi )"
+		fi
+		IUSE="${IUSE} linguas_${X/-/_}"
+		# english is handled internally
+		if [ "${#X}" == 5 ] && ! has ${X} ${NOSHORTLANGS}; then
+			if [ "${X}" != "en-US" ]; then
+				SRC_URI="${SRC_URI}
+					linguas_${X%%-*}? ( ${FTP_URI}/${TB_PV}/linux-i686/xpi/${X}.xpi -> ${P}-${X}.xpi )"
+			fi
+			IUSE="${IUSE} linguas_${X%%-*}"
+		fi
+	done
+fi
+
+RDEPEND=">=sys-devel/binutils-2.16.1
+	>=dev-libs/nss-3.12.10
+	>=dev-libs/nspr-4.8.8
+	gconf? ( >=gnome-base/gconf-1.2.1:2 )
+	media-libs/libpng[apng]
+	webm? ( media-libs/libvpx
+		media-libs/alsa-lib )
+	virtual/libffi
+	!x11-plugins/lightning
+	!x11-plugins/enigmail
+	system-sqlite? ( >=dev-db/sqlite-3.7.5[fts3,secure-delete,unlock-notify,debug=] )
+	crypt?  ( || (
+		( >=app-crypt/gnupg-2.0
+			|| (
+				app-crypt/pinentry[gtk]
+				app-crypt/pinentry[qt4]
+			)
+		)
+		=app-crypt/gnupg-1.4*
+	) )"
+
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}"/comm-release
+
+linguas() {
+	local LANG SLANG
+	for LANG in ${LINGUAS}; do
+		if has ${LANG} en en_US; then
+			has en ${linguas} || linguas="${linguas:+"${linguas} "}en"
+			continue
+		elif has ${LANG} ${LANGS//-/_}; then
+			has ${LANG//_/-} ${linguas} || linguas="${linguas:+"${linguas} "}${LANG//_/-}"
+			continue
+		elif [[ " ${LANGS} " == *" ${LANG}-"* ]]; then
+			for X in ${LANGS}; do
+				if [[ "${X}" == "${LANG}-"* ]] && \
+					[[ " ${NOSHORTLANGS} " != *" ${X} "* ]]; then
+					has ${X} ${linguas} || linguas="${linguas:+"${linguas} "}${X}"
+					continue 2
+				fi
+			done
+		fi
+		ewarn "Sorry, but ${PN} does not support the ${LANG} LINGUA"
+	done
+}
+
+pkg_setup() {
+	moz_pkgsetup
+
+	if ! use bindist; then
+		elog "You are enabling official branding. You may not redistribute this build"
+		elog "to any users on your network or the internet. Doing so puts yourself into"
+		elog "a legal problem with Mozilla Foundation"
+		elog "You can disable it by emerging ${PN} _with_ the bindist USE-flag"
+	fi
+
+	# Ensure we have enough disk space to compile
+	CHECKREQS_DISK_BUILD="4G"
+	check-reqs_pkg_setup
+}
+
+src_unpack() {
+	unpack ${A}
+
+	if ! [[ ${PV} =~ alpha|beta ]]; then
+		linguas
+		for X in ${linguas}; do
+			# FIXME: Add support for unpacking xpis to portage
+			[[ ${X} != "en" ]] && xpi_unpack "${P}-${X}.xpi"
+		done
+		if [[ ${linguas} != "" && ${linguas} != "en" ]]; then
+			einfo "Selected language packs (first will be default): ${linguas}"
+		fi
+	fi
+}
+
+src_prepare() {
+	# Apply our Thunderbird patchset
+	EPATCH_SUFFIX="patch" \
+	EPATCH_FORCE="yes" \
+	epatch "${WORKDIR}/thunderbird"
+
+	# Apply our patchset from firefox to thunderbird as well
+	pushd "${S}"/mozilla &>/dev/null || die
+	EPATCH_SUFFIX="patch" \
+	EPATCH_FORCE="yes" \
+	epatch "${WORKDIR}/firefox"
+	popd &>/dev/null || die
+
+	if use crypt ; then
+		mv "${WORKDIR}"/enigmail "${S}"/mailnews/extensions/enigmail
+		cd "${S}"/mailnews/extensions/enigmail || die
+		./makemake -r 2&> /dev/null
+		sed -i -e 's:@srcdir@:${S}/mailnews/extensions/enigmail:' Makefile.in
+		cd "${S}"
+	fi
+
+	#Fix compilation with curl-7.21.7 bug 376027
+	sed -e '/#include <curl\/types.h>/d'  \
+		-i "${S}"/mozilla/toolkit/crashreporter/google-breakpad/src/common/linux/http_upload.cc \
+		-i "${S}"/mozilla/toolkit/crashreporter/google-breakpad/src/common/linux/libcurl_wrapper.cc \
+		-i "${S}"/mozilla/config/system-headers \
+		-i "${S}"/mozilla/js/src/config/system-headers || die "Sed failed"
+
+	# Allow user to apply any additional patches without modifing ebuild
+	epatch_user
+
+	eautoreconf
+
+	cd mozilla
+	eautoreconf
+	cd js/src
+	eautoreconf
+}
+
+src_configure() {
+	declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+	MEXTENSIONS="default"
+
+	####################################
+	#
+	# mozconfig, CFLAGS and CXXFLAGS setup
+	#
+	####################################
+
+	mozconfig_init
+	mozconfig_config
+
+	# It doesn't compile on alpha without this LDFLAGS
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	if use crypt ; then
+		# omni.jar breaks enigmail
+		mozconfig_annotate '' --enable-chrome-format=jar
+	fi
+	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
+	mozconfig_annotate '' --with-default-mozilla-five-home="${EPREFIX}${MOZILLA_FIVE_HOME}"
+	mozconfig_annotate '' --with-user-appdir=.thunderbird
+	mozconfig_annotate '' --with-system-png
+	mozconfig_annotate '' --enable-system-ffi
+
+	# Use enable features
+	mozconfig_use_enable lightning calendar
+	mozconfig_use_enable gconf
+
+	# Bug #72667
+	if use mozdom; then
+		MEXTENSIONS="${MEXTENSIONS},inspector"
+	fi
+
+	# Finalize and report settings
+	mozconfig_final
+
+	####################################
+	#
+	#  Configure and build
+	#
+	####################################
+
+	# Disable no-print-directory
+	MAKEOPTS=${MAKEOPTS/--no-print-directory/}
+
+	if [[ $(gcc-major-version) -lt 4 ]]; then
+		append-cxxflags -fno-stack-protector
+	elif [[ $(gcc-major-version) -gt 4 || $(gcc-minor-version) -gt 3 ]]; then
+		if use amd64 || use x86; then
+			append-flags -mno-avx
+		fi
+	fi
+
+	CPPFLAGS="${CPPFLAGS}" \
+	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
+	econf || die
+}
+
+src_compile() {
+	emake || die
+
+	# Only build enigmail extension if crypt enabled.
+	if use crypt ; then
+		emake -C "${S}"/mailnews/extensions/enigmail || die "make enigmail failed"
+		emake -C "${S}"/mailnews/extensions/enigmail xpi || die "make enigmail xpi failed"
+	fi
+}
+
+src_install() {
+	declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+	declare emid
+
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	if ! use bindist; then
+		newicon "${S}"/other-licenses/branding/thunderbird/content/icon48.png thunderbird-icon.png
+		domenu "${FILESDIR}"/icon/${PN}.desktop
+	else
+		newicon "${S}"/mail/branding/unofficial/content/icon48.png thunderbird-icon-unbranded.png
+		newmenu "${FILESDIR}"/icon/${PN}-unbranded.desktop \
+			${PN}.desktop
+
+		sed -i -e "s:Mozilla\ Thunderbird:Lanikai:g" \
+			"${ED}"/usr/share/applications/${PN}.desktop
+	fi
+
+	if use crypt ; then
+		cd "${T}" || die
+		unzip "${S}"/mozilla/dist/bin/enigmail*.xpi install.rdf || die
+		emid=$(sed -n '/<em:id>/!d; s/.*\({.*}\).*/\1/; p; q' install.rdf)
+
+		dodir ${MOZILLA_FIVE_HOME}/extensions/${emid} || die
+		cd "${D}"${MOZILLA_FIVE_HOME}/extensions/${emid} || die
+		unzip "${S}"/mozilla/dist/bin/enigmail*.xpi || die
+	fi
+
+	if use lightning ; then
+		emid="{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}"
+		dodir ${MOZILLA_FIVE_HOME}/extensions/${emid}
+		cd "${ED}"${MOZILLA_FIVE_HOME}/extensions/${emid}
+		unzip "${S}"/mozilla/dist/xpi-stage/gdata-provider.xpi
+
+		emid="calendar-timezones@mozilla.org"
+		dodir ${MOZILLA_FIVE_HOME}/extensions/${emid}
+		cd "${ED}"${MOZILLA_FIVE_HOME}/extensions/${emid}
+		unzip "${S}"/mozilla/dist/xpi-stage/calendar-timezones.xpi
+
+		emid="{e2fda1a4-762b-4020-b5ad-a41df1933103}"
+		dodir ${MOZILLA_FIVE_HOME}/extensions/${emid}
+		cd "${ED}"${MOZILLA_FIVE_HOME}/extensions/${emid}
+		unzip "${S}"/mozilla/dist/xpi-stage/lightning.xpi
+
+		# Fix mimetype so it shows up as a calendar application in GNOME 3
+		# This requires that the .desktop file was already installed earlier
+		sed -e "s:^\(MimeType=\):\1text/calendar;:" \
+			-e "s:^\(Categories=\):\1Calendar;:" \
+			-i "${ED}"/usr/share/applications/${PN}.desktop
+	fi
+
+	if ! [[ ${PV} =~ alpha|beta ]]; then
+		linguas
+		for X in ${linguas}; do
+			[[ ${X} != "en" ]] && xpi_install "${WORKDIR}"/"${P}-${X}"
+		done
+	fi
+
+	pax-mark m "${ED}"/${MOZILLA_FIVE_HOME}/thunderbird-bin
+
+	# Enable very specific settings for thunderbird-3
+	cp "${FILESDIR}"/thunderbird-gentoo-default-prefs-1.js \
+		"${ED}/${MOZILLA_FIVE_HOME}/defaults/pref/all-gentoo.js" || \
+		die "failed to cp thunderbird-gentoo-default-prefs.js"
+}
diff --git a/media-sound/id3v2/id3v2-0.1.12.ebuild b/media-sound/id3v2/id3v2-0.1.12.ebuild
index f4bb1b19b2c9..a607ddaf6feb 100644
--- a/media-sound/id3v2/id3v2-0.1.12.ebuild
+++ b/media-sound/id3v2/id3v2-0.1.12.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/id3v2/id3v2-0.1.12.ebuild,v 1.1 2010/04/12 09:54:58 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/id3v2/id3v2-0.1.12.ebuild,v 1.2 2011/11/11 01:19:34 xmw Exp $
 
 EAPI=2
 
@@ -27,7 +27,7 @@ src_configure() {
 }
 
 src_install() {
-	dobin id3v2
-	doman id3v2.1
-	dodoc README
+	dobin id3v2 || die
+	doman id3v2.1 || die
+	dodoc README || die
 }
diff --git a/media-sound/snd/Manifest b/media-sound/snd/Manifest
index 24eef7cf37a8..2df7d99d8abd 100644
--- a/media-sound/snd/Manifest
+++ b/media-sound/snd/Manifest
@@ -1,6 +1,3 @@
-DIST snd-12.1.tar.gz 15609288 RMD160 94f8103e2240d5dabb0db6695695a290189517cd SHA1 e2bcbc39d10d1e1cb618ee704a20da55307ba6f7 SHA256 0fbed687d920ec1570aeeb4786b237feea6b99fe302ab66cf50420586fc91358
-DIST snd-12.2.tar.gz 15613589 RMD160 00c0edf2ad7e2c6bb9e8730317ae31c53c804875 SHA1 9492a55e61fdb4a01041c0c0c4103c569239acf8 SHA256 79cd1613b3aa1498e953348f3b7aac28d2ed99df411a6b19ab5e5ff0056c17f9
-DIST snd-12.3.tar.gz 15645756 RMD160 b81750f5f212e283742cbd17c61e8028271e7924 SHA1 6360ac0f3850ad513ba345a2f96faa358eb7dc54 SHA256 6a30ba6b96f9b0c1ea4e843a52082cc664bb5d1d2e19a97c146e346a6a32ba5e
-DIST snd-12.4.tar.gz 15432750 RMD160 3d05572b354be2db1bd7d393d82c7d12b2c72542 SHA1 2a86eb6120f607b4d81c9506f9bccaaac61b1343 SHA256 fc6cd101b1d9a52383457f52d70d4a7a2ea25864b26853388dbf0f985dc806e7
 DIST snd-12.5.tar.gz 15458830 RMD160 4957c61a6a116b907f3d6a11d0c63482eafe30d9 SHA1 69d38942f433f768ae18de8a96b3ab02b4389966 SHA256 ce6055a9277445fc9132b303f473e49b1771f8072f148db4eef44505518913d5
+DIST snd-12.6.tar.gz 15475491 RMD160 f0e893d15b01e8827713638e89bf706b6a5a5980 SHA1 b2a103d059a5d1453356f5db6152f303ebca6147 SHA256 ea273c1d717e8c8b6140d9294678567f91c5216e283789989158d7fd8a1b9c91
 DIST snd-9.11.tar.gz 13455864 RMD160 9c4137114f9056efaba66aed6e7140f4f4e6e671 SHA1 950c6336bae0e2ccf5eae62b037572bc7ddabcf7 SHA256 364fa4ee39d9909e7cffc400aff5723712bfa19960ecb2271d83bf2fe1909165
diff --git a/media-sound/snd/files/snd-12.6-as-needed.patch b/media-sound/snd/files/snd-12.6-as-needed.patch
new file mode 100644
index 000000000000..d2f0bcbe9d8b
--- /dev/null
+++ b/media-sound/snd/files/snd-12.6-as-needed.patch
@@ -0,0 +1,37 @@
+--- snd-12.6/configure.ac.orig
++++ snd-12.6/configure.ac
+@@ -1468,7 +1468,7 @@
+         LDSO_FLAGS="-shared"
+         LIBS="$LIBS -lm"
+ 	if test "$ac_cv_header_dlfcn_h" = yes ; then 
+-	  LDFLAGS="$LDFLAGS -ldl" 
++	  LIBS="$LIBS -ldl"
+ 	fi 
+ 	if test "$GCC" = yes ; then
+ 	  SO_FLAGS="-fPIC $SO_FLAGS"
+@@ -1979,7 +1979,7 @@
+ if test "$ac_snd_have_extension_language" = yes ; then
+   if test "$ac_snd_have_gui" = yes ; then
+     if test "$ac_cv_header_pthread_h" = yes ; then
+-      LDFLAGS="$LDFLAGS -lpthread"
++      LIBS="$LIBS -lpthread"
+     fi
+   fi
+ fi
+@@ -1987,14 +1987,14 @@
+ if test "$ac_snd_have_extension_language" = no ; then
+   if test "$ac_snd_have_gui" = no ; then
+     if test "$ac_cv_header_dlfcn_h" = yes ; then
+-      LDFLAGS="$LDFLAGS -ldl"
++      LIBS="$LIBS -ldl"
+     fi
+     AC_MSG_WARN([Snd needs either an extension language (s7, Fth, or Ruby), or a graphics toolkit (Gtk or Motif), or preferably both.  As currently configured, this version of Snd is useless.])
+   fi
+ fi
+ 
+ if test "$ac_snd_have_extension_language" = yes && test "$with_audio" = no && test "$ac_cv_header_dlfcn_h" = yes ; then
+-  LDFLAGS="$LDFLAGS -ldl"
++  LIBS="$LIBS -ldl"
+ fi
+ 
+ 
diff --git a/media-sound/snd/snd-12.1.ebuild b/media-sound/snd/snd-12.1.ebuild
deleted file mode 100644
index 59ebac4e580e..000000000000
--- a/media-sound/snd/snd-12.1.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/snd/snd-12.1.ebuild,v 1.3 2011/05/03 08:35:11 radhermit Exp $
-
-EAPI=4
-
-inherit multilib flag-o-matic
-
-DESCRIPTION="Snd is a sound editor"
-HOMEPAGE="http://ccrma.stanford.edu/software/snd/"
-SRC_URI="ftp://ccrma-ftp.stanford.edu/pub/Lisp/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="as-is"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-interix ~amd64-linux ~x86-linux"
-IUSE="alsa esd fam fftw gmp gsl gtk jack ladspa motif opengl oss portaudio pulseaudio ruby"
-
-RDEPEND="media-libs/audiofile
-	sys-libs/readline
-	alsa? ( media-libs/alsa-lib )
-	esd? ( media-sound/esound )
-	fam? ( virtual/fam )
-	fftw? ( sci-libs/fftw )
-	gmp? ( dev-libs/gmp
-		dev-libs/mpc
-		dev-libs/mpfr )
-	gsl? ( >=sci-libs/gsl-0.8 )
-	gtk? ( x11-libs/gtk+:3
-		x11-libs/pango
-		x11-libs/cairo
-		opengl? ( x11-libs/gtkglext ) )
-	jack? ( media-sound/jack-audio-connection-kit )
-	ladspa? ( media-libs/ladspa-sdk )
-	motif? ( >=x11-libs/openmotif-2.3:0 )
-	opengl? ( virtual/opengl )
-	portaudio? ( media-libs/portaudio )
-	pulseaudio? ( media-sound/pulseaudio )
-	ruby? ( dev-lang/ruby )"
-
-pkg_setup() {
-	if ! use gtk && ! use motif; then
-		ewarn "Warning: no graphic toolkit selected (gtk or motif)."
-		ewarn "Upstream suggests to enable one of the toolkits (or both)"
-		ewarn "or only the command line utilities will be helpful."
-	fi
-}
-
-src_configure() {
-	# Workaround executable sections QA warning (bug #348754)
-	append-ldflags -Wl,-z,noexecstack
-
-	local myconf
-	if use opengl; then
-		myconf="${myconf} --with-just-gl"
-	else
-		myconf="${myconf} --without-gl"
-	fi
-
-	econf \
-		$(use_with alsa) \
-		$(use_with esd) \
-		$(use_with fam) \
-		$(use_with fftw) \
-		$(use_with gmp) \
-		$(use_with gsl) \
-		$(use_with gtk) \
-		$(use_with jack) \
-		$(use_with ladspa) \
-		$(use_with motif) \
-		$(use_with oss) \
-		$(use_with portaudio) \
-		$(use_with pulseaudio) \
-		$(use_with ruby) \
-		--with-float-samples \
-		${myconf}
-
-}
-
-src_compile() {
-	emake snd
-
-	# Do not compile ruby extensions for command line programs since they fail
-	sed -i -e "s:HAVE_RUBY 1:HAVE_RUBY 0:" mus-config.h
-
-	for i in sndinfo audinfo sndplay; do
-	   emake ${i}
-	done
-}
-
-src_install () {
-	dobin snd
-	dobin sndplay
-	dobin sndinfo
-	dobin audinfo
-
-	insinto /usr/$(get_libdir)/snd/scheme
-	doins *.scm
-
-	dodoc README.Snd HISTORY.Snd NEWS
-	dohtml -r *.html pix/*.png tutorial
-}
diff --git a/media-sound/snd/snd-12.2.ebuild b/media-sound/snd/snd-12.2.ebuild
deleted file mode 100644
index 02e3232ab69c..000000000000
--- a/media-sound/snd/snd-12.2.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/snd/snd-12.2.ebuild,v 1.1 2011/06/09 08:52:57 radhermit Exp $
-
-EAPI=4
-
-inherit multilib flag-o-matic
-
-DESCRIPTION="Snd is a sound editor"
-HOMEPAGE="http://ccrma.stanford.edu/software/snd/"
-SRC_URI="ftp://ccrma-ftp.stanford.edu/pub/Lisp/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="as-is"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-interix ~amd64-linux ~x86-linux"
-IUSE="alsa esd fam fftw gmp gsl gtk jack ladspa motif opengl oss portaudio pulseaudio ruby"
-
-RDEPEND="media-libs/audiofile
-	sys-libs/readline
-	alsa? ( media-libs/alsa-lib )
-	esd? ( media-sound/esound )
-	fam? ( virtual/fam )
-	fftw? ( sci-libs/fftw )
-	gmp? ( dev-libs/gmp
-		dev-libs/mpc
-		dev-libs/mpfr )
-	gsl? ( >=sci-libs/gsl-0.8 )
-	gtk? ( x11-libs/gtk+:3
-		x11-libs/pango
-		x11-libs/cairo
-		opengl? ( x11-libs/gtkglext ) )
-	jack? ( media-sound/jack-audio-connection-kit )
-	ladspa? ( media-libs/ladspa-sdk )
-	motif? ( >=x11-libs/openmotif-2.3:0 )
-	opengl? ( virtual/opengl )
-	portaudio? ( media-libs/portaudio )
-	pulseaudio? ( media-sound/pulseaudio )
-	ruby? ( dev-lang/ruby )"
-
-pkg_setup() {
-	if ! use gtk && ! use motif; then
-		ewarn "Warning: no graphic toolkit selected (gtk or motif)."
-		ewarn "Upstream suggests to enable one of the toolkits (or both)"
-		ewarn "or only the command line utilities will be helpful."
-	fi
-}
-
-src_configure() {
-	# Workaround executable sections QA warning (bug #348754)
-	append-ldflags -Wl,-z,noexecstack
-
-	local myconf
-	if use opengl; then
-		myconf="${myconf} --with-just-gl"
-	else
-		myconf="${myconf} --without-gl"
-	fi
-
-	econf \
-		$(use_with alsa) \
-		$(use_with esd) \
-		$(use_with fam) \
-		$(use_with fftw) \
-		$(use_with gmp) \
-		$(use_with gsl) \
-		$(use_with gtk) \
-		$(use_with jack) \
-		$(use_with ladspa) \
-		$(use_with motif) \
-		$(use_with oss) \
-		$(use_with portaudio) \
-		$(use_with pulseaudio) \
-		$(use_with ruby) \
-		--with-float-samples \
-		${myconf}
-
-}
-
-src_compile() {
-	emake snd
-
-	# Do not compile ruby extensions for command line programs since they fail
-	sed -i -e "s:HAVE_RUBY 1:HAVE_RUBY 0:" mus-config.h
-
-	for i in sndinfo audinfo sndplay; do
-	   emake ${i}
-	done
-}
-
-src_install () {
-	dobin snd
-	dobin sndplay
-	dobin sndinfo
-	dobin audinfo
-
-	insinto /usr/$(get_libdir)/snd/scheme
-	doins *.scm
-
-	dodoc README.Snd HISTORY.Snd NEWS
-	dohtml -r *.html pix/*.png tutorial
-}
diff --git a/media-sound/snd/snd-12.3.ebuild b/media-sound/snd/snd-12.3.ebuild
deleted file mode 100644
index 12f0b4f58217..000000000000
--- a/media-sound/snd/snd-12.3.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/snd/snd-12.3.ebuild,v 1.1 2011/08/22 08:45:53 radhermit Exp $
-
-EAPI=4
-
-inherit multilib flag-o-matic autotools
-
-DESCRIPTION="Snd is a sound editor"
-HOMEPAGE="http://ccrma.stanford.edu/software/snd/"
-SRC_URI="ftp://ccrma-ftp.stanford.edu/pub/Lisp/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="as-is"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-interix ~amd64-linux ~x86-linux"
-IUSE="alsa esd fam fftw gmp gsl gtk jack ladspa motif opengl oss portaudio pulseaudio ruby"
-
-RDEPEND="media-libs/audiofile
-	sys-libs/readline
-	alsa? ( media-libs/alsa-lib )
-	esd? ( media-sound/esound )
-	fam? ( virtual/fam )
-	fftw? ( sci-libs/fftw )
-	gmp? ( dev-libs/gmp
-		dev-libs/mpc
-		dev-libs/mpfr )
-	gsl? ( >=sci-libs/gsl-0.8 )
-	gtk? ( x11-libs/gtk+:3
-		x11-libs/pango
-		x11-libs/cairo
-		opengl? ( x11-libs/gtkglext ) )
-	jack? ( media-sound/jack-audio-connection-kit )
-	ladspa? ( media-libs/ladspa-sdk )
-	motif? ( >=x11-libs/openmotif-2.3:0 )
-	opengl? ( virtual/opengl )
-	portaudio? ( media-libs/portaudio )
-	pulseaudio? ( media-sound/pulseaudio )
-	ruby? ( dev-lang/ruby )"
-
-pkg_setup() {
-	if ! use gtk && ! use motif; then
-		ewarn "Warning: no graphic toolkit selected (gtk or motif)."
-		ewarn "Upstream suggests to enable one of the toolkits (or both)"
-		ewarn "or only the command line utilities will be helpful."
-	fi
-}
-
-src_prepare() {
-	sed -i -e "s:-O2 ::" configure.ac || die
-	eautoreconf
-}
-
-src_configure() {
-	# Workaround executable sections QA warning (bug #348754)
-	append-ldflags -Wl,-z,noexecstack
-
-	local myconf
-	if use opengl; then
-		myconf="${myconf} --with-just-gl"
-	else
-		myconf="${myconf} --without-gl"
-	fi
-
-	econf \
-		$(use_with alsa) \
-		$(use_with esd) \
-		$(use_with fam) \
-		$(use_with fftw) \
-		$(use_with gmp) \
-		$(use_with gsl) \
-		$(use_with gtk) \
-		$(use_with jack) \
-		$(use_with ladspa) \
-		$(use_with motif) \
-		$(use_with oss) \
-		$(use_with portaudio) \
-		$(use_with pulseaudio) \
-		$(use_with ruby) \
-		--with-float-samples \
-		${myconf}
-
-}
-
-src_compile() {
-	emake snd
-
-	# Do not compile ruby extensions for command line programs since they fail
-	sed -i -e "s:HAVE_RUBY 1:HAVE_RUBY 0:" mus-config.h
-
-	for i in sndinfo audinfo sndplay; do
-	   emake ${i}
-	done
-}
-
-src_install () {
-	dobin snd
-	dobin sndplay
-	dobin sndinfo
-	dobin audinfo
-
-	insinto /usr/$(get_libdir)/snd/scheme
-	doins *.scm
-
-	dodoc README.Snd HISTORY.Snd NEWS
-	dohtml -r *.html pix/*.png tutorial
-}
diff --git a/media-sound/snd/snd-12.4.ebuild b/media-sound/snd/snd-12.6.ebuild
similarity index 91%
rename from media-sound/snd/snd-12.4.ebuild
rename to media-sound/snd/snd-12.6.ebuild
index bfd484b31094..58a5ed267324 100644
--- a/media-sound/snd/snd-12.4.ebuild
+++ b/media-sound/snd/snd-12.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/snd/snd-12.4.ebuild,v 1.1 2011/08/30 08:23:15 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/snd/snd-12.6.ebuild,v 1.1 2011/11/11 07:00:38 radhermit Exp $
 
 EAPI=4
 
@@ -44,7 +44,7 @@ REQUIRED_USE="^^ (
 	)"
 
 pkg_setup() {
-	if ! use gtk && ! use motif; then
+	if ! use gtk && ! use motif ; then
 		ewarn "Warning: no graphic toolkit selected (gtk or motif)."
 		ewarn "Upstream suggests to enable one of the toolkits (or both)"
 		ewarn "or only the command line utilities will be helpful."
@@ -52,6 +52,7 @@ pkg_setup() {
 }
 
 src_prepare() {
+	epatch "${FILESDIR}"/${P}-as-needed.patch
 	sed -i -e "s:-O2 ::" configure.ac || die
 	eautoreconf
 }
@@ -61,7 +62,7 @@ src_configure() {
 	append-ldflags -Wl,-z,noexecstack
 
 	local myconf
-	if use opengl; then
+	if use opengl ; then
 		myconf+=" --with-just-gl"
 	else
 		myconf+=" --without-gl"
@@ -99,7 +100,7 @@ src_compile() {
 	# Do not compile ruby extensions for command line programs since they fail
 	sed -i -e "s:HAVE_RUBY 1:HAVE_RUBY 0:" mus-config.h
 
-	for i in sndinfo audinfo sndplay; do
+	for i in sndinfo audinfo sndplay ; do
 	   emake ${i}
 	done
 }
diff --git a/metadata/cache/dev-python/netifaces-0.5 b/metadata/cache/dev-python/netifaces-0.5
new file mode 100644
index 000000000000..c26f619d46e5
--- /dev/null
+++ b/metadata/cache/dev-python/netifaces-0.5
@@ -0,0 +1,22 @@
+dev-python/setuptools >=app-admin/eselect-python-20091230 =dev-lang/python-2* >=app-admin/eselect-python-20091230 =dev-lang/python-2*
+>=app-admin/eselect-python-20091230 =dev-lang/python-2* >=app-admin/eselect-python-20091230 =dev-lang/python-2*
+0
+http://alastairs-place.net/2007/03/netifaces/netifaces-0.5.tar.gz
+
+http://alastairs-place.net/netifaces/
+MIT
+Portable network interface information
+~amd64 ~x86
+distutils multilib python toolchain-funcs
+
+
+
+
+3
+
+compile install postinst postrm prepare
+
+
+
+
+
diff --git a/metadata/cache/dev-util/valgrind-3.7.0 b/metadata/cache/dev-util/valgrind-3.7.0
new file mode 100644
index 000000000000..deabd1d05e6d
--- /dev/null
+++ b/metadata/cache/dev-util/valgrind-3.7.0
@@ -0,0 +1,22 @@
+mpi? ( virtual/mpi ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool
+mpi? ( virtual/mpi )
+0
+http://www.valgrind.org/downloads/valgrind-3.7.0.tar.bz2
+
+http://www.valgrind.org
+GPL-2
+An open-source memory debugger for GNU/Linux
+-* ~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+autotools eutils flag-o-matic libtool multilib pax-utils portability toolchain-funcs user
+mpi
+
+
+
+4
+
+configure install postinst prepare
+
+
+
+
+
diff --git a/metadata/cache/mail-client/thunderbird-8.0 b/metadata/cache/mail-client/thunderbird-8.0
new file mode 100644
index 000000000000..b9aaab7014d4
--- /dev/null
+++ b/metadata/cache/mail-client/thunderbird-8.0
@@ -0,0 +1,22 @@
+>=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.12.10 >=dev-libs/nspr-4.8.8 gconf? ( >=gnome-base/gconf-1.2.1:2 ) media-libs/libpng[apng] webm? ( media-libs/libvpx media-libs/alsa-lib ) virtual/libffi !x11-plugins/lightning !x11-plugins/enigmail system-sqlite? ( >=dev-db/sqlite-3.7.5[fts3,secure-delete,unlock-notify,debug=] ) crypt? ( || ( ( >=app-crypt/gnupg-2.0 || ( app-crypt/pinentry[gtk] app-crypt/pinentry[qt4] ) ) =app-crypt/gnupg-1.4* ) ) >=app-admin/eselect-python-20091230 x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 dev-util/pkgconfig =dev-lang/python-2*[threads] app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 !<x11-base/xorg-x11-6.7.0-r2 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools ) app-arch/unzip || ( =sys-devel/automake-1.11* ) =sys-devel/autoconf-2.1* sys-devel/libtool >=app-admin/eselect-python-20091230
+>=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.12.10 >=dev-libs/nspr-4.8.8 gconf? ( >=gnome-base/gconf-1.2.1:2 ) media-libs/libpng[apng] webm? ( media-libs/libvpx media-libs/alsa-lib ) virtual/libffi !x11-plugins/lightning !x11-plugins/enigmail system-sqlite? ( >=dev-db/sqlite-3.7.5[fts3,secure-delete,unlock-notify,debug=] ) crypt? ( || ( ( >=app-crypt/gnupg-2.0 || ( app-crypt/pinentry[gtk] app-crypt/pinentry[qt4] ) ) =app-crypt/gnupg-1.4* ) ) >=app-admin/eselect-python-20091230 x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 !<x11-base/xorg-x11-6.7.0-r2 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools ) >=app-admin/eselect-python-20091230
+0
+ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/source/thunderbird-8.0.source.tar.bz2 crypt? ( http://www.mozilla-enigmail.org/download/source/enigmail-1.3.3.tar.gz ) http://dev.gentoo.org/~anarchy/mozilla/patchsets/thunderbird-8.0-patches-0.1.tar.xz http://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-8.0-patches-0.2.tar.xz linguas_ar? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/ar.xpi -> thunderbird-8.0-ar.xpi ) linguas_ca? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/ca.xpi -> thunderbird-8.0-ca.xpi ) linguas_cs? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/cs.xpi -> thunderbird-8.0-cs.xpi ) linguas_da? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/da.xpi -> thunderbird-8.0-da.xpi ) linguas_de? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/de.xpi -> thunderbird-8.0-de.xpi ) linguas_en_GB? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/en-GB.xpi -> thunderbird-8.0-en-GB.xpi ) linguas_es_AR? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/es-AR.xpi -> thunderbird-8.0-es-AR.xpi ) linguas_es_ES? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/es-ES.xpi -> thunderbird-8.0-es-ES.xpi ) linguas_es? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/es-ES.xpi -> thunderbird-8.0-es-ES.xpi ) linguas_et? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/et.xpi -> thunderbird-8.0-et.xpi ) linguas_eu? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/eu.xpi -> thunderbird-8.0-eu.xpi ) linguas_fi? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/fi.xpi -> thunderbird-8.0-fi.xpi ) linguas_fr? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/fr.xpi -> thunderbird-8.0-fr.xpi ) linguas_fy_NL? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/fy-NL.xpi -> thunderbird-8.0-fy-NL.xpi ) linguas_fy? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/fy-NL.xpi -> thunderbird-8.0-fy-NL.xpi ) linguas_ga_IE? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/ga-IE.xpi -> thunderbird-8.0-ga-IE.xpi ) linguas_ga? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/ga-IE.xpi -> thunderbird-8.0-ga-IE.xpi ) linguas_he? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/he.xpi -> thunderbird-8.0-he.xpi ) linguas_hu? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/hu.xpi -> thunderbird-8.0-hu.xpi ) linguas_is? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/is.xpi -> thunderbird-8.0-is.xpi ) linguas_it? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/it.xpi -> thunderbird-8.0-it.xpi ) linguas_ja? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/ja.xpi -> thunderbird-8.0-ja.xpi ) linguas_ko? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/ko.xpi -> thunderbird-8.0-ko.xpi ) linguas_lt? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/lt.xpi -> thunderbird-8.0-lt.xpi ) linguas_nb_NO? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/nb-NO.xpi -> thunderbird-8.0-nb-NO.xpi ) linguas_nb? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/nb-NO.xpi -> thunderbird-8.0-nb-NO.xpi ) linguas_nl? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/nl.xpi -> thunderbird-8.0-nl.xpi ) linguas_nn_NO? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/nn-NO.xpi -> thunderbird-8.0-nn-NO.xpi ) linguas_nn? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/nn-NO.xpi -> thunderbird-8.0-nn-NO.xpi ) linguas_pl? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/pl.xpi -> thunderbird-8.0-pl.xpi ) linguas_pt_BR? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/pt-BR.xpi -> thunderbird-8.0-pt-BR.xpi ) linguas_pt_PT? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/pt-PT.xpi -> thunderbird-8.0-pt-PT.xpi ) linguas_pt? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/pt-PT.xpi -> thunderbird-8.0-pt-PT.xpi ) linguas_ru? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/ru.xpi -> thunderbird-8.0-ru.xpi ) linguas_si? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/si.xpi -> thunderbird-8.0-si.xpi ) linguas_sk? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/sk.xpi -> thunderbird-8.0-sk.xpi ) linguas_sl? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/sl.xpi -> thunderbird-8.0-sl.xpi ) linguas_sq? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/sq.xpi -> thunderbird-8.0-sq.xpi ) linguas_sv_SE? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/sv-SE.xpi -> thunderbird-8.0-sv-SE.xpi ) linguas_sv? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/sv-SE.xpi -> thunderbird-8.0-sv-SE.xpi ) linguas_tr? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/tr.xpi -> thunderbird-8.0-tr.xpi ) linguas_uk? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/uk.xpi -> thunderbird-8.0-uk.xpi ) linguas_zh_TW? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/zh-TW.xpi -> thunderbird-8.0-zh-TW.xpi ) linguas_zh_CN? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/zh-CN.xpi -> thunderbird-8.0-zh-CN.xpi )
+
+http://www.mozilla.com/en-US/thunderbird/
+|| ( MPL-1.1 GPL-2 LGPL-2.1 )
+Thunderbird Mail Client
+~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+autotools check-reqs eutils flag-o-matic libtool makeedit mozconfig-3 mozcoreconf-2 mozextension multilib pax-utils portability python toolchain-funcs user
+bindist gconf +crashreporter +crypt +ipc +lightning mozdom +webm linguas_ar linguas_ca linguas_cs linguas_da linguas_de linguas_en linguas_en_GB linguas_en_US linguas_en linguas_es_AR linguas_es_ES linguas_es linguas_et linguas_eu linguas_fi linguas_fr linguas_fy_NL linguas_fy linguas_ga_IE linguas_ga linguas_he linguas_hu linguas_is linguas_it linguas_ja linguas_ko linguas_lt linguas_nb_NO linguas_nb linguas_nl linguas_nn_NO linguas_nn linguas_pl linguas_pt_BR linguas_pt_PT linguas_pt linguas_ru linguas_si linguas_sk linguas_sl linguas_sq linguas_sv_SE linguas_sv linguas_tr linguas_uk linguas_zh_TW linguas_zh_CN custom-cflags custom-optimization +alsa +dbus debug libnotify startup-notification system-sqlite wifi
+
+
+
+3
+
+compile configure install prepare setup unpack
+
+
+
+
+
diff --git a/metadata/cache/media-sound/snd-12.1 b/metadata/cache/media-sound/snd-12.1
deleted file mode 100644
index 479dcd153fff..000000000000
--- a/metadata/cache/media-sound/snd-12.1
+++ /dev/null
@@ -1,22 +0,0 @@
-
-media-libs/audiofile sys-libs/readline alsa? ( media-libs/alsa-lib ) esd? ( media-sound/esound ) fam? ( virtual/fam ) fftw? ( sci-libs/fftw ) gmp? ( dev-libs/gmp dev-libs/mpc dev-libs/mpfr ) gsl? ( >=sci-libs/gsl-0.8 ) gtk? ( x11-libs/gtk+:3 x11-libs/pango x11-libs/cairo opengl? ( x11-libs/gtkglext ) ) jack? ( media-sound/jack-audio-connection-kit ) ladspa? ( media-libs/ladspa-sdk ) motif? ( >=x11-libs/openmotif-2.3:0 ) opengl? ( virtual/opengl ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-sound/pulseaudio ) ruby? ( dev-lang/ruby )
-0
-ftp://ccrma-ftp.stanford.edu/pub/Lisp/snd-12.1.tar.gz
-
-http://ccrma.stanford.edu/software/snd/
-as-is
-Snd is a sound editor
-~amd64 ~ppc ~x86 ~x86-interix ~amd64-linux ~x86-linux
-eutils flag-o-matic multilib portability toolchain-funcs user
-alsa esd fam fftw gmp gsl gtk jack ladspa motif opengl oss portaudio pulseaudio ruby
-
-
-
-4
-
-compile configure install setup
-
-
-
-
-
diff --git a/metadata/cache/media-sound/snd-12.2 b/metadata/cache/media-sound/snd-12.2
deleted file mode 100644
index 6cb7129e4f2e..000000000000
--- a/metadata/cache/media-sound/snd-12.2
+++ /dev/null
@@ -1,22 +0,0 @@
-
-media-libs/audiofile sys-libs/readline alsa? ( media-libs/alsa-lib ) esd? ( media-sound/esound ) fam? ( virtual/fam ) fftw? ( sci-libs/fftw ) gmp? ( dev-libs/gmp dev-libs/mpc dev-libs/mpfr ) gsl? ( >=sci-libs/gsl-0.8 ) gtk? ( x11-libs/gtk+:3 x11-libs/pango x11-libs/cairo opengl? ( x11-libs/gtkglext ) ) jack? ( media-sound/jack-audio-connection-kit ) ladspa? ( media-libs/ladspa-sdk ) motif? ( >=x11-libs/openmotif-2.3:0 ) opengl? ( virtual/opengl ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-sound/pulseaudio ) ruby? ( dev-lang/ruby )
-0
-ftp://ccrma-ftp.stanford.edu/pub/Lisp/snd-12.2.tar.gz
-
-http://ccrma.stanford.edu/software/snd/
-as-is
-Snd is a sound editor
-~amd64 ~ppc ~x86 ~x86-interix ~amd64-linux ~x86-linux
-eutils flag-o-matic multilib portability toolchain-funcs user
-alsa esd fam fftw gmp gsl gtk jack ladspa motif opengl oss portaudio pulseaudio ruby
-
-
-
-4
-
-compile configure install setup
-
-
-
-
-
diff --git a/metadata/cache/media-sound/snd-12.3 b/metadata/cache/media-sound/snd-12.3
deleted file mode 100644
index c844ccd7e60d..000000000000
--- a/metadata/cache/media-sound/snd-12.3
+++ /dev/null
@@ -1,22 +0,0 @@
-|| ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool
-media-libs/audiofile sys-libs/readline alsa? ( media-libs/alsa-lib ) esd? ( media-sound/esound ) fam? ( virtual/fam ) fftw? ( sci-libs/fftw ) gmp? ( dev-libs/gmp dev-libs/mpc dev-libs/mpfr ) gsl? ( >=sci-libs/gsl-0.8 ) gtk? ( x11-libs/gtk+:3 x11-libs/pango x11-libs/cairo opengl? ( x11-libs/gtkglext ) ) jack? ( media-sound/jack-audio-connection-kit ) ladspa? ( media-libs/ladspa-sdk ) motif? ( >=x11-libs/openmotif-2.3:0 ) opengl? ( virtual/opengl ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-sound/pulseaudio ) ruby? ( dev-lang/ruby )
-0
-ftp://ccrma-ftp.stanford.edu/pub/Lisp/snd-12.3.tar.gz
-
-http://ccrma.stanford.edu/software/snd/
-as-is
-Snd is a sound editor
-~amd64 ~ppc ~x86 ~x86-interix ~amd64-linux ~x86-linux
-autotools eutils flag-o-matic libtool multilib portability toolchain-funcs user
-alsa esd fam fftw gmp gsl gtk jack ladspa motif opengl oss portaudio pulseaudio ruby
-
-
-
-4
-
-compile configure install prepare setup
-
-
-
-
-
diff --git a/metadata/cache/media-sound/snd-12.4 b/metadata/cache/media-sound/snd-12.6
similarity index 95%
rename from metadata/cache/media-sound/snd-12.4
rename to metadata/cache/media-sound/snd-12.6
index cd9da065dde7..49e60b582bfd 100644
--- a/metadata/cache/media-sound/snd-12.4
+++ b/metadata/cache/media-sound/snd-12.6
@@ -1,7 +1,7 @@
 || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool
 media-libs/audiofile alsa? ( media-libs/alsa-lib ) esd? ( media-sound/esound ) fam? ( virtual/fam ) fftw? ( sci-libs/fftw ) gmp? ( dev-libs/gmp dev-libs/mpc dev-libs/mpfr ) gsl? ( sci-libs/gsl ) gtk? ( x11-libs/gtk+:3 x11-libs/pango x11-libs/cairo opengl? ( x11-libs/gtkglext ) ) jack? ( media-sound/jack-audio-connection-kit ) ladspa? ( media-libs/ladspa-sdk ) motif? ( >=x11-libs/openmotif-2.3:0 ) opengl? ( virtual/opengl ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-sound/pulseaudio ) readline? ( sys-libs/readline ) ruby? ( dev-lang/ruby )
 0
-ftp://ccrma-ftp.stanford.edu/pub/Lisp/snd-12.4.tar.gz
+ftp://ccrma-ftp.stanford.edu/pub/Lisp/snd-12.6.tar.gz
 
 http://ccrma.stanford.edu/software/snd/
 as-is
diff --git a/metadata/cache/net-dialup/ppp-2.4.5 b/metadata/cache/net-dialup/ppp-2.4.5-r2
similarity index 91%
rename from metadata/cache/net-dialup/ppp-2.4.5
rename to metadata/cache/net-dialup/ppp-2.4.5-r2
index f2c9b641aa30..18c51cb2441c 100644
--- a/metadata/cache/net-dialup/ppp-2.4.5
+++ b/metadata/cache/net-dialup/ppp-2.4.5-r2
@@ -1,7 +1,7 @@
 activefilter? ( net-libs/libpcap ) atm? ( net-dialup/linux-atm ) pam? ( virtual/pam ) gtk? ( x11-libs/gtk+:2 ) eap-tls? ( net-misc/curl dev-libs/openssl )
 activefilter? ( net-libs/libpcap ) atm? ( net-dialup/linux-atm ) pam? ( virtual/pam ) gtk? ( x11-libs/gtk+:2 ) eap-tls? ( net-misc/curl dev-libs/openssl )
 0
-ftp://ftp.samba.org/pub/ppp/ppp-2.4.5.tar.gz mirror://gentoo/ppp-2.4.5-gentoo-20100903.tar.gz dhcp? ( http://www.netservers.co.uk/gpl/ppp-dhcpc.tgz )
+ftp://ftp.samba.org/pub/ppp/ppp-2.4.5.tar.gz mirror://gentoo/ppp-2.4.5-gentoo-20111111.tar.gz dhcp? ( http://www.netservers.co.uk/gpl/ppp-dhcpc.tgz )
 
 http://www.samba.org/ppp
 BSD GPL-2
diff --git a/metadata/cache/net-misc/freerdp-1.0_beta1 b/metadata/cache/net-misc/freerdp-1.0_beta1
new file mode 100644
index 000000000000..71cefc1749af
--- /dev/null
+++ b/metadata/cache/net-misc/freerdp-1.0_beta1
@@ -0,0 +1,22 @@
+dev-libs/openssl sys-libs/zlib alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) directfb? ( dev-libs/DirectFB ) pulseaudio? ( media-sound/pulseaudio ) X? ( x11-libs/libX11 xcursor? ( x11-libs/libXcursor ) xext? ( x11-libs/libXext ) xinerama? ( x11-libs/libXinerama ) ) xkbfile? ( x11-libs/libxkbfile ) app-text/xmlto test? ( dev-util/cunit ) >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+dev-libs/openssl sys-libs/zlib alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) directfb? ( dev-libs/DirectFB ) pulseaudio? ( media-sound/pulseaudio ) X? ( x11-libs/libX11 xcursor? ( x11-libs/libXcursor ) xext? ( x11-libs/libXext ) xinerama? ( x11-libs/libXinerama ) ) xkbfile? ( x11-libs/libxkbfile )
+0
+https://github.com/downloads/FreeRDP/FreeRDP/FreeRDP-1.0-beta1.tar.gz
+test
+http://www.freerdp.com/
+Apache-2.0
+Client-side implementation of the Remote Desktop Protocol
+~amd64 ~x86
+base cmake-utils eutils flag-o-matic multilib portability toolchain-funcs user
++alsa +cups directfb pulseaudio sse2 test +X +xcursor +xext +xinerama +xkbfile debug-transport debug-chanman debug-svc debug-dvc debug-kbd debug-nla debug-nego debug-certificate debug-license debug-gdi debug-rfx debug-x11 debug-rail debug-xv
+
+
+
+4
+
+compile configure install prepare test unpack
+
+
+
+
+
diff --git a/metadata/cache/net-print/cups-pdf-2.6.1 b/metadata/cache/net-print/cups-pdf-2.6.1
new file mode 100644
index 000000000000..3e6d6a2a6e38
--- /dev/null
+++ b/metadata/cache/net-print/cups-pdf-2.6.1
@@ -0,0 +1,22 @@
+net-print/cups app-text/ghostscript-gpl
+net-print/cups app-text/ghostscript-gpl
+0
+http://www.cups-pdf.de/src/cups-pdf_2.6.1.tar.gz
+
+http://www.cups-pdf.de/
+GPL-2
+Provides a virtual printer for CUPS to produce PDF files.
+~amd64 ~ppc ~sparc ~x86
+multilib toolchain-funcs
+
+
+
+
+4
+
+compile install postinst
+
+
+
+
+
diff --git a/metadata/cache/sys-devel/gcc-config-1.5-r1 b/metadata/cache/sys-devel/gcc-config-1.5-r1
index 5505585ea001..392cf6625b7c 100644
--- a/metadata/cache/sys-devel/gcc-config-1.5-r1
+++ b/metadata/cache/sys-devel/gcc-config-1.5-r1
@@ -6,7 +6,7 @@
 http://www.gentoo.org/
 GPL-2
 Utility to change the gcc compiler being used
-
+~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd
 eutils flag-o-matic multilib portability toolchain-funcs user
 
 
diff --git a/metadata/cache/www-apps/drupal-7.9 b/metadata/cache/www-apps/drupal-7.9
new file mode 100644
index 000000000000..2a0e15ef9868
--- /dev/null
+++ b/metadata/cache/www-apps/drupal-7.9
@@ -0,0 +1,22 @@
+|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) virtual/httpd-php >=app-admin/webapp-config-1.50.15
+dev-lang/php[pdo,postgres?,sqlite?,xml] mysql? ( || ( dev-lang/php[mysql] dev-lang/php[mysqli] ) ) || ( dev-lang/php[gd] dev-lang/php[gd-external] ) >=app-admin/webapp-config-1.50.15
+7.9
+http://drupal.org/files/projects/drupal-7.9.tar.gz
+
+http://drupal.org/
+GPL-2
+PHP-based open-source platform and content management system
+~alpha ~amd64 ~ppc ~x86
+depend.php eutils multilib phpconfutils portability toolchain-funcs user webapp
++mysql postgres sqlite vhosts
+|| ( mysql postgres sqlite )
+
+
+4
+
+install postinst prerm setup
+
+
+
+
+
diff --git a/metadata/cache/www-apps/phpsysinfo-3.0.15 b/metadata/cache/www-apps/phpsysinfo-3.0.15
new file mode 100644
index 000000000000..742b19cdb687
--- /dev/null
+++ b/metadata/cache/www-apps/phpsysinfo-3.0.15
@@ -0,0 +1,22 @@
+|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) virtual/httpd-php >=app-admin/webapp-config-1.50.15
+dev-lang/php[simplexml,xml,xsl,unicode] || ( <dev-lang/php-5.3[pcre] >=dev-lang/php-5.3 ) virtual/httpd-php >=app-admin/webapp-config-1.50.15
+3.0.15
+mirror://sourceforge/phpsysinfo/phpsysinfo-3.0.15.tar.gz
+
+http://phpsysinfo.sourceforge.net/
+GPL-2
+phpSysInfo is a nice package that will display your system stats via PHP.
+~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+depend.php eutils multilib phpconfutils portability toolchain-funcs user webapp
+vhosts
+
+
+
+4
+
+install postinst prerm setup
+
+
+
+
+
diff --git a/metadata/cache/www-apps/wordpress-3.3_beta2 b/metadata/cache/www-apps/wordpress-3.3_beta2
deleted file mode 100644
index 8d2e0686aca8..000000000000
--- a/metadata/cache/www-apps/wordpress-3.3_beta2
+++ /dev/null
@@ -1,22 +0,0 @@
-|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) virtual/httpd-php >=app-admin/webapp-config-1.50.15
-|| ( dev-lang/php[mysql] dev-lang/php[mysqli] ) || ( <dev-lang/php-5.3[pcre] >=dev-lang/php-5.3 ) virtual/httpd-php >=app-admin/webapp-config-1.50.15
-3.3_beta2
-http://wordpress.org/wordpress-3.3-beta2.tar.gz
-
-http://wordpress.org/
-GPL-2
-Wordpress php and mysql based CMS system
-~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
-depend.php eutils multilib phpconfutils portability toolchain-funcs user webapp
-vhosts
-
-
-
-4
-
-install postinst prerm setup
-
-
-
-
-
diff --git a/metadata/cache/www-apps/wordpress-3.3_beta1 b/metadata/cache/www-apps/wordpress-3.3_beta3
similarity index 89%
rename from metadata/cache/www-apps/wordpress-3.3_beta1
rename to metadata/cache/www-apps/wordpress-3.3_beta3
index a5d2d9557688..ea3f94825662 100644
--- a/metadata/cache/www-apps/wordpress-3.3_beta1
+++ b/metadata/cache/www-apps/wordpress-3.3_beta3
@@ -1,7 +1,7 @@
 || ( virtual/httpd-cgi virtual/httpd-fastcgi ) virtual/httpd-php >=app-admin/webapp-config-1.50.15
 || ( dev-lang/php[mysql] dev-lang/php[mysqli] ) || ( <dev-lang/php-5.3[pcre] >=dev-lang/php-5.3 ) virtual/httpd-php >=app-admin/webapp-config-1.50.15
-3.3_beta1
-http://wordpress.org/wordpress-3.3-beta1.tar.gz
+3.3_beta3
+http://wordpress.org/wordpress-3.3-beta3.tar.gz
 
 http://wordpress.org/
 GPL-2
diff --git a/metadata/cache/www-client/firefox-8.0 b/metadata/cache/www-client/firefox-8.0
new file mode 100644
index 000000000000..fcc022340d7f
--- /dev/null
+++ b/metadata/cache/www-client/firefox-8.0
@@ -0,0 +1,22 @@
+>=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.12.10 >=dev-libs/nspr-4.8.8 >=dev-libs/glib-2.26:2 >=media-libs/mesa-7.10 media-libs/libpng[apng] virtual/libffi system-sqlite? ( >=dev-db/sqlite-3.7.4[fts3,secure-delete,unlock-notify,debug=] ) webm? ( media-libs/libvpx media-libs/alsa-lib ) crashreporter? ( net-misc/curl ) dev-util/pkgconfig pgo? ( =dev-lang/python-2*[sqlite] >=sys-devel/gcc-4.5 ) webm? ( x86? ( >=dev-lang/yasm-1.1 ) amd64? ( >=dev-lang/yasm-1.1 ) ) >=sys-apps/sed-4 >=app-admin/eselect-python-20091230 x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 dev-util/pkgconfig =dev-lang/python-2*[threads] app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 !<x11-base/xorg-x11-6.7.0-r2 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools ) || ( =sys-devel/automake-1.11* ) =sys-devel/autoconf-2.1* sys-devel/libtool app-arch/unzip >=app-admin/eselect-python-20091230 pgo? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+>=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.12.10 >=dev-libs/nspr-4.8.8 >=dev-libs/glib-2.26:2 >=media-libs/mesa-7.10 media-libs/libpng[apng] virtual/libffi system-sqlite? ( >=dev-db/sqlite-3.7.4[fts3,secure-delete,unlock-notify,debug=] ) webm? ( media-libs/libvpx media-libs/alsa-lib ) crashreporter? ( net-misc/curl ) >=app-admin/eselect-python-20091230 x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 !<x11-base/xorg-x11-6.7.0-r2 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools ) >=app-admin/eselect-python-20091230
+0
+http://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-8.0-patches-0.2.tar.xz ftp://ftp.mozilla.org/pub/firefox/releases//8.0/source/firefox-8.0.source.tar.bz2 linguas_af? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/af.xpi -> firefox-8.0-af.xpi ) linguas_ak? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/ak.xpi -> firefox-8.0-ak.xpi ) linguas_ar? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/ar.xpi -> firefox-8.0-ar.xpi ) linguas_ast? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/ast.xpi -> firefox-8.0-ast.xpi ) linguas_be? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/be.xpi -> firefox-8.0-be.xpi ) linguas_bg? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/bg.xpi -> firefox-8.0-bg.xpi ) linguas_bn_BD? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/bn-BD.xpi -> firefox-8.0-bn-BD.xpi ) linguas_bn? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/bn-BD.xpi -> firefox-8.0-bn-BD.xpi ) linguas_bn_IN? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/bn-IN.xpi -> firefox-8.0-bn-IN.xpi ) linguas_bn? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/bn-IN.xpi -> firefox-8.0-bn-IN.xpi ) linguas_br? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/br.xpi -> firefox-8.0-br.xpi ) linguas_bs? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/bs.xpi -> firefox-8.0-bs.xpi ) linguas_ca? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/ca.xpi -> firefox-8.0-ca.xpi ) linguas_cs? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/cs.xpi -> firefox-8.0-cs.xpi ) linguas_cy? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/cy.xpi -> firefox-8.0-cy.xpi ) linguas_da? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/da.xpi -> firefox-8.0-da.xpi ) linguas_de? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/de.xpi -> firefox-8.0-de.xpi ) linguas_el? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/el.xpi -> firefox-8.0-el.xpi ) linguas_en_GB? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/en-GB.xpi -> firefox-8.0-en-GB.xpi ) linguas_en_ZA? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/en-ZA.xpi -> firefox-8.0-en-ZA.xpi ) linguas_eo? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/eo.xpi -> firefox-8.0-eo.xpi ) linguas_es_AR? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/es-AR.xpi -> firefox-8.0-es-AR.xpi ) linguas_es? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/es-AR.xpi -> firefox-8.0-es-AR.xpi ) linguas_es_CL? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/es-CL.xpi -> firefox-8.0-es-CL.xpi ) linguas_es? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/es-CL.xpi -> firefox-8.0-es-CL.xpi ) linguas_es_ES? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/es-ES.xpi -> firefox-8.0-es-ES.xpi ) linguas_es? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/es-ES.xpi -> firefox-8.0-es-ES.xpi ) linguas_es_MX? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/es-MX.xpi -> firefox-8.0-es-MX.xpi ) linguas_es? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/es-MX.xpi -> firefox-8.0-es-MX.xpi ) linguas_et? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/et.xpi -> firefox-8.0-et.xpi ) linguas_eu? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/eu.xpi -> firefox-8.0-eu.xpi ) linguas_fa? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/fa.xpi -> firefox-8.0-fa.xpi ) linguas_fi? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/fi.xpi -> firefox-8.0-fi.xpi ) linguas_fr? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/fr.xpi -> firefox-8.0-fr.xpi ) linguas_fy_NL? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/fy-NL.xpi -> firefox-8.0-fy-NL.xpi ) linguas_fy? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/fy-NL.xpi -> firefox-8.0-fy-NL.xpi ) linguas_ga_IE? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/ga-IE.xpi -> firefox-8.0-ga-IE.xpi ) linguas_ga? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/ga-IE.xpi -> firefox-8.0-ga-IE.xpi ) linguas_gd? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/gd.xpi -> firefox-8.0-gd.xpi ) linguas_gl? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/gl.xpi -> firefox-8.0-gl.xpi ) linguas_gu_IN? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/gu-IN.xpi -> firefox-8.0-gu-IN.xpi ) linguas_gu? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/gu-IN.xpi -> firefox-8.0-gu-IN.xpi ) linguas_he? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/he.xpi -> firefox-8.0-he.xpi ) linguas_hi_IN? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/hi-IN.xpi -> firefox-8.0-hi-IN.xpi ) linguas_hi? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/hi-IN.xpi -> firefox-8.0-hi-IN.xpi ) linguas_hr? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/hr.xpi -> firefox-8.0-hr.xpi ) linguas_hu? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/hu.xpi -> firefox-8.0-hu.xpi ) linguas_hy_AM? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/hy-AM.xpi -> firefox-8.0-hy-AM.xpi ) linguas_hy? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/hy-AM.xpi -> firefox-8.0-hy-AM.xpi ) linguas_id? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/id.xpi -> firefox-8.0-id.xpi ) linguas_is? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/is.xpi -> firefox-8.0-is.xpi ) linguas_it? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/it.xpi -> firefox-8.0-it.xpi ) linguas_ja? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/ja.xpi -> firefox-8.0-ja.xpi ) linguas_kk? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/kk.xpi -> firefox-8.0-kk.xpi ) linguas_kn? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/kn.xpi -> firefox-8.0-kn.xpi ) linguas_ko? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/ko.xpi -> firefox-8.0-ko.xpi ) linguas_ku? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/ku.xpi -> firefox-8.0-ku.xpi ) linguas_lg? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/lg.xpi -> firefox-8.0-lg.xpi ) linguas_lt? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/lt.xpi -> firefox-8.0-lt.xpi ) linguas_lv? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/lv.xpi -> firefox-8.0-lv.xpi ) linguas_mai? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/mai.xpi -> firefox-8.0-mai.xpi ) linguas_mk? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/mk.xpi -> firefox-8.0-mk.xpi ) linguas_ml? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/ml.xpi -> firefox-8.0-ml.xpi ) linguas_mr? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/mr.xpi -> firefox-8.0-mr.xpi ) linguas_nb_NO? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/nb-NO.xpi -> firefox-8.0-nb-NO.xpi ) linguas_nb? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/nb-NO.xpi -> firefox-8.0-nb-NO.xpi ) linguas_nl? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/nl.xpi -> firefox-8.0-nl.xpi ) linguas_nn_NO? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/nn-NO.xpi -> firefox-8.0-nn-NO.xpi ) linguas_nn? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/nn-NO.xpi -> firefox-8.0-nn-NO.xpi ) linguas_nso? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/nso.xpi -> firefox-8.0-nso.xpi ) linguas_or? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/or.xpi -> firefox-8.0-or.xpi ) linguas_pa_IN? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/pa-IN.xpi -> firefox-8.0-pa-IN.xpi ) linguas_pa? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/pa-IN.xpi -> firefox-8.0-pa-IN.xpi ) linguas_pl? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/pl.xpi -> firefox-8.0-pl.xpi ) linguas_pt_BR? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/pt-BR.xpi -> firefox-8.0-pt-BR.xpi ) linguas_pt? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/pt-BR.xpi -> firefox-8.0-pt-BR.xpi ) linguas_pt_PT? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/pt-PT.xpi -> firefox-8.0-pt-PT.xpi ) linguas_pt? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/pt-PT.xpi -> firefox-8.0-pt-PT.xpi ) linguas_rm? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/rm.xpi -> firefox-8.0-rm.xpi ) linguas_ro? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/ro.xpi -> firefox-8.0-ro.xpi ) linguas_ru? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/ru.xpi -> firefox-8.0-ru.xpi ) linguas_si? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/si.xpi -> firefox-8.0-si.xpi ) linguas_sk? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/sk.xpi -> firefox-8.0-sk.xpi ) linguas_sl? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/sl.xpi -> firefox-8.0-sl.xpi ) linguas_son? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/son.xpi -> firefox-8.0-son.xpi ) linguas_sq? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/sq.xpi -> firefox-8.0-sq.xpi ) linguas_sr? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/sr.xpi -> firefox-8.0-sr.xpi ) linguas_sv_SE? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/sv-SE.xpi -> firefox-8.0-sv-SE.xpi ) linguas_sv? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/sv-SE.xpi -> firefox-8.0-sv-SE.xpi ) linguas_ta? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/ta.xpi -> firefox-8.0-ta.xpi ) linguas_ta_LK? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/ta-LK.xpi -> firefox-8.0-ta-LK.xpi ) linguas_te? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/te.xpi -> firefox-8.0-te.xpi ) linguas_th? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/th.xpi -> firefox-8.0-th.xpi ) linguas_tr? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/tr.xpi -> firefox-8.0-tr.xpi ) linguas_uk? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/uk.xpi -> firefox-8.0-uk.xpi ) linguas_vi? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/vi.xpi -> firefox-8.0-vi.xpi ) linguas_zh_CN? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/zh-CN.xpi -> firefox-8.0-zh-CN.xpi ) linguas_zh? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/zh-CN.xpi -> firefox-8.0-zh-CN.xpi ) linguas_zh_TW? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/zh-TW.xpi -> firefox-8.0-zh-TW.xpi ) linguas_zh? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/zh-TW.xpi -> firefox-8.0-zh-TW.xpi ) linguas_zu? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/zu.xpi -> firefox-8.0-zu.xpi )
+
+http://www.mozilla.com/firefox
+|| ( MPL-1.1 GPL-2 LGPL-2.1 )
+Firefox Web Browser
+~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
+autotools eutils fdo-mime flag-o-matic gnome2-utils libtool mozconfig-3 mozcoreconf-2 mozextension multilib pax-utils portability python toolchain-funcs user versionator virtualx
+bindist +crashreporter +ipc pgo system-sqlite +webm linguas_af linguas_ak linguas_ar linguas_ast linguas_be linguas_bg linguas_bn_BD linguas_bn linguas_bn_IN linguas_bn linguas_br linguas_bs linguas_ca linguas_cs linguas_cy linguas_da linguas_de linguas_el linguas_en linguas_en_GB linguas_en_US linguas_en_ZA linguas_eo linguas_es_AR linguas_es linguas_es_CL linguas_es linguas_es_ES linguas_es linguas_es_MX linguas_es linguas_et linguas_eu linguas_fa linguas_fi linguas_fr linguas_fy_NL linguas_fy linguas_ga_IE linguas_ga linguas_gd linguas_gl linguas_gu_IN linguas_gu linguas_he linguas_hi_IN linguas_hi linguas_hr linguas_hu linguas_hy_AM linguas_hy linguas_id linguas_is linguas_it linguas_ja linguas_kk linguas_kn linguas_ko linguas_ku linguas_lg linguas_lt linguas_lv linguas_mai linguas_mk linguas_ml linguas_mr linguas_nb_NO linguas_nb linguas_nl linguas_nn_NO linguas_nn linguas_nso linguas_or linguas_pa_IN linguas_pa linguas_pl linguas_pt_BR linguas_pt linguas_pt_PT linguas_pt linguas_rm linguas_ro linguas_ru linguas_si linguas_sk linguas_sl linguas_son linguas_sq linguas_sr linguas_sv_SE linguas_sv linguas_ta linguas_ta_LK linguas_te linguas_th linguas_tr linguas_uk linguas_vi linguas_zh_CN linguas_zh linguas_zh_TW linguas_zh linguas_zu custom-cflags custom-optimization +alsa +dbus debug libnotify startup-notification system-sqlite wifi pgo
+
+
+
+3
+
+compile configure install postinst postrm preinst prepare setup unpack
+
+
+
+
+
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index d4d71107d293..66d546108b0b 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Fri, 11 Nov 2011 01:06:45 +0000
+Fri, 11 Nov 2011 07:46:41 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index d9af984c77a8..66d546108b0b 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Fri, 11 Nov 2011 01:06:46 +0000
+Fri, 11 Nov 2011 07:46:41 +0000
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index ca44aa7a0076..72bdbe071f22 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Fri, 11 Nov 2011 01:06:47 +0000
+Fri, 11 Nov 2011 07:46:42 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index a597e70d5654..b61265dc3cdd 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Fri Nov 11 01:06:45 UTC 2011
+Fri Nov 11 07:46:41 UTC 2011
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 4e938bcd80f3..2493a996fec8 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Fri, 11 Nov 2011 01:30:01 +0000
+Fri, 11 Nov 2011 08:00:01 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 82331b652f34..a97774d06bb1 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1320973501 Fri Nov 11 01:05:01 2011 UTC
+1320997501 Fri Nov 11 07:45:01 2011 UTC
diff --git a/net-dialup/ppp/Manifest b/net-dialup/ppp/Manifest
index 5d870a2729be..d3caf421952d 100644
--- a/net-dialup/ppp/Manifest
+++ b/net-dialup/ppp/Manifest
@@ -1,6 +1,6 @@
 DIST ppp-2.4.4-gentoo-20091116.tar.gz 54932 RMD160 5f37dbae97a4e55ae25ed54d8ae521cb51064c50 SHA1 b35cbec42b3a0794281921e7879eab322f27da70 SHA256 52f174b3df36110d14c522869c507f64aef4d2d01db2dec2936cc9917c9fa716
 DIST ppp-2.4.4.tar.gz 688763 RMD160 ed289a4506c3af41a72f88103d5e0be44dec3da7 SHA1 9b91b0117e0a8bfaf8c4e894af79e0960dd36259 SHA256 58af45fc07e5f326eea2408df770ea40e4626d1a15e7d564dd054d74880e91ea
-DIST ppp-2.4.5-gentoo-20100903.tar.gz 38811 RMD160 5e64ea4ddd5f7823376709f6076f117acbdd6c17 SHA1 da55d88d3ea5557f3f92b949a6827a4701b32c91 SHA256 fab65eaae9116af6debee4fa35c412b8221e91e5cbc81115448fb4f81a27bf0f
 DIST ppp-2.4.5-gentoo-20101127.tar.gz 41562 RMD160 b9aa87b7f185eda2d022580ccbb9b23d2c2a4f42 SHA1 b63aa5c0c91458fe82a2be2cca2fbe264db2b301 SHA256 d49f51dd10dfc97f25bb5dbc4acc61c708d890da231295467ac3710751d2bcdd
+DIST ppp-2.4.5-gentoo-20111111.tar.gz 41883 RMD160 e94c89a8404182ae0b2b9757c23ae69db012918d SHA1 98748395fbbd85509ba0059745ae708e57cc9f91 SHA256 950e06cb9e9c844e88cb99c3fc1dbb7515814d75f7f6e87a81fbb245e48ba4ed
 DIST ppp-2.4.5.tar.gz 684342 RMD160 231682ab2314d182c893c64523fd89f571a258de SHA1 cb977b31584e3488e08a643aaa672fdb229d2e78 SHA256 43317afec9299f9920b96f840414c977f0385410202d48e56d2fdb8230003505
 DIST ppp-dhcpc.tgz 33497 RMD160 63bf0d1cc52e91ea536fc593fb7a40502baecd90 SHA1 1a0b02788d522f2137d0b66c749ffe6c96cceb94 SHA256 977fd980bb1d285963d8e27a87b7601ea84317faadfdb40989b258d1853db644
diff --git a/net-dialup/ppp/metadata.xml b/net-dialup/ppp/metadata.xml
index 714b92a83d32..748645b1596d 100644
--- a/net-dialup/ppp/metadata.xml
+++ b/net-dialup/ppp/metadata.xml
@@ -16,7 +16,7 @@
     by a DHCP server (see http://www.netservers.co.uk/gpl/)</flag>
     <flag name="eap-tls">Enables support for Extensible Authentication
     Protocol and Transport Level Security (see
-    http://eaptls.spe.net/index.html)</flag>
+    http://www.nikhef.nl/~janjust/ppp/index.html)</flag>
     <flag name="gtk">Installs GTK+ password prompting program that can be used
     by passprompt.so PPP plugin for reading the password from a X11 input
     terminal</flag>
diff --git a/net-dialup/ppp/ppp-2.4.5.ebuild b/net-dialup/ppp/ppp-2.4.5-r2.ebuild
similarity index 96%
rename from net-dialup/ppp/ppp-2.4.5.ebuild
rename to net-dialup/ppp/ppp-2.4.5-r2.ebuild
index 6871adb4a1d8..62932b852172 100644
--- a/net-dialup/ppp/ppp-2.4.5.ebuild
+++ b/net-dialup/ppp/ppp-2.4.5-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ppp-2.4.5.ebuild,v 1.3 2011/04/02 12:51:08 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ppp-2.4.5-r2.ebuild,v 1.1 2011/11/11 01:02:03 mrness Exp $
 
 EAPI="2"
 
@@ -9,7 +9,7 @@ inherit eutils toolchain-funcs linux-info pam
 DESCRIPTION="Point-to-Point Protocol (PPP)"
 HOMEPAGE="http://www.samba.org/ppp"
 SRC_URI="ftp://ftp.samba.org/pub/ppp/${P}.tar.gz
-	mirror://gentoo/${P}-gentoo-20100903.tar.gz
+	mirror://gentoo/${P}-gentoo-20111111.tar.gz
 	dhcp? ( http://www.netservers.co.uk/gpl/ppp-dhcpc.tgz )"
 
 LICENSE="BSD GPL-2"
@@ -41,11 +41,13 @@ src_prepare() {
 	epatch "${WORKDIR}/patch/connect-errors.patch"
 	epatch "${WORKDIR}/patch/Makefile.patch"
 	epatch "${WORKDIR}/patch/pppol2tpv3-2.6.35.patch"
+	epatch "${WORKDIR}/patch/pado-timeout.patch"
+	epatch "${WORKDIR}/patch/lcp-echo-adaptive.patch"
 
 	use eap-tls && {
 		# see http://www.nikhef.nl/~janjust/ppp for more info
 		einfo "Enabling EAP-TLS support"
-		epatch "${WORKDIR}/patch/eaptls-mppe-0.98-gentoo.patch"
+		epatch "${WORKDIR}/patch/eaptls-mppe-0.991-gentoo.patch"
 	}
 
 	use atm && {
diff --git a/net-print/cups-pdf/Manifest b/net-print/cups-pdf/Manifest
index 3c98a3688151..984c37227f47 100644
--- a/net-print/cups-pdf/Manifest
+++ b/net-print/cups-pdf/Manifest
@@ -1,2 +1,3 @@
 DIST cups-pdf_2.4.8.tar.gz 34254 RMD160 ceed244effd0c9e63ec0a376a2adabb98abd9a4f SHA1 7da47c61fef313e47fa6db9f1859499683fc72e8 SHA256 c77e4a538cf04512f6d712030d392a2a96bf06f72e5c3f31ec9eeabde5e3b135
 DIST cups-pdf_2.5.1.tar.gz 32578 RMD160 b99fdff0e523470aaf3a99e1c446f79a63c123a7 SHA1 2b5fe4bb779afa8764c274d6e35e3f9c539fb582 SHA256 63c8bcf0ec12eaa2af9477267f8aecd0c1c1e03fa6b88ab47ca2a781a83c1f94
+DIST cups-pdf_2.6.1.tar.gz 33315 RMD160 ebb7ed5192ff91201e2ef9d87d8f24c1c7a393cc SHA1 6806f0004dfed5216625ab60cfe307ded23c2f6a SHA256 04e17eb563dceea048e1a435edcbcf52faa5288f85e8390cd64d702edb6745f1
diff --git a/net-print/cups-pdf/cups-pdf-2.6.1.ebuild b/net-print/cups-pdf/cups-pdf-2.6.1.ebuild
new file mode 100644
index 000000000000..ed91b67d903c
--- /dev/null
+++ b/net-print/cups-pdf/cups-pdf-2.6.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups-pdf/cups-pdf-2.6.1.ebuild,v 1.1 2011/11/11 05:54:48 radhermit Exp $
+
+EAPI=4
+
+inherit toolchain-funcs
+
+DESCRIPTION="Provides a virtual printer for CUPS to produce PDF files."
+HOMEPAGE="http://www.cups-pdf.de/"
+SRC_URI="http://www.cups-pdf.de/src/${PN}_${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+DEPEND="net-print/cups
+	app-text/ghostscript-gpl"
+RDEPEND="${DEPEND}"
+
+src_compile() {
+	cd "${S}"/src
+	$(tc-getCC) ${CFLAGS} ${LDFLAGS} -o ${PN} ${PN}.c || die "Compilation failed."
+}
+
+src_install () {
+	exeinto /usr/libexec/cups/backend
+	exeopts -m0700
+	doexe src/cups-pdf
+
+	insinto /usr/share/cups/model
+	doins extra/CUPS-PDF.ppd
+
+	insinto /etc/cups
+	doins extra/cups-pdf.conf
+
+	dodoc ChangeLog README
+	newdoc contrib/Contents contrib_Contents
+}
+
+pkg_postinst () {
+	elog "Please view both the README and contrib_Contents files"
+	elog "as you may want to adjust some settings and/or use"
+	elog "contributed software. In the latter case you may need"
+	elog "to extract some files from the ${P} distfile."
+}
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index ac34a0c9b84d..b42f2f37010a 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -2043,6 +2043,7 @@ mail-client/thunderbird:ipc - Use inter-process communication between tabs and p
 mail-client/thunderbird:lightning - Enable calendar support
 mail-client/thunderbird:mozdom - Enable Mozilla's DOM inspector
 mail-client/thunderbird:system-sqlite - Use the system-wide dev-db/sqlite installation with secure-delete enabled
+mail-client/thunderbird:webm - Use system media-libs/libvpx for HTML5 WebM video support.
 mail-filter/amavisd-new:courier - Add courier support
 mail-filter/amavisd-new:dkim - Add DomainKeys Identified Mail support
 mail-filter/amavisd-new:qmail - Add qmail support
diff --git a/sys-devel/gcc-config/gcc-config-1.5-r1.ebuild b/sys-devel/gcc-config/gcc-config-1.5-r1.ebuild
index c151ad7655dc..121e3de0e028 100644
--- a/sys-devel/gcc-config/gcc-config-1.5-r1.ebuild
+++ b/sys-devel/gcc-config/gcc-config-1.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/gcc-config-1.5-r1.ebuild,v 1.1 2011/03/18 19:47:37 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/gcc-config-1.5-r1.ebuild,v 1.2 2011/11/11 05:02:38 dirtyepic Exp $
 
 inherit flag-o-matic toolchain-funcs multilib
 
@@ -13,7 +13,7 @@ SRC_URI=""
 
 LICENSE="GPL-2"
 SLOT="0"
-#KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND="!app-admin/eselect-compiler"
diff --git a/www-apps/drupal/Manifest b/www-apps/drupal/Manifest
index b401b5ea25ac..01b2b610f962 100644
--- a/www-apps/drupal/Manifest
+++ b/www-apps/drupal/Manifest
@@ -3,3 +3,4 @@ DIST drupal-6.22.tar.gz 1100999 RMD160 42cb64a32ca457779e498ef8edb952e04f8b2c86
 DIST drupal-7.4.tar.gz 2744808 RMD160 bfb44319df159fd7597b1a043abffb0f27e37a2f SHA1 5baafc27b3473dae1056e6053734fab42a1bfc25 SHA256 ff55543ce00b0c49d6db0cc75097a90acb9dc720326d86d4c793ae36b5cf2f3f
 DIST drupal-7.7.tar.gz 2754113 RMD160 cdd3e35a0a72af466e454eff9f317e9fe856e27a SHA1 30351894503b283c1a5f73bbcb0e3bf7f1c98de8 SHA256 f85456586c88e035743827bda200ff9d4c2d90f0b331a22b3a533899f1f98e26
 DIST drupal-7.8.tar.gz 2766967 RMD160 74e9c67d85bf67fdf49cb8c12fd878aab82c5893 SHA1 14d3fda681264a0ca4e81c22fe7e6cd474128baf SHA256 982d84c6d3bd8181e37cfd063bc32739c4eb81ddca315f48672399a168b4a6ab
+DIST drupal-7.9.tar.gz 2788086 RMD160 ccdac9785d62e92c298ce88c4847536b1383dc28 SHA1 3aa90fa9baae2c723ab5f4fe0cc523a6c96683ba SHA256 9708db25f860d1250166fe0936af366155f6a59c5dc6d2de356bb7d22036c93a
diff --git a/www-apps/drupal/drupal-7.9.ebuild b/www-apps/drupal/drupal-7.9.ebuild
new file mode 100644
index 000000000000..aa690a0edf22
--- /dev/null
+++ b/www-apps/drupal/drupal-7.9.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/drupal/drupal-7.9.ebuild,v 1.1 2011/11/11 04:56:32 radhermit Exp $
+
+EAPI=4
+
+inherit webapp depend.php
+
+MY_PV=${PV:0:3}.0
+
+DESCRIPTION="PHP-based open-source platform and content management system"
+HOMEPAGE="http://drupal.org/"
+SRC_URI="http://drupal.org/files/projects/${P/_/-}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~ppc ~x86"
+IUSE="+mysql postgres sqlite"
+
+need_httpd_cgi
+need_php_httpd
+
+RDEPEND="dev-lang/php[pdo,postgres?,sqlite?,xml]
+	mysql? ( || ( dev-lang/php[mysql] dev-lang/php[mysqli] ) )
+	|| ( dev-lang/php[gd] dev-lang/php[gd-external] )"
+
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+S="${WORKDIR}/${P/_/-}"
+
+src_install() {
+	webapp_src_preinst
+
+	local docs="MAINTAINERS.txt LICENSE.txt INSTALL.txt CHANGELOG.txt INSTALL.mysql.txt INSTALL.pgsql.txt INSTALL.sqlite.txt UPGRADE.txt "
+	dodoc ${docs}
+	rm -f ${docs} INSTALL COPYRIGHT.txt
+
+	cp sites/default/{default.settings.php,settings.php}
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+
+	dodir "${MY_HTDOCSDIR}"/files
+	webapp_serverowned "${MY_HTDOCSDIR}"/files
+	webapp_serverowned "${MY_HTDOCSDIR}"/sites/default
+	webapp_serverowned "${MY_HTDOCSDIR}"/sites/default/settings.php
+
+	webapp_configfile "${MY_HTDOCSDIR}"/sites/default/settings.php
+	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
+
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+
+	webapp_src_install
+}
+
+pkg_postinst() {
+	ewarn
+	ewarn "SECURITY NOTICE"
+	ewarn "If you plan on using SSL on your Drupal site, please consult the postinstall information:"
+	ewarn "\t# webapp-config --show-postinst ${PN} ${PV}"
+	ewarn
+}
diff --git a/www-apps/phpsysinfo/Manifest b/www-apps/phpsysinfo/Manifest
index 1a32f25ba3b7..f97b614bb5ef 100644
--- a/www-apps/phpsysinfo/Manifest
+++ b/www-apps/phpsysinfo/Manifest
@@ -2,3 +2,4 @@ DIST phpsysinfo-2.5.4.tar.gz 221324 RMD160 d328e77f59757cec80f93862098ea6114e535
 DIST phpsysinfo-3.0.12.tar.gz 464967 RMD160 02c269bbda28b0907b2bb5aad68097822dc7b2f1 SHA1 98458dd470b6f1141210fab56817d4527f95928d SHA256 27e19d3db668f287016295f427090891e729e3ed070187e7b936cf69ce764bd1
 DIST phpsysinfo-3.0.13.tar.gz 466169 RMD160 55d05e6930db8cd2c64e7db4cc3b61d5dca2ca53 SHA1 4950457377d41950fc03983571824aec3266d540 SHA256 7ca08fd41f5678ac516d2fad6e016d4693f830f2e7c0a65f1a36f5854d0fabfe
 DIST phpsysinfo-3.0.14.tar.gz 470084 RMD160 9a788a8e0d526636afa1701d012eac2fdaaa52ac SHA1 297f0a232f32027fa40dad0842382d5e625e2f1a SHA256 75846da61329dad7d26118a291c7825db2e6d448c6529b75961f1ba9387af486
+DIST phpsysinfo-3.0.15.tar.gz 466195 RMD160 1930081ff7e0e0747ac0183063c959b22f04b765 SHA1 427a785309b75b02e4fa326a8fb089aa75cdd99c SHA256 2db8dc4b9348ef051fd50a000fd6b9f33149d442e5fb4334e5e83b37870c2740
diff --git a/www-apps/phpsysinfo/phpsysinfo-3.0.15.ebuild b/www-apps/phpsysinfo/phpsysinfo-3.0.15.ebuild
new file mode 100644
index 000000000000..0b2cd6f53d05
--- /dev/null
+++ b/www-apps/phpsysinfo/phpsysinfo-3.0.15.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/phpsysinfo/phpsysinfo-3.0.15.ebuild,v 1.1 2011/11/11 05:05:34 radhermit Exp $
+
+EAPI="4"
+
+inherit webapp depend.php
+
+DESCRIPTION="phpSysInfo is a nice package that will display your system stats via PHP."
+HOMEPAGE="http://phpsysinfo.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND="dev-lang/php[simplexml,xml,xsl,unicode]
+	|| ( <dev-lang/php-5.3[pcre] >=dev-lang/php-5.3 )"
+
+S="${WORKDIR}/${PN}"
+
+need_httpd_cgi
+need_php_httpd
+
+src_install() {
+	webapp_src_preinst
+
+	dodoc ChangeLog README*
+	rm -f ChangeLog COPYING README*
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+	newins config.php{.new,}
+
+	webapp_configfile "${MY_HTDOCSDIR}"/config.php
+	webapp_src_install
+}
diff --git a/www-apps/wordpress/Manifest b/www-apps/wordpress/Manifest
index 55138660249f..df64e376468b 100644
--- a/www-apps/wordpress/Manifest
+++ b/www-apps/wordpress/Manifest
@@ -3,5 +3,4 @@ DIST wordpress-3.1.3.tar.gz 2764167 RMD160 b46c9c52186f815db97d44ec25acf4dcc02d3
 DIST wordpress-3.1.4.tar.gz 2764719 RMD160 a60edf117c7dd385d8400f38722d98aa4118d0ba SHA1 b93ff680a7035378abac1063abebf72a473e8a78 SHA256 ad5368d0beb7646bc1cd152fd08551e158ee0dae61f01f18939cee9c485b00eb
 DIST wordpress-3.2.1.tar.gz 3607522 RMD160 a78f1aec0d142e1de32f214fd65ac2aef256979d SHA1 674bcf0abe80770ac08dfb4c5f21df3303bf771a SHA256 21e3cebd02808f9ee39a979d22e6e10bce5356ddf7068aef182847b12c9b95a9
 DIST wordpress-3.2.tar.gz 3560784 RMD160 517aa89ed46f011607ca056b8a54747bf53af5e2 SHA1 ee2e7e0415e41d1ae0f82a1c1e5583a6ed257802 SHA256 12a94a9226c5387ef41057653d62cf7b1fd47df0ec95e87749b7f085fc05b742
-DIST wordpress-3.3-beta1.tar.gz 3763463 RMD160 f1e8e4b2f3ab0d1c5bfc394bb33a6f66cdd1df76 SHA1 f6c9dbf7dd2c8872ec7987ca2b24a500cc312ee4 SHA256 201033d058126a48378501290c71a45be928122f73a40943d4e9334a68616c41
-DIST wordpress-3.3-beta2.tar.gz 3762763 RMD160 a259f17bb8cfc926f3c1922bf092879f2733a174 SHA1 1860dd41a823aa4bfb5d94a2566f73eac2db80be SHA256 11e43feffb846a9b2015a496c210f38e5e2efa7f6ae10bc3498ab306f36bbe12
+DIST wordpress-3.3-beta3.tar.gz 3767010 RMD160 67a52977d765eeffc3a2954204fb4544b5cef9ca SHA1 f213c8254fb45504b6cd1d95d6c9677d6f0eb246 SHA256 95932185dee3220365ec68e4fffb5ef233438da07c8347f27d6b3db429e539b3
diff --git a/www-apps/wordpress/wordpress-3.3_beta1.ebuild b/www-apps/wordpress/wordpress-3.3_beta1.ebuild
deleted file mode 100644
index f361db06cd9b..000000000000
--- a/www-apps/wordpress/wordpress-3.3_beta1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/wordpress/wordpress-3.3_beta1.ebuild,v 1.1 2011/10/11 06:08:45 radhermit Exp $
-
-EAPI="4"
-
-inherit webapp depend.php
-
-DESCRIPTION="Wordpress php and mysql based CMS system"
-HOMEPAGE="http://wordpress.org/"
-SRC_URI="http://wordpress.org/${P/_/-}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND="|| ( dev-lang/php[mysql] dev-lang/php[mysqli] )
-		 || ( <dev-lang/php-5.3[pcre] >=dev-lang/php-5.3 )"
-
-S=${WORKDIR}/${PN}
-
-need_httpd_cgi
-need_php_httpd
-
-src_install() {
-	webapp_src_preinst
-
-	dohtml readme.html
-	rm -f readme.html license.txt
-
-	[ -f wp-config.php ] || cp wp-config-sample.php wp-config.php
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-
-	webapp_serverowned "${MY_HTDOCSDIR}"/index.php
-	webapp_serverowned "${MY_HTDOCSDIR}"/wp-admin/menu.php
-	webapp_serverowned "${MY_HTDOCSDIR}"
-
-	webapp_configfile  "${MY_HTDOCSDIR}"/wp-config.php
-
-	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
-	webapp_postupgrade_txt en "${FILESDIR}"/postupgrade-en.txt
-
-	webapp_src_install
-}
diff --git a/www-apps/wordpress/wordpress-3.3_beta2.ebuild b/www-apps/wordpress/wordpress-3.3_beta3.ebuild
similarity index 94%
rename from www-apps/wordpress/wordpress-3.3_beta2.ebuild
rename to www-apps/wordpress/wordpress-3.3_beta3.ebuild
index 911e5f980a7f..495ead34383b 100644
--- a/www-apps/wordpress/wordpress-3.3_beta2.ebuild
+++ b/www-apps/wordpress/wordpress-3.3_beta3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/wordpress/wordpress-3.3_beta2.ebuild,v 1.1 2011/10/21 05:27:04 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/wordpress/wordpress-3.3_beta3.ebuild,v 1.1 2011/11/11 04:52:58 radhermit Exp $
 
 EAPI="4"
 
diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index 325541da5ffc..1ee36b0ecc22 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -380,3 +380,87 @@ DIST firefox-7.0.1-zh-CN.xpi 240535 RMD160 38abee2f2a6124e13995a1442faf4207a4627
 DIST firefox-7.0.1-zh-TW.xpi 241359 RMD160 0e59c2a0e2b7a43e0d72d2646c74d80608a2ea0c SHA1 c9c9a4ea29b1bb830c4067a62466299c943e9344 SHA256 4fe12f4df2d515b40c7505a1963f24a45acbbe57d4b7874983b0ea2ad74bfbaa
 DIST firefox-7.0.1-zu.xpi 231701 RMD160 4d0ef079e5ae115459247cab374be09624163a20 SHA1 28bf909842265e1ff0e328406d506640c6b13a79 SHA256 928c38a78898d6a4923a371f253c1ecebe51a164a8165d62d736763bdcc3c410
 DIST firefox-7.0.1.source.tar.bz2 69278554 RMD160 cabd83f829ba54711f132749282d7d49e33b6334 SHA1 94bbc7152832371dc0be82f411730df043c5c6ac SHA256 81ecf63fca67186094d49dd5a6fe7f5dbd143a39f872ad126de38f246334fc04
+DIST firefox-8.0-af.xpi 227038 RMD160 2e8ddd25cdb6a25f6a3a7ff38528342136e712a9 SHA1 4893b99cdf7020d608af2e4805af312e3e559421 SHA256 5c63d809c19a6332a728bc1a818b804c09b2ec122f42e773285c8f247529c7e9
+DIST firefox-8.0-ak.xpi 228653 RMD160 64726a43b8cf4d1ca6a8c896655c4e222e55a98f SHA1 985510e14a3ad29308e492747a0a1fd5e84b3e37 SHA256 926dee62d6c8cb24892d9a5bc38943f20213f408d58c1fcf441e8d566cc7323c
+DIST firefox-8.0-ar.xpi 248245 RMD160 75f4ea69e4ffe92002131083510ebb6302464e8f SHA1 0876e6b069b5d422ff5c1e98bffdacfd829c8324 SHA256 aa0c13ad9e4ac94ea49727b64d8397a1888b1631971570591a1ede0d3250f5f0
+DIST firefox-8.0-ast.xpi 222524 RMD160 abfb12f5c98c185910aa3e996833efc31725adea SHA1 b742e09f61dfa5e4942db3b7e4e8ad6e6c33dcd3 SHA256 cbc5f9e4d8fdd4ea6999f5707b703ed05095011d607437f0ae556a23f17ea2e1
+DIST firefox-8.0-be.xpi 236531 RMD160 5c6a49bcf3eb43092968b6cbfb67fea7195b93d4 SHA1 bd08a835f47653e4ef0daf414270ae3d4b1374ee SHA256 8fd1c686f787859bd89662c7048550d8026e046aeaf8a690fa66532c557fbbf4
+DIST firefox-8.0-bg.xpi 259782 RMD160 5d5b2fbb455b62192e6ef6b85da3da2683893d03 SHA1 6e21fc90a57485e90741e229e440a7f5885a3764 SHA256 2e2a6a187728e43e5af33bf47e14db4bf6e881aee2af39a4e7bad6be91c7710f
+DIST firefox-8.0-bn-BD.xpi 273609 RMD160 02c11df530a68b4ac1caaae4f47c9dcd5580a88b SHA1 e2e6611c1ff61a295240015e2aaad159fabfdfad SHA256 a89ec80b1979872d4686cff3c13b6ac5f2aedfb264000f7089fa7e6534e4de8a
+DIST firefox-8.0-bn-IN.xpi 303021 RMD160 efea8d816b5f892e77525e3476afe0d08acf1fa2 SHA1 9ee2384a76775228902ad586e23fbbcfaf5f0ce1 SHA256 0fac4cc2e617397c1a06964effff860e67270c3be00f346616d225be863a706c
+DIST firefox-8.0-br.xpi 235604 RMD160 23b34d18eb521f27d1c16e2f4119b5b6ff0d9986 SHA1 36d7786271bd3b52179ca4a0823983d455ddc64c SHA256 8d3ca1680e14a6d34354cf52f9481b2ef3a8b85466e8c8a3fcfbeda1bc1ed057
+DIST firefox-8.0-bs.xpi 233304 RMD160 cd743ceb04fd044fb754f00f2c7a571299f1d09b SHA1 0f29d6ac65c2b55d1a7ee5118c8713a6936c893b SHA256 77ecb7f0ac79fce5fd453bbfe92314e0946960a35b84b1b3f6a2871b8e107487
+DIST firefox-8.0-ca.xpi 235712 RMD160 14e2a458e8e1ae3862c7c07f83c13d8344e13e09 SHA1 a7e85b4773efaa7e17c707bbd5b566280737747c SHA256 e371f655bf66f7ae0762be939d0e959485a3ad9058ee1024ea47a3320f754518
+DIST firefox-8.0-cs.xpi 236152 RMD160 fa8d25d55e7a4388625e456de2587a879da2f196 SHA1 a4b148c9bf5f2373d2665daabcdf6ce91a5a666a SHA256 98cea1111f70a09daff0619f2fa682cd64ef2f8c73ef769f051fdafeae15afbf
+DIST firefox-8.0-cy.xpi 229663 RMD160 cec962893cc7eba999f76bf87aa3bfe52422d73c SHA1 00f90ef5cc344b6b9009c4099df29cc291c032e0 SHA256 38081615bfc4e26e904f535be3cec0957d5134b2e45e3d61bc47260b71c07965
+DIST firefox-8.0-da.xpi 228371 RMD160 10141b0df5cee564cdb92975f0113c5955d17b47 SHA1 cd7b97df4fadc4bd3eecbc57524bdef206484730 SHA256 e372f176a186b3b733f98881cd94d1513647bdbc3370e6646c399087d5808a96
+DIST firefox-8.0-de.xpi 236423 RMD160 3131a3eeab3753cb001f1ef871fa9d0de192762a SHA1 1173240f7dffcaacf30e90f938ffd18cbc094c33 SHA256 700bb5248a270045700a6f443a877730ae99707c23acf61c117f8c627c6db1a3
+DIST firefox-8.0-el.xpi 251484 RMD160 fdb896915f993954ae38bf420b403583a2b3edc8 SHA1 ff1f511b64a9257c36ac6b9735faa688b0758f31 SHA256 eb88d7e66a7309e0ea10586c522ab6b3d74da1ab9339d51903a525369cec9d90
+DIST firefox-8.0-en-GB.xpi 219604 RMD160 77a82ede5381c7f20da53e82689c798702c11c15 SHA1 ea8c3c5036a0ee152fcb8ae6147c71c9bd66edf9 SHA256 43d362e55380ba57813fa929a4f2ac35f63214e72c660e836e7ef44fd328d9cb
+DIST firefox-8.0-en-ZA.xpi 220975 RMD160 bddd488511d9564160223c817e00636863e8e431 SHA1 284673a1f9174f28b97d9d274ddb27af647da1f0 SHA256 ab3163185d4add78486c3459a962885a623e87d3b4d30dd05ed5ff086ee47e1f
+DIST firefox-8.0-eo.xpi 228870 RMD160 adc317de4d4859a856745e1a16bc81738dd9ec12 SHA1 22386b6671324a7bc8f5bce2eaef3ec37b3badd7 SHA256 6628d7e61f2ad420dc9dc8857684a86dec4930947064af59931018a748ac1f1f
+DIST firefox-8.0-es-AR.xpi 232815 RMD160 9fb0868da33a0d6beb95461305ee6e004d321e6b SHA1 c4aa7a0bf92862d18dbb6e56b28148d9bcd8e9b2 SHA256 5bf026d3f6f50c6ecc410d77dfcd9f032925e63f95d56f724e307ba71b792951
+DIST firefox-8.0-es-CL.xpi 235293 RMD160 f9b2cc7411c5fe963bd1f2e2166ee56650d97b45 SHA1 71cc176ed4b7cc8702cd8cb4a67c9a7e1e791794 SHA256 394b327d90e4a3affc250d499cd8854a5589cbbb3f3c7501e9211b753d6b8400
+DIST firefox-8.0-es-ES.xpi 206605 RMD160 35b54f8aa323e4ec969ce278f056accd16241f59 SHA1 45ada38670c8239060118feb7bbd9c370af433e4 SHA256 3d8caa12b35d65e85ad24b7ee62db58ec44fdbeb896d87886a8ebb645cb1ea1a
+DIST firefox-8.0-es-MX.xpi 207459 RMD160 968e20ce602a10fc2c17ec5e967c1cf255ee7815 SHA1 14b87444c98dc8254e229f04c2e7fd401670082b SHA256 4f1b6eae47f912a03d07a4cba2fc4f9d8ecb5619d3bb6ec367f1d22804442151
+DIST firefox-8.0-et.xpi 230283 RMD160 10223ce2807c967c4e175394b3aff3d658c060b4 SHA1 9fb2cc5a3e57c548eb355932082b517443eae038 SHA256 1216729dff3f60aaa70f46c3b6a4b1b057b6a1e20c39c48fe12422557e0df221
+DIST firefox-8.0-eu.xpi 228065 RMD160 06e61259d0208b87cf05f1ca5f9ddaf57724683e SHA1 e39a63a3814d4a5aeb749fec5c35cf18028be949 SHA256 96b011d99bdb19ca4536080bf95699b5d5320602d730a8baf7b9663fad7e8262
+DIST firefox-8.0-fa.xpi 257339 RMD160 4c4e679e584c2fe6b551ed775e61270f7f645517 SHA1 0bc04d03fc239c2da89e1c7d72fc72a28260134a SHA256 c74bdff47aadf36ef485cb88bfaccd5f06afb3b8f0d545697a5221d5c608dc88
+DIST firefox-8.0-fi.xpi 231178 RMD160 04d4daa406354728c96b1b000b11f5d9141b034b SHA1 66fa4a3a436a4867eb299d14d41ec130e908dffc SHA256 99524102c61b27f7fa6cddbc477cb5b45dd088453e5fb7a164a3d83a7213125b
+DIST firefox-8.0-fr.xpi 237069 RMD160 b6048e037e904e5861fd0d9ace446cf6556e4737 SHA1 cca0114141d2b372478acc3633ce2a2885bace73 SHA256 41448fa45220f5e0c556c4e160cf49a670481a11d922a620f5d7ff94cf7ae318
+DIST firefox-8.0-fy-NL.xpi 234377 RMD160 55212d5399061499635880877e469356ffe52064 SHA1 753d025d137d4803bab5e00657007d6b002da595 SHA256 c1e953d64fb61f2ee522873128d23dac726eacc3343526098d499039ff2a7c5e
+DIST firefox-8.0-ga-IE.xpi 239393 RMD160 05014c17d2ba94d976b22ad17e374c2c2dc8ddbc SHA1 51543223e4241ae3754fec22534d109f995671db SHA256 b66ff1d60e8ae58a8f60f873370c653bd3f35906dfea8a6f2ec3f540aeb3a1c9
+DIST firefox-8.0-gd.xpi 240921 RMD160 ec378cb84bcaea473d56951f86bd75192680e755 SHA1 da111967490096fe21b3229b4008069a5fe521d4 SHA256 7ea2ad77a1ea63481a23519906357b39f8c28e94d5299ec5e91614cc83ea9658
+DIST firefox-8.0-gl.xpi 230996 RMD160 ba36869b82140a0b175e46373ff4033fdd8379ac SHA1 7b968801be717b8c4f5ea5d9a5ed4c0c31d5eb81 SHA256 55e0fa621c74acec4a40c67638b90a34983be2652ce66111f6cea79ff7f7f428
+DIST firefox-8.0-gu-IN.xpi 260852 RMD160 cd484bf7b550c5698093f073eacfc473858688eb SHA1 427f5c54589f6a769f64268a7e831c29429972e0 SHA256 de3cadb8379a4109f867da9bc7d584673ba7c56c8565d8e2da1772659917401a
+DIST firefox-8.0-he.xpi 251243 RMD160 9160d6973fdbf8ce392777baa1591f628cb43d21 SHA1 803811492ba842b587d4acca551814d3b430ffab SHA256 b898f7f61773af974ee66a466fdcbcedb713c45a049c1fabe1bdfc0a9483ce66
+DIST firefox-8.0-hi-IN.xpi 264513 RMD160 6ae31e88bd7dfe537fc4783efeb648614ff67b1c SHA1 aaf94004733eb9f6fdcd5f720236219d2289355f SHA256 22a78f7f9f56b0a6f7f2dbac5dfc327a09c9e68584cd18dd50c10ce90b4d6f92
+DIST firefox-8.0-hr.xpi 239498 RMD160 6e4bce60947c213b41f49a37da8c42c185ec11d1 SHA1 7829ded21be7b5985e2383728f1c227323358c82 SHA256 4317ae1d89de2a28add1aa5891d8a3e9e5c7c2ee34e13883da0bfcd0d6c80cb3
+DIST firefox-8.0-hu.xpi 241689 RMD160 8c4fe08072bc476e434cbfc623a8d947a94de702 SHA1 8a17320afc7a41ad7e153f6c17d728173590a950 SHA256 47fb39be733931cb46e34adf3a206fe58f52f6b48b3acbe5e4e5b3aece4edd6a
+DIST firefox-8.0-hy-AM.xpi 431335 RMD160 8743befaa41033908211eeb283ada7bf5f45be9d SHA1 c7d4c4f146ef330c72034df386e1d784e631c5dd SHA256 861dc7b5088cc06cc2cb932babedd2d151c542583dc3daf367f9f4c0a1095d9e
+DIST firefox-8.0-id.xpi 224907 RMD160 f929a0678cac082f3085bd1fc0f7376f0e8f5b16 SHA1 f00fabeed18d7a0f099e21130bdfe8ca94af1ede SHA256 59d7c13ce9ad90fcc9954c0c51af2d5642d680ca1592fcce93f7d4a8e0a9cb8b
+DIST firefox-8.0-is.xpi 230806 RMD160 24358ea960652f4f210cb1d5cb4b04e7c3d19d93 SHA1 cb3d8b7209382b31c3897c46826684b81d1ca6be SHA256 15d7917b61e520af9d3fcb14a4cc8cbf4870c64cadb1c034e46ef5ec4b3adf04
+DIST firefox-8.0-it.xpi 204075 RMD160 daa250538119f1f21372716d5276ec9ae456e1c6 SHA1 9e4a285946889eb917159d290eabae208dab0574 SHA256 91296fab514450cceeb4b926d7224350456e1ec434a55503be1abbd78e051356
+DIST firefox-8.0-ja.xpi 260221 RMD160 d0568b1a2b03660acfe1c6e8437ae0affefd0447 SHA1 25b73b9ca041aca73bf3c98dbb80f4d43f9220c4 SHA256 61b44806b3890fe1016960c5c0d827640b15b3b549d0d8c093120e000d51e04a
+DIST firefox-8.0-kk.xpi 263696 RMD160 c8e8b8fc62adb4c077662ec4048d554fb1acbf1d SHA1 2d0a40213d0ee94aa47df28eade506080a0ffa22 SHA256 1a0bfa5f0ffca6634fedfa9fa4e2b87528873a82fb589fdaec48c0b40270d5de
+DIST firefox-8.0-kn.xpi 283736 RMD160 ab89748d336be2e9f9cc3c7ae412abd657352e19 SHA1 1210edb6617c48f0837c6fb552e35e4b66ce7525 SHA256 16e2eb4ae179f1216ca54480a086e553ea418f722bb93cc45630001c8f6a83d1
+DIST firefox-8.0-ko.xpi 215216 RMD160 d562634ba168af86ed15387b0522f10795cc81b6 SHA1 016ef140a01ef0f426dcf37c5c26e317fa2f8967 SHA256 c27a6c0abce063b2ac3cb2e56a90555b10809b555c0a2a0fe98f4da207ed86d4
+DIST firefox-8.0-ku.xpi 239272 RMD160 84711d9fc8c5a2866e18b4c812d0f7cc16698766 SHA1 527eb7fd61a04f8db4f6b1224ba2c1655718e50e SHA256 3bfe1871bacd12857c1e20bda83f569bc21d372de8ec1ad70dd3ef839d46523e
+DIST firefox-8.0-lg.xpi 235459 RMD160 5130628e268d2764cac3a07ef60780c83827cf75 SHA1 1dd9cd5dbd699702e5646164f00d2fa9d64f7046 SHA256 9435b77ff439aa19ea98cc6d8de8bbb7d54d27e7f94a29db035b0890a4b886f1
+DIST firefox-8.0-lt.xpi 320556 RMD160 ed20a7d44cca378085b44436966fb9b04a362df1 SHA1 5066ff8cb6f186e2cf431ff4d5cb7247c6cf01c4 SHA256 81c169c8137d8c3e2c0885f2fc52894984015057e3b192fe7e47015e5b6596d0
+DIST firefox-8.0-lv.xpi 231978 RMD160 8096fcc1ad4ca195ac2a6e96081ec004655ae388 SHA1 3b73960b424244846f71e4f1fee7533691ca7b84 SHA256 b0f1863e5f5ca1a1c003eddeb0bbf4af6fe04e02acb759ae30c121d5764f3aee
+DIST firefox-8.0-mai.xpi 264043 RMD160 fb29ddf5c8c2a34c99787364f5aa48e7feb34f6f SHA1 4e8ea2d3e0f03d80dcfad9616da236fc2f6e01cb SHA256 3e9581657a47bac7b8729ff6d9de0a9da6eedcfc4c3691779af07c79f94752e0
+DIST firefox-8.0-mk.xpi 258223 RMD160 adbe5d92be5d5b755ee46ffb3de833a0df2c9bba SHA1 026dd37487023a492c97a100ee3a7f5f64026372 SHA256 98fe000b35a3ba06540d1897decfac3387e222698ac29cfd73f888a2b709591b
+DIST firefox-8.0-ml.xpi 290671 RMD160 43289cb1fe3b900b5c4b891f6e4ac24658c59663 SHA1 00c663c0c89b80785a462a8bd7b4542f9f2337aa SHA256 28c61c03a5bf402c9a47c34cc0d8d9a8c4987f776080578ef611f63cbc9061ba
+DIST firefox-8.0-mr.xpi 266706 RMD160 0df10dbe63e157f305d1fe4a20e2e404de3ee48d SHA1 54e5f088f871e7e389d4b8d6564c7f9a0aeae187 SHA256 e2612fd058b5903cb071b12d45db7eef42e96121be9a919eef7243bd6b9f6d23
+DIST firefox-8.0-nb-NO.xpi 229160 RMD160 0846d05e208cba5b1a49fbaf54f70d7a7f2f7b83 SHA1 3c2708f36c831bb80bc08fab2d562fed6cc58ca8 SHA256 755ecf80fa1bba5c97eaa9046bd0776a8438a4c0989a9a91b6d073ba57a962e8
+DIST firefox-8.0-nl.xpi 230348 RMD160 a54005d2355822e2c7cf53c822c9fc3332fff839 SHA1 3e555aae4009c3f2133d0c1e092f83c6c716e512 SHA256 94da51857d398e916e396a9b5fb5acd971e945445641c0ea74b72902c6a80e1d
+DIST firefox-8.0-nn-NO.xpi 230399 RMD160 626612eb55103be0cfc83ae109b1f432ecf86786 SHA1 7c157d4b3b9e3d488616e1aaa6ab1a08884253fb SHA256 a65f70af550eb01b59e9ace4090848d8492d825b13b2ff968d2d326c250d46f4
+DIST firefox-8.0-nso.xpi 233834 RMD160 41a1735a8a443c2a7e36edcf1c6ff5bf6b8397d6 SHA1 a0e61c2008625546f56dfefb79b980d5e745b36d SHA256 caa8b7ed1fa2fb736996370aae1393d0bfc3dd76b8f86ec07c2d1e313a1ab63f
+DIST firefox-8.0-or.xpi 269665 RMD160 ba4c3d379989c7abce4e8e8a1ba1c8080594861f SHA1 d0e76f379bc5f38261fed113996388ef922a59d5 SHA256 bfa96aeb4d6f0dd4acbaadaac8d9c36d45e14ec1b30004f2ee7e71574a12f966
+DIST firefox-8.0-pa-IN.xpi 266300 RMD160 374f4427079e62b62da93f17b5da7f09726f3f1e SHA1 b1d52f19ffa7d450d1a9066f4a0ae65d4ec1277e SHA256 677f2b8ccac8b72c6dd6198c7ef0684a066e836b5bb2c9f515ae533824f5f6c8
+DIST firefox-8.0-patches-0.2.tar.xz 8032 RMD160 221500ed4f56e9c139f563d598bf38df448e5652 SHA1 f41c04c659a253d464ab9bb2c169c1b99b22d443 SHA256 52d351133187dfb7b367950f4da543b06b9f0666f6c07b8bbb5b21cd3d40b0c3
+DIST firefox-8.0-pl.xpi 239375 RMD160 47b213e0f40899e11a2dcae592390f303626d985 SHA1 999c76b0bd8fdf2e5a66371c1fb8c8c606ffdd3d SHA256 603d0b3ffc00551fe1f2f27255e5b756821805ba634efd2bd1474d4dd31b9f2f
+DIST firefox-8.0-pt-BR.xpi 234489 RMD160 2f009a0ff591216390859ffe69958d0122304ce8 SHA1 5599af4e8c8c1c8f78e7aada928eb2406ec9428b SHA256 9938b9d0790913b409ce81d2ff4094293503274a06230f521b8ea0949d79b235
+DIST firefox-8.0-pt-PT.xpi 234235 RMD160 b1524fefe5e58ac43bb0dc58478e7461f3d94c58 SHA1 0cb8eb593ed54eb7f6dec08a707d3dd69e2f21f3 SHA256 884d4455c18de3a41c2a449015235469bda9019ac5b95e44e6ee30ff7938df44
+DIST firefox-8.0-rm.xpi 233467 RMD160 f964196e5df584d5a378399b532deb46e4c8d83f SHA1 398dbe0e58bc55d81a47cc724e86e3bd8747a82b SHA256 e975177e48cb1f74ab39c6d5d9d0b3c3e9b3f7052539b2773ee1600ec2d3c528
+DIST firefox-8.0-ro.xpi 246673 RMD160 42a2121ad0ac4bb7c27e56ac7ce968a6f2e2f7a4 SHA1 b4e6463bc5a991824e041b996f63ced9a6dd4bf2 SHA256 3daff1cd78ccb248a4b64cddb58e692c54c295d90cb5dd08ebf8f5b5a4e0c267
+DIST firefox-8.0-ru.xpi 244641 RMD160 525fbb0e39742ace176fb623725594e5686c5730 SHA1 8fb3ea7a009567f56fb601548f99c1b9dc67398b SHA256 f9668155d5c51ab38e2d31db92e754a44dfa20544d08e10979a10194134fa727
+DIST firefox-8.0-si.xpi 259613 RMD160 34cb700ba98250aa6ecfc3dc440bb97ddd864e79 SHA1 1a44763e96b119df749fc812993945b48df10028 SHA256 299b9c58e704ae4072bff8d49901804d262d546ae04b1dafd30719a3eb7d0bc2
+DIST firefox-8.0-sk.xpi 241442 RMD160 f97319be89a221e728588b89e10e4bf719af0635 SHA1 2e8f10e469e2221006f8bd1faae551035195cab3 SHA256 530f15f397fcc69992e31f3b3f116ec395eb3c2a2a49f591d317185b20060860
+DIST firefox-8.0-sl.xpi 228920 RMD160 860d7281d590cab9341e0ee8d477a472f5e80e50 SHA1 5ea49c7dc7f2382b997828559090cb323f14fa81 SHA256 53443126e247c1bd59ec2e182a993c2773ef703003213bf03f0ac5409fac2aa4
+DIST firefox-8.0-son.xpi 227126 RMD160 f55d28c70c648bca63ebea699fb7e6ffdfa2aae9 SHA1 8ed337e4cea470bfb95a569afee929b7fa037c56 SHA256 0a34481858859c55f3bb7a603e3032b8b0e6bc10a3129ac0c583b6b02d03aa88
+DIST firefox-8.0-sq.xpi 214501 RMD160 aaa720189ceabd3f8f3c60b25449e4c02c40f4cf SHA1 1a16d4ac93621a65779fa450b2d9083cd2f83084 SHA256 c9a5bcc021af2652f05fa200e51e26d06b7e5ba10e1e468b1c9dccaa42673189
+DIST firefox-8.0-sr.xpi 263534 RMD160 8b56c58f59ef1aa31371b4008539fba08f4706cd SHA1 d5aa92636b4e15ebfd9577a28ff12ab8eb1c0563 SHA256 688bbade22a5165d70a9bf95d222a4c9332689d836d53abb695e90e4c2c29f6a
+DIST firefox-8.0-sv-SE.xpi 266714 RMD160 6ecd41bac85f8135cd8c41d2d9eaf2cc9778def6 SHA1 d5e230770fddf0af62dd8a93f5df3a3a70ec3793 SHA256 9575874c5632940338f6f26fe25dcabc9e7679820253fd12f07c449caabf10e1
+DIST firefox-8.0-ta-LK.xpi 276080 RMD160 afb05c40bb51bcb60698642d2bc47fad8942af74 SHA1 3cd519a6f65b55c391059ad40d3442d4b7afda55 SHA256 00f45c5146b0925d9a82d95cb5dc2e102341d15cbd29944578b3aaec04a84cfe
+DIST firefox-8.0-ta.xpi 259828 RMD160 579b8fca05d8a4c7092b2b8e0e3362eaa6f9b955 SHA1 88a5a5cb3daf24fd4837e85a1b742821ee7254cf SHA256 9be67d46d130807d08b7e8b333914003efec60691b19252ea9dc6cce30522e91
+DIST firefox-8.0-te.xpi 274087 RMD160 d882d75af16e48c603549e1a4d79436dc12e6860 SHA1 ac7156ed5cbddb01b6ec223417902a857367a69e SHA256 ddeebd051e18a3ed4fa7827dd1c8d02dc35ccbe0d48b10eec4ff110c88ebf88d
+DIST firefox-8.0-th.xpi 261251 RMD160 0c891d7ba70ba2cae7ac5731ff5d56a630023254 SHA1 a6b92c887ad807442a79e739a4167fdafdbd035b SHA256 d2cbf744ec3bcfb172a592c249ad418928fd3d4a66038f23947df89c59ae20af
+DIST firefox-8.0-tr.xpi 233606 RMD160 2f3b83b5a9cb9f7240353722fd78ed8615a69140 SHA1 d4a4c5dab683541d83d954ca2b1573f5b8e26614 SHA256 df554696d93c32460a86cbbb727e27de1640da6e58a116b3a21cedfa71eb908e
+DIST firefox-8.0-uk.xpi 267710 RMD160 4ed37860a5af5831beb405eaeba0ca4c8ed00a3a SHA1 114cea611f958723d41bbcf75fa8d839bd37dcf4 SHA256 ebe03cff3f6962d6d7bab20025a684a54951964347fd43dd955d524005237512
+DIST firefox-8.0-vi.xpi 248529 RMD160 25b37ac6891edf53512f8f784f10b9b66c099304 SHA1 ab2f854488b666ed269937f070e28a8845b26b56 SHA256 c4988705cffe66b6803fe880e2773d2e3d1e77a60e34b136c59a77a3321f7f26
+DIST firefox-8.0-zh-CN.xpi 243430 RMD160 50781f9c1e56671b71958962d8047f1c1e69e992 SHA1 4c524381b5e7789c678dde8b7703d9d215164b78 SHA256 c5f0a12db5fee1e2a755012d400a79527a150347ce1aff0208517afbe3a8a014
+DIST firefox-8.0-zh-TW.xpi 244296 RMD160 b61ad8ada60b9841a23c72579b9f903773b70e77 SHA1 faa4fa00a67585fd9cfba9e6cea2d4e4dce0f938 SHA256 bf988457d2174eaeba9272a6d049e27431fc2413f3b43ee8bab2924675dc24fa
+DIST firefox-8.0-zu.xpi 234633 RMD160 c8163fab204bf8b412345089cdc9a2a79aea4b27 SHA1 5120fdf77cbfd09d7cf211cfb1ec988eae1654b9 SHA256 856bfe9ea1251e1104046c1da1452298cd12280b8e281fa00a0618d7e91ab01f
+DIST firefox-8.0.source.tar.bz2 70377448 RMD160 f87ec7668b2dcc1bb581b97e1dbe85e4b97cb31c SHA1 843cf4ad70d2fc4b16654c3ff9b080d3eb357452 SHA256 d950324ecd5362a648a891a66c3f2dde5e69b09f30ef8470b7759ec007691139
diff --git a/www-client/firefox/firefox-8.0.ebuild b/www-client/firefox/firefox-8.0.ebuild
new file mode 100644
index 000000000000..372f828b7590
--- /dev/null
+++ b/www-client/firefox/firefox-8.0.ebuild
@@ -0,0 +1,359 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/firefox-8.0.ebuild,v 1.1 2011/11/11 01:36:32 anarchy Exp $
+
+EAPI="3"
+VIRTUALX_REQUIRED="pgo"
+WANT_AUTOCONF="2.1"
+
+inherit flag-o-matic toolchain-funcs eutils gnome2-utils mozconfig-3 multilib pax-utils fdo-mime autotools mozextension versionator python virtualx
+
+MAJ_FF_PV="$(get_version_component_range 1-2)" # 3.5, 3.6, 4.0, etc.
+FF_PV="${PV/_alpha/a}" # Handle alpha for SRC_URI
+FF_PV="${FF_PV/_beta/b}" # Handle beta for SRC_URI
+FF_PV="${FF_PV/_rc/rc}" # Handle rc for SRC_URI
+CHANGESET="e56ecd8b3a68"
+PATCH="${PN}-8.0-patches-0.2"
+
+DESCRIPTION="Firefox Web Browser"
+HOMEPAGE="http://www.mozilla.com/firefox"
+
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+SLOT="0"
+LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
+IUSE="bindist +crashreporter +ipc pgo system-sqlite +webm"
+
+FTP_URI="ftp://ftp.mozilla.org/pub/firefox/releases/"
+# More URIs appended below...
+SRC_URI="http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCH}.tar.xz"
+
+ASM_DEPEND=">=dev-lang/yasm-1.1"
+
+# Mesa 7.10 needed for WebGL + bugfixes
+RDEPEND="
+	>=sys-devel/binutils-2.16.1
+	>=dev-libs/nss-3.12.10
+	>=dev-libs/nspr-4.8.8
+	>=dev-libs/glib-2.26:2
+	>=media-libs/mesa-7.10
+	media-libs/libpng[apng]
+	virtual/libffi
+	system-sqlite? ( >=dev-db/sqlite-3.7.4[fts3,secure-delete,unlock-notify,debug=] )
+	webm? ( media-libs/libvpx
+		media-libs/alsa-lib )
+	crashreporter? ( net-misc/curl )"
+# We don't use PYTHON_DEPEND/PYTHON_USE_WITH for some silly reason
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	pgo? (
+		=dev-lang/python-2*[sqlite]
+		>=sys-devel/gcc-4.5 )
+	webm? ( x86? ( ${ASM_DEPEND} )
+		amd64? ( ${ASM_DEPEND} ) )"
+
+# No source releases for alpha|beta
+if [[ ${PV} =~ alpha ]]; then
+	SRC_URI="${SRC_URI}
+		http://dev.gentoo.org/~anarchy/mozilla/firefox/firefox-${FF_PV}_${CHANGESET}.source.tar.bz2"
+	S="${WORKDIR}/mozilla-central"
+elif [[ ${PV} =~ beta ]]; then
+	SRC_URI="${SRC_URI}
+		${FTP_URI}/${FF_PV}/source/firefox-${FF_PV}.source.tar.bz2"
+	S="${WORKDIR}/mozilla-beta"
+else
+	SRC_URI="${SRC_URI}
+		${FTP_URI}/${FF_PV}/source/firefox-${FF_PV}.source.tar.bz2"
+	S="${WORKDIR}/mozilla-release"
+fi
+
+# No language packs for alphas
+if ! [[ ${PV} =~ alpha|beta ]]; then
+	# This list can be updated with scripts/get_langs.sh from mozilla overlay
+	LANGS=(af ak ar ast be bg bn-BD bn-IN br bs ca cs cy da de el en en-GB en-US
+	en-ZA eo es-AR es-CL es-ES es-MX et eu fa fi fr fy-NL ga-IE gd gl gu-IN he
+	hi-IN hr hu hy-AM id is it ja kk kn ko ku lg lt lv mai mk ml mr nb-NO nl
+	nn-NO nso or pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq sr sv-SE ta ta-LK
+	te th tr uk vi zh-CN zh-TW zu)
+
+	for X in "${LANGS[@]}" ; do
+		# en and en_US are handled internally
+		if [[ ${X} != en ]] && [[ ${X} != en-US ]]; then
+			SRC_URI="${SRC_URI}
+				linguas_${X/-/_}? ( ${FTP_URI}/${FF_PV}/linux-i686/xpi/${X}.xpi -> ${P}-${X}.xpi )"
+		fi
+		IUSE="${IUSE} linguas_${X/-/_}"
+		# Install all the specific locale xpis if there's no generic locale xpi
+		# Example: there's no pt.xpi, so install all pt-*.xpi
+		if ! has ${X%%-*} "${LANGS[@]}"; then
+			SRC_URI="${SRC_URI}
+				linguas_${X%%-*}? ( ${FTP_URI}/${FF_PV}/linux-i686/xpi/${X}.xpi -> ${P}-${X}.xpi )"
+			IUSE="${IUSE} linguas_${X%%-*}"
+		fi
+	done
+fi
+
+QA_PRESTRIPPED="usr/$(get_libdir)/${PN}/firefox"
+
+# TODO: Move all the linguas crap to an eclass
+linguas() {
+	# Generate the list of language packs called "linguas"
+	# This list is used to install the xpi language packs
+	local LINGUA
+	for LINGUA in ${LINGUAS}; do
+		if has ${LINGUA} en en_US; then
+			# For mozilla products, en and en_US are handled internally
+			continue
+		# If this language is supported by ${P},
+		elif has ${LINGUA} "${LANGS[@]//-/_}"; then
+			# Add the language to linguas, if it isn't already there
+			has ${LINGUA//_/-} "${linguas[@]}" || linguas+=(${LINGUA//_/-})
+			continue
+		# For each short LINGUA that isn't in LANGS,
+		# add *all* long LANGS to the linguas list
+		elif ! has ${LINGUA%%-*} "${LANGS[@]}"; then
+			for LANG in "${LANGS[@]}"; do
+				if [[ ${LANG} == ${LINGUA}-* ]]; then
+					has ${LANG} "${linguas[@]}" || linguas+=(${LANG})
+					continue 2
+				fi
+			done
+		fi
+		ewarn "Sorry, but ${P} does not support the ${LINGUA} locale"
+	done
+}
+
+pkg_setup() {
+	moz_pkgsetup
+
+	# Avoid PGO profiling problems due to enviroment leakage
+	# These should *always* be cleaned up anyway
+	unset DBUS_SESSION_BUS_ADDRESS \
+		DISPLAY \
+		ORBIT_SOCKETDIR \
+		SESSION_MANAGER \
+		XDG_SESSION_COOKIE \
+		XAUTHORITY
+
+	if ! use bindist; then
+		einfo
+		elog "You are enabling official branding. You may not redistribute this build"
+		elog "to any users on your network or the internet. Doing so puts yourself into"
+		elog "a legal problem with Mozilla Foundation"
+		elog "You can disable it by emerging ${PN} _with_ the bindist USE-flag"
+	fi
+
+	if use pgo; then
+		einfo
+		ewarn "You will do a double build for profile guided optimization."
+		ewarn "This will result in your build taking at least twice as long as before."
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+
+	linguas
+	for X in "${linguas[@]}"; do
+		# FIXME: Add support for unpacking xpis to portage
+		xpi_unpack "${P}-${X}.xpi"
+	done
+}
+
+src_prepare() {
+	# Apply our patches
+	EPATCH_SUFFIX="patch" \
+	EPATCH_FORCE="yes" \
+	epatch "${WORKDIR}/firefox"
+
+	# Allow user to apply any additional patches without modifing ebuild
+	epatch_user
+
+	# Enable gnomebreakpad
+	if use debug ; then
+		sed -i -e "s:GNOME_DISABLE_CRASH_DIALOG=1:GNOME_DISABLE_CRASH_DIALOG=0:g" \
+			"${S}"/build/unix/run-mozilla.sh || die "sed failed!"
+	fi
+
+	# Disable gnomevfs extension
+	sed -i -e "s:gnomevfs::" "${S}/"browser/confvars.sh \
+		-e "s:gnomevfs::" "${S}/"xulrunner/confvars.sh \
+		|| die "Failed to remove gnomevfs extension"
+
+	# Ensure that are plugins dir is enabled as default
+	sed -i -e "s:/usr/lib/mozilla/plugins:/usr/$(get_libdir)/nsbrowser/plugins:" \
+		"${S}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path!"
+
+	# Fix sandbox violations during make clean, bug 372817
+	sed -e "s:\(/no-such-file\):${T}\1:g" \
+		-i "${S}"/config/rules.mk \
+		-i "${S}"/js/src/config/rules.mk \
+		-i "${S}"/nsprpub/configure{.in,} \
+		|| die
+
+	#Fix compilation with curl-7.21.7 bug 376027
+	sed -e '/#include <curl\/types.h>/d'  \
+		-i "${S}"/toolkit/crashreporter/google-breakpad/src/common/linux/http_upload.cc \
+		-i "${S}"/toolkit/crashreporter/google-breakpad/src/common/linux/libcurl_wrapper.cc \
+		-i "${S}"/config/system-headers \
+		-i "${S}"/js/src/config/system-headers || die "Sed failed"
+
+	eautoreconf
+
+	cd js/src
+	eautoreconf
+}
+
+src_configure() {
+	MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+	MEXTENSIONS="default"
+
+	####################################
+	#
+	# mozconfig, CFLAGS and CXXFLAGS setup
+	#
+	####################################
+
+	mozconfig_init
+	mozconfig_config
+
+	# It doesn't compile on alpha without this LDFLAGS
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	mozconfig_annotate '' --prefix="${EPREFIX}"/usr
+	mozconfig_annotate '' --libdir="${EPREFIX}"/usr/$(get_libdir)
+	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
+	mozconfig_annotate '' --disable-gconf
+	mozconfig_annotate '' --disable-mailnews
+	mozconfig_annotate '' --enable-canvas
+	mozconfig_annotate '' --enable-safe-browsing
+	mozconfig_annotate '' --with-system-png
+	mozconfig_annotate '' --enable-system-ffi
+
+	# Other ff-specific settings
+	mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
+	mozconfig_annotate '' --target="${CTARGET:-${CHOST}}"
+
+	mozconfig_use_enable system-sqlite
+
+	# Allow for a proper pgo build
+	if use pgo; then
+		echo "mk_add_options PROFILE_GEN_SCRIPT='\$(PYTHON) \$(OBJDIR)/_profile/pgo/profileserver.py'" >> "${S}"/.mozconfig
+	fi
+
+	# Finalize and report settings
+	mozconfig_final
+
+	if [[ $(gcc-major-version) -lt 4 ]]; then
+		append-cxxflags -fno-stack-protector
+	elif [[ $(gcc-major-version) -gt 4 || $(gcc-minor-version) -gt 3 ]]; then
+		if use amd64 || use x86; then
+			append-flags -mno-avx
+		fi
+	fi
+}
+
+src_compile() {
+	if use pgo; then
+		addpredict /root
+		addpredict /etc/gconf
+		# Firefox tries to dri stuff when it's run, see bug 380283
+		shopt -s nullglob
+		local cards=$(echo -n /dev/{dri,ati}/card* /dev/nvidiactl* | sed 's/ /:/g')
+		shopt -u nullglob
+		test -n "${cards}" && addpredict "${cards}"
+
+		CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
+		MOZ_MAKE_FLAGS="${MAKEOPTS}" \
+		Xemake -f client.mk profiledbuild || die "Xemake failed"
+	else
+		CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
+		MOZ_MAKE_FLAGS="${MAKEOPTS}" \
+		emake -f client.mk || die "emake failed"
+	fi
+
+}
+
+src_install() {
+	MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+
+	# MOZ_BUILD_ROOT, and hence OBJ_DIR change depending on arch, compiler, pgo, etc.
+	local obj_dir="$(echo */config.log)"
+	obj_dir="${obj_dir%/*}"
+	cd "${S}/${obj_dir}"
+
+	# Pax mark xpcshell for hardened support, only used for startupcache creation.
+	pax-mark m "${S}/${obj_dir}"/dist/bin/xpcshell
+
+	# Add our default prefs for firefox + xulrunner
+	cp "${FILESDIR}"/gentoo-default-prefs.js \
+		"${S}/${obj_dir}/dist/bin/defaults/pref/all-gentoo.js" || die
+
+	MOZ_MAKE_FLAGS="${MAKEOPTS}" \
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	linguas
+	for X in "${linguas[@]}"; do
+		xpi_install "${WORKDIR}/${P}-${X}"
+	done
+
+	local size sizes icon_path icon name
+	if use bindist; then
+		sizes="16 32 48"
+		icon_path="${S}/browser/branding/unofficial"
+		# Firefox's new rapid release cycle means no more codenames
+		# Let's just stick with this one...
+		icon="tumucumaque"
+		name="Tumucumaque"
+	else
+		sizes="16 22 24 32 256"
+		icon_path="${S}/browser/branding/official"
+		icon="${PN}"
+		name="Mozilla Firefox"
+	fi
+
+	# Install icons and .desktop for menu entry
+	for size in ${sizes}; do
+		insinto "/usr/share/icons/hicolor/${size}x${size}/apps"
+		newins "${icon_path}/default${size}.png" "${icon}.png" || die
+	done
+	# The 128x128 icon has a different name
+	insinto "/usr/share/icons/hicolor/128x128/apps"
+	newins "${icon_path}/mozicon128.png" "${icon}.png" || die
+	# Install a 48x48 icon into /usr/share/pixmaps for legacy DEs
+	newicon "${icon_path}/content/icon48.png" "${icon}.png" || die
+	newmenu "${FILESDIR}/icon/${PN}.desktop" "${PN}.desktop" || die
+	sed -i -e "s:@NAME@:${name}:" -e "s:@ICON@:${icon}:" \
+		"${ED}/usr/share/applications/${PN}.desktop" || die
+
+	# Add StartupNotify=true bug 237317
+	if use startup-notification ; then
+		echo "StartupNotify=true" >> "${ED}/usr/share/applications/${PN}.desktop"
+	fi
+
+	# Required in order to use plugins and even run firefox on hardened.
+	pax-mark m "${ED}"/${MOZILLA_FIVE_HOME}/{firefox,firefox-bin,plugin-container}
+
+	# Plugins dir
+	dosym ../nsbrowser/plugins "${MOZILLA_FIVE_HOME}"/plugins \
+		|| die "failed to symlink"
+
+	# very ugly hack to make firefox not sigbus on sparc
+	# FIXME: is this still needed??
+	use sparc && { sed -e 's/Firefox/FirefoxGentoo/g' \
+					 -i "${ED}/${MOZILLA_FIVE_HOME}/application.ini" || \
+					 die "sparc sed failed"; }
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	# Update mimedb for the new .desktop file
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}