diff --git a/app-admin/haskell-updater/haskell-updater-1.2.0.6.ebuild b/app-admin/haskell-updater/haskell-updater-1.2.0.6.ebuild
index abcb378901b1..c6a61d697054 100644
--- a/app-admin/haskell-updater/haskell-updater-1.2.0.6.ebuild
+++ b/app-admin/haskell-updater/haskell-updater-1.2.0.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/haskell-updater/haskell-updater-1.2.0.6.ebuild,v 1.1 2012/07/08 18:13:13 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/haskell-updater/haskell-updater-1.2.0.6.ebuild,v 1.2 2012/08/22 18:31:30 grobian Exp $
 
 EAPI=4
 
@@ -13,7 +13,7 @@ SRC_URI="http://hackage.haskell.org/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris" # Add keywords as those archs have a binpkg
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" # Add keywords as those archs have a binpkg
 IUSE=""
 
 DEPEND=">=dev-lang/ghc-6.12.1"
diff --git a/app-editors/elvis/elvis-2.2.0-r4.ebuild b/app-editors/elvis/elvis-2.2.0-r4.ebuild
index 13c34754a33c..4ba38ecde7ea 100644
--- a/app-editors/elvis/elvis-2.2.0-r4.ebuild
+++ b/app-editors/elvis/elvis-2.2.0-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/elvis/elvis-2.2.0-r4.ebuild,v 1.4 2012/08/06 21:21:49 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/elvis/elvis-2.2.0-r4.ebuild,v 1.5 2012/08/22 23:01:52 xmw Exp $
 
 EAPI="3"
 
@@ -14,7 +14,7 @@ SRC_URI="ftp://ftp.cs.pdx.edu/pub/elvis/${PN}-${MY_PV}.tar.gz"
 
 LICENSE="Artistic"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ppc ppc64 ~sparc x86 ~x86-interix ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris"
+KEYWORDS="~alpha amd64 ppc ppc64 ~sparc x86 ~x86-interix ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris"
 IUSE="X"
 
 DEPEND=">=sys-libs/ncurses-5.2
diff --git a/app-emulation/virtualbox/files/virtualbox-4.1.20-nopie.patch b/app-emulation/virtualbox/files/virtualbox-4.1.20-nopie.patch
new file mode 100644
index 000000000000..343e4e30b35e
--- /dev/null
+++ b/app-emulation/virtualbox/files/virtualbox-4.1.20-nopie.patch
@@ -0,0 +1,127 @@
+--- a/Config.kmk	2012-08-22 10:44:28.280834966 -0400
++++ b/Config.kmk	2012-08-22 10:44:35.990837245 -0400
+@@ -2126,6 +2126,7 @@
+ 	$(APPEND) '$@' 'VBOX_GCC_Wno-variadic-macros   ?= $(call VBOX_GCC_CHECK_CXX,-Wno-variadic-macros,)'
+ 	$(APPEND) '$@' 'VBOX_GCC_fdiagnostics-show-option ?= $(call VBOX_GCC_CHECK_CC,-fdiagnostics-show-option,)'
+ 	$(APPEND) '$@' 'VBOX_GCC_fno-stack-protector   ?= $(call VBOX_GCC_CHECK_CC,-fno-stack-protector,)'
++	$(APPEND) '$@' 'VBOX_GCC_nopie   ?= $(call VBOX_GCC_CHECK_CC,-nopie,)'
+ # Produce code optimized for the most common IA32/AMD64/EM64T processors. Introduced with gcc version 4.2.
+ 	$(APPEND) '$@' 'VBOX_GCC_mtune-generic         ?= $(call VBOX_GCC_CHECK_CC,-mtune=generic,)'
+ 	$(APPEND) '$@' 'VBOX_LD_as_needed              ?= $(call VBOX_GCC_CHECK_LD,--as-needed,)'
+@@ -2643,8 +2644,8 @@
+ 
+  ifeq ($(VBOX_LDR_FMT32),elf)
+  TEMPLATE_VBoxRc_TOOL                = $(VBOX_GCC32_TOOL)
+- TEMPLATE_VBoxRc_CXXFLAGS            = -nostdinc -g -pipe $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_CXX) $(VBOX_GCC32_Wno-variadic-macros) -fno-exceptions $(VBOX_GCC_GC_OPT) $(VBOX_GCC_GC_FP) -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fno-strict-aliasing $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_fvisibility-hidden) $(VBOX_GCC_fvisibility-inlines-hidden) -fno-rtti
+- TEMPLATE_VBoxRc_CFLAGS              = -nostdinc -g -pipe $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_C)   $(VBOX_GCC32_Wno-variadic-macros) -fno-exceptions $(VBOX_GCC_GC_OPT) $(VBOX_GCC_GC_FP) -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fno-strict-aliasing $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_fvisibility-hidden)
++ TEMPLATE_VBoxRc_CXXFLAGS            = -nostdinc -g -pipe $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_CXX) $(VBOX_GCC32_Wno-variadic-macros) -fno-exceptions $(VBOX_GCC_GC_OPT) $(VBOX_GCC_GC_FP) -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fno-strict-aliasing $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_nopie) $(VBOX_GCC_fvisibility-hidden) $(VBOX_GCC_fvisibility-inlines-hidden) -fno-rtti
++ TEMPLATE_VBoxRc_CFLAGS              = -nostdinc -g -pipe $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_C)   $(VBOX_GCC32_Wno-variadic-macros) -fno-exceptions $(VBOX_GCC_GC_OPT) $(VBOX_GCC_GC_FP) -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fno-strict-aliasing $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_nopie) $(VBOX_GCC_fvisibility-hidden)
+   ifeq ($(KBUILD_TARGET),solaris)
+    TEMPLATE_VBoxRc_LDFLAGS           = -r
+   else
+@@ -2704,9 +2705,9 @@
+  endif
+ 
+  ifeq ($(VBOX_LDR_FMT32),elf)
+-  TEMPLATE_VBoxRcExe_CFLAGS   = $(filter-out -nostdinc,$(TEMPLATE_VBoxRc_CFLAGS)) -O0
+-  TEMPLATE_VBoxRcExe_CXXFLAGS = $(filter-out -nostdinc,$(TEMPLATE_VBoxRc_CXXFLAGS)) -O0
+-  TEMPLATE_VBoxRcExe_LDFLAGS  = -g
++  TEMPLATE_VBoxRcExe_CFLAGS   = $(filter-out -nostdinc,$(TEMPLATE_VBoxRc_CFLAGS)) -O0 $(VBOX_GCC_nopie)
++  TEMPLATE_VBoxRcExe_CXXFLAGS = $(filter-out -nostdinc,$(TEMPLATE_VBoxRc_CXXFLAGS)) -O0 $(VBOX_GCC_nopie)
++  TEMPLATE_VBoxRcExe_LDFLAGS  = -g $(VBOX_GCC_nopie)
+   TEMPLATE_VBoxRcExe_LDFLAGS.dbgopt = -g
+   TEMPLATE_VBoxRcExe_LDFLAGS.strict = -g
+   TEMPLATE_VBoxRcExe_LDFLAGS.release = -g
+@@ -2768,8 +2769,8 @@
+ 
+ ifeq ($(VBOX_LDR_FMT),elf)
+ TEMPLATE_VBoxR0_TOOL                = $(VBOX_GCC_TOOL)
+-TEMPLATE_VBoxR0_CFLAGS              = -nostdinc -g -pipe $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_C)   $(VBOX_GCC_Wno-variadic-macros) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) -fno-strict-aliasing -fno-exceptions $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_fvisibility-hidden) -std=gnu99
+-TEMPLATE_VBoxR0_CXXFLAGS            = -nostdinc -g -pipe $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_CXX) $(VBOX_GCC_Wno-variadic-macros) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) -fno-strict-aliasing -fno-exceptions $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_fvisibility-inlines-hidden) $(VBOX_GCC_fvisibility-hidden) -fno-rtti
++TEMPLATE_VBoxR0_CFLAGS              = -nostdinc -g -pipe $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_C)   $(VBOX_GCC_Wno-variadic-macros) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) -fno-strict-aliasing -fno-exceptions $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_nopie) $(VBOX_GCC_fvisibility-hidden) -std=gnu99
++TEMPLATE_VBoxR0_CXXFLAGS            = -nostdinc -g -pipe $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_CXX) $(VBOX_GCC_Wno-variadic-macros) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) -fno-strict-aliasing -fno-exceptions $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_nopie) $(VBOX_GCC_fvisibility-inlines-hidden) $(VBOX_GCC_fvisibility-hidden) -fno-rtti
+ TEMPLATE_VBoxR0_CFLAGS.amd64        = -m64 -mno-red-zone -mcmodel=kernel -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fno-asynchronous-unwind-tables -ffreestanding
+ TEMPLATE_VBoxR0_CXXFLAGS.amd64      = -m64 -mno-red-zone -mcmodel=kernel -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fno-asynchronous-unwind-tables
+ ifeq ($(KBUILD_TARGET),solaris)
+@@ -2794,12 +2795,12 @@
+ TEMPLATE_VBoxR0_DEFS               += $(VBOX_DARWIN_DEF_SDK_DEFS)
+ TEMPLATE_VBoxR0_CXXFLAGS            = $(VBOX_DARWIN_DEF_SDK_CXXFLAGS) -nostdinc -g -pipe $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_CXX) $(VBOX_GCC_Wno-variadic-macros) \
+ 	-fno-common -msoft-float -static -fno-rtti -fno-exceptions $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) -fno-strict-aliasing \
+-	-mno-sse -mno-mmx -mno-sse2 -mno-3dnow $(VBOX_GCC_fno-stack-protector)
++	-mno-sse -mno-mmx -mno-sse2 -mno-3dnow $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_nopie)
+ TEMPLATE_VBoxR0_CXXFLAGS.amd64      = -m64 -mno-red-zone -mno-sse3 -mno-sse4 -mno-sse4.1 -mno-sse4.2  -mno-sse4a -fno-unwind-tables
+ TEMPLATE_VBoxR0_CXXFLAGS.x86        = -m32
+ TEMPLATE_VBoxR0_CFLAGS              = $(VBOX_DARWIN_DEF_SDK_CFLAGS)   -nostdinc -g -pipe $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_C)   $(VBOX_GCC_Wno-variadic-macros) \
+ 	-fno-common -msoft-float -static -fno-exceptions $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) -fno-strict-aliasing \
+-	-mno-sse -mno-mmx -mno-sse2 -mno-3dnow $(VBOX_GCC_fno-stack-protector)
++	-mno-sse -mno-mmx -mno-sse2 -mno-3dnow $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_nopie)
+ TEMPLATE_VBoxR0_CFLAGS.amd64        = -m64 -mno-red-zone -mno-sse3 -mno-sse4 -mno-sse4.1 -mno-sse4.2  -mno-sse4a -fno-unwind-tables
+ TEMPLATE_VBoxR0_CFLAGS.x86          = -m32
+ TEMPLATE_VBoxR0_LDFLAGS             = $(VBOX_DARWIN_DEF_SDK_LDFLAGS) -nostdlib
+@@ -2861,7 +2862,7 @@
+ TEMPLATE_VBOXR0DRV_INCS                = $(VBOX_LINUX_INCS)
+ TEMPLATE_VBOXR0DRV_CFLAGS              = -nostdinc -iwithprefix include $(VBOX_LINUX_INCLUDE) \
+ 	$(VBOX_GCC_WARN) -Wstrict-prototypes $(VBOX_GCC_Wno-pointer-sign) -Wno-sign-compare \
+-	$(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) -fno-strict-aliasing -fno-common -Werror-implicit-function-declaration
++	$(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_nopie) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) -fno-strict-aliasing -fno-common -Werror-implicit-function-declaration
+ TEMPLATE_VBOXR0DRV_CFLAGS.x86          = -mpreferred-stack-boundary=2 -msoft-float
+ TEMPLATE_VBOXR0DRV_CFLAGS.amd64        = -m64 -mno-red-zone -mcmodel=kernel -mno-sse -mno-mmx -mno-sse2 -mno-3dnow \
+ 	-fno-reorder-blocks -ffreestanding -fno-asynchronous-unwind-tables -funit-at-a-time \
+@@ -2985,7 +2986,7 @@
+ 	-Wstrict-prototypes -Wmissing-prototypes -Wstrict-prototypes -Wnested-externs \
+ 	-Wimplicit-function-declaration -Werror-implicit-function-declaration \
+ 	-O2 -fformat-extensions -ffreestanding -fno-strict-aliasing -fno-common -finline-limit=8000 \
+-	$(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) \
++	$(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_nopie) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) \
+ 	-nostdinc -std=c99
+ TEMPLATE_VBOXR0DRV_CFLAGS.x86          = -m32 -mno-align-long-strings -mpreferred-stack-boundary=2 -mno-mmx -mno-3dnow -mno-sse -mno-sse2
+ TEMPLATE_VBOXR0DRV_CFLAGS.amd64        = -m64 --param inline-unit-growth=100 --param large-function-growth=1000 \
+@@ -2994,7 +2995,7 @@
+ TEMPLATE_VBOXR0DRV_CXXFLAGS            = -fno-exceptions -fno-rtti \
+ 	$(VBOX_GCC_WARN) -Wpointer-arith -Winline \
+ 	-O2 -fno-format-extensions -fno-strict-aliasing -fno-common -finline-limit=8000 \
+-	$(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) \
++	$(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_nopie) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) \
+ 	-nostdinc
+ TEMPLATE_VBOXR0DRV_CXXFLAGS.x86        = $(TEMPLATE_VBOXR0DRV_CFLAGS.x86)
+ TEMPLATE_VBOXR0DRV_CXXFLAGS.amd64      = $(TEMPLATE_VBOXR0DRV_CFLAGS.amd64)
+@@ -3546,8 +3547,8 @@
+  TEMPLATE_VBOXNOCRTGCC_TOOL             = $(VBOX_GCC_TOOL)
+  TEMPLATE_VBOXNOCRTGCC_ASTOOL           = $(VBOX_ASTOOL)
+  TEMPLATE_VBOXNOCRTGCC_ASFLAGS          = $(VBOX_ASFLAGS)
+- TEMPLATE_VBOXNOCRTGCC_CFLAGS          += $(VBOX_GCC_fno-stack-protector)
+- TEMPLATE_VBOXNOCRTGCC_CXXFLAGS        += $(VBOX_GCC_fno-stack-protector)
++ TEMPLATE_VBOXNOCRTGCC_CFLAGS          += $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_nopie)
++ TEMPLATE_VBOXNOCRTGCC_CXXFLAGS        += $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_nopie)
+  ifeq ($(KBUILD_TARGET_ARCH),amd64)
+   # in 64-bit mode we'll build a sys-module (VBoxREM2).
+   if1of ($(KBUILD_TARGET), darwin solaris)
+@@ -4392,7 +4393,7 @@
+ TEMPLATE_VBOXLNXHOSTR3EXE_ASFLAGS           = $(VBOX_ASFLAGS)
+ TEMPLATE_VBOXLNXHOSTR3EXE_DLLSUFF           = .so
+ TEMPLATE_VBOXLNXHOSTR3EXE_DEFS              = IN_RING3 $(ARCH_BITS_DEFS)
+-TEMPLATE_VBOXLNXHOSTR3EXE_CXXFLAGS          = -g -pipe $(VBOX_GCC_PEDANTIC_CXX) $(VBOX_GCC_fno-stack-protector)
++TEMPLATE_VBOXLNXHOSTR3EXE_CXXFLAGS          = -g -pipe $(VBOX_GCC_PEDANTIC_CXX) $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_nopie)
+ TEMPLATE_VBOXLNXHOSTR3EXE_CXXFLAGS.debug    = -fno-inline
+ TEMPLATE_VBOXLNXHOSTR3EXE_CXXFLAGS.release  = -O2 -fno-omit-frame-pointer -fno-strict-aliasing
+ TEMPLATE_VBOXLNXHOSTR3EXE_CXXFLAGS.profile  = $(TEMPLATE_VBOXLNXHOSTR3EXE_CXXFLAGS.release)
+@@ -4401,7 +4402,7 @@
+ TEMPLATE_VBOXLNXHOSTR3EXE_CFLAGS.debug      = $(TEMPLATE_VBOXLNXHOSTR3EXE_CXXFLAGS.debug)
+ TEMPLATE_VBOXLNXHOSTR3EXE_CFLAGS.profile    = $(TEMPLATE_VBOXLNXHOSTR3EXE_CXXFLAGS.profile)
+ TEMPLATE_VBOXLNXHOSTR3EXE_CFLAGS.kprofile   = $(TEMPLATE_VBOXLNXHOSTR3EXE_CXXFLAGS.kprofile)
+-TEMPLATE_VBOXLNXHOSTR3EXE_CFLAGS            = -g -pipe $(VBOX_GCC_PEDANTIC_C)   $(VBOX_GCC_fno-stack-protector)
++TEMPLATE_VBOXLNXHOSTR3EXE_CFLAGS            = -g -pipe $(VBOX_GCC_PEDANTIC_C)   $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_nopie)
+ TEMPLATE_VBOXLNXHOSTR3EXE_LIBS              = pthread m rt dl
+ 
+ TEMPLATE_VBOXLNXHOSTR3LIB                   = Template for linux host libraries.
+@@ -4528,8 +4529,8 @@
+  TEMPLATE_VBOXGUESTR3XF86MOD_LDFLAGS.x86     = -m elf_i386
+  TEMPLATE_VBOXGUESTR3XF86MOD_LDFLAGS.amd64   = -Wl,-O1 -Wl,--as-needed -m elf_x86_64
+ endif
+-TEMPLATE_VBOXGUESTR3XF86MOD_CFLAGS  = $(TEMPLATE_VBOXGUESTR3EXE_CFLAGS)   -fno-merge-constants -std=c99 $(VBOX_GCC_fno-stack-protector) -ffreestanding
+-TEMPLATE_VBOXGUESTR3XF86MOD_CXXFLAGS= $(TEMPLATE_VBOXGUESTR3EXE_CXXFLAGS) -fno-merge-constants $(VBOX_GCC_fno-stack-protector) -ffreestanding
++TEMPLATE_VBOXGUESTR3XF86MOD_CFLAGS  = $(TEMPLATE_VBOXGUESTR3EXE_CFLAGS)   -fno-merge-constants -std=c99 $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_nopie) -ffreestanding
++TEMPLATE_VBOXGUESTR3XF86MOD_CXXFLAGS= $(TEMPLATE_VBOXGUESTR3EXE_CXXFLAGS) -fno-merge-constants $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_nopie) -ffreestanding
+ TEMPLATE_VBOXGUESTR3XF86MOD_SYSSUFF = .o
+ TEMPLATE_VBOXGUESTR3XF86MOD_LIBS  = \
+ 	$(VBOX_LIB_VBGL_R3_XFREE86)
diff --git a/app-emulation/virtualbox/files/virtualbox_nopie.patch b/app-emulation/virtualbox/files/virtualbox-4.1.8-nopie.patch
similarity index 100%
rename from app-emulation/virtualbox/files/virtualbox_nopie.patch
rename to app-emulation/virtualbox/files/virtualbox-4.1.8-nopie.patch
diff --git a/app-emulation/virtualbox/virtualbox-4.1.12.ebuild b/app-emulation/virtualbox/virtualbox-4.1.12.ebuild
index e6ec01cdf047..c17b8f12debf 100644
--- a/app-emulation/virtualbox/virtualbox-4.1.12.ebuild
+++ b/app-emulation/virtualbox/virtualbox-4.1.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-4.1.12.ebuild,v 1.6 2012/08/21 09:19:11 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-4.1.12.ebuild,v 1.7 2012/08/22 21:15:58 polynomial-c Exp $
 
 EAPI=4
 
@@ -176,7 +176,7 @@ src_prepare() {
 
 	# Fix compile error on hardened bug 339914 (disable PIE)
 	if gcc-specs-pie ; then
-		epatch "${FILESDIR}"/virtualbox_nopie.patch
+		epatch "${FILESDIR}"/${PN}-4.1.8-nopie.patch
 	fi
 }
 
diff --git a/app-emulation/virtualbox/virtualbox-4.1.18.ebuild b/app-emulation/virtualbox/virtualbox-4.1.18.ebuild
index fd88111d9d8a..a999623ffee3 100644
--- a/app-emulation/virtualbox/virtualbox-4.1.18.ebuild
+++ b/app-emulation/virtualbox/virtualbox-4.1.18.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-4.1.18.ebuild,v 1.3 2012/08/21 09:19:11 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-4.1.18.ebuild,v 1.4 2012/08/22 21:15:58 polynomial-c Exp $
 
 EAPI=4
 
@@ -176,7 +176,7 @@ src_prepare() {
 
 	# Fix compile error on hardened bug 339914 (disable PIE)
 	if gcc-specs-pie ; then
-		epatch "${FILESDIR}"/virtualbox_nopie.patch
+		epatch "${FILESDIR}"/${PN}-4.1.8-nopie.patch
 	fi
 }
 
diff --git a/app-emulation/virtualbox/virtualbox-4.1.20-r1.ebuild b/app-emulation/virtualbox/virtualbox-4.1.20-r1.ebuild
index 628b62c805b4..8acdd9e31516 100644
--- a/app-emulation/virtualbox/virtualbox-4.1.20-r1.ebuild
+++ b/app-emulation/virtualbox/virtualbox-4.1.20-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-4.1.20-r1.ebuild,v 1.1 2012/08/22 11:37:28 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-4.1.20-r1.ebuild,v 1.2 2012/08/22 21:15:58 polynomial-c Exp $
 
 EAPI=4
 
@@ -176,7 +176,7 @@ src_prepare() {
 
 	# Fix compile error on hardened bug 339914 (disable PIE)
 	if gcc-specs-pie ; then
-		epatch "${FILESDIR}"/virtualbox_nopie.patch
+		epatch "${FILESDIR}"/${PN}-4.1.20-nopie.patch
 	fi
 }
 
diff --git a/app-misc/vifm/vifm-0.7.2.ebuild b/app-misc/vifm/vifm-0.7.2.ebuild
index 199d90a3b958..5aae37a460bb 100644
--- a/app-misc/vifm/vifm-0.7.2.ebuild
+++ b/app-misc/vifm/vifm-0.7.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/vifm/vifm-0.7.2.ebuild,v 1.2 2012/08/12 17:41:42 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/vifm/vifm-0.7.2.ebuild,v 1.3 2012/08/22 22:57:25 xmw Exp $
 
 EAPI=4
 inherit base
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/vifm/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~s390 ~x86"
+KEYWORDS="amd64 ppc ~s390 ~x86"
 IUSE="+compatibility +extended-keys +magic vim-plugin vim-syntax"
 
 DEPEND="
diff --git a/app-office/calcurse/Manifest b/app-office/calcurse/Manifest
index 7269d28a12be..068381baa04b 100644
--- a/app-office/calcurse/Manifest
+++ b/app-office/calcurse/Manifest
@@ -1 +1,2 @@
 DIST calcurse-2.9.2.tar.gz 517071 SHA256 e116c52fb82a051b38950bdbdb3f9df99fce2713c64d3eda1de236bacba28a55 SHA512 1b8136535ca72dc4f42f60d16a9f11f51aa899659feb01aef621bc0ec9997a81444ce9465c269b4e8da848c89a54dac8f6a3e59982e74e3223950b666576c5bf WHIRLPOOL ce351c6fa54f0f6e824154ef4dec512b34f45ba2a8282ca2e1de3867dc2806357468cbeb41c75de92ef684eb8cc1a2762bb84cd66a2a720c8b4046d9eb1337d3
+DIST calcurse-3.0.0.tar.gz 682545 SHA256 8a633120a8da250bce11d746a98c9aac3309235a3acdf19d001ab36e62cacdfa SHA512 cd4defff719635469216d9edb592cbd22b845be74eeb060ca51a93f1c0fb3fb297857ef29464c77f2aa6571eac24249901dbab77845332d82217986e4fb8d7ff WHIRLPOOL fec1147e9e7883ef909168cbb52b94da00f36251fd13dfc1cb0626e33886ce0ee754a52c9526bccec4149d014466ffa950bca906b31c01084bd2ee809b421855
diff --git a/app-office/calcurse/calcurse-3.0.0.ebuild b/app-office/calcurse/calcurse-3.0.0.ebuild
new file mode 100644
index 000000000000..bd72eb7ff2ef
--- /dev/null
+++ b/app-office/calcurse/calcurse-3.0.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/calcurse/calcurse-3.0.0.ebuild,v 1.1 2012/08/23 02:18:35 jer Exp $
+
+EAPI=4
+inherit eutils
+
+DESCRIPTION="a text-based personal organizer"
+HOMEPAGE="http://calcurse.org"
+SRC_URI="http://calcurse.org/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="linguas_en linguas_fr linguas_de linguas_es linguas_nl linguas_ru"
+CC_LINGUAS="de en es fr nl pt_BR ru"
+for lingua in ${CC_LINGUAS}; do
+	IUSE+=" linguas_${lingua}"
+done
+
+RDEPEND="sys-libs/ncurses"
+DEPEND="${RDEPEND}
+	test? ( sys-libs/libfaketime )"
+
+DOCS=( AUTHORS NEWS README TODO )
diff --git a/app-portage/gentoolkit/gentoolkit-0.3.0.6-r3.ebuild b/app-portage/gentoolkit/gentoolkit-0.3.0.6-r3.ebuild
index 0fac1d6e629e..75275e603941 100644
--- a/app-portage/gentoolkit/gentoolkit-0.3.0.6-r3.ebuild
+++ b/app-portage/gentoolkit/gentoolkit-0.3.0.6-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit/gentoolkit-0.3.0.6-r3.ebuild,v 1.9 2012/07/29 00:06:33 jmorgan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit/gentoolkit-0.3.0.6-r3.ebuild,v 1.10 2012/08/22 19:15:40 darkside Exp $
 
 EAPI="3"
 SUPPORT_PYTHON_ABIS="1"
@@ -70,8 +70,7 @@ src_install() {
 	if use prefix; then
 		elog "The revdep-rebuild command is removed, the preserve-libs"
 		elog "feature of portage will handle issues."
-		rm "${ED}"/usr/bin/revdep-rebuild
-		rm "${ED}"/usr/bin/revdep-rebuild.py
+		rm "${ED}"/usr/bin/revdep-rebuild*
 		rm "${ED}"/usr/share/man/man1/revdep-rebuild.1
 		rm -rf "${ED}"/etc/revdep-rebuild
 		rm -rf "${ED}"/var
diff --git a/app-portage/gentoolkit/gentoolkit-9999.ebuild b/app-portage/gentoolkit/gentoolkit-9999.ebuild
index b2f8e7b7a918..ae5cd45c938d 100644
--- a/app-portage/gentoolkit/gentoolkit-9999.ebuild
+++ b/app-portage/gentoolkit/gentoolkit-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit/gentoolkit-9999.ebuild,v 1.21 2012/05/11 17:38:12 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit/gentoolkit-9999.ebuild,v 1.22 2012/08/22 19:15:40 darkside Exp $
 
 EAPI="3"
 SUPPORT_PYTHON_ABIS="1"
@@ -68,8 +68,7 @@ src_install() {
 	if use prefix; then
 		elog "The revdep-rebuild command is removed, the preserve-libs"
 		elog "feature of portage will handle issues."
-		rm "${ED}"/usr/bin/revdep-rebuild
-		rm "${ED}"/usr/bin/revdep-rebuild.sh
+		rm "${ED}"/usr/bin/revdep-rebuild*
 		rm "${ED}"/usr/share/man/man1/revdep-rebuild.1
 		rm -rf "${ED}"/etc/revdep-rebuild
 		rm -rf "${ED}"/var
diff --git a/app-shells/bash/bash-4.2_p37.ebuild b/app-shells/bash/bash-4.2_p37.ebuild
index e54eff9c3af1..94e418d432a1 100644
--- a/app-shells/bash/bash-4.2_p37.ebuild
+++ b/app-shells/bash/bash-4.2_p37.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.2_p37.ebuild,v 1.5 2012/08/20 02:46:57 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.2_p37.ebuild,v 1.6 2012/08/23 01:17:53 vapier Exp $
 
 EAPI="1"
 
@@ -151,8 +151,20 @@ src_install() {
 		newins "${FILESDIR}"/dot-${f} .${f}
 	done
 
-	sed -i -e "s:#${USERLAND}#@::" "${D}"/etc/skel/.bashrc "${D}"/etc/bash/bashrc
-	sed -i -e '/#@/d' "${D}"/etc/skel/.bashrc "${D}"/etc/bash/bashrc
+	local sed_args=(
+		-e "s:#${USERLAND}#@::"
+		-e '/#@/d'
+	)
+	if ! use readline ; then
+		sed_args+=( #432338
+			-e '/^shopt -s histappend/s:^:#:'
+			-e 's:use_color=true:use_color=false:'
+		)
+	fi
+	sed -i \
+		"${sed_args[@]}" \
+		"${D}"/etc/skel/.bashrc \
+		"${D}"/etc/bash/bashrc || die
 
 	if use plugins ; then
 		exeinto /usr/$(get_libdir)/bash
diff --git a/app-text/qpdf/qpdf-3.0.1.ebuild b/app-text/qpdf/qpdf-3.0.1.ebuild
index 45f4f76c81da..fb82d6f5c346 100644
--- a/app-text/qpdf/qpdf-3.0.1.ebuild
+++ b/app-text/qpdf/qpdf-3.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/qpdf/qpdf-3.0.1.ebuild,v 1.1 2012/08/19 07:01:40 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/qpdf/qpdf-3.0.1.ebuild,v 1.2 2012/08/23 00:13:26 jer Exp $
 
 EAPI="4"
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/qpdf/${P}.tar.gz"
 
 LICENSE="Artistic-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~hppa ~x86"
 IUSE="doc examples static-libs test"
 
 RDEPEND="dev-libs/libpcre
diff --git a/dev-db/tokyocabinet/Manifest b/dev-db/tokyocabinet/Manifest
index ce0c80660f40..877cb096c58b 100644
--- a/dev-db/tokyocabinet/Manifest
+++ b/dev-db/tokyocabinet/Manifest
@@ -1,2 +1,3 @@
 DIST tokyocabinet-1.4.46.tar.gz 1002423 SHA256 0eaaa3305cb67bd0555d228b28d842db6c6dc928dced9ad852980d82a7d933a3 SHA512 bdec41a9dc4f73421d1f304fe1c9d814b18450e1bf2b6de7d484145e7598484b08b00450eccda32b3ce03a418380e3323932c518a9994142ce6db39008eb11d6 WHIRLPOOL f79c09b6a93ae48c69b35b95b622f7c2ac4854f34ccd90a052a7bd969663833dec4ff05134fb6ee88176961761a506d9577d4d7a175bb839759a2247d9da7aa8
 DIST tokyocabinet-1.4.47.tar.gz 1002443 SHA256 a456193bac4843c0f0caa877b828c8d99dc44495511df10e1b00acf81c538594 SHA512 ccc90e2fba39a0507125a696c58ed6519b8a503e3a7433e7b34440cdccba75f6573ff8c4e3917e54c96171d459d1fb7d44afad7606d3833415fdfc63a9302a89 WHIRLPOOL 782e5dc7634581380a3088efb9c6544765d76a35a9399dd65235ba4e6c7306d13be3c7622adf5fa9577021d0ae65b22df6bbc975bf965b25052360716d43b1e2
+DIST tokyocabinet-1.4.48.tar.gz 1000485 SHA256 a003f47c39a91e22d76bc4fe68b9b3de0f38851b160bbb1ca07a4f6441de1f90 SHA512 b9995c838e713c13f781ab41062caefeb5c613f696dab08039f992f6860413d60a513114b83468cafdf7fc5b5e51ab880226972465d532f873f2a55f615e1440 WHIRLPOOL 90d47ac8858e5f4c198418c48118c0142e5bd04156088075eb0450cbc1aa7c70dde3206624c52710c46bb1a307675d536ba0d15e5ac8f4680aaf56691dd8a58e
diff --git a/dev-db/tokyocabinet/tokyocabinet-1.4.48.ebuild b/dev-db/tokyocabinet/tokyocabinet-1.4.48.ebuild
new file mode 100644
index 000000000000..b7af65c2d2b5
--- /dev/null
+++ b/dev-db/tokyocabinet/tokyocabinet-1.4.48.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/tokyocabinet/tokyocabinet-1.4.48.ebuild,v 1.1 2012/08/23 04:23:59 patrick Exp $
+
+EAPI="2"
+
+inherit eutils autotools
+
+DESCRIPTION="A library of routines for managing a database"
+HOMEPAGE="http://fallabs.com/tokyocabinet/"
+SRC_URI="${HOMEPAGE}${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+IUSE="debug doc examples"
+
+DEPEND="sys-libs/zlib
+	app-arch/bzip2"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}/fix_rpath.patch"
+	sed -i \
+		-e "/ldconfig/d" \
+		-e "/DATADIR/d" Makefile.in || die
+	# cflags fix - remove -O2 at end of line and -fomit-frame-pointer
+	sed -i -e 's/-O3"$/"/' configure.in || die
+	sed -i -e 's/-fomit-frame-pointer//' configure.in || die
+	# flag only works on x86 derivatives, remove everywhere else
+	if ! use x86 && ! use amd64; then sed -i -e 's/ -minline-all-stringops//' configure.in; fi
+	eautoreconf
+}
+
+src_configure() {
+	# we use the "fastest" target without the -O3
+	econf $(use_enable debug) --enable-off64 --enable-fastest
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "Install failed"
+
+	if use examples; then
+		insinto /usr/share/${PF}/example
+		doins example/* || die "Install failed"
+	fi
+
+	if use doc; then
+		insinto /usr/share/doc/${PF}
+		doins -r doc/* || die "Install failed"
+	fi
+}
+
+src_test() {
+	emake -j1 check || die "Tests failed"
+}
diff --git a/dev-lang/parrot/Manifest b/dev-lang/parrot/Manifest
index 59b3c581b359..ac67309638f9 100644
--- a/dev-lang/parrot/Manifest
+++ b/dev-lang/parrot/Manifest
@@ -1,3 +1,4 @@
 DIST parrot-4.4.0.tar.bz2 4324058 SHA256 348ce13fc136afc74a7b50b094f64d8cb00f83f0cd3d59acc6fa4e63c824fa4d SHA512 da7659ac62a86df9004dd789255570547afa19ae045515bf8bb4eafb00fe2615b353b3f597108d18b68c7f513cfcf4359c2fe656c917b97f12977e01342b100c WHIRLPOOL 9e2a1dee83539d4a2e9509d5ce0d93ec36f81954436cd29be26bf3a4e9671f1b5994cd1ab7d993e1250a5112806b20c8bf939fa2f0ee3cbb8cd5b4e0f2650ab9
 DIST parrot-4.5.0.tar.bz2 4331710 SHA256 74996076eb9dbe0f2442e0ae9c0cb5c3e9d5f49a266368eee01f4ab30c6d2808 SHA512 ea468823db32f54cb4314b34fff87da1d4e62aa278c73fdb265ce8af0b0f048fd22426108dad355c086b2ef26509b9df36960d9f13a2553392ef69618322a449 WHIRLPOOL 111ddc48e47803d94b8d9d9415c3e965bb8534279ea3461fd6d5d874b485ea887136d1120de69eb73ccda2892a1363453db9acb445082203f937e78b273d8dfc
 DIST parrot-4.6.0.tar.bz2 4331714 SHA256 31d48e348eab418d5d9d9f9bb24d628763ff90c608d21b1944c227b6938a69d1 SHA512 dd715e4f66aaa739353b5a43a79047d234247f0d1d727d3f73e80358000dc933e32d706f40a27d57127c7728683c5aa8bc851aa2ceb80f9e25008360d20efba0 WHIRLPOOL bc12b26c7cb5158adc066ec5f6e00ea0ef49d16bab24f0fec6e28c104ac3b30016bd3892485fbdb2b52e1bb8866db3aefad7d4d2bec70025c76abc0c5d6fce30
+DIST parrot-4.7.0.tar.bz2 4333224 SHA256 4360ac3dffafffaa00bce561c1329df8ad134019f76930cf24e7a875a4422a90 SHA512 d67d9fb097b3a47c1220aa1548c37a2dd63c925f4fd9e18efa258a23917df8d6c37f6fc0ff6439f5164700d8eae9c699cb21dc9d0e2a41213be8be7232abe244 WHIRLPOOL ce22ac06fa1d015d9208805785613d5f73f8f03121bf3afbe4d7e3fa606a34f361d68513a9d7b6ebaaff8b7c0e1d664486c4dcbb9c705098ba8095221781ac1f
diff --git a/dev-lang/parrot/parrot-4.7.0.ebuild b/dev-lang/parrot/parrot-4.7.0.ebuild
new file mode 100644
index 000000000000..7969631a85da
--- /dev/null
+++ b/dev-lang/parrot/parrot-4.7.0.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/parrot/parrot-4.7.0.ebuild,v 1.1 2012/08/23 03:23:04 patrick Exp $
+
+EAPI=3
+
+inherit eutils multilib
+
+DESCRIPTION="Virtual machine designed to efficiently compile and execute bytecode for dynamic languages"
+HOMEPAGE="http://www.parrot.org/"
+SRC_URI="ftp://ftp.parrot.org/pub/parrot/releases/devel/${PV}/${P}.tar.bz2"
+
+LICENSE="Artistic-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="opengl nls doc examples gdbm gmp ssl +unicode pcre"
+
+RDEPEND="sys-libs/readline
+	opengl? ( media-libs/freeglut )
+	nls? ( sys-devel/gettext )
+	unicode? ( >=dev-libs/icu-2.6 )
+	gdbm? ( >=sys-libs/gdbm-1.8.3-r1 )
+	gmp? ( >=dev-libs/gmp-4.1.4 )
+	ssl? ( dev-libs/openssl )
+	pcre? ( dev-libs/libpcre )"
+
+DEPEND="dev-lang/perl[doc?]
+	${RDEPEND}"
+
+src_prepare() {
+	# Fix for #404195 - pcre detection is wonky
+	sed -i 's:libpcre.so.0:libpcre.so.1:' runtime/parrot/library/pcre.pir || die "Couldn't fix pcre location"
+}
+
+src_configure() {
+	myconf="--disable-rpath"
+	use unicode || myconf+=" --without-icu"
+	use ssl     || myconf+=" --without-crypto"
+	use gdbm    || myconf+=" --without-gdbm"
+	use nls     || myconf+=" --without-gettext"
+	use gmp     || myconf+=" --without-gmp"
+	use opengl  || myconf+=" --without-opengl"
+	use pcre    || myconf+=" --without-pcre"
+
+	perl Configure.pl \
+		--ccflags="${CFLAGS}" \
+		--linkflags="${LDFLAGS}" \
+		--prefix="${EPREFIX}"/usr \
+		--libdir="${EPREFIX}"/usr/$(get_libdir) \
+		--mandir="${EPREFIX}"/usr/share/man \
+		--sysconfdir="${EPREFIX}"/etc \
+		--sharedstatedir="${EPREFIX}"/var/lib/parrot \
+		$myconf || die
+}
+
+src_compile() {
+	export LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}"${S}"/blib/lib
+	# occasionally dies in parallel make
+	emake -j1 || die
+	if use doc ; then
+		emake -j1 html || die
+	fi
+}
+
+src_test() {
+	emake -j1 test || die
+}
+
+src_install() {
+	emake -j1 install-dev DESTDIR="${D}" DOC_DIR="${EPREFIX}/usr/share/doc/${PF}" || die
+	dodoc CREDITS DONORS.pod PBC_COMPAT PLATFORMS RESPONSIBLE_PARTIES TODO || die
+	if use examples; then
+		insinto "/usr/share/doc/${PF}/examples"
+		doins -r examples/* || die
+	fi
+	if use doc; then
+		insinto "/usr/share/doc/${PF}/editor"
+		doins -r editor || die
+		cd docs/html
+		dohtml -r developer.html DONORS.pod.html index.html ops.html parrotbug.html pdds.html \
+			pmc.html tools.html docs src tools || die
+	fi
+}
diff --git a/dev-lisp/ecls/ecls-12.7.1.ebuild b/dev-lisp/ecls/ecls-12.7.1.ebuild
index 16f60f7b9116..5c400cc09843 100644
--- a/dev-lisp/ecls/ecls-12.7.1.ebuild
+++ b/dev-lisp/ecls/ecls-12.7.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/ecls/ecls-12.7.1.ebuild,v 1.1 2012/08/05 04:00:15 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/ecls/ecls-12.7.1.ebuild,v 1.2 2012/08/23 04:32:11 ottxor Exp $
 
 EAPI=4
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD LGPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug emacs gengc precisegc threads +unicode X"
 
 RDEPEND="dev-libs/gmp
diff --git a/dev-ml/camlimages/camlimages-4.0.1.ebuild b/dev-ml/camlimages/camlimages-4.0.1.ebuild
index 612f59ba4022..5472403595e4 100644
--- a/dev-ml/camlimages/camlimages-4.0.1.ebuild
+++ b/dev-ml/camlimages/camlimages-4.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/camlimages/camlimages-4.0.1.ebuild,v 1.3 2012/07/24 10:50:03 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/camlimages/camlimages-4.0.1.ebuild,v 1.4 2012/08/22 23:54:41 xmw Exp $
 
 EAPI=4
 
@@ -12,7 +12,7 @@ SRC_URI="http://bitbucket.org/camlspotter/camlimages/get/v4.0.1.tar.bz2 -> ${P}.
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
+KEYWORDS="~amd64 ppc x86"
 IUSE="doc gif gtk jpeg png postscript tiff truetype X xpm zlib"
 
 RDEPEND=">=dev-lang/ocaml-3.10.2[X?,ocamlopt]
diff --git a/dev-python/traits/traits-4.1.0.ebuild b/dev-python/traits/traits-4.1.0.ebuild
index 7d56f8273ccd..142a82bb96ab 100644
--- a/dev-python/traits/traits-4.1.0.ebuild
+++ b/dev-python/traits/traits-4.1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/traits/traits-4.1.0.ebuild,v 1.3 2012/06/01 13:02:22 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/traits/traits-4.1.0.ebuild,v 1.4 2012/08/22 23:04:01 xmw Exp $
 
 EAPI=4
 
@@ -16,7 +16,7 @@ SRC_URI="http://www.enthought.com/repo/ETS/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ~ppc64 ~x86"
 IUSE="doc examples test"
 
 RDEPEND="dev-python/numpy"
diff --git a/dev-util/insight/insight-6.8.1.ebuild b/dev-util/insight/insight-6.8.1.ebuild
index c68799dec5b7..97d91ce59f61 100644
--- a/dev-util/insight/insight-6.8.1.ebuild
+++ b/dev-util/insight/insight-6.8.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/insight/insight-6.8.1.ebuild,v 1.6 2012/07/29 16:27:39 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/insight/insight-6.8.1.ebuild,v 1.7 2012/08/22 23:23:16 xmw Exp $
 
 EAPI=4
 
@@ -15,7 +15,7 @@ SRC_URI="ftp://sources.redhat.com/pub/${PN}/releases/${MY_P}a.tar.bz2
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="nls"
 
 RDEPEND="
diff --git a/dev-util/omake/omake-0.9.8.6.0_rc1.ebuild b/dev-util/omake/omake-0.9.8.6.0_rc1.ebuild
index c5151101c883..4b2f24696da2 100644
--- a/dev-util/omake/omake-0.9.8.6.0_rc1.ebuild
+++ b/dev-util/omake/omake-0.9.8.6.0_rc1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/omake/omake-0.9.8.6.0_rc1.ebuild,v 1.2 2012/07/10 22:30:37 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/omake/omake-0.9.8.6.0_rc1.ebuild,v 1.3 2012/08/22 23:49:11 xmw Exp $
 
 EAPI=2
 inherit toolchain-funcs multilib versionator eutils
@@ -13,7 +13,7 @@ SRC_URI="http://omake.metaprl.org/downloads/${PN}-${MY_PV}.tar.gz"
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
+KEYWORDS="~amd64 ppc x86"
 IUSE="doc fam ncurses +ocamlopt readline"
 DEPEND=">=dev-lang/ocaml-3.10.2[ocamlopt?]
 	ncurses? ( >=sys-libs/ncurses-5.3 )
diff --git a/dev-util/weka/weka-3.6.6-r1.ebuild b/dev-util/weka/weka-3.6.6-r1.ebuild
index fc9f233c399f..e95574d23f8d 100644
--- a/dev-util/weka/weka-3.6.6-r1.ebuild
+++ b/dev-util/weka/weka-3.6.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/weka/weka-3.6.6-r1.ebuild,v 1.3 2012/08/03 13:58:08 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/weka/weka-3.6.6-r1.ebuild,v 1.4 2012/08/23 05:46:36 xmw Exp $
 
 EAPI="3"
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip"
 HOMEPAGE="http://www.cs.waikato.ac.nz/ml/weka/"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
 DEPEND=">=virtual/jdk-1.5
 	app-arch/unzip
 	>=dev-java/javacup-0.11a_beta20060608:0"
diff --git a/dev-vcs/git/files/git-daemon.confd b/dev-vcs/git/files/git-daemon.confd
index 75b421680c80..db77de5d3068 100644
--- a/dev-vcs/git/files/git-daemon.confd
+++ b/dev-vcs/git/files/git-daemon.confd
@@ -10,7 +10,7 @@
 #   --export-all  --- Exports all repositories
 #   --port=XXXX   --- Starts in port XXXX instead of 9418
 #
-GITDAEMON_OPTS="--syslog /var/git"
+GITDAEMON_OPTS="--syslog --base-path=/var/git"
 
 # To run an anonymous git safely, the following user should be able to only
 # read your Git repositories. It should not able able to write to anywhere on
diff --git a/dev-vcs/git/git-1.7.12-r2.ebuild b/dev-vcs/git/git-1.7.12-r2.ebuild
new file mode 100644
index 000000000000..04e294cec4eb
--- /dev/null
+++ b/dev-vcs/git/git-1.7.12-r2.ebuild
@@ -0,0 +1,523 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.12-r2.ebuild,v 1.1 2012/08/23 05:38:18 robbat2 Exp $
+
+EAPI=4
+
+GENTOO_DEPEND_ON_PERL=no
+
+# bug #329479: git-remote-testgit is not multiple-version aware
+PYTHON_DEPEND="python? 2"
+[[ ${PV} == *9999 ]] && SCM="git-2"
+EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
+
+inherit toolchain-funcs eutils elisp-common perl-module bash-completion-r1 python ${SCM}
+
+MY_PV="${PV/_rc/.rc}"
+MY_P="${PN}-${MY_PV}"
+
+DOC_VER=${MY_PV}
+
+DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team"
+HOMEPAGE="http://www.git-scm.com/"
+if [[ ${PV} != *9999 ]]; then
+	SRC_URI_SUFFIX="gz"
+	SRC_URI_GOOG="http://git-core.googlecode.com/files"
+	SRC_URI_KORG="mirror://kernel/software/scm/git"
+	SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX}
+			${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
+			${SRC_URI_GOOG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+			${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+			doc? (
+			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+			${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+			)"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+else
+	SRC_URI=""
+	KEYWORDS=""
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+blksha1 +curl cgi doc emacs +gpg gtk +iconv +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
+
+# Common to both DEPEND and RDEPEND
+CDEPEND="
+	dev-libs/openssl
+	sys-libs/zlib
+	pcre? ( dev-libs/libpcre )
+	perl? ( dev-lang/perl[-build] )
+	tk? ( dev-lang/tk )
+	curl? (
+		net-misc/curl
+		webdav? ( dev-libs/expat )
+	)
+	emacs?  ( virtual/emacs )"
+
+RDEPEND="${CDEPEND}
+	gpg? ( app-crypt/gnupg )
+	perl? ( dev-perl/Error
+			dev-perl/Net-SMTP-SSL
+			dev-perl/Authen-SASL
+			cgi? ( virtual/perl-CGI app-text/highlight )
+			cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
+			subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
+			)
+	python? ( gtk?
+	(
+		>=dev-python/pygtk-2.8
+		dev-python/pygtksourceview:2
+	) )"
+
+# This is how info docs are created with Git:
+#   .txt/asciidoc --(asciidoc)---------> .xml/docbook
+#   .xml/docbook  --(docbook2texi.pl)--> .texi
+#   .texi         --(makeinfo)---------> .info
+DEPEND="${CDEPEND}
+	app-arch/cpio
+	doc? (
+		app-text/asciidoc
+		app-text/docbook2X
+		sys-apps/texinfo
+	)
+	test? (
+		app-crypt/gnupg
+	)"
+
+# Live ebuild builds man pages and HTML docs, additionally
+if [[ ${PV} == *9999 ]]; then
+	DEPEND="${DEPEND}
+		app-text/asciidoc
+		app-text/xmlto"
+fi
+
+SITEFILE=50${PN}-gentoo.el
+S="${WORKDIR}/${MY_P}"
+
+REQUIRED_USE="
+	cgi? ( perl )
+	cvs? ( perl )
+	subversion? ( perl )
+	webdav? ( curl )
+"
+
+pkg_setup() {
+	if use subversion && has_version dev-vcs/subversion && built_with_use --missing false dev-vcs/subversion dso ; then
+		ewarn "Per Gentoo bugs #223747, #238586, when subversion is built"
+		ewarn "with USE=dso, there may be weird crashes in git-svn. You"
+		ewarn "have been warned."
+	fi
+	if use python ; then
+		python_set_active_version 2
+		python_pkg_setup
+	fi
+}
+
+# This is needed because for some obscure reasons future calls to make don't
+# pick up these exports if we export them in src_unpack()
+exportmakeopts() {
+	local myopts
+
+	if use blksha1 ; then
+		myopts="${myopts} BLK_SHA1=YesPlease"
+	elif use ppcsha1 ; then
+		myopts="${myopts} PPC_SHA1=YesPlease"
+	fi
+
+	if use curl ; then
+		use webdav || myopts="${myopts} NO_EXPAT=YesPlease"
+	else
+		myopts="${myopts} NO_CURL=YesPlease"
+	fi
+
+	# broken assumptions, because of broken build system ...
+	myopts="${myopts} NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease"
+	myopts="${myopts} INSTALL=install TAR=tar"
+	myopts="${myopts} SHELL_PATH=${EPREFIX}/bin/sh"
+	myopts="${myopts} SANE_TOOL_PATH="
+	myopts="${myopts} OLD_ICONV="
+	myopts="${myopts} NO_EXTERNAL_GREP="
+
+	# can't define this to null, since the entire makefile depends on it
+	sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile
+
+	use iconv \
+		|| myopts="${myopts} NO_ICONV=YesPlease"
+	use nls \
+		|| myopts="${myopts} NO_GETTEXT=YesPlease"
+	use tk \
+		|| myopts="${myopts} NO_TCLTK=YesPlease"
+	use pcre \
+		&& myopts="${myopts} USE_LIBPCRE=yes"
+	use perl \
+		&& myopts="${myopts} INSTALLDIRS=vendor" \
+		|| myopts="${myopts} NO_PERL=YesPlease"
+	use python \
+		|| myopts="${myopts} NO_PYTHON=YesPlease"
+	use subversion \
+		|| myopts="${myopts} NO_SVN_TESTS=YesPlease"
+	use threads \
+		&& myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease"
+	use cvs \
+		|| myopts="${myopts} NO_CVS=YesPlease"
+# Disabled until ~m68k-mint can be keyworded again
+#	if [[ ${CHOST} == *-mint* ]] ; then
+#		myopts="${myopts} NO_MMAP=YesPlease"
+#		myopts="${myopts} NO_IPV6=YesPlease"
+#		myopts="${myopts} NO_STRLCPY=YesPlease"
+#		myopts="${myopts} NO_MEMMEM=YesPlease"
+#		myopts="${myopts} NO_MKDTEMP=YesPlease"
+#		myopts="${myopts} NO_MKSTEMPS=YesPlease"
+#	fi
+	if [[ ${CHOST} == ia64-*-hpux* ]]; then
+		myopts="${myopts} NO_NSEC=YesPlease"
+	fi
+	if [[ ${CHOST} == *-*-aix* ]]; then
+		myopts="${myopts} NO_FNMATCH_CASEFOLD=YesPlease"
+	fi
+
+	has_version '>=app-text/asciidoc-8.0' \
+		&& myopts="${myopts} ASCIIDOC8=YesPlease"
+	myopts="${myopts} ASCIIDOC_NO_ROFF=YesPlease"
+
+	# Bug 290465:
+	# builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
+	[[ "${CHOST}" == *-uclibc* ]] && \
+		myopts="${myopts} NO_NSEC=YesPlease"
+
+	export MY_MAKEOPTS="${myopts}"
+}
+
+src_unpack() {
+	if [[ ${PV} != *9999 ]]; then
+		unpack ${MY_P}.tar.${SRC_URI_SUFFIX}
+		cd "${S}"
+		unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+		use doc && \
+			cd "${S}"/Documentation && \
+			unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+		cd "${S}"
+	else
+		git-2_src_unpack
+		cd "${S}"
+		#cp "${FILESDIR}"/GIT-VERSION-GEN .
+	fi
+
+}
+
+src_prepare() {
+	# bug #418431 - stated for upstream 1.7.13. Developed by Michael Schwern,
+	# funded as a bounty by the Gentoo Foundation.
+	epatch "${FILESDIR}"/git-1.7.12-git-svn-backport.patch
+
+	# bug #350330 - automagic CVS when we don't want it is bad.
+	epatch "${FILESDIR}"/git-1.7.12-optional-cvs.patch
+
+	sed -i \
+		-e 's:^\(CFLAGS =\).*$:\1 $(OPTCFLAGS) -Wall:' \
+		-e 's:^\(LDFLAGS =\).*$:\1 $(OPTLDFLAGS):' \
+		-e 's:^\(CC = \).*$:\1$(OPTCC):' \
+		-e 's:^\(AR = \).*$:\1$(OPTAR):' \
+		-e "s:\(PYTHON_PATH = \)\(.*\)$:\1${EPREFIX}\2:" \
+		-e "s:\(PERL_PATH = \)\(.*\)$:\1${EPREFIX}\2:" \
+		Makefile || die "sed failed"
+
+	# Never install the private copy of Error.pm (bug #296310)
+	sed -i \
+		-e '/private-Error.pm/s,^,#,' \
+		perl/Makefile.PL
+
+	# Fix docbook2texi command
+	sed -i 's/DOCBOOK2X_TEXI=docbook2x-texi/DOCBOOK2X_TEXI=docbook2texi.pl/' \
+		Documentation/Makefile || die "sed failed"
+}
+
+git_emake() {
+	# bug #326625: PERL_PATH, PERL_MM_OPT
+	# bug #320647: PYTHON_PATH
+	PYTHON_PATH=""
+	use python && PYTHON_PATH="$(PYTHON -a)"
+	emake ${MY_MAKEOPTS} \
+		DESTDIR="${D}" \
+		OPTCFLAGS="${CFLAGS}" \
+		OPTLDFLAGS="${LDFLAGS}" \
+		OPTCC="$(tc-getCC)" \
+		OPTAR="$(tc-getAR)" \
+		prefix="${EPREFIX}"/usr \
+		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
+		sysconfdir="${EPREFIX}"/etc \
+		PYTHON_PATH="${PYTHON_PATH}" \
+		PERL_MM_OPT="" \
+		GIT_TEST_OPTS="--no-color" \
+		"$@"
+	# This is the fix for bug #326625, but it also causes breakage, see bug
+	# #352693.
+	# PERL_PATH="${EPREFIX}/usr/bin/env perl" \
+}
+
+src_configure() {
+	exportmakeopts
+}
+
+src_compile() {
+	if use perl ; then
+	git_emake perl/PM.stamp || die "emake perl/PM.stamp failed"
+	git_emake perl/perl.mak || die "emake perl/perl.mak failed"
+	fi
+	git_emake || die "emake failed"
+
+	if use emacs ; then
+		elisp-compile contrib/emacs/git{,-blame}.el \
+			|| die "emacs modules failed"
+	fi
+
+	if use perl && use cgi ; then
+		git_emake \
+			gitweb/gitweb.cgi \
+			|| die "emake gitweb/gitweb.cgi failed"
+	fi
+
+	if [[ ${CHOST} == *-darwin* ]]; then
+		cd "${S}"/contrib/credential/osxkeychain || die "cd credential/osxkeychain"
+		git_emake || die "email credential-osxkeychain"
+	fi
+
+	cd "${S}"/Documentation
+	if [[ ${PV} == *9999 ]] ; then
+		git_emake man \
+			|| die "emake man failed"
+		if use doc ; then
+			git_emake info html \
+				|| die "emake info html failed"
+		fi
+	else
+		if use doc ; then
+			git_emake info \
+				|| die "emake info html failed"
+		fi
+	fi
+}
+
+src_install() {
+	git_emake \
+		install || \
+		die "make install failed"
+
+	if [[ ${CHOST} == *-darwin* ]]; then
+		dobin contrib/credential/osxkeychain/git-credential-osxkeychain
+	fi
+
+	# Depending on the tarball and manual rebuild of the documentation, the
+	# manpages may exist in either OR both of these directories.
+	find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
+	find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157]
+
+	dodoc README Documentation/{SubmittingPatches,CodingGuidelines}
+	use doc && dodir /usr/share/doc/${PF}/html
+	for d in / /howto/ /technical/ ; do
+		docinto ${d}
+		dodoc Documentation${d}*.txt
+		use doc && dohtml -p ${d} Documentation${d}*.html
+	done
+	docinto /
+	# Upstream does not ship this pre-built :-(
+	use doc && doinfo Documentation/{git,gitman}.info
+
+	newbashcomp contrib/completion/git-completion.bash ${PN}
+	newbashcomp contrib/completion/git-prompt.sh ${PN}-prompt
+
+	if use emacs ; then
+		elisp-install ${PN} contrib/emacs/git.{el,elc} || die
+		elisp-install ${PN} contrib/emacs/git-blame.{el,elc} || die
+		#elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc} || die
+		# don't add automatically to the load-path, so the sitefile
+		# can do a conditional loading
+		touch "${ED}${SITELISP}/${PN}/compat/.nosearch"
+		elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die
+	fi
+
+	if use python && use gtk ; then
+		dobin "${S}"/contrib/gitview/gitview
+		python_convert_shebangs ${PYTHON_ABI} "${ED}"/usr/bin/gitview
+		dodoc "${S}"/contrib/gitview/gitview.txt
+	fi
+
+	#dobin contrib/fast-import/git-p4 # Moved upstream
+	#dodoc contrib/fast-import/git-p4.txt # Moved upstream
+	newbin contrib/fast-import/import-tars.perl import-tars
+	newbin contrib/git-resurrect.sh git-resurrect
+
+	dodir /usr/share/${PN}/contrib
+	# The following are excluded:
+	# completion - installed above
+	# emacs - installed above
+	# examples - these are stuff that is not used in Git anymore actually
+	# gitview - installed above
+	# p4import - excluded because fast-import has a better one
+	# patches - stuff the Git guys made to go upstream to other places
+	# svnimport - use git-svn
+	# thunderbird-patch-inline - fixes thunderbird
+	for i in \
+		blameview buildsystems ciabot continuous convert-objects fast-import \
+		hg-to-git hooks remotes2config.sh remotes2config.sh rerere-train.sh \
+		stats svn-fe vim workdir \
+		; do
+		cp -rf \
+			"${S}"/contrib/${i} \
+			"${ED}"/usr/share/${PN}/contrib \
+			|| die "Failed contrib ${i}"
+	done
+
+	if use perl && use cgi ; then
+		# We used to install in /usr/share/${PN}/gitweb
+		# but upstream installs in /usr/share/gitweb
+		# so we will install a symlink and use their location for compat with other
+		# distros
+		dosym /usr/share/gitweb /usr/share/${PN}/gitweb
+
+		# INSTALL discusses configuration issues, not just installation
+		docinto /
+		newdoc  "${S}"/gitweb/INSTALL INSTALL.gitweb
+		newdoc  "${S}"/gitweb/README README.gitweb
+
+		find "${ED}"/usr/lib64/perl5/ \
+			-name .packlist \
+			-exec rm \{\} \;
+	else
+		rm -rf "${ED}"/usr/share/gitweb
+	fi
+
+	if ! use subversion ; then
+		rm -f "${ED}"/usr/libexec/git-core/git-svn \
+			"${ED}"/usr/share/man/man1/git-svn.1*
+	fi
+
+	if use xinetd ; then
+		insinto /etc/xinetd.d
+		newins "${FILESDIR}"/git-daemon.xinetd git-daemon
+	fi
+
+	newinitd "${FILESDIR}"/git-daemon.initd git-daemon
+	newconfd "${FILESDIR}"/git-daemon.confd git-daemon
+
+	fixlocalpod
+}
+
+src_test() {
+	local disabled=""
+	local tests_cvs="t9200-git-cvsexportcommit.sh \
+					t9400-git-cvsserver-server.sh \
+					t9401-git-cvsserver-crlf.sh \
+					t9600-cvsimport.sh \
+					t9601-cvsimport-vendor-branch.sh \
+					t9602-cvsimport-branches-tags.sh \
+					t9603-cvsimport-patchsets.sh"
+	local tests_perl="t5502-quickfetch.sh \
+					t5512-ls-remote.sh \
+					t5520-pull.sh"
+	# Bug #225601 - t0004 is not suitable for root perm
+	# Bug #219839 - t1004 is not suitable for root perm
+	# t0001-init.sh - check for init notices EPERM*  fails
+	local tests_nonroot="t0001-init.sh \
+		t0004-unwritable.sh \
+		t0070-fundamental.sh \
+		t1004-read-tree-m-u-wf.sh \
+		t3700-add.sh \
+		t7300-clean.sh"
+	# t9100 still fails with symlinks in SVN 1.7
+	local test_svn="t9100-git-svn-basic.sh"
+
+	# Unzip is used only for the testcase code, not by any normal parts of Git.
+	if ! has_version app-arch/unzip ; then
+		einfo "Disabling tar-tree tests"
+		disabled="${disabled} t5000-tar-tree.sh"
+	fi
+
+	cvs=0
+	use cvs && let cvs=$cvs+1
+	if [[ ${EUID} -eq 0 ]]; then
+		if [[ $cvs -eq 1 ]]; then
+			ewarn "Skipping CVS tests because CVS does not work as root!"
+			ewarn "You should retest with FEATURES=userpriv!"
+			disabled="${disabled} ${tests_cvs}"
+		fi
+		einfo "Skipping other tests that require being non-root"
+		disabled="${disabled} ${tests_nonroot}"
+	else
+		[[ $cvs -gt 0 ]] && \
+			has_version dev-vcs/cvs && \
+			let cvs=$cvs+1
+		[[ $cvs -gt 1 ]] && \
+			built_with_use dev-vcs/cvs server && \
+			let cvs=$cvs+1
+		if [[ $cvs -lt 3 ]]; then
+			einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
+			disabled="${disabled} ${tests_cvs}"
+		fi
+	fi
+
+	if ! use perl ; then
+		einfo "Disabling tests that need Perl"
+		disabled="${disabled} ${tests_perl}"
+	fi
+
+	einfo "Disabling tests that fail with SVN 1.7"
+	disabled="${disabled} ${test_svn}"
+
+	# Reset all previously disabled tests
+	cd "${S}/t"
+	for i in *.sh.DISABLED ; do
+		[[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}"
+	done
+	einfo "Disabled tests:"
+	for i in ${disabled} ; do
+		[[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i"
+	done
+
+	# Avoid the test system removing the results because we want them ourselves
+	sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \
+		-i "${S}"/t/Makefile
+
+	# Clean old results first, must always run
+	cd "${S}/t"
+	nonfatal git_emake clean
+
+	# Now run the tests, keep going if we hit an error, and don't terminate on
+	# failure
+	cd "${S}"
+	einfo "Start test run"
+	#MAKEOPTS=-j1
+	nonfatal git_emake --keep-going test
+	rc=$?
+
+	# Display nice results, now print the results
+	cd "${S}/t"
+	nonfatal git_emake aggregate-results
+
+	# And bail if there was a problem
+	[ $rc -eq 0 ] || die "tests failed. Please file a bug."
+}
+
+showpkgdeps() {
+	local pkg=$1
+	shift
+	elog "  $(printf "%-17s:" ${pkg}) ${@}"
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+	use python && python_mod_optimize git_remote_helpers
+		einfo "Please read /usr/share/bash-completion/git for Git bash completion"
+	elog "These additional scripts need some dependencies:"
+	echo
+	showpkgdeps git-quiltimport "dev-util/quilt"
+	showpkgdeps git-instaweb \
+		"|| ( www-servers/lighttpd www-servers/apache )"
+	echo
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+	use python && python_mod_cleanup git_remote_helpers
+}
diff --git a/dev-vcs/hgview/Manifest b/dev-vcs/hgview/Manifest
index b59689ec9400..808095407466 100644
--- a/dev-vcs/hgview/Manifest
+++ b/dev-vcs/hgview/Manifest
@@ -1,2 +1,2 @@
-DIST hgview-1.2.1.tar.gz 99673 SHA256 a80fc2e53ddc715d74e3d9ff0bdb57890e7989364f06c40bab65aaf0d797d974 SHA512 4284ff60a2c8b5c1cbe458a53c7a7209fd23801e16427a5c8039095e2b7523e5cddbdeff23c69818524e5467af720944c1d67d95918be06801d456c560486a4b WHIRLPOOL 9f4f4d3c799651df9f584e96dac8c1faa31aea3097b0000f0ba3dea49f16e048f753635bfdc6b84b0248ba11767e09a006253ee338622c89918efa641a522077
 DIST hgview-1.5.0.tar.gz 220706 SHA256 411c7a795616263d16a4f9178c0c50f9078f047d1e601d80e035d36c565d7715 SHA512 f20e570389929e359efe3d2787ad32f4f0a3253181ce492ab6cac7a3980c582d22322f7d6e4936e547cf979de5d9e063629c6f5306a8593db6a5a09365ee8c42 WHIRLPOOL a951bd896a4dda152d20db73f7b5febd7af7cc6405191c8f1a5a155ff27c2c8ba95e4911c9b565b5c4018dd28d32ee14c9563a67ca0e8ba4e2e3445d09a17a66
+DIST hgview-1.6.2.tar.gz 161731 SHA256 7ff7c2bf92dbe40a1520ef8944ed25467895d3c503e7aef8a73c3103e7da7fa0 SHA512 2905dde38a3b329a926e0f96bbac723319a11a19add800e58afabec53e3d8925398ccb78f4c53fb5b32a3d2d9238dc69a132908c706ff1bf2bfd5ec4d21db43f WHIRLPOOL c26d3ad0c7ac1e907f1d254aef1b777c7c300d39021a23c8badb4490192355c92d97aa1f57438a644573cb2c30f1694abe84664330cbd79c81b8b5b760ff13b5
diff --git a/dev-vcs/hgview/hgview-1.2.1.ebuild b/dev-vcs/hgview/hgview-1.6.2.ebuild
similarity index 65%
rename from dev-vcs/hgview/hgview-1.2.1.ebuild
rename to dev-vcs/hgview/hgview-1.6.2.ebuild
index 1b1c014b2207..8acbece10eba 100644
--- a/dev-vcs/hgview/hgview-1.2.1.ebuild
+++ b/dev-vcs/hgview/hgview-1.6.2.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/hgview/hgview-1.2.1.ebuild,v 1.2 2011/03/26 21:11:12 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/hgview/hgview-1.6.2.ebuild,v 1.1 2012/08/23 01:05:34 pesa Exp $
+
+EAPI=4
 
-EAPI="3"
 PYTHON_DEPEND="2:2.5"
 SUPPORT_PYTHON_ABIS="1"
 RESTRICT_PYTHON_ABIS="2.4 3.* *-jython"
@@ -10,7 +11,7 @@ RESTRICT_PYTHON_ABIS="2.4 3.* *-jython"
 inherit distutils
 
 DESCRIPTION="PyQt4-based Mercurial log navigator"
-HOMEPAGE="http://www.logilab.org/project/hgview http://pypi.python.org/pypi/hgview"
+HOMEPAGE="http://www.logilab.org/project/hgview"
 SRC_URI="http://ftp.logilab.org/pub/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
@@ -33,8 +34,8 @@ src_prepare() {
 
 	# Fix mercurial extension install path.
 	if ! use doc; then
-		sed -e '/make -C doc/d' -i setup.py || die "sed failed"
-		sed -e '/share\/man\/man1/,+1 d' -i hgviewlib/__pkginfo__.py || die "sed failed"
+		sed -e '/make -C doc/d' -i setup.py || die
+		sed -e '/share\/man\/man1/,+1 d' -i hgviewlib/__pkginfo__.py || die
 	fi
 }
 
@@ -42,6 +43,6 @@ src_install() {
 	distutils_src_install
 
 	# Install the mercurial extension config.
-	insinto /etc/mercurial/hgrc.d || die "insinto failed"
-	doins "${FILESDIR}/hgview.rc" || die "doins failed"
+	insinto /etc/mercurial/hgrc.d
+	doins "${FILESDIR}"/hgview.rc
 }
diff --git a/dev-vcs/hgview/metadata.xml b/dev-vcs/hgview/metadata.xml
index 46f151f3da59..dc439f7e84f5 100644
--- a/dev-vcs/hgview/metadata.xml
+++ b/dev-vcs/hgview/metadata.xml
@@ -3,4 +3,3 @@
 <pkgmetadata>
 <herd>qt</herd>
 </pkgmetadata>
-
diff --git a/dev-vcs/subversion/files/subversion-1.7.6-kwallet.patch b/dev-vcs/subversion/files/subversion-1.7.6-kwallet.patch
new file mode 100644
index 000000000000..e568b88a3f46
--- /dev/null
+++ b/dev-vcs/subversion/files/subversion-1.7.6-kwallet.patch
@@ -0,0 +1,44 @@
+--- subversion/trunk/subversion/libsvn_auth_kwallet/kwallet.cpp	2012/03/21 18:22:15	1303489
++++ subversion/trunk/subversion/libsvn_auth_kwallet/kwallet.cpp	2012/06/03 18:54:26	1345740
+@@ -60,6 +60,9 @@
+ /* KWallet simple provider, puts passwords in KWallet                    */
+ /*-----------------------------------------------------------------------*/
+ 
++static int q_argc = 1;
++static char q_argv0[] = "svn"; // Build non-const char * from string constant
++static char *q_argv[] = { q_argv0 };
+ 
+ static const char *
+ get_application_name(apr_hash_t *parameters,
+@@ -212,12 +215,11 @@
+   QCoreApplication *app;
+   if (! qApp)
+     {
+-      int argc = 1;
+-      app = new QCoreApplication(argc, (char *[1]) {(char *) "svn"});
++      int argc = q_argc;
++      app = new QCoreApplication(argc, q_argv);
+     }
+ 
+-  KCmdLineArgs::init(1,
+-                     (char *[1]) {(char *) "svn"},
++  KCmdLineArgs::init(q_argc, q_argv,
+                      get_application_name(parameters, pool),
+                      "subversion",
+                      ki18n(get_application_name(parameters, pool)),
+@@ -289,12 +291,11 @@
+   QCoreApplication *app;
+   if (! qApp)
+     {
+-      int argc = 1;
+-      app = new QCoreApplication(argc, (char *[1]) {(char *) "svn"});
++      int argc = q_argc;
++      app = new QCoreApplication(argc, q_argv);
+     }
+ 
+-  KCmdLineArgs::init(1,
+-                     (char *[1]) {(char *) "svn"},
++  KCmdLineArgs::init(q_argc, q_argv,
+                      get_application_name(parameters, pool),
+                      "subversion",
+                      ki18n(get_application_name(parameters, pool)),
diff --git a/dev-vcs/subversion/subversion-1.7.6.ebuild b/dev-vcs/subversion/subversion-1.7.6.ebuild
index b4a05fbb2631..9a4423762b33 100644
--- a/dev-vcs/subversion/subversion-1.7.6.ebuild
+++ b/dev-vcs/subversion/subversion-1.7.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/subversion-1.7.6.ebuild,v 1.2 2012/08/21 20:53:41 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/subversion-1.7.6.ebuild,v 1.3 2012/08/22 20:33:10 tommy Exp $
 
 EAPI="3"
 SUPPORT_PYTHON_ABIS="1"
@@ -109,7 +109,8 @@ src_prepare() {
 		"${FILESDIR}"/${PN}-1.5.6-aix-dso.patch \
 		"${FILESDIR}"/${PN}-1.6.3-hpux-dso.patch \
 		"${FILESDIR}"/${PN}-fix-parallel-build-support-for-perl-bindings.patch \
-		"${FILESDIR}"/${P}-revert-mod_dontdothat-move.patch
+		"${FILESDIR}"/${P}-revert-mod_dontdothat-move.patch \
+		"${FILESDIR}"/${P}-kwallet.patch
 
 	fperms +x build/transform_libtool_scripts.sh
 
diff --git a/games-action/extreme-tuxracer/Manifest b/games-action/extreme-tuxracer/Manifest
index 94820231bd39..b981cba97600 100644
--- a/games-action/extreme-tuxracer/Manifest
+++ b/games-action/extreme-tuxracer/Manifest
@@ -1,2 +1,2 @@
-DIST extremetuxracer-0.4.tar.gz 28749072 RMD160 69a1433e7fef2e8b0eeb27c17002ef3d74dc0a44 SHA1 db5e55b5780dc2578d8c80d0ce48354b99bb53cf SHA256 5e4057f90e6854e774f251f189b0e676cfd7e2f15779c75544c9ac5b8e30273d
-DIST extremetuxracer-0.5beta.tar.gz 43524138 RMD160 6f3bf00f792a765063cb97f691df82369157fcca SHA1 8c86186fa633b77d70722e84ab5a441ff0550452 SHA256 ba7fa156361cc6015ad2a1563ec7f05cdbf701f75177795562b528ebb44ba911
+DIST extremetuxracer-0.4.tar.gz 28749072 SHA256 5e4057f90e6854e774f251f189b0e676cfd7e2f15779c75544c9ac5b8e30273d
+DIST extremetuxracer-0.5beta.tar.gz 43524138 SHA256 ba7fa156361cc6015ad2a1563ec7f05cdbf701f75177795562b528ebb44ba911
diff --git a/games-action/extreme-tuxracer/extreme-tuxracer-0.4.ebuild b/games-action/extreme-tuxracer/extreme-tuxracer-0.4.ebuild
index 326627906e00..13014b90b243 100644
--- a/games-action/extreme-tuxracer/extreme-tuxracer-0.4.ebuild
+++ b/games-action/extreme-tuxracer/extreme-tuxracer-0.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/extreme-tuxracer/extreme-tuxracer-0.4.ebuild,v 1.8 2012/05/03 03:02:34 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/extreme-tuxracer/extreme-tuxracer-0.4.ebuild,v 1.9 2012/08/22 18:55:03 mr_bones_ Exp $
 
 EAPI=2
 inherit eutils games
@@ -18,7 +18,7 @@ RDEPEND="virtual/opengl
 	dev-lang/tcl
 	virtual/glu
 	media-libs/libsdl[X]
-	media-libs/sdl-mixer[mikmod]
+	media-libs/sdl-mixer[mod]
 	>=media-libs/freetype-2
 	media-libs/libpng
 	x11-libs/libXmu
diff --git a/games-action/extreme-tuxracer/extreme-tuxracer-0.5_beta.ebuild b/games-action/extreme-tuxracer/extreme-tuxracer-0.5_beta.ebuild
index 6e62f1a8caed..84927a0b476f 100644
--- a/games-action/extreme-tuxracer/extreme-tuxracer-0.5_beta.ebuild
+++ b/games-action/extreme-tuxracer/extreme-tuxracer-0.5_beta.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/extreme-tuxracer/extreme-tuxracer-0.5_beta.ebuild,v 1.5 2012/05/03 03:02:34 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/extreme-tuxracer/extreme-tuxracer-0.5_beta.ebuild,v 1.6 2012/08/22 18:55:03 mr_bones_ Exp $
 
 EAPI=2
 inherit eutils games
@@ -18,7 +18,7 @@ RDEPEND="virtual/opengl
 	virtual/glu
 	dev-lang/tcl
 	media-libs/libsdl[X,audio,video]
-	media-libs/sdl-mixer[mikmod,vorbis]
+	media-libs/sdl-mixer[mod,vorbis]
 	media-libs/freetype:2
 	media-libs/libpng
 	x11-libs/libXmu
diff --git a/games-engines/gargoyle/gargoyle-2011.1.ebuild b/games-engines/gargoyle/gargoyle-2011.1.ebuild
index 374ca40591cd..e8dbb3eff56a 100644
--- a/games-engines/gargoyle/gargoyle-2011.1.ebuild
+++ b/games-engines/gargoyle/gargoyle-2011.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-engines/gargoyle/gargoyle-2011.1.ebuild,v 1.5 2012/08/22 16:29:24 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-engines/gargoyle/gargoyle-2011.1.ebuild,v 1.6 2012/08/22 18:05:11 ago Exp $
 
 # Regarding licenses: libgarglk is licensed under the GPLv2. Bundled
 # interpreters are licensed under GPLv2, BSD or MIT license, except:
@@ -18,7 +18,7 @@ SRC_URI="http://garglk.googlecode.com/files/${P}-sources.zip"
 
 LICENSE="BSD GPL-2 MIT Hugo Glulxe"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/gnome-extra/nautilus-dropbox/Manifest b/gnome-extra/nautilus-dropbox/Manifest
index 0e630aea0c76..b0ead462bca0 100644
--- a/gnome-extra/nautilus-dropbox/Manifest
+++ b/gnome-extra/nautilus-dropbox/Manifest
@@ -1,4 +1,4 @@
-DIST nautilus-dropbox-0.6.9.tar.bz2 351131 RMD160 116eedc009dd34a51a34909f4093537ebcb060d4 SHA1 bad6402183b2ed1190ecb8faec2eccaf9ae3e821 SHA256 f1c16c0a485884a5600121a168d4617dc4b47842b22524007f5e2b116b1701f6
-DIST nautilus-dropbox-0.7.0.tar.bz2 353719 RMD160 48dbf2ff6859e7a1aae7726aa48bf1752e671351 SHA1 1b6764b15cfca95a49771b3fd4ed64062b94085c SHA256 4fe171760c897c0ab4166cea70f8587623f72c616ef66ea7d81565b702322daa
-DIST nautilus-dropbox-0.7.1.tar.bz2 353942 RMD160 19e1ad4f628915254996c11639027b1c51aa034d SHA1 efeea06f5b80de82acf7f7dd9913f1520fbf74a6 SHA256 87effa9c89d27f36350628bdd42fad4a4e013af3f8e42e4761790ff4ecd09770
-DIST nautilus-dropbox-1.4.0.tar.bz2 353988 RMD160 0bdad36dfd4730fe3b96882acbcd7d553a64a221 SHA1 0b929a0afe8fb24b9f3cee37082572133d860cd6 SHA256 3412554d31a4a819a45edcb96bb1ab071a3e2d781817b90a14df8010137cb802
+DIST nautilus-dropbox-0.6.9.tar.bz2 351131 SHA256 f1c16c0a485884a5600121a168d4617dc4b47842b22524007f5e2b116b1701f6
+DIST nautilus-dropbox-0.7.0.tar.bz2 353719 SHA256 4fe171760c897c0ab4166cea70f8587623f72c616ef66ea7d81565b702322daa
+DIST nautilus-dropbox-0.7.1.tar.bz2 353942 SHA256 87effa9c89d27f36350628bdd42fad4a4e013af3f8e42e4761790ff4ecd09770
+DIST nautilus-dropbox-1.4.0.tar.bz2 353988 SHA256 3412554d31a4a819a45edcb96bb1ab071a3e2d781817b90a14df8010137cb802
diff --git a/gnome-extra/nautilus-dropbox/nautilus-dropbox-1.4.0.ebuild b/gnome-extra/nautilus-dropbox/nautilus-dropbox-1.4.0.ebuild
index 26c6ece4ddb8..0e31cae13299 100644
--- a/gnome-extra/nautilus-dropbox/nautilus-dropbox-1.4.0.ebuild
+++ b/gnome-extra/nautilus-dropbox/nautilus-dropbox-1.4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nautilus-dropbox/nautilus-dropbox-1.4.0.ebuild,v 1.2 2012/06/07 22:22:02 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nautilus-dropbox/nautilus-dropbox-1.4.0.ebuild,v 1.3 2012/08/23 03:16:47 ottxor Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
@@ -44,8 +44,8 @@ src_prepare() {
 	python_convert_shebangs 2 dropbox.in
 
 	# use sysem dropbox
-	sed -e "s|~/[.]dropbox-dist|/opt/dropbox|" \
-		-e 's|\(DROPBOXD_PATH = \).*|\1"/opt/dropbox/dropboxd"|' \
+	sed -e "s|~/[.]dropbox-dist|${EPREFIX}/opt/dropbox|" \
+		-e "s|\(DROPBOXD_PATH = \).*|\1\"${EPREFIX}/opt/dropbox/dropboxd\"|" \
 			-i dropbox.in || die
 	# us system rst2man
 	epatch "${FILESDIR}"/${PN}-0.7.0-system-rst2man.patch
diff --git a/kde-misc/print-manager/Manifest b/kde-misc/print-manager/Manifest
index 0e86e37479fd..639914db29ce 100644
--- a/kde-misc/print-manager/Manifest
+++ b/kde-misc/print-manager/Manifest
@@ -1,2 +1,3 @@
 DIST print-manager-0.1.0-cups16.patch.bz2 7067 SHA256 4eed86676a5afff10b567cb7852fe970bdf7314df2d2295f3be93098a0943ae5 SHA512 48d7ac752cf7832742d81459fa78568aa523faa447f9cfe7edf8e3327fd71700dad24139ff146173cdc612f6f6b831334d34303d6c34e3c1c9a710726b88038e WHIRLPOOL db51c9e5c69c2e566f115411e4902aec3932a12c0e499897f90e09be3c4b962bd22693b0ab1a71e385c61fe77450d80a4c2d2a8ce7a992c47f89dceb48fbf08a
 DIST print-manager-0.1.0.tar.bz2 96482 SHA256 6a8161692c05411cd700a73ef8bace592235475a5b636aeaff2825a0b69e1c8e SHA512 0c45d7041f4038e412dfe3e1ad726a01ae37963a23ea430e4f7278e55e8f317bb99286ff1d01f2cb84b7ecde7b781e498dad6a0b584cb82be4ceae44f78dbfb5 WHIRLPOOL c0de62cc90d3eed834b4974c2afe916eb336ae4c8f8ae1457c6e1607c10a3513ad4e4b4071543ac0d8fb78840e9767c3e873f12c6b61335e3d3604fb46ae4dd2
+DIST print-manager-0.2.0.tar.bz2 118988 SHA256 691afe46ce9c623a414289650e3f8cb8f806278a3eecb5fd5e43890b6a4b6ee5 SHA512 d16e270fc4502a1c0a32bff3034b4783e61191100519bb6d8a6994a089d92dee0268e7b06bae5cda129fc143c98245d0803a1f81b0e247874b045a3d645ae41e WHIRLPOOL c15359d461fe3bc4f81e9243456e96b917e73c77180f803b23da88e37a57f4ea30329d16e9cd54b59fe91f573a56db9801cc7f97e858f532df681b4ff5655cac
diff --git a/kde-misc/print-manager/print-manager-0.2.0.ebuild b/kde-misc/print-manager/print-manager-0.2.0.ebuild
new file mode 100644
index 000000000000..d666cc501a13
--- /dev/null
+++ b/kde-misc/print-manager/print-manager-0.2.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/print-manager/print-manager-0.2.0.ebuild,v 1.1 2012/08/22 22:07:07 dilfridge Exp $
+
+EAPI=4
+
+KDE_LINGUAS="cs da de et hu km nl pl pt pt_BR sk sv uk"
+inherit kde4-base
+
+DESCRIPTION="Manage print jobs and printers in KDE"
+HOMEPAGE="https://projects.kde.org/projects/playground/base/print-manager"
+[[ "${PV}" != "9999" ]] && SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+SLOT="4"
+IUSE="debug"
+
+RDEPEND="
+	>=net-print/cups-1.6.0[dbus]
+"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	mycmakeargs=( -DCUPS_1_6=ON )
+	kde4-base_src_configure
+}
diff --git a/licenses/Ravenbrook b/licenses/Ravenbrook
index 6e4fb8dc07dd..c16d620a79bf 100644
--- a/licenses/Ravenbrook
+++ b/licenses/Ravenbrook
@@ -1,6 +1,6 @@
 Copyright and License
 
-This document is copyright © 2001, 2002, 2004, 2006-2007, 2010 Ravenbrook Limited. All rights reserved. This is an open source license. Contact Ravenbrook for commercial licensing options.
+This document is copyright © 2001, 2002, 2004, 2006-2007, 2010 Ravenbrook Limited. All rights reserved. This is an open source license. Contact Ravenbrook for commercial licensing options.
 
 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
 
@@ -13,4 +13,4 @@ modules it contains. It does not include source code for modules or files that t
 This software is provided by the copyright holders and contributors "as is" and any express or implied warranties, including, but not limited to, the implied warranties of merchantability, fitness for a particular purpose, or 
 non-infringement, are disclaimed. In no event shall the copyright holders and contributors be liable for any direct, indirect, incidental, special, exemplary, or consequential damages (including, but not limited to, procurement 
 of substitute goods or services; loss of use, data, or profits; or business interruption) however caused and on any theory of liability, whether in contract, strict liability, or tort (including negligence or otherwise) arising 
-in any way out of the use of this software, even if advised of the possibility of such damage. 
+in any way out of the use of this software, even if advised of the possibility of such damage.
diff --git a/mail-filter/assp/Manifest b/mail-filter/assp/Manifest
index 86c06393c3b5..505fc69b82e1 100644
--- a/mail-filter/assp/Manifest
+++ b/mail-filter/assp/Manifest
@@ -1,7 +1,3 @@
 DIST ASSP_1.8.5.9-Install.zip 750552 SHA256 f468d8cd0003280ff089efd438c0516f928f772fd9cc0e6d522866a21492ccb1
-DIST ASSP_1.9.1.3-Install.zip 763977 SHA256 cd436cd72b6886e9e6c86e7dc5cdaf708d8ff0e40cf4c06f57827b27b683ce02
-DIST ASSP_1.9.2.0-Install.zip 839038 SHA256 65bdad2405011430fe373a8cefcb006d77f1c5d4842fbefd7b81aeb11cd4254e SHA512 a921465f6da976a39b797dafe86016d48759015698725bcbe4a1c280eac9b2bfacb87f25511bb7d42af9eedabac6a918841d5051d345d57aef989cae559c5eb0 WHIRLPOOL 875326790663e7053e3b57d40215a351e6352aee5b68f0820264ba5c5851c6fe9e037fc676e31f648d25322f6ed92b29769b798da18ea1f508f0b8e7a882081a
-DIST ASSP_1.9.3.5-Install.zip 862341 SHA256 28ba8f1d665db883a8364f269251453659617876bc6d889b8c58d7b233f44735 SHA512 2ca35e9c221ad5835f9769ac6ab62f86b503cfbfd9c5e22f6eee7d6c0fd236b1979d6c1fd6a87472d83add1aa78d470bfea923ff337935b2eadb5237f116def9 WHIRLPOOL e11b6896046908d325be365ad5c46386d68f52f1b67d3571a0b41237ebb78bd9843510f6d445ec82459862d22fd2e0289e7cb4876d68f8129115780aa05aa7a1
-DIST ASSP_1.9.3.6-Install.zip 862688 SHA256 ace76aa09a005e863a6b5313dce176501b5929c3103e09b2eafe0131092f9a70 SHA512 82d4633a2f82f31c0970512416e33a602b0ce243a4f86dcd643d22992d440c9e0570c351e468f847cda77e3235f7ab8860e605312c7c6197180ad5e90e9dc2d8 WHIRLPOOL d715dbda30b7add68d2c8d94032c9286dd2ae710e05d2c01936b0b8f1e86c6f22071be73c1347fc193efe271753f4946319cc4a004e21cdf284a45124e4f2a3d
-DIST ASSP_1.9.3.7-Install.zip 863327 SHA256 28ef08ce26f745ca2ae4d58e06b022a33f8f4cf18eaa2981ea95f5f577975f0d SHA512 38bf7464265c8fac22641a65e93f7c5ca0b121b5acc958bb0714b277d0bc7f71fe73c2317b5737c53f9e532c575b3df881ae995a08fac7719312df9969c95a73 WHIRLPOOL 2a2b35b359d55a3c167207df62371da51247878ed4cb7128ba75c1a4d74e781234c6c937879219c4f778fd596f3cfbd897f64d2713f1ac0e5c8a8c2641360409
 DIST ASSP_1.9.3.9-Install.zip 863847 SHA256 563eecfc6be4d4de323d57903cdf62814c657877efbfb6e3ab3dc99711e5182c SHA512 0f0e4db4e59fc944340c713e9184c467a6851f957603c5c3f32a279f9a3d26708fa0401fb7d7c97679e7dae88119d96289f78eaa285252e3091d63ece90371cf WHIRLPOOL a8b2e3e495c4f51ca2857d1103fc625c1b30bee33f05d2753f5816d370c46d25cf253889867c808b08d98b0ee52a9eb661c234d3cf26143ce541fa9c97185e6a
+DIST ASSP_1.9.4.0-Install.zip 866260 SHA256 965489c475794e25a7ecf03aae2027b80e9fe2e324638aead4cf219acbe7e160 SHA512 71fafff6b2e8d03b7b1d0915671373e033577dc643682c2134b305da7b8b4cafbe097744247b4d9a59620d547b639f70e8676126f103175c9ed8f2d1e628acfa WHIRLPOOL e862b3d5a6ead965ff1e9c50ebef9ae6252a220a312d3d5dbac463b9e8dcf041d49e8bf601528fbb89ff3f9cb4e5cefee4fca4f044abf8eea4f9a3f5ec56b566
diff --git a/mail-filter/assp/assp-1.9.1.3.ebuild b/mail-filter/assp/assp-1.9.1.3.ebuild
deleted file mode 100644
index f8eb51effcec..000000000000
--- a/mail-filter/assp/assp-1.9.1.3.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/assp/assp-1.9.1.3.ebuild,v 1.2 2012/06/04 23:37:01 zmedico Exp $
-
-inherit eutils user
-
-DESCRIPTION="Anti-Spam SMTP Proxy written in Perl."
-HOMEPAGE="http://assp.sourceforge.net/"
-MY_PN=ASSP_${PV}-Install
-SRC_URI="mirror://sourceforge/${PN}/${MY_PN}.zip"
-LICENSE="GPL-2"
-SLOT="0"
-
-# this is a pre-release, so no keywords for now
-KEYWORDS=""
-
-IUSE="ipv6 ldap sasl spf srs ssl syslog"
-
-DEPEND="app-arch/unzip"
-
-RDEPEND="dev-lang/perl
-	dev-perl/Net-DNS
-	dev-perl/File-ReadBackwards
-	virtual/perl-IO-Compress
-	dev-perl/Email-MIME
-	dev-perl/Email-Send
-	dev-perl/Email-Valid
-	dev-perl/libwww-perl
-	dev-perl/mime-construct
-	dev-perl/Net-CIDR-Lite
-	virtual/perl-Digest-MD5
-	virtual/perl-Time-HiRes
-	ipv6? ( dev-perl/IO-Socket-INET6 )
-	sasl? ( dev-perl/Authen-SASL )
-	spf? ( dev-perl/Mail-SPF )
-	srs? ( dev-perl/Mail-SRS )
-	ssl? ( dev-perl/IO-Socket-SSL )
-	syslog? ( perl-core/Sys-Syslog )
-	ldap? ( dev-perl/perl-ldap )"
-
-S=${WORKDIR}/${MY_PN}/ASSP
-
-pkg_setup() {
-	enewgroup assp
-	enewuser assp -1 -1 /dev/null assp
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	local FILES="
-		assp.pl
-		rebuildspamdb.pl
-		stat.pl
-	"
-	# just being safe
-	for file in ${FILES}; do
-		edos2unix ${file}
-	done
-
-	# portable changes via sed vs patch
-	sed -i -e 's|file:files/|file:/etc/assp/|' \
-		-e 's|$base/images|/usr/share/assp/images|' \
-		-e 's|logs/maillog.txt|/var/log/assp/maillog.txt|' \
-		-e 's|PID File'\'',40,textinput,'\''pid'\''|PID File'\'',40,textinput,'\''asspd.pid'\''|' \
-		-e 's|Daemon\*\*'\'',0,checkbox,0|Daemon\*\*'\'',0,checkbox,1|' \
-		-e 's|UID\*\*'\'',20,textinput,'\'''\''|UID\*\*'\'',20,textinput,'\''assp'\''|' \
-		-e 's|GID\*\*'\'',20,textinput,'\'''\''|GID\*\*'\'',20,textinput,'\''assp'\''|' \
-		-e 's|popFileEditor'\('\\'\''pb/pbdb\.\([^\.]*\)\.db\\'\'',|popFileEditor(\\'\''/var/lib/assp/pb/pbdb.\1.db\\'\'',|g' \
-		-e 's|$base/assp.cfg|/etc/assp/assp.cfg|g' \
-		-e 's|$base/$pidfile|/var/run/assp/asspd.pid|' \
-		-e 's|mkdir "$base/$logdir",0700 if $logdir;||' \
-		-e 's|mkdir "$base/$logdir",0700;||' \
-		-e 's|$base/$logfile|$logfile|' \
-		-e 's|$base/$logdir|$logdir|' \
-		-e 's|"maillog.log"|"/var/log/assp/maillog.log"|' \
-		-e 's|-d "$base/logs" or mkdir "$base/logs",0700;||' \
-		-e 's|-d "$base/notes" or mkdir "$base/notes",0700;||' \
-		-e 's|-d "$base/docs" or mkdir "$base/docs",0777;||' \
-		-e 's|$base/$archivelogfile|$archivelogfile|' \
-		-e 's|"$base/$file",$sub,"$this|"/etc/assp/$file",$sub,"$this|' \
-		-e 's|"$base/$file",'\'''\'',"$this|"/etc/assp/$file",'\'''\'',"$this|' \
-		-e 's|my $fil=$1; $fil="$base/$fil" if $fil!~/^\\Q$base\\E/i;|my $fil=$1;|' \
-		-e 's|$fil="$base/$fil" if $fil!~/^\\Q$base\\E/i;|$fil="/etc/assp/$fil" if $fil!~/^\\/etc\\/assp\\/\|\\/var\\/lib\\/assp\\/\/i;|' \
-		-e 's|$fil="$base/$fil" if $fil!~/^((\[a-z\]:)?\[\\/\\\\\]\|\\Q$base\\E)/;||' \
-		-e 's|if ($fil !~ /^\\Q$base\\E/i) {|if ($fil !~ /^\\/usr\\/share\\/assp\\//i) {|' \
-		-e 's|$fil = "$base/$fil";|$fil = "/usr/share/assp/$fil";|' \
-		-e 's|Q$base\\E|Q\\/etc\\/assp\\/\\E|' \
-		-e 's|$fil="$base/$fil"|$fil="/etc/assp/$fil"|' \
-		-e 's|$base/$bf|/etc/assp/$bf|g' \
-		-e 's|rebuildrun.txt|/var/lib/assp/rebuildrun.txt|' \
-		assp.pl || die
-
-	# sed rebuildspamdb.pl
-	sed -i -e 's|assp.cfg|/etc/assp/assp.cfg|' \
-		-e 's|} && "$Config{base}/$Config{logfile}" \|\| '\''maillog.txt'\'';|};|' \
-		-e 's|tmaxtick('\''rebuild'\'');|tmaxtick('\''/var/lib/assp/rebuild'\'');|' \
-		-e 's|goodhosts|/var/lib/assp/goodhosts|g' \
-		-e 's|rebuildrun.txt|/var/lib/assp/rebuildrun.txt|' \
-		-e 's|$base/$DropList|$DropList|' \
-		-e 's|&fixPath($base) . "/|"|' \
-		-e 's|= "/var/lib/assp/rebuildrun.txt";|= "/var/lib/assp/rebuildrun.txt";\n    $RebuildLog          = "/var/lib/assp/rebuild.log";|' \
-		-e 's|"$base//|"/|g' \
-		rebuildspamdb.pl || die
-
-	# remove windows stuff
-	rm "${S}/addservice.pl" || die "Could not remove ${S}/addservice.pl"
-	rm -f "${S}/Win32-quickstart-guide.txt" || die "Could not remove ${S}/Win32-quickstart-guide.txt"
-}
-
-src_install() {
-	# Configuration directory
-	dodir /etc/assp/notes
-
-	insinto /etc/assp
-	# Installs files that are used by assp for black/gray lists,
-	# and domain country lookup. To be changed by admin as needed.
-	doins files/*.txt || die
-
-	fowners assp:assp /etc/assp -R
-	fperms 770 /etc/assp /etc/assp/notes
-
-	# Setup directories for mail to be stored for filter
-	keepdir /var/lib/assp/spam /var/lib/assp/notspam
-	keepdir /var/lib/assp/errors/spam /var/lib/assp/errors/notspam
-
-	# Logs directory
-	keepdir /var/log/assp
-	fowners assp:assp -R /var/log/assp
-	fperms 770 /var/log/assp
-
-	# Install the app
-	exeinto /usr/share/assp
-	doexe *.pl *.sh || die
-	insinto /usr/share/assp
-	doins -r images/ || die
-
-	# Lock down the files/data
-	fowners assp:assp -R /usr/share/assp
-	fperms 770 /usr/share/assp
-
-	# Data storage
-	fowners assp:assp -R /var/lib/assp
-	fperms 770 /var/lib/assp
-
-	# PID directory
-	dodir /var/run/assp
-	keepdir /var/run/assp
-	fowners assp:assp -R /var/run/assp
-	fperms 770 /var/run/assp
-
-	# Install the init.d script to listen
-	newinitd "${FILESDIR}/asspd.init" asspd
-
-	dohtml docs/*.htm || die "Failed to install html docs"
-}
-
-pkg_postinst() {
-	elog
-	elog "To configure ASSP, start /etc/init.d/asspd then point"
-	elog "your browser to http://localhost:55555"
-	elog "Username: admin  Password: nospam4me (CHANGE ASAP!)"
-	elog
-	elog "File permissions have been set to use assp:assp"
-	elog "with mode 770 on directories.  When you configure"
-	elog "ASSP, make sure and use the user assp."
-	elog
-	elog "Don't change any path related options."
-	elog
-	elog "See the on-line docs for a complete tutorial."
-	elog "http://assp.sourceforge.net/docs.html"
-	elog
-	elog "If upgrading, please update your old config to set both"
-	elog "redre.txt and nodelay.txt path of /etc/assp.  There are"
-	elog "also many new options that you should review."
-	elog
-}
diff --git a/mail-filter/assp/assp-1.9.2.0.ebuild b/mail-filter/assp/assp-1.9.2.0.ebuild
deleted file mode 100644
index 345bfb94d29e..000000000000
--- a/mail-filter/assp/assp-1.9.2.0.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/assp/assp-1.9.2.0.ebuild,v 1.2 2012/06/04 23:37:01 zmedico Exp $
-
-inherit eutils user
-
-DESCRIPTION="Anti-Spam SMTP Proxy written in Perl."
-HOMEPAGE="http://assp.sourceforge.net/"
-MY_PN=ASSP_${PV}-Install
-SRC_URI="mirror://sourceforge/${PN}/${MY_PN}.zip"
-LICENSE="GPL-2"
-SLOT="0"
-
-# this is a pre-release, so no keywords for now
-KEYWORDS=""
-
-IUSE="ipv6 ldap sasl spf srs ssl syslog"
-
-DEPEND="app-arch/unzip"
-
-RDEPEND="dev-lang/perl
-	dev-perl/Net-DNS
-	dev-perl/File-ReadBackwards
-	virtual/perl-IO-Compress
-	dev-perl/Email-MIME
-	dev-perl/Email-Send
-	dev-perl/Email-Valid
-	dev-perl/libwww-perl
-	dev-perl/mime-construct
-	dev-perl/Net-CIDR-Lite
-	virtual/perl-Digest-MD5
-	virtual/perl-Time-HiRes
-	ipv6? ( dev-perl/IO-Socket-INET6 )
-	sasl? ( dev-perl/Authen-SASL )
-	spf? ( dev-perl/Mail-SPF )
-	srs? ( dev-perl/Mail-SRS )
-	ssl? ( dev-perl/IO-Socket-SSL )
-	syslog? ( perl-core/Sys-Syslog )
-	ldap? ( dev-perl/perl-ldap )"
-
-S=${WORKDIR}/${MY_PN}/ASSP
-
-pkg_setup() {
-	enewgroup assp
-	enewuser assp -1 -1 /dev/null assp
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	local FILES="
-		assp.pl
-		rebuildspamdb.pl
-		stat.pl
-	"
-	# just being safe
-	for file in ${FILES}; do
-		edos2unix ${file}
-	done
-
-	# portable changes via sed vs patch
-	sed -i -e 's|file:files/|file:/etc/assp/|' \
-		-e 's|$base/images|/usr/share/assp/images|' \
-		-e 's|logs/maillog.txt|/var/log/assp/maillog.txt|' \
-		-e 's|PID File'\'',40,textinput,'\''pid'\''|PID File'\'',40,textinput,'\''asspd.pid'\''|' \
-		-e 's|Daemon\*\*'\'',0,checkbox,0|Daemon\*\*'\'',0,checkbox,1|' \
-		-e 's|UID\*\*'\'',20,textinput,'\'''\''|UID\*\*'\'',20,textinput,'\''assp'\''|' \
-		-e 's|GID\*\*'\'',20,textinput,'\'''\''|GID\*\*'\'',20,textinput,'\''assp'\''|' \
-		-e 's|popFileEditor'\('\\'\''pb/pbdb\.\([^\.]*\)\.db\\'\'',|popFileEditor(\\'\''/var/lib/assp/pb/pbdb.\1.db\\'\'',|g' \
-		-e 's|$base/assp.cfg|/etc/assp/assp.cfg|g' \
-		-e 's|$base/$pidfile|/var/run/assp/asspd.pid|' \
-		-e 's|mkdir "$base/$logdir",0700 if $logdir;||' \
-		-e 's|mkdir "$base/$logdir",0700;||' \
-		-e 's|$base/$logfile|$logfile|' \
-		-e 's|$base/$logdir|$logdir|' \
-		-e 's|"maillog.log"|"/var/log/assp/maillog.log"|' \
-		-e 's|-d "$base/logs" or mkdir "$base/logs",0700;||' \
-		-e 's|-d "$base/notes" or mkdir "$base/notes",0700;||' \
-		-e 's|-d "$base/docs" or mkdir "$base/docs",0777;||' \
-		-e 's|$base/$archivelogfile|$archivelogfile|' \
-		-e 's|"$base/$file",$sub,"$this|"/etc/assp/$file",$sub,"$this|' \
-		-e 's|"$base/$file",'\'''\'',"$this|"/etc/assp/$file",'\'''\'',"$this|' \
-		-e 's|my $fil=$1; $fil="$base/$fil" if $fil!~/^\\Q$base\\E/i;|my $fil=$1;|' \
-		-e 's|$fil="$base/$fil" if $fil!~/^\\Q$base\\E/i;|$fil="/etc/assp/$fil" if $fil!~/^\\/etc\\/assp\\/\|\\/var\\/lib\\/assp\\/\/i;|' \
-		-e 's|$fil="$base/$fil" if $fil!~/^((\[a-z\]:)?\[\\/\\\\\]\|\\Q$base\\E)/;||' \
-		-e 's|if ($fil !~ /^\\Q$base\\E/i) {|if ($fil !~ /^\\/usr\\/share\\/assp\\//i) {|' \
-		-e 's|$fil = "$base/$fil";|$fil = "/usr/share/assp/$fil";|' \
-		-e 's|Q$base\\E|Q\\/etc\\/assp\\/\\E|' \
-		-e 's|$fil="$base/$fil"|$fil="/etc/assp/$fil"|' \
-		-e 's|$base/$bf|/etc/assp/$bf|g' \
-		-e 's|rebuildrun.txt|/var/lib/assp/rebuildrun.txt|' \
-		assp.pl || die
-
-	# sed rebuildspamdb.pl
-	sed -i -e 's|assp.cfg|/etc/assp/assp.cfg|' \
-		-e 's|} && "$Config{base}/$Config{logfile}" \|\| '\''maillog.txt'\'';|};|' \
-		-e 's|tmaxtick('\''rebuild'\'');|tmaxtick('\''/var/lib/assp/rebuild'\'');|' \
-		-e 's|goodhosts|/var/lib/assp/goodhosts|g' \
-		-e 's|rebuildrun.txt|/var/lib/assp/rebuildrun.txt|' \
-		-e 's|$base/$DropList|$DropList|' \
-		-e 's|&fixPath($base) . "/|"|' \
-		-e 's|= "/var/lib/assp/rebuildrun.txt";|= "/var/lib/assp/rebuildrun.txt";\n    $RebuildLog          = "/var/lib/assp/rebuild.log";|' \
-		-e 's|"$base//|"/|g' \
-		rebuildspamdb.pl || die
-
-	# remove windows stuff
-	rm "${S}/addservice.pl" || die "Could not remove ${S}/addservice.pl"
-	rm -f "${S}/Win32-quickstart-guide.txt" || die "Could not remove ${S}/Win32-quickstart-guide.txt"
-}
-
-src_install() {
-	# Configuration directory
-	dodir /etc/assp/notes
-
-	insinto /etc/assp
-	# Installs files that are used by assp for black/gray lists,
-	# and domain country lookup. To be changed by admin as needed.
-	doins files/*.txt || die
-
-	fowners assp:assp /etc/assp -R
-	fperms 770 /etc/assp /etc/assp/notes
-
-	# Setup directories for mail to be stored for filter
-	keepdir /var/lib/assp/spam /var/lib/assp/notspam
-	keepdir /var/lib/assp/errors/spam /var/lib/assp/errors/notspam
-
-	# Logs directory
-	keepdir /var/log/assp
-	fowners assp:assp -R /var/log/assp
-	fperms 770 /var/log/assp
-
-	# Install the app
-	exeinto /usr/share/assp
-	doexe *.pl *.sh || die
-	insinto /usr/share/assp
-	doins -r images/ || die
-
-	# Lock down the files/data
-	fowners assp:assp -R /usr/share/assp
-	fperms 770 /usr/share/assp
-
-	# Data storage
-	fowners assp:assp -R /var/lib/assp
-	fperms 770 /var/lib/assp
-
-	# PID directory
-	dodir /var/run/assp
-	keepdir /var/run/assp
-	fowners assp:assp -R /var/run/assp
-	fperms 770 /var/run/assp
-
-	# Install the init.d script to listen
-	newinitd "${FILESDIR}/asspd.init" asspd
-
-	dohtml docs/*.htm || die "Failed to install html docs"
-}
-
-pkg_postinst() {
-	elog
-	elog "To configure ASSP, start /etc/init.d/asspd then point"
-	elog "your browser to http://localhost:55555"
-	elog "Username: admin  Password: nospam4me (CHANGE ASAP!)"
-	elog
-	elog "File permissions have been set to use assp:assp"
-	elog "with mode 770 on directories.  When you configure"
-	elog "ASSP, make sure and use the user assp."
-	elog
-	elog "Don't change any path related options."
-	elog
-	elog "See the on-line docs for a complete tutorial."
-	elog "http://assp.sourceforge.net/docs.html"
-	elog
-	elog "If upgrading, please update your old config to set both"
-	elog "redre.txt and nodelay.txt path of /etc/assp.  There are"
-	elog "also many new options that you should review."
-	elog
-}
diff --git a/mail-filter/assp/assp-1.9.3.5.ebuild b/mail-filter/assp/assp-1.9.3.5.ebuild
deleted file mode 100644
index f00a3adf9fb4..000000000000
--- a/mail-filter/assp/assp-1.9.3.5.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/assp/assp-1.9.3.5.ebuild,v 1.3 2012/06/04 23:37:01 zmedico Exp $
-
-inherit eutils user
-
-DESCRIPTION="Anti-Spam SMTP Proxy written in Perl."
-HOMEPAGE="http://assp.sourceforge.net/"
-MY_PN=ASSP_${PV}-Install
-SRC_URI="mirror://sourceforge/${PN}/${MY_PN}.zip"
-LICENSE="GPL-2"
-SLOT="0"
-
-# this is a pre-release, so no keywords for now
-KEYWORDS="~amd64 ~x86"
-
-IUSE="ipv6 ldap sasl spf srs ssl syslog"
-
-DEPEND="app-arch/unzip"
-
-RDEPEND="dev-lang/perl
-	dev-perl/Net-DNS
-	dev-perl/File-ReadBackwards
-	virtual/perl-IO-Compress
-	dev-perl/Email-MIME
-	dev-perl/Email-Send
-	dev-perl/Email-Valid
-	dev-perl/libwww-perl
-	dev-perl/mime-construct
-	dev-perl/Net-CIDR-Lite
-	virtual/perl-Digest-MD5
-	virtual/perl-Time-HiRes
-	ipv6? ( dev-perl/IO-Socket-INET6 )
-	sasl? ( dev-perl/Authen-SASL )
-	spf? ( dev-perl/Mail-SPF )
-	srs? ( dev-perl/Mail-SRS )
-	ssl? ( dev-perl/IO-Socket-SSL )
-	syslog? ( perl-core/Sys-Syslog )
-	ldap? ( dev-perl/perl-ldap )"
-
-S=${WORKDIR}/${MY_PN}/ASSP
-
-pkg_setup() {
-	enewgroup assp
-	enewuser assp -1 -1 /dev/null assp
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	local FILES="
-		assp.pl
-		rebuildspamdb.pl
-		stat.pl
-	"
-	# just being safe
-	for file in ${FILES}; do
-		edos2unix ${file}
-	done
-
-	# portable changes via sed vs patch
-	sed -i -e 's|file:files/|file:/etc/assp/|' \
-		-e 's|$base/images|/usr/share/assp/images|' \
-		-e 's|logs/maillog.txt|/var/log/assp/maillog.txt|' \
-		-e 's|PID File'\'',40,textinput,'\''pid'\''|PID File'\'',40,textinput,'\''asspd.pid'\''|' \
-		-e 's|Daemon\*\*'\'',0,checkbox,0|Daemon\*\*'\'',0,checkbox,1|' \
-		-e 's|UID\*\*'\'',20,textinput,'\'''\''|UID\*\*'\'',20,textinput,'\''assp'\''|' \
-		-e 's|GID\*\*'\'',20,textinput,'\'''\''|GID\*\*'\'',20,textinput,'\''assp'\''|' \
-		-e 's|popFileEditor'\('\\'\''pb/pbdb\.\([^\.]*\)\.db\\'\'',|popFileEditor(\\'\''/var/lib/assp/pb/pbdb.\1.db\\'\'',|g' \
-		-e 's|$base/assp.cfg|/etc/assp/assp.cfg|g' \
-		-e 's|$base/$pidfile|/var/run/assp/asspd.pid|' \
-		-e 's|mkdir "$base/$logdir",0700 if $logdir;||' \
-		-e 's|mkdir "$base/$logdir",0700;||' \
-		-e 's|$base/$logfile|$logfile|' \
-		-e 's|$base/$logdir|$logdir|' \
-		-e 's|"maillog.log"|"/var/log/assp/maillog.log"|' \
-		-e 's|-d "$base/logs" or mkdir "$base/logs",0700;||' \
-		-e 's|-d "$base/notes" or mkdir "$base/notes",0700;||' \
-		-e 's|-d "$base/docs" or mkdir "$base/docs",0777;||' \
-		-e 's|$base/$archivelogfile|$archivelogfile|' \
-		-e 's|"$base/$file",$sub,"$this|"/etc/assp/$file",$sub,"$this|' \
-		-e 's|"$base/$file",'\'''\'',"$this|"/etc/assp/$file",'\'''\'',"$this|' \
-		-e 's|my $fil=$1; $fil="$base/$fil" if $fil!~/^\\Q$base\\E/i;|my $fil=$1;|' \
-		-e 's|$fil="$base/$fil" if $fil!~/^\\Q$base\\E/i;|$fil="/etc/assp/$fil" if $fil!~/^\\/etc\\/assp\\/\|\\/var\\/lib\\/assp\\/\/i;|' \
-		-e 's|$fil="$base/$fil" if $fil!~/^((\[a-z\]:)?\[\\/\\\\\]\|\\Q$base\\E)/;||' \
-		-e 's|if ($fil !~ /^\\Q$base\\E/i) {|if ($fil !~ /^\\/usr\\/share\\/assp\\//i) {|' \
-		-e 's|$fil = "$base/$fil";|$fil = "/usr/share/assp/$fil";|' \
-		-e 's|Q$base\\E|Q\\/etc\\/assp\\/\\E|' \
-		-e 's|$fil="$base/$fil"|$fil="/etc/assp/$fil"|' \
-		-e 's|$base/$bf|/etc/assp/$bf|g' \
-		-e 's|rebuildrun.txt|/var/lib/assp/rebuildrun.txt|' \
-		assp.pl || die
-
-	# sed rebuildspamdb.pl
-	sed -i -e 's|assp.cfg|/etc/assp/assp.cfg|' \
-		-e 's|} && "$Config{base}/$Config{logfile}" \|\| '\''maillog.txt'\'';|};|' \
-		-e 's|tmaxtick('\''rebuild'\'');|tmaxtick('\''/var/lib/assp/rebuild'\'');|' \
-		-e 's|goodhosts|/var/lib/assp/goodhosts|g' \
-		-e 's|rebuildrun.txt|/var/lib/assp/rebuildrun.txt|' \
-		-e 's|$base/$DropList|$DropList|' \
-		-e 's|&fixPath($base) . "/|"|' \
-		-e 's|= "/var/lib/assp/rebuildrun.txt";|= "/var/lib/assp/rebuildrun.txt";\n    $RebuildLog          = "/var/lib/assp/rebuild.log";|' \
-		-e 's|"$base//|"/|g' \
-		rebuildspamdb.pl || die
-
-	# remove windows stuff
-	rm "${S}/addservice.pl" || die "Could not remove ${S}/addservice.pl"
-	rm -f "${S}/Win32-quickstart-guide.txt" || die "Could not remove ${S}/Win32-quickstart-guide.txt"
-}
-
-src_install() {
-	# Configuration directory
-	dodir /etc/assp/notes
-
-	insinto /etc/assp
-	# Installs files that are used by assp for black/gray lists,
-	# and domain country lookup. To be changed by admin as needed.
-	doins files/*.txt || die
-
-	fowners assp:assp /etc/assp -R
-	fperms 770 /etc/assp /etc/assp/notes
-
-	# Setup directories for mail to be stored for filter
-	keepdir /var/lib/assp/spam /var/lib/assp/notspam
-	keepdir /var/lib/assp/errors/spam /var/lib/assp/errors/notspam
-
-	# Logs directory
-	keepdir /var/log/assp
-	fowners assp:assp -R /var/log/assp
-	fperms 770 /var/log/assp
-
-	# Install the app
-	exeinto /usr/share/assp
-	doexe *.pl *.sh || die
-	insinto /usr/share/assp
-	doins -r images/ || die
-
-	# Lock down the files/data
-	fowners assp:assp -R /usr/share/assp
-	fperms 770 /usr/share/assp
-
-	# Data storage
-	fowners assp:assp -R /var/lib/assp
-	fperms 770 /var/lib/assp
-
-	# PID directory
-	dodir /var/run/assp
-	keepdir /var/run/assp
-	fowners assp:assp -R /var/run/assp
-	fperms 770 /var/run/assp
-
-	# Install the init.d script to listen
-	newinitd "${FILESDIR}/asspd.init" asspd
-
-	dohtml docs/*.htm || die "Failed to install html docs"
-}
-
-pkg_postinst() {
-	elog
-	elog "To configure ASSP, start /etc/init.d/asspd then point"
-	elog "your browser to http://localhost:55555"
-	elog "Username: admin  Password: nospam4me (CHANGE ASAP!)"
-	elog
-	elog "File permissions have been set to use assp:assp"
-	elog "with mode 770 on directories.  When you configure"
-	elog "ASSP, make sure and use the user assp."
-	elog
-	elog "Don't change any path related options."
-	elog
-	elog "See the on-line docs for a complete tutorial."
-	elog "http://assp.sourceforge.net/docs.html"
-	elog
-	elog "If upgrading, please update your old config to set both"
-	elog "redre.txt and nodelay.txt path of /etc/assp.  There are"
-	elog "also many new options that you should review."
-	elog
-}
diff --git a/mail-filter/assp/assp-1.9.3.7.ebuild b/mail-filter/assp/assp-1.9.3.7.ebuild
deleted file mode 100644
index 47d1251f114d..000000000000
--- a/mail-filter/assp/assp-1.9.3.7.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/assp/assp-1.9.3.7.ebuild,v 1.1 2012/07/04 02:35:19 patrick Exp $
-
-inherit eutils user
-
-DESCRIPTION="Anti-Spam SMTP Proxy written in Perl."
-HOMEPAGE="http://assp.sourceforge.net/"
-MY_PN=ASSP_${PV}-Install
-SRC_URI="mirror://sourceforge/${PN}/${MY_PN}.zip"
-LICENSE="GPL-2"
-SLOT="0"
-
-# this is a pre-release, so no keywords for now
-KEYWORDS="~amd64 ~x86"
-
-IUSE="ipv6 ldap sasl spf srs ssl syslog"
-
-DEPEND="app-arch/unzip"
-
-RDEPEND="dev-lang/perl
-	dev-perl/Net-DNS
-	dev-perl/File-ReadBackwards
-	virtual/perl-IO-Compress
-	dev-perl/Email-MIME
-	dev-perl/Email-Send
-	dev-perl/Email-Valid
-	dev-perl/libwww-perl
-	dev-perl/mime-construct
-	dev-perl/Net-CIDR-Lite
-	virtual/perl-Digest-MD5
-	virtual/perl-Time-HiRes
-	ipv6? ( dev-perl/IO-Socket-INET6 )
-	sasl? ( dev-perl/Authen-SASL )
-	spf? ( dev-perl/Mail-SPF )
-	srs? ( dev-perl/Mail-SRS )
-	ssl? ( dev-perl/IO-Socket-SSL )
-	syslog? ( perl-core/Sys-Syslog )
-	ldap? ( dev-perl/perl-ldap )"
-
-S=${WORKDIR}/${MY_PN}/ASSP
-
-pkg_setup() {
-	enewgroup assp
-	enewuser assp -1 -1 /dev/null assp
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	local FILES="
-		assp.pl
-		rebuildspamdb.pl
-		stat.pl
-	"
-	# just being safe
-	for file in ${FILES}; do
-		edos2unix ${file}
-	done
-
-	# portable changes via sed vs patch
-	sed -i -e 's|file:files/|file:/etc/assp/|' \
-		-e 's|$base/images|/usr/share/assp/images|' \
-		-e 's|logs/maillog.txt|/var/log/assp/maillog.txt|' \
-		-e 's|PID File'\'',40,textinput,'\''pid'\''|PID File'\'',40,textinput,'\''asspd.pid'\''|' \
-		-e 's|Daemon\*\*'\'',0,checkbox,0|Daemon\*\*'\'',0,checkbox,1|' \
-		-e 's|UID\*\*'\'',20,textinput,'\'''\''|UID\*\*'\'',20,textinput,'\''assp'\''|' \
-		-e 's|GID\*\*'\'',20,textinput,'\'''\''|GID\*\*'\'',20,textinput,'\''assp'\''|' \
-		-e 's|popFileEditor'\('\\'\''pb/pbdb\.\([^\.]*\)\.db\\'\'',|popFileEditor(\\'\''/var/lib/assp/pb/pbdb.\1.db\\'\'',|g' \
-		-e 's|$base/assp.cfg|/etc/assp/assp.cfg|g' \
-		-e 's|$base/$pidfile|/var/run/assp/asspd.pid|' \
-		-e 's|mkdir "$base/$logdir",0700 if $logdir;||' \
-		-e 's|mkdir "$base/$logdir",0700;||' \
-		-e 's|$base/$logfile|$logfile|' \
-		-e 's|$base/$logdir|$logdir|' \
-		-e 's|"maillog.log"|"/var/log/assp/maillog.log"|' \
-		-e 's|-d "$base/logs" or mkdir "$base/logs",0700;||' \
-		-e 's|-d "$base/notes" or mkdir "$base/notes",0700;||' \
-		-e 's|-d "$base/docs" or mkdir "$base/docs",0777;||' \
-		-e 's|$base/$archivelogfile|$archivelogfile|' \
-		-e 's|"$base/$file",$sub,"$this|"/etc/assp/$file",$sub,"$this|' \
-		-e 's|"$base/$file",'\'''\'',"$this|"/etc/assp/$file",'\'''\'',"$this|' \
-		-e 's|my $fil=$1; $fil="$base/$fil" if $fil!~/^\\Q$base\\E/i;|my $fil=$1;|' \
-		-e 's|$fil="$base/$fil" if $fil!~/^\\Q$base\\E/i;|$fil="/etc/assp/$fil" if $fil!~/^\\/etc\\/assp\\/\|\\/var\\/lib\\/assp\\/\/i;|' \
-		-e 's|$fil="$base/$fil" if $fil!~/^((\[a-z\]:)?\[\\/\\\\\]\|\\Q$base\\E)/;||' \
-		-e 's|if ($fil !~ /^\\Q$base\\E/i) {|if ($fil !~ /^\\/usr\\/share\\/assp\\//i) {|' \
-		-e 's|$fil = "$base/$fil";|$fil = "/usr/share/assp/$fil";|' \
-		-e 's|Q$base\\E|Q\\/etc\\/assp\\/\\E|' \
-		-e 's|$fil="$base/$fil"|$fil="/etc/assp/$fil"|' \
-		-e 's|$base/$bf|/etc/assp/$bf|g' \
-		-e 's|rebuildrun.txt|/var/lib/assp/rebuildrun.txt|' \
-		assp.pl || die
-
-	# sed rebuildspamdb.pl
-	sed -i -e 's|assp.cfg|/etc/assp/assp.cfg|' \
-		-e 's|} && "$Config{base}/$Config{logfile}" \|\| '\''maillog.txt'\'';|};|' \
-		-e 's|tmaxtick('\''rebuild'\'');|tmaxtick('\''/var/lib/assp/rebuild'\'');|' \
-		-e 's|goodhosts|/var/lib/assp/goodhosts|g' \
-		-e 's|rebuildrun.txt|/var/lib/assp/rebuildrun.txt|' \
-		-e 's|$base/$DropList|$DropList|' \
-		-e 's|&fixPath($base) . "/|"|' \
-		-e 's|= "/var/lib/assp/rebuildrun.txt";|= "/var/lib/assp/rebuildrun.txt";\n    $RebuildLog          = "/var/lib/assp/rebuild.log";|' \
-		-e 's|"$base//|"/|g' \
-		rebuildspamdb.pl || die
-
-	# remove windows stuff
-	rm "${S}/addservice.pl" || die "Could not remove ${S}/addservice.pl"
-	rm -f "${S}/Win32-quickstart-guide.txt" || die "Could not remove ${S}/Win32-quickstart-guide.txt"
-}
-
-src_install() {
-	# Configuration directory
-	dodir /etc/assp/notes
-
-	insinto /etc/assp
-	# Installs files that are used by assp for black/gray lists,
-	# and domain country lookup. To be changed by admin as needed.
-	doins files/*.txt || die
-
-	fowners assp:assp /etc/assp -R
-	fperms 770 /etc/assp /etc/assp/notes
-
-	# Setup directories for mail to be stored for filter
-	keepdir /var/lib/assp/spam /var/lib/assp/notspam
-	keepdir /var/lib/assp/errors/spam /var/lib/assp/errors/notspam
-
-	# Logs directory
-	keepdir /var/log/assp
-	fowners assp:assp -R /var/log/assp
-	fperms 770 /var/log/assp
-
-	# Install the app
-	exeinto /usr/share/assp
-	doexe *.pl *.sh || die
-	insinto /usr/share/assp
-	doins -r images/ || die
-
-	# Lock down the files/data
-	fowners assp:assp -R /usr/share/assp
-	fperms 770 /usr/share/assp
-
-	# Data storage
-	fowners assp:assp -R /var/lib/assp
-	fperms 770 /var/lib/assp
-
-	# PID directory
-	dodir /var/run/assp
-	keepdir /var/run/assp
-	fowners assp:assp -R /var/run/assp
-	fperms 770 /var/run/assp
-
-	# Install the init.d script to listen
-	newinitd "${FILESDIR}/asspd.init" asspd
-
-	dohtml docs/*.htm || die "Failed to install html docs"
-}
-
-pkg_postinst() {
-	elog
-	elog "To configure ASSP, start /etc/init.d/asspd then point"
-	elog "your browser to http://localhost:55555"
-	elog "Username: admin  Password: nospam4me (CHANGE ASAP!)"
-	elog
-	elog "File permissions have been set to use assp:assp"
-	elog "with mode 770 on directories.  When you configure"
-	elog "ASSP, make sure and use the user assp."
-	elog
-	elog "Don't change any path related options."
-	elog
-	elog "See the on-line docs for a complete tutorial."
-	elog "http://assp.sourceforge.net/docs.html"
-	elog
-	elog "If upgrading, please update your old config to set both"
-	elog "redre.txt and nodelay.txt path of /etc/assp.  There are"
-	elog "also many new options that you should review."
-	elog
-}
diff --git a/mail-filter/assp/assp-1.9.3.6.ebuild b/mail-filter/assp/assp-1.9.4.0.ebuild
similarity index 98%
rename from mail-filter/assp/assp-1.9.3.6.ebuild
rename to mail-filter/assp/assp-1.9.4.0.ebuild
index e23c815f9a30..21c2934e2ee1 100644
--- a/mail-filter/assp/assp-1.9.3.6.ebuild
+++ b/mail-filter/assp/assp-1.9.4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/assp/assp-1.9.3.6.ebuild,v 1.1 2012/06/18 07:16:28 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/assp/assp-1.9.4.0.ebuild,v 1.1 2012/08/23 04:48:56 patrick Exp $
 
 inherit eutils user
 
diff --git a/mail-filter/imapfilter/imapfilter-2.5.2.ebuild b/mail-filter/imapfilter/imapfilter-2.5.2.ebuild
index cf81f2518e22..ea6f795680b8 100644
--- a/mail-filter/imapfilter/imapfilter-2.5.2.ebuild
+++ b/mail-filter/imapfilter/imapfilter-2.5.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/imapfilter/imapfilter-2.5.2.ebuild,v 1.4 2012/08/11 12:57:08 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/imapfilter/imapfilter-2.5.2.ebuild,v 1.5 2012/08/23 05:49:30 xmw Exp $
 
 EAPI=4
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://github/lefcha/imapfilter/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
 IUSE=""
 
 RDEPEND="dev-libs/openssl
diff --git a/media-libs/ladspa-cmt/ladspa-cmt-1.16.ebuild b/media-libs/ladspa-cmt/ladspa-cmt-1.16.ebuild
index ac8ba97e6a0b..e6168a35ee38 100644
--- a/media-libs/ladspa-cmt/ladspa-cmt-1.16.ebuild
+++ b/media-libs/ladspa-cmt/ladspa-cmt-1.16.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/ladspa-cmt/ladspa-cmt-1.16.ebuild,v 1.11 2012/08/11 13:14:04 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/ladspa-cmt/ladspa-cmt-1.16.ebuild,v 1.12 2012/08/23 05:52:52 xmw Exp $
 
 inherit eutils multilib toolchain-funcs
 
@@ -13,7 +13,7 @@ DESCRIPTION="CMT (computer music toolkit) Lasdpa library plugins"
 HOMEPAGE="http://www.ladspa.org/"
 SRC_URI="http://www.ladspa.org/download/${MY_P}.tgz"
 
-KEYWORDS="alpha amd64 hppa ~ppc ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 hppa ppc ppc64 ~sparc x86 ~x86-fbsd"
 LICENSE="LGPL-2.1"
 SLOT="0"
 
diff --git a/media-libs/vamp-plugin-sdk/vamp-plugin-sdk-2.3.ebuild b/media-libs/vamp-plugin-sdk/vamp-plugin-sdk-2.3.ebuild
index 4922c4e8c03c..3b6d21f487d5 100644
--- a/media-libs/vamp-plugin-sdk/vamp-plugin-sdk-2.3.ebuild
+++ b/media-libs/vamp-plugin-sdk/vamp-plugin-sdk-2.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/vamp-plugin-sdk/vamp-plugin-sdk-2.3.ebuild,v 1.8 2012/08/11 14:05:28 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/vamp-plugin-sdk/vamp-plugin-sdk-2.3.ebuild,v 1.9 2012/08/23 05:54:41 xmw Exp $
 
 inherit toolchain-funcs eutils multilib
 
@@ -10,7 +10,7 @@ SRC_URI="http://code.soundsoftware.ac.uk/attachments/download/224/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm hppa ~mips ~ppc ppc64 x86"
+KEYWORDS="amd64 ~arm hppa ~mips ppc ppc64 x86"
 IUSE="doc"
 
 RDEPEND="media-libs/libsndfile"
diff --git a/media-sound/amarok/Manifest b/media-sound/amarok/Manifest
index b587f278c734..267df85901bc 100644
--- a/media-sound/amarok/Manifest
+++ b/media-sound/amarok/Manifest
@@ -1,3 +1,2 @@
-DIST amarok-2.4.3.tar.bz2 17468203 SHA256 6ce448ecd30cc3d45211617636904e3662c2082441b79ca1e36685c8b0be8208 SHA512 68a06a92f354b6ecd9e888c57f0d3dccf29d1029f4d877a80853daf9846863ad9e5195cce2335a3fca46ebed49e8d767c09211a1661a331a53a59fbab518b6cb WHIRLPOOL 692610428f5a1db37bd430e38f9efd49f5b061c2e19d49d6545b016d4e54a69bb82721b2a200ade3bf35da1aa46e05e8d355d49879056a7125ea0f8c99b3d81a
 DIST amarok-2.5.0.tar.bz2 46607238 SHA256 1ed191db290fdede7c910c322cff2aba8ecfc1c4af891508d9ee410db3768849 SHA512 ac195f627ed0b1daba4b3a2896048d445caa85310b3373b373cabc76c36f424a60f2a3a439012363f3022c0ddb85a6770f2debd5b1a6e009e067bc5329d284c6 WHIRLPOOL e2256ae5dc941016afc9c3798b8f4ee4275dd23085b520067d6f24fa682ce465254d251c3494208a679441058771226668d5b500cb84851ccdd5b48584bb73bc
 DIST amarok-2.6.0.tar.bz2 42331208 SHA256 a91280e588181cf9363d7146f339ef527220fe0c8057f26f010f592b01fdd2c0 SHA512 da67876dfc41dcc3e1f3087698d36dabb43a339cef1669ca0518de191e2d9dd2e3e72122ffe76ecfd763e83547e46c55bba8606c095d35c85058df77bf35fb4a WHIRLPOOL 70fadaff2565fc2e9d8cb628942ec8107c6f4fcea0bd3e898f4ba6a72231ebaca8cb1d924f1413ced7c82940790438c9dcbe2fba7760e356b100eb832d8a2edc
diff --git a/media-sound/amarok/amarok-2.4.3-r1.ebuild b/media-sound/amarok/amarok-2.4.3-r1.ebuild
deleted file mode 100644
index ba7a7e1bb329..000000000000
--- a/media-sound/amarok/amarok-2.4.3-r1.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-2.4.3-r1.ebuild,v 1.7 2012/07/19 15:56:45 kensington Exp $
-
-EAPI=4
-
-KDE_LINGUAS="bg ca cs da de en_GB es et eu fi fr it ja km nb nds nl pa
-pl pt pt_BR ru sl sr sr@latin sv th tr uk wa zh_TW"
-KDE_SCM="git"
-KDE_REQUIRED="never"
-inherit flag-o-matic kde4-base
-
-DESCRIPTION="Advanced audio player based on KDE framework."
-HOMEPAGE="http://amarok.kde.org/"
-if [[ ${PV} != *9999* ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.bz2"
-	KEYWORDS="amd64 ppc x86"
-else
-	KEYWORDS=""
-fi
-
-LICENSE="GPL-2"
-SLOT="4"
-IUSE="cdda daap debug +embedded ipod lastfm mp3tunes mtp opengl semantic-desktop +utils"
-
-# Tests require gmock - http://code.google.com/p/gmock/
-# It's not in the tree yet
-RESTRICT="test"
-
-# ipod requires gdk enabled and also gtk compiled in libgpod
-COMMONDEPEND="
-	app-crypt/qca:2
-	>=app-misc/strigi-0.5.7
-	$(add_kdebase_dep kdelibs 'opengl?,semantic-desktop?')
-	$(add_kdebase_dep kdebase-kioslaves)
-	>=media-libs/taglib-1.6.1[asf,mp4]
-	>=media-libs/taglib-extras-1.0.1
-	sys-libs/zlib
-	>=virtual/mysql-5.1[embedded?]
-	x11-libs/qt-script:4
-	>=x11-libs/qtscriptgenerator-0.1.0
-	cdda? (
-		$(add_kdebase_dep libkcddb)
-		$(add_kdebase_dep libkcompactdisc)
-		$(add_kdebase_dep kdemultimedia-kioslaves)
-	)
-	ipod? ( >=media-libs/libgpod-0.7.0[gtk] )
-	lastfm? ( =media-libs/liblastfm-0.3* )
-	mp3tunes? (
-		dev-libs/glib:2
-		dev-libs/libxml2
-		dev-libs/openssl
-		net-libs/loudmouth
-		net-misc/curl
-		x11-libs/qt-core:4[glib]
-	)
-	mtp? ( >=media-libs/libmtp-1.0.0 )
-	opengl? ( virtual/opengl )
-"
-DEPEND="${COMMONDEPEND}
-	dev-util/automoc
-	virtual/pkgconfig
-"
-RDEPEND="${COMMONDEPEND}
-	$(add_kdebase_dep phonon-kde)
-	!media-sound/amarok-utils
-"
-
-src_configure() {
-	# Append minimal-toc cflag for ppc64, see bug 280552 and 292707
-	use ppc64 && append-flags -mminimal-toc
-	local mycmakeargs
-
-	mycmakeargs=(
-		-DWITH_PLAYER=ON
-		-DWITH_Libgcrypt=OFF
-		$(cmake-utils_use embedded WITH_MYSQL_EMBEDDED)
-		$(cmake-utils_use_with ipod)
-		$(cmake-utils_use_with ipod Gdk)
-		$(cmake-utils_use_with lastfm LibLastFm)
-		$(cmake-utils_use_with mtp)
-		$(cmake-utils_use_with mp3tunes MP3Tunes)
-	)
-
-	mycmakeargs+=(
-		$(cmake-utils_use_with utils UTILITIES)
-	)
-		# $(cmake-utils_use_with semantic-desktop Nepomuk)
-		# $(cmake-utils_use_with semantic-desktop Soprano)
-
-	kde4-base_src_configure
-}
-
-pkg_postinst() {
-	kde4-base_pkg_postinst
-
-	if use daap; then
-		echo
-		elog "You have installed amarok with daap support."
-		elog "You may be interested in installing www-servers/mongrel as well."
-		echo
-	fi
-
-	if ! use embedded; then
-		echo
-		elog "You've disabled the amarok support for embedded mysql DBs."
-		elog "You'll have to configure amarok to use an external db server."
-		echo
-		elog "Please read http://amarok.kde.org/wiki/MySQL_Server for details on how"
-		elog "to configure the external db and migrate your data from the embedded database."
-		echo
-
-		if has_version "virtual/mysql[minimal]"; then
-			elog "You built mysql with the minimal use flag, so it doesn't include the server."
-			elog "You won't be able to use the local mysql installation to store your amarok collection."
-			echo
-		fi
-	fi
-}
diff --git a/media-sound/amarok/amarok-2.5.0-r4.ebuild b/media-sound/amarok/amarok-2.5.0-r4.ebuild
index 6dfa365fb02b..f84cd5b89f00 100644
--- a/media-sound/amarok/amarok-2.5.0-r4.ebuild
+++ b/media-sound/amarok/amarok-2.5.0-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-2.5.0-r4.ebuild,v 1.4 2012/07/19 15:56:45 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-2.5.0-r4.ebuild,v 1.5 2012/08/22 22:59:15 xmw Exp $
 
 EAPI=4
 
@@ -16,7 +16,7 @@ DESCRIPTION="Advanced audio player based on KDE framework."
 HOMEPAGE="http://amarok.kde.org/"
 if [[ ${PV} != *9999* ]]; then
 	SRC_URI="mirror://kde/unstable/${PN}/${PV}/src/${P}.tar.bz2"
-	KEYWORDS="amd64 ~ppc ~ppc64 x86"
+	KEYWORDS="amd64 ppc ~ppc64 x86"
 else
 	KEYWORDS=""
 fi
diff --git a/media-sound/amarok/files/amarok-2.3.2-fix-qt-regression.patch b/media-sound/amarok/files/amarok-2.3.2-fix-qt-regression.patch
deleted file mode 100644
index 4e8faec3ad9a..000000000000
--- a/media-sound/amarok/files/amarok-2.3.2-fix-qt-regression.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-From 79d86829294ac54132c01153660e70e30c15c378 Mon Sep 17 00:00:00 2001
-From: Jeff Mitchell <mitchell@kde.org>
-Date: Wed, 22 Sep 2010 18:15:17 -0400
-Subject: [PATCH] Re-add some tests for unprintable but also invalid chars. Apparently Qt's XML classes don't properly check for invalid chars when writing XML, even if you tell them to.
-
-Also switch to QXmlStreamWriter, as apparently going forward it is the more supported class.
-
-BUG: 251762
----
- utilities/collectionscanner/CollectionScanner.cpp |   27 +++++++++++++-------
- 1 files changed, 17 insertions(+), 10 deletions(-)
-
-diff --git a/utilities/collectionscanner/CollectionScanner.cpp b/utilities/collectionscanner/CollectionScanner.cpp
-index 0a23a53..28c554b 100644
---- a/utilities/collectionscanner/CollectionScanner.cpp
-+++ b/utilities/collectionscanner/CollectionScanner.cpp
-@@ -37,13 +37,13 @@
- #include <QByteArray>
- #include <QDBusReply>
- #include <QDir>
--#include <QDomDocument>
- #include <QFile>
- #include <QtDebug>
- #include <QTextCodec>
- #include <QTextStream>
- #include <QTimer>
- #include <QThread>
-+#include <QXmlStreamWriter>
- 
- //Taglib:
- #include <apetag.h>
-@@ -814,8 +814,10 @@ CollectionScanner::readTags( const QString &path, TagLib::AudioProperties::ReadS
- void
- CollectionScanner::writeElement( const QString &name, const AttributeHash &attributes )
- {
--    QDomDocument doc; // A dummy. We don't really use DOM, but SAX2
--    QDomElement element = doc.createElement( name );
-+    QString text;
-+    QXmlStreamWriter writer( &text );
-+
-+    writer.writeStartElement( name );
- 
-     QHashIterator<QString, QString> it( attributes );
-     while( it.hasNext() )
-@@ -829,7 +831,15 @@ CollectionScanner::writeElement( const QString &name, const AttributeHash &attri
-         bool noCategory = false;
-         for( unsigned i = 0; i < len; i++ )
-         {
--            if( data[i].category() == QChar::NoCategory )
-+            if( data[i].category() == QChar::NoCategory ||
-+                data[i].category() == QChar::Other_Surrogate ||
-+                ( 
-+                    data[i].unicode() < 20 &&
-+                    data[i].unicode() != 9 &&
-+                    data[i].unicode() != 10 &&
-+                    data[i].unicode() != 13
-+                )
-+            )
-             {
-                 noCategory = true;
-                 break;
-@@ -838,15 +848,12 @@ CollectionScanner::writeElement( const QString &name, const AttributeHash &attri
- 
-         if( noCategory )
-             continue;
--
--        element.setAttribute( it.key(), it.value() );
-+        writer.writeAttribute( it.key(), it.value() );
-     }
- 
--    QString text;
--    QTextStream stream( &text, QIODevice::WriteOnly );
--    element.save( stream, 0 );
-+    writer.writeEndElement();
- 
--    std::cout << text.toUtf8().data() << std::endl;
-+    std::cout << text.toUtf8().data() << std::endl << std::endl;
- }
- 
- // taken verbatim from Qt's sources, since it's stupidly in the QtGui module
--- 
-1.7.0.4
-
diff --git a/media-sound/amarok/files/amarok-2.3.2-flac-fix.patch b/media-sound/amarok/files/amarok-2.3.2-flac-fix.patch
deleted file mode 100644
index 341582658c46..000000000000
--- a/media-sound/amarok/files/amarok-2.3.2-flac-fix.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-commit ce57e4264d0395b15e7253e3cdef48e36a8b129c
-Author: Jeff Mitchell <mitchell@kde.org>
-Date:   Fri Sep 17 13:02:38 2010 -0400
-
-    FLAC BPM tags could be read in incorrectly.
-    
-    BUG: 234166
-
-diff --git a/utilities/collectionscanner/CollectionScanner.cpp b/utilities/collectionscanner/CollectionScanner.cpp
-index a9d6755..0a23a53 100644
---- a/utilities/collectionscanner/CollectionScanner.cpp
-+++ b/utilities/collectionscanner/CollectionScanner.cpp
-@@ -701,7 +701,7 @@ CollectionScanner::readTags( const QString &path, TagLib::AudioProperties::ReadS
-                     attributes["composer"] = TStringToQString( file->xiphComment()->fieldListMap()["COMPOSER"].front() ).trimmed();
- 
-                 if ( !file->xiphComment()->fieldListMap()[ "BPM" ].isEmpty() )
--                    attributes["bpm"] = TStringToQString( file->xiphComment()->fieldListMap()["BPM"].front() ).trimmed().toFloat();
-+                    attributes["bpm"] = TStringToQString( file->xiphComment()->fieldListMap()["BPM"].front() ).trimmed();
- 
-                 if ( !file->xiphComment()->fieldListMap()[ "DISCNUMBER" ].isEmpty() )
-                     disc = TStringToQString( file->xiphComment()->fieldListMap()["DISCNUMBER"].front() ).trimmed();
\ No newline at end of file
diff --git a/media-sound/amarok/files/amarok-2.4.0.90-fix-plugin-detection.patch b/media-sound/amarok/files/amarok-2.4.0.90-fix-plugin-detection.patch
deleted file mode 100644
index d075ba048601..000000000000
--- a/media-sound/amarok/files/amarok-2.4.0.90-fix-plugin-detection.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit 37eda947bd8181a73ad0fffc88e66c25ddd69f28
-Author: Rick W. Chen <stuffcorpse@archlinux.us>
-Date:   Thu Mar 17 18:38:19 2011 +1300
-
-    Fix plugin loading and bump_plugin_version.rb script
-
-diff --git a/src/PluginManager.cpp b/src/PluginManager.cpp
-index ff52646..1e34510 100644
---- a/src/PluginManager.cpp
-+++ b/src/PluginManager.cpp
-@@ -32,7 +32,7 @@
- #include <QFile>
- #include <QMetaEnum>
- 
--const int Plugins::PluginManager::s_pluginFrameworkVersion = 60;
-+const int Plugins::PluginManager::s_pluginFrameworkVersion = 61;
- Plugins::PluginManager* Plugins::PluginManager::s_instance = 0;
- 
- Plugins::PluginManager*
diff --git a/media-sound/amarok/files/amarok-fix-upnp-dep.patch b/media-sound/amarok/files/amarok-fix-upnp-dep.patch
deleted file mode 100644
index 878c013fa972..000000000000
--- a/media-sound/amarok/files/amarok-fix-upnp-dep.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff -urN amarok-2.4.0.90.orig/CMakeLists.txt amarok-2.4.0.90/CMakeLists.txt
---- amarok-2.4.0.90.orig/CMakeLists.txt	2011-04-19 00:03:27.910000016 +0000
-+++ amarok-2.4.0.90/CMakeLists.txt	2011-04-19 00:06:17.466666683 +0000
-@@ -105,6 +105,10 @@
-     macro_optional_find_package(QJSON)
-     macro_log_feature( QJSON_FOUND "QJson" "Qt JSON Parser used for the Playdar Collection" "http://qjson.sourceforge.net/" FALSE "" "" )
- 
-+    # HUpnp is required for the upnp plugin
-+    macro_optional_find_package(HUpnp)
-+    macro_log_feature ( HUPNP_FOUND "HUpnp" "HUpnp is an universal Plug and Play Library" "http://herqq.org/" FALSE "" "" )
-+
-     # macro_optional_find_package(Strigi)
-     # macro_log_feature( STRIGI_FOUND "strigi" "Index metadata of files" "http://strigi.sourceforge.net" FALSE "" "" )
- 
-diff -urN amarok-2.4.0.90.orig/src/core-impl/collections/CMakeLists.txt amarok-2.4.0.90/src/core-impl/collections/CMakeLists.txt
---- amarok-2.4.0.90.orig/src/core-impl/collections/CMakeLists.txt	2011-04-19 00:03:27.940000015 +0000
-+++ amarok-2.4.0.90/src/core-impl/collections/CMakeLists.txt	2011-04-19 00:07:06.753333348 +0000
-@@ -25,4 +25,6 @@
- if( QJSON_FOUND )
-     add_subdirectory( playdarcollection )
- endif( QJSON_FOUND )
--add_subdirectory( upnpcollection )
-+if( HUPNP_FOUND )
-+    add_subdirectory( upnpcollection )
-+endif( HUPNP_FOUND )
-diff -urN amarok-2.4.0.90.orig/cmake/modules/FindHUpnp.cmake amarok-2.4.0.90/cmake/modules/FindHUpnp.cmake
---- amarok-2.4.0.90.orig/cmake/modules/FindHUpnp.cmake	2011-04-19 01:59:14.313333349 +0000
-+++ amarok-2.4.0.90/cmake/modules/FindHUpnp.cmake	2011-04-19 02:14:13.670000016 +0000
-@@ -6,7 +6,7 @@
- # HUPNP_LIBRARIES
- # HUPNP_FOUND
- 
--find_path(HUPNP_INCLUDE_DIR HUpnp HINTS ${KDE4_INCLUDE_DIR})
-+find_path(HUPNP_INCLUDE_DIR HUpnp HINTS ${KDE4_INCLUDE_DIR} /usr/include/HUpnpCore)
- 
- find_library(HUPNP_LIBRARIES HUpnp PATHS ${KDE4_LIB_DIR})
- 
diff --git a/media-sound/mp3blaster/mp3blaster-3.2.5-r1.ebuild b/media-sound/mp3blaster/mp3blaster-3.2.5-r1.ebuild
index 83eb27c8802d..f03e5a99a4c9 100644
--- a/media-sound/mp3blaster/mp3blaster-3.2.5-r1.ebuild
+++ b/media-sound/mp3blaster/mp3blaster-3.2.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3blaster/mp3blaster-3.2.5-r1.ebuild,v 1.8 2012/08/11 14:12:31 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3blaster/mp3blaster-3.2.5-r1.ebuild,v 1.9 2012/08/23 05:55:42 xmw Exp $
 
 EAPI=4
 inherit eutils
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~ppc ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm ppc ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="lirc oss sdl sid vorbis"
 
 RDEPEND=">=sys-libs/ncurses-5.7-r7
diff --git a/media-video/parole/Manifest b/media-video/parole/Manifest
index 95ad8b7ff98b..b387e775ddda 100644
--- a/media-video/parole/Manifest
+++ b/media-video/parole/Manifest
@@ -1,3 +1,4 @@
 DIST parole-0.2.0.6.tar.bz2 652946 SHA256 1bfcb6ca34eb496bc08ce3ac803a20b4fea566bddca4ce4400d3edf7b25804b6 SHA512 7cfa55f6044416df86628f44fe0696c1753d4bce04b42ad44963d3d6387c6a239f3055f7ae2bdb2e2b37ed737558ff2ba386cba32f9cbe0903ccfbee7e61e30e WHIRLPOOL 455fa0179c715499c63f895c42508c3296ef8e54435aa14d5ed281d3be3acaba28bc24340c3a2022908dba2d2e7026719427d4b374dc2ba17a7a8bc7a987ecfb
 DIST parole-0.2.90_pre20120720.tar.bz2 605272 SHA256 2498f8d2b9613923bbafedcb870f828d33796118e7f1776ec00135f365142927 SHA512 6315f9c05d2e10ec198c49d4e208cc5f0c49752daf9a4781201108cb48a906bce3bbe827c1423e4b373a0b4ef384b52d3c859b729f4cac7e906e982ceaff07c3 WHIRLPOOL 77c0ca901d7dc5b272c356f1ad98d75ca8b3e30495d7e2633a269df334d4b0cffbdf922245806cd973f4f38cfb0ddb88864977e93bbbb7c6a8a219f71e1ddd63
+DIST parole-0.3.0.3.tar.bz2 622735 SHA256 e02925a51321f6e413d608d36aa1a886d78938967664c178386c4c618e883661 SHA512 ea079a07f5ae713d0dcf0b0d00fb62383db05983650192891bf767fe5dda0d76f808ae763e795978da68e4981cc34bf772fc1aaf6c4f940f484de296a4b11438 WHIRLPOOL 5f940a00cfb3037b18e93b80a255d7f7d132b6e7d4bc2b52191296b5d78a762ca1c7f06cb5815ba896915daff2b80d4e30c7da5bb8294c6229b625cfc6db9674
 DIST parole-0.3.0.tar.bz2 620227 SHA256 4e96524bfbfaa8f81f3a6e655edb0ce58d62543531609ba10cffdf2dc894a840 SHA512 13cb9158b8dddc391a943bc09f99c45d3d5e0f665cc8963e3a013b145b0b06668ca05d1d0ad43ad4bfeca95f7de553038a00accaafe7077d9fbf768a60800118 WHIRLPOOL 9fad273888a92951a84ec343f20ac8c8b4bdb54b6f7c0aa3786a60fcd88771ff6362ed4720d8c01d3852a68d34d62d8cc277a9a0b10606b8005ac6386197a0e4
diff --git a/media-video/parole/parole-0.3.0.3.ebuild b/media-video/parole/parole-0.3.0.3.ebuild
new file mode 100644
index 000000000000..a81e9932315d
--- /dev/null
+++ b/media-video/parole/parole-0.3.0.3.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/parole/parole-0.3.0.3.ebuild,v 1.1 2012/08/23 03:12:12 ssuominen Exp $
+
+EAPI=4
+inherit xfconf
+
+DESCRIPTION="a simple media player based on the GStreamer framework for the Xfce4 desktop"
+HOMEPAGE="http://goodies.xfce.org/projects/applications/parole/"
+SRC_URI="mirror://xfce/src/apps/${PN}/0.3/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~x86"
+IUSE="debug libnotify taglib"
+
+COMMON_DEPEND=">=x11-libs/gtk+-2.20:2
+	>=dev-libs/glib-2.24:2
+	>=xfce-base/libxfce4util-4.8
+	>=xfce-base/libxfce4ui-4.8
+	>=dev-libs/dbus-glib-0.88
+	>=media-libs/gstreamer-0.10.11:0.10
+	>=media-libs/gst-plugins-base-0.10.11:0.10
+	libnotify? ( >=x11-libs/libnotify-0.4.5 )
+	taglib? ( >=media-libs/taglib-1.4 )"
+RDEPEND="${COMMON_DEPEND}
+	media-plugins/gst-plugins-meta:0.10"
+DEPEND="${COMMON_DEPEND}
+	dev-util/intltool
+	virtual/pkgconfig
+	x11-proto/xproto"
+
+pkg_setup() {
+	XFCONF=(
+		$(use_enable libnotify)
+		$(use_enable taglib)
+		$(xfconf_use_debug)
+		)
+
+	DOCS=( AUTHORS ChangeLog README THANKS TODO )
+}
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index efb99dd9d871..2febdfe25754 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Wed, 22 Aug 2012 18:07:30 +0000
+Thu, 23 Aug 2012 06:07:32 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 3ff9253f571a..cd1580c9e9bf 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Wed, 22 Aug 2012 18:07:31 +0000
+Thu, 23 Aug 2012 06:07:33 +0000
diff --git a/metadata/md5-cache/app-admin/haskell-updater-1.2.0.6 b/metadata/md5-cache/app-admin/haskell-updater-1.2.0.6
index fd241f1c6d28..88ca019467d7 100644
--- a/metadata/md5-cache/app-admin/haskell-updater-1.2.0.6
+++ b/metadata/md5-cache/app-admin/haskell-updater-1.2.0.6
@@ -3,10 +3,10 @@ DEPEND=>=dev-lang/ghc-6.12.1
 DESCRIPTION=Rebuild Haskell dependencies in Gentoo
 EAPI=4
 HOMEPAGE=http://haskell.org/haskellwiki/Gentoo#haskell-updater
-KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=|| ( >=sys-apps/portage-2.1.6 sys-apps/pkgcore sys-apps/paludis )
 SLOT=0
 SRC_URI=http://hackage.haskell.org/packages/archive/haskell-updater/1.2.0.6/haskell-updater-1.2.0.6.tar.gz
 _eclasses_=eutils	b8eb29e3c9c4e94c65da9ebec37902a9	ghc-package	f39fadb76cd4747582996e6b0d44479c	haskell-cabal	10f63c8efa3135a67f680571f1956a97	multilib	564d80d2026ae9f1910d8da4ea211e91	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=b849e01e78082a2ef5fa0072ecda4b68
+_md5_=51b70a0f610844335dd6bc5e9f1d1cd3
diff --git a/metadata/md5-cache/app-editors/elvis-2.2.0-r4 b/metadata/md5-cache/app-editors/elvis-2.2.0-r4
index 56accad8ce85..5972c8c2b515 100644
--- a/metadata/md5-cache/app-editors/elvis-2.2.0-r4
+++ b/metadata/md5-cache/app-editors/elvis-2.2.0-r4
@@ -4,10 +4,10 @@ DESCRIPTION=A vi/ex clone
 EAPI=3
 HOMEPAGE=ftp://ftp.cs.pdx.edu/pub/elvis/
 IUSE=X
-KEYWORDS=~alpha amd64 ~ppc ppc64 ~sparc x86 ~x86-interix ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris
+KEYWORDS=~alpha amd64 ppc ppc64 ~sparc x86 ~x86-interix ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris
 LICENSE=Artistic
 RDEPEND=>=sys-libs/ncurses-5.2 X? ( >=x11-proto/xproto-7.0.4 >=x11-libs/libX11-1.0.0 >=x11-libs/libXt-1.0.0 >=x11-libs/libXpm-3.5.4.2 >=x11-libs/libXft-2.1.8.2 ) app-admin/eselect-vi
 SLOT=0
 SRC_URI=ftp://ftp.cs.pdx.edu/pub/elvis/elvis-2.2_0.tar.gz
 _eclasses_=eutils	b8eb29e3c9c4e94c65da9ebec37902a9	multilib	564d80d2026ae9f1910d8da4ea211e91	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=a584cfc46600792353c9cf9305da167f
+_md5_=f22d54d470f2b46f23246028f221297e
diff --git a/metadata/md5-cache/app-emulation/virtualbox-4.1.12 b/metadata/md5-cache/app-emulation/virtualbox-4.1.12
index e2f4b104f13e..a94eda9c9d90 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-4.1.12
+++ b/metadata/md5-cache/app-emulation/virtualbox-4.1.12
@@ -12,4 +12,4 @@ REQUIRED_USE=java? ( sdk ) python? ( sdk ) vboxwebsrv? ( java )
 SLOT=0
 SRC_URI=http://download.virtualbox.org/virtualbox/4.1.12/VirtualBox-4.1.12.tar.bz2
 _eclasses_=base	d40e074a6349af3ea5e937210630bdc1	eutils	b8eb29e3c9c4e94c65da9ebec37902a9	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	2d9eb3508fa5d6759e39354b74545567	linux-info	0b7adf68a2edb4e5a32b07bb6e68121c	multilib	564d80d2026ae9f1910d8da4ea211e91	pax-utils	0ace932c4045349c7fc1af0fe7091acf	python	a0b470c1fca4658ffc97f0df0f25dcdc	qt4-r2	3f724d1082a722cce69ce795371b81a3	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=0a6693a17ec854e35f06be69e97fea81
+_md5_=49699ca450e914a6316d64bd69bf370a
diff --git a/metadata/md5-cache/app-emulation/virtualbox-4.1.18 b/metadata/md5-cache/app-emulation/virtualbox-4.1.18
index f069f1858190..9b5f2583ea3c 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-4.1.18
+++ b/metadata/md5-cache/app-emulation/virtualbox-4.1.18
@@ -12,4 +12,4 @@ REQUIRED_USE=java? ( sdk ) python? ( sdk ) vboxwebsrv? ( java )
 SLOT=0
 SRC_URI=http://download.virtualbox.org/virtualbox/4.1.18/VirtualBox-4.1.18.tar.bz2
 _eclasses_=base	d40e074a6349af3ea5e937210630bdc1	eutils	b8eb29e3c9c4e94c65da9ebec37902a9	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	2d9eb3508fa5d6759e39354b74545567	linux-info	0b7adf68a2edb4e5a32b07bb6e68121c	multilib	564d80d2026ae9f1910d8da4ea211e91	pax-utils	0ace932c4045349c7fc1af0fe7091acf	python	a0b470c1fca4658ffc97f0df0f25dcdc	qt4-r2	3f724d1082a722cce69ce795371b81a3	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=a2b0f39e69eba5c6f15db7b719e3c951
+_md5_=e30df6a8077ac7b1db25de3f1c6c7c2c
diff --git a/metadata/md5-cache/app-emulation/virtualbox-4.1.20-r1 b/metadata/md5-cache/app-emulation/virtualbox-4.1.20-r1
index 90cd32aea8c1..401a63394a5d 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-4.1.20-r1
+++ b/metadata/md5-cache/app-emulation/virtualbox-4.1.20-r1
@@ -12,4 +12,4 @@ REQUIRED_USE=java? ( sdk ) python? ( sdk ) vboxwebsrv? ( java )
 SLOT=0
 SRC_URI=http://download.virtualbox.org/virtualbox/4.1.20/VirtualBox-4.1.20.tar.bz2
 _eclasses_=base	d40e074a6349af3ea5e937210630bdc1	eutils	b8eb29e3c9c4e94c65da9ebec37902a9	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	2d9eb3508fa5d6759e39354b74545567	linux-info	0b7adf68a2edb4e5a32b07bb6e68121c	multilib	564d80d2026ae9f1910d8da4ea211e91	pax-utils	0ace932c4045349c7fc1af0fe7091acf	python	a0b470c1fca4658ffc97f0df0f25dcdc	qt4-r2	3f724d1082a722cce69ce795371b81a3	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=e6425cd4eee3897939277cc087ed303b
+_md5_=406d8275d6d7aa82c87cd8bb26e42223
diff --git a/metadata/md5-cache/app-misc/vifm-0.7.2 b/metadata/md5-cache/app-misc/vifm-0.7.2
index 591982c307db..3c665a651ebd 100644
--- a/metadata/md5-cache/app-misc/vifm-0.7.2
+++ b/metadata/md5-cache/app-misc/vifm-0.7.2
@@ -4,10 +4,10 @@ DESCRIPTION=Console file manager with vi(m)-like keybindings
 EAPI=4
 HOMEPAGE=http://vifm.sourceforge.net/
 IUSE=+compatibility +extended-keys +magic vim-plugin vim-syntax
-KEYWORDS=amd64 ~ppc ~s390 ~x86
+KEYWORDS=amd64 ppc ~s390 ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-libs/ncurses-5.7-r7 magic? ( sys-apps/file ) vim-plugin? ( >=app-editors/vim-7.3 ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/vifm/vifm-0.7.2.tar.bz2
 _eclasses_=base	d40e074a6349af3ea5e937210630bdc1	eutils	b8eb29e3c9c4e94c65da9ebec37902a9	multilib	564d80d2026ae9f1910d8da4ea211e91	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=d7735fd76a950f485e60c242a5f84e43
+_md5_=601c6c415895f5422e4cb71657773c8a
diff --git a/metadata/md5-cache/app-office/calcurse-3.0.0 b/metadata/md5-cache/app-office/calcurse-3.0.0
new file mode 100644
index 000000000000..5800fe54e211
--- /dev/null
+++ b/metadata/md5-cache/app-office/calcurse-3.0.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=-
+DEPEND=sys-libs/ncurses test? ( sys-libs/libfaketime )
+DESCRIPTION=a text-based personal organizer
+EAPI=4
+HOMEPAGE=http://calcurse.org
+IUSE=linguas_en linguas_fr linguas_de linguas_es linguas_nl linguas_ru linguas_de linguas_en linguas_es linguas_fr linguas_nl linguas_pt_BR linguas_ru
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=sys-libs/ncurses
+SLOT=0
+SRC_URI=http://calcurse.org/files/calcurse-3.0.0.tar.gz
+_eclasses_=eutils	b8eb29e3c9c4e94c65da9ebec37902a9	multilib	564d80d2026ae9f1910d8da4ea211e91	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=2ab62840cb2bfef19a92e8fca0d3c4e4
diff --git a/metadata/md5-cache/app-portage/gentoolkit-0.3.0.6-r3 b/metadata/md5-cache/app-portage/gentoolkit-0.3.0.6-r3
index 7fdd0bcf2daa..e6786d46faab 100644
--- a/metadata/md5-cache/app-portage/gentoolkit-0.3.0.6-r3
+++ b/metadata/md5-cache/app-portage/gentoolkit-0.3.0.6-r3
@@ -9,4 +9,4 @@ RDEPEND=sys-apps/portage >=dev-lang/python-2.6[xml] !>=dev-lang/python-2.6[-xml]
 SLOT=0
 SRC_URI=mirror://gentoo/gentoolkit-0.3.0.6.tar.gz
 _eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	b8eb29e3c9c4e94c65da9ebec37902a9	multilib	564d80d2026ae9f1910d8da4ea211e91	python	a0b470c1fca4658ffc97f0df0f25dcdc	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=8d242f22222e4394847b61f09f6067e9
+_md5_=d0863ed6d668b61d1cad066e53b3abce
diff --git a/metadata/md5-cache/app-portage/gentoolkit-9999 b/metadata/md5-cache/app-portage/gentoolkit-9999
index 32a7ff2baaaa..bc8437bfe376 100644
--- a/metadata/md5-cache/app-portage/gentoolkit-9999
+++ b/metadata/md5-cache/app-portage/gentoolkit-9999
@@ -8,4 +8,4 @@ LICENSE=GPL-2
 RDEPEND=sys-apps/portage >=dev-lang/python-2.6[xml] !>=dev-lang/python-2.6[-xml] !<=app-portage/gentoolkit-dev-0.2.7 dev-python/argparse || ( >=sys-apps/coreutils-8.15 app-misc/realpath sys-freebsd/freebsd-bin ) sys-apps/gawk sys-apps/grep !minimal? ( app-admin/eclean-kernel app-portage/diffmask app-portage/flaggie app-portage/install-mask app-portage/smart-live-rebuild ) dev-lang/python[xml] dev-lang/python
 SLOT=0
 _eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	git-2	15733ab6a6feb34af9837b41623c2bad	multilib	564d80d2026ae9f1910d8da4ea211e91	python	a0b470c1fca4658ffc97f0df0f25dcdc	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142
-_md5_=73d34202ab2d6ff47f7526b7782f23ab
+_md5_=0121c374d98ebd596e24373fe3b91ecf
diff --git a/metadata/md5-cache/app-shells/bash-4.2_p37 b/metadata/md5-cache/app-shells/bash-4.2_p37
index 593cd961b2d8..ebbf0c7e8c61 100644
--- a/metadata/md5-cache/app-shells/bash-4.2_p37
+++ b/metadata/md5-cache/app-shells/bash-4.2_p37
@@ -10,4 +10,4 @@ RDEPEND=>=sys-libs/ncurses-5.2-r2 readline? ( >=sys-libs/readline-6.2 ) nls? ( v
 SLOT=0
 SRC_URI=mirror://gnu/bash/bash-4.2.tar.gz ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-001 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-002 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-003 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-004 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-005 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-006 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-007 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-008 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-009 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-010 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-011 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-012 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-013 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-014 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-015 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-016 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-017 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-018 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-019 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-020 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-021 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-022 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-023 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-024 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-025 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-026 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-027 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-028 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-029 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-030 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-031 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-032 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-033 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-034 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-035 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-036 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-037 mirror://gnu/bash/bash-4.2-patches/bash42-001 mirror://gnu/bash/bash-4.2-patches/bash42-002 mirror://gnu/bash/bash-4.2-patches/bash42-003 mirror://gnu/bash/bash-4.2-patches/bash42-004 mirror://gnu/bash/bash-4.2-patches/bash42-005 mirror://gnu/bash/bash-4.2-patches/bash42-006 mirror://gnu/bash/bash-4.2-patches/bash42-007 mirror://gnu/bash/bash-4.2-patches/bash42-008 mirror://gnu/bash/bash-4.2-patches/bash42-009 mirror://gnu/bash/bash-4.2-patches/bash42-010 mirror://gnu/bash/bash-4.2-patches/bash42-011 mirror://gnu/bash/bash-4.2-patches/bash42-012 mirror://gnu/bash/bash-4.2-patches/bash42-013 mirror://gnu/bash/bash-4.2-patches/bash42-014 mirror://gnu/bash/bash-4.2-patches/bash42-015 mirror://gnu/bash/bash-4.2-patches/bash42-016 mirror://gnu/bash/bash-4.2-patches/bash42-017 mirror://gnu/bash/bash-4.2-patches/bash42-018 mirror://gnu/bash/bash-4.2-patches/bash42-019 mirror://gnu/bash/bash-4.2-patches/bash42-020 mirror://gnu/bash/bash-4.2-patches/bash42-021 mirror://gnu/bash/bash-4.2-patches/bash42-022 mirror://gnu/bash/bash-4.2-patches/bash42-023 mirror://gnu/bash/bash-4.2-patches/bash42-024 mirror://gnu/bash/bash-4.2-patches/bash42-025 mirror://gnu/bash/bash-4.2-patches/bash42-026 mirror://gnu/bash/bash-4.2-patches/bash42-027 mirror://gnu/bash/bash-4.2-patches/bash42-028 mirror://gnu/bash/bash-4.2-patches/bash42-029 mirror://gnu/bash/bash-4.2-patches/bash42-030 mirror://gnu/bash/bash-4.2-patches/bash42-031 mirror://gnu/bash/bash-4.2-patches/bash42-032 mirror://gnu/bash/bash-4.2-patches/bash42-033 mirror://gnu/bash/bash-4.2-patches/bash42-034 mirror://gnu/bash/bash-4.2-patches/bash42-035 mirror://gnu/bash/bash-4.2-patches/bash42-036 mirror://gnu/bash/bash-4.2-patches/bash42-037
 _eclasses_=eutils	b8eb29e3c9c4e94c65da9ebec37902a9	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	564d80d2026ae9f1910d8da4ea211e91	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=b26112a7cd6532fbe655df15059874b3
+_md5_=7d32f9493b336e133f8b7a8581641ad2
diff --git a/metadata/md5-cache/app-text/qpdf-3.0.1 b/metadata/md5-cache/app-text/qpdf-3.0.1
index ed5cd554cf1b..ce9df4d9c915 100644
--- a/metadata/md5-cache/app-text/qpdf-3.0.1
+++ b/metadata/md5-cache/app-text/qpdf-3.0.1
@@ -4,9 +4,9 @@ DESCRIPTION=A command-line program that does structural, content-preserving tran
 EAPI=4
 HOMEPAGE=http://qpdf.sourceforge.net/
 IUSE=doc examples static-libs test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~hppa ~x86
 LICENSE=Artistic-2
 RDEPEND=dev-libs/libpcre sys-libs/zlib >=dev-lang/perl-5.8
 SLOT=0
 SRC_URI=mirror://sourceforge/qpdf/qpdf-3.0.1.tar.gz
-_md5_=55c852908fd207b4ac26fdc6715b75a6
+_md5_=cb1336a6cf8453565d3aed1554a17707
diff --git a/metadata/md5-cache/dev-db/tokyocabinet-1.4.48 b/metadata/md5-cache/dev-db/tokyocabinet-1.4.48
new file mode 100644
index 000000000000..fa497c0fc862
--- /dev/null
+++ b/metadata/md5-cache/dev-db/tokyocabinet-1.4.48
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare test
+DEPEND=sys-libs/zlib app-arch/bzip2 || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DESCRIPTION=A library of routines for managing a database
+EAPI=2
+HOMEPAGE=http://fallabs.com/tokyocabinet/
+IUSE=debug doc examples
+KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris
+LICENSE=LGPL-2.1
+RDEPEND=sys-libs/zlib app-arch/bzip2
+SLOT=0
+SRC_URI=http://fallabs.com/tokyocabinet/tokyocabinet-1.4.48.tar.gz
+_eclasses_=autotools	d89996a2048bc6d1ae72bfa4c04517fe	eutils	b8eb29e3c9c4e94c65da9ebec37902a9	libtool	a83de71c2123161fc5a8323cb275f8e5	multilib	564d80d2026ae9f1910d8da4ea211e91	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=a840aa59def484feb77ef2184d9d0ed4
diff --git a/metadata/md5-cache/dev-lang/parrot-4.7.0 b/metadata/md5-cache/dev-lang/parrot-4.7.0
new file mode 100644
index 000000000000..6cfcfd0d191a
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/parrot-4.7.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl[doc?] sys-libs/readline opengl? ( media-libs/freeglut ) nls? ( sys-devel/gettext ) unicode? ( >=dev-libs/icu-2.6 ) gdbm? ( >=sys-libs/gdbm-1.8.3-r1 ) gmp? ( >=dev-libs/gmp-4.1.4 ) ssl? ( dev-libs/openssl ) pcre? ( dev-libs/libpcre )
+DESCRIPTION=Virtual machine designed to efficiently compile and execute bytecode for dynamic languages
+EAPI=3
+HOMEPAGE=http://www.parrot.org/
+IUSE=opengl nls doc examples gdbm gmp ssl +unicode pcre
+KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=Artistic-2
+RDEPEND=sys-libs/readline opengl? ( media-libs/freeglut ) nls? ( sys-devel/gettext ) unicode? ( >=dev-libs/icu-2.6 ) gdbm? ( >=sys-libs/gdbm-1.8.3-r1 ) gmp? ( >=dev-libs/gmp-4.1.4 ) ssl? ( dev-libs/openssl ) pcre? ( dev-libs/libpcre )
+SLOT=0
+SRC_URI=ftp://ftp.parrot.org/pub/parrot/releases/devel/4.7.0/parrot-4.7.0.tar.bz2
+_eclasses_=eutils	b8eb29e3c9c4e94c65da9ebec37902a9	multilib	564d80d2026ae9f1910d8da4ea211e91	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=da52d5c6e86ae7e553b0cc745557328d
diff --git a/metadata/md5-cache/dev-lisp/ecls-12.7.1 b/metadata/md5-cache/dev-lisp/ecls-12.7.1
index 2abc5448ab34..889360b04908 100644
--- a/metadata/md5-cache/dev-lisp/ecls-12.7.1
+++ b/metadata/md5-cache/dev-lisp/ecls-12.7.1
@@ -4,11 +4,11 @@ DESCRIPTION=ECL is an embeddable Common Lisp implementation.
 EAPI=4
 HOMEPAGE=http://ecls.sourceforge.net/
 IUSE=debug emacs gengc precisegc threads +unicode X
-KEYWORDS=~amd64 ~ppc ~sparc ~x86
+KEYWORDS=~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD LGPL-2
 PDEPEND=dev-lisp/gentoo-init
 RDEPEND=dev-libs/gmp virtual/libffi >=dev-libs/boehm-gc-7.1[threads?]
 SLOT=0
 SRC_URI=mirror://sourceforge/ecls/ecl-12.7.1.tar.gz
 _eclasses_=eutils	b8eb29e3c9c4e94c65da9ebec37902a9	multilib	564d80d2026ae9f1910d8da4ea211e91	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=9d2dc0e9768f72de8eda63ffc5fb3093
+_md5_=8e4c76ea2e8b4a2c0e64008abbb925c0
diff --git a/metadata/md5-cache/dev-ml/camlimages-4.0.1 b/metadata/md5-cache/dev-ml/camlimages-4.0.1
index 292da866ee1b..fc9812db48e6 100644
--- a/metadata/md5-cache/dev-ml/camlimages-4.0.1
+++ b/metadata/md5-cache/dev-ml/camlimages-4.0.1
@@ -4,11 +4,11 @@ DESCRIPTION=An image manipulation library for ocaml
 EAPI=4
 HOMEPAGE=http://gallium.inria.fr/camlimages/
 IUSE=doc gif gtk jpeg png postscript tiff truetype X xpm zlib
-KEYWORDS=~amd64 ~ppc x86
+KEYWORDS=~amd64 ppc x86
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-lang/ocaml-3.10.2[X?,ocamlopt] gif? ( media-libs/giflib ) gtk? ( dev-ml/lablgtk ) jpeg? ( virtual/jpeg ) tiff? ( media-libs/tiff ) png? ( >=media-libs/libpng-1.4:0 ) postscript? ( app-text/ghostscript-gpl ) truetype? ( >=media-libs/freetype-2 ) xpm? ( x11-libs/libXpm ) X? ( x11-apps/rgb ) zlib? ( sys-libs/zlib )
 REQUIRED_USE=png? ( zlib )
 SLOT=0
 SRC_URI=http://bitbucket.org/camlspotter/camlimages/get/v4.0.1.tar.bz2 -> camlimages-4.0.1.tar.bz2
 _eclasses_=eutils	b8eb29e3c9c4e94c65da9ebec37902a9	findlib	9cf6020ee5481f39f1aa566a323f9868	multilib	564d80d2026ae9f1910d8da4ea211e91	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142	user	d0a4d0735a6c0183d707ca919bd72f28	vcs-snapshot	07df4a337a309c0aa605525027917677
-_md5_=faee1334c62d8fd98a606356d1ff2b57
+_md5_=669248e0b30f9bc71066492619ab9ad5
diff --git a/metadata/md5-cache/dev-python/traits-4.1.0 b/metadata/md5-cache/dev-python/traits-4.1.0
index a0aab51e8faf..1a5d14f96167 100644
--- a/metadata/md5-cache/dev-python/traits-4.1.0
+++ b/metadata/md5-cache/dev-python/traits-4.1.0
@@ -4,10 +4,10 @@ DESCRIPTION=Enthought Tool Suite: Explicitly typed attributes for Python
 EAPI=4
 HOMEPAGE=http://code.enthought.com/projects/traits/ http://pypi.python.org/pypi/traits
 IUSE=doc examples test test test
-KEYWORDS=amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ppc ~ppc64 ~x86
 LICENSE=BSD
 RDEPEND=dev-python/numpy dev-lang/python
 SLOT=0
 SRC_URI=http://www.enthought.com/repo/ETS/traits-4.1.0.tar.gz
 _eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	multilib	564d80d2026ae9f1910d8da4ea211e91	python	a0b470c1fca4658ffc97f0df0f25dcdc	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142	virtualx	0c41ff55e46b959d9457dde69e7a09d9
-_md5_=4ca40a8056ff4ea62f7017878dca605f
+_md5_=add2e044e86d54932ee355db1da5eeb0
diff --git a/metadata/md5-cache/dev-util/insight-6.8.1 b/metadata/md5-cache/dev-util/insight-6.8.1
index 34ef712cc2b4..ff4a2afd682c 100644
--- a/metadata/md5-cache/dev-util/insight-6.8.1
+++ b/metadata/md5-cache/dev-util/insight-6.8.1
@@ -4,10 +4,10 @@ DESCRIPTION=A graphical interface to the GNU debugger
 EAPI=4
 HOMEPAGE=http://sourceware.org/insight/
 IUSE=nls
-KEYWORDS=amd64 ~ppc x86
+KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2 LGPL-2
 RDEPEND=dev-libs/expat dev-tcltk/iwidgets sys-libs/ncurses sys-libs/readline x11-libs/libX11
 SLOT=0
 SRC_URI=ftp://sources.redhat.com/pub/insight/releases/insight-6.8-1a.tar.bz2 http://dev.gentooexperimental.org/~scarabeus/insight-6.8.1-patchset-01.tar.xz
 _eclasses_=autotools	d89996a2048bc6d1ae72bfa4c04517fe	eutils	b8eb29e3c9c4e94c65da9ebec37902a9	libtool	a83de71c2123161fc5a8323cb275f8e5	multilib	564d80d2026ae9f1910d8da4ea211e91	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=57af4ff50823072aa6941544e57f57f0
+_md5_=070cdce9e9f6a50f7fa46adeb62c27dc
diff --git a/metadata/md5-cache/dev-util/omake-0.9.8.6.0_rc1 b/metadata/md5-cache/dev-util/omake-0.9.8.6.0_rc1
index d52c30eaaeee..f2a5c749ac5f 100644
--- a/metadata/md5-cache/dev-util/omake-0.9.8.6.0_rc1
+++ b/metadata/md5-cache/dev-util/omake-0.9.8.6.0_rc1
@@ -4,11 +4,11 @@ DESCRIPTION=Make replacement
 EAPI=2
 HOMEPAGE=http://omake.metaprl.org/
 IUSE=doc fam ncurses +ocamlopt readline
-KEYWORDS=~amd64 ~ppc x86
+KEYWORDS=~amd64 ppc x86
 LICENSE=GPL-2
 RDEPEND=>=dev-lang/ocaml-3.10.2[ocamlopt?] ncurses? ( >=sys-libs/ncurses-5.3 ) fam? ( virtual/fam ) readline? ( >=sys-libs/readline-4.3 )
 RESTRICT=installsources
 SLOT=0
 SRC_URI=http://omake.metaprl.org/downloads/omake-0.9.8.6-0.rc1.tar.gz
 _eclasses_=eutils	b8eb29e3c9c4e94c65da9ebec37902a9	multilib	564d80d2026ae9f1910d8da4ea211e91	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=945d3a56283409b4fe030b13b75b10f2
+_md5_=d4073bf9fa3f00ef8a4bee8d3fbadc4f
diff --git a/metadata/md5-cache/dev-util/weka-3.6.6-r1 b/metadata/md5-cache/dev-util/weka-3.6.6-r1
index 977aec682991..9a8879a825d1 100644
--- a/metadata/md5-cache/dev-util/weka-3.6.6-r1
+++ b/metadata/md5-cache/dev-util/weka-3.6.6-r1
@@ -4,10 +4,10 @@ DESCRIPTION=A Java data mining package
 EAPI=3
 HOMEPAGE=http://www.cs.waikato.ac.nz/ml/weka/
 IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ~ppc x86
+KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.5 >=dev-java/javacup-0.11a_beta20060608:0 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/weka/weka-3-6-6.zip
 _eclasses_=eutils	b8eb29e3c9c4e94c65da9ebec37902a9	java-ant-2	05b1e5a708f4dd372a85c9c6424fecbe	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	2d9eb3508fa5d6759e39354b74545567	multilib	564d80d2026ae9f1910d8da4ea211e91	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=c790aa1adabc5cf0e7bb64c92641f7cf
+_md5_=bcc10da5e9c6d3dcebd1fb3d3722f324
diff --git a/metadata/md5-cache/dev-vcs/git-1.7.12-r2 b/metadata/md5-cache/dev-vcs/git-1.7.12-r2
new file mode 100644
index 000000000000..4f39a7494294
--- /dev/null
+++ b/metadata/md5-cache/dev-vcs/git-1.7.12-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DEPEND=dev-libs/openssl sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl[-build] ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) app-arch/cpio doc? ( app-text/asciidoc app-text/docbook2X sys-apps/texinfo ) test? ( app-crypt/gnupg ) python? ( =dev-lang/python-2* )
+DESCRIPTION=GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team
+EAPI=4
+HOMEPAGE=http://www.git-scm.com/
+IUSE=+blksha1 +curl cgi doc emacs +gpg gtk +iconv +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=dev-libs/openssl sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl[-build] ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( virtual/perl-CGI app-text/highlight ) cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( gtk? ( >=dev-python/pygtk-2.8 dev-python/pygtksourceview:2 ) ) python? ( =dev-lang/python-2* )
+REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) subversion? ( perl ) webdav? ( curl )
+SLOT=0
+SRC_URI=http://git-core.googlecode.com/files/git-1.7.12.tar.gz mirror://kernel/software/scm/git/git-1.7.12.tar.gz http://git-core.googlecode.com/files/git-manpages-1.7.12.tar.gz mirror://kernel/software/scm/git/git-manpages-1.7.12.tar.gz doc? ( mirror://kernel/software/scm/git/git-htmldocs-1.7.12.tar.gz http://git-core.googlecode.com/files/git-htmldocs-1.7.12.tar.gz )
+_eclasses_=base	d40e074a6349af3ea5e937210630bdc1	bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	elisp-common	5785babccf9fc9be868981620c7940d3	eutils	b8eb29e3c9c4e94c65da9ebec37902a9	multilib	564d80d2026ae9f1910d8da4ea211e91	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	1c5ba5b92574108992a6758f863da534	python	a0b470c1fca4658ffc97f0df0f25dcdc	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=2d36774f54e4b511d2e426940048b512
diff --git a/metadata/md5-cache/dev-vcs/hgview-1.2.1 b/metadata/md5-cache/dev-vcs/hgview-1.6.2
similarity index 74%
rename from metadata/md5-cache/dev-vcs/hgview-1.2.1
rename to metadata/md5-cache/dev-vcs/hgview-1.6.2
index 17565795ea16..9e39cc330a57 100644
--- a/metadata/md5-cache/dev-vcs/hgview-1.2.1
+++ b/metadata/md5-cache/dev-vcs/hgview-1.6.2
@@ -1,13 +1,13 @@
-DEFINED_PHASES=compile install postinst postrm prepare
+DEFINED_PHASES=compile install postinst postrm prepare setup
 DEPEND=dev-python/docutils dev-python/egenix-mx-base dev-python/PyQt4[X] dev-python/qscintilla-python dev-vcs/mercurial doc? ( app-text/asciidoc ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
 DESCRIPTION=PyQt4-based Mercurial log navigator
-EAPI=3
-HOMEPAGE=http://www.logilab.org/project/hgview http://pypi.python.org/pypi/hgview
+EAPI=4
+HOMEPAGE=http://www.logilab.org/project/hgview
 IUSE=doc
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=dev-python/docutils dev-python/egenix-mx-base dev-python/PyQt4[X] dev-python/qscintilla-python dev-vcs/mercurial doc? ( app-text/asciidoc ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
 SLOT=0
-SRC_URI=http://ftp.logilab.org/pub/hgview/hgview-1.2.1.tar.gz
+SRC_URI=http://ftp.logilab.org/pub/hgview/hgview-1.6.2.tar.gz
 _eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	multilib	564d80d2026ae9f1910d8da4ea211e91	python	a0b470c1fca4658ffc97f0df0f25dcdc	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142
-_md5_=c0716c89f45b3edf4ab570cf2cc05acc
+_md5_=2d0e648f859c5d2a4e3bdb350be4bf21
diff --git a/metadata/md5-cache/dev-vcs/subversion-1.7.6 b/metadata/md5-cache/dev-vcs/subversion-1.7.6
index 482aa553d2a9..bd5aa4e937eb 100644
--- a/metadata/md5-cache/dev-vcs/subversion-1.7.6
+++ b/metadata/md5-cache/dev-vcs/subversion-1.7.6
@@ -10,4 +10,4 @@ RDEPEND=>=dev-db/sqlite-3.4 >=dev-libs/apr-1.3:1 >=dev-libs/apr-util-1.3:1 dev-l
 SLOT=0
 SRC_URI=http://www.apache.org/dist/subversion/subversion-1.7.6.tar.bz2
 _eclasses_=autotools	d89996a2048bc6d1ae72bfa4c04517fe	base	d40e074a6349af3ea5e937210630bdc1	bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	db-use	2f5d6a2718559b90a51648d8ff58be83	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	elisp-common	5785babccf9fc9be868981620c7940d3	eutils	b8eb29e3c9c4e94c65da9ebec37902a9	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	2d9eb3508fa5d6759e39354b74545567	libtool	a83de71c2123161fc5a8323cb275f8e5	multilib	564d80d2026ae9f1910d8da4ea211e91	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	1c5ba5b92574108992a6758f863da534	python	a0b470c1fca4658ffc97f0df0f25dcdc	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=2f605675cb09b96cb2279b14bb669f67
+_md5_=246615742e2f7329f285780969f87fe2
diff --git a/metadata/md5-cache/games-action/extreme-tuxracer-0.4 b/metadata/md5-cache/games-action/extreme-tuxracer-0.4
index d3f51e005b5c..078633078ea2 100644
--- a/metadata/md5-cache/games-action/extreme-tuxracer-0.4
+++ b/metadata/md5-cache/games-action/extreme-tuxracer-0.4
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=virtual/opengl dev-lang/tcl virtual/glu media-libs/libsdl[X] media-libs/sdl-mixer[mikmod] >=media-libs/freetype-2 media-libs/libpng x11-libs/libXmu x11-libs/libXi virtual/pkgconfig
+DEPEND=virtual/opengl dev-lang/tcl virtual/glu media-libs/libsdl[X] media-libs/sdl-mixer[mod] >=media-libs/freetype-2 media-libs/libpng x11-libs/libXmu x11-libs/libXi virtual/pkgconfig
 DESCRIPTION=High speed arctic racing game based on Tux Racer
 EAPI=2
 HOMEPAGE=http://www.extremetuxracer.com/
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
-RDEPEND=virtual/opengl dev-lang/tcl virtual/glu media-libs/libsdl[X] media-libs/sdl-mixer[mikmod] >=media-libs/freetype-2 media-libs/libpng x11-libs/libXmu x11-libs/libXi
+RDEPEND=virtual/opengl dev-lang/tcl virtual/glu media-libs/libsdl[X] media-libs/sdl-mixer[mod] >=media-libs/freetype-2 media-libs/libpng x11-libs/libXmu x11-libs/libXi
 SLOT=0
 SRC_URI=mirror://sourceforge/extremetuxracer/extremetuxracer-0.4.tar.gz
 _eclasses_=base	d40e074a6349af3ea5e937210630bdc1	eutils	b8eb29e3c9c4e94c65da9ebec37902a9	games	024161bb840ff1c7b424696877dbb18b	multilib	564d80d2026ae9f1910d8da4ea211e91	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=a8bb88016f5a3174e4f837a094158a6a
+_md5_=15345012fad1a98f3428ebc3e8fa3800
diff --git a/metadata/md5-cache/games-action/extreme-tuxracer-0.5_beta b/metadata/md5-cache/games-action/extreme-tuxracer-0.5_beta
index 909fad5a318e..983e5882a593 100644
--- a/metadata/md5-cache/games-action/extreme-tuxracer-0.5_beta
+++ b/metadata/md5-cache/games-action/extreme-tuxracer-0.5_beta
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=virtual/opengl virtual/glu dev-lang/tcl media-libs/libsdl[X,audio,video] media-libs/sdl-mixer[mikmod,vorbis] media-libs/freetype:2 media-libs/libpng x11-libs/libXmu x11-libs/libXi virtual/libintl nls? ( sys-devel/gettext ) virtual/pkgconfig
+DEPEND=virtual/opengl virtual/glu dev-lang/tcl media-libs/libsdl[X,audio,video] media-libs/sdl-mixer[mod,vorbis] media-libs/freetype:2 media-libs/libpng x11-libs/libXmu x11-libs/libXi virtual/libintl nls? ( sys-devel/gettext ) virtual/pkgconfig
 DESCRIPTION=High speed arctic racing game based on Tux Racer
 EAPI=2
 HOMEPAGE=http://www.extremetuxracer.com/
 IUSE=nls
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
-RDEPEND=virtual/opengl virtual/glu dev-lang/tcl media-libs/libsdl[X,audio,video] media-libs/sdl-mixer[mikmod,vorbis] media-libs/freetype:2 media-libs/libpng x11-libs/libXmu x11-libs/libXi virtual/libintl
+RDEPEND=virtual/opengl virtual/glu dev-lang/tcl media-libs/libsdl[X,audio,video] media-libs/sdl-mixer[mod,vorbis] media-libs/freetype:2 media-libs/libpng x11-libs/libXmu x11-libs/libXi virtual/libintl
 SLOT=0
 SRC_URI=mirror://sourceforge/extremetuxracer/extremetuxracer-0.5beta.tar.gz
 _eclasses_=base	d40e074a6349af3ea5e937210630bdc1	eutils	b8eb29e3c9c4e94c65da9ebec37902a9	games	024161bb840ff1c7b424696877dbb18b	multilib	564d80d2026ae9f1910d8da4ea211e91	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=111bafac5e93c258db322cafab7d12ed
+_md5_=ea3bb825774e2acb2d99e0d63ca0ad7c
diff --git a/metadata/md5-cache/games-engines/gargoyle-2011.1 b/metadata/md5-cache/games-engines/gargoyle-2011.1
index 45f3f4223d51..bcdd3693233c 100644
--- a/metadata/md5-cache/games-engines/gargoyle-2011.1
+++ b/metadata/md5-cache/games-engines/gargoyle-2011.1
@@ -3,10 +3,10 @@ DEPEND=>=media-fonts/libertine-ttf-5 media-fonts/liberation-fonts media-libs/fre
 DESCRIPTION=An Interactive Fiction (IF) player supporting all major formats
 EAPI=4
 HOMEPAGE=http://ccxvii.net/gargoyle/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=BSD GPL-2 MIT Hugo Glulxe
 RDEPEND=>=media-fonts/libertine-ttf-5 media-fonts/liberation-fonts media-libs/freetype:2 media-libs/libpng:0 media-libs/sdl-mixer media-libs/sdl-sound[modplug,mp3,vorbis] sys-libs/zlib virtual/jpeg x11-libs/gtk+:2
 SLOT=0
 SRC_URI=http://garglk.googlecode.com/files/gargoyle-2011.1-sources.zip
 _eclasses_=base	d40e074a6349af3ea5e937210630bdc1	eutils	b8eb29e3c9c4e94c65da9ebec37902a9	games	024161bb840ff1c7b424696877dbb18b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	multilib	564d80d2026ae9f1910d8da4ea211e91	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=890ecb365c6814f6a657f2d6682b9902
+_md5_=b8c3b7ba21f6e2c46ffdff375147f0f8
diff --git a/metadata/md5-cache/gnome-extra/nautilus-dropbox-1.4.0 b/metadata/md5-cache/gnome-extra/nautilus-dropbox-1.4.0
index 63c2fd1a060c..3fab3dff4abf 100644
--- a/metadata/md5-cache/gnome-extra/nautilus-dropbox-1.4.0
+++ b/metadata/md5-cache/gnome-extra/nautilus-dropbox-1.4.0
@@ -10,4 +10,4 @@ RDEPEND=gnome-base/nautilus dev-libs/glib:2 dev-python/pygtk:2 net-misc/dropbox
 SLOT=0
 SRC_URI=http://www.dropbox.com/download?dl=packages/nautilus-dropbox-1.4.0.tar.bz2
 _eclasses_=autotools	d89996a2048bc6d1ae72bfa4c04517fe	eutils	b8eb29e3c9c4e94c65da9ebec37902a9	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	a83de71c2123161fc5a8323cb275f8e5	linux-info	0b7adf68a2edb4e5a32b07bb6e68121c	multilib	564d80d2026ae9f1910d8da4ea211e91	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	a0b470c1fca4658ffc97f0df0f25dcdc	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=f22561e41b34f178bb924b7e18a59203
+_md5_=b5a854caf847535222ff85077a1f31a3
diff --git a/metadata/md5-cache/kde-misc/print-manager-0.2.0 b/metadata/md5-cache/kde-misc/print-manager-0.2.0
new file mode 100644
index 000000000000..e709447d515f
--- /dev/null
+++ b/metadata/md5-cache/kde-misc/print-manager-0.2.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
+DEPEND=>=net-print/cups-1.6.0[dbus] >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
+DESCRIPTION=Manage print jobs and printers in KDE
+EAPI=4
+HOMEPAGE=https://projects.kde.org/projects/playground/base/print-manager
+IUSE=debug linguas_cs linguas_da linguas_de linguas_et linguas_hu linguas_km linguas_nl linguas_pl linguas_pt linguas_pt_BR linguas_sk linguas_sv linguas_uk aqua
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=net-print/cups-1.6.0[dbus] >=kde-base/oxygen-icons-4.4:4[aqua=] linguas_cs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cs(+)] ) linguas_da? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_et? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_et(+)] ) linguas_hu? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hu(+)] ) linguas_km? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_km(+)] ) linguas_nl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nl(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt_BR(+)] ) linguas_sk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sk(+)] ) linguas_sv? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sv(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_uk(+)] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
+SLOT=4
+SRC_URI=mirror://kde/stable/print-manager/0.2.0/src/print-manager-0.2.0.tar.bz2
+_eclasses_=base	d40e074a6349af3ea5e937210630bdc1	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	b8eb29e3c9c4e94c65da9ebec37902a9	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	6e4e3fc3a36f43b71c84ad615e804a83	kde4-functions	df82ee2da839042995eb204cf576da49	multilib	564d80d2026ae9f1910d8da4ea211e91	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_md5_=546a4f31e2eb9ddc3bdfb118b7b2c135
diff --git a/metadata/md5-cache/mail-filter/assp-1.9.1.3 b/metadata/md5-cache/mail-filter/assp-1.9.1.3
deleted file mode 100644
index 191d1d06773d..000000000000
--- a/metadata/md5-cache/mail-filter/assp-1.9.1.3
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst setup unpack
-DEPEND=app-arch/unzip
-DESCRIPTION=Anti-Spam SMTP Proxy written in Perl.
-HOMEPAGE=http://assp.sourceforge.net/
-IUSE=ipv6 ldap sasl spf srs ssl syslog
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl dev-perl/Net-DNS dev-perl/File-ReadBackwards virtual/perl-IO-Compress dev-perl/Email-MIME dev-perl/Email-Send dev-perl/Email-Valid dev-perl/libwww-perl dev-perl/mime-construct dev-perl/Net-CIDR-Lite virtual/perl-Digest-MD5 virtual/perl-Time-HiRes ipv6? ( dev-perl/IO-Socket-INET6 ) sasl? ( dev-perl/Authen-SASL ) spf? ( dev-perl/Mail-SPF ) srs? ( dev-perl/Mail-SRS ) ssl? ( dev-perl/IO-Socket-SSL ) syslog? ( perl-core/Sys-Syslog ) ldap? ( dev-perl/perl-ldap )
-SLOT=0
-SRC_URI=mirror://sourceforge/assp/ASSP_1.9.1.3-Install.zip
-_eclasses_=eutils	b8eb29e3c9c4e94c65da9ebec37902a9	multilib	564d80d2026ae9f1910d8da4ea211e91	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=aba0d941753fc3bb34648a0a0b03d6c3
diff --git a/metadata/md5-cache/mail-filter/assp-1.9.2.0 b/metadata/md5-cache/mail-filter/assp-1.9.2.0
deleted file mode 100644
index 743be80f3d50..000000000000
--- a/metadata/md5-cache/mail-filter/assp-1.9.2.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst setup unpack
-DEPEND=app-arch/unzip
-DESCRIPTION=Anti-Spam SMTP Proxy written in Perl.
-HOMEPAGE=http://assp.sourceforge.net/
-IUSE=ipv6 ldap sasl spf srs ssl syslog
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl dev-perl/Net-DNS dev-perl/File-ReadBackwards virtual/perl-IO-Compress dev-perl/Email-MIME dev-perl/Email-Send dev-perl/Email-Valid dev-perl/libwww-perl dev-perl/mime-construct dev-perl/Net-CIDR-Lite virtual/perl-Digest-MD5 virtual/perl-Time-HiRes ipv6? ( dev-perl/IO-Socket-INET6 ) sasl? ( dev-perl/Authen-SASL ) spf? ( dev-perl/Mail-SPF ) srs? ( dev-perl/Mail-SRS ) ssl? ( dev-perl/IO-Socket-SSL ) syslog? ( perl-core/Sys-Syslog ) ldap? ( dev-perl/perl-ldap )
-SLOT=0
-SRC_URI=mirror://sourceforge/assp/ASSP_1.9.2.0-Install.zip
-_eclasses_=eutils	b8eb29e3c9c4e94c65da9ebec37902a9	multilib	564d80d2026ae9f1910d8da4ea211e91	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=01506faf3b0642b941e253f1d90cb2fa
diff --git a/metadata/md5-cache/mail-filter/assp-1.9.3.5 b/metadata/md5-cache/mail-filter/assp-1.9.3.5
deleted file mode 100644
index 474f170bc1e6..000000000000
--- a/metadata/md5-cache/mail-filter/assp-1.9.3.5
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst setup unpack
-DEPEND=app-arch/unzip
-DESCRIPTION=Anti-Spam SMTP Proxy written in Perl.
-HOMEPAGE=http://assp.sourceforge.net/
-IUSE=ipv6 ldap sasl spf srs ssl syslog
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl dev-perl/Net-DNS dev-perl/File-ReadBackwards virtual/perl-IO-Compress dev-perl/Email-MIME dev-perl/Email-Send dev-perl/Email-Valid dev-perl/libwww-perl dev-perl/mime-construct dev-perl/Net-CIDR-Lite virtual/perl-Digest-MD5 virtual/perl-Time-HiRes ipv6? ( dev-perl/IO-Socket-INET6 ) sasl? ( dev-perl/Authen-SASL ) spf? ( dev-perl/Mail-SPF ) srs? ( dev-perl/Mail-SRS ) ssl? ( dev-perl/IO-Socket-SSL ) syslog? ( perl-core/Sys-Syslog ) ldap? ( dev-perl/perl-ldap )
-SLOT=0
-SRC_URI=mirror://sourceforge/assp/ASSP_1.9.3.5-Install.zip
-_eclasses_=eutils	b8eb29e3c9c4e94c65da9ebec37902a9	multilib	564d80d2026ae9f1910d8da4ea211e91	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=7fe7b2aea78dc3196c3ac2cf703828b0
diff --git a/metadata/md5-cache/mail-filter/assp-1.9.3.7 b/metadata/md5-cache/mail-filter/assp-1.9.3.7
deleted file mode 100644
index 7614e65e7852..000000000000
--- a/metadata/md5-cache/mail-filter/assp-1.9.3.7
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst setup unpack
-DEPEND=app-arch/unzip
-DESCRIPTION=Anti-Spam SMTP Proxy written in Perl.
-HOMEPAGE=http://assp.sourceforge.net/
-IUSE=ipv6 ldap sasl spf srs ssl syslog
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl dev-perl/Net-DNS dev-perl/File-ReadBackwards virtual/perl-IO-Compress dev-perl/Email-MIME dev-perl/Email-Send dev-perl/Email-Valid dev-perl/libwww-perl dev-perl/mime-construct dev-perl/Net-CIDR-Lite virtual/perl-Digest-MD5 virtual/perl-Time-HiRes ipv6? ( dev-perl/IO-Socket-INET6 ) sasl? ( dev-perl/Authen-SASL ) spf? ( dev-perl/Mail-SPF ) srs? ( dev-perl/Mail-SRS ) ssl? ( dev-perl/IO-Socket-SSL ) syslog? ( perl-core/Sys-Syslog ) ldap? ( dev-perl/perl-ldap )
-SLOT=0
-SRC_URI=mirror://sourceforge/assp/ASSP_1.9.3.7-Install.zip
-_eclasses_=eutils	b8eb29e3c9c4e94c65da9ebec37902a9	multilib	564d80d2026ae9f1910d8da4ea211e91	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=98066b131472657d41d7e3d1cba2615b
diff --git a/metadata/md5-cache/mail-filter/assp-1.9.3.6 b/metadata/md5-cache/mail-filter/assp-1.9.4.0
similarity index 90%
rename from metadata/md5-cache/mail-filter/assp-1.9.3.6
rename to metadata/md5-cache/mail-filter/assp-1.9.4.0
index 62d60ed8e39d..0c98d1f4b20b 100644
--- a/metadata/md5-cache/mail-filter/assp-1.9.3.6
+++ b/metadata/md5-cache/mail-filter/assp-1.9.4.0
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=dev-lang/perl dev-perl/Net-DNS dev-perl/File-ReadBackwards virtual/perl-IO-Compress dev-perl/Email-MIME dev-perl/Email-Send dev-perl/Email-Valid dev-perl/libwww-perl dev-perl/mime-construct dev-perl/Net-CIDR-Lite virtual/perl-Digest-MD5 virtual/perl-Time-HiRes ipv6? ( dev-perl/IO-Socket-INET6 ) sasl? ( dev-perl/Authen-SASL ) spf? ( dev-perl/Mail-SPF ) srs? ( dev-perl/Mail-SRS ) ssl? ( dev-perl/IO-Socket-SSL ) syslog? ( perl-core/Sys-Syslog ) ldap? ( dev-perl/perl-ldap )
 SLOT=0
-SRC_URI=mirror://sourceforge/assp/ASSP_1.9.3.6-Install.zip
+SRC_URI=mirror://sourceforge/assp/ASSP_1.9.4.0-Install.zip
 _eclasses_=eutils	b8eb29e3c9c4e94c65da9ebec37902a9	multilib	564d80d2026ae9f1910d8da4ea211e91	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=aa7576dd2f8a34d77d401acb67d6d4d9
+_md5_=b61c63424719853ca1a288bfdb9ccf84
diff --git a/metadata/md5-cache/mail-filter/imapfilter-2.5.2 b/metadata/md5-cache/mail-filter/imapfilter-2.5.2
index 6c6d914ebda7..f583aa84474e 100644
--- a/metadata/md5-cache/mail-filter/imapfilter-2.5.2
+++ b/metadata/md5-cache/mail-filter/imapfilter-2.5.2
@@ -3,10 +3,10 @@ DEPEND=dev-libs/openssl dev-libs/libpcre >=dev-lang/lua-5.1
 DESCRIPTION=An IMAP mail filtering utility
 EAPI=4
 HOMEPAGE=http://imapfilter.hellug.gr
-KEYWORDS=amd64 ~ppc x86
+KEYWORDS=amd64 ppc x86
 LICENSE=MIT
 RDEPEND=dev-libs/openssl dev-libs/libpcre >=dev-lang/lua-5.1
 SLOT=0
 SRC_URI=mirror://github/lefcha/imapfilter/imapfilter-2.5.2.tar.gz
 _eclasses_=multilib	564d80d2026ae9f1910d8da4ea211e91	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142
-_md5_=0e9c8bb2d1a081a6893aca4be8597028
+_md5_=c6cdafd7a62c07b2658cab16b6c6cb71
diff --git a/metadata/md5-cache/media-libs/ladspa-cmt-1.16 b/metadata/md5-cache/media-libs/ladspa-cmt-1.16
index e85d0cf6456e..d6cca8d1b636 100644
--- a/metadata/md5-cache/media-libs/ladspa-cmt-1.16
+++ b/metadata/md5-cache/media-libs/ladspa-cmt-1.16
@@ -2,10 +2,10 @@ DEFINED_PHASES=compile install unpack
 DEPEND=media-libs/ladspa-sdk >=sys-apps/sed-4
 DESCRIPTION=CMT (computer music toolkit) Lasdpa library plugins
 HOMEPAGE=http://www.ladspa.org/
-KEYWORDS=alpha amd64 hppa ~ppc ppc64 ~sparc x86 ~x86-fbsd
+KEYWORDS=alpha amd64 hppa ppc ppc64 ~sparc x86 ~x86-fbsd
 LICENSE=LGPL-2.1
 RDEPEND=media-libs/ladspa-sdk >=sys-apps/sed-4
 SLOT=0
 SRC_URI=http://www.ladspa.org/download/cmt_src_1.16.tgz
 _eclasses_=eutils	b8eb29e3c9c4e94c65da9ebec37902a9	multilib	564d80d2026ae9f1910d8da4ea211e91	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=6a84cd236c5ae9ee11b9439dde9c501d
+_md5_=bd60945f3afcb3ee38af1d950a72e840
diff --git a/metadata/md5-cache/media-libs/vamp-plugin-sdk-2.3 b/metadata/md5-cache/media-libs/vamp-plugin-sdk-2.3
index 869b45701f88..8a7073f0ef37 100644
--- a/metadata/md5-cache/media-libs/vamp-plugin-sdk-2.3
+++ b/metadata/md5-cache/media-libs/vamp-plugin-sdk-2.3
@@ -3,10 +3,10 @@ DEPEND=media-libs/libsndfile doc? ( app-doc/doxygen )
 DESCRIPTION=Audio processing plugin system for plugins that extract descriptive information from audio data
 HOMEPAGE=http://www.vamp-plugins.org
 IUSE=doc
-KEYWORDS=amd64 ~arm hppa ~mips ~ppc ppc64 x86
+KEYWORDS=amd64 ~arm hppa ~mips ppc ppc64 x86
 LICENSE=BSD
 RDEPEND=media-libs/libsndfile
 SLOT=0
 SRC_URI=http://code.soundsoftware.ac.uk/attachments/download/224/vamp-plugin-sdk-2.3.tar.gz
 _eclasses_=eutils	b8eb29e3c9c4e94c65da9ebec37902a9	multilib	564d80d2026ae9f1910d8da4ea211e91	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=78fdc4b65aa37c4b9eaa3423f33cd8e2
+_md5_=50bdd76a4aa28de919cf24a0dd07ecd5
diff --git a/metadata/md5-cache/media-sound/amarok-2.4.3-r1 b/metadata/md5-cache/media-sound/amarok-2.4.3-r1
deleted file mode 100644
index a2ef1ef9c35e..000000000000
--- a/metadata/md5-cache/media-sound/amarok-2.4.3-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=app-crypt/qca:2 >=app-misc/strigi-0.5.7 >=kde-base/kdelibs-4.4:4[aqua=,opengl?,semantic-desktop?] >=kde-base/kdebase-kioslaves-4.4:4[aqua=] >=media-libs/taglib-1.6.1[asf,mp4] >=media-libs/taglib-extras-1.0.1 sys-libs/zlib >=virtual/mysql-5.1[embedded?] x11-libs/qt-script:4 >=x11-libs/qtscriptgenerator-0.1.0 cdda? ( >=kde-base/libkcddb-4.4:4[aqua=] >=kde-base/libkcompactdisc-4.4:4[aqua=] >=kde-base/kdemultimedia-kioslaves-4.4:4[aqua=] ) ipod? ( >=media-libs/libgpod-0.7.0[gtk] ) lastfm? ( =media-libs/liblastfm-0.3* ) mp3tunes? ( dev-libs/glib:2 dev-libs/libxml2 dev-libs/openssl net-libs/loudmouth net-misc/curl x11-libs/qt-core:4[glib] ) mtp? ( >=media-libs/libmtp-1.0.0 ) opengl? ( virtual/opengl ) dev-util/automoc virtual/pkgconfig >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
-DESCRIPTION=Advanced audio player based on KDE framework.
-EAPI=4
-HOMEPAGE=http://amarok.kde.org/
-IUSE=cdda daap debug +embedded ipod lastfm mp3tunes mtp opengl semantic-desktop +utils linguas_bg linguas_ca linguas_cs linguas_da linguas_de linguas_en_GB linguas_es linguas_et linguas_eu linguas_fi linguas_fr linguas_it linguas_ja linguas_km linguas_nb linguas_nds linguas_nl linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ru linguas_sl linguas_sr linguas_sr@latin linguas_sv linguas_th linguas_tr linguas_uk linguas_wa linguas_zh_TW
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=app-crypt/qca:2 >=app-misc/strigi-0.5.7 >=kde-base/kdelibs-4.4:4[aqua=,opengl?,semantic-desktop?] >=kde-base/kdebase-kioslaves-4.4:4[aqua=] >=media-libs/taglib-1.6.1[asf,mp4] >=media-libs/taglib-extras-1.0.1 sys-libs/zlib >=virtual/mysql-5.1[embedded?] x11-libs/qt-script:4 >=x11-libs/qtscriptgenerator-0.1.0 cdda? ( >=kde-base/libkcddb-4.4:4[aqua=] >=kde-base/libkcompactdisc-4.4:4[aqua=] >=kde-base/kdemultimedia-kioslaves-4.4:4[aqua=] ) ipod? ( >=media-libs/libgpod-0.7.0[gtk] ) lastfm? ( =media-libs/liblastfm-0.3* ) mp3tunes? ( dev-libs/glib:2 dev-libs/libxml2 dev-libs/openssl net-libs/loudmouth net-misc/curl x11-libs/qt-core:4[glib] ) mtp? ( >=media-libs/libmtp-1.0.0 ) opengl? ( virtual/opengl ) >=kde-base/phonon-kde-4.4:4[aqua=] !media-sound/amarok-utils
-RESTRICT=test
-SLOT=4
-SRC_URI=mirror://kde/stable/amarok/2.4.3/src/amarok-2.4.3.tar.bz2
-_eclasses_=base	d40e074a6349af3ea5e937210630bdc1	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	b8eb29e3c9c4e94c65da9ebec37902a9	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	6e4e3fc3a36f43b71c84ad615e804a83	kde4-functions	df82ee2da839042995eb204cf576da49	multilib	564d80d2026ae9f1910d8da4ea211e91	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
-_md5_=e355b8c88b0d104b53d9dd93f8eba68a
diff --git a/metadata/md5-cache/media-sound/amarok-2.5.0-r4 b/metadata/md5-cache/media-sound/amarok-2.5.0-r4
index fad085d8417b..088fa94687ff 100644
--- a/metadata/md5-cache/media-sound/amarok-2.5.0-r4
+++ b/metadata/md5-cache/media-sound/amarok-2.5.0-r4
@@ -4,11 +4,11 @@ DESCRIPTION=Advanced audio player based on KDE framework.
 EAPI=4
 HOMEPAGE=http://amarok.kde.org/
 IUSE=cdda daap debug +embedded ipod lastfm mp3tunes mtp ofa opengl semantic-desktop +utils linguas_af linguas_ar linguas_ast linguas_be linguas_bg linguas_bs linguas_ca linguas_ca@valencia linguas_cs linguas_csb linguas_da linguas_de linguas_el linguas_en_GB linguas_eo linguas_es linguas_et linguas_eu linguas_fa linguas_fi linguas_fr linguas_ga linguas_gl linguas_he linguas_hr linguas_hu linguas_is linguas_it linguas_ja linguas_km linguas_ko linguas_ku linguas_lt linguas_lv linguas_mai linguas_ml linguas_ms linguas_nb linguas_nds linguas_ne linguas_nl linguas_nn linguas_oc linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_se linguas_si linguas_sk linguas_sl linguas_sq linguas_sr linguas_sr@ijekavian linguas_sr@ijekavianlatin linguas_sr@Latn linguas_sv linguas_tg linguas_th linguas_tr linguas_ug linguas_uk linguas_wa linguas_zh_CN linguas_zh_TW
-KEYWORDS=amd64 ~ppc ~ppc64 x86
+KEYWORDS=amd64 ppc ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=app-crypt/qca:2 >=app-misc/strigi-0.5.7 >=kde-base/kdelibs-4.4:4[aqua=,opengl?,semantic-desktop?] >=kde-base/kdebase-kioslaves-4.4:4[aqua=] >=media-libs/taglib-1.6.1[asf,mp4] >=media-libs/taglib-extras-1.0.1 sys-libs/zlib >=virtual/mysql-5.1[embedded?] x11-libs/qt-core:4 x11-libs/qt-dbus:4 x11-libs/qt-script:4 >=x11-libs/qtscriptgenerator-0.1.0 cdda? ( >=kde-base/libkcddb-4.4:4[aqua=] >=kde-base/libkcompactdisc-4.4:4[aqua=] || ( >=kde-base/audiocd-kio-4.4:4[aqua=] >=kde-base/kdemultimedia-kioslaves-4.4:4[aqua=] ) ) ipod? ( >=media-libs/libgpod-0.7.0[gtk] ) lastfm? ( =media-libs/liblastfm-0.3* ) mp3tunes? ( dev-libs/glib:2 dev-libs/libxml2 dev-libs/openssl net-libs/loudmouth net-misc/curl x11-libs/qt-core:4[glib] ) mtp? ( >=media-libs/libmtp-1.0.0 ) ofa? ( >=media-libs/libofa-0.9.0 ) opengl? ( virtual/opengl ) !media-sound/amarok-utils >=kde-base/phonon-kde-4.4:4[aqua=]
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://kde/unstable/amarok/2.5.0/src/amarok-2.5.0.tar.bz2
 _eclasses_=base	d40e074a6349af3ea5e937210630bdc1	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	b8eb29e3c9c4e94c65da9ebec37902a9	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	6e4e3fc3a36f43b71c84ad615e804a83	kde4-functions	df82ee2da839042995eb204cf576da49	multilib	564d80d2026ae9f1910d8da4ea211e91	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
-_md5_=09f90d69185b51828d0d2c04cb74eec6
+_md5_=ea2c2b81aff53c3f5d3149a16baebb77
diff --git a/metadata/md5-cache/media-sound/mp3blaster-3.2.5-r1 b/metadata/md5-cache/media-sound/mp3blaster-3.2.5-r1
index 9233b11756ae..8178d7c8b546 100644
--- a/metadata/md5-cache/media-sound/mp3blaster-3.2.5-r1
+++ b/metadata/md5-cache/media-sound/mp3blaster-3.2.5-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Text console based program for playing audio files
 EAPI=4
 HOMEPAGE=http://mp3blaster.sourceforge.net/
 IUSE=lirc oss sdl sid vorbis
-KEYWORDS=~alpha amd64 arm ~ppc ppc64 ~sparc x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 arm ppc ppc64 ~sparc x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=sys-libs/ncurses-5.7-r7 lirc? ( app-misc/lirc ) sdl? ( media-libs/libsdl ) sid? ( =media-libs/libsidplay-1* ) vorbis? ( >=media-libs/libvorbis-1 )
 REQUIRED_USE=|| ( oss sdl )
 SLOT=0
 SRC_URI=mirror://sourceforge/mp3blaster/mp3blaster-3.2.5.tar.gz mirror://debian/pool/main/m/mp3blaster/mp3blaster_3.2.5-3.debian.tar.gz
 _eclasses_=eutils	b8eb29e3c9c4e94c65da9ebec37902a9	multilib	564d80d2026ae9f1910d8da4ea211e91	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=273666c8bf1e12250368ac9f7106b791
+_md5_=66ac51615a212b1acecde41da447b017
diff --git a/metadata/md5-cache/media-video/parole-0.3.0.3 b/metadata/md5-cache/media-video/parole-0.3.0.3
new file mode 100644
index 000000000000..bf7b1f8f9e24
--- /dev/null
+++ b/metadata/md5-cache/media-video/parole-0.3.0.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
+DEPEND=>=x11-libs/gtk+-2.20:2 >=dev-libs/glib-2.24:2 >=xfce-base/libxfce4util-4.8 >=xfce-base/libxfce4ui-4.8 >=dev-libs/dbus-glib-0.88 >=media-libs/gstreamer-0.10.11:0.10 >=media-libs/gst-plugins-base-0.10.11:0.10 libnotify? ( >=x11-libs/libnotify-0.4.5 ) taglib? ( >=media-libs/taglib-1.4 ) dev-util/intltool virtual/pkgconfig x11-proto/xproto >=sys-apps/sed-4
+DESCRIPTION=a simple media player based on the GStreamer framework for the Xfce4 desktop
+EAPI=4
+HOMEPAGE=http://goodies.xfce.org/projects/applications/parole/
+IUSE=debug libnotify taglib
+KEYWORDS=~amd64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=>=x11-libs/gtk+-2.20:2 >=dev-libs/glib-2.24:2 >=xfce-base/libxfce4util-4.8 >=xfce-base/libxfce4ui-4.8 >=dev-libs/dbus-glib-0.88 >=media-libs/gstreamer-0.10.11:0.10 >=media-libs/gst-plugins-base-0.10.11:0.10 libnotify? ( >=x11-libs/libnotify-0.4.5 ) taglib? ( >=media-libs/taglib-1.4 ) media-plugins/gst-plugins-meta:0.10
+SLOT=0
+SRC_URI=mirror://xfce/src/apps/parole/0.3/parole-0.3.0.3.tar.bz2
+_eclasses_=autotools	d89996a2048bc6d1ae72bfa4c04517fe	base	d40e074a6349af3ea5e937210630bdc1	eutils	b8eb29e3c9c4e94c65da9ebec37902a9	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	libtool	a83de71c2123161fc5a8323cb275f8e5	multilib	564d80d2026ae9f1910d8da4ea211e91	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142	user	d0a4d0735a6c0183d707ca919bd72f28	xfconf	880b0e8f23147d868b73f420e84bc1ba
+_md5_=8b87bb984298c0fd367e3ec06a0658a3
diff --git a/metadata/md5-cache/net-analyzer/pmacct-0.14.1 b/metadata/md5-cache/net-analyzer/pmacct-0.14.1
new file mode 100644
index 000000000000..8c10b0acf8b9
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/pmacct-0.14.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=net-libs/libpcap mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) sqlite? ( =dev-db/sqlite-3* )
+DESCRIPTION=A network tool to gather IP traffic information
+EAPI=4
+HOMEPAGE=http://www.pmacct.net/
+IUSE=64bit debug ipv6 mysql postgres sqlite threads ulog
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=net-libs/libpcap mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) sqlite? ( =dev-db/sqlite-3* )
+SLOT=0
+SRC_URI=http://www.pmacct.net/pmacct-0.14.1.tar.gz
+_eclasses_=eutils	b8eb29e3c9c4e94c65da9ebec37902a9	multilib	564d80d2026ae9f1910d8da4ea211e91	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=4f2f66566e8da96c1ab982b1a0c0cd1b
diff --git a/metadata/md5-cache/net-analyzer/thrulay-0.9-r1 b/metadata/md5-cache/net-analyzer/thrulay-0.9-r1
index 52a0ed6e4ce2..dc59700da4e3 100644
--- a/metadata/md5-cache/net-analyzer/thrulay-0.9-r1
+++ b/metadata/md5-cache/net-analyzer/thrulay-0.9-r1
@@ -3,9 +3,9 @@ DEPEND=|| ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=
 DESCRIPTION=Measure the capacity of a network by sending a bulk TCP stream over it.
 EAPI=4
 HOMEPAGE=http://www.internet2.edu/~shalunov/thrulay/
-KEYWORDS=amd64 ~ppc x86
+KEYWORDS=amd64 ppc x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=http://www.internet2.edu/~shalunov/thrulay/thrulay-0.9.tar.gz mirror://sourceforge/thrulay/thrulay-0.9.tar.gz
 _eclasses_=autotools	d89996a2048bc6d1ae72bfa4c04517fe	libtool	a83de71c2123161fc5a8323cb275f8e5	multilib	564d80d2026ae9f1910d8da4ea211e91	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142
-_md5_=145d4b6af9058fcbf56200139cc3851e
+_md5_=521990927d585daf69eda39d38bd7115
diff --git a/metadata/md5-cache/net-firewall/conntrack-tools-1.2.2 b/metadata/md5-cache/net-firewall/conntrack-tools-1.2.2
new file mode 100644
index 000000000000..57ca2c408431
--- /dev/null
+++ b/metadata/md5-cache/net-firewall/conntrack-tools-1.2.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install setup
+DEPEND=>=net-libs/libnetfilter_conntrack-1.0.1 >=net-libs/libnetfilter_cttimeout-1.0.0 >=net-libs/libnfnetlink-1.0.0 net-libs/libmnl virtual/pkgconfig sys-devel/bison sys-devel/flex
+DESCRIPTION=Connection tracking userspace tools
+EAPI=4
+HOMEPAGE=http://conntrack-tools.netfilter.org
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=net-libs/libnetfilter_conntrack-1.0.1 >=net-libs/libnetfilter_cttimeout-1.0.0 >=net-libs/libnfnetlink-1.0.0 net-libs/libmnl
+SLOT=0
+SRC_URI=http://www.netfilter.org/projects/conntrack-tools/files/conntrack-tools-1.2.2.tar.bz2
+_eclasses_=eutils	b8eb29e3c9c4e94c65da9ebec37902a9	linux-info	0b7adf68a2edb4e5a32b07bb6e68121c	multilib	564d80d2026ae9f1910d8da4ea211e91	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=3b8e3986e93434f45b297ff47500992a
diff --git a/metadata/md5-cache/net-libs/gsoap-2.8.0 b/metadata/md5-cache/net-libs/gsoap-2.8.0
deleted file mode 100644
index f74dc949b45b..000000000000
--- a/metadata/md5-cache/net-libs/gsoap-2.8.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=app-arch/unzip sys-devel/flex sys-devel/bison sys-libs/zlib ssl? ( dev-libs/openssl ) || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
-DESCRIPTION=A cross-platform open source C and C++ SDK to ease the development of SOAP/XML Web services
-EAPI=2
-HOMEPAGE=http://gsoap2.sourceforge.net
-IUSE=doc debug examples +ssl
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 gSOAP
-SLOT=0
-SRC_URI=mirror://sourceforge/gsoap2/gsoap_2.8.0.zip
-_eclasses_=autotools	d89996a2048bc6d1ae72bfa4c04517fe	eutils	b8eb29e3c9c4e94c65da9ebec37902a9	libtool	a83de71c2123161fc5a8323cb275f8e5	multilib	564d80d2026ae9f1910d8da4ea211e91	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=ee299729361f21be98b4f46bd2fc723d
diff --git a/metadata/md5-cache/net-libs/gsoap-2.8.1 b/metadata/md5-cache/net-libs/gsoap-2.8.1
deleted file mode 100644
index 845c095ac4ae..000000000000
--- a/metadata/md5-cache/net-libs/gsoap-2.8.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=app-arch/unzip sys-devel/flex sys-devel/bison sys-libs/zlib ssl? ( dev-libs/openssl ) || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
-DESCRIPTION=A cross-platform open source C and C++ SDK to ease the development of SOAP/XML Web services
-EAPI=2
-HOMEPAGE=http://gsoap2.sourceforge.net
-IUSE=doc debug examples +ssl
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 gSOAP
-SLOT=0
-SRC_URI=mirror://sourceforge/gsoap2/gsoap_2.8.1.zip
-_eclasses_=autotools	d89996a2048bc6d1ae72bfa4c04517fe	eutils	b8eb29e3c9c4e94c65da9ebec37902a9	libtool	a83de71c2123161fc5a8323cb275f8e5	multilib	564d80d2026ae9f1910d8da4ea211e91	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=b9ad4ed57f82cdb4af8079aed3d7acc9
diff --git a/metadata/md5-cache/net-libs/gsoap-2.8.8 b/metadata/md5-cache/net-libs/gsoap-2.8.10
similarity index 90%
rename from metadata/md5-cache/net-libs/gsoap-2.8.8
rename to metadata/md5-cache/net-libs/gsoap-2.8.10
index 638ba5ad3556..79b3888f279c 100644
--- a/metadata/md5-cache/net-libs/gsoap-2.8.8
+++ b/metadata/md5-cache/net-libs/gsoap-2.8.10
@@ -7,6 +7,6 @@ IUSE=doc debug examples ipv6 gnutls +ssl
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2 gSOAP
 SLOT=0
-SRC_URI=mirror://sourceforge/gsoap2/gsoap_2.8.8.zip
+SRC_URI=mirror://sourceforge/gsoap2/gsoap_2.8.10.zip
 _eclasses_=autotools	d89996a2048bc6d1ae72bfa4c04517fe	eutils	b8eb29e3c9c4e94c65da9ebec37902a9	libtool	a83de71c2123161fc5a8323cb275f8e5	multilib	564d80d2026ae9f1910d8da4ea211e91	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=26881ceb07ccabfafbcb1078f4f389e2
+_md5_=37e0e6aa4853d1b25efc2231a86f9cfe
diff --git a/metadata/md5-cache/net-libs/libgsasl-1.8.0 b/metadata/md5-cache/net-libs/libgsasl-1.8.0
index 9aa6b6687c98..cb24f3810249 100644
--- a/metadata/md5-cache/net-libs/libgsasl-1.8.0
+++ b/metadata/md5-cache/net-libs/libgsasl-1.8.0
@@ -4,10 +4,10 @@ DESCRIPTION=The GNU SASL library
 EAPI=4
 HOMEPAGE=http://www.gnu.org/software/gsasl/
 IUSE=idn gcrypt kerberos nls ntlm static-libs
-KEYWORDS=~alpha amd64 arm ~ia64 ppc ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
+KEYWORDS=~alpha amd64 arm ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
 LICENSE=GPL-3 LGPL-3
 RDEPEND=gcrypt? ( dev-libs/libgcrypt ) idn? ( net-dns/libidn ) kerberos? ( virtual/krb5 ) nls? ( >=sys-devel/gettext-0.18.1 ) ntlm? ( net-libs/libntlm ) !net-misc/gsasl
 SLOT=0
 SRC_URI=mirror://gnu/gsasl/libgsasl-1.8.0.tar.gz
 _eclasses_=autotools	d89996a2048bc6d1ae72bfa4c04517fe	eutils	b8eb29e3c9c4e94c65da9ebec37902a9	libtool	a83de71c2123161fc5a8323cb275f8e5	multilib	564d80d2026ae9f1910d8da4ea211e91	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=26f1e48f2ba56b5325e5a1999a51d28a
+_md5_=0b2f6a0ee28d850fe6311baa7c2dc4b5
diff --git a/metadata/md5-cache/net-libs/libnetfilter_cttimeout-1.0.0 b/metadata/md5-cache/net-libs/libnetfilter_cttimeout-1.0.0
new file mode 100644
index 000000000000..ca946f676275
--- /dev/null
+++ b/metadata/md5-cache/net-libs/libnetfilter_cttimeout-1.0.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=net-libs/libmnl virtual/pkgconfig
+DESCRIPTION=netlink interface to the connection tracking timeout infrastructure in the kernel packet filter
+EAPI=4
+HOMEPAGE=http://www.netfilter.org/projects/libnetfilter_cttimeout
+IUSE=static-libs
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=net-libs/libmnl
+SLOT=0
+SRC_URI=http://www.netfilter.org/projects/libnetfilter_cttimeout/files/libnetfilter_cttimeout-1.0.0.tar.bz2
+_eclasses_=autotools	d89996a2048bc6d1ae72bfa4c04517fe	autotools-utils	cfb1126efe81254030227216aa71f32c	eutils	b8eb29e3c9c4e94c65da9ebec37902a9	libtool	a83de71c2123161fc5a8323cb275f8e5	linux-info	0b7adf68a2edb4e5a32b07bb6e68121c	multilib	564d80d2026ae9f1910d8da4ea211e91	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=cfd942eecdf893647e92e4b1d2452625
diff --git a/metadata/md5-cache/net-libs/nodejs-0.8.8 b/metadata/md5-cache/net-libs/nodejs-0.8.8
new file mode 100644
index 000000000000..90b81c30ea01
--- /dev/null
+++ b/metadata/md5-cache/net-libs/nodejs-0.8.8
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=>=dev-lang/v8-3.11.10 dev-libs/openssl =dev-lang/python-2*
+DESCRIPTION=Evented IO for V8 Javascript
+EAPI=3
+HOMEPAGE=http://nodejs.org/
+KEYWORDS=~amd64 ~x86 ~x64-macos
+LICENSE=GPL-2
+RDEPEND=>=dev-lang/v8-3.11.10 dev-libs/openssl =dev-lang/python-2*
+RESTRICT=test
+SLOT=0
+SRC_URI=http://nodejs.org/dist/v0.8.8/node-v0.8.8.tar.gz
+_eclasses_=eutils	b8eb29e3c9c4e94c65da9ebec37902a9	multilib	564d80d2026ae9f1910d8da4ea211e91	pax-utils	0ace932c4045349c7fc1af0fe7091acf	python	a0b470c1fca4658ffc97f0df0f25dcdc	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=819d43cceb6441d91ff00c199c7b7fc7
diff --git a/metadata/md5-cache/net-misc/badvpn-1.999.123-r1 b/metadata/md5-cache/net-misc/badvpn-1.999.123-r2
similarity index 96%
rename from metadata/md5-cache/net-misc/badvpn-1.999.123-r1
rename to metadata/md5-cache/net-misc/badvpn-1.999.123-r2
index 3758f17b4f4f..227f484673fa 100644
--- a/metadata/md5-cache/net-misc/badvpn-1.999.123-r1
+++ b/metadata/md5-cache/net-misc/badvpn-1.999.123-r2
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( client ncd server tun2socks udpgw )
 SLOT=0
 SRC_URI=http://badvpn.googlecode.com/files/badvpn-1.999.123.tar.bz2
 _eclasses_=base	d40e074a6349af3ea5e937210630bdc1	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	b8eb29e3c9c4e94c65da9ebec37902a9	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	564d80d2026ae9f1910d8da4ea211e91	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=879349447b9c6f11a2629621aca05b51
+_md5_=24c75c510a84b9b15e85ebbff89dbbfd
diff --git a/metadata/md5-cache/net-misc/dropbox-1.4.7-r1 b/metadata/md5-cache/net-misc/dropbox-1.4.7-r1
index 6123371933e1..27668d273ab0 100644
--- a/metadata/md5-cache/net-misc/dropbox-1.4.7-r1
+++ b/metadata/md5-cache/net-misc/dropbox-1.4.7-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Dropbox daemon (pretends to be GUI-less)
 EAPI=4
 HOMEPAGE=http://dropbox.com/
 IUSE=+librsync-bundled
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~x86 ~x86-linux
 LICENSE=CCPL-Attribution-NoDerivs-3.0 FTL MIT LGPL-2 openssl dropbox
 RDEPEND=app-arch/bzip2 dev-libs/popt dev-libs/openssl:0.9.8 media-libs/libpng:1.2 !librsync-bundled? ( net-libs/librsync ) net-misc/wget >=sys-devel/gcc-4.2.0 sys-libs/zlib x11-themes/hicolor-icon-theme
 RESTRICT=mirror strip
 SLOT=0
 SRC_URI=x86? ( http://dl-web.dropbox.com/u/17/dropbox-lnx.x86-1.4.7.tar.gz ) amd64? ( http://dl-web.dropbox.com/u/17/dropbox-lnx.x86_64-1.4.7.tar.gz )
 _eclasses_=gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	pax-utils	0ace932c4045349c7fc1af0fe7091acf
-_md5_=b5b53841619abb25eba0c2cd15778201
+_md5_=9928e48c49561a2fb0277b47f0a80a38
diff --git a/metadata/md5-cache/net-misc/gsasl-1.8.0 b/metadata/md5-cache/net-misc/gsasl-1.8.0
index 87d0ad8829ec..95663a78f634 100644
--- a/metadata/md5-cache/net-misc/gsasl-1.8.0
+++ b/metadata/md5-cache/net-misc/gsasl-1.8.0
@@ -4,10 +4,10 @@ DESCRIPTION=The GNU SASL client, server, and library
 EAPI=4
 HOMEPAGE=http://www.gnu.org/software/gsasl/
 IUSE=doc gcrypt idn kerberos nls ntlm static-libs +threads
-KEYWORDS=amd64 ppc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=amd64 ppc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-3
 RDEPEND=gcrypt? ( dev-libs/libgcrypt ) idn? ( net-dns/libidn ) kerberos? ( virtual/krb5 ) nls? ( >=sys-devel/gettext-0.18.1 ) ntlm? ( net-libs/libntlm )
 SLOT=0
 SRC_URI=mirror://gnu/gsasl/gsasl-1.8.0.tar.gz
 _eclasses_=autotools	d89996a2048bc6d1ae72bfa4c04517fe	eutils	b8eb29e3c9c4e94c65da9ebec37902a9	libtool	a83de71c2123161fc5a8323cb275f8e5	multilib	564d80d2026ae9f1910d8da4ea211e91	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=0ce63e01fce0a06619100019ebd89e33
+_md5_=635c102a05ab14f31b9bd7b3103c68fc
diff --git a/metadata/md5-cache/net-misc/italc-1.0.9 b/metadata/md5-cache/net-misc/italc-1.0.9
deleted file mode 100644
index 84e4dd707ad4..000000000000
--- a/metadata/md5-cache/net-misc/italc-1.0.9
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile config configure install postinst prepare setup unpack
-DEPEND=dev-libs/lzo dev-libs/openssl virtual/jpeg sys-apps/tcp-wrappers sys-libs/zlib x11-libs/qt-core:4 x11-libs/qt-xmlpatterns:4 system-libvncserver? ( net-libs/libvncserver ) xinerama? ( x11-libs/libXinerama ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXtst x11-apps/xinput x11-libs/qt-gui:4 ) X? ( x11-proto/inputproto ) || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
-DESCRIPTION=Intelligent Teaching And Learning with Computers (iTALC) supports working with computers in school
-EAPI=2
-HOMEPAGE=http://italc.sourceforge.net/
-IUSE=X v4l crypt xinerama threads fbcon system-libvncserver
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/lzo dev-libs/openssl virtual/jpeg sys-apps/tcp-wrappers sys-libs/zlib x11-libs/qt-core:4 x11-libs/qt-xmlpatterns:4 system-libvncserver? ( net-libs/libvncserver ) xinerama? ( x11-libs/libXinerama ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXtst x11-apps/xinput x11-libs/qt-gui:4 )
-SLOT=0
-SRC_URI=mirror://sourceforge/italc/italc-1.0.9.tar.bz2
-_eclasses_=autotools	d89996a2048bc6d1ae72bfa4c04517fe	base	d40e074a6349af3ea5e937210630bdc1	eutils	b8eb29e3c9c4e94c65da9ebec37902a9	libtool	a83de71c2123161fc5a8323cb275f8e5	multilib	564d80d2026ae9f1910d8da4ea211e91	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	qt4-r2	3f724d1082a722cce69ce795371b81a3	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=22905998ba63bd3ff91322b6a368e9c1
diff --git a/metadata/md5-cache/net-misc/italc-2.0.0 b/metadata/md5-cache/net-misc/italc-2.0.0
index 082386ad051b..7752d5f6bf06 100644
--- a/metadata/md5-cache/net-misc/italc-2.0.0
+++ b/metadata/md5-cache/net-misc/italc-2.0.0
@@ -3,11 +3,11 @@ DEPEND=dev-libs/lzo dev-libs/openssl sys-apps/tcp-wrappers sys-libs/zlib virtual
 DESCRIPTION=Intelligent Teaching And Learning with Computers (iTALC) supports working with computers in school
 EAPI=4
 HOMEPAGE=http://italc.sourceforge.net/
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 PROPERTIES=interactive
 RDEPEND=dev-libs/lzo dev-libs/openssl sys-apps/tcp-wrappers sys-libs/zlib virtual/jpeg x11-libs/qt-core:4 x11-libs/qt-xmlpatterns:4 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXtst x11-apps/xinput x11-libs/qt-gui:4
 SLOT=0
 SRC_URI=mirror://sourceforge/italc/italc-2.0.0.tar.bz2
 _eclasses_=base	d40e074a6349af3ea5e937210630bdc1	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	b8eb29e3c9c4e94c65da9ebec37902a9	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	564d80d2026ae9f1910d8da4ea211e91	qt4-r2	3f724d1082a722cce69ce795371b81a3	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=ae666c54d11209c4a0330a6330dcdc41
+_md5_=a432559c71d7ba2864b5c44c546dc98f
diff --git a/metadata/md5-cache/net-misc/openvpn-2.2.2 b/metadata/md5-cache/net-misc/openvpn-2.2.2
index 4ea1f097403b..dcbdaa1cb07e 100644
--- a/metadata/md5-cache/net-misc/openvpn-2.2.2
+++ b/metadata/md5-cache/net-misc/openvpn-2.2.2
@@ -4,10 +4,10 @@ DESCRIPTION=OpenVPN is a robust and highly flexible tunneling application compat
 EAPI=4
 HOMEPAGE=http://openvpn.net/
 IUSE=examples iproute2 minimal pam passwordsave selinux +ssl static pkcs11 userland_BSD
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/lzo-1.07 kernel_linux? ( iproute2? ( sys-apps/iproute2[-minimal] ) !iproute2? ( sys-apps/net-tools ) ) !minimal? ( pam? ( virtual/pam ) ) selinux? ( sec-policy/selinux-openvpn ) ssl? ( >=dev-libs/openssl-0.9.6 ) pkcs11? ( >=dev-libs/pkcs11-helper-1.05 )
 SLOT=0
 SRC_URI=http://swupdate.openvpn.net/community/releases/openvpn-2.2.2.tar.gz
 _eclasses_=eutils	b8eb29e3c9c4e94c65da9ebec37902a9	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	564d80d2026ae9f1910d8da4ea211e91	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=d9a9c46473019d9d60bce444c8644cbc
+_md5_=283101c916399fa22205a2e74871d3c9
diff --git a/metadata/md5-cache/net-p2p/deluge-1.3.5 b/metadata/md5-cache/net-p2p/deluge-1.3.5
index b156249619e2..adbbba3e99b6 100644
--- a/metadata/md5-cache/net-p2p/deluge-1.3.5
+++ b/metadata/md5-cache/net-p2p/deluge-1.3.5
@@ -4,10 +4,10 @@ DESCRIPTION=BitTorrent client with a client/server model.
 EAPI=3
 HOMEPAGE=http://deluge-torrent.org/
 IUSE=geoip gtk libnotify setproctitle webinterface
-KEYWORDS=amd64 ~arm ~sparc ~x86
+KEYWORDS=amd64 ~arm ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=net-libs/rb_libtorrent-0.14.9[python] dev-python/setuptools dev-util/intltool dev-python/chardet dev-python/pyopenssl dev-python/pyxdg || ( dev-lang/python:2.7 dev-lang/python:2.6 dev-python/simplejson ) >=dev-python/twisted-8.1 >=dev-python/twisted-web-8.1 geoip? ( dev-libs/geoip ) gtk? ( dev-python/pygame dev-python/pygobject:2 >=dev-python/pygtk-2.12 gnome-base/librsvg libnotify? ( dev-python/notify-python ) ) setproctitle? ( dev-python/setproctitle ) webinterface? ( dev-python/mako ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
 SLOT=0
 SRC_URI=http://download.deluge-torrent.org/source/deluge-1.3.5.tar.lzma
 _eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	b8eb29e3c9c4e94c65da9ebec37902a9	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	564d80d2026ae9f1910d8da4ea211e91	python	a0b470c1fca4658ffc97f0df0f25dcdc	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=3d3bd670a3df5deb1e5e203008e04e4c
+_md5_=1be344a7ed4c8c394a67bab211885ba3
diff --git a/metadata/md5-cache/net-p2p/gtk-gnutella-0.98.3 b/metadata/md5-cache/net-p2p/gtk-gnutella-0.98.3
index 51ab093dd6dd..741f70a8a871 100644
--- a/metadata/md5-cache/net-p2p/gtk-gnutella-0.98.3
+++ b/metadata/md5-cache/net-p2p/gtk-gnutella-0.98.3
@@ -4,10 +4,10 @@ DESCRIPTION=A GTK+ Gnutella client
 EAPI=4
 HOMEPAGE=http://gtk-gnutella.sourceforge.net/
 IUSE=nls dbus ssl +gtk
-KEYWORDS=amd64 ppc ~x86 ~x86-fbsd
+KEYWORDS=amd64 ppc x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 sys-libs/zlib gtk? ( >=x11-libs/gtk+-2.2.1:2 ) dbus? ( >=sys-apps/dbus-0.35.2 ) ssl? ( >=net-libs/gnutls-2.2.5 ) nls? ( >=sys-devel/gettext-0.11.5 )
 SLOT=0
 SRC_URI=mirror://sourceforge/gtk-gnutella/gtk-gnutella-0.98.3.tar.bz2
 _eclasses_=eutils	b8eb29e3c9c4e94c65da9ebec37902a9	multilib	564d80d2026ae9f1910d8da4ea211e91	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=bb402239de08d3ab55913fe1c4d05687
+_md5_=c855562df1f79abbe981f92a6e0d7c3c
diff --git a/metadata/md5-cache/net-print/cups-filters-1.0.23 b/metadata/md5-cache/net-print/cups-filters-1.0.23
index f2f8a14776f5..1c47a788d25e 100644
--- a/metadata/md5-cache/net-print/cups-filters-1.0.23
+++ b/metadata/md5-cache/net-print/cups-filters-1.0.23
@@ -4,10 +4,10 @@ DESCRIPTION=Cups PDF filters
 EAPI=4
 HOMEPAGE=http://www.linuxfoundation.org/collaborate/workgroups/openprinting/pdfasstandardprintjobformat
 IUSE=jpeg perl png static-libs tiff
-KEYWORDS=~amd64 ~mips ~x86
+KEYWORDS=~amd64 ~hppa ~mips ~x86
 LICENSE=MIT GPL-2
 RDEPEND=app-text/ghostscript-gpl app-text/poppler[cxx,jpeg?,lcms,tiff?,xpdf-headers(+)] app-text/qpdf media-libs/fontconfig media-libs/freetype:2 media-libs/lcms:2 >net-print/cups-1.5.9999 !<=net-print/cups-1.5.9999 sys-devel/bc sys-libs/zlib jpeg? ( virtual/jpeg ) perl? ( dev-lang/perl ) png? ( media-libs/libpng ) tiff? ( media-libs/tiff )
 SLOT=0
 SRC_URI=http://www.openprinting.org/download/cups-filters/cups-filters-1.0.23.tar.xz
 _eclasses_=base	d40e074a6349af3ea5e937210630bdc1	eutils	b8eb29e3c9c4e94c65da9ebec37902a9	multilib	564d80d2026ae9f1910d8da4ea211e91	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	1c5ba5b92574108992a6758f863da534	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=300a48b4e99ff12e9193be75c4054a41
+_md5_=71c28891b091fddbffaef3ca3f28be65
diff --git a/metadata/md5-cache/sci-mathematics/gfan-0.5 b/metadata/md5-cache/sci-mathematics/gfan-0.5
index fa57d577bb6e..5485cf5263f6 100644
--- a/metadata/md5-cache/sci-mathematics/gfan-0.5
+++ b/metadata/md5-cache/sci-mathematics/gfan-0.5
@@ -3,10 +3,10 @@ DEPEND=dev-libs/gmp[cxx] sci-libs/cddlib
 DESCRIPTION=computes Groebner fans and tropical varities
 EAPI=3
 HOMEPAGE=http://www.math.tu-berlin.de/~jensen/software/gfan/gfan.html
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=dev-libs/gmp[cxx] sci-libs/cddlib
 SLOT=0
 SRC_URI=http://www.math.tu-berlin.de/~jensen/software/gfan/gfan0.5.tar.gz
 _eclasses_=eutils	b8eb29e3c9c4e94c65da9ebec37902a9	multilib	564d80d2026ae9f1910d8da4ea211e91	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=7a39d5b84ab7a922e56db7c5fdc99b0f
+_md5_=fda37d8428c54641551f1bd0691831ab
diff --git a/metadata/md5-cache/sys-apps/portage-2.1.11.11 b/metadata/md5-cache/sys-apps/portage-2.1.11.11
new file mode 100644
index 000000000000..7c2c4c148ec2
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/portage-2.1.11.11
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test
+DEPEND=python3? ( =dev-lang/python-3* ) !pypy1_9? ( !python2? ( !python3? ( || ( >=dev-lang/python-2.7 dev-lang/python:2.6[threads] ) ) ) ) pypy1_9? ( !python2? ( !python3? ( dev-python/pypy:1.9[bzip2] ) ) ) python2? ( !python3? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] ) ) ) >=sys-apps/sed-4.0.5 sys-devel/patch doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 ) epydoc? ( >=dev-python/epydoc-2.0 !<=dev-python/pysqlite-2.4.1 )
+DESCRIPTION=Portage is the package management and distribution system for Gentoo
+EAPI=2
+HOMEPAGE=http://www.gentoo.org/proj/en/portage/index.xml
+IUSE=build doc epydoc +ipc linguas_pl pypy1_9 python2 python3 selinux xattr
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd
+LICENSE=GPL-2
+PDEPEND=!build? ( >=net-misc/rsync-2.6.4 userland_GNU? ( >=sys-apps/coreutils-6.4 ) )
+RDEPEND=python3? ( =dev-lang/python-3* ) !pypy1_9? ( !python2? ( !python3? ( || ( >=dev-lang/python-2.7 dev-lang/python:2.6[threads] ) ) ) ) pypy1_9? ( !python2? ( !python3? ( dev-python/pypy:1.9[bzip2] ) ) ) python2? ( !python3? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] ) ) ) !build? ( >=sys-apps/sed-4.0.5 >=app-shells/bash-3.2_p17 >=app-admin/eselect-1.2 || ( python3? ( =dev-lang/python-3*[ssl] ) !pypy1_9? ( !python2? ( !python3? ( || ( >=dev-lang/python-2.7[ssl] dev-lang/python:2.6[threads,ssl] ) ) ) ) pypy1_9? ( !python2? ( !python3? ( dev-python/pypy:1.9[bzip2,ssl] ) ) ) python2? ( !python3? ( || ( dev-lang/python:2.7[ssl] dev-lang/python:2.6[ssl,threads] ) ) ) dev-python/python-mhash ) ) elibc_FreeBSD? ( sys-freebsd/freebsd-bin ) elibc_glibc? ( >=sys-apps/sandbox-2.2 ) elibc_uclibc? ( >=sys-apps/sandbox-2.2 ) >=app-misc/pax-utils-0.1.17 xattr? ( kernel_linux? ( || ( >=dev-lang/python-3.3_pre20110902 dev-python/pyxattr ) ) ) selinux? ( || ( >=sys-libs/libselinux-2.0.94[python] <sys-libs/libselinux-2.0.94 ) ) !<app-shells/bash-3.2_p17 !<app-admin/logrotate-3.8.0
+SLOT=0
+SRC_URI=mirror://gentoo/portage-2.1.11.11.tar.bz2 http://dev.gentoo.org/~zmedico/portage/archives/portage-2.1.11.11.tar.bz2 linguas_pl? ( mirror://gentoo/portage-man-pl-2.1.2.tar.bz2 http://dev.gentoo.org/~zmedico/portage/archives/portage-man-pl-2.1.2.tar.bz2 )
+_eclasses_=eutils	b8eb29e3c9c4e94c65da9ebec37902a9	multilib	564d80d2026ae9f1910d8da4ea211e91	python	a0b470c1fca4658ffc97f0df0f25dcdc	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=79b880997076cbaa2107769b5db516a5
diff --git a/metadata/md5-cache/sys-apps/portage-2.2.0_alpha122 b/metadata/md5-cache/sys-apps/portage-2.2.0_alpha122
new file mode 100644
index 000000000000..3ba401820cd4
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/portage-2.2.0_alpha122
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test
+DEPEND=python3? ( =dev-lang/python-3* ) !pypy1_9? ( !python2? ( !python3? ( || ( >=dev-lang/python-2.7 dev-lang/python:2.6[threads] ) ) ) ) pypy1_9? ( !python2? ( !python3? ( dev-python/pypy:1.9[bzip2] ) ) ) python2? ( !python3? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] ) ) ) >=sys-apps/sed-4.0.5 sys-devel/patch doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 ) epydoc? ( >=dev-python/epydoc-2.0 !<=dev-python/pysqlite-2.4.1 )
+DESCRIPTION=Portage is the package management and distribution system for Gentoo
+EAPI=3
+HOMEPAGE=http://www.gentoo.org/proj/en/portage/index.xml
+IUSE=build doc epydoc +ipc linguas_pl pypy1_9 python2 python3 selinux xattr
+KEYWORDS=~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+LICENSE=GPL-2
+PDEPEND=!build? ( >=net-misc/rsync-2.6.4 userland_GNU? ( >=sys-apps/coreutils-6.4 ) )
+RDEPEND=python3? ( =dev-lang/python-3* ) !pypy1_9? ( !python2? ( !python3? ( || ( >=dev-lang/python-2.7 dev-lang/python:2.6[threads] ) ) ) ) pypy1_9? ( !python2? ( !python3? ( dev-python/pypy:1.9[bzip2] ) ) ) python2? ( !python3? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] ) ) ) !build? ( >=sys-apps/sed-4.0.5 >=app-shells/bash-3.2_p17 >=app-admin/eselect-1.2 || ( python3? ( =dev-lang/python-3*[ssl] ) !pypy1_9? ( !python2? ( !python3? ( || ( >=dev-lang/python-2.7[ssl] dev-lang/python:2.6[threads,ssl] ) ) ) ) pypy1_9? ( !python2? ( !python3? ( dev-python/pypy:1.9[bzip2,ssl] ) ) ) python2? ( !python3? ( || ( dev-lang/python:2.7[ssl] dev-lang/python:2.6[ssl,threads] ) ) ) dev-python/python-mhash ) ) elibc_FreeBSD? ( sys-freebsd/freebsd-bin ) elibc_glibc? ( >=sys-apps/sandbox-2.2 ) elibc_uclibc? ( >=sys-apps/sandbox-2.2 ) >=app-misc/pax-utils-0.1.17 xattr? ( kernel_linux? ( || ( >=dev-lang/python-3.3_pre20110902 dev-python/pyxattr ) ) ) selinux? ( || ( >=sys-libs/libselinux-2.0.94[python] <sys-libs/libselinux-2.0.94 ) ) !<app-shells/bash-3.2_p17 !<app-admin/logrotate-3.8.0
+SLOT=0
+SRC_URI=mirror://gentoo/portage-2.2.0_alpha121.tar.bz2 http://dev.gentoo.org/~zmedico/portage/archives/portage-2.2.0_alpha121.tar.bz2 linguas_pl? ( mirror://gentoo/portage-man-pl-2.1.2.tar.bz2 http://dev.gentoo.org/~zmedico/portage/archives/portage-man-pl-2.1.2.tar.bz2 ) mirror://gentoo/portage-2.2.0_alpha122.patch.bz2 http://dev.gentoo.org/~zmedico/portage/archives/portage-2.2.0_alpha122.patch.bz2
+_eclasses_=eutils	b8eb29e3c9c4e94c65da9ebec37902a9	multilib	564d80d2026ae9f1910d8da4ea211e91	python	a0b470c1fca4658ffc97f0df0f25dcdc	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=7fd20eb640f16d76706b6ca03c3bc3eb
diff --git a/metadata/md5-cache/sys-block/fio-2.0.9 b/metadata/md5-cache/sys-block/fio-2.0.9
new file mode 100644
index 000000000000..c9ccbc3be507
--- /dev/null
+++ b/metadata/md5-cache/sys-block/fio-2.0.9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=dev-libs/libaio
+DESCRIPTION=Jens Axboe's Flexible IO tester
+EAPI=4
+HOMEPAGE=http://brick.kernel.dk/snaps/
+KEYWORDS=~amd64 ~ia64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/libaio
+SLOT=0
+SRC_URI=http://brick.kernel.dk/snaps/fio-2.0.9.tar.bz2
+_eclasses_=eutils	b8eb29e3c9c4e94c65da9ebec37902a9	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	multilib	564d80d2026ae9f1910d8da4ea211e91	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=3916261df21d729d2003b09ab99f3b3a
diff --git a/metadata/md5-cache/sys-libs/freeipmi-1.2.0_beta0 b/metadata/md5-cache/sys-libs/freeipmi-1.2.1
similarity index 88%
rename from metadata/md5-cache/sys-libs/freeipmi-1.2.0_beta0
rename to metadata/md5-cache/sys-libs/freeipmi-1.2.1
index 70a40277f93b..c7b0b1a68f9d 100644
--- a/metadata/md5-cache/sys-libs/freeipmi-1.2.0_beta0
+++ b/metadata/md5-cache/sys-libs/freeipmi-1.2.1
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=dev-libs/libgcrypt sys-apps/openrc
 SLOT=0
-SRC_URI=mirror://gnu-alpha/freeipmi/freeipmi-1.2.0.beta0.tar.gz
+SRC_URI=mirror://gnu/freeipmi/freeipmi-1.2.1.tar.gz
 _eclasses_=autotools	d89996a2048bc6d1ae72bfa4c04517fe	eutils	b8eb29e3c9c4e94c65da9ebec37902a9	libtool	a83de71c2123161fc5a8323cb275f8e5	multilib	564d80d2026ae9f1910d8da4ea211e91	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=94610d04f9cea269a9236ec5d3df3f54
+_md5_=d871c1ed0f434513437d19ba9495fad4
diff --git a/metadata/md5-cache/sys-libs/glibc-2.15-r2 b/metadata/md5-cache/sys-libs/glibc-2.15-r2
index 230759549549..0f7de9ae2153 100644
--- a/metadata/md5-cache/sys-libs/glibc-2.15-r2
+++ b/metadata/md5-cache/sys-libs/glibc-2.15-r2
@@ -8,6 +8,6 @@ LICENSE=LGPL-2
 RDEPEND=!sys-kernel/ps3-sources selinux? ( sys-libs/libselinux ) !sys-libs/nss-db vanilla? ( !sys-libs/timezone-data ) !vanilla? ( sys-libs/timezone-data )
 RESTRICT=strip
 SLOT=2.2
-SRC_URI=mirror://gnu/glibc/glibc-2.15.tar.xz ftp://sources.redhat.com/pub/glibc/releases/glibc-2.15.tar.xz ftp://sources.redhat.com/pub/glibc/snapshots/glibc-2.15.tar.xz mirror://gentoo/glibc-2.15.tar.xz mirror://gnu/glibc/glibc-ports-2.15.tar.xz ftp://sources.redhat.com/pub/glibc/releases/glibc-ports-2.15.tar.xz ftp://sources.redhat.com/pub/glibc/snapshots/glibc-ports-2.15.tar.xz mirror://gentoo/glibc-ports-2.15.tar.xz mirror://gentoo/glibc-2.15-patches-20.tar.bz2 http://dev.gentoo.org/~vapier/dist/glibc-2.15-patches-20.tar.bz2 http://dev.gentoo.org/~azarah/glibc/glibc-2.15-patches-20.tar.bz2
+SRC_URI=mirror://gnu/glibc/glibc-2.15.tar.xz ftp://sources.redhat.com/pub/glibc/releases/glibc-2.15.tar.xz ftp://sources.redhat.com/pub/glibc/snapshots/glibc-2.15.tar.xz mirror://gentoo/glibc-2.15.tar.xz mirror://gnu/glibc/glibc-ports-2.15.tar.xz ftp://sources.redhat.com/pub/glibc/releases/glibc-ports-2.15.tar.xz ftp://sources.redhat.com/pub/glibc/snapshots/glibc-ports-2.15.tar.xz mirror://gentoo/glibc-ports-2.15.tar.xz mirror://gentoo/glibc-2.15-patches-21.tar.bz2 http://dev.gentoo.org/~vapier/dist/glibc-2.15-patches-21.tar.bz2 http://dev.gentoo.org/~azarah/glibc/glibc-2.15-patches-21.tar.bz2
 _eclasses_=eutils	b8eb29e3c9c4e94c65da9ebec37902a9	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnuconfig	9200bfc8e0184357abfb86a08edd4fc3	libtool	a83de71c2123161fc5a8323cb275f8e5	multilib	564d80d2026ae9f1910d8da4ea211e91	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142	unpacker	50e1227854e96469a19a63f053496328	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=a407ce51b9e4d8b674f3eaf9f63c33ee
+_md5_=7eeaf59f3ffc2a09f29fd39938ca1b98
diff --git a/metadata/md5-cache/sys-process/parallel-20120822 b/metadata/md5-cache/sys-process/parallel-20120822
new file mode 100644
index 000000000000..bed43315c915
--- /dev/null
+++ b/metadata/md5-cache/sys-process/parallel-20120822
@@ -0,0 +1,11 @@
+DEFINED_PHASES=configure install postinst
+DEPEND=dev-lang/perl dev-perl/Devel-Size virtual/perl-Data-Dumper virtual/perl-File-Temp virtual/perl-IO !<sys-apps/moreutils-0.45-r1 !<sci-geosciences/grass-6.4.1-r1
+DESCRIPTION=A shell tool for executing jobs in parallel locally or on remote machines
+EAPI=4
+HOMEPAGE=http://www.gnu.org/software/parallel/
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-3
+RDEPEND=dev-lang/perl dev-perl/Devel-Size virtual/perl-Data-Dumper virtual/perl-File-Temp virtual/perl-IO
+SLOT=0
+SRC_URI=mirror://gnu/parallel/parallel-20120822.tar.bz2
+_md5_=54307e498047db62a535a23186f5b579
diff --git a/metadata/md5-cache/www-apps/nikola-4 b/metadata/md5-cache/www-apps/nikola-4
new file mode 100644
index 000000000000..d10e35e1e4e2
--- /dev/null
+++ b/metadata/md5-cache/www-apps/nikola-4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=!<sys-apps/portage-2.1.10.58 python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 )
+DESCRIPTION=A static website and blog generator
+EAPI=4
+HOMEPAGE=http://nikola.ralsina.com.ar/
+IUSE=python_targets_python2_6 python_targets_python2_7
+KEYWORDS=~amd64
+LICENSE=GPL-3
+RDEPEND=dev-python/docutils dev-python/doit dev-python/imaging >=dev-python/mako-0.6 dev-python/pygments python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 )
+REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
+SLOT=0
+SRC_URI=http://nikola-generator.googlecode.com/files/nikola-4.zip
+_eclasses_=python-distutils-ng	6786a3ab681bb2f21310183278f72e33
+_md5_=64bbac02aeadc15abf2e2d6bf841ae33
diff --git a/metadata/md5-cache/www-apps/otrs-3.1.7 b/metadata/md5-cache/www-apps/otrs-3.1.9
similarity index 94%
rename from metadata/md5-cache/www-apps/otrs-3.1.7
rename to metadata/md5-cache/www-apps/otrs-3.1.9
index f542c930cd30..05e7c545f72d 100644
--- a/metadata/md5-cache/www-apps/otrs-3.1.7
+++ b/metadata/md5-cache/www-apps/otrs-3.1.9
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 ~x86
 LICENSE=AGPL-3
 RDEPEND=dev-perl/Authen-SASL dev-perl/Crypt-PasswdMD5 dev-perl/CSS-Minifier dev-perl/Date-Pcalc mysql? ( dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg ) dev-perl/DBI gd? ( dev-perl/GD dev-perl/GDTextUtil dev-perl/GDGraph ) dev-perl/IO-Socket-SSL >=dev-perl/JavaScript-Minifier-1.05 >=dev-perl/JSON-2.21 dev-perl/JSON-XS dev-perl/LWP-UserAgent-Determined dev-perl/Mail-POP3Client dev-perl/MailTools >=dev-perl/MIME-tools-5.427 dev-perl/NetxAP dev-perl/Net-IMAP-Simple-SSL >dev-perl/Net-DNS-0.60 dev-perl/Net-SMTP-SSL dev-perl/Net-SMTP-TLS dev-perl/IO-stringy pdf? ( >=dev-perl/PDF-API2-0.73 virtual/perl-Compress-Raw-Zlib ) ldap? ( dev-perl/perl-ldap ) soap? ( dev-perl/SOAP-Lite !=dev-perl/SOAP-Lite-0.711 !=dev-perl/SOAP-Lite-0.712 ) dev-perl/Text-CSV dev-perl/Text-CSV_XS dev-perl/TimeDate dev-perl/XML-Parser virtual/perl-MIME-Base64 >=virtual/perl-CGI-3.33 virtual/perl-libnet virtual/perl-Digest-MD5 >=virtual/perl-Digest-SHA-5.48 virtual/mta apache2? ( mod_perl? ( www-servers/apache:2 =www-apache/libapreq2-2* www-apache/mod_perl ) fastcgi? ( || ( www-apache/mod_fcgid www-apache/mod_fastcgi ) www-servers/apache:2[suexec] ) !fastcgi? ( !mod_perl? ( www-servers/apache:2[suexec] ) ) ) fastcgi? ( dev-perl/FCGI virtual/httpd-fastcgi ) !fastcgi? ( !apache2? ( virtual/httpd-cgi ) )
 SLOT=0
-SRC_URI=http://ftp.otrs.org/pub/otrs/otrs-3.1.7.tar.bz2
+SRC_URI=http://ftp.otrs.org/pub/otrs/otrs-3.1.9.tar.bz2
 _eclasses_=confutils	a80706bb5b9ddcf6bbd14365656d4985	eutils	b8eb29e3c9c4e94c65da9ebec37902a9	multilib	564d80d2026ae9f1910d8da4ea211e91	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=ffdd09d3ac27b362089c2e9ee73f5ac5
+_md5_=11f6e5123b8432a40b94ba10dc919c54
diff --git a/metadata/md5-cache/x11-libs/colord-gtk-0.1.22 b/metadata/md5-cache/x11-libs/colord-gtk-0.1.22
index 4b431eb91b83..88d37b9a16a8 100644
--- a/metadata/md5-cache/x11-libs/colord-gtk-0.1.22
+++ b/metadata/md5-cache/x11-libs/colord-gtk-0.1.22
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=dev-libs/glib-2.28:2 >=media-libs/lcms-2.2:2 x11-libs/gdk-pixbuf:2[introspection?] x11-libs/gtk+:3[X(+),introspection?] x11-misc/colord[introspection?,vala?] introspection? ( >=dev-libs/gobject-introspection-0.9.8 ) dev-libs/libxslt >=dev-util/intltool-0.35 >=sys-devel/gettext-0.17 virtual/pkgconfig doc? ( app-text/docbook-xml-dtd:4.1.2 >=dev-util/gtk-doc-1.9 ) vala? ( dev-lang/vala:0.14[vapigen] ) || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-libs/glib-2.28:2 >=media-libs/lcms-2.2:2 x11-libs/gdk-pixbuf:2[introspection?] x11-libs/gtk+:3[X(+),introspection?] x11-misc/colord[introspection?,vala?] introspection? ( >=dev-libs/gobject-introspection-0.9.8 ) app-arch/xz-utils dev-libs/libxslt >=dev-util/intltool-0.35 >=sys-devel/gettext-0.17 virtual/pkgconfig doc? ( app-text/docbook-xml-dtd:4.1.2 >=dev-util/gtk-doc-1.9 ) vala? ( dev-lang/vala:0.14[vapigen] ) || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=GTK support library for colord
 EAPI=4
 HOMEPAGE=http://www.freedesktop.org/software/colord/
@@ -8,7 +8,8 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd
 LICENSE=LGPL-3
 RDEPEND=>=dev-libs/glib-2.28:2 >=media-libs/lcms-2.2:2 x11-libs/gdk-pixbuf:2[introspection?] x11-libs/gtk+:3[X(+),introspection?] x11-misc/colord[introspection?,vala?] introspection? ( >=dev-libs/gobject-introspection-0.9.8 ) !<x11-misc/colord-0.1.22
 REQUIRED_USE=vala? ( introspection )
+RESTRICT=test
 SLOT=0
 SRC_URI=http://www.freedesktop.org/software/colord/releases/colord-gtk-0.1.22.tar.xz
 _eclasses_=autotools	d89996a2048bc6d1ae72bfa4c04517fe	eutils	b8eb29e3c9c4e94c65da9ebec37902a9	libtool	a83de71c2123161fc5a8323cb275f8e5	multilib	564d80d2026ae9f1910d8da4ea211e91	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=f76240f270c6d77e6626b5e25cf982aa
+_md5_=9fe9f418a89b327fd5d791ba475addb4
diff --git a/metadata/md5-cache/x11-misc/tabbed-0.4.1 b/metadata/md5-cache/x11-misc/tabbed-0.4.1
new file mode 100644
index 000000000000..5eec504309aa
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/tabbed-0.4.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst prepare
+DEPEND=x11-proto/xproto x11-libs/libX11
+DESCRIPTION=Simple generic tabbed fronted to xembed aware applications
+EAPI=3
+HOMEPAGE=http://tools.suckless.org/tabbed
+IUSE=savedconfig
+KEYWORDS=~amd64 ~x86
+LICENSE=as-is
+RDEPEND=x11-libs/libX11
+SLOT=0
+SRC_URI=http://dl.suckless.org/tools/tabbed-0.4.1.tar.gz
+_eclasses_=multilib	564d80d2026ae9f1910d8da4ea211e91	portability	536c5e70c5fb252ed3b769e04aa3f05b	savedconfig	973a6df1a0949eba28a185eac79de815	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142
+_md5_=00a6e39c68336f1813bd9bcc24c57d93
diff --git a/metadata/md5-cache/x11-misc/xdg-utils-1.1.0_rc1_p20120823 b/metadata/md5-cache/x11-misc/xdg-utils-1.1.0_rc1_p20120823
new file mode 100644
index 000000000000..0b90dcb71aa4
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/xdg-utils-1.1.0_rc1_p20120823
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst
+DESCRIPTION=Portland utils for cross-platform/cross-toolkit/cross-desktop interoperability
+EAPI=4
+HOMEPAGE=http://portland.freedesktop.org/
+IUSE=doc +perl
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info x11-apps/xprop x11-apps/xset perl? ( dev-perl/File-MimeInfo )
+RESTRICT=test
+SLOT=0
+SRC_URI=http://dev.gentoo.org/~ssuominen/xdg-utils-1.1.0_rc1_p20122308.tar.xz -> xdg-utils-1.1.0_rc1_p20120823.tar.xz
+_md5_=f2c41f30e6745b3d1ea848b704667f28
diff --git a/metadata/md5-cache/x11-terms/eterm-0.9.6 b/metadata/md5-cache/x11-terms/eterm-0.9.6
index 8c9b1e5cda11..a2c0b54762e1 100644
--- a/metadata/md5-cache/x11-terms/eterm-0.9.6
+++ b/metadata/md5-cache/x11-terms/eterm-0.9.6
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure install unpack
 DEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libICE x11-libs/libSM x11-proto/xextproto x11-proto/xproto >=x11-libs/libast-0.6.1 media-libs/imlib2[X] media-fonts/font-misc-misc escreen? ( app-misc/screen ) || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A vt102 terminal emulator for X
-EAPI=2
+EAPI=3
 HOMEPAGE=http://www.eterm.org/
-IUSE=escreen minimal mmx sse2 unicode
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd
+IUSE=escreen minimal mmx sse2 unicode +utempter
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~ppc-macos ~x86-macos
 LICENSE=BSD
 RDEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libICE x11-libs/libSM x11-proto/xextproto x11-proto/xproto >=x11-libs/libast-0.6.1 media-libs/imlib2[X] media-fonts/font-misc-misc escreen? ( app-misc/screen )
 SLOT=0
 SRC_URI=http://www.eterm.org/download/Eterm-0.9.6.tar.gz !minimal? ( http://www.eterm.org/download/Eterm-bg-0.9.6.tar.gz )
 _eclasses_=autotools	d89996a2048bc6d1ae72bfa4c04517fe	eutils	b8eb29e3c9c4e94c65da9ebec37902a9	libtool	a83de71c2123161fc5a8323cb275f8e5	multilib	564d80d2026ae9f1910d8da4ea211e91	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=bd6aff283502a0b920459ab8a7775e14
+_md5_=f8d95658f1c815ca7a062096fbf16356
diff --git a/metadata/md5-cache/x11-terms/eterm-9999 b/metadata/md5-cache/x11-terms/eterm-9999
index 9527ff837b12..7befe11c6132 100644
--- a/metadata/md5-cache/x11-terms/eterm-9999
+++ b/metadata/md5-cache/x11-terms/eterm-9999
@@ -1,11 +1,11 @@
 DEFINED_PHASES=configure install preinst prepare unpack
 DEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libICE x11-libs/libSM x11-proto/xextproto x11-proto/xproto >=x11-libs/libast-0.6.1 media-libs/imlib2[X] media-fonts/font-misc-misc escreen? ( app-misc/screen ) || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool || ( dev-vcs/subversion[webdav-neon] dev-vcs/subversion[webdav-serf] ) net-misc/rsync
 DESCRIPTION=A vt102 terminal emulator for X
-EAPI=2
+EAPI=3
 HOMEPAGE=http://www.eterm.org/
-IUSE=escreen minimal mmx sse2 unicode
+IUSE=escreen minimal mmx sse2 unicode +utempter
 LICENSE=BSD
 RDEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libICE x11-libs/libSM x11-proto/xextproto x11-proto/xproto >=x11-libs/libast-0.6.1 media-libs/imlib2[X] media-fonts/font-misc-misc escreen? ( app-misc/screen )
 SLOT=0
 _eclasses_=autotools	d89996a2048bc6d1ae72bfa4c04517fe	eutils	b8eb29e3c9c4e94c65da9ebec37902a9	libtool	a83de71c2123161fc5a8323cb275f8e5	multilib	564d80d2026ae9f1910d8da4ea211e91	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	subversion	877d251a42b69543c01f6a36b4707b3b	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=6a0c743d48bc19296f93a63ff3928f0c
+_md5_=ec70a886f12560c5cd4b22e74738e4d6
diff --git a/metadata/md5-cache/x11-themes/qtcurve-qt4-1.8.14 b/metadata/md5-cache/x11-themes/qtcurve-qt4-1.8.14
new file mode 100644
index 000000000000..fcac892fe99f
--- /dev/null
+++ b/metadata/md5-cache/x11-themes/qtcurve-qt4-1.8.14
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
+DEPEND=x11-libs/qt-gui:4[dbus] x11-libs/qt-svg:4 kde? ( >=kde-base/systemsettings-4.4:4[aqua=] windeco? ( >=kde-base/kwin-4.4:4[aqua=] ) ) >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) kde? ( dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) ) kde? ( dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] )
+DESCRIPTION=A set of widget styles for Qt4 based apps, also available for GTK2
+EAPI=4
+HOMEPAGE=http://www.kde-look.org/content/show.php?content=40492
+IUSE=kde windeco aqua kde
+KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=x11-libs/qt-gui:4[dbus] x11-libs/qt-svg:4 kde? ( >=kde-base/systemsettings-4.4:4[aqua=] windeco? ( >=kde-base/kwin-4.4:4[aqua=] ) ) kde? ( >=kde-base/oxygen-icons-4.4:4[aqua=] ) kde? ( dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] )
+REQUIRED_USE=windeco? ( kde )
+SLOT=0
+SRC_URI=http://craigd.wikispaces.com/file/view/QtCurve-KDE4-1.8.14.tar.bz2
+_eclasses_=base	d40e074a6349af3ea5e937210630bdc1	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	b8eb29e3c9c4e94c65da9ebec37902a9	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	gnome2-utils	e0a2e141b421d38788b23422dfbe4f82	kde4-base	6e4e3fc3a36f43b71c84ad615e804a83	kde4-functions	df82ee2da839042995eb204cf576da49	multilib	564d80d2026ae9f1910d8da4ea211e91	toolchain-funcs	d3b5812eeab360bc41aa48b6cdbbc142	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_md5_=f252a1c0a97e9262850791a0ba5eb4d6
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index aa3348a88068..8d7ffc30d281 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Wed, 22 Aug 2012 18:07:32 +0000
+Thu, 23 Aug 2012 06:07:35 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index c59495b7690c..602c683fe122 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Wed Aug 22 18:07:30 UTC 2012
+Thu Aug 23 06:07:32 UTC 2012
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 535f644917cd..9f6882cd3cd5 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Wed, 22 Aug 2012 18:30:01 +0000
+Thu, 23 Aug 2012 06:30:01 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 40ca3ad10d54..e5dd05b49a61 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1345658701 Wed Aug 22 18:05:01 2012 UTC
+1345701901 Thu Aug 23 06:05:01 2012 UTC
diff --git a/net-analyzer/pmacct/Manifest b/net-analyzer/pmacct/Manifest
index b080d7753481..8c48f591a0ed 100644
--- a/net-analyzer/pmacct/Manifest
+++ b/net-analyzer/pmacct/Manifest
@@ -1,2 +1,3 @@
-DIST pmacct-0.12.5.tar.gz 552007 RMD160 de505ff82158fa56ebdc2a7f485814a0680b3d0c SHA1 efbabc0ae624f1b5c1229c0ded26b9bd5debc5cd SHA256 5252d7df24e9baefcc5a36ed66e9cac5ae505c9d502c8cffb96e6808acbb2fe8
-DIST pmacct-0.14.0.tar.gz 700794 RMD160 7bb093257f672b143b3823734328d6650e5846e4 SHA1 0b1cd2f04294af4ce1586f8ddd55523f9f2fb72f SHA256 c4b4ed5608c600910bd580f92faefd8d3af0f6d5c4aabddb5ce31c6d192e0336
+DIST pmacct-0.12.5.tar.gz 552007 SHA256 5252d7df24e9baefcc5a36ed66e9cac5ae505c9d502c8cffb96e6808acbb2fe8 SHA512 86a1b29055d517c070ebe5a592685e2409ef26b79fa53fea3b9280a53523adc9096eb7c9d689892a78e0c26e9b57f4777f96fe0bf102bace3146bd44a63dbd83 WHIRLPOOL 5ee946e675eaab84134f10b868679a142bb71ab944b967eaf40180b52f20dee1e98caae3bf9d6350e859b19f75f93119815d1995e157e95d802f20a494e50816
+DIST pmacct-0.14.0.tar.gz 700794 SHA256 c4b4ed5608c600910bd580f92faefd8d3af0f6d5c4aabddb5ce31c6d192e0336 SHA512 79f0ba4fe4aa426e9d429a48ef7b329f0a37293b9334185f1f2d2f64abcf1293f91f48d001434a541c7311551d821121423761ea468b9e248cd9e9474e1c7a24 WHIRLPOOL 5ed5874d3a97810e305bf853c02aef4ff0236971dece85280b6a605caa1418dc9d340caa79d4e297dbf202842e0f7e04fb4bd1e2faf93528ec7a887948c2d6e9
+DIST pmacct-0.14.1.tar.gz 704707 SHA256 048f5747c2caa1085f1cd9442668b9edc98a40688b7696d1ad6f1e16c5a6d206 SHA512 0c13a2a2faab0fda1ba3b9218ea1f5d33de2581abb16916fa95ad80a05758e65b9bd2c19fa54bf1f59e62f8c769c9b0dedcbc505bcc4eb8fc79df12806b013a2 WHIRLPOOL 04d1816c924841f1008f58b6828f7128bdb42b2cca3750dc1b2342386ea125ebb8fadb923ff6eeee6367359742a96a97ff36d69b17439defe523081b1b1bede3
diff --git a/net-analyzer/pmacct/pmacct-0.14.1.ebuild b/net-analyzer/pmacct/pmacct-0.14.1.ebuild
new file mode 100644
index 000000000000..3d48e13c4f02
--- /dev/null
+++ b/net-analyzer/pmacct/pmacct-0.14.1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pmacct/pmacct-0.14.1.ebuild,v 1.1 2012/08/23 03:18:17 jer Exp $
+
+EAPI=4
+inherit eutils toolchain-funcs
+
+DESCRIPTION="A network tool to gather IP traffic information"
+HOMEPAGE="http://www.pmacct.net/"
+SRC_URI="http://www.pmacct.net/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="64bit debug ipv6 mysql postgres sqlite threads ulog"
+
+RDEPEND="net-libs/libpcap
+	mysql? ( virtual/mysql )
+	postgres? ( dev-db/postgresql-base )
+	sqlite? ( =dev-db/sqlite-3* )"
+DEPEND="${RDEPEND}"
+DOCS=(
+	CONFIG-KEYS ChangeLog FAQS KNOWN-BUGS README TODO TOOLS UPGRADE
+	docs/INTERNALS docs/PLUGINS docs/SIGNALS
+)
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.12.0-gentoo.patch
+}
+
+src_configure() {
+	tc-export CC
+	econf \
+		$(use_enable 64bit) \
+		$(use_enable debug) \
+		$(use_enable ipv6) \
+		$(use_enable mysql) \
+		$(use_enable postgres pgsql) \
+		$(use_enable sqlite sqlite3) \
+		$(use_enable threads) \
+		$(use_enable ulog) \
+		|| die "econf failed"
+}
+
+src_install() {
+	default
+
+	for dirname in examples sql; do
+		docinto ${dirname}
+		dodoc ${dirname}/*
+	done
+
+	newinitd "${FILESDIR}"/pmacctd-init.d pmacctd
+	newconfd "${FILESDIR}"/pmacctd-conf.d pmacctd
+
+	insinto /etc/pmacctd
+	newins examples/pmacctd-imt.conf.example pmacctd.conf
+}
diff --git a/net-analyzer/thrulay/thrulay-0.9-r1.ebuild b/net-analyzer/thrulay/thrulay-0.9-r1.ebuild
index be791f304f0d..a8b0c7f024bf 100644
--- a/net-analyzer/thrulay/thrulay-0.9-r1.ebuild
+++ b/net-analyzer/thrulay/thrulay-0.9-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/thrulay/thrulay-0.9-r1.ebuild,v 1.3 2012/08/11 14:22:53 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/thrulay/thrulay-0.9-r1.ebuild,v 1.4 2012/08/23 05:56:26 xmw Exp $
 
 EAPI=4
 inherit toolchain-funcs autotools
@@ -11,7 +11,7 @@ SRC_URI="http://www.internet2.edu/~shalunov/thrulay/${P}.tar.gz
 		mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
 IUSE=""
 DEPEND=""
 
diff --git a/net-firewall/conntrack-tools/Manifest b/net-firewall/conntrack-tools/Manifest
index a8d04a398a4d..fab9543bdafc 100644
--- a/net-firewall/conntrack-tools/Manifest
+++ b/net-firewall/conntrack-tools/Manifest
@@ -1,3 +1,4 @@
-DIST conntrack-tools-0.9.14.tar.bz2 433383 RMD160 a7311ca790da31c2a7c93cceffffbd142c3e7ab7 SHA1 d49b6716331c81c3c41d013bbf7a985802121a86 SHA256 2e36744da83eb2e6e54a5769aa1abf044d53089470d646898222936e7e8da6ac
-DIST conntrack-tools-1.0.0.tar.bz2 440061 RMD160 2af1703eb882ca133fd725eddf834d9658e435a2 SHA1 2e50741c0b22a0ad06e43a21106b97f67bbbd3d7 SHA256 fe36b044bb494d1810a6d73f0b4ccd25b6e81f72a2fc63c44da79ceebe4817b0
-DIST conntrack-tools-1.0.1.tar.bz2 444640 RMD160 167bb7e19f53f6b38d91646f51b13158ccd59d46 SHA1 5d76e63e67ca45387fc53a8cd95749146de2a70c SHA256 1e5769a17ed17e1e8886a1807af00acda4cceec996d194f0519d922e41655380
+DIST conntrack-tools-0.9.14.tar.bz2 433383 SHA256 2e36744da83eb2e6e54a5769aa1abf044d53089470d646898222936e7e8da6ac
+DIST conntrack-tools-1.0.0.tar.bz2 440061 SHA256 fe36b044bb494d1810a6d73f0b4ccd25b6e81f72a2fc63c44da79ceebe4817b0
+DIST conntrack-tools-1.0.1.tar.bz2 444640 SHA256 1e5769a17ed17e1e8886a1807af00acda4cceec996d194f0519d922e41655380 SHA512 7071cce675798694714f2cd0762804cc9cac749898ff5aa52d700f21dff60c4fd4b814c04f8a8a8cac19411919fdf80973cd25add1d813c9926c2b5706f734c0 WHIRLPOOL ac16a000bbe7843605552ed6fb6ed585e6425361a6f375c3ecae16b51fdc21725118a5441e073c75bb4f784150e0026e1463f2061c684bc62260ddf561c039e6
+DIST conntrack-tools-1.2.2.tar.bz2 476888 SHA256 e1da5f4c46094c252df5a167b28ecf2085dd73d1258316021d80612e5c9e332b SHA512 461ae67a5b8af2f43df393c6e5204a88c9f1e2bbfe40bb954fdb18e5c7855fb80cc446d51924546198d2626ebba404d86dd0bf3e94da0735d8a5caa741605f99 WHIRLPOOL edfb63e1edd9cef59f77e0851e715b157d11737c44afe5b4e682faa09b17181d2f8f2de6476a922ba6dc9d5e2caf1611231cc6a26c2d6c7f75840db75f5d5c5f
diff --git a/net-firewall/conntrack-tools/conntrack-tools-1.2.2.ebuild b/net-firewall/conntrack-tools/conntrack-tools-1.2.2.ebuild
new file mode 100644
index 000000000000..426af76bdc59
--- /dev/null
+++ b/net-firewall/conntrack-tools/conntrack-tools-1.2.2.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/conntrack-tools/conntrack-tools-1.2.2.ebuild,v 1.1 2012/08/23 01:34:40 jer Exp $
+
+EAPI="4"
+
+inherit linux-info
+
+DESCRIPTION="Connection tracking userspace tools"
+HOMEPAGE="http://conntrack-tools.netfilter.org"
+SRC_URI="http://www.netfilter.org/projects/conntrack-tools/files/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=net-libs/libnetfilter_conntrack-1.0.1
+	>=net-libs/libnetfilter_cttimeout-1.0.0
+	>=net-libs/libnfnetlink-1.0.0
+	net-libs/libmnl"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	sys-devel/bison
+	sys-devel/flex"
+
+pkg_setup() {
+	linux-info_pkg_setup
+
+	if kernel_is lt 2 6 18 ; then
+		die "${PN} requires at least 2.6.18 kernel version"
+	fi
+
+	#netfilter core team has changed some option names with kernel 2.6.20
+	if kernel_is lt 2 6 20 ; then
+		CONFIG_CHECK="~IP_NF_CONNTRACK_NETLINK"
+	else
+		CONFIG_CHECK="~NF_CT_NETLINK"
+	fi
+	CONFIG_CHECK="${CONFIG_CHECK} ~NF_CONNTRACK
+		~NETFILTER_NETLINK ~NF_CONNTRACK_EVENTS"
+
+	check_extra_config
+
+	linux_config_exists || \
+		linux_chkconfig_present "NF_CONNTRACK_IPV4" || \
+		linux_chkconfig_present "NF_CONNTRACK_IPV6" || \
+		ewarn "CONFIG_NF_CONNTRACK_IPV4 or CONFIG_NF_CONNTRACK_IPV6 " \
+			"are not set when one at least should be."
+}
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}/conntrackd.initd-r1" conntrackd
+	newconfd "${FILESDIR}/conntrackd.confd-r1" conntrackd
+
+	insinto /etc/conntrackd
+	doins doc/stats/conntrackd.conf
+
+	insinto /usr/share/doc/${PF}
+	doins -r doc/*
+}
diff --git a/net-libs/gsoap/Manifest b/net-libs/gsoap/Manifest
index 50496b5130c3..6e6790b6795e 100644
--- a/net-libs/gsoap/Manifest
+++ b/net-libs/gsoap/Manifest
@@ -1,5 +1,3 @@
 DIST gsoap_2.7.17.zip 10224444 SHA256 d3af1ce9464b28cacdf1dfbe09b689f8927cbcf3948479996aef52a39afa2c16
-DIST gsoap_2.8.0.zip 10776994 SHA256 48dd009fed0ac361c669dab17e543184909d0567175d8be4af5afc7849d314e6
-DIST gsoap_2.8.1.zip 10954908 SHA256 1b80b04712aa5170a9fa5a88cc4debb489c38dcd0225093c45e99d3141666bae
-DIST gsoap_2.8.8.zip 13782549 SHA256 8b1ad1cbd521bd5f85ff4c038bfd5a17a2530610c1ce8bf7318725bc568465cc
+DIST gsoap_2.8.10.zip 19156778 SHA256 fddfd59ba9b0236daa59d1ced9149cb827d446e0a24b85395ed23c10858cabfb SHA512 e1f5badada6b0cd0351ca593add793491a8b8c0d6e0e6db454b30efbacd250aa5c27943bf3be1dc69bf2445ff6c9aadb57d386054be5874f37e1d81a806772bb WHIRLPOOL 2adacd31f431aa9da6e8e70c653b8e965debde6ba1c17c5d23f67ce7678a71bb7913c9fce41bf7515ea39509aa1c269fba60f5ffd5ce093b6aace049926dd23a
 DIST gsoap_2.8.9.zip 18955364 SHA256 24ff4a4c3b2470149febfd9d2d22127a267e9e92f4a5dd1ad2b16d07da62a7d5 SHA512 cba30527862f1d6a8e7f82553af0f00aa5abdda26cd2c052b32417251374671d63d3afc3a31152c7355722c0d7db414825ae98cfb5645263fbbea634794d01e6 WHIRLPOOL b0dbeb9cba3c97fe7cd68646a715c8c5851c14c3b080291153a65755b973ec3ef49b27725564bed16cb53c3b50516d252526736edd8fb625e4f003e91f8b5ecb
diff --git a/net-libs/gsoap/gsoap-2.8.0.ebuild b/net-libs/gsoap/gsoap-2.8.0.ebuild
deleted file mode 100644
index 7dd7f9db96da..000000000000
--- a/net-libs/gsoap/gsoap-2.8.0.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gsoap/gsoap-2.8.0.ebuild,v 1.2 2010/10/02 10:28:46 polynomial-c Exp $
-
-EAPI=2
-
-inherit autotools eutils
-
-MY_P="${PN}-2.8"
-
-DESCRIPTION="A cross-platform open source C and C++ SDK to ease the development of SOAP/XML Web services"
-HOMEPAGE="http://gsoap2.sourceforge.net"
-SRC_URI="mirror://sourceforge/gsoap2/gsoap_${PV}.zip"
-
-LICENSE="GPL-2 gSOAP"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc debug examples +ssl"
-
-DEPEND="app-arch/unzip
-	sys-devel/flex
-	sys-devel/bison
-	sys-libs/zlib
-	ssl? ( dev-libs/openssl )"
-RDEPEND=""
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	# Fix Pre-ISO headers
-	epatch "${FILESDIR}/${PN}-2.7-fix-pre-iso-headers.patch"
-	epatch "${FILESDIR}/${PN}-2.7.10-fedora-install_soapcpp2_wsdl2h_aux.patch"
-
-	# causes compilation of app-emulation/virtualbox-ose[vboxwebsrv] to
-	# break (bug #320901):
-	#epatch "${FILESDIR}/${PN}-2.7.15-use_libtool.patch"
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable ssl openssl) \
-		$(use_enable examples samples) \
-		$(use_enable debug)
-}
-
-src_compile() {
-	emake -j1 || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "Install failed"
-
-	# yes, we also install the license-file since
-	# it contains info about how to apply the licenses
-	dodoc *.txt
-
-	dohtml changelog.html
-
-	rm -rf "${D}"/usr/lib*/*.la
-
-	if use examples; then
-		rm -rf gsoap/samples/Makefile* gsoap/samples/*/Makefile* gsoap/samples/*/*.o
-		insinto /usr/share/doc/${PF}/examples
-		doins -r gsoap/samples/*
-	fi
-
-	if use doc; then
-		dohtml -r gsoap/doc/*
-	fi
-}
diff --git a/net-libs/gsoap/gsoap-2.8.1.ebuild b/net-libs/gsoap/gsoap-2.8.1.ebuild
deleted file mode 100644
index e21aff80c9ee..000000000000
--- a/net-libs/gsoap/gsoap-2.8.1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gsoap/gsoap-2.8.1.ebuild,v 1.1 2011/01/19 16:40:49 polynomial-c Exp $
-
-EAPI=2
-
-inherit autotools eutils
-
-MY_P="${PN}-2.8"
-
-DESCRIPTION="A cross-platform open source C and C++ SDK to ease the development of SOAP/XML Web services"
-HOMEPAGE="http://gsoap2.sourceforge.net"
-SRC_URI="mirror://sourceforge/gsoap2/gsoap_${PV}.zip"
-
-LICENSE="GPL-2 gSOAP"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc debug examples +ssl"
-
-DEPEND="app-arch/unzip
-	sys-devel/flex
-	sys-devel/bison
-	sys-libs/zlib
-	ssl? ( dev-libs/openssl )"
-RDEPEND=""
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	# Fix Pre-ISO headers
-	epatch "${FILESDIR}/${PN}-2.7.10-fedora-install_soapcpp2_wsdl2h_aux.patch"
-
-	# causes compilation of app-emulation/virtualbox-ose[vboxwebsrv] to
-	# break (bug #320901):
-	#epatch "${FILESDIR}/${PN}-2.7.15-use_libtool.patch"
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable ssl openssl) \
-		$(use_enable examples samples) \
-		$(use_enable debug)
-}
-
-src_compile() {
-	emake -j1 || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "Install failed"
-
-	# yes, we also install the license-file since
-	# it contains info about how to apply the licenses
-	dodoc *.txt
-
-	dohtml changelog.html
-
-	rm -rf "${D}"/usr/lib*/*.la
-
-	if use examples; then
-		rm -rf gsoap/samples/Makefile* gsoap/samples/*/Makefile* gsoap/samples/*/*.o
-		insinto /usr/share/doc/${PF}/examples
-		doins -r gsoap/samples/*
-	fi
-
-	if use doc; then
-		dohtml -r gsoap/doc/*
-	fi
-}
diff --git a/net-libs/gsoap/gsoap-2.8.8.ebuild b/net-libs/gsoap/gsoap-2.8.10.ebuild
similarity index 93%
rename from net-libs/gsoap/gsoap-2.8.8.ebuild
rename to net-libs/gsoap/gsoap-2.8.10.ebuild
index f980c1e70e18..bf5c358678fe 100644
--- a/net-libs/gsoap/gsoap-2.8.8.ebuild
+++ b/net-libs/gsoap/gsoap-2.8.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gsoap/gsoap-2.8.8.ebuild,v 1.1 2012/03/24 10:27:08 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gsoap/gsoap-2.8.10.ebuild,v 1.1 2012/08/23 04:06:12 patrick Exp $
 
 EAPI=4
 
diff --git a/net-libs/libgsasl/libgsasl-1.8.0.ebuild b/net-libs/libgsasl/libgsasl-1.8.0.ebuild
index b2a5768c4758..77f841dde556 100644
--- a/net-libs/libgsasl/libgsasl-1.8.0.ebuild
+++ b/net-libs/libgsasl/libgsasl-1.8.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libgsasl/libgsasl-1.8.0.ebuild,v 1.6 2012/08/03 18:16:07 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libgsasl/libgsasl-1.8.0.ebuild,v 1.7 2012/08/22 19:10:44 johu Exp $
 
 EAPI="4"
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.gnu.org/software/gsasl/"
 SRC_URI="mirror://gnu/${PN/lib}/${P}.tar.gz"
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="idn gcrypt kerberos nls ntlm static-libs"
 DEPEND="
 	gcrypt? ( dev-libs/libgcrypt )
diff --git a/net-libs/libnetfilter_cttimeout/Manifest b/net-libs/libnetfilter_cttimeout/Manifest
new file mode 100644
index 000000000000..f92998f3fb22
--- /dev/null
+++ b/net-libs/libnetfilter_cttimeout/Manifest
@@ -0,0 +1 @@
+DIST libnetfilter_cttimeout-1.0.0.tar.bz2 275065 SHA256 aeab12754f557cba3ce2950a2029963d817490df7edb49880008b34d7ff8feba SHA512 d64f592be022d02b6e6627470f9aed75114b0c7177012d31d868ee7eb39fca330a7638c9a209ff489d4a8c0549b8fcfd33582c6d36ee519b920cf27429301c85 WHIRLPOOL a40a7b41ba118ff7868b8cf04f2653319d6ca242703c0b944d896336de80029ea2dd579eb706406035f57976c4890b7f984d6c9bba6fb240e78c6afa9f128c51
diff --git a/net-libs/libnetfilter_cttimeout/libnetfilter_cttimeout-1.0.0.ebuild b/net-libs/libnetfilter_cttimeout/libnetfilter_cttimeout-1.0.0.ebuild
new file mode 100644
index 000000000000..b37439f54bc7
--- /dev/null
+++ b/net-libs/libnetfilter_cttimeout/libnetfilter_cttimeout-1.0.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libnetfilter_cttimeout/libnetfilter_cttimeout-1.0.0.ebuild,v 1.1 2012/08/23 01:33:49 jer Exp $
+
+EAPI="4"
+
+inherit linux-info autotools-utils
+
+DESCRIPTION="netlink interface to the connection tracking timeout infrastructure in the kernel packet filter"
+HOMEPAGE="http://www.netfilter.org/projects/libnetfilter_cttimeout"
+SRC_URI="http://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static-libs"
+
+RDEPEND="net-libs/libmnl"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+CONFIG_CHECK="~NF_CT_NETLINK_TIMEOUT"
+
+pkg_setup() {
+	linux-info_pkg_setup
+	kernel_is lt 3 4 0 && ewarn "requires at least 3.4.0 kernel version"
+}
diff --git a/net-libs/libnetfilter_cttimeout/metadata.xml b/net-libs/libnetfilter_cttimeout/metadata.xml
new file mode 100644
index 000000000000..9ca15ca788e8
--- /dev/null
+++ b/net-libs/libnetfilter_cttimeout/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>netmon</herd>
+</pkgmetadata>
+
diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest
index 825e27192a82..48bf5b3c9940 100644
--- a/net-libs/nodejs/Manifest
+++ b/net-libs/nodejs/Manifest
@@ -1,4 +1,5 @@
 DIST node-v0.6.21.tar.gz 10235165 SHA256 22265fd07e09c22f1d058156d548e7398c9740210f534e2f848eeab5b9772117 SHA512 b00908576986741a2c10d00fb9ae4b97c8a8bd8e5937fc196b13bab80098b07f1f5eb2d0e67a1dd1d6d56acf45e4e847a60325501d9db3f02ddebf94e5393d5f WHIRLPOOL 1fa1d71ed761cb9fcef9b3bb0c640075349e0ccc67951e4554de200fd4091051d5b9b56f8d0cf28088df5ca2e9d1b0600e4a44ccf920b01ec570300f2bc38c95
 DIST node-v0.8.6.tar.gz 11468801 SHA256 dbd42800e69644beff5c2cf11a9d4cf6dfbd644a9a36ffdd5e8c6b8db9240854
 DIST node-v0.8.7.tar.gz 11490955 SHA256 fa979488347ad08ea6e36d3fe9c543807cd6f84cad31b22bfc6179b54b1e9d04 SHA512 040ce0340d98eb92341d6e571fe15e781b9d2379985701778ad06ba9f0756df44823fee9a525c00de38d02066d095a6329f5ab2e45185fcc382a7db945b05cf5 WHIRLPOOL f07a3580bff5c94871120329b02447748ef387c9b695c7204d4a3a6282d537a89f3184b494bf75699ae22d450867ab603fbc8ac1641c4a3fabef43b1e0ce64c6
+DIST node-v0.8.8.tar.gz 11492087 SHA256 092b7045b8e956f838a2a3da36cdcf7954e9e0d16fb88b14e2b7d090422e3133 SHA512 10bf88f9187b8dd17c9e2fc673feb18b024e9e498a98ff0b55572bed64b16e01fc983b3f7ebfd7022ed66df5d650e03ae5a18ba6351639a740ffe9ef731ed0e0 WHIRLPOOL df607ac41d34fae5c65bd311691c3043fcd967a16ff737271b1c9d89fd688da8b321a5235a07feab982147c30fdec5a0d9302e3689486fb5d6ce399c0e37cf20
 DIST node-v0.9.0.tar.gz 11827167 SHA256 4d2e5d7c8b345f6e401eed7d06b4bbc6cb012aefc34b46e7c3aedb4a0fccd258 SHA512 25806ef23cd0bd2854e40502759182ec0e6462ed9cec3462cd5e0888df1c315725791900f925c23cc6c9f470a8632b811c24522b50df7d5c16e5a439c4b56a14 WHIRLPOOL 574aecbc5ceb43cb3ea5f6bc54824f884401a4f7b3e11399fbaea5d620e156922d22c6a9474ab0f65933e672c9734fbeb3ce1ed96c4240c1ffc3aac6ea2087e4
diff --git a/net-libs/nodejs/nodejs-0.8.8.ebuild b/net-libs/nodejs/nodejs-0.8.8.ebuild
new file mode 100644
index 000000000000..1e4fb1b36e5f
--- /dev/null
+++ b/net-libs/nodejs/nodejs-0.8.8.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/nodejs/nodejs-0.8.8.ebuild,v 1.1 2012/08/23 04:34:50 patrick Exp $
+
+EAPI=3
+
+PYTHON_DEPEND="2"
+
+inherit python eutils multilib pax-utils
+
+# omgwtf
+RESTRICT="test"
+
+DESCRIPTION="Evented IO for V8 Javascript"
+HOMEPAGE="http://nodejs.org/"
+SRC_URI="http://nodejs.org/dist/v${PV}/node-v${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x64-macos"
+IUSE=""
+
+DEPEND=">=dev-lang/v8-3.11.10
+	dev-libs/openssl"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/node-v${PV}
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	# fix compilation on Darwin
+	# http://code.google.com/p/gyp/issues/detail?id=260
+	sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
+	# Hardcoded braindamage extraction helper
+	#sed -i -e 's:wafdir = join(prefix, "lib", "node"):wafdir = "/lib/node/":' tools/node-waf || die
+	python_convert_shebangs 2 tools/node-waf || die
+}
+
+src_configure() {
+	# this is an autotools lookalike confuserator
+	./configure --shared-v8 --prefix="${EPREFIX}"/usr --shared-v8-includes="${EPREFIX}"/usr/include --openssl-use-sys --shared-zlib || die
+}
+
+src_compile() {
+	emake || die
+}
+
+src_install() {
+	local MYLIB=$(get_libdir)
+	mkdir -p "${ED}"/usr/include/node
+	mkdir -p "${ED}"/usr/bin
+	mkdir -p "${ED}"/usr/"${MYLIB}"/node_modules/npm
+	mkdir -p "${ED}"/usr/"${MYLIB}"/node
+	cp 'src/eio-emul.h' 'src/ev-emul.h' 'src/node.h' 'src/node_buffer.h' 'src/node_object_wrap.h' 'src/node_version.h' "${ED}"/usr/include/node || die "Failed to copy stuff"
+	cp -R deps/uv/include/* "${ED}"/usr/include/node || die "Failed to copy stuff"
+	cp 'out/Release/node' "${ED}"/usr/bin/node || die "Failed to copy stuff"
+	cp -R deps/npm/* "${ED}"/usr/"${MYLIB}"/node_modules/npm || die "Failed to copy stuff"
+	cp -R tools/wafadmin "${ED}"/usr/"${MYLIB}"/node/ || die "Failed to copy stuff"
+	cp 'tools/node-waf' "${ED}"/usr/bin/ || die "Failed to copy stuff"
+
+	# now add some extra stupid just because we can
+	# needs to be a symlink because of hardcoded paths ... no es bueno!
+	dosym /usr/"${MYLIB}"/node_modules/npm/bin/npm-cli.js /usr/bin/npm
+	pax-mark -m "${ED}"/usr/bin/node
+}
+
+src_test() {
+	emake test || die
+}
diff --git a/net-misc/badvpn/badvpn-1.999.123-r1.ebuild b/net-misc/badvpn/badvpn-1.999.123-r2.ebuild
similarity index 96%
rename from net-misc/badvpn/badvpn-1.999.123-r1.ebuild
rename to net-misc/badvpn/badvpn-1.999.123-r2.ebuild
index 43fbc0bbea1b..ba62b8c090db 100644
--- a/net-misc/badvpn/badvpn-1.999.123-r1.ebuild
+++ b/net-misc/badvpn/badvpn-1.999.123-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/badvpn/badvpn-1.999.123-r1.ebuild,v 1.1 2012/08/19 13:23:21 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/badvpn/badvpn-1.999.123-r2.ebuild,v 1.1 2012/08/23 01:37:21 williamh Exp $
 
 EAPI=4
 inherit eutils cmake-utils user
diff --git a/net-misc/badvpn/files/badvpn-ncd.init b/net-misc/badvpn/files/badvpn-ncd.init
index dba4c9af56d8..ce35ba351716 100644
--- a/net-misc/badvpn/files/badvpn-ncd.init
+++ b/net-misc/badvpn/files/badvpn-ncd.init
@@ -21,3 +21,25 @@ start_pre() {
 		--syslog-ident \"${ncd_syslog_ident:-${RC_SVCNAME}}\""
 	fi
 }
+
+start()
+{
+	[ -n "$command" ] || return 0
+	local _background=
+	ebegin "Starting ${name:-$RC_SVCNAME}"
+	if yesno "${command_background}"; then
+		if [ -z "${pidfile}" ]; then
+			eend 1 "command_background option used but no pidfile specified"
+			return 1
+		fi
+		_background="--background --make-pidfile"
+	fi
+	eval start-stop-daemon --start \
+		--exec $command \
+		${procname:+--name} $procname \
+		${pidfile:+--pidfile} $pidfile \
+		$_background $start_stop_daemon_args \
+		-- $command_args
+	eend $? "Failed to start $RC_SVCNAME"
+	return $?
+}
diff --git a/net-misc/badvpn/files/badvpn-server.init b/net-misc/badvpn/files/badvpn-server.init
index 2af1db36c5ce..b4200c3ad096 100644
--- a/net-misc/badvpn/files/badvpn-server.init
+++ b/net-misc/badvpn/files/badvpn-server.init
@@ -21,3 +21,25 @@ start_pre() {
 			--syslog-ident \"${vpn_syslog_ident:-${RC_SVCNAME}}\""
         fi
 }
+
+start()
+{
+	[ -n "$command" ] || return 0
+	local _background=
+	ebegin "Starting ${name:-$RC_SVCNAME}"
+	if yesno "${command_background}"; then
+		if [ -z "${pidfile}" ]; then
+			eend 1 "command_background option used but no pidfile specified"
+			return 1
+		fi
+		_background="--background --make-pidfile"
+	fi
+	eval start-stop-daemon --start \
+		--exec $command \
+		${procname:+--name} $procname \
+		${pidfile:+--pidfile} $pidfile \
+		$_background $start_stop_daemon_args \
+		-- $command_args
+	eend $? "Failed to start $RC_SVCNAME"
+	return $?
+}
diff --git a/net-misc/dropbox/Manifest b/net-misc/dropbox/Manifest
index 671f4a067ff4..69ba050569c4 100644
--- a/net-misc/dropbox/Manifest
+++ b/net-misc/dropbox/Manifest
@@ -1,4 +1,4 @@
-DIST dropbox-lnx.x86-1.2.48.tar.gz 15790350 SHA256 ee21f84729a85b0d45b8e82edb1e50918c906a51d373e920c1c3053fb5ebc267
+DIST dropbox-lnx.x86-1.2.48.tar.gz 15790350 SHA256 ee21f84729a85b0d45b8e82edb1e50918c906a51d373e920c1c3053fb5ebc267 SHA512 e111bca3344cec31a836e9328ba4ff517bc2712852de4405d205f6dad5f621ef1dcd0b4b2ff41ab027ec13346a67bca84b4cc895f49f14453d498c2a12ead099 WHIRLPOOL a339a7b9de18e7a4d7c4c96a49097a274cbbc28b206ea5ff7347a6d96e0d36a8b4e00262bacf73df75625fa49d27e5934b35cf8198ff7c7c1e0092bd60388511
 DIST dropbox-lnx.x86-1.2.51.tar.gz 15794517 SHA256 ccfa42c19b6ceaefae9be210096fe58755179ac51f318cfa06d1e7bd5aebbb26
 DIST dropbox-lnx.x86-1.4.3.tar.gz 17738364 SHA256 62fb5d5f892c114e6988e3cd6c3282174e6853dfff6e06eea0fa52a9b3fe1269
 DIST dropbox-lnx.x86-1.4.7.tar.gz 17765299 SHA256 7162a3f66b5c362a4a01f50c04bbacb69d1de0f55a8c69ce381b32dafb731f1b SHA512 e1962bc14a48a48e1d332f259c9bc919119c9f0ec1b4ccad5a7a2af4557d1ccb6180dd477ff324875763f6f8ec8f84917fae02372ebb4220a6fb29bdabc5d767 WHIRLPOOL 33c2df937aa063baedde0932449328faa8cf8aa1be9554a993c5b3cf75d1214846faa01953eea96bd85dd5aabc52f9a60b51118a0a04c097e88337eb4c25dd3d
diff --git a/net-misc/dropbox/dropbox-1.4.7-r1.ebuild b/net-misc/dropbox/dropbox-1.4.7-r1.ebuild
index ee7f36805076..9b4314f3ca67 100644
--- a/net-misc/dropbox/dropbox-1.4.7-r1.ebuild
+++ b/net-misc/dropbox/dropbox-1.4.7-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dropbox/dropbox-1.4.7-r1.ebuild,v 1.1 2012/07/25 02:39:58 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dropbox/dropbox-1.4.7-r1.ebuild,v 1.2 2012/08/23 03:31:07 ottxor Exp $
 
 EAPI="4"
 
@@ -13,7 +13,7 @@ SRC_URI="x86? ( http://dl-web.dropbox.com/u/17/dropbox-lnx.x86-${PV}.tar.gz )
 
 LICENSE="CCPL-Attribution-NoDerivs-3.0 FTL MIT LGPL-2 openssl dropbox"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~x86 ~x86-linux"
 IUSE="+librsync-bundled"
 RESTRICT="mirror strip"
 
diff --git a/net-misc/gsasl/gsasl-1.8.0.ebuild b/net-misc/gsasl/gsasl-1.8.0.ebuild
index f7482c112c9f..6f826957d8c6 100644
--- a/net-misc/gsasl/gsasl-1.8.0.ebuild
+++ b/net-misc/gsasl/gsasl-1.8.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/gsasl/gsasl-1.8.0.ebuild,v 1.5 2012/08/15 22:29:22 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/gsasl/gsasl-1.8.0.ebuild,v 1.6 2012/08/22 19:11:59 johu Exp $
 
 EAPI="4"
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.gnu.org/software/gsasl/"
 SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ppc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ppc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="doc gcrypt idn kerberos nls ntlm static-libs +threads"
 
 DEPEND="
diff --git a/net-misc/italc/Manifest b/net-misc/italc/Manifest
index 4a8e6b7a201c..5b2f89adecd8 100644
--- a/net-misc/italc/Manifest
+++ b/net-misc/italc/Manifest
@@ -1,2 +1 @@
-DIST italc-1.0.9.tar.bz2 2737753 SHA256 0f810816b1a0e7ccecc4adbf289a0e61e93ba0d29412dd36b8553456c72b2ce0
 DIST italc-2.0.0.tar.bz2 3413075 SHA256 edb5e0502ad73e3398f63e2f485fa7ca7d12cae50315801ac3f22304ccdb6aac SHA512 2e0a0ce97933df1d7332f37d8342f39dd3fad019147e212cb4c2e4e241fdace9ae7febb48cd8808017108de201850d132de7dde35d01a7e60fef6f69302cb4af WHIRLPOOL fa90a335cc5253a513eda1216def0e712e47ccb5b6c1991066090447569a6580d1ee58ac9faa337498e62a7c9c43c40cd17c5260acb7447fb2fffb88d93002a5
diff --git a/net-misc/italc/files/italc-1.0.9-as-needed.patch b/net-misc/italc/files/italc-1.0.9-as-needed.patch
deleted file mode 100644
index b0c03b38f2a3..000000000000
--- a/net-misc/italc/files/italc-1.0.9-as-needed.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- italc-1.0.9.orig/setup/Makefile.am	2008-02-09 12:14:52.000000000 +0100
-+++ italc-1.0.9/setup/Makefile.am	2009-10-16 15:14:21.086898900 +0200
-@@ -65,7 +65,7 @@
- PLATFORM_LDADD = ../lib/libitalc_core-static.a
- endif
- 
--setup_LDADD = $(QT_LDADD) $(QT_LIB_GUI) $(LIBSSL_LDADD) -ljpeg $(PLATFORM_LDADD)
-+setup_LDADD = $(PLATFORM_LDADD) $(QT_LDADD) $(QT_LIB_GUI) $(LIBSSL_LDADD) -ljpeg
- setup_LDFLAGS = $(LDFLAGS) -mwindows
- 
- AM_CXXFLAGS := $(AM_CXXFLAGS) $(QT_CXXFLAGS)
diff --git a/net-misc/italc/files/italc-1.0.9-gcc44.patch b/net-misc/italc/files/italc-1.0.9-gcc44.patch
deleted file mode 100644
index 44f2904d18c9..000000000000
--- a/net-misc/italc/files/italc-1.0.9-gcc44.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -ur italc-1.0.9.orig/lib/include/types.h italc-1.0.9/lib/include/types.h
---- italc-1.0.9.orig/lib/include/types.h	2008-02-10 01:03:25.000000000 +0200
-+++ italc-1.0.9/lib/include/types.h	2009-07-30 11:03:00.000000000 +0300
-@@ -25,6 +25,8 @@
- #ifndef _TYPES_H
- #define _TYPES_H
- 
-+#include <stdint.h>
-+
- typedef signed char             Q_INT8;         /* 8 bit signed */
- typedef unsigned char           Q_UINT8;        /* 8 bit unsigned */
- typedef short                   Q_INT16;        /* 16 bit signed */
-diff -ur italc-1.0.9.orig/lib/src/fast_qimage.cpp italc-1.0.9/lib/src/fast_qimage.cpp
---- italc-1.0.9.orig/lib/src/fast_qimage.cpp	2008-03-17 10:02:33.000000000 +0200
-+++ italc-1.0.9/lib/src/fast_qimage.cpp	2009-07-30 10:56:19.000000000 +0300
-@@ -52,6 +52,7 @@
-   pete@shinners.org
- */
- 
-+#include <stdint.h>
- 
- #define ALIGN_SIZE 16
- 
diff --git a/net-misc/italc/files/italc-1.0.9-gcc45.patch b/net-misc/italc/files/italc-1.0.9-gcc45.patch
deleted file mode 100644
index d4ee44e2a7f8..000000000000
--- a/net-misc/italc/files/italc-1.0.9-gcc45.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: italc-1.0.9/lib/include/isd_base.h
-===================================================================
---- italc-1.0.9.orig/lib/include/isd_base.h
-+++ italc-1.0.9/lib/include/isd_base.h
-@@ -191,7 +191,7 @@ qint64 IC_DllExport qtcpsocketDispatcher
- 
- 
- 
--typedef struct
-+typedef struct mystruct
- {
- 	enum commands
- 	{
diff --git a/net-misc/italc/files/italc-1.0.9-qt4-libpath.patch b/net-misc/italc/files/italc-1.0.9-qt4-libpath.patch
deleted file mode 100644
index b2c92c7aa05d..000000000000
--- a/net-misc/italc/files/italc-1.0.9-qt4-libpath.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- ./italc-1.0.9/acinclude.m4	2008-05-24 11:19:33.000000000 +0200
-+++ ./italc-1.0.9/acinclude.m4	2009-01-31 21:24:54.000000000 +0100
-@@ -127,9 +127,9 @@
- 	fi
-         ;;
-     *)
--       	QT_LIBS=`ls $QTDIR/lib64/libQt*.so 2> /dev/null` 
-+       	QT_LIBS=`ls $QTDIR/lib64/qt4/libQt*.so 2> /dev/null` 
-         if test "x$QT_LIBS" = x;  then
--        	QT_LIBS=`ls $QTDIR/lib/libQt*.so 2> /dev/null` 
-+        	QT_LIBS=`ls $QTDIR/lib/qt4/libQt*.so 2> /dev/null` 
-             	if test "x$QT_LIBS" = x;  then
- 			AC_MSG_ERROR([*** Couldn't find any Qt4 libraries])
-             	fi
diff --git a/net-misc/italc/files/italc-1.0.9-strip.patch b/net-misc/italc/files/italc-1.0.9-strip.patch
deleted file mode 100644
index 831b9723930a..000000000000
--- a/net-misc/italc/files/italc-1.0.9-strip.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- ./italc-1.0.9/Makefile.am	2008-07-23 13:25:55.000000000 +0200
-+++ ./italc-1.0.9/Makefile.am	2009-01-31 21:59:40.000000000 +0100
-@@ -10,13 +10,6 @@
- 	rm -rf `find $(distdir) -name *.moc`
- 	rm -rf `find $(distdir) -name *_qrc.cpp`
- 
--# strip all binaries after installation
--install-exec-hook:
--	cd $(DESTDIR)$(bindir) ; \
--	strip ica; \
--	strip italc
--
--
- if HAVE_RPM
- $(PACKAGE)-$(VERSION).tar.gz: dist
- 
diff --git a/net-misc/italc/files/italc-1.0.9-system-libvncserver.patch b/net-misc/italc/files/italc-1.0.9-system-libvncserver.patch
deleted file mode 100644
index c48441eaaa62..000000000000
--- a/net-misc/italc/files/italc-1.0.9-system-libvncserver.patch
+++ /dev/null
@@ -1,52 +0,0 @@
---- ./italc-1.0.9.orig/ica/Makefile.am	2008-04-17 23:23:57.000000000 +0200
-+++ ./italc-1.0.9/ica/Makefile.am	2009-01-31 22:08:53.000000000 +0100
-@@ -6,47 +6,14 @@
- IVS_INCLUDES = -I$(srcdir)/x11 -I$(srcdir)/x11/x11vnc -I$(srcdir)/x11/libvncserver
- 
- IVS_SRCS =	$(srcdir)/x11/x11vnc.c				\
--		$(srcdir)/x11/libvncserver/auth.c		\
--		$(srcdir)/x11/libvncserver/cargs.c		\
--		$(srcdir)/x11/libvncserver/corre.c		\
--		$(srcdir)/x11/libvncserver/cursor.c		\
--		$(srcdir)/x11/libvncserver/cutpaste.c		\
--		$(srcdir)/x11/libvncserver/d3des.c		\
--		$(srcdir)/x11/libvncserver/draw.c		\
--		$(srcdir)/x11/libvncserver/font.c		\
--		$(srcdir)/x11/libvncserver/hextile.c		\
--		$(srcdir)/x11/libvncserver/httpd.c		\
--		$(srcdir)/x11/libvncserver/main.c		\
--		$(srcdir)/x11/libvncserver/rfbregion.c		\
--		$(srcdir)/x11/libvncserver/rfbserver.c		\
--		$(srcdir)/x11/libvncserver/rre.c		\
--		$(srcdir)/x11/libvncserver/scale.c		\
--		$(srcdir)/x11/libvncserver/selbox.c		\
--		$(srcdir)/x11/libvncserver/sockets.c		\
--		$(srcdir)/x11/libvncserver/stats.c		\
--		$(srcdir)/x11/libvncserver/translate.c		\
--		$(srcdir)/x11/libvncserver/ultra.c		\
--		$(srcdir)/x11/libvncserver/vncauth.c		\
- 		$(srcdir)/x11/rfb/rfbregion.h			\
--		$(srcdir)/x11/rfb/default8x16.h			\
--		$(srcdir)/x11/libvncserver/d3des.h		\
--		$(srcdir)/x11/libvncserver/private.h		\
--		$(srcdir)/x11/libvncserver/scale.h		\
--		$(srcdir)/x11/libvncserver/zrleoutstream.h	\
--		$(srcdir)/x11/libvncserver/zrlepalettehelper.h	\
--		$(srcdir)/x11/libvncserver/zrletypes.h		\
--		$(srcdir)/x11/libvncserver/zlib.c		\
--		$(srcdir)/x11/libvncserver/zrle.c		\
--		$(srcdir)/x11/libvncserver/zrleoutstream.c	\
--		$(srcdir)/x11/libvncserver/zrlepalettehelper.c	\
--		$(srcdir)/x11/libvncserver/tight.c
--
-+		$(srcdir)/x11/rfb/default8x16.h
- 
- if HAVE_LIBPTHREAD
- PTHREADLDADD = -lpthread
- endif
- 
--IVSLDADD = @X_LIBS@ $(PTHREADLDADD)
-+IVSLDADD = @X_LIBS@ $(PTHREADLDADD) -lvncserver
- 
- 
- else
diff --git a/net-misc/italc/italc-1.0.9.ebuild b/net-misc/italc/italc-1.0.9.ebuild
deleted file mode 100644
index 7898163404ee..000000000000
--- a/net-misc/italc/italc-1.0.9.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/italc/italc-1.0.9.ebuild,v 1.11 2012/06/25 17:27:10 jlec Exp $
-
-EAPI=2
-
-inherit autotools eutils qt4-r2 user
-
-DESCRIPTION="Intelligent Teaching And Learning with Computers (iTALC) supports working with computers in school"
-HOMEPAGE="http://italc.sourceforge.net/"
-SRC_URI="mirror://sourceforge/italc/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE="X v4l crypt xinerama threads fbcon system-libvncserver"
-
-RDEPEND="
-	dev-libs/lzo
-	dev-libs/openssl
-	virtual/jpeg
-	sys-apps/tcp-wrappers
-	sys-libs/zlib
-	x11-libs/qt-core:4
-	x11-libs/qt-xmlpatterns:4
-	system-libvncserver? ( net-libs/libvncserver )
-	xinerama? ( x11-libs/libXinerama )
-	X? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/libXdamage
-		x11-libs/libXext
-		x11-libs/libXfixes
-		x11-libs/libXrandr
-		x11-libs/libXtst
-		x11-apps/xinput
-		x11-libs/qt-gui:4
-	)"
-DEPEND="${RDEPEND}
-	X? ( x11-proto/inputproto )"
-
-pkg_setup() {
-	enewgroup italc
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-qt4-libpath.patch
-	epatch "${FILESDIR}"/${P}-strip.patch
-	use system-libvncserver && epatch "${FILESDIR}"/${P}-system-libvncserver.patch
-	epatch "${FILESDIR}"/${P}-gcc44.patch
-	epatch "${FILESDIR}"/${P}-as-needed.patch
-	epatch "${FILESDIR}"/${P}-gcc45.patch
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		"--with-qtdir=/usr" \
-		"--with-linux" \
-		"--with-uinput" \
-		"--without-macosx-native" \
-		$(use_with xinerama) \
-		$(use_with X x) \
-		$(use_with X xkeyboard) \
-		$(use_with X xrandr) \
-		$(use_with X xfixes) \
-		$(use_with X xdamage) \
-		$(use_with X xtrap) \
-		$(use_with X xrecord) \
-		$(use_with X dpms) \
-		$(use_with v4l) \
-		$(use_with fbcon fbdev) \
-		$(use_with fbcon fbpm) \
-		$(use_with threads pthread) \
-		$(use_with crypt) \
-		|| die "econf failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "Install failed"
-	rm -r "${D}/usr/share/italc"
-	dodoc TODO README AUTHORS INSTALL ChangeLog
-
-	# -- disabled per 2007-04-04 as the icon is missing in upstream file
-	# -- joke
-	# Install server logo
-	#newicon ima/resources/client_manager.png ${PN}.png
-	#make_desktop_entry ${PN} "iTALC Master" ${PN} "Qt;KDE;Education"
-}
-
-pkg_postinst() {
-	elog "On the master, please run "
-	elog "# emerge --config =${CATEGORY}/${PF}"
-
-	elog "Please add the logins of master users (teachers) to the italc group by running"
-	elog "# usermod -a -G italc <loginname>"
-
-	elog ""
-}
-
-pkg_config() {
-	if [ ! -d /etc/italc/keys ] ; then
-		einfo "Creating public and private keys for italc in /etc/italc/keys."
-		/usr/bin/ica -role teacher -createkeypair > /dev/null
-		eend $?
-		einfo "Setting chmod 640 on private keys."
-		chgrp -R italc /etc/italc
-		chmod -R o-rwx /etc/italc/keys/private
-	else
-		einfo "Not creating new keypair, as /etc/italc/keys already exists"
-	fi
-}
diff --git a/net-misc/italc/italc-2.0.0.ebuild b/net-misc/italc/italc-2.0.0.ebuild
index e0480bf09ab3..fa5dc0ef5f8f 100644
--- a/net-misc/italc/italc-2.0.0.ebuild
+++ b/net-misc/italc/italc-2.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/italc/italc-2.0.0.ebuild,v 1.4 2012/08/03 19:08:37 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/italc/italc-2.0.0.ebuild,v 1.5 2012/08/22 22:52:42 johu Exp $
 
 EAPI=4
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/italc/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/net-misc/italc/metadata.xml b/net-misc/italc/metadata.xml
index 6771389ecf1b..91f4e72fb544 100644
--- a/net-misc/italc/metadata.xml
+++ b/net-misc/italc/metadata.xml
@@ -4,7 +4,4 @@
 	<maintainer>
 		<email>maintainer-needed@gentoo.org</email>
 	</maintainer>
-	<use>
-		<flag name="system-libvncserver">Build against the system libvncserver (experimental)</flag>
-	</use>
 </pkgmetadata>
diff --git a/net-misc/openvpn/Manifest b/net-misc/openvpn/Manifest
index cc5fece7e71d..3ca0619bdfca 100644
--- a/net-misc/openvpn/Manifest
+++ b/net-misc/openvpn/Manifest
@@ -1,4 +1,4 @@
 DIST openvpn-2.1.0_eurephia.patch 2774 SHA256 9604f1bcc8d60361795741fc74caa9f0fad3c087e4023ed2d0af0b13c6650896
-DIST openvpn-2.1.1-ipv6-0.4.11.patch.gz 20869 SHA256 98dc1de039007109c0b24cccca4b9eb9061c391ee219b0e550d73c868015c45d
-DIST openvpn-2.1.4.tar.gz 863726 SHA256 67fe78e5def82d44d2ad4ef6fc6d87901195849d10b6b3cab81fa03257f52af5
-DIST openvpn-2.2.2.tar.gz 911158 SHA256 54ca8b260e2ea3b26e84c2282ccb5f8cb149edcfd424b686d5fb22b8dbbeac00
+DIST openvpn-2.1.1-ipv6-0.4.11.patch.gz 20869 SHA256 98dc1de039007109c0b24cccca4b9eb9061c391ee219b0e550d73c868015c45d SHA512 939043e8e900f704ce4dfb56fb5113f7233726b435f4564df051784f3814c95abd88fab122262fb87f92f10cc73bd324c60bdd63c07999a1f2296c68084130c7 WHIRLPOOL 98d2a92695c464cec8254f26738573e63929356e27ace9d27cb045edb78bdf37a6539043783bedbc3e0f624d47f80d8dcf9df2f2ba3c0ac371f2ca0f42407977
+DIST openvpn-2.1.4.tar.gz 863726 SHA256 67fe78e5def82d44d2ad4ef6fc6d87901195849d10b6b3cab81fa03257f52af5 SHA512 f3845da8de3d777d0aa92dc272c6824043fd1363bf3cb92e61ceedea93fa2d9f96f4910afa3823d19423357a574e4ea7db29ade73a09197cca0f8efb05cfaf3c WHIRLPOOL 0aaa9b3a77e387f65612c180b31b49aa36745e37ce7998bfa68841f841a06e19ac98a0b4ea9d4a2cb361180b7e15a9503fa29d7bd026df8be5f68ac657a9c499
+DIST openvpn-2.2.2.tar.gz 911158 SHA256 54ca8b260e2ea3b26e84c2282ccb5f8cb149edcfd424b686d5fb22b8dbbeac00 SHA512 69725652c95d779371ded032db7efeb51d1287cc270e7c6e47dc06ae4b22438e6d6dd7b6d9fc41b9c2315b83eebcd28ca83df47b3f0f3a2f3d7b1aeba9524802 WHIRLPOOL 1a04b5633df65ffb11fecc71c2dd25da2bd1f83114b3138b22b868b65cc7ac1cda5ca3b80c40e54cb32efc525a1c7458f4077b2c7965d646343b0a11cc6ecf91
diff --git a/net-misc/openvpn/openvpn-2.2.2.ebuild b/net-misc/openvpn/openvpn-2.2.2.ebuild
index 8e45fff9fc4f..97b217de680b 100644
--- a/net-misc/openvpn/openvpn-2.2.2.ebuild
+++ b/net-misc/openvpn/openvpn-2.2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-2.2.2.ebuild,v 1.12 2012/07/29 16:47:31 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-2.2.2.ebuild,v 1.13 2012/08/23 03:49:47 ottxor Exp $
 
 EAPI=4
 
@@ -12,7 +12,7 @@ HOMEPAGE="http://openvpn.net/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="examples iproute2 minimal pam passwordsave selinux +ssl static pkcs11 userland_BSD"
 
 DEPEND=">=dev-libs/lzo-1.07
@@ -72,7 +72,7 @@ src_compile() {
 			[[ ${i} == "README" || ${i} == "examples" || ${i} == "defer" ]] && continue
 			[[ ${i} == "auth-pam" ]] && ! use pam && continue
 			einfo "Building ${i} plugin"
-			emake -C "${i}" CC=$(tc-getCC)
+			emake -C "${i}" CC=$(tc-getCC) TARGET_DIR="${EPREFIX}"/usr/$(get_libdir)/${PN} || die "make failed"
 		done
 		cd ..
 	fi
@@ -124,7 +124,7 @@ pkg_postinst() {
 	enewgroup openvpn
 	enewuser openvpn "" "" "" openvpn
 
-	if [ path_exists -o "${ROOT}/etc/openvpn/*/local.conf" ] ; then
+	if [ path_exists -o "${EROOT}/etc/openvpn/*/local.conf" ] ; then
 		ewarn "WARNING: The openvpn init script has changed"
 		ewarn ""
 	fi
@@ -143,7 +143,7 @@ pkg_postinst() {
 	elog "You can then treat openvpn.foo as any other service, so you can"
 	elog "stop one vpn and start another if you need to."
 
-	if grep -Eq "^[ \t]*(up|down)[ \t].*" "${ROOT}/etc/openvpn"/*.conf 2>/dev/null ; then
+	if grep -Eq "^[ \t]*(up|down)[ \t].*" "${EROOT}/etc/openvpn"/*.conf 2>/dev/null ; then
 		ewarn ""
 		ewarn "WARNING: If you use the remote keyword then you are deemed to be"
 		ewarn "a client by our init script and as such we force up,down scripts."
diff --git a/net-p2p/deluge/Manifest b/net-p2p/deluge/Manifest
index eed1a5fed411..e1666aae5ac6 100644
--- a/net-p2p/deluge/Manifest
+++ b/net-p2p/deluge/Manifest
@@ -1,2 +1,2 @@
-DIST deluge-1.3.3.tar.lzma 2094978 RMD160 d6044714dd242d9758436f5d0194a37f298f5dc0 SHA1 5bf22824cc5181c789429575d5d4a40f2e7d3cc6 SHA256 c40e0f5757bc3912e9628e1a68dfa41cd487beca370c315f5d31261b931cea05
+DIST deluge-1.3.3.tar.lzma 2094978 SHA256 c40e0f5757bc3912e9628e1a68dfa41cd487beca370c315f5d31261b931cea05
 DIST deluge-1.3.5.tar.lzma 2100244 SHA256 cdb97fd64cc2131da812fad026f49e82f82b6a214e592222145ddcfb19174247 SHA512 755b5cd72dcdff0cb54d1fac5ad539f42db78a4ea8a71e13d5d493810c2d1b69865bd0026ddc14ea8fc51eb454398248524ad91bbbc8303792dd8a0513900d45 WHIRLPOOL 7f19c6ee4785b48d8c20b00ee67dfeccf1355c0ae36faf953f411bd3e977d11b7fb4fac1456cf91e0ff117021b25e6673432afd03cc1270178486867c5b89c88
diff --git a/net-p2p/deluge/deluge-1.3.5.ebuild b/net-p2p/deluge/deluge-1.3.5.ebuild
index 670697b7a242..ab7bfa4e2651 100644
--- a/net-p2p/deluge/deluge-1.3.5.ebuild
+++ b/net-p2p/deluge/deluge-1.3.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/deluge/deluge-1.3.5.ebuild,v 1.2 2012/08/03 19:07:42 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/deluge/deluge-1.3.5.ebuild,v 1.3 2012/08/22 21:05:43 johu Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2:2.5"
@@ -13,7 +13,7 @@ SRC_URI="http://download.deluge-torrent.org/source/${P}.tar.lzma"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~sparc x86"
 IUSE="geoip gtk libnotify setproctitle webinterface"
 
 DEPEND=">=net-libs/rb_libtorrent-0.14.9[python]
diff --git a/net-p2p/gtk-gnutella/gtk-gnutella-0.98.3.ebuild b/net-p2p/gtk-gnutella/gtk-gnutella-0.98.3.ebuild
index 9a963f7e94f8..8ca079877f74 100644
--- a/net-p2p/gtk-gnutella/gtk-gnutella-0.98.3.ebuild
+++ b/net-p2p/gtk-gnutella/gtk-gnutella-0.98.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/gtk-gnutella/gtk-gnutella-0.98.3.ebuild,v 1.3 2012/08/08 20:01:09 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/gtk-gnutella/gtk-gnutella-0.98.3.ebuild,v 1.4 2012/08/22 20:03:37 johu Exp $
 
 EAPI=4
 
@@ -14,7 +14,7 @@ HOMEPAGE="http://gtk-gnutella.sourceforge.net/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="amd64 ppc ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc x86 ~x86-fbsd"
 
 RDEPEND="
 	dev-libs/glib:2
diff --git a/net-print/cups-filters/cups-filters-1.0.23.ebuild b/net-print/cups-filters/cups-filters-1.0.23.ebuild
index b55cad43bf40..9f41e5204751 100644
--- a/net-print/cups-filters/cups-filters-1.0.23.ebuild
+++ b/net-print/cups-filters/cups-filters-1.0.23.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups-filters/cups-filters-1.0.23.ebuild,v 1.1 2012/08/21 18:01:08 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups-filters/cups-filters-1.0.23.ebuild,v 1.2 2012/08/23 00:14:45 jer Exp $
 
 EAPI=4
 
@@ -14,7 +14,7 @@ if [[ "${PV}" == "9999" ]] ; then
 	KEYWORDS=""
 else
 	SRC_URI="http://www.openprinting.org/download/${PN}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~mips ~x86"
+	KEYWORDS="~amd64 ~hppa ~mips ~x86"
 fi
 DESCRIPTION="Cups PDF filters"
 HOMEPAGE="http://www.linuxfoundation.org/collaborate/workgroups/openprinting/pdfasstandardprintjobformat"
diff --git a/profiles/base/package.mask b/profiles/base/package.mask
index 291e500547df..d69139922e66 100644
--- a/profiles/base/package.mask
+++ b/profiles/base/package.mask
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/base/package.mask,v 1.43 2012/07/28 09:04:22 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/package.mask,v 1.45 2012/08/22 21:23:59 swift Exp $
 
 # Diego Elio Pettenò <flameeyes@gentoo.org> (8 Feb 2011)
 #  on behalf of QA team <qa@gentoo.org
@@ -73,6 +73,7 @@ sec-policy/selinux-dcc
 sec-policy/selinux-ddclient
 sec-policy/selinux-ddcprobe
 sec-policy/selinux-denyhosts
+sec-policy/selinux-devicekit
 sec-policy/selinux-dhcp
 sec-policy/selinux-dictd
 sec-policy/selinux-distcc
@@ -233,6 +234,7 @@ sec-policy/selinux-usbmuxd
 sec-policy/selinux-uwimap
 sec-policy/selinux-varnishd
 sec-policy/selinux-vbetool
+sec-policy/selinux-vdagent
 sec-policy/selinux-vde
 sec-policy/selinux-virt
 sec-policy/selinux-vlock
diff --git a/profiles/features/selinux/package.mask b/profiles/features/selinux/package.mask
index 7bd3c79d1cd9..0b853519ca2f 100644
--- a/profiles/features/selinux/package.mask
+++ b/profiles/features/selinux/package.mask
@@ -1,4 +1,4 @@
-# $Header: /var/cvsroot/gentoo-x86/profiles/features/selinux/package.mask,v 1.30 2012/07/28 09:04:22 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/features/selinux/package.mask,v 1.32 2012/08/22 21:23:59 swift Exp $
 
 # Zac Medico <zmedico@gentoo.org> (09 Aug 2011)
 # Bug #377907 - Use package.mask for compatibility with PMS section 5.2.7, and
@@ -80,6 +80,7 @@
 -sec-policy/selinux-ddclient
 -sec-policy/selinux-ddcprobe
 -sec-policy/selinux-denyhosts
+-sec-policy/selinux-devicekit
 -sec-policy/selinux-dhcp
 -sec-policy/selinux-dictd
 -sec-policy/selinux-distcc
@@ -239,6 +240,7 @@
 -sec-policy/selinux-uwimap
 -sec-policy/selinux-varnishd
 -sec-policy/selinux-vbetool
+-sec-policy/selinux-vdagent
 -sec-policy/selinux-vde
 -sec-policy/selinux-virt
 -sec-policy/selinux-vlock
diff --git a/profiles/package.mask b/profiles/package.mask
index a255f2ddce88..0f0537617c67 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
 ####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.14068 2012/08/22 16:56:35 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.14069 2012/08/22 23:42:16 flameeyes Exp $
 #
 # When you add an entry to the top of this file, add your name, the date, and
 # an explanation of why something is getting masked. Please be extremely
@@ -112,10 +112,6 @@ dev-ruby/spruz
 # you can give dev-util/pkgconf a try.
 dev-util/pkg-config-lite
 
-# Diego Elio Pettenò <flameeyes@gentoo.org> (30 Jul 2012)
-# Beta version, waiting for final release
-=sys-libs/freeipmi-1.2*
-
 # Anthony G. Basile <blueness@gentoo.org> (26 Jul 2012)
 # Removal in 30 days, bug #365825
 sys-apps/chpax
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index c9eb0c9cf6ea..6622315905fd 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -4358,7 +4358,6 @@ net-misc/hylafaxplus:pam - hfaxd authentication via PAM
 net-misc/icecast:kate - Add karaoke and text encapsulation support for Ogg files
 net-misc/icecast:yp - Build support for yp public directory listings
 net-misc/iputils:SECURITY_HAZARD - Allow non-root users to flood (ping -f). This is generally a very bad idea.
-net-misc/italc:system-libvncserver - Build against the system libvncserver (experimental)
 net-misc/knock:server - Installs the knockd server daemon.
 net-misc/leechcraft-netstoremanager:googledrive - Support Google Drive storage backend
 net-misc/leechcraft-netstoremanager:yandexdisk - Support Yandex.Disk storage backend
@@ -5897,6 +5896,7 @@ x11-plugins/wmsysmon:high-ints - Enable support for monitoring 24 interrupts. Us
 x11-terms/aterm:background - Enable background image support via media-libs/libafterimage
 x11-terms/aterm:xgetdefault - Enable resources via X instead of aterm small version
 x11-terms/eterm:escreen - Enable built-in app-misc/screen support
+x11-terms/eterm:utempter - Include libutempter support
 x11-terms/hanterm:utempter - Records user logins. Useful on multi-user systems
 x11-terms/mlterm:ibus - Enable app-i18n/ibus support
 x11-terms/mlterm:libssh2 - Enable net-libs/libssh2 support
diff --git a/sci-mathematics/gfan/Manifest b/sci-mathematics/gfan/Manifest
index 353582978672..35402b1d8ccc 100644
--- a/sci-mathematics/gfan/Manifest
+++ b/sci-mathematics/gfan/Manifest
@@ -1,2 +1,2 @@
-DIST gfan0.4plus.tar.gz 748514 RMD160 d8a1f235878c7d207e26c00e9097dfea548540e7 SHA1 e8e3f2c2f730c88d0c556f5b0fdf3a99b66b9bac SHA256 bdc4f608df6bda56fdb1bf253fba8e9d9c98dec6915a80a1da9d9ee4210cfff3
-DIST gfan0.5.tar.gz 1134987 RMD160 be0084e82832db02a65e3bff93b823f56c6aa902 SHA1 ea795044e057dafc9eca7bf56b8f44a2c7f3686e SHA256 d7307c8979220adc0a7ce5acf472178a6c280c963967df6241392ed9954cc1fb
+DIST gfan0.4plus.tar.gz 748514 SHA256 bdc4f608df6bda56fdb1bf253fba8e9d9c98dec6915a80a1da9d9ee4210cfff3
+DIST gfan0.5.tar.gz 1134987 SHA256 d7307c8979220adc0a7ce5acf472178a6c280c963967df6241392ed9954cc1fb
diff --git a/sci-mathematics/gfan/gfan-0.5.ebuild b/sci-mathematics/gfan/gfan-0.5.ebuild
index 4f1ed07d1241..03647e1e12b6 100644
--- a/sci-mathematics/gfan/gfan-0.5.ebuild
+++ b/sci-mathematics/gfan/gfan-0.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/gfan/gfan-0.5.ebuild,v 1.7 2012/06/30 02:06:45 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/gfan/gfan-0.5.ebuild,v 1.8 2012/08/23 04:35:02 ottxor Exp $
 
 EAPI="3"
 
@@ -12,7 +12,7 @@ SRC_URI="http://www.math.tu-berlin.de/~jensen/software/gfan/${PN}${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND="dev-libs/gmp[cxx]
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 08cf6c102dc9..838f2ecbb455 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,5 +1,6 @@
 DIST portage-2.1.10.65.tar.bz2 826100 SHA256 aaeba4789b05864e8ca142752dc31c017d47976332394c1bf533aba6b3748f8c SHA512 fd7807cbde6c9de85c2b4acd7ef6848c36b7f569fd22decb4b684529f65e9ff3f6a29af0038c88ca7861873251e8cb3bf17ce25140b18e3b7bfe6492ff8edc6c WHIRLPOOL d0e22726fb65bd80f58d70c155b6c669dcc1c086d9b77303fd987bc7cfaeeb3b6922300ddc01a05eca948167e09c3c16462f023fa7bfeca963958d6e3036cf7b
 DIST portage-2.1.11.10.tar.bz2 799167 SHA256 b3fa5db65998b8d011e6f3f32e266ff7f8eabc51d691fcd26e39e440f8d1b53f SHA512 ec6860435d34b8aa1c1a6199fb00e0f894029e1eb354683158ef99a0588a2c770b7a1a95807a2b78b1369c02fb67b5bcdf5484690a10165071704aec99807857 WHIRLPOOL ae5962fd586281f2b2b57f766984e9e591a6c06d123963a9d6ed7b52140fe33d1615663a3428cb1bc435dbd7a5d784f71a6cf8590af112e6ffa43d9122fec5ca
+DIST portage-2.1.11.11.tar.bz2 805235 SHA256 3a7a20ea417983dcdc79f2cbe855f9ca0f793f90aaca42d69cb61b264794f50f SHA512 8b0348e565b75352e9b86f12a5fd01328a0d21962afd11c126669cbafa5eca7d19a2af02dd0277dee4b56d9a1ac0adf5fecf24fd796463eaebd37bbdcc6cca11 WHIRLPOOL cd2d4f2121e5248471d195ca764a10669a095286bb508cd09baa6178f2483e3b123c51aa8d1c74ab6000b4ac002baaa2207929b786cf16ed042bfa681b0488df
 DIST portage-2.1.11.9.tar.bz2 844344 SHA256 590ecdae12581e0ead0eca6e4b8e0ca6bc5f1ecaafb98a5d3b684db5b1af7a05 SHA512 64919b833a719f6f1de5bc3ec8a921dd5fca75ea8c4535ce21faa608ff2bf811632ef627845e9b050fcd1ebf56f5792c7bd471925e75c1264d01277979d704a8 WHIRLPOOL d325c2b5ec50cde40f4b2ce127728b3712321febef58897b3141287776424610bd12701c159f15c5cec41f2eb35569e302a5692045406205e833f8e4cfd3d9fd
 DIST portage-2.1.6.7.patch.bz2 50118 SHA256 5f0605b51a24d23703330b040d2f7154322284db3e0cefa7499002ff1fa733c0 SHA512 dd2acc1d436cad77cfc83c4dec79316763c1fb88d61b7702e8e47e6f31b2b9fe49e8a4cf4a947614a2acd6db2ef080ed8b4ae5fce9d9be29d7e218a0ec1576c0 WHIRLPOOL 050f923249fde7c4774a2a8a944889e4270a89b00441f1923c01ab0be38f107503e018d7ab7a7f42615e7e375f0f6c0eb3bdbf3ff4ce1ce226957238a729b1ee
 DIST portage-2.1.6.7_p1.patch.bz2 4741 SHA256 ddaae2ad8c01e6477bfe22e23a4da57eb9d079a27a17a08385d56fe2c49eec30 SHA512 39058d815827b340787d813515ed4fb8c52c4fb0caa12ae70c8a9a97b9ba16c2bf4177190cb7d1c508055ce8a7aaa390ba9b31642c7d74bfb4a14d729e720617 WHIRLPOOL 8eab9574ed2e6cabac593d93f8b6ff71465c01376e7eec4cf357c336b5ed3d4f3fb3521991148ba4e34ba00c56bec5534c98311167c03866812277a8d88b0494
@@ -9,4 +10,5 @@ DIST portage-2.2.0_alpha110.patch.bz2 14215 SHA256 af73f05b918634835a0d99a914502
 DIST portage-2.2.0_alpha111.tar.bz2 836193 SHA256 3187c6915aaab681e444eca0cbe050f8e68f714176b3f7c0cbec0e7e23d5c5df SHA512 b1dfee2c1869cf30ac50c5ecaa603571bd7c71879d5e9fae80b89602b5d7e3016636703ffc7aec384e7d93356c93415200609dcd2f0f9f74a56ca0364144c120 WHIRLPOOL e7a5cea176b66f632388920bf8e1635b2ec8b7ce70f9aedea2289cdc6a7d560e6b0e6f3a7f3636217539d4883857aa84bb85e3b146e749600d57435f613b60a8
 DIST portage-2.2.0_alpha120.patch.bz2 33973 SHA256 24a5447e9af37013e30c3372e3eef799e1de17884f6328f08396e8f50c9527d1 SHA512 397114af03680734ba95de42087ead7b8cb122c4952407fb0b0c86c510c65be487d0578a3e5052f8c03c0ed9487b6f8138a4d6fb54b9025c16bd393800b67b59 WHIRLPOOL 440e5796f53be19b4a3af8dacfba576b8bd3cf7fa01bfe1b5d0f1af8fb15fb9daa8efe5d9d909d37712c7a381c3811a8dc213106f19cb87fad3faec75c4c8e9d
 DIST portage-2.2.0_alpha121.tar.bz2 798864 SHA256 9df9ea9117354b4aeedc79ef15df3b34fcbc62d38c72405cdf5c92333410ae3b SHA512 a600a6d4b172dcdf80aee2fde8793ad42d491100113c17724fcca5ee5f449e7f46fc7e6cc9c30c583a1305a408440dd357ec19353e97add6f26f972d0cc5c526 WHIRLPOOL 6a68f13c73a1a282aafcf6ae2061317103d1a4c843cc9da6a8c24b2dc90916bd0cd53d820fc8fd1633d22571f7677dfe9a9bbc694332f553afc90704039f6729
+DIST portage-2.2.0_alpha122.patch.bz2 16076 SHA256 ff7d67a0172acfcca1f4a9317a15b6202a6a63f4332ce58b44d10fa08fbb4ac6 SHA512 16ffe8f081cd87539fa639fd4058c8a99a39342b6571ff7536dff8bf3d088239999365a68e9c74ae1b60f9f722aa9180048f81b8d9b7682c887270072e379e2f WHIRLPOOL fa50260920ac8487b56b92743e391fbabc0aac04c157b6af0989ac81712b7336454ccf990b05057f1c9786f78b64143b3718d61b6ae052037bce667f04fe391e
 DIST portage-man-pl-2.1.2.tar.bz2 53893 SHA256 960eaa7c6f3a2af44bdc665266a8e884628a562373cc477d301597ecc5ef961f SHA512 5f5c8dd1559048546633b1e7291ff8c0f5d637595f1a4c98405424b08c30c089fc9359e0214f78fbe358754f20d327794f4692b9b67639585c29b755975ee853 WHIRLPOOL 756e267b84077501d976f46fa448cda5368cd52aeca6ec43d109c81fe8e2364e0cd0f35630d68a4186c70e3b440b7c870b86ac7ef83cc0afa43e10f9f8e1f422
diff --git a/sys-apps/portage/portage-2.1.11.11.ebuild b/sys-apps/portage/portage-2.1.11.11.ebuild
new file mode 100644
index 000000000000..5f6f8ded0889
--- /dev/null
+++ b/sys-apps/portage/portage-2.1.11.11.ebuild
@@ -0,0 +1,287 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.11.11.ebuild,v 1.1 2012/08/22 23:36:19 zmedico Exp $
+
+# Require EAPI 2 since we now require at least python-2.6 (for python 3
+# syntax support) which also requires EAPI 2.
+EAPI=2
+inherit eutils multilib python
+
+DESCRIPTION="Portage is the package management and distribution system for Gentoo"
+HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+SLOT="0"
+IUSE="build doc epydoc +ipc linguas_pl pypy1_9 python2 python3 selinux xattr"
+
+# Import of the io module in python-2.6 raises ImportError for the
+# thread module if threading is disabled.
+python_dep_ssl="python3? ( =dev-lang/python-3*[ssl] )
+	!pypy1_9? ( !python2? ( !python3? (
+		|| ( >=dev-lang/python-2.7[ssl] dev-lang/python:2.6[threads,ssl] )
+	) ) )
+	pypy1_9? ( !python2? ( !python3? ( dev-python/pypy:1.9[bzip2,ssl] ) ) )
+	python2? ( !python3? ( || ( dev-lang/python:2.7[ssl] dev-lang/python:2.6[ssl,threads] ) ) )"
+python_dep="${python_dep_ssl//\[ssl\]}"
+python_dep="${python_dep//,ssl}"
+python_dep="${python_dep//ssl,}"
+
+# The pysqlite blocker is for bug #282760.
+DEPEND="${python_dep}
+	>=sys-apps/sed-4.0.5 sys-devel/patch
+	doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
+	epydoc? ( >=dev-python/epydoc-2.0 !<=dev-python/pysqlite-2.4.1 )"
+# Require sandbox-2.2 for bug #288863.
+# For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's
+# quite slow, so it's not considered in the dependencies as an alternative to
+# to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so
+# for now, don't pull in xattr deps for other kernels.
+# For whirlpool hash, require python[ssl] or python-mhash (bug #425046).
+RDEPEND="${python_dep}
+	!build? ( >=sys-apps/sed-4.0.5
+		>=app-shells/bash-3.2_p17
+		>=app-admin/eselect-1.2
+		|| ( ${python_dep_ssl} dev-python/python-mhash )
+	)
+	elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
+	elibc_glibc? ( >=sys-apps/sandbox-2.2 )
+	elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
+	>=app-misc/pax-utils-0.1.17
+	xattr? ( kernel_linux? ( || ( >=dev-lang/python-3.3_pre20110902 dev-python/pyxattr ) ) )
+	selinux? ( || ( >=sys-libs/libselinux-2.0.94[python] <sys-libs/libselinux-2.0.94 ) )
+	!<app-shells/bash-3.2_p17
+	!<app-admin/logrotate-3.8.0"
+PDEPEND="
+	!build? (
+		>=net-misc/rsync-2.6.4
+		userland_GNU? ( >=sys-apps/coreutils-6.4 )
+	)"
+# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
+# NOTE: FEATURES=install-sources requires debugedit and rsync
+
+SRC_ARCHIVES="http://dev.gentoo.org/~zmedico/portage/archives"
+
+prefix_src_archives() {
+	local x y
+	for x in ${@}; do
+		for y in ${SRC_ARCHIVES}; do
+			echo ${y}/${x}
+		done
+	done
+}
+
+PV_PL="2.1.2"
+PATCHVER_PL=""
+TARBALL_PV=$PV
+SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
+	$(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)
+	linguas_pl? ( mirror://gentoo/${PN}-man-pl-${PV_PL}.tar.bz2
+		$(prefix_src_archives ${PN}-man-pl-${PV_PL}.tar.bz2) )"
+
+PATCHVER=
+[[ $TARBALL_PV = $PV ]] || PATCHVER=$PV
+if [ -n "${PATCHVER}" ]; then
+	SRC_URI="${SRC_URI} mirror://gentoo/${PN}-${PATCHVER}.patch.bz2
+	$(prefix_src_archives ${PN}-${PATCHVER}.patch.bz2)"
+fi
+
+S="${WORKDIR}"/${PN}-${TARBALL_PV}
+S_PL="${WORKDIR}"/${PN}-${PV_PL}
+
+compatible_python_is_selected() {
+	[[ $(/usr/bin/python -c 'import sys ; sys.stdout.write(sys.hexversion >= 0x2060000 and "good" or "bad")') = good ]]
+}
+
+current_python_has_xattr() {
+	[[ $(/usr/bin/python -c 'import sys ; sys.stdout.write(sys.hexversion >= 0x3030000 and "yes" or "no")') = yes ]] || \
+	/usr/bin/python -c 'import xattr' 2>/dev/null
+}
+
+pkg_setup() {
+	# Bug #359731 - Die early if get_libdir fails.
+	[[ -z $(get_libdir) ]] && \
+		die "get_libdir returned an empty string"
+
+	if use python2 && use python3 ; then
+		ewarn "Both python2 and python3 USE flags are enabled, but only one"
+		ewarn "can be in the shebangs. Using python3."
+	fi
+	if use pypy1_9 && use python3 ; then
+		ewarn "Both pypy1_9 and python3 USE flags are enabled, but only one"
+		ewarn "can be in the shebangs. Using python3."
+	fi
+	if use pypy1_9 && use python2 ; then
+		ewarn "Both pypy1_9 and python2 USE flags are enabled, but only one"
+		ewarn "can be in the shebangs. Using python2"
+	fi
+	if ! use pypy1_9 && ! use python2 && ! use python3 && \
+		! compatible_python_is_selected ; then
+		ewarn "Attempting to select a compatible default python interpreter"
+		local x success=0
+		for x in /usr/bin/python2.* ; do
+			x=${x#/usr/bin/python2.}
+			if [[ $x -ge 6 ]] 2>/dev/null ; then
+				eselect python set python2.$x
+				if compatible_python_is_selected ; then
+					elog "Default python interpreter is now set to python-2.$x"
+					success=1
+					break
+				fi
+			fi
+		done
+		if [ $success != 1 ] ; then
+			eerror "Unable to select a compatible default python interpreter!"
+			die "This version of portage requires at least python-2.6 to be selected as the default python interpreter (see \`eselect python --help\`)."
+		fi
+	fi
+
+	if use python3; then
+		python_set_active_version 3
+	elif use python2; then
+		python_set_active_version 2
+	elif use pypy1_9; then
+		python_set_active_version 2.7-pypy-1.9
+	fi
+}
+
+src_prepare() {
+	if [ -n "${PATCHVER}" ] ; then
+		if [[ -L $S/bin/ebuild-helpers/portageq ]] ; then
+			rm "$S/bin/ebuild-helpers/portageq" \
+				|| die "failed to remove portageq helper symlink"
+		fi
+		epatch "${WORKDIR}/${PN}-${PATCHVER}.patch"
+	fi
+	einfo "Setting portage.VERSION to ${PVR} ..."
+	sed -e "s/^VERSION=.*/VERSION=\"${PVR}\"/" -i pym/portage/__init__.py || \
+		die "Failed to patch portage.VERSION"
+	sed -e "1s/VERSION/${PVR}/" -i doc/fragment/version || \
+		die "Failed to patch VERSION in doc/fragment/version"
+	sed -e "1s/VERSION/${PVR}/" -i man/* || \
+		die "Failed to patch VERSION in man page headers"
+
+	if ! use ipc ; then
+		einfo "Disabling ipc..."
+		sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
+			-i pym/_emerge/AbstractEbuildProcess.py || \
+			die "failed to patch AbstractEbuildProcess.py"
+	fi
+
+	if use xattr && use kernel_linux ; then
+		einfo "Adding FEATURES=xattr to make.globals ..."
+		echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \
+			|| die "failed to append to make.globals"
+	fi
+
+	if use python3; then
+		einfo "Converting shebangs for python3..."
+		python_convert_shebangs -r 3 .
+	elif use python2; then
+		einfo "Converting shebangs for python2..."
+		python_convert_shebangs -r 2 .
+	elif use pypy1_9; then
+		einfo "Converting shebangs for pypy-c1.9..."
+		python_convert_shebangs -r 2.7-pypy-1.9 .
+	fi
+
+	cd "${S}/cnf" || die
+	if [ -f "make.conf.${ARCH}".diff ]; then
+		patch make.conf "make.conf.${ARCH}".diff || \
+			die "Failed to patch make.conf.example"
+	else
+		eerror ""
+		eerror "Portage does not have an arch-specific configuration for this arch."
+		eerror "Please notify the arch maintainer about this issue. Using generic."
+		eerror ""
+	fi
+
+	# BSD and OSX need a sed wrapper so that find/xargs work properly
+	if use userland_GNU; then
+		rm -f "${S}"/bin/ebuild-helpers/sed || \
+			die "Failed to remove sed wrapper"
+	fi
+}
+
+src_compile() {
+	if use doc; then
+		emake docbook || die
+	fi
+
+	if use epydoc; then
+		einfo "Generating api docs"
+		emake epydoc || die
+	fi
+}
+
+src_test() {
+	emake test || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" \
+		sysconfdir="/etc" \
+		prefix="/usr" \
+		libdir="/usr/$(get_libdir)" \
+		install || die
+
+	# Use dodoc for compression, since the Makefile doesn't do that.
+	dodoc "${S}"/{ChangeLog,NEWS,RELEASE-NOTES} || die
+
+	if use linguas_pl; then
+		doman -i18n=pl "${S_PL}"/man/pl/*.[0-9] || die
+		doman -i18n=pl_PL.UTF-8 "${S_PL}"/man/pl_PL.UTF-8/*.[0-9] || die
+	fi
+}
+
+pkg_preinst() {
+	if [[ $ROOT == / ]] ; then
+		# Run some minimal tests as a sanity check.
+		local test_runner=$(find "$D" -name runTests)
+		if [[ -n $test_runner && -x $test_runner ]] ; then
+			einfo "Running preinst sanity tests..."
+			"$test_runner" || die "preinst sanity tests failed"
+		fi
+	fi
+
+	if use xattr && ! current_python_has_xattr ; then
+		ewarn "For optimal performance in xattr handling, install"
+		ewarn "dev-python/pyxattr, or install >=dev-lang/python-3.3 and"
+		ewarn "enable USE=python3 for $CATEGORY/$PN."
+	fi
+
+	if ! use build && ! has_version dev-python/pycrypto && \
+		! has_version '>=dev-lang/python-2.6[ssl]' ; then
+		ewarn "If you are an ebuild developer and you plan to commit ebuilds"
+		ewarn "with this system then please install dev-python/pycrypto or"
+		ewarn "enable the ssl USE flag for >=dev-lang/python-2.6 in order"
+		ewarn "to enable RMD160 hash support."
+		ewarn "See bug #198398 for more information."
+	fi
+
+	if [[ -d ${ROOT}var/log/portage && \
+		$(ls -ld "${ROOT}var/log/portage") != *" portage portage "* ]] && \
+		has_version '<sys-apps/portage-2.1.10.11' ; then
+		# Initialize permissions for bug #378451 and bug #377177, since older
+		# portage does not create /var/log/portage with the desired default
+		# permissions.
+		einfo "Applying portage group permission to ${ROOT}var/log/portage for bug #378451"
+		chown portage:portage "${ROOT}var/log/portage"
+		chmod g+ws "${ROOT}var/log/portage"
+	fi
+
+	if has_version '<sys-apps/portage-2.1.10.61' ; then
+		ewarn "FEATURES=config-protect-if-modified is now enabled by default."
+		ewarn "This causes the CONFIG_PROTECT behavior to be skipped for"
+		ewarn "files that have not been modified since they were installed."
+	fi
+}
+
+pkg_postinst() {
+	# Compile all source files recursively. Any orphans
+	# will be identified and removed in postrm.
+	python_mod_optimize /usr/$(get_libdir)/portage/pym
+}
+
+pkg_postrm() {
+	python_mod_cleanup /usr/$(get_libdir)/portage/pym
+}
diff --git a/sys-apps/portage/portage-2.2.0_alpha122.ebuild b/sys-apps/portage/portage-2.2.0_alpha122.ebuild
new file mode 100644
index 000000000000..6822be7d8d49
--- /dev/null
+++ b/sys-apps/portage/portage-2.2.0_alpha122.ebuild
@@ -0,0 +1,341 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2.0_alpha122.ebuild,v 1.1 2012/08/22 23:37:22 zmedico Exp $
+
+# Require EAPI 2 since we now require at least python-2.6 (for python 3
+# syntax support) which also requires EAPI 2.
+EAPI=3
+inherit eutils multilib python
+
+DESCRIPTION="Portage is the package management and distribution system for Gentoo"
+HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
+LICENSE="GPL-2"
+KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+SLOT="0"
+IUSE="build doc epydoc +ipc linguas_pl pypy1_9 python2 python3 selinux xattr"
+
+# Import of the io module in python-2.6 raises ImportError for the
+# thread module if threading is disabled.
+python_dep_ssl="python3? ( =dev-lang/python-3*[ssl] )
+	!pypy1_9? ( !python2? ( !python3? (
+		|| ( >=dev-lang/python-2.7[ssl] dev-lang/python:2.6[threads,ssl] )
+	) ) )
+	pypy1_9? ( !python2? ( !python3? ( dev-python/pypy:1.9[bzip2,ssl] ) ) )
+	python2? ( !python3? ( || ( dev-lang/python:2.7[ssl] dev-lang/python:2.6[ssl,threads] ) ) )"
+python_dep="${python_dep_ssl//\[ssl\]}"
+python_dep="${python_dep//,ssl}"
+python_dep="${python_dep//ssl,}"
+
+# The pysqlite blocker is for bug #282760.
+DEPEND="${python_dep}
+	>=sys-apps/sed-4.0.5 sys-devel/patch
+	doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
+	epydoc? ( >=dev-python/epydoc-2.0 !<=dev-python/pysqlite-2.4.1 )"
+# Require sandbox-2.2 for bug #288863.
+# For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's
+# quite slow, so it's not considered in the dependencies as an alternative to
+# to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so
+# for now, don't pull in xattr deps for other kernels.
+# For whirlpool hash, require python[ssl] or python-mhash (bug #425046).
+RDEPEND="${python_dep}
+	!build? ( >=sys-apps/sed-4.0.5
+		>=app-shells/bash-3.2_p17
+		>=app-admin/eselect-1.2
+		|| ( ${python_dep_ssl} dev-python/python-mhash )
+	)
+	elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
+	elibc_glibc? ( >=sys-apps/sandbox-2.2 )
+	elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
+	>=app-misc/pax-utils-0.1.17
+	xattr? ( kernel_linux? ( || ( >=dev-lang/python-3.3_pre20110902 dev-python/pyxattr ) ) )
+	selinux? ( || ( >=sys-libs/libselinux-2.0.94[python] <sys-libs/libselinux-2.0.94 ) )
+	!<app-shells/bash-3.2_p17
+	!<app-admin/logrotate-3.8.0"
+PDEPEND="
+	!build? (
+		>=net-misc/rsync-2.6.4
+		userland_GNU? ( >=sys-apps/coreutils-6.4 )
+	)"
+# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
+# NOTE: FEATURES=install-sources requires debugedit and rsync
+
+SRC_ARCHIVES="http://dev.gentoo.org/~zmedico/portage/archives"
+
+prefix_src_archives() {
+	local x y
+	for x in ${@}; do
+		for y in ${SRC_ARCHIVES}; do
+			echo ${y}/${x}
+		done
+	done
+}
+
+PV_PL="2.1.2"
+PATCHVER_PL=""
+TARBALL_PV=2.2.0_alpha121
+SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
+	$(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)
+	linguas_pl? ( mirror://gentoo/${PN}-man-pl-${PV_PL}.tar.bz2
+		$(prefix_src_archives ${PN}-man-pl-${PV_PL}.tar.bz2) )"
+
+PATCHVER=
+[[ $TARBALL_PV = $PV ]] || PATCHVER=$PV
+if [ -n "${PATCHVER}" ]; then
+	SRC_URI="${SRC_URI} mirror://gentoo/${PN}-${PATCHVER}.patch.bz2
+	$(prefix_src_archives ${PN}-${PATCHVER}.patch.bz2)"
+fi
+
+S="${WORKDIR}"/${PN}-${TARBALL_PV}
+S_PL="${WORKDIR}"/${PN}-${PV_PL}
+
+compatible_python_is_selected() {
+	[[ $("${EPREFIX}/usr/bin/python" -c 'import sys ; sys.stdout.write(sys.hexversion >= 0x2060000 and "good" or "bad")') = good ]]
+}
+
+current_python_has_xattr() {
+	[[ $("${EPREFIX}/usr/bin/python" -c 'import sys ; sys.stdout.write(sys.hexversion >= 0x3030000 and "yes" or "no")') = yes ]] || \
+	"${EPREFIX}/usr/bin/python" -c 'import xattr' 2>/dev/null
+}
+
+pkg_setup() {
+	# Bug #359731 - Die early if get_libdir fails.
+	[[ -z $(get_libdir) ]] && \
+		die "get_libdir returned an empty string"
+
+	if use python2 && use python3 ; then
+		ewarn "Both python2 and python3 USE flags are enabled, but only one"
+		ewarn "can be in the shebangs. Using python3."
+	fi
+	if use pypy1_9 && use python3 ; then
+		ewarn "Both pypy1_9 and python3 USE flags are enabled, but only one"
+		ewarn "can be in the shebangs. Using python3."
+	fi
+	if use pypy1_9 && use python2 ; then
+		ewarn "Both pypy1_9 and python2 USE flags are enabled, but only one"
+		ewarn "can be in the shebangs. Using python2"
+	fi
+	if ! use pypy1_9 && ! use python2 && ! use python3 && \
+		! compatible_python_is_selected ; then
+		ewarn "Attempting to select a compatible default python interpreter"
+		local x success=0
+		for x in /usr/bin/python2.* ; do
+			x=${x#/usr/bin/python2.}
+			if [[ $x -ge 6 ]] 2>/dev/null ; then
+				eselect python set python2.$x
+				if compatible_python_is_selected ; then
+					elog "Default python interpreter is now set to python-2.$x"
+					success=1
+					break
+				fi
+			fi
+		done
+		if [ $success != 1 ] ; then
+			eerror "Unable to select a compatible default python interpreter!"
+			die "This version of portage requires at least python-2.6 to be selected as the default python interpreter (see \`eselect python --help\`)."
+		fi
+	fi
+
+	if use python3; then
+		python_set_active_version 3
+	elif use python2; then
+		python_set_active_version 2
+	elif use pypy1_9; then
+		python_set_active_version 2.7-pypy-1.9
+	fi
+}
+
+src_prepare() {
+	if [ -n "${PATCHVER}" ] ; then
+		if [[ -L $S/bin/ebuild-helpers/portageq ]] ; then
+			rm "$S/bin/ebuild-helpers/portageq" \
+				|| die "failed to remove portageq helper symlink"
+		fi
+		epatch "${WORKDIR}/${PN}-${PATCHVER}.patch"
+	fi
+	einfo "Setting portage.VERSION to ${PVR} ..."
+	sed -e "s/^VERSION=.*/VERSION=\"${PVR}\"/" -i pym/portage/__init__.py || \
+		die "Failed to patch portage.VERSION"
+	sed -e "1s/VERSION/${PVR}/" -i doc/fragment/version || \
+		die "Failed to patch VERSION in doc/fragment/version"
+	sed -e "1s/VERSION/${PVR}/" -i man/* || \
+		die "Failed to patch VERSION in man page headers"
+
+	if ! use ipc ; then
+		einfo "Disabling ipc..."
+		sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
+			-i pym/_emerge/AbstractEbuildProcess.py || \
+			die "failed to patch AbstractEbuildProcess.py"
+	fi
+
+	if use xattr && use kernel_linux ; then
+		einfo "Adding FEATURES=xattr to make.globals ..."
+		echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \
+			|| die "failed to append to make.globals"
+	fi
+
+	if use python3; then
+		einfo "Converting shebangs for python3..."
+		python_convert_shebangs -r 3 .
+	elif use python2; then
+		einfo "Converting shebangs for python2..."
+		python_convert_shebangs -r 2 .
+	elif use pypy1_9; then
+		einfo "Converting shebangs for pypy-c1.9..."
+		python_convert_shebangs -r 2.7-pypy-1.9 .
+	fi
+
+	if [[ -n ${EPREFIX} ]] ; then
+		einfo "Setting portage.const.EPREFIX ..."
+		sed -e "s|^\(SANDBOX_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/sandbox\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(FAKEROOT_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/fakeroot\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(BASH_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/bash\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(MOVE_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/mv\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(PRELINK_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/sbin/prelink\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(EPREFIX[[:space:]]*=[[:space:]]*\"\).*|\\1${EPREFIX}\"|" \
+			-i pym/portage/const.py || \
+			die "Failed to patch portage.const.EPREFIX"
+
+		einfo "Prefixing shebangs ..."
+		find . -type f -print0 | \
+		while read -r -d $'\0' ; do
+			local shebang=$(head -n1 "$REPLY")
+			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
+				sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \
+					die "sed failed"
+			fi
+		done
+
+		einfo "Adjusting make.globals ..."
+		sed -e 's|^SYNC=.*|SYNC="rsync://rsync.prefix.freens.org/gentoo-portage-prefix"|' \
+			-e "s|^\(PORTDIR=\)\(/usr/portage\)|\\1\"${EPREFIX}\\2\"|" \
+			-e "s|^\(PORTAGE_TMPDIR=\)\(/var/tmp\)|\\1\"${EPREFIX}\\2\"|" \
+			-i cnf/make.globals || die "sed failed"
+
+		einfo "Adding FEATURES=force-prefix to make.globals ..."
+		echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \
+			|| die "failed to append to make.globals"
+	fi
+
+	cd "${S}/cnf" || die
+	if [ -f "make.conf.${ARCH}".diff ]; then
+		patch make.conf "make.conf.${ARCH}".diff || \
+			die "Failed to patch make.conf.example"
+	else
+		eerror ""
+		eerror "Portage does not have an arch-specific configuration for this arch."
+		eerror "Please notify the arch maintainer about this issue. Using generic."
+		eerror ""
+	fi
+
+	# BSD and OSX need a sed wrapper so that find/xargs work properly
+	if use userland_GNU; then
+		rm -f "${S}"/bin/ebuild-helpers/sed || \
+			die "Failed to remove sed wrapper"
+	fi
+}
+
+src_compile() {
+	if use doc; then
+		emake docbook || die
+	fi
+
+	if use epydoc; then
+		einfo "Generating api docs"
+		emake epydoc || die
+	fi
+}
+
+src_test() {
+	# make files executable, in case they were created by patch
+	find bin -type f | xargs chmod +x
+	emake test || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" \
+		sysconfdir="${EPREFIX}/etc" \
+		prefix="${EPREFIX}/usr" \
+		libdir="${EPREFIX}/usr/$(get_libdir)" \
+		install || die
+
+	# Use dodoc for compression, since the Makefile doesn't do that.
+	dodoc "${S}"/{ChangeLog,NEWS,RELEASE-NOTES} || die
+
+	if use linguas_pl; then
+		doman -i18n=pl "${S_PL}"/man/pl/*.[0-9] || die
+		doman -i18n=pl_PL.UTF-8 "${S_PL}"/man/pl_PL.UTF-8/*.[0-9] || die
+	fi
+}
+
+pkg_preinst() {
+	if [[ $ROOT == / ]] ; then
+		# Run some minimal tests as a sanity check.
+		local test_runner=$(find "$ED" -name runTests)
+		if [[ -n $test_runner && -x $test_runner ]] ; then
+			einfo "Running preinst sanity tests..."
+			"$test_runner" || die "preinst sanity tests failed"
+		fi
+	fi
+
+	if use xattr && ! current_python_has_xattr ; then
+		ewarn "For optimal performance in xattr handling, install"
+		ewarn "dev-python/pyxattr, or install >=dev-lang/python-3.3 and"
+		ewarn "enable USE=python3 for $CATEGORY/$PN."
+	fi
+
+	if ! use build && ! has_version dev-python/pycrypto && \
+		! has_version '>=dev-lang/python-2.6[ssl]' ; then
+		ewarn "If you are an ebuild developer and you plan to commit ebuilds"
+		ewarn "with this system then please install dev-python/pycrypto or"
+		ewarn "enable the ssl USE flag for >=dev-lang/python-2.6 in order"
+		ewarn "to enable RMD160 hash support."
+		ewarn "See bug #198398 for more information."
+	fi
+
+	has_version "<=${CATEGORY}/${PN}-2.2_pre5" \
+		&& WORLD_MIGRATION_UPGRADE=true || WORLD_MIGRATION_UPGRADE=false
+
+	# If portage-2.1.6 is installed and the preserved_libs_registry exists,
+	# assume that the NEEDED.ELF.2 files have already been generated.
+	has_version "<=${CATEGORY}/${PN}-2.2_pre7" && \
+		! ( [ -e "${EROOT}"var/lib/portage/preserved_libs_registry ] && \
+		has_version ">=${CATEGORY}/${PN}-2.1.6_rc" ) \
+		&& NEEDED_REBUILD_UPGRADE=true || NEEDED_REBUILD_UPGRADE=false
+}
+
+pkg_postinst() {
+	# Compile all source files recursively. Any orphans
+	# will be identified and removed in postrm.
+	python_mod_optimize /usr/$(get_libdir)/portage/pym
+
+	if $WORLD_MIGRATION_UPGRADE && \
+		grep -q "^@" "${EROOT}/var/lib/portage/world"; then
+		einfo "moving set references from the worldfile into world_sets"
+		cd "${EROOT}/var/lib/portage/"
+		grep "^@" world >> world_sets
+		sed -i -e '/^@/d' world
+	fi
+
+	if $NEEDED_REBUILD_UPGRADE ; then
+		einfo "rebuilding NEEDED.ELF.2 files"
+		for cpv in "${EROOT}/var/db/pkg"/*/*; do
+			if [ -f "${cpv}/NEEDED" ]; then
+				rm -f "${cpv}/NEEDED.ELF.2"
+				while read line; do
+					filename=${line% *}
+					needed=${line#* }
+					needed=${needed//+/++}
+					needed=${needed//#/##}
+					needed=${needed//%/%%}
+					newline=$(scanelf -BF "%a;%F;%S;%r;${needed}" $filename)
+					newline=${newline//  -  }
+					echo "${newline:3}" >> "${cpv}/NEEDED.ELF.2"
+				done < "${cpv}/NEEDED"
+			fi
+		done
+	fi
+}
+
+pkg_postrm() {
+	python_mod_cleanup /usr/$(get_libdir)/portage/pym
+}
diff --git a/sys-block/fio/Manifest b/sys-block/fio/Manifest
index f34051dfc71b..29f2dac14663 100644
--- a/sys-block/fio/Manifest
+++ b/sys-block/fio/Manifest
@@ -13,3 +13,4 @@ DIST fio-1.58.tar.bz2 354895 SHA256 c1477f68183c7dd892218a1e2bfab8c21b98c01bf9b7
 DIST fio-1.99.10.tar.bz2 371892 SHA256 c6af6f685dfaa32c1f5779497f8d1b3dc1e18fc54bf35f0f3bb8120cf4ac2b3a
 DIST fio-2.0.3.tar.bz2 373972 SHA256 5cba2bfe5f9ad23d2a1e2be5c63898ac5566e309f6fe5fb75c346b00e179efdd
 DIST fio-2.0.8.tar.bz2 216417 SHA256 584724a98cbed7364a550c9106c88d1ae3833b3edffda46ed5fcbb90fffb672a SHA512 ae254e4a2ea1a17052c9c2de6e6707c6254a80dd96c29a74c88d85808f1aa471e1ef2dd0a558114814b7813daedfabf4d38eb1bf875791d186b08eaeaecfe9e4 WHIRLPOOL 0350893fb7b097ae6ef902134f77fed078ae54be29e5c8c3108467c1d4dffb87e96d75fb365473c80f5f9b36b63a5fdc135bf0dd3f5f45f358081adc191a5df8
+DIST fio-2.0.9.tar.bz2 217972 SHA256 46c44757f489ffa89fa4566baba93c9f2efdc584029f1106d0c04ee900a8993a SHA512 c8be33477e3735170de9b91da3af8de32680e5e6e96728f0664aab21156e59f24a2508f6d2966b316c01e89f4932e0cdcbd9ef3c22067b76f81dd48e56dd6fc3 WHIRLPOOL 4e9313a75b56c925b58fd9dd19d4148e9643661ee63bfd7dfca89c669f42c9fc58d91bdcfaf62b5761a44a189c9c11555456557d76069ffdc80f935ea4584d84
diff --git a/sys-block/fio/fio-2.0.9.ebuild b/sys-block/fio/fio-2.0.9.ebuild
new file mode 100644
index 000000000000..2c5456c7c8e5
--- /dev/null
+++ b/sys-block/fio/fio-2.0.9.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-block/fio/fio-2.0.9.ebuild,v 1.1 2012/08/22 23:35:23 radhermit Exp $
+
+EAPI="4"
+
+inherit toolchain-funcs flag-o-matic
+
+MY_PV="${PV/_rc/-rc}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="Jens Axboe's Flexible IO tester"
+HOMEPAGE="http://brick.kernel.dk/snaps/"
+SRC_URI="http://brick.kernel.dk/snaps/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="dev-libs/libaio"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	sed -i \
+		-e '/filter /s:-o:$(LDFLAGS) -o:' \
+		-e '/: depend$/d' \
+		Makefile || die
+}
+
+src_compile() {
+	append-flags -W
+	emake V=1 CC="$(tc-getCC)" OPTFLAGS="${CFLAGS}"
+}
+
+src_install() {
+	emake install DESTDIR="${D}" prefix="/usr" mandir="/usr/share/man"
+	dodoc README REPORTING-BUGS HOWTO
+	docinto examples
+	dodoc examples/*
+	doman fio.1
+}
diff --git a/sys-libs/freeipmi/Manifest b/sys-libs/freeipmi/Manifest
index b52159793b6b..61edcd40cd47 100644
--- a/sys-libs/freeipmi/Manifest
+++ b/sys-libs/freeipmi/Manifest
@@ -1,3 +1,3 @@
 DIST freeipmi-1.1.5.tar.gz 3069748 SHA256 f26bafe90e6d39a032c73aaad66bde1f2f2542e1e0f2cfe2c1ef81f22b99cad9 SHA512 bf3fe7414a1dc0593902b094ec61311681bbad8619cd18c6919271c184a6f65f2546bc5d33e5199b0481948262a3cad9733bc604eb7f641f69aea37378608cc4 WHIRLPOOL d211d90f46794dd216f75b5742582fef1549d7d84431dfa80f2015180167325d924fb328bad68410583c60d4e0743eff3bd990bd2ccb622650b260ab5fc150df
 DIST freeipmi-1.1.7.tar.gz 3080264 SHA256 3b4fc1b514e2052622bfcbfef5b69726d83505aa54109b16ed847a9d0b47bacb SHA512 ea88e2da222d8fee34469f1a5dea02de7c82ce06d9406642cf15b9fdb43d41963e7739e0a4ae82702db044d8e89f9330fd0a23c993dd8595024d3528b6de99f9 WHIRLPOOL 5ce8c2d58a685e4567204ed99542bffea0bdc0b550311720a4685d4516285a37340f94e823d11ee9984d608310fb98a555a12b8b9f4b5da72424d37462fe3ff9
-DIST freeipmi-1.2.0.beta0.tar.gz 3003009 SHA256 86880c111dedb9ff12275bf989bc532a8e19e10c9fee24ab7f9dfc1bb795161b SHA512 1208353743dff20a4b402db1ad23346019e4ddfc4cf817399a73c19d07c3f99a81c92358cd7b22e617517ff99eeba01a70d3242665deff08b65cf8f080429d60 WHIRLPOOL 97f1f8e6c6a1bd2d2d0d1080910156e05e1114479051f4fc4d4fe0ec6c6cc9af44f05a549575fbe78b8aac0fde44194608adfe5e6ab129880944ebd8c22fba27
+DIST freeipmi-1.2.1.tar.gz 3024658 SHA256 f11c25eedbbcc558e8d3e9baf8602bd9559c97da7f544a3d4247a9c40b82be9f SHA512 cb9c67c60b31935adb0f70c04bce7c4699dc78f2c3e8ecd79c4590e77000edbdd9c003ff61dda05e03acfa553495b365315f0e54608a45c704d67026ec93091d WHIRLPOOL 69acdec4ac8073df2c49bc313cc003d0ffe01cfb7b3c9eebf3ebef03f3a4329915f4f218be4f571174d5766919018c7c311fda0c6b4e6c2e46fa4fe7cfa6ae0b
diff --git a/sys-libs/freeipmi/files/ipmiseld.confd b/sys-libs/freeipmi/files/ipmiseld.confd
new file mode 100644
index 000000000000..8e40a5c0c8dc
--- /dev/null
+++ b/sys-libs/freeipmi/files/ipmiseld.confd
@@ -0,0 +1,5 @@
+# This configuration file controls the behaviour of the ipmiseld daemon
+# from FreeIPMI.
+# See `man 8 ipmiseld` for further information.
+
+# OPTIONS="--config-file /etc/freeipmi/ipmiseld.conf"
diff --git a/sys-libs/freeipmi/freeipmi-1.2.0_beta0.ebuild b/sys-libs/freeipmi/freeipmi-1.2.1.ebuild
similarity index 92%
rename from sys-libs/freeipmi/freeipmi-1.2.0_beta0.ebuild
rename to sys-libs/freeipmi/freeipmi-1.2.1.ebuild
index cdfc88106566..28c7948e528d 100644
--- a/sys-libs/freeipmi/freeipmi-1.2.0_beta0.ebuild
+++ b/sys-libs/freeipmi/freeipmi-1.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/freeipmi/freeipmi-1.2.0_beta0.ebuild,v 1.1 2012/07/31 01:41:36 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/freeipmi/freeipmi-1.2.1.ebuild,v 1.1 2012/08/22 23:12:08 flameeyes Exp $
 
 EAPI=4
 
@@ -76,4 +76,7 @@ src_install() {
 
 	newinitd "${FILESDIR}"/bmc-watchdog.initd.4 bmc-watchdog
 	newconfd "${FILESDIR}"/bmc-watchdog.confd bmc-watchdog
+
+	newinitd "${FILESDIR}"/bmc-watchdog.initd.4 ipmiseld
+	newconfd "${FILESDIR}"/ipmiseld.confd ipmiseld
 }
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 1b1d674877fd..edebc17d16ee 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -15,7 +15,7 @@ DIST glibc-2.14.1-patches-5.tar.bz2 159559 SHA256 b185e1742d4e180015f16bd8f641cb
 DIST glibc-2.14.1.tar.bz2 15650580 SHA256 6e85a2fa3ebe6b28103361f09d27eeda37a021f24dab73f34064456d5a715b3b SHA512 c83c9d6dae0091b7b6d3c8fb2b9376e58d2574a8016ce1b4d6e870afca3b892e8da2482ddf95d07ae7407a7f4cc84c1f52cb2f975a18c734529ec019204f65b7 WHIRLPOOL 0aee8c43d851375dd18b3b0ec33aad74ab396936f347cbc9f91f182d84ec03d45425be44a7edbc3faa8159dcbf9cbc4a09fa8c70b3da495fff071469fe063959
 DIST glibc-2.14.tar.bz2 15630590 SHA256 8404b54651d42133d9a2ab17d30d698e53c5f250b2ad8e5f3d9a208ea7c75d6c SHA512 4647b9999e56d88c669832b58555d4e53a22737d5c1963ae62e89958d9880193d1ad8f37cd4b05464cab79f7a244772eb1484d55788ec4828ff98dac30c8fa80 WHIRLPOOL 3aa97d56fa28bd45fb9a41925f41fe0d74020553ca4aa92293cbc47de2bc8a88b7dcbf368c77f0872d18ab6ba91bdf2b199a0520d946115f821dd4a4728ef2b8
 DIST glibc-2.15-patches-13.tar.bz2 154658 SHA256 59c11d8b70bc406f6bc7dd87509f1c5fa05998fb0dde8e1be530064e9dd24a53 SHA512 ceec0506e10cff25ec9acce3d4e3f174d56a7cbb00993cb8edbf532f303c48e3b2d5e965e4470f537dbed23d14a29bae4ac4c834b4c11fcd27d8e66d8500e4c6 WHIRLPOOL 9dadbcd8626df9938b6b215a0618cbc605405bf56bb143f25e029c0aa00d5d6ac75877c7b2fd2a2c22291f62587cf8011c30d32baafb5ed0dd2bb539895f1c54
-DIST glibc-2.15-patches-20.tar.bz2 111045 SHA256 639934e73b74382c3226372d3d917a5315c5895d75f0bb4875f471326e25750c SHA512 4d34fa3a1db959379ca652b3930296004bba8ffdd67d0d7499c31e4e4e7b5c6511701e47d5cc619d59c5d99ee78f481cba1077b1a1688e426efe2f9c70f9e2e8 WHIRLPOOL d23abc8702f6772badb574cdb87983dee65ba81d0f8901e8480b44f1cbb293c69dc4fc9d8473271bc358bb07e15a56980a98a9692a8f2df8b2f2d66e7e8831cf
+DIST glibc-2.15-patches-21.tar.bz2 110297 SHA256 5553c0a37c5c0a3abb303850fa9d2ad309e2f47c3f42806c2f1dd32a48affbfe SHA512 5255ef053a2c30f9cae583133094f41604385b9d6e653a0d6aab1d13d69e6c8cbf16fde712607ab0bac738944a0410ddc050dc231ad4ea7d3584271937b0b059 WHIRLPOOL d70249c6c3c3c0a4d02c3ebbf0309bd6b3da3962231c153c77be38d217e2f57e0eba88614e34f0f219f485ba8f8474586d0059cfc505e44f312396e6a753d441
 DIST glibc-2.15.tar.xz 10280176 SHA256 321ec482abdc27b03244f7b345ee22dc431bc55daf9c000a4e7b040fbdbecb50 SHA512 fc8bc407cd9edfd79bd286d28c84e0b8224e1f57c1d318e73da098a9693257d78970178fd59f487f0321a079fcb772e8e78473fab52f091b2addb0a48fe8dcf7 WHIRLPOOL 061fc0c9915bd821dc31c2fea8e4f9a75b6c7ec0c935ea713d8c087408a8bf3c600179273438f3d9748fe40b946866b2f160e6da6fee4da51e549a30d0f0ebbc
 DIST glibc-2.16.0-patches-3.tar.bz2 83886 SHA256 bc839a6594f124cf636c573a67075ebfea8b962d734826fe754e5d2d46d4cae9 SHA512 f3d531eaa06f6c47ae6fc2f7f7ca854dcc0ceaef2b5ad0e7063cc2f0f73a4aef8bd73a759b04ac20def34cbc3350821bddc24968ca22fe81f331a2e3dcf8852e WHIRLPOOL abaa5df0d541607f695b644b334f47edfdaf836df006945f07ff89ba2136e5f4049eba2e929edbb9be749cffe5c63797658cfe461416281724a37bb6e8461a41
 DIST glibc-2.16.0.tar.xz 9990512 SHA256 1edc36aa2a6cb7127971fce8e02eecffe9c7956297ad3ef10dd4c09f486d5924 SHA512 be9acc11b77ab3c01d5766fe626a6a51bc3192ac98f9554fbb5c37120cfc6f636c0b7a80beddc180f13b32ad06051d24c1999fa2e64eeb724d55a9498f0f634e WHIRLPOOL 9bfd4358a4488080e12e08deca5fca59c1555853d1c1978b7d1bb3b480eb8fb125dccab38c55644248ae5e18b0167aec85f8a7850bab9e11f980aae6f171eac3
diff --git a/sys-libs/glibc/glibc-2.15-r2.ebuild b/sys-libs/glibc/glibc-2.15-r2.ebuild
index b7a6b9f5fb47..c902956ddca2 100644
--- a/sys-libs/glibc/glibc-2.15-r2.ebuild
+++ b/sys-libs/glibc/glibc-2.15-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.15-r2.ebuild,v 1.20 2012/08/18 18:40:21 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.15-r2.ebuild,v 1.21 2012/08/22 23:02:38 vapier Exp $
 
 inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib unpacker multiprocessing
 
@@ -33,7 +33,7 @@ esac
 MANPAGE_VER=""                                 # pregenerated manpages
 INFOPAGE_VER=""                                # pregenerated infopages
 LIBIDN_VER=""                                  # it's integrated into the main tarball now
-PATCH_VER="20"                                 # Gentoo patchset
+PATCH_VER="21"                                 # Gentoo patchset
 PORTS_VER=${RELEASE_VER}                       # version of glibc ports addon
 NPTL_KERN_VER=${NPTL_KERN_VER:-"2.6.9"}        # min kernel version nptl requires
 
diff --git a/sys-process/parallel/Manifest b/sys-process/parallel/Manifest
index 07a3c28edad0..37f188bc6dd3 100644
--- a/sys-process/parallel/Manifest
+++ b/sys-process/parallel/Manifest
@@ -1,2 +1,3 @@
-DIST parallel-20120522.tar.bz2 226625 RMD160 f1bff4bff0585e06c43d3827e2c9dc141979863d SHA1 bc8118949f900c05ef232c6946c4ebfa779cafed SHA256 697cd39b089d5b302fe8965650c5c6d9e8a6653f59e90a6c1a297aba0df31471
-DIST parallel-20120622.tar.bz2 228881 RMD160 a317c74ca3947cdbba3a72814118d9e3eaf6ce31 SHA1 b184a55674ce10e8bf7c65790c2806552eb79577 SHA256 bfdbb4a66835eacce2bffde23f5e0f12b4e99ced5e348b5f69b7aa97d0123869
+DIST parallel-20120522.tar.bz2 226625 SHA256 697cd39b089d5b302fe8965650c5c6d9e8a6653f59e90a6c1a297aba0df31471 SHA512 f5570bccafdb47885194a56c83be257e09495e8aa6f571442c919601a46e4501451838ae1e6e96140ac5d5b9676dae4a3cd30af455ad4f9fdbe3e7107a13ec1d WHIRLPOOL e5794b666ff94d5510101ccad95101543a346b31e4e5b717d31c019aa5c791ae9164bcc3dfbe6f4c5adb7b345ce34ee7387cd609ef36955c822b64887a68c649
+DIST parallel-20120622.tar.bz2 228881 SHA256 bfdbb4a66835eacce2bffde23f5e0f12b4e99ced5e348b5f69b7aa97d0123869 SHA512 35e89cd53d4352d18ad7cc1bbf036a4a8e30117846d2c87edccbd363e10539149c5526ba10b6fe3eaa1efafaf0b6fe7a5149e00d35e129e514632516eceef8ec WHIRLPOOL 9786c5f2427db9b06d62a388fa84f9d1be7aba217d8181c6226648fda909b73c5172bfd8caa2cf9b252d307a3c7817c6678fcc56b2da3b45fb31d8940fe110a7
+DIST parallel-20120822.tar.bz2 231076 SHA256 4762e0a47337c457bf4c2d16372fce4f6399de9441ac34d32b4e436d1ab26949 SHA512 004bef927ac93fa6769c6a8bc571764091903c86db14d58153ba53e5e93beb213fc7fd2b419ec8af69ae86a26a7fe4f828d99855ff1ffa64a771b01e3b177034 WHIRLPOOL 7ed52a7601ab30dc5036374df0f0e97343892fdc5a781cd17195f926828ab11717848d62cc55339c673bdae5d8bdf9b4b01537cd4a8b738db8607730451172d4
diff --git a/sys-process/parallel/parallel-20120822.ebuild b/sys-process/parallel/parallel-20120822.ebuild
new file mode 100644
index 000000000000..be9f7f93925a
--- /dev/null
+++ b/sys-process/parallel/parallel-20120822.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-process/parallel/parallel-20120822.ebuild,v 1.1 2012/08/22 23:14:12 radhermit Exp $
+
+EAPI=4
+
+DESCRIPTION="A shell tool for executing jobs in parallel locally or on remote machines"
+HOMEPAGE="http://www.gnu.org/software/parallel/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="dev-lang/perl
+	dev-perl/Devel-Size
+	virtual/perl-Data-Dumper
+	virtual/perl-File-Temp
+	virtual/perl-IO"
+# moreutils for `parallel` and grass for 'sql.1' manpage
+DEPEND="${RDEPEND}
+	!<sys-apps/moreutils-0.45-r1
+	!<sci-geosciences/grass-6.4.1-r1"
+
+DOCS="NEWS README"
+
+src_configure() {
+	econf --docdir="${EPREFIX}"/usr/share/doc/${PF}/html
+}
+
+src_install() {
+	default
+
+	# See src/Makefile.am for this one:
+	rm -f "${ED}"usr/bin/sem
+	dosym ${PN} /usr/bin/sem
+}
+
+pkg_postinst() {
+	elog "To distribute jobs to remote machines you'll need these dependencies"
+	elog " net-misc/openssh"
+	elog " net-misc/rsync"
+}
diff --git a/www-apps/nikola/Manifest b/www-apps/nikola/Manifest
index f85c51abf7e1..d947feb58c6e 100644
--- a/www-apps/nikola/Manifest
+++ b/www-apps/nikola/Manifest
@@ -1 +1,2 @@
-DIST nikola-3.zip 954645 RMD160 187d5b1e62cff44a1991e12478b14f1b8e949705 SHA1 be6bf791f89f07965a58fe7134f8c82b31e8e47a SHA256 0d08e09ecdb941130af6db7d5a3c23e06ade5d91119c7483dcb508d7a804a338
+DIST nikola-3.zip 954645 SHA256 0d08e09ecdb941130af6db7d5a3c23e06ade5d91119c7483dcb508d7a804a338
+DIST nikola-4.zip 509907 SHA256 c1db8baab62e39136252f86560cec5fee6cc94fdc63f0c415186ed428d93481c SHA512 3accac350c585db9d53b7d6327c17999bb75f2dd4c1b60515f580d4722c7e4aa1f3d48a235374670d45a322ba3891ff41bd7936e15833640109b27a32b18da23 WHIRLPOOL 47aa290f29bfcdc011ce3927679f37c9f800321a06e4bc95eabf0f3328d0f5c8c4106c0356714a3ab59d84a303e55b1da1cc70d074772184158c41a18d1c0a4d
diff --git a/www-apps/nikola/nikola-4.ebuild b/www-apps/nikola/nikola-4.ebuild
new file mode 100644
index 000000000000..725fb20f876e
--- /dev/null
+++ b/www-apps/nikola/nikola-4.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/nikola/nikola-4.ebuild,v 1.1 2012/08/23 05:47:06 patrick Exp $
+
+EAPI=4
+PYTHON_COMPAT="python2_6 python2_7"
+
+inherit python-distutils-ng
+
+DESCRIPTION="A static website and blog generator"
+HOMEPAGE="http://nikola.ralsina.com.ar/"
+SRC_URI="http://nikola-generator.googlecode.com/files/${P}.zip"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=""
+RDEPEND="dev-python/docutils
+	dev-python/doit
+	dev-python/imaging
+	>=dev-python/mako-0.6
+	dev-python/pygments"
+
+src_install() {
+	python-distutils-ng_src_install
+
+	# hackish way to remove docs that ended up in the wrong place
+	rm "${D}"/usr/*.txt
+
+	dodoc README.md docs/*
+}
diff --git a/www-apps/otrs/Manifest b/www-apps/otrs/Manifest
index e83e9a9bcddb..d061a8b20897 100644
--- a/www-apps/otrs/Manifest
+++ b/www-apps/otrs/Manifest
@@ -1,2 +1,2 @@
-DIST otrs-3.1.7.tar.bz2 23759547 SHA256 a1e3da9569bb99b9f2cbbc791488dfa5954c2b94222e6463a4da1205625a6fb9 SHA512 8fbda3a2303dd0451422313c2e2f499a73fe620abbb49984a0c697ccf08dd4e7772bd34d097ac22bcf155c2386f2c6e0d298c8ad34be4cce4728cc5888033674 WHIRLPOOL 9ffe536736746a4dce1401d908a6f216afeedbb1929dc107e11ee194a196a117fa477e4353a7109d909fb4bda3eb725f97a348a9494929f13a383476ce3500b2
 DIST otrs-3.1.8.tar.bz2 23804808 SHA256 a80285bb818fc32ba3f077a800da842be3f0a2e81e2542a9d7300d1709b61a9e SHA512 f679d0e55d4b3e5d224c986a111a61a54cfac3f54ad079be2f19f511bfbff470446ca3cece9046ab953798b931e0d1e461d85fa944a0b4190091a6fe499b984c WHIRLPOOL a4bafe6640d1951d0f79b1fe0823e3a127630f88a6d3265e805d9bf7a2831c4a497f4bdf867d904b68bcf6be5c6f86b24b5604ef871f968db0c2e7fdcd3b56b8
+DIST otrs-3.1.9.tar.bz2 23782055 SHA256 9691c106789013e31f8f7f16085df9478dff28f3667d0fe4d33965b7ae1fc49d SHA512 de3b817ba181a558975174c89dea6a26e1f72959c199f43a942e2fc0328364a457f0b78faee93470ce54f4baef22d71b3d28dffae53f6294b6d1030edce882da WHIRLPOOL ea546f81a2c4cb86c513aed6f190f099131cb3945228403f34d4d51130ceedd38cb3de44dc07253dea3e928d1dd7734c60c0957980f8c5a26a417718fc1f1661
diff --git a/www-apps/otrs/otrs-3.1.7.ebuild b/www-apps/otrs/otrs-3.1.9.ebuild
similarity index 97%
rename from www-apps/otrs/otrs-3.1.7.ebuild
rename to www-apps/otrs/otrs-3.1.9.ebuild
index 58fccf94e0b2..35b2ed8d13eb 100644
--- a/www-apps/otrs/otrs-3.1.7.ebuild
+++ b/www-apps/otrs/otrs-3.1.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/otrs/otrs-3.1.7.ebuild,v 1.1 2012/06/28 06:31:22 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/otrs/otrs-3.1.9.ebuild,v 1.1 2012/08/23 03:50:04 patrick Exp $
 
 EAPI=2
 
diff --git a/x11-libs/colord-gtk/colord-gtk-0.1.22.ebuild b/x11-libs/colord-gtk/colord-gtk-0.1.22.ebuild
index f4ad2470657c..440e1f876f0a 100644
--- a/x11-libs/colord-gtk/colord-gtk-0.1.22.ebuild
+++ b/x11-libs/colord-gtk/colord-gtk-0.1.22.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/colord-gtk/colord-gtk-0.1.22.ebuild,v 1.1 2012/08/10 19:03:00 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/colord-gtk/colord-gtk-0.1.22.ebuild,v 1.2 2012/08/22 21:23:32 tetromino Exp $
 
 EAPI="4"
 
@@ -26,6 +26,7 @@ COMMON_DEPEND=">=dev-libs/glib-2.28:2
 RDEPEND="${COMMON_DEPEND}
 	!<x11-misc/colord-0.1.22"
 DEPEND="${COMMON_DEPEND}
+	app-arch/xz-utils
 	dev-libs/libxslt
 	>=dev-util/intltool-0.35
 	>=sys-devel/gettext-0.17
@@ -36,6 +37,8 @@ DEPEND="${COMMON_DEPEND}
 	)
 	vala? ( dev-lang/vala:0.14[vapigen] )"
 
+RESTRICT="test" # Tests need a display device with a default color profile set
+
 src_prepare() {
 	epatch "${FILESDIR}/${PN}-0.1.22-automagic-vala.patch"
 	eautoreconf
diff --git a/x11-misc/tabbed/Manifest b/x11-misc/tabbed/Manifest
index 7d495e70b52a..2802b311bf81 100644
--- a/x11-misc/tabbed/Manifest
+++ b/x11-misc/tabbed/Manifest
@@ -1,2 +1,3 @@
 DIST tabbed-0.3.tar.gz 9177 SHA256 bb72aa6e4831e0aadee8a6232d8532a548e736236bbaaed970e77fb5d3177ff0 SHA512 b311fb3a3e8fa82bba6bd5d3d31128202a842315bcc2dc154bbf0df857f64fd245b50cd618ea2ad98fb5137682699473d9b1e9af5cab4724bfacb65889238ebf WHIRLPOOL 8a07a8a08f1a5e0c23f588e92a138ab31b21f7d083178349be9f6ea4965abc10ae00f7512f02686b7e4e92c480dcb33d85cbe9d7250f697f7b3862c2c8bdb5a4
+DIST tabbed-0.4.1.tar.gz 9911 SHA256 24e155e5f6335c90bc98d600644a7710937edc21745141e5c0692c36c2c183d8 SHA512 d93cb0dd6aaa6d3a85b621f05fe2681be680354d6e7212b6541b1648e825d14503d64fce8086012faec54b8cc00913f164c56269623dc1752bc612a375b150cb WHIRLPOOL 2cc3fd06f95697cbafc738a8d4d87187222c635d2ec3eeb4796e662d3a31282f46d7b0d26082f751c425c5d808680923aedb7738dbce71f3462c669be4881ab3
 DIST tabbed-0.4.tar.gz 9868 SHA256 f6feeff380725b74482ffdb2aad5be632ecd9b5fa67c4a869debc4b71875f2f6 SHA512 aa39d8d8e175dc79f80b55449ba3a2f912da84c7d3a9ab7d1575f55efe60396ee8f627fab4601f928a1f8b03c700cca141a7355031d6f77872444d9d140efa6f WHIRLPOOL a847a2f9ea17b73c64c075b6780d40fda44d7de1d47ab5bf33e375667f930973ef700fd3c201d962eecb8eb0d5133e7f324f5af532d9973fce2940acd8b420f8
diff --git a/x11-misc/tabbed/tabbed-0.4.1.ebuild b/x11-misc/tabbed/tabbed-0.4.1.ebuild
new file mode 100644
index 000000000000..62e3986c0762
--- /dev/null
+++ b/x11-misc/tabbed/tabbed-0.4.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/tabbed/tabbed-0.4.1.ebuild,v 1.1 2012/08/23 03:09:32 jer Exp $
+
+EAPI="3"
+
+inherit savedconfig toolchain-funcs
+
+DESCRIPTION="Simple generic tabbed fronted to xembed aware applications"
+HOMEPAGE="http://tools.suckless.org/tabbed"
+SRC_URI="http://dl.suckless.org/tools/${P}.tar.gz"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="x11-libs/libX11"
+DEPEND="
+	x11-proto/xproto
+	${RDEPEND}
+"
+
+src_prepare() {
+	sed config.mk \
+		-e '/^CC/d' \
+		-e 's|/usr/local|/usr|g' \
+		-e 's|^CFLAGS.*|CFLAGS += -std=c99 -pedantic -Wall $(INCS) $(CPPFLAGS)|g' \
+		-e 's|^LDFLAGS.*|LDFLAGS += $(LIBS)|g' \
+		-e 's|^LIBS.*|LIBS = -lX11|g' \
+		-e 's|{|(|g;s|}|)|g' \
+		-i || die
+
+	sed Makefile \
+		-e 's|{|(|g;s|}|)|g' \
+		-e '/^[[:space:]]*@echo/d' \
+		-e 's|^	@|	|g' \
+		-i || die
+
+	restore_config config.h
+}
+
+src_compile() {
+	emake CC=$(tc-getCC) || die "emake compile failed"
+}
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	save_config config.h
+}
diff --git a/x11-misc/xdg-utils/Manifest b/x11-misc/xdg-utils/Manifest
index 072cbb7a3c19..14588919e8fe 100644
--- a/x11-misc/xdg-utils/Manifest
+++ b/x11-misc/xdg-utils/Manifest
@@ -1 +1,2 @@
-DIST xdg-utils-1.1.0_rc1_p20120319.tar.xz 268720 RMD160 473569c951c83dc4547c938d29193453c3ab3fbc SHA1 a3b96919ff03cfe569abd0adce0feb9a03118836 SHA256 e9d9db6662ba2674fbd7f2534c6e4cb9512aed07d9b98072ea4e883715bb8c07
+DIST xdg-utils-1.1.0_rc1_p20120319.tar.xz 268720 SHA256 e9d9db6662ba2674fbd7f2534c6e4cb9512aed07d9b98072ea4e883715bb8c07
+DIST xdg-utils-1.1.0_rc1_p20120823.tar.xz 269832 SHA256 df1e20a8c88557225a763336a0747c4624285c4f30f122e6fd1e909a9def6495 SHA512 9d7705460a26ea2056fe42c6fd67a8c8856c6b8630955c46c5f9507908c5660a00692e014c74643157cbb4731e9622f3a9aa98841fd904803c7ea67e5544c309 WHIRLPOOL 25d25f1a5aaa10278e32a2832613e2847ecdb07691e3bc90736d1da50cac75cb0eaeea73bee8ecf972a27dd5dc38fa44c5df640eda1796f56f1a274d0bded21c
diff --git a/x11-misc/xdg-utils/xdg-utils-1.1.0_rc1_p20120823.ebuild b/x11-misc/xdg-utils/xdg-utils-1.1.0_rc1_p20120823.ebuild
new file mode 100644
index 000000000000..16d47b418aec
--- /dev/null
+++ b/x11-misc/xdg-utils/xdg-utils-1.1.0_rc1_p20120823.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xdg-utils/xdg-utils-1.1.0_rc1_p20120823.ebuild,v 1.1 2012/08/23 02:33:35 ssuominen Exp $
+
+# See .spec in http://pkgs.fedoraproject.org/gitweb/?p=xdg-utils.git;a=summary
+# The source tree MUST be cleaned before rolling a snapshot tarball:
+# make scripts-clean -C scripts
+# make man scripts -C scripts
+
+EAPI=4
+
+DESCRIPTION="Portland utils for cross-platform/cross-toolkit/cross-desktop interoperability"
+HOMEPAGE="http://portland.freedesktop.org/"
+SRC_URI="http://dev.gentoo.org/~ssuominen/${P/0823/2308}.tar.xz -> ${P}.tar.xz" # typo :(
+#SRC_URI="http://portland.freedesktop.org/download/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc +perl"
+
+RDEPEND="dev-util/desktop-file-utils
+	x11-misc/shared-mime-info
+	x11-apps/xprop
+	x11-apps/xset
+	perl? ( dev-perl/File-MimeInfo )"
+DEPEND=""
+#app-text/xmlto || ( www-client/links www-client/lynx virtual/w3m )
+
+DOCS="ChangeLog README RELEASE_NOTES TODO"
+
+RESTRICT="test" # Disabled because of sandbox violation(s)
+
+S=${WORKDIR}/${P/0823/2308}
+
+#src_prepare() {
+#	emake scripts-clean -C scripts
+#}
+#
+#src_compile() {
+#	emake man scripts -C scripts
+#}
+
+src_install() {
+	default
+
+	newdoc scripts/README README.scripts
+	use doc && dohtml -r scripts/html
+
+	# Install default XDG_DATA_DIRS, bug #264647
+	echo 'XDG_DATA_DIRS="/usr/local/share"' > 30xdg-data-local
+	echo 'COLON_SEPARATED="XDG_DATA_DIRS XDG_CONFIG_DIRS"' >> 30xdg-data-local
+	doenvd 30xdg-data-local
+
+	echo 'XDG_DATA_DIRS="/usr/share"' > 90xdg-data-base
+	echo 'XDG_CONFIG_DIRS="/etc/xdg"' >> 90xdg-data-base
+	doenvd 90xdg-data-base
+}
+
+pkg_postinst() {
+	[[ -x $(type -P gtk-update-icon-cache) ]] || elog "Install x11-libs/gtk+:2 for the gtk-update-icon-cache command."
+}
diff --git a/x11-terms/eterm/Manifest b/x11-terms/eterm/Manifest
index 70c5f440b330..451b601860e6 100644
--- a/x11-terms/eterm/Manifest
+++ b/x11-terms/eterm/Manifest
@@ -1,4 +1,4 @@
-DIST Eterm-0.9.5.tar.gz 796872 RMD160 19e006f0fe2bdd6a95818f11b96bb978b9cb6762 SHA1 f2d75354a48734f63f018f7173cebee81f2358c7 SHA256 63ad6e3d89571a72d8302274ebb00d569b8789e24fae038beaee7aa4b8362bd2
-DIST Eterm-0.9.6.tar.gz 831756 RMD160 96e2ebf7ee7464ffab8bbecec2976a1e5935712e SHA1 b4cb00f898ffd2de9bf7ae0ecde1cc3a5fee9f02 SHA256 72b907aa64f8bcf053f2ecbc8a2e243c6de353a94ecaf579ff2c4e3ae5d7e13c
-DIST Eterm-bg-0.9.5.tar.gz 1883627 RMD160 acbab70cf5a22f1c45a16f5a8a92ed1e057a59a0 SHA1 26e81a1e91228c971c70ba06e006ef69490ef208 SHA256 8be436c38337557b77bb73d31a65c4dfe21966e84b7d3306e1e28c5c1e809c55
-DIST Eterm-bg-0.9.6.tar.gz 1883627 RMD160 acbab70cf5a22f1c45a16f5a8a92ed1e057a59a0 SHA1 26e81a1e91228c971c70ba06e006ef69490ef208 SHA256 8be436c38337557b77bb73d31a65c4dfe21966e84b7d3306e1e28c5c1e809c55
+DIST Eterm-0.9.5.tar.gz 796872 SHA256 63ad6e3d89571a72d8302274ebb00d569b8789e24fae038beaee7aa4b8362bd2
+DIST Eterm-0.9.6.tar.gz 831756 SHA256 72b907aa64f8bcf053f2ecbc8a2e243c6de353a94ecaf579ff2c4e3ae5d7e13c SHA512 07ef5587b7c8444d49ffd6f20f09c98bd248ccee9b3de311f5705961579f707c4a8e2b69a2193500b75cc1e4bdeabb711a1dd23637d6b94433508d8a93d377fe WHIRLPOOL 51a958675fba197ec0dd069028e6a6066ab1133c030ddaad1bccf8c2e541b5063b0612ae7db80e40f30331ab5930da2b7d628b21c7da4d64eb9697163f05d90b
+DIST Eterm-bg-0.9.5.tar.gz 1883627 SHA256 8be436c38337557b77bb73d31a65c4dfe21966e84b7d3306e1e28c5c1e809c55
+DIST Eterm-bg-0.9.6.tar.gz 1883627 SHA256 8be436c38337557b77bb73d31a65c4dfe21966e84b7d3306e1e28c5c1e809c55 SHA512 2d58d1342c7750f8dde93451b732cff3a0580d76635054632728cf2d8e5c5298732c855672981810cf21a8d1f5d46626abe1f35fbf33e2b713cc5d6bc82d10f8 WHIRLPOOL f03b6432d406b7882ab28f80fd0f4b63bee15d8c720a54eb42f400f7cae51c2d96641656b5e779d5ccdc19c098b1c54e03d1dc0cb27a344dad5a5c5181b571a1
diff --git a/x11-terms/eterm/eterm-0.9.6.ebuild b/x11-terms/eterm/eterm-0.9.6.ebuild
index 2083b1c23b45..6a75a3d45dde 100644
--- a/x11-terms/eterm/eterm-0.9.6.ebuild
+++ b/x11-terms/eterm/eterm-0.9.6.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/eterm/eterm-0.9.6.ebuild,v 1.1 2012/02/23 20:28:34 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/eterm/eterm-0.9.6.ebuild,v 1.2 2012/08/23 04:06:33 ottxor Exp $
 
-EAPI="2"
+EAPI="3"
 inherit eutils autotools
 
 MY_P=Eterm-${PV}
@@ -15,7 +15,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	SRC_URI="http://www.eterm.org/download/${MY_P}.tar.gz
 		!minimal? ( http://www.eterm.org/download/Eterm-bg-${PV}.tar.gz )"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~ppc-macos ~x86-macos"
 fi
 
 DESCRIPTION="A vt102 terminal emulator for X"
@@ -23,7 +23,7 @@ HOMEPAGE="http://www.eterm.org/"
 
 LICENSE="BSD"
 SLOT="0"
-IUSE="escreen minimal mmx sse2 unicode"
+IUSE="escreen minimal mmx sse2 unicode +utempter"
 
 RDEPEND="x11-libs/libX11
 	x11-libs/libXmu
@@ -66,6 +66,7 @@ src_configure() {
 		$(use_enable mmx) \
 		$(use_enable sse2) \
 		$(use_enable unicode multi-charset) \
+		$(use_enable utempter utmp) \
 		--with-delete=execute \
 		--with-backspace=auto
 }
diff --git a/x11-terms/eterm/eterm-9999.ebuild b/x11-terms/eterm/eterm-9999.ebuild
index 73afc5d8f24d..14f4882f8417 100644
--- a/x11-terms/eterm/eterm-9999.ebuild
+++ b/x11-terms/eterm/eterm-9999.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/eterm/eterm-9999.ebuild,v 1.19 2012/02/23 20:28:34 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/eterm/eterm-9999.ebuild,v 1.20 2012/08/23 04:06:33 ottxor Exp $
 
-EAPI="2"
+EAPI="3"
 inherit eutils autotools
 
 MY_P=Eterm-${PV}
@@ -15,7 +15,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	SRC_URI="http://www.eterm.org/download/${MY_P}.tar.gz
 		!minimal? ( http://www.eterm.org/download/Eterm-bg-${PV}.tar.gz )"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~ppc-macos ~x86-macos"
 fi
 
 DESCRIPTION="A vt102 terminal emulator for X"
@@ -23,7 +23,7 @@ HOMEPAGE="http://www.eterm.org/"
 
 LICENSE="BSD"
 SLOT="0"
-IUSE="escreen minimal mmx sse2 unicode"
+IUSE="escreen minimal mmx sse2 unicode +utempter"
 
 RDEPEND="x11-libs/libX11
 	x11-libs/libXmu
@@ -66,6 +66,7 @@ src_configure() {
 		$(use_enable mmx) \
 		$(use_enable sse2) \
 		$(use_enable unicode multi-charset) \
+		$(use_enable utempter utmp) \
 		--with-delete=execute \
 		--with-backspace=auto
 }
diff --git a/x11-terms/eterm/metadata.xml b/x11-terms/eterm/metadata.xml
index a9272a70eef7..c27b995175c3 100644
--- a/x11-terms/eterm/metadata.xml
+++ b/x11-terms/eterm/metadata.xml
@@ -15,5 +15,6 @@ maintaining speed and efficiency.
 <use>
 	<flag name='escreen'>Enable built-in <pkg>app-misc/screen</pkg>
 		support</flag>
+	<flag name='utempter'>Include libutempter support</flag>
 </use>
 </pkgmetadata>
diff --git a/x11-themes/qtcurve-qt4/Manifest b/x11-themes/qtcurve-qt4/Manifest
index 5dd60aa660fb..c0072d90b1bc 100644
--- a/x11-themes/qtcurve-qt4/Manifest
+++ b/x11-themes/qtcurve-qt4/Manifest
@@ -1,3 +1,4 @@
 DIST QtCurve-KDE4-1.6.4.tar.bz2 308223 SHA256 14a534d54fdae63582d94535f46c2d11019ad27b1462c97867ce73fcabbe138f
 DIST QtCurve-KDE4-1.8.12.tar.bz2 383523 SHA256 6956805f3f8603a79445728bf73bd1e642b7a8de723196d364f1ceeea3575d64 SHA512 eab297070fc6af3b1b594d541985b2a3fef27e7d2610f9e308e0e1e5cc666bc628c32b7f47126d6c1b3a1e44b4c26e11e9ea90ebb45d1659c449baaac42a7df2 WHIRLPOOL 7f923fb435c9c2d37349c71487814ce251b196abb309aae575b9eb5c1cbe4d83a97eecf6df16ab622593c84405b5e81a005923c515f834d966083e9f0acb0b70
 DIST QtCurve-KDE4-1.8.13.tar.bz2 383239 SHA256 2c3b65c09bedb02258a4dd1562d9168d6fcffca22c5339de7dc25a3c0dd70855 SHA512 ae02ca126ed3c81b077e671b80869c2731aab69e4f64832ae213ca313bca3e07300ded2aac0cef02ccb8cf32d020db4151ab102cda8d8e6bd90d1f0509f4dc4e WHIRLPOOL a62753dde585ef73d5a72f6134f925ba57c885feb88bbbf846b34c6a6017a440f889926b12d78bd25d0a5676ad0bad3d0aafddf03cd2e25bbbb0f3cc0ab3803e
+DIST QtCurve-KDE4-1.8.14.tar.bz2 383313 SHA256 ff2f4731a0fd3c0a246a4c9099ac8a117bba463fd7cc00490acb6525ea463404 SHA512 5f5c6449d56c03a901bbec9ce44433b1919139183be75df5fec9d35a73f2c31d8b845185f542a2f9c75e4eaea251d8f07e0ddf05fef4fd1cbf32cbaf827621d9 WHIRLPOOL 68ff3eaee0b5e4ef42e7588428e9c036307ec1cf80cb443a37442baae2f8c4e6f107558c0c1617eb72e738a4f0803a4ac1e93e9e888b76411e30559118c8ae5b
diff --git a/x11-themes/qtcurve-qt4/qtcurve-qt4-1.8.14.ebuild b/x11-themes/qtcurve-qt4/qtcurve-qt4-1.8.14.ebuild
new file mode 100644
index 000000000000..2e874dea99e2
--- /dev/null
+++ b/x11-themes/qtcurve-qt4/qtcurve-qt4-1.8.14.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/qtcurve-qt4/qtcurve-qt4-1.8.14.ebuild,v 1.1 2012/08/23 05:08:41 yngwin Exp $
+
+EAPI=4
+KDE_REQUIRED="optional"
+inherit cmake-utils kde4-base
+
+MY_P="${P/qtcurve-qt4/QtCurve-KDE4}"
+
+DESCRIPTION="A set of widget styles for Qt4 based apps, also available for GTK2"
+HOMEPAGE="http://www.kde-look.org/content/show.php?content=40492"
+SRC_URI="http://craigd.wikispaces.com/file/view/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="kde windeco"
+REQUIRED_USE="windeco? ( kde )"
+
+DEPEND="x11-libs/qt-gui:4[dbus]
+	x11-libs/qt-svg:4
+	kde? (
+		$(add_kdebase_dep systemsettings)
+		windeco? ( $(add_kdebase_dep kwin) )
+	)"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+DOCS=( ChangeLog README TODO )
+PATCHES=( "${FILESDIR}/${PN}_kwin_automagic_fix.patch" )
+
+pkg_setup() {
+	use kde && kde4-base_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs
+	if use kde; then
+		mycmakeargs=(
+			$(cmake-utils_use windeco QTC_KWIN)
+		)
+		kde4-base_src_configure
+	else
+		mycmakeargs=(
+			"-DQTC_QT_ONLY=true"
+		)
+		cmake-utils_src_configure
+	fi
+}