Sync with portage [Fri Jun 21 15:54:21 MSK 2013].

11 years ago · 178ce1dd4e
parent 6f08dff206
commit 178ce1dd4e
245 changed files with 3248 additions and 2445 deletions
--- a/app-emulation/qemu/metadata.xml
+++ b/app-emulation/qemu/metadata.xml
@ -7,6 +7,7 @@
 	<name>Doug Goldstein</name>
  </maintainer>
  <use>
+    <flag name='accessibility'>Adds support for braille displays using brltty</flag>
    <flag name='aio'>Enables support for Linux's Async IO</flag>
    <flag name='alsa'>Enable alsa output for sound emulation</flag>
    <flag name='brltty'>Adds support for braille displays using brltty</flag>
--- a/app-emulation/qemu/qemu-1.4.2.ebuild
+++ b/app-emulation/qemu/qemu-1.4.2.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-1.4.2.ebuild,v 1.2 2013/05/30 15:06:39 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-1.4.2.ebuild,v 1.3 2013/06/20 23:17:13 vapier Exp $

 EAPI=5

@ -29,7 +29,7 @@ HOMEPAGE="http://www.qemu.org http://www.linux-kvm.org"

 LICENSE="GPL-2 LGPL-2 BSD-2"
 SLOT="0"
-IUSE="+aio alsa bluetooth brltty +caps +curl debug fdt iscsi +jpeg \
+IUSE="accessibility +aio alsa bluetooth +caps +curl debug fdt iscsi +jpeg \
 kernel_linux kernel_FreeBSD mixemu ncurses opengl +png pulseaudio python \
 rbd sasl +seccomp sdl selinux smartcard spice static static-softmmu \
 static-user systemtap tci test +threads tls usbredir +uuid vde +vhost-net \
@ -99,7 +99,7 @@ RDEPEND="!static-softmmu? ( ${LIB_DEPEND//\[static-libs(+)]} )
 	)
 	alsa? ( >=media-libs/alsa-lib-1.0.13 )
 	bluetooth? ( net-wireless/bluez )
-	brltty? ( app-accessibility/brltty )
+	accessibility? ( app-accessibility/brltty )
 	iscsi? ( net-libs/libiscsi )
 	opengl? ( virtual/opengl )
 	pulseaudio? ( media-sound/pulseaudio )
@ -277,7 +277,7 @@ qemu_src_configure() {
 		conf_opts+=" $(use_enable bluetooth bluez)"
 		conf_opts+=" $(use_enable sdl)"
 		conf_opts+=" $(use_enable aio linux-aio)"
-		conf_opts+=" $(use_enable brltty brlapi)"
+		conf_opts+=" $(use_enable accessibility brlapi)"
 		conf_opts+=" $(use_enable caps cap-ng)"
 		conf_opts+=" $(use_enable curl)"
 		conf_opts+=" $(use_enable fdt)"
--- a/app-emulation/qemu/qemu-9999.ebuild
+++ b/app-emulation/qemu/qemu-9999.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.52 2013/05/31 15:35:40 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.53 2013/06/20 23:17:13 vapier Exp $

 EAPI=5

@ -30,7 +30,7 @@ HOMEPAGE="http://www.qemu.org http://www.linux-kvm.org"

 LICENSE="GPL-2 LGPL-2 BSD-2"
 SLOT="0"
-IUSE="+aio alsa bluetooth brltty +caps +curl debug fdt iscsi +jpeg \
+IUSE="accessibility +aio alsa bluetooth +caps +curl debug fdt iscsi +jpeg \
 kernel_linux kernel_FreeBSD mixemu ncurses opengl +png pulseaudio python \
 rbd sasl +seccomp sdl selinux smartcard spice static static-softmmu \
 static-user systemtap tci test +threads tls usbredir +uuid vde +vhost-net \
@ -100,7 +100,7 @@ RDEPEND="!static-softmmu? ( ${LIB_DEPEND//\[static-libs(+)]} )
 	)
 	alsa? ( >=media-libs/alsa-lib-1.0.13 )
 	bluetooth? ( net-wireless/bluez )
-	brltty? ( app-accessibility/brltty )
+	accessibility? ( app-accessibility/brltty )
 	iscsi? ( net-libs/libiscsi )
 	opengl? ( virtual/opengl )
 	pulseaudio? ( media-sound/pulseaudio )
@ -278,7 +278,7 @@ qemu_src_configure() {
 		conf_opts+=" $(use_enable bluetooth bluez)"
 		conf_opts+=" $(use_enable sdl)"
 		conf_opts+=" $(use_enable aio linux-aio)"
-		conf_opts+=" $(use_enable brltty brlapi)"
+		conf_opts+=" $(use_enable accessibility brlapi)"
 		conf_opts+=" $(use_enable caps cap-ng)"
 		conf_opts+=" $(use_enable curl)"
 		conf_opts+=" $(use_enable fdt)"
--- a/app-misc/bijiben/Manifest
+++ b/app-misc/bijiben/Manifest
@ -1,2 +1,2 @@
-DIST bijiben-3.8.1.tar.xz 401940 SHA256 a0965874c68ca8492dcffc25cbf6f51549ff4a005c1fa1d87a1d82021aae7908 SHA512 e5846487174d9574eb09699b7734555dbd3f3662b912cac68f98250548dbcbfa544f761cd9c54410fddefb7101bb4968f3c2bf02733ea25fc720a3abbc5be5dd WHIRLPOOL c327007de8f22ac3aea37d3e773384e825d264d9775669c516a7584b66f43888293e55b195c8194c58cce1d128da94a455c7ee9e8a9b50b46275f9d5a1023e62
 DIST bijiben-3.8.2.tar.xz 402704 SHA256 c8c02c3701594d0b7f212c25613c097e2343d104157518c7c8cfb6a1bc111cf8 SHA512 d7dc36e72ed99bef10a9898a4150acc1408a8772a673bce7dce4b7f8f9cc35261cb220bd2cf8ed9b646a3d1750c52662120890fe0476ffe5a4a9f63aa0aa0708 WHIRLPOOL df64a32cad93ddcba72c92daa634c474e7ced3bfb76262c76b552edef37b1bd1fe35c0b31a75a74f32b422f5fb7c004070183c6ad487103f7df6ff7adaf6b014
+DIST bijiben-3.8.3.tar.xz 434004 SHA256 287742267c7484a92ead8c896091ceb0b2603ba8b5dccf304ea534456735beec SHA512 8d49a112901ceb856a88c981c9dc0df2a95955c317042a868540ab4f4393a8e36df0f3b04c0c490d4975cc3c7edf16abe982213e4ccc643a1c6d8928847b836b WHIRLPOOL a47dcb4b5d0984f114d56d2fbec1ff9695f07c3f53225e2777d0dcd083172f37c11466987efa9ca1c3e9b7ad417cc9b0ad50cd5f92e96fb94e80386506e94748
--- a/app-misc/bijiben/bijiben-3.8.3.ebuild
+++ b/app-misc/bijiben/bijiben-3.8.3.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/bijiben/bijiben-3.8.1.ebuild,v 1.2 2013/05/10 07:33:27 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/bijiben/bijiben-3.8.3.ebuild,v 1.1 2013/06/21 08:22:06 pacho Exp $

 EAPI="5"
 GCONF_DEBUG="no"
@ -19,7 +19,7 @@ RDEPEND="
 	>=app-misc/tracker-0.16
 	>=dev-libs/glib-2.28:2
 	dev-libs/libxml2
-	gnome-extra/zeitgeist
+	dev-libs/libzeitgeist
 	media-libs/clutter-gtk:1.0
 	net-libs/webkit-gtk:3
 	>=x11-libs/gtk+-3.7.7:3
--- a/app-misc/ca-certificates/ca-certificates-20130119.ebuild
+++ b/app-misc/ca-certificates/ca-certificates-20130119.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/ca-certificates/ca-certificates-20130119.ebuild,v 1.3 2013/06/15 15:13:02 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/ca-certificates/ca-certificates-20130119.ebuild,v 1.4 2013/06/20 20:08:11 nimiux Exp $

 EAPI="3"

@ -13,7 +13,7 @@ SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${PV}${NMU_PR:++nmu}${NMU_PR}_a

 LICENSE="MPL-1.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""

 # platforms like AIX don't have a good ar
--- a/app-office/lyx/lyx-2.0.6.ebuild
+++ b/app-office/lyx/lyx-2.0.6.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/lyx-2.0.6.ebuild,v 1.2 2013/06/19 17:51:03 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/lyx-2.0.6.ebuild,v 1.3 2013/06/21 10:19:59 pacho Exp $

 EAPI=3

@ -122,7 +122,9 @@ src_install() {
 		doins "${T}"/hebrew.bind || die
 	fi

-	newicon -s 32 "$S/development/Win32/packaging/icons/lyx_32x32.png" ${PN}.png
+	newicon -s 32 "${S}/development/Win32/packaging/icons/lyx_32x32.png" ${PN}.png
+	doicon -s 48 "${S}/lib/images/lyx.png"
+	doicon -s scalable "${S}/lib/images/lyx.svg"
 	make_desktop_entry ${PN} "LyX" "${PN}" "Office" "MimeType=application/x-lyx;"

 	# fix for bug 91108
--- a/app-portage/portpeek/portpeek-2.1.8.ebuild
+++ b/app-portage/portpeek/portpeek-2.1.8.ebuild
@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/portpeek/portpeek-2.1.8.ebuild,v 1.2 2013/06/13 00:22:10 mpagano Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/portpeek/portpeek-2.1.8.ebuild,v 1.3 2013/06/20 18:04:50 mpagano Exp $

 EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_2,3_3} )
+PYTHON_COMPAT=( python{2_7,3_2} )

 inherit python-single-r1

--- a/app-text/mupdf/files/mupdf-9999-buildsystem.patch
+++ b/app-text/mupdf/files/mupdf-9999-buildsystem.patch
--- a/app-text/mupdf/files/mupdf-9999-forward_back.patch
+++ b/app-text/mupdf/files/mupdf-9999-forward_back.patch
@ -0,0 +1,25 @@
+Add F86XK_Forward and XF86XK_Back for page switch by muhpdf@binkmail.com 
+on http://bugs.ghostscript.com/show_bug.cgi?id=693494
+
+--- mupdf-9999/platform/x11/x11_main.c
+++ mupdf-9999/platform/x11/x11_main.c
+@@ -5,6 +5,7 @@
+ #include <X11/Xatom.h>
+ #include <X11/cursorfont.h>
+ #include <X11/keysym.h>
+#include <X11/XF86keysym.h>
+ 
+ #include <sys/select.h>
+ #include <sys/time.h>
+@@ -836,9 +837,11 @@
+ 						break;
+ 
+ 					case XK_Page_Up:
+					case XF86XK_Back:
+ 						len = 1; buf[0] = ',';
+ 						break;
+ 					case XK_Page_Down:
+					case XF86XK_Forward:
+ 						len = 1; buf[0] = '.';
+ 						break;
+ 					}
--- a/app-text/mupdf/files/mupdf-9999-install-headers.patch
+++ b/app-text/mupdf/files/mupdf-9999-install-headers.patch
@ -1,19 +0,0 @@
-based on http://bugs.ghostscript.com/show_bug.cgi?id=694365&list_id=6717
-
--- mupdf-9999/Makefile
-+++ mupdf-9999/Makefile
-@@ -248,9 +248,12 @@
- mandir ?= $(prefix)/share/man
- 
- install: $(MUPDF_LIB) $(MUVIEW) $(MUDRAW) $(MUTOOL)
-	install -d $(DESTDIR)$(bindir) $(DESTDIR)$(libdir) $(DESTDIR)$(incdir) $(DESTDIR)$(mandir)/man1
-+	install -d $(DESTDIR)$(bindir) $(DESTDIR)$(libdir) $(DESTDIR)$(mandir)/man1
-+	install -d $(DESTDIR)$(incdir)/mupdf/{fitz,pdf}
- 	install $(MUPDF_LIB) $(DESTDIR)$(libdir)
-	install fitz/memento.h fitz/fitz.h pdf/mupdf.h xps/muxps.h cbz/mucbz.h image/muimage.h $(DESTDIR)$(incdir)
-+	install include/mupdf/*.h $(DESTDIR)$(incdir)/mupdf
-+	install include/mupdf/fitz/*.h $(DESTDIR)$(incdir)/mupdf/fitz
-+	install include/mupdf/pdf/*.h $(DESTDIR)$(incdir)/mupdf/pdf
- 	install $(MUVIEW) $(MUDRAW) $(MUTOOL) $(DESTDIR)$(bindir)
- 	install $(wildcard apps/man/*.1) $(DESTDIR)$(mandir)/man1
- 
--- a/app-text/mupdf/files/mupdf-9999-pkg-config.patch
+++ b/app-text/mupdf/files/mupdf-9999-pkg-config.patch
@ -4,9 +4,9 @@ http://bugs.ghostscript.com/show_bug.cgi?id=694301
 openjpeg-2
 http://bugs.ghostscript.com/show_bug.cgi?id=693518

--- mupdf-9999/debian/mupdf.pc
-+++ mupdf-9999/debian/mupdf.pc
-@@ -4,9 +4,8 @@
+--- mupdf-9999/platform/debian/mupdf.pc
+++ mupdf-9999/platform/debian/mupdf.pc
+@@ -4,9 +4,9 @@
 includedir=${prefix}/include
 
 Name: mupdf
@ -16,4 +16,5 @@ http://bugs.ghostscript.com/show_bug.cgi?id=693518
 Version: 0.5.0
 Libs: -L${libdir} -lmupdf
 -Libs.private: -lopenjpeg -ljbig2dec -ljpeg -lz -lm
+Libs.private: -lmupdf-js-none
 Cflags: -I${includedir}
--- a/app-text/mupdf/files/mupdf-9999-zoom-2.patch
+++ b/app-text/mupdf/files/mupdf-9999-zoom-2.patch
@ -0,0 +1,10 @@
+--- mupdf-9999/platform/x11/pdfapp.c
+++ mupdf-9999/platform/x11/pdfapp.c
+@@ -866,6 +867,7 @@
+ 		break;
+ 
+ 	case ' ':
+	case 'F':
+ 		panto = DONT_PAN;
+ 		if (app->numberlen > 0)
+ 			app->pageno += atoi(app->number);
--- a/app-text/mupdf/mupdf-9999.ebuild
+++ b/app-text/mupdf/mupdf-9999.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/mupdf-9999.ebuild,v 1.36 2013/06/20 09:11:08 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/mupdf-9999.ebuild,v 1.37 2013/06/20 22:46:53 xmw Exp $

 EAPI=5

@ -36,22 +36,25 @@ DEPEND="${RDEPEND}
 src_prepare() {
 	rm -rf thirdparty || die

+	[ -f source/fitz/draw-scale-simple.c ] && \
+		rm -f source/fitz/draw-scale.c
+
 	epatch \
-		"${FILESDIR}"/${P}-buildsystem.patch \
+		"${FILESDIR}"/${P}-CFLAGS.patch \
 		"${FILESDIR}"/${P}-openjpeg2.patch \
-		"${FILESDIR}"/${P}-pkg-config.patch \
-		"${FILESDIR}"/${P}-install-headers.patch
+		"${FILESDIR}"/${P}-pkg-config.patch

 	sed -e "/^libdir=/s:/lib:/$(get_libdir):" \
 		-e "/^prefix=/s:=.*:=${EROOR}/usr:" \
-		-i debian/mupdf.pc || die
+		-i platform/debian/mupdf.pc || die

 	use vanilla || epatch \
-		"${FILESDIR}"/${PN}-1.1_rc1-zoom-2.patch
+		"${FILESDIR}"/${P}-zoom-2.patch \
+		"${FILESDIR}"/${P}-forward_back.patch

 	#http://bugs.ghostscript.com/show_bug.cgi?id=693467
 	sed -e '/^Actions=/s:=.*:=View;:' \
-		-i debian/${PN}.desktop || die
+		-i platform/debian/${PN}.desktop || die

 	sed -e "\$aOS = Linux" \
 		-e "\$aCC = $(tc-getCC)" \
@ -78,43 +81,44 @@ src_prepare() {
 	fi

 	my_soname=libmupdf.so.1.2
-	sed -e "\$a\$(MUPDF_LIB):" \
-		-e "\$a\\\t\$(QUIET_LINK) \$(CC) \$(LDFLAGS) --shared -Wl,-soname -Wl,${my_soname} -Wl,--no-undefined -o \$@ \$^ \$(LIBS)" \
-		-e "/^MUPDF_LIB :=/s:=.*:= build/debug/${my_soname}:" \
+	my_soname_js_none=libmupdf-js-none.so.1.2
+	sed -e "\$a\$(MUPDF_LIB): \$(MUPDF_JS_NONE_LIB)" \
+		-e "\$a\\\t\$(QUIET_LINK) \$(CC) \$(LDFLAGS) --shared -Wl,-soname -Wl,${my_soname} -Wl,--no-undefined -o \$@ \$^ \$(MUPDF_JS_NONE_LIB) \$(LIBS)" \
+		-e "/^MUPDF_LIB :=/s:=.*:= \$(OUT)/${my_soname}:" \
+		-e "\$a\$(MUPDF_JS_NONE_LIB):" \
+		-e "\$a\\\t\$(QUIET_LINK) \$(CC) \$(LDFLAGS) --shared -Wl,-soname -Wl,${my_soname_js_none} -Wl,--no-undefined -o \$@ \$^ \$(LIBS)" \
+		-e "/^MUPDF_JS_NONE_LIB :=/s:=.*:= \$(OUT)/${my_soname_js_none}:" \
 		-i Makefile || die
 }

 src_compile() {
 	emake XCFLAGS="-fpic"
 	use static-libs && \
-		emake -C "${S}"-static build/debug/libmupdf.a
+		emake -C "${S}"-static build/debug/libmupdf{,-js-none}.a
 	use static && \
 		emake -C "${S}"-static XLIBS="-static"
 }

 src_install() {
 	if use X ; then
-		domenu debian/mupdf.desktop
-		doicon debian/mupdf.xpm
+		domenu platform/debian/mupdf.desktop
+		doicon platform/debian/mupdf.xpm
 	else
-		rm apps/man/mupdf.1
+		rm docs/man/mupdf.1
 	fi

 	emake install
 	dosym ${my_soname} /usr/$(get_libdir)/libmupdf.so

 	use static-libs && \
-		dolib.a "${S}"-static/build/debug/libmupdf.a
+		dolib.a "${S}"-static/build/debug/libmupdf{,-js-none}.a
 	if use static ; then
 		dobin "${S}"-static/build/debug/mu{tool,draw}
 		use X && dobin "${S}"-static/build/debug/mupdf
 	fi

-	#insinto /usr/include
-	#doins pdf/mupdf-internal.h fitz/fitz-internal.h xps/muxps-internal.h
-
 	insinto /usr/$(get_libdir)/pkgconfig
-	doins debian/mupdf.pc
+	doins platform/debian/mupdf.pc

-	dodoc README doc/{example.c,overview.txt}
+	dodoc README docs/*.{txt,c}
 }
--- a/app-text/pdf2djvu/Manifest
+++ b/app-text/pdf2djvu/Manifest
@ -1 +1,2 @@
 DIST pdf2djvu_0.7.16.tar.gz 320802 SHA256 dbda2086d0f164d0da6e785f8ffd6f252bf805ce7930127d42aab9dbf1bde4f9 SHA512 ccd4b11137b730226f42382669517a2cd8eed235fb50ef67e0958194e5a290282a450f5118c6117f1f77a099c79c4755bf8e5ebf1dbf9743ac74cf78d830c538 WHIRLPOOL 8d7b28f7df5135cd97cf458adf0979daa177fc2d0e3e41eb20698dceb92ddb41c4fc0282d0d0423dae68402d7cfa354df4c7dd8e77cbf93567d4889158dc80e5
+DIST pdf2djvu_0.7.17.tar.gz 320923 SHA256 fe6d6e2d6df53195f082890d3cb5e50080784510691e708a5e4614b49662f4da SHA512 ba4071fb6cb9ae8d5d5a226a4ab23a3298fae137d03cc675057e5451e79a2ddf517441611481098df07468f0258894ef6a14705793bfeaa56aec2aea9b32827a WHIRLPOOL f54e78f58755493aa3a953043ef7538da68a5d0e8838a31a81a020dd3e5b0ef81eb8abcaa56ba1e7135996dd95cdad529e2d3c72c6a1c26ae8356eb62d028b2e
--- a/app-text/pdf2djvu/pdf2djvu-0.7.17.ebuild
+++ b/app-text/pdf2djvu/pdf2djvu-0.7.17.ebuild
@ -0,0 +1,54 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/pdf2djvu/pdf2djvu-0.7.17.ebuild,v 1.1 2013/06/21 09:58:31 xmw Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit python-single-r1 toolchain-funcs
+
+DESCRIPTION="A tool to create DjVu files from PDF files"
+HOMEPAGE="http://code.google.com/p/pdf2djvu/"
+SRC_URI="http://pdf2djvu.googlecode.com/files/${PN}_${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+graphicsmagick nls openmp test"
+
+RDEPEND="
+	>=app-text/djvu-3.5.21:=
+	>=app-text/poppler-0.16.7:=
+	dev-libs/libxml2:=
+	dev-libs/libxslt:=
+	graphicsmagick? ( media-gfx/graphicsmagick:= )
+"
+DEPEND="${RDEPEND}
+	dev-cpp/pstreams
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+"
+
+REQUIRED_USE="test? ( graphicsmagick )"
+
+src_prepare() {
+	sed -e "s:nosetests :nosetests-${EPYTHON} :" \
+		-i tests/Makefile || die
+}
+
+src_configure() {
+	local openmp=--disable-openmp
+	use openmp && tc-has-openmp && openmp=--enable-openmp
+
+	econf \
+		${openmp} \
+		$(use_enable nls) \
+		$(use_with graphicsmagick)
+}
+
+src_install() {
+	default
+	dodoc doc/{changelog,{cjk,credits,djvudigital}.txt}
+}
--- a/app-text/zathura-cb/zathura-cb-0.1.1.ebuild
+++ b/app-text/zathura-cb/zathura-cb-0.1.1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/zathura-cb/zathura-cb-0.1.1.ebuild,v 1.2 2013/06/13 21:52:51 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/zathura-cb/zathura-cb-0.1.1.ebuild,v 1.3 2013/06/20 23:13:48 xmw Exp $

 EAPI=5

@ -13,12 +13,12 @@ SRC_URI="http://pwmt.org/projects/zathura/plugins/download/${P}.tar.gz"
 LICENSE="ZLIB"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
-IUSE="cairo"
+IUSE=""

 COMMON_DEPEND=">=app-text/zathura-0.2.0
 	dev-libs/glib:2
 	app-arch/libarchive:=
-	cairo? ( x11-libs/cairo )"
+	x11-libs/cairo:="
 RDEPEND="${COMMON_DEPEND}
 	app-arch/p7zip
 	app-arch/tar
@ -28,8 +28,9 @@ DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig"

 pkg_setup() {
+	#does not render w/o cairo
 	myzathuraconf=(
-		WITH_CAIRO=$(usex cairo 1 0)
+		WITH_CAIRO=1
 		CC="$(tc-getCC)"
 		LD="$(tc-getLD)"
 		VERBOSE=1
--- a/dev-haskell/base-compat/Manifest
+++ b/dev-haskell/base-compat/Manifest
@ -0,0 +1 @@
+DIST base-compat-0.2.1.tar.gz 9158 SHA256 834465a92fdcbbb48623700208615f9f2d1b77b8ab9488f8ac2d21ceede85afb SHA512 959ce234c61211dc62850f656bb8342aa1fe0c849607a32d43f23d121eb1cb4c3f25a8b669042d9e76aa2f634708219e1a15a4a9afa89e3a3e1a4276b73c0214 WHIRLPOOL 266177e355907a54f8c2d7f2add7ac0741f7c81adaacc8a42e8413026b681e18e0715b4941719cbf9a92a70e501f9bd3e0dcb18a0bb4a6b502edb9d99224d323
--- a/dev-haskell/base-compat/base-compat-0.2.1.ebuild
+++ b/dev-haskell/base-compat/base-compat-0.2.1.ebuild
@ -0,0 +1,26 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/base-compat/base-compat-0.2.1.ebuild,v 1.1 2013/06/20 23:19:39 qnikst Exp $
+
+EAPI=5
+
+# ebuild generated by hackport 0.3.1.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="A compatibility layer for base"
+HOMEPAGE="http://hackage.haskell.org/package/base-compat"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-6.10.4:="
+DEPEND="${RDEPEND}
+		test? ( >=dev-haskell/hspec-1.3
+			dev-haskell/setenv
+		)
+		>=dev-haskell/cabal-1.8"
--- a/dev-haskell/base-compat/metadata.xml
+++ b/dev-haskell/base-compat/metadata.xml
@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+	</maintainer>
+	<longdescription>
+		Ban CPP from your code.  See the README for what is covered:
+		&lt;https://github.com/sol/base-compat#readme&gt;
+	</longdescription>
+</pkgmetadata>
--- a/dev-haskell/css-text/Manifest
+++ b/dev-haskell/css-text/Manifest
@ -0,0 +1 @@
+DIST css-text-0.1.1.tar.gz 3139 SHA256 1ed480f350d0107e3ba95c33ab94ea4efd1956443cc7cc0f3f28616733026b83 SHA512 6a62eb4c9919ddc2b8143422fc4af8fcc54fec151d88b46ee34467c94a630b47773a6b4a24c634b44b7551e70b82ddc385345f85ebf2c5fb440ea06a96bee4a6 WHIRLPOOL bb727f9ad50abcbb563f9232766dbcb3143234379b8ce5c68132004559ff642c444fa24fe39db6f9ae46776f7d452507c41cc90bccd86d4f8f69b962bba886ca
--- a/dev-haskell/css-text/css-text-0.1.1.ebuild
+++ b/dev-haskell/css-text/css-text-0.1.1.ebuild
@ -0,0 +1,29 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/css-text/css-text-0.1.1.ebuild,v 1.1 2013/06/20 23:21:58 qnikst Exp $
+
+EAPI=5
+
+# ebuild generated by hackport 0.3.2.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="CSS parser and renderer."
+HOMEPAGE="http://www.yesodweb.com/"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/attoparsec-0.10:=[profile?]
+		>=dev-haskell/text-0.11:=[profile?]
+		>=dev-lang/ghc-6.10.4:="
+DEPEND="${RDEPEND}
+		>=dev-haskell/cabal-1.8
+		test? ( >=dev-haskell/hspec-0.6.1
+			>=dev-haskell/hunit-1.2
+			dev-haskell/quickcheck
+		)"
--- a/dev-haskell/css-text/metadata.xml
+++ b/dev-haskell/css-text/metadata.xml
@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+	</maintainer>
+	<longdescription>
+		CSS parser and renderer.
+	</longdescription>
+</pkgmetadata>
--- a/dev-haskell/doctest/Manifest
+++ b/dev-haskell/doctest/Manifest
@ -0,0 +1 @@
+DIST doctest-0.9.7.tar.gz 14131 SHA256 b4a8dcf800cf7af08eb89d2b8ca8aeb6c1936d248b991898097d8e5d2af76a34 SHA512 7b23d8b7e9ad5995427e68bcc230316ae3995441bcb6ef2328596e2c9b2069af0d9aa347fab7e27b9221b2aa0298c08c7d9be1a5667709c60fa0a08c2fd228f5 WHIRLPOOL 15db2c5fc72f4c10d375ee1f79c9929b4e77e16ab7b6cdfb3dda7b52a3b0e9d6182a3eeb607dbe514369415e76b2c586b9a21014bc8b9ff45ff720067e263f2f
--- a/dev-haskell/doctest/doctest-0.9.7.ebuild
+++ b/dev-haskell/doctest/doctest-0.9.7.ebuild
@ -0,0 +1,36 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/doctest/doctest-0.9.7.ebuild,v 1.1 2013/06/20 23:20:09 qnikst Exp $
+
+EAPI=5
+
+# ebuild generated by hackport 0.3.2.9999
+
+CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Test interactive Haskell examples"
+HOMEPAGE="https://github.com/sol/doctest-haskell#readme"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/deepseq:=[profile?]
+		>=dev-haskell/ghc-paths-0.1.0.9:=[profile?]
+		>=dev-haskell/syb-0.3:=[profile?]
+		<dev-haskell/syb-0.5:=[profile?]
+		dev-haskell/transformers:=[profile?]
+		>=dev-lang/ghc-6.10.4:="
+DEPEND="${RDEPEND}
+		>=dev-haskell/cabal-1.8
+		test? ( >=dev-haskell/base-compat-0.2.1
+			>=dev-haskell/hspec-1.3
+			dev-haskell/hunit
+			>=dev-haskell/quickcheck-2.5
+			dev-haskell/setenv
+			>=dev-haskell/silently-1.2.4
+			>=dev-haskell/stringbuilder-0.4
+		)"
--- a/dev-haskell/doctest/metadata.xml
+++ b/dev-haskell/doctest/metadata.xml
@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+	</maintainer>
+	<longdescription>
+		The doctest program checks examples in source code comments.
+		It is modeled after doctest for Python
+		(&lt;http://docs.python.org/library/doctest.html&gt;).
+		
+		Documentation is at
+		&lt;https://github.com/sol/doctest-haskell#readme&gt;.
+	</longdescription>
+</pkgmetadata>
--- a/dev-haskell/filestore/Manifest
+++ b/dev-haskell/filestore/Manifest
@ -0,0 +1 @@
+DIST filestore-0.6.0.1.tar.gz 29807 SHA256 6eabe0a7d5c8c95a3c827f92db80fe84a14c514f2a74dfca66cf4a56e30243d1 SHA512 875d79953ff92cf1605f5255cf5c9b53e218de9d110da51f8a216b6240a37566d3c70f36d4a68ca2f63827b45a75ce40e370b3cb4f93dc8b417c230a9f8b845f WHIRLPOOL 08295100ecb45276ab7844a90bff5b41896620c254648e878008abda23e6ceafaa3367382e36f3ab305a10d91f170a8d2fce2e0b5e6a623e4a16a9e947cc0c3b
--- a/dev-haskell/filestore/filestore-0.6.0.1.ebuild
+++ b/dev-haskell/filestore/filestore-0.6.0.1.ebuild
@ -0,0 +1,47 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/filestore/filestore-0.6.0.1.ebuild,v 1.1 2013/06/20 23:37:15 qnikst Exp $
+
+EAPI=5
+
+# ebuild generated by hackport 0.3.2.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Interface for versioning file stores."
+HOMEPAGE="http://hackage.haskell.org/package/filestore"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+maxcount"
+
+RDEPEND=">=dev-haskell/diff-0.2:=[profile?]
+		<dev-haskell/diff-0.4:=[profile?]
+		>=dev-haskell/parsec-2:=[profile?]
+		<dev-haskell/parsec-3.2:=[profile?]
+		>=dev-haskell/split-0.1:=[profile?]
+		<dev-haskell/split-0.3:=[profile?]
+		=dev-haskell/utf8-string-0.3*:=[profile?]
+		=dev-haskell/xml-1.3*:=[profile?]
+		>=dev-lang/ghc-6.12.1:="
+DEPEND="${RDEPEND}
+		>=dev-haskell/cabal-1.10
+		test? ( =dev-haskell/hunit-1.2*
+			dev-haskell/mtl
+		)"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag maxcount maxcount)
+}
+
+pkg_postinst() {
+	ghc-package_pkg_postinst
+
+	elog "${PN} requires either dev-vcs/darcs or dev-vcs/git to work."
+	elog "Please install one of these DVCS packages to fully utilise ${PN}."
+	elog "(These aren't in RDEPEND in case you are just using filestore to program.)"
+}
--- a/dev-haskell/filestore/metadata.xml
+++ b/dev-haskell/filestore/metadata.xml
@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+	</maintainer>
+	<longdescription>
+		The filestore library provides an abstract interface for a versioning
+		file store, and modules that instantiate this interface.  Currently
+		Git, Darcs, and Mercurial modules are provided, and other VCSs
+		or databases could be added.
+	</longdescription>
+	<use>
+		<flag name="maxcount">Make use of a recent (>= 2.3.0) Darcs feature which vastly improves the performance
+		of 'latest'.  You should disable this flag if you plan to use gitit with an
+		older version of Darcs, or 'latest' will raise an error.</flag>
+	</use>
+</pkgmetadata>
--- a/dev-haskell/hspec-expectations/Manifest
+++ b/dev-haskell/hspec-expectations/Manifest
@ -0,0 +1 @@
+DIST hspec-expectations-0.3.2.tar.gz 3707 SHA256 b11b2618749197a56c4ea3ea1d924a0de910d95fc92f560fe36032fc2ce5c224 SHA512 0ccb5a8999c41df00d977cefd985f2fd9d3d1abe79e79e340ab92ab87d875edbbd22f5b7a16e9f2c7f7ad127d7a30a8491b4bb6c59e92eec0c6a1439604c2599 WHIRLPOOL 0cda24b6e5786f45641bf2aeaaba53baf9819ada09f5816770f73cff0fbce968a13ea93a15ff2fa88d176f1ddab36b950c93fd7dff649344dfd5213ecc951885
--- a/dev-haskell/hspec-expectations/hspec-expectations-0.3.2.ebuild
+++ b/dev-haskell/hspec-expectations/hspec-expectations-0.3.2.ebuild
@ -0,0 +1,28 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hspec-expectations/hspec-expectations-0.3.2.ebuild,v 1.1 2013/06/20 23:05:10 qnikst Exp $
+
+EAPI=5
+
+# ebuild generated by hackport 0.3.2.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Catchy combinators for HUnit"
+HOMEPAGE="https://github.com/sol/hspec-expectations#readme"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/hunit:=[profile?]
+		>=dev-lang/ghc-6.10.4:="
+DEPEND="${RDEPEND}
+		>=dev-haskell/cabal-1.8
+		test? ( >=dev-haskell/hspec-1.3
+			dev-haskell/markdown-unlit
+			dev-haskell/silently
+		)"
--- a/dev-haskell/hspec-expectations/metadata.xml
+++ b/dev-haskell/hspec-expectations/metadata.xml
@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+	</maintainer>
+	<longdescription>
+		Catchy combinators for HUnit: &lt;https://github.com/sol/hspec-expectations#readme&gt;
+	</longdescription>
+</pkgmetadata>
--- a/dev-haskell/hspec-meta/Manifest
+++ b/dev-haskell/hspec-meta/Manifest
@ -0,0 +1 @@
+DIST hspec-meta-1.5.4.tar.gz 19600 SHA256 88319cbaa84c4ef998f1813081e9b99ff24da59cb0b72530ca394d6b55e7a71e SHA512 de1fe63013bbae4178bb6beed181f2413c9398fba79d3ba8ee384809f636893b0052202f77eed2be12455c66f51a703d149d880fb628669c37fdae928ee4dda1 WHIRLPOOL f4b479b61f12c0189412d42efbff64fcba1b160b6a506e6cfef084174d43de84ae440370209f19a9e897598e2a389a2c5b7e22e564f39a829f0d809add37ed15
--- a/dev-haskell/hspec-meta/hspec-meta-1.5.4.ebuild
+++ b/dev-haskell/hspec-meta/hspec-meta-1.5.4.ebuild
@ -0,0 +1,33 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hspec-meta/hspec-meta-1.5.4.ebuild,v 1.1 2013/06/20 23:12:27 qnikst Exp $
+
+EAPI=5
+
+# ebuild generated by hackport 0.3.2.9999
+
+CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="A version of Hspec which is used to test Hspec itself"
+HOMEPAGE="http://hspec.github.com/"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/ansi-terminal-0.5:=[profile?]
+		dev-haskell/deepseq:=[profile?]
+		=dev-haskell/hspec-expectations-0.3.2*:=[profile?]
+		>=dev-haskell/hunit-1.2.5:=[profile?]
+		>=dev-haskell/quickcheck-2.5.1:=[profile?]
+		dev-haskell/quickcheck-io:=[profile?]
+		=dev-haskell/random-1.0*:=[profile?]
+		dev-haskell/setenv:=[profile?]
+		>=dev-haskell/transformers-0.2.2.0:=[profile?]
+		<dev-haskell/transformers-0.4.0:=[profile?]
+		>=dev-lang/ghc-6.12.1:="
+DEPEND="${RDEPEND}
+		>=dev-haskell/cabal-1.8"
--- a/dev-haskell/hspec-meta/metadata.xml
+++ b/dev-haskell/hspec-meta/metadata.xml
@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+	</maintainer>
+	<longdescription>
+		A stable version of Hspec which is used to test the
+		in-development version of Hspec.
+	</longdescription>
+</pkgmetadata>
--- a/dev-haskell/hspec/Manifest
+++ b/dev-haskell/hspec/Manifest
@ -0,0 +1 @@
+DIST hspec-1.5.4.tar.gz 30050 SHA256 8dce8de068eb84eec2bf72de37f6727a2dfddd85f2289d969e07038885ac87a1 SHA512 a2587d3b105786e74664ca378c09c971f11f48daf6175dd6eb6ada84116312911545bedf93b8ef3a50c86374899f1b6267404f82587047d8d5163515ac58b346 WHIRLPOOL 13061d776531a0726f6dfcef4d195a8b2d25e579d7f372ac92e4d6618323a2ef290706cf6b4ea4ed1ad84b4341671f702c6317f630daf5dcb20e0190a23c3c82
--- a/dev-haskell/hspec/hspec-1.5.4.ebuild
+++ b/dev-haskell/hspec/hspec-1.5.4.ebuild
@ -0,0 +1,38 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hspec/hspec-1.5.4.ebuild,v 1.1 2013/06/21 02:47:23 patrick Exp $
+
+EAPI=5
+
+# ebuild generated by hackport 0.3.2.9999
+
+CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Behavior-Driven Development for Haskell"
+HOMEPAGE="http://hspec.github.com/"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/ansi-terminal-0.5:=[profile?]
+		dev-haskell/deepseq:=[profile?]
+		=dev-haskell/hspec-expectations-0.3.2*:=[profile?]
+		>=dev-haskell/hunit-1.2.5:=[profile?]
+		>=dev-haskell/quickcheck-2.5.1:=[profile?]
+		dev-haskell/quickcheck-io:=[profile?]
+		=dev-haskell/random-1.0*:=[profile?]
+		dev-haskell/setenv:=[profile?]
+		>=dev-haskell/transformers-0.2.2.0:=[profile?]
+		<dev-haskell/transformers-0.4.0:=[profile?]
+		>=dev-lang/ghc-6.12.1:="
+DEPEND="${RDEPEND}
+		>=dev-haskell/cabal-1.8
+		test? ( >=dev-haskell/doctest-0.9.4.1
+			dev-haskell/ghc-paths
+			>=dev-haskell/hspec-meta-1.5.1
+			>=dev-haskell/silently-1.2.4
+		)"
--- a/dev-haskell/hspec/metadata.xml
+++ b/dev-haskell/hspec/metadata.xml
@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+	</maintainer>
+	<longdescription>
+		Behavior Driven Development for Haskell
+		
+		Hspec is roughly based on the Ruby library RSpec. However, Hspec is just a framework for running HUnit and QuickCheck tests. Compared to other options, it provides a much nicer syntax that makes tests very easy to read.
+	</longdescription>
+</pkgmetadata>
--- a/dev-haskell/markdown-unlit/Manifest
+++ b/dev-haskell/markdown-unlit/Manifest
@ -0,0 +1 @@
+DIST markdown-unlit-0.2.0.1.tar.gz 2950 SHA256 186e38a8cba9371293763708778bce59756d184003478a606bac8bed22db83ad SHA512 72098e14fd7c8abceb2001d0b180384b7e1e1ad180d41417841bef6c327a242cf1eec060e23137f46f766c4b15366c212f1dde9500647e504ebf6246f0e89072 WHIRLPOOL 9988d5bdba0792d6a848f1b71980471ede2aa7856d07fceb495df24cb81cd181e4788a212c191377588353340dc3bb992c72bd884da882c126d408fd848bb175
--- a/dev-haskell/markdown-unlit/markdown-unlit-0.2.0.1.ebuild
+++ b/dev-haskell/markdown-unlit/markdown-unlit-0.2.0.1.ebuild
@ -0,0 +1,28 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/markdown-unlit/markdown-unlit-0.2.0.1.ebuild,v 1.1 2013/06/20 23:03:41 qnikst Exp $
+
+EAPI=5
+
+# ebuild generated by hackport 0.3.9999
+
+CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Literate Haskell support for Markdown"
+HOMEPAGE="http://hackage.haskell.org/package/markdown-unlit"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-6.10.4:="
+DEPEND="${RDEPEND}
+		test? ( >=dev-haskell/hspec-1.3
+			dev-haskell/quickcheck
+			dev-haskell/silently
+			dev-haskell/stringbuilder
+		)
+		>=dev-haskell/cabal-1.8"
--- a/dev-haskell/markdown-unlit/metadata.xml
+++ b/dev-haskell/markdown-unlit/metadata.xml
@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+	</maintainer>
+	<longdescription>
+		Documentation is here: &lt;https://github.com/sol/markdown-unlit#readme&gt;
+	</longdescription>
+</pkgmetadata>
--- a/dev-haskell/nanospec/Manifest
+++ b/dev-haskell/nanospec/Manifest
@ -0,0 +1 @@
+DIST nanospec-0.1.0.tar.gz 3408 SHA256 604aab074552e580a52bcfda8fce7cb2a48316f4f903801ea5d9a29b52b0179b SHA512 6e38bcee0d9a5f2e6b42566bb3e4aec57a61115dd649cb441721cb79193caac5aaf59aeef54a30dccb7e939e6512632221ec9e03b86142e5cb7671ef3433d4e9 WHIRLPOOL 0185abd0ad4a374a65f8b63168a74a66175b63db3f85deb3277ac6dd06c945486711aa1333501f104b59e400a9c6a176459fbf95b90f9a2e297325631edaa673
--- a/dev-haskell/nanospec/metadata.xml
+++ b/dev-haskell/nanospec/metadata.xml
@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+	</maintainer>
+	<longdescription>
+		A lightweight implementation of a subset of Hspec&#39;s API with
+		minimal dependencies.
+	</longdescription>
+</pkgmetadata>
--- a/dev-haskell/nanospec/nanospec-0.1.0.ebuild
+++ b/dev-haskell/nanospec/nanospec-0.1.0.ebuild
@ -0,0 +1,26 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/nanospec/nanospec-0.1.0.ebuild,v 1.1 2013/06/20 22:54:03 qnikst Exp $
+
+EAPI=5
+
+# ebuild generated by hackport 0.3.2.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="A lightweight implementation of a subset of Hspec's API"
+HOMEPAGE="http://hackage.haskell.org/package/nanospec"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-6.10.4:="
+DEPEND="${RDEPEND}
+		>=dev-haskell/cabal-1.8
+		test? ( >=dev-haskell/hspec-1.3
+			dev-haskell/silently
+		)"
--- a/dev-haskell/quickcheck-io/Manifest
+++ b/dev-haskell/quickcheck-io/Manifest
@ -0,0 +1 @@
+DIST quickcheck-io-0.1.0.tar.gz 1604 SHA256 5a32c4bf8266010db2874d101b6af471af2e41d602c34ebd768c867bd8d1ed98 SHA512 9d0ed38c0e90475946528373e0ccfa1cd66337fda6ec18de1cdcfa7469e9809dbc227f8c8b0c2a48b020749f1750f1159f6b5a24a2b5f1f39965561bfa7c1d60 WHIRLPOOL 769617053dbd549222a9e9c09894d8718aaef664f3e7c415b42f385781c5dbdaae9df35ff965b92663212c44cf4375d22374af9ec41a2fdb5ac04d259b1207f1
--- a/dev-haskell/quickcheck-io/metadata.xml
+++ b/dev-haskell/quickcheck-io/metadata.xml
@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+	</maintainer>
+	<longdescription>
+		This package provides an orphan instance that allows you to
+		use HUnit assertions as QuickCheck properties.
+	</longdescription>
+</pkgmetadata>
--- a/dev-haskell/quickcheck-io/quickcheck-io-0.1.0.ebuild
+++ b/dev-haskell/quickcheck-io/quickcheck-io-0.1.0.ebuild
@ -0,0 +1,25 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/quickcheck-io/quickcheck-io-0.1.0.ebuild,v 1.1 2013/06/20 23:09:28 qnikst Exp $
+
+EAPI=5
+
+# ebuild generated by hackport 0.3.2.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Use HUnit assertions as QuickCheck properties"
+HOMEPAGE="http://hackage.haskell.org/package/quickcheck-io"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/hunit-1.2.5:=[profile?]
+		>=dev-haskell/quickcheck-2.5.1:=[profile?]
+		>=dev-lang/ghc-6.10.4:="
+DEPEND="${RDEPEND}
+		>=dev-haskell/cabal-1.8"
--- a/dev-haskell/setenv/Manifest
+++ b/dev-haskell/setenv/Manifest
@ -0,0 +1 @@
+DIST setenv-0.1.0.tar.gz 2478 SHA256 5e37d7a0a7abe3830fdb42cbba39f9b707f35a8affa770656645e7e5ee128413 SHA512 0cb7615e4795f53ac80bba9e892bd2bfd44e861001daf939fd8abe5d0437ce31614403ebb1873c8b355877470ee4580fa7c7e78ba669a042c5beb5443378ccc0 WHIRLPOOL 3674d6f716d2d4a4edf64727c7d0f74c7a2dc9824dfe9b1cb9d9c1aa52c8c78c3c60e084c9694b03ffda8ef9594c0898cc96b5d9ba9c237e5899f36b728d8f5b
--- a/dev-haskell/setenv/metadata.xml
+++ b/dev-haskell/setenv/metadata.xml
@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+	</maintainer>
+	<longdescription>
+		A cross-platform library for setting environment variables
+	</longdescription>
+</pkgmetadata>
--- a/dev-haskell/setenv/setenv-0.1.0.ebuild
+++ b/dev-haskell/setenv/setenv-0.1.0.ebuild
@ -0,0 +1,28 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/setenv/setenv-0.1.0.ebuild,v 1.1 2013/06/20 23:11:03 qnikst Exp $
+
+EAPI=5
+
+# ebuild generated by hackport 0.3.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour" # test-suite" breaks when installed version is broken
+inherit haskell-cabal
+
+DESCRIPTION="A cross-platform library for setting environment variables"
+HOMEPAGE="http://hackage.haskell.org/package/setenv"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RESTRICT=test # breaks when installed version is broken
+
+RDEPEND=">=dev-lang/ghc-6.10.4:="
+DEPEND="${RDEPEND}
+		test? ( >=dev-haskell/hspec-1.3
+			dev-haskell/quickcheck
+		)
+		>=dev-haskell/cabal-1.8"
--- a/dev-haskell/silently/Manifest
+++ b/dev-haskell/silently/Manifest
@ -0,0 +1 @@
+DIST silently-1.2.4.1.tar.gz 3199 SHA256 a2b8f53e7e7bc0272852852c49d8b27ff250accc73e25cbe9f1e20f3fee0ad0c SHA512 ab8fea9c15a2061e3c3fd6970422a2cdea67aac3614991a8135f19a2f075de52f923fd0e78b5a45a91f2523f6263eb626efea2e89ed94277e03a132410862e19 WHIRLPOOL 8181fa796fcc7b2f0abfb48c481a1bbc19a5ffca9bd1f318ad5d42521dc84c2b48af64dd51304070dc3cb18ff2894bd338e11943ae606d9f2fcd654dde4f37db
--- a/dev-haskell/silently/metadata.xml
+++ b/dev-haskell/silently/metadata.xml
@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+	</maintainer>
+	<longdescription>
+		Prevent or capture writing to stdout and other handles.
+	</longdescription>
+</pkgmetadata>
--- a/dev-haskell/silently/silently-1.2.4.1.ebuild
+++ b/dev-haskell/silently/silently-1.2.4.1.ebuild
@ -0,0 +1,26 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/silently/silently-1.2.4.1.ebuild,v 1.1 2013/06/20 22:54:56 qnikst Exp $
+
+EAPI=5
+
+# ebuild generated by hackport 0.3.2.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Prevent or capture writing to stdout and other handles."
+HOMEPAGE="https://github.com/trystan/silently"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/deepseq:=[profile?]
+		>=dev-lang/ghc-6.10.4:="
+DEPEND="${RDEPEND}
+		>=dev-haskell/cabal-1.8
+		test? ( dev-haskell/nanospec
+		)"
--- a/dev-haskell/stringbuilder/Manifest
+++ b/dev-haskell/stringbuilder/Manifest
@ -0,0 +1 @@
+DIST stringbuilder-0.4.0.tar.gz 1981 SHA256 145283f60a157233906e336bb9f9f4b25b458cd3fffbd9dcf3f1c239c2ba146c SHA512 fead3cedc1851b4b66d443eff50659328c4b5005c2095151ac848314c8eb55fe7061f725d594a792594e7ffe939eb3ef69770e79947a28549b1a4254144ab251 WHIRLPOOL 25d05046d1d4c54b7e0ff3fb4fbf1e157fc5a950dac5208b2f1ccc4125e2d40a5aa33e8911919edfe54c4c77daaa30c7de254c795d17c16ee841d0d14b3b6cb3
--- a/dev-haskell/stringbuilder/metadata.xml
+++ b/dev-haskell/stringbuilder/metadata.xml
@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+	</maintainer>
+	<longdescription>
+		&lt;https://github.com/sol/stringbuilder#readme&gt;
+	</longdescription>
+</pkgmetadata>
--- a/dev-haskell/stringbuilder/stringbuilder-0.4.0.ebuild
+++ b/dev-haskell/stringbuilder/stringbuilder-0.4.0.ebuild
@ -0,0 +1,26 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/stringbuilder/stringbuilder-0.4.0.ebuild,v 1.1 2013/06/20 23:00:38 qnikst Exp $
+
+EAPI=5
+
+# ebuild generated by hackport 0.3.1.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="A writer monad for multi-line string literals"
+HOMEPAGE="http://hackage.haskell.org/package/stringbuilder"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-6.10.4:="
+DEPEND="${RDEPEND}
+		test? ( >=dev-haskell/hspec-1.3
+			dev-haskell/quickcheck
+		)
+		>=dev-haskell/cabal-1.8"
--- a/dev-haskell/xss-sanitize/Manifest
+++ b/dev-haskell/xss-sanitize/Manifest
@ -0,0 +1 @@
+DIST xss-sanitize-0.3.3.tar.gz 8495 SHA256 8a9cabdfa98b686fee05171af85e45ee45887ec161cac895e204d2c72dbade76 SHA512 a6910d9437ea01a4b07911e5b221e5fd546cf80405e1d1f715eb69ed59121c20e725c84ec79d87ba6dcea7f2ac8fa04f4042adbaf1475720eb8fd1d3eff3a2aa WHIRLPOOL 037b1d190b5a4f0f3353290018e7aed4b12b21d8907ab093aa8356b3a200dcc827c0abff95bb08b001d4dbee5338f690213c35446f4ab353efe1e0a87660da1c
--- a/dev-haskell/xss-sanitize/metadata.xml
+++ b/dev-haskell/xss-sanitize/metadata.xml
@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+	</maintainer>
+	<longdescription>
+		run untrusted HTML through Text.HTML.SanitizeXSS.sanitizeXSS to prevent XSS attacks. see README.md &lt;http://github.com/yesodweb/haskell-xss-sanitize&gt; for more details
+	</longdescription>
+</pkgmetadata>
--- a/dev-haskell/xss-sanitize/xss-sanitize-0.3.3.ebuild
+++ b/dev-haskell/xss-sanitize/xss-sanitize-0.3.3.ebuild
@ -0,0 +1,37 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/xss-sanitize/xss-sanitize-0.3.3.ebuild,v 1.1 2013/06/20 23:25:21 qnikst Exp $
+
+EAPI=5
+
+# ebuild generated by hackport 0.3.1.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="sanitize untrusted HTML to prevent XSS attacks"
+HOMEPAGE="http://github.com/yesodweb/haskell-xss-sanitize"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/attoparsec-0.10.0.3:=[profile?]
+		<dev-haskell/attoparsec-1:=[profile?]
+		>=dev-haskell/css-text-0.1.1:=[profile?]
+		<dev-haskell/css-text-0.2:=[profile?]
+		=dev-haskell/network-2*:=[profile?]
+		>=dev-haskell/tagsoup-0.12.2:=[profile?]
+		<dev-haskell/tagsoup-1:=[profile?]
+		>=dev-haskell/text-0.11:=[profile?]
+		<dev-haskell/text-1:=[profile?]
+		>=dev-haskell/utf8-string-0.3:=[profile?]
+		<dev-haskell/utf8-string-1:=[profile?]
+		>=dev-lang/ghc-6.10.4:="
+DEPEND="${RDEPEND}
+		test? ( >=dev-haskell/hspec-0.8
+			>=dev-haskell/hunit-1.2
+		)
+		>=dev-haskell/cabal-1.8"
--- a/dev-libs/libburn/libburn-1.3.0_p01.ebuild
+++ b/dev-libs/libburn/libburn-1.3.0_p01.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libburn/libburn-1.3.0_p01.ebuild,v 1.4 2013/06/18 19:33:08 nimiux Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libburn/libburn-1.3.0_p01.ebuild,v 1.5 2013/06/20 16:58:12 billie Exp $

 EAPI=5

@ -38,11 +38,10 @@ src_install() {

 	dodoc CONTRIBUTORS doc/{comments,*.txt}

-	cd "${S}"/cdrskin
 	docinto cdrskin
-	dodoc *.txt README
+	dodoc cdrskin/{*.txt,README}
 	docinto cdrskin/html
-	dohtml cdrskin_eng.html
+	dohtml cdrskin/cdrskin_eng.html

 	find "${D}" -name '*.la' -exec rm -rf '{}' '+' || die "la removal failed"
 }
--- a/dev-libs/libisoburn/libisoburn-1.3.0.ebuild
+++ b/dev-libs/libisoburn/libisoburn-1.3.0.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libisoburn/libisoburn-1.3.0.ebuild,v 1.4 2013/06/18 19:33:34 nimiux Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libisoburn/libisoburn-1.3.0.ebuild,v 1.5 2013/06/20 17:05:47 billie Exp $

 EAPI=5

@ -51,9 +51,10 @@ src_install() {

 	dodoc CONTRIBUTORS doc/{comments,*.wiki,startup_file.txt}

-	cd "${S}"/xorriso
+	docinto frontend
+	dodoc frontend/README-tcltk
 	docinto xorriso
-	dodoc changelog.txt README_gnu_xorriso
+	dodoc xorriso/{changelog.txt,README_gnu_xorriso}

 	find "${D}" -name '*.la' -exec rm -rf '{}' '+' || die "la removal failed"
 }
--- a/dev-libs/libisofs/libisofs-1.3.0.ebuild
+++ b/dev-libs/libisofs/libisofs-1.3.0.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libisofs/libisofs-1.3.0.ebuild,v 1.4 2013/06/18 19:33:26 nimiux Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libisofs/libisofs-1.3.0.ebuild,v 1.6 2013/06/20 17:27:44 billie Exp $

 EAPI=5

@ -34,7 +34,7 @@ src_configure() {
 src_install() {
 	default

-	dodoc Roadmap doc/{checksums.txt,susp_aaip*,Tutorial,zisofs_format.txt}
+	dodoc Roadmap doc/{*.txt,Tutorial}

 	find "${D}" -name '*.la' -exec rm -rf '{}' '+' || die "la removal failed"
 }
--- a/dev-util/ninja/Manifest
+++ b/dev-util/ninja/Manifest
@ -1,2 +1,3 @@
 DIST ninja-1.1.0.tar.gz 132523 SHA256 a9964fd5d22d34d476e9e10f1281f094a9cb53797ae0e02356a5138c853c7c5e SHA512 b894f147dce2fde0c39f75523e4c36271630b176e7418896d44c5c29d04c798e42e80ea378787cbcd4b5acae949feb7ee7310a99a5fe80881b1edfa22d31d235 WHIRLPOOL 711ef53756fa01b12f2ef161bebf475f3b9bda666d1b3b4af4c16465323d4e828e5e9ad130473bf46364b7dedd6c62c3433fba7013ed91a21e484d9cd2d1bb5e
 DIST ninja-1.3.3.tar.gz 147703 SHA256 6212af69c2bdb9b6e7a4a5b45802483aebfb5d8967e437981fa66f0da3d17a3e SHA512 8e088f7c82f99f7eb974cd0c564d85a87206c7341df33af53f001b6d46ee34e29406ea196dc79dcc8101fd5c567f1bbc46095a6911e9830ffa6a89ff06d5672e WHIRLPOOL b5828d4c75007541a0e895443471305bf602d03508de918b5c619414a0fba54907365901cf9ac7e89c0d1bb0837dbd999c8ac31f4583c8de6e2306d90ec7bf62
+DIST ninja-1.3.4.tar.gz 148750 SHA256 e71066b1db7b68f0aada6e93639ae8986844491d18bbca209338853d706f6099 SHA512 4bcd5b357729bbcbddae4eedac1dbd0bce2932474182f32cbbcef80b5f1c8e0bb3046bcd1e0f092a9df711727b27046bfb7f63b4eaa1ac3f8815ca6c26c0344e WHIRLPOOL b8f15a67672d839a8e5717830ed253ac298ed84f098162943436a28fb9290a46540654f39a8ce3d3a3320b6b5fc028f5b7d88f3e0fe089604ac5759b2afb6f04
--- a/dev-util/ninja/ninja-1.3.4.ebuild
+++ b/dev-util/ninja/ninja-1.3.4.ebuild
@ -0,0 +1,105 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/ninja/ninja-1.3.4.ebuild,v 1.1 2013/06/21 04:35:39 floppym Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit bash-completion-r1 elisp-common python-any-r1 toolchain-funcs
+
+if [ "${PV}" = "999999" ]; then
+	EGIT_REPO_URI="git://github.com/martine/ninja.git http://github.com/martine/ninja.git"
+	inherit git-2
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/martine/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+fi
+
+DESCRIPTION="A small build system similar to make."
+HOMEPAGE="http://github.com/martine/ninja"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+IUSE="doc emacs test vim-syntax zsh-completion"
+
+DEPEND="
+	${PYTHON_DEPS}
+	dev-util/re2c
+	doc? (
+		app-text/asciidoc
+		app-doc/doxygen
+		dev-libs/libxslt
+	)
+	test? ( dev-cpp/gtest )
+"
+RDEPEND="
+	emacs? ( virtual/emacs )
+	vim-syntax? (
+		|| (
+			app-editors/vim
+			app-editors/gvim
+		)
+	)
+	zsh-completion? ( app-shells/zsh )
+	!<net-irc/ninja-1.5.9_pre14-r1" #436804
+
+src_compile() {
+	# If somebody wants to cross-compile, we will probably need to do 2 builds.
+	tc-export CXX
+
+	"${PYTHON}" bootstrap.py --verbose || die
+
+	if use doc; then
+		./ninja -v doxygen manual || die
+	fi
+
+	if use emacs; then
+		elisp-compile misc/ninja-mode.el || die
+	fi
+}
+
+src_test() {
+	./ninja -v ninja_test || die
+	./ninja_test || die
+}
+
+src_install() {
+	dodoc README HACKING.md
+	if use doc; then
+		dohtml -r doc/doxygen/html/*
+		dohtml doc/manual.html
+	fi
+	dobin ninja
+
+	newbashcomp misc/bash-completion "${PN}"
+
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/syntax/
+		doins misc/"${PN}".vim
+
+		echo 'au BufNewFile,BufRead *.ninja set ft=ninja' > "${T}/${PN}.vim"
+		insinto /usr/share/vim/vimfiles/ftdetect
+		doins "${T}/${PN}.vim"
+	fi
+
+	if use zsh-completion; then
+		insinto /usr/share/zsh/site-functions
+		newins misc/zsh-completion _ninja
+	fi
+
+	if use emacs; then
+		cd misc || die
+		elisp-install ${PN} ninja-mode.el* || die
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
--- a/kde-base/kdenetwork-filesharing/kdenetwork-filesharing-4.10.3.ebuild
+++ b/kde-base/kdenetwork-filesharing/kdenetwork-filesharing-4.10.3.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork-filesharing/kdenetwork-filesharing-4.10.3.ebuild,v 1.5 2013/06/08 10:09:08 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork-filesharing/kdenetwork-filesharing-4.10.3.ebuild,v 1.6 2013/06/20 17:26:14 johu Exp $

 EAPI=5

@ -9,6 +9,6 @@ KMMODULE="filesharing"
 KDE_SCM="svn"
 inherit kde4-meta

-DESCRIPTION="kcontrol filesharing config module for NFS, SMB etc"
+DESCRIPTION="kcontrol filesharing config module for SMB"
 KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
--- a/kde-base/kdenetwork-filesharing/kdenetwork-filesharing-4.10.4.ebuild
+++ b/kde-base/kdenetwork-filesharing/kdenetwork-filesharing-4.10.4.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork-filesharing/kdenetwork-filesharing-4.10.4.ebuild,v 1.1 2013/06/04 18:21:52 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork-filesharing/kdenetwork-filesharing-4.10.4.ebuild,v 1.2 2013/06/20 17:26:14 johu Exp $

 EAPI=5

@ -9,6 +9,6 @@ KMMODULE="filesharing"
 KDE_SCM="svn"
 inherit kde4-meta

-DESCRIPTION="kcontrol filesharing config module for NFS, SMB etc"
+DESCRIPTION="kcontrol filesharing config module for SMB"
 KEYWORDS=" ~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@ -1,3 +1,4 @@
 DIST blender-2.64a-patches-1.tar.xz 14388 SHA256 047f3231f4b21dd813e7b052be0b28b9391345422fb335d4cca578820977bc8b SHA512 f0dc73769a74ca9098380640ae28508b204f4c198a97219bb2ac8445eff6120dbda64a9d2d80e5dcab48df34d7de844489702510b5a8d32677b5cb8e70c7b4d9 WHIRLPOOL e8bfaf0ca1a51991e3109a51068bea2619da7d3a93bba623d78f67f98681c43ad7dc3a1452fd13929081b3a118ae6a35ff07994251c857e3b6d35aabcd4b732e
 DIST blender-2.64a.tar.gz 31388178 SHA256 a5b1c3f1919b041a253d8d6d7c4f54e2b7f8a9531795675ab468ae742350cc7b SHA512 77d171a36f1c87a82613ed7601df9cef444069a2a6600e05260607e9a2009c292068a2b4753f3cbd53d820cdc8d9ed88ddd1685f20647b943f75bfbeb905b9b5 WHIRLPOOL 7f4878a606379dad9d121b0ad08f17e8691baf944147dc72dd33defd33a2303116a7090f7b8f8a186760fdd65ba9c0a0e523ed7d231fd23c070c31b52693178f
 DIST blender-2.66.tar.gz 36914318 SHA256 627a4bb12b6d971be76ae2ada080d5ed65904d7f83bcefe43a9a5a82cf433558 SHA512 f76499edc5f8179a42ec6d6334c6fa03f830570d054061ae40c2e8e1ec0a0090efcbb642f4f7f3b99d3941d4c4b791a0e357a275acf1b3ac251d58906f23b2b4 WHIRLPOOL cfc0e1cb441b41d4363dea28c0d2ac3879d49b417d43f5dce44c784cf78d924b3d640a698c8df3c842aa90a8f5c84faf80d4769f64505c151d0c965b4f28f48b
+DIST blender-2.67b.tar.gz 41368150 SHA256 7d6701d92ee7e3923771de10f610a3f8cca8b6d14b488d3044f8329878187d67 SHA512 d9b24219770e51aac76a15cb6db486835d389e27a89d1ce890da0f0a30f3f76a070ddd9c21e739df93e7f4a670a6b3de993a6f56696983bf466be9c14e906525 WHIRLPOOL fee35d98766a8acf3bd2ca696ae1c9f0deb1422d45f3951c56bae6ea172fef1ecd21801e4696665e6a40384636aee59d5cb173ef31998aba985c41193f9d4949
--- a/media-gfx/blender/blender-2.67b.ebuild
+++ b/media-gfx/blender/blender-2.67b.ebuild
@ -0,0 +1,271 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.67b.ebuild,v 1.1 2013/06/20 19:59:26 hasufell Exp $
+
+# TODO:
+#   bundled-deps: bullet is modified
+#   multiple python abi?
+
+EAPI=5
+PYTHON_COMPAT=( python3_3 )
+#PATCHSET="1"
+
+inherit multilib fdo-mime gnome2-utils cmake-utils eutils python-single-r1 versionator flag-o-matic toolchain-funcs pax-utils check-reqs
+
+DESCRIPTION="3D Creation/Animation/Publishing System"
+HOMEPAGE="http://www.blender.org"
+
+case ${PV} in
+	*_p*)
+		SRC_URI="http://dev.gentoo.org/~lu_zero/${P}.tar.gz" ;;
+	*)
+		SRC_URI="http://download.blender.org/source/${P}.tar.gz" ;;
+esac
+
+if [[ -n ${PATCHSET} ]]; then
+	SRC_URI+=" http://dev.gentoo.org/~flameeyes/${PN}/${P}-patches-${PATCHSET}.tar.xz"
+fi
+
+SLOT="0"
+LICENSE="|| ( GPL-2 BL )"
+KEYWORDS="~amd64 ~x86"
+IUSE="+boost +bullet collada colorio cycles +dds debug doc +elbeem ffmpeg fftw +game-engine jack jpeg2k ndof nls openal openmp +openexr player redcode sdl sndfile sse tiff"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	player? ( game-engine )
+	redcode? ( jpeg2k )
+	cycles? ( boost openexr tiff )
+	nls? ( boost )
+	game-engine? ( boost )"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	dev-cpp/gflags
+	dev-cpp/glog[gflags]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	>=media-libs/freetype-2.0
+	media-libs/glew
+	media-libs/libpng:0
+	media-libs/libsamplerate
+	sci-libs/colamd
+	sci-libs/ldl
+	sys-libs/zlib
+	virtual/glu
+	virtual/jpeg
+	virtual/libintl
+	virtual/opengl
+	x11-libs/libXi
+	x11-libs/libX11
+	boost? ( >=dev-libs/boost-1.44[threads(+)] )
+	collada? ( media-libs/opencollada )
+	colorio? ( media-libs/opencolorio )
+	cycles? (
+		media-libs/openimageio
+	)
+	ffmpeg? (
+		>=virtual/ffmpeg-0.6.90[x264,mp3,encode,theora,jpeg2k?]
+	)
+	fftw? ( sci-libs/fftw:3.0 )
+	jack? ( media-sound/jack-audio-connection-kit )
+	ndof? ( app-misc/spacenavd )
+	nls? ( virtual/libiconv )
+	openal? ( >=media-libs/openal-1.6.372 )
+	openexr? ( media-libs/openexr )
+	sdl? ( media-libs/libsdl[audio,joystick] )
+	sndfile? ( media-libs/libsndfile )
+	tiff? ( media-libs/tiff:0 )"
+DEPEND="${RDEPEND}
+	>=dev-cpp/eigen-3.1.3:3
+	doc? (
+		app-doc/doxygen[-nodot(-),dot(+)]
+		dev-python/sphinx
+	)
+	nls? ( sys-devel/gettext )"
+
+pkg_pretend() {
+	if use openmp && ! tc-has-openmp; then
+		eerror "You are using gcc built without 'openmp' USE."
+		eerror "Switch CXX to an OpenMP capable compiler."
+		die "Need openmp"
+	fi
+
+	if use doc; then
+		CHECKREQS_DISK_BUILD="4G" check-reqs_pkg_pretend
+	fi
+}
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-doxyfile.patch \
+		"${FILESDIR}"/${P}-unbundle-colamd.patch \
+		"${FILESDIR}"/${P}-remove-binreloc.patch \
+		"${FILESDIR}"/${P}-unbundle-glog.patch \
+		"${FILESDIR}"/${P}-unbundle-eigen3.patch \
+		"${FILESDIR}"/${P}-fix-install-rules.patch
+
+	# remove some bundled deps
+	rm -r \
+		extern/Eigen3 \
+		extern/libopenjpeg \
+		extern/glew \
+		extern/colamd \
+		extern/binreloc \
+		extern/libmv/third_party/{ldl,glog,gflags} \
+		|| die
+
+	# turn off binreloc (not cached)
+	sed -i \
+		-e 's#set(WITH_BINRELOC ON)#set(WITH_BINRELOC OFF)#' \
+		CMakeLists.txt || die
+
+	# we don't want static glew, but it's scattered across
+	# thousand files
+	# !!!CHECK THIS SED ON EVERY VERSION BUMP!!!
+	sed -i \
+		-e '/-DGLEW_STATIC/d' \
+		$(find . -type f -name "CMakeLists.txt") || die
+
+	ewarn "$(echo "Remaining bundled dependencies:";
+			( find extern -mindepth 1 -maxdepth 1 -type d; find extern/libmv/third_party -mindepth 1 -maxdepth 1 -type d; ) | sed 's|^|- |')"
+}
+
+src_configure() {
+	# FIX: forcing '-funsigned-char' fixes an anti-aliasing issue with menu
+	# shadows, see bug #276338 for reference
+	append-flags -funsigned-char
+	append-lfs-flags
+
+	# WITH_PYTHON_SECURITY
+	# WITH_PYTHON_SAFETY
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX=/usr
+		-DWITH_INSTALL_PORTABLE=OFF
+		$(cmake-utils_use_with boost BOOST)
+		$(cmake-utils_use_with cycles CYCLES)
+		$(cmake-utils_use_with collada OPENCOLLADA)
+		$(cmake-utils_use_with dds IMAGE_DDS)
+		$(cmake-utils_use_with elbeem MOD_FLUID)
+		$(cmake-utils_use_with ffmpeg CODEC_FFMPEG)
+		$(cmake-utils_use_with fftw FFTW3)
+		$(cmake-utils_use_with fftw MOD_OCEANISM)
+		$(cmake-utils_use_with game-engine GAMEENGINE)
+		$(cmake-utils_use_with nls INTERNATIONAL)
+		$(cmake-utils_use_with jack JACK)
+		$(cmake-utils_use_with jpeg2k IMAGE_OPENJPEG)
+		$(cmake-utils_use_with openal OPENAL)
+		$(cmake-utils_use_with openexr IMAGE_OPENEXR)
+		$(cmake-utils_use_with openmp OPENMP)
+		$(cmake-utils_use_with player PLAYER)
+		$(cmake-utils_use_with redcode IMAGE_REDCODE)
+		$(cmake-utils_use_with sdl SDL)
+		$(cmake-utils_use_with sndfile CODEC_SNDFILE)
+		$(cmake-utils_use_with sse RAYOPTIMIZATION)
+		$(cmake-utils_use_with bullet BULLET)
+		$(cmake-utils_use_with tiff IMAGE_TIFF)
+		$(cmake-utils_use_with colorio OPENCOLORIO)
+		$(cmake-utils_use_with ndof INPUT_NDOF)
+		-DWITH_PYTHON_INSTALL=OFF
+		-DWITH_PYTHON_INSTALL_NUMPY=OFF
+		-DWITH_STATIC_LIBS=OFF
+		-DWITH_SYSTEM_GLEW=ON
+		-DWITH_SYSTEM_OPENJPEG=ON
+		-DWITH_SYSTEM_BULLET=OFF
+		-DPYTHON_VERSION="${EPYTHON/python/}"
+		-DPYTHON_LIBRARY="$(python_get_library_path)"
+		-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
+	)
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+
+	cat - > "${T}"/${PN}.env <<EOF
+BLENDER_SYSTEM_SCRIPTS="/usr/share/blender/${PV}/scripts"
+BLENDER_SYSTEM_DATAFILES="/usr/share/blender/${PV}/datafiles"
+BLENDER_SYSTEM_PLUGINS="/usr/$(get_libdir)/plugins"
+EOF
+
+	if use doc; then
+		einfo "Generating Blender C/C++ API docs ..."
+		cd "${CMAKE_USE_DIR}"/doc/doxygen || die
+		doxygen -u Doxyfile
+		doxygen || die "doxygen failed to build API docs."
+
+		cd "${CMAKE_USE_DIR}" || die
+		einfo "Generating (BPY) Blender Python API docs ..."
+		"${BUILD_DIR}"/bin/blender --background --python doc/python_api/sphinx_doc_gen.py -noaudio || die "blender failed."
+
+		cd "${CMAKE_USE_DIR}"/doc/python_api || die
+		sphinx-build sphinx-in BPY_API || die "sphinx failed."
+	fi
+}
+
+src_test() { :; }
+
+src_install() {
+	local i
+
+	# Pax mark blender for hardened support.
+	pax-mark m "${CMAKE_BUILD_DIR}"/bin/blender
+
+	newenvd "${T}"/${PN}.env 60${PN}
+
+	if use doc; then
+		docinto "API/python"
+		dohtml -r "${CMAKE_USE_DIR}"/doc/python_api/BPY_API/*
+
+		docinto "API/blender"
+		dohtml -r "${CMAKE_USE_DIR}"/doc/doxygen/html/*
+	fi
+
+	# linguas cleanup
+	if ! use nls; then
+		rm -r "${CMAKE_USE_DIR}"/release/datafiles/locale || die
+	else
+		if [[ -n "${LINGUAS+x}" ]] ; then
+			for i in "${CMAKE_USE_DIR}"/release/datafiles/locale/* ; do
+				mylang=${i##*/}
+				has ${mylang} ${LINGUAS} || { rm -r ${i} || die ; }
+			done
+		fi
+	fi
+
+	# fucked up cmake will relink binary for no reason
+	emake -C "${CMAKE_BUILD_DIR}" DESTDIR="${D}" install/fast
+
+	# fix doc installdir
+	dohtml "${D}"/usr/share/doc/blender/readme.html
+	rm -r "${D}"/usr/share/doc/blender || die
+
+	python_fix_shebang "${D}"/usr/bin/blender-thumbnailer.py
+	python_optimize "${D}"/usr/share/blender/${PV}/scripts
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	elog
+	elog "Blender uses python integration. As such, may have some"
+	elog "inherit risks with running unknown python scripting."
+	elog
+	elog "It is recommended to change your blender temp directory"
+	elog "from /tmp to /home/user/tmp or another tmp file under your"
+	elog "home directory. This can be done by starting blender, then"
+	elog "dragging the main menu down do display all paths."
+	elog
+	ewarn "If you're updating from blender before 2.66, please make"
+	ewarn "sure to log out and then back in before launching it, so"
+	ewarn "that the new environment variables are picked up."
+	gnome2_icon_cache_update
+	fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	fdo-mime_desktop_database_update
+}
--- a/media-gfx/blender/files/blender-2.67b-doxyfile.patch
+++ b/media-gfx/blender/files/blender-2.67b-doxyfile.patch
@ -0,0 +1,19 @@
+commit eefa71abd4c13b28e0c42041240754c4ec1fda6e
+Author: hasufell <hasufell@gentoo.org>
+Date:   Thu Jun 20 20:32:46 2013 +0200
+
+    remove hhc.exe reference
+
+diff --git a/doc/doxygen/Doxyfile b/doc/doxygen/Doxyfile
+index 8444ea7..745ab77 100644
+--- a/doc/doxygen/Doxyfile
+++ b/doc/doxygen/Doxyfile
+@@ -952,7 +952,7 @@ CHM_FILE               = blender.chm
+ # the HTML help compiler (hhc.exe). If non-empty doxygen will try to run 
+ # the HTML help compiler on the generated index.hhp.
+ 
+-HHC_LOCATION           = "C:/Program Files (x86)/HTML Help Workshop/hhc.exe"
+HHC_LOCATION           = 
+ 
+ # If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag 
+ # controls if a separate .chi index file is generated (YES) or that 
--- a/media-gfx/blender/files/blender-2.67b-fix-install-rules.patch
+++ b/media-gfx/blender/files/blender-2.67b-fix-install-rules.patch
@ -0,0 +1,26 @@
+commit c8f101e4cca0092645070480c2837c446894f305
+Author: hasufell <hasufell@gentoo.org>
+Date:   Thu Jun 20 20:38:23 2013 +0200
+
+    remove stupid uninstall snippet
+    
+    whoever coded this... it is dangerous
+    uninstall methods have NO PLACE in install rules
+
+diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
+index cd8106a..3a54dd0 100644
+--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
+@@ -268,12 +268,6 @@ endif()
+ # Install Targets (Generic, All Platforms)
+ 
+ 
+-# important to make a clean  install each time, else old scripts get loaded.
+-install(
+-	CODE
+-	"file(REMOVE_RECURSE ${TARGETDIR_VER})"
+-)
+-
+ if(WITH_PYTHON)
+ 	# install(CODE "message(\"copying blender scripts...\")")
+ 	
--- a/media-gfx/blender/files/blender-2.67b-remove-binreloc.patch
+++ b/media-gfx/blender/files/blender-2.67b-remove-binreloc.patch
@ -0,0 +1,36 @@
+commit 657d19a1107d6765fc7c7152d6becbd7fb422b6b
+Author: hasufell <hasufell@gentoo.org>
+Date:   Thu Jun 20 20:36:41 2013 +0200
+
+    remove binreloc references
+
+diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt
+index b21cdc3..1c8dfa1 100644
+--- a/extern/CMakeLists.txt
+++ b/extern/CMakeLists.txt
+@@ -40,10 +40,6 @@ endif()
+ #	add_subdirectory(eltopo)
+ #endif()
+ 
+-if(WITH_BINRELOC)
+-	add_subdirectory(binreloc)
+-endif()
+-
+ if(NOT WITH_SYSTEM_GLEW)
+ 	add_subdirectory(glew)
+ endif()
+diff --git a/source/blenderplayer/CMakeLists.txt b/source/blenderplayer/CMakeLists.txt
+index c0b4e2d..261cbd2 100644
+--- a/source/blenderplayer/CMakeLists.txt
+++ b/source/blenderplayer/CMakeLists.txt
+@@ -81,10 +81,6 @@ list(APPEND BLENDER_LINK_LIBS
+ 	blenkernel_blc
+ )
+ 
+-if(CMAKE_SYSTEM_NAME MATCHES "Linux")
+-	list(APPEND BLENDER_LINK_LIBS extern_binreloc)
+-endif()
+-
+ # if(UNIX)
+ 	# Sort libraries
+ 	set(BLENDER_SORTED_LIBS
--- a/media-gfx/blender/files/blender-2.67b-unbundle-colamd.patch
+++ b/media-gfx/blender/files/blender-2.67b-unbundle-colamd.patch
@ -0,0 +1,61 @@
+commit 066ac461a3864a014623c8670593c67ca6aa7a76
+Author: hasufell <hasufell@gentoo.org>
+Date:   Thu Jun 20 20:35:34 2013 +0200
+
+    unbundle colamd
+
+diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt
+index 941f69e..b21cdc3 100644
+--- a/extern/CMakeLists.txt
+++ b/extern/CMakeLists.txt
+@@ -26,7 +26,6 @@
+ # Otherwise we get warnings here that we cant fix in external projects
+ remove_strict_flags()
+ 
+-add_subdirectory(colamd)
+ add_subdirectory(rangetree)
+ add_subdirectory(wcwidth)
+ 
+diff --git a/source/blenderplayer/CMakeLists.txt b/source/blenderplayer/CMakeLists.txt
+index c775f7d..c0b4e2d 100644
+--- a/source/blenderplayer/CMakeLists.txt
+++ b/source/blenderplayer/CMakeLists.txt
+@@ -170,8 +170,6 @@ endif()
+ 		list(APPEND BLENDER_SORTED_LIBS extern_ceres)
+ 	endif()
+ 
+-	list(APPEND BLENDER_SORTED_LIBS extern_colamd)
+-
+ 	if(WITH_MOD_BOOLEAN)
+ 		list(APPEND BLENDER_SORTED_LIBS bf_intern_bsp)
+ 		list(APPEND BLENDER_SORTED_LIBS bf_intern_moto)
+@@ -214,7 +212,7 @@ endif()
+ 		list(SORT REM_MSG)
+ 		message(STATUS "Player Skipping: (${REM_MSG})")
+ 	endif()
+-	target_link_libraries(blenderplayer ${BLENDER_SORTED_LIBS})
+	target_link_libraries(blenderplayer ${BLENDER_SORTED_LIBS} colamd)
+ 
+ 	unset(SEARCHLIB)
+ 	unset(SORTLIB)
+diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
+index d5407fe..cd8106a 100644
+--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
+@@ -900,7 +900,6 @@ endif()
+ 		bf_intern_smoke
+ 		extern_minilzo
+ 		extern_lzma
+-		extern_colamd
+ 		ge_logic_ketsji
+ 		extern_recastnavigation
+ 		ge_logic
+@@ -1014,7 +1013,7 @@ endif()
+ 		list(SORT REM_MSG)
+ 		message(STATUS "Blender Skipping: (${REM_MSG})")
+ 	endif()
+-	target_link_libraries(blender ${BLENDER_SORTED_LIBS})
+	target_link_libraries(blender ${BLENDER_SORTED_LIBS} colamd)
+ 
+ 	unset(SEARCHLIB)
+ 	unset(SORTLIB)
--- a/media-gfx/blender/files/blender-2.67b-unbundle-eigen3.patch
+++ b/media-gfx/blender/files/blender-2.67b-unbundle-eigen3.patch
@ -0,0 +1,561 @@
+commit 346fda03d8f792ed441be329d709d1ff1a8c0cb5
+Author: hasufell <julian.ospald@googlemail.com>
+Date:   Thu Jun 20 21:15:09 2013 +0200
+
+    unbundle Eigen3
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 973bdcc..44ce1c3 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -109,6 +109,7 @@ set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib CACHE INTERNAL "" FORCE)
+ # Check for some modules
+ if(UNIX)
+   find_package(PkgConfig)
+  pkg_check_modules(_PC_EIGEN3 eigen3)
+   pkg_check_modules(_PC_GFLAGS libgflags)
+   pkg_check_modules(_PC_GLOG libglog)
+ endif()
+diff --git a/extern/libmv/CMakeLists.txt b/extern/libmv/CMakeLists.txt
+index 5a0e8aa..bdee259 100644
+--- a/extern/libmv/CMakeLists.txt
+++ b/extern/libmv/CMakeLists.txt
+@@ -32,7 +32,7 @@ set(INC
+ )
+ 
+ set(INC_SYS
+-	../Eigen3
+	${_PC_EIGEN3_INCLUDE_DIRS}
+ 	${PNG_INCLUDE_DIR}
+ 	${ZLIB_INCLUDE_DIRS}
+ )
+diff --git a/extern/libmv/third_party/ceres/CMakeLists.txt b/extern/libmv/third_party/ceres/CMakeLists.txt
+index 0645883..d79fe9e 100644
+--- a/extern/libmv/third_party/ceres/CMakeLists.txt
+++ b/extern/libmv/third_party/ceres/CMakeLists.txt
+@@ -35,7 +35,7 @@ set(INC
+ )
+ 
+ set(INC_SYS
+-	../../../Eigen3
+	${_PC_EIGEN3_INCLUDE_DIRS}
+ )
+ 
+ set(SRC
+diff --git a/intern/dualcon/CMakeLists.txt b/intern/dualcon/CMakeLists.txt
+index da5e10f..a4aae1b 100644
+--- a/intern/dualcon/CMakeLists.txt
+++ b/intern/dualcon/CMakeLists.txt
+@@ -22,7 +22,7 @@ set(INC
+ )
+ 
+ set(INC_SYS
+-	../../extern/Eigen3
+	${_PC_EIGEN3_INCLUDE_DIRS}
+ )
+ 
+ set(SRC
+diff --git a/intern/itasc/CMakeLists.txt b/intern/itasc/CMakeLists.txt
+index bc3ea0c..f5dec1a 100644
+--- a/intern/itasc/CMakeLists.txt
+++ b/intern/itasc/CMakeLists.txt
+@@ -28,7 +28,7 @@ set(INC
+ )
+ 
+ set(INC_SYS
+-	../../extern/Eigen3
+	${_PC_EIGEN3_INCLUDE_DIRS}
+ )
+ 
+ set(SRC
+@@ -121,235 +121,235 @@ set(SRC
+ 	kdl/framevel.inl
+ 
+ 	# until we have another user...
+-	../../extern/Eigen3/Eigen/src/Cholesky/LDLT.h
+-	../../extern/Eigen3/Eigen/src/Cholesky/LLT.h
+-	../../extern/Eigen3/Eigen/src/Cholesky/LLT_MKL.h
+-	../../extern/Eigen3/Eigen/src/CholmodSupport/CholmodSupport.h
+-	../../extern/Eigen3/Eigen/src/Core/Array.h
+-	../../extern/Eigen3/Eigen/src/Core/ArrayBase.h
+-	../../extern/Eigen3/Eigen/src/Core/ArrayWrapper.h
+-	../../extern/Eigen3/Eigen/src/Core/Assign.h
+-	../../extern/Eigen3/Eigen/src/Core/Assign_MKL.h
+-	../../extern/Eigen3/Eigen/src/Core/BandMatrix.h
+-	../../extern/Eigen3/Eigen/src/Core/Block.h
+-	../../extern/Eigen3/Eigen/src/Core/BooleanRedux.h
+-	../../extern/Eigen3/Eigen/src/Core/CommaInitializer.h
+-	../../extern/Eigen3/Eigen/src/Core/CwiseBinaryOp.h
+-	../../extern/Eigen3/Eigen/src/Core/CwiseNullaryOp.h
+-	../../extern/Eigen3/Eigen/src/Core/CwiseUnaryOp.h
+-	../../extern/Eigen3/Eigen/src/Core/CwiseUnaryView.h
+-	../../extern/Eigen3/Eigen/src/Core/DenseBase.h
+-	../../extern/Eigen3/Eigen/src/Core/DenseCoeffsBase.h
+-	../../extern/Eigen3/Eigen/src/Core/DenseStorage.h
+-	../../extern/Eigen3/Eigen/src/Core/Diagonal.h
+-	../../extern/Eigen3/Eigen/src/Core/DiagonalMatrix.h
+-	../../extern/Eigen3/Eigen/src/Core/DiagonalProduct.h
+-	../../extern/Eigen3/Eigen/src/Core/Dot.h
+-	../../extern/Eigen3/Eigen/src/Core/EigenBase.h
+-	../../extern/Eigen3/Eigen/src/Core/Flagged.h
+-	../../extern/Eigen3/Eigen/src/Core/ForceAlignedAccess.h
+-	../../extern/Eigen3/Eigen/src/Core/Functors.h
+-	../../extern/Eigen3/Eigen/src/Core/Fuzzy.h
+-	../../extern/Eigen3/Eigen/src/Core/GeneralProduct.h
+-	../../extern/Eigen3/Eigen/src/Core/GenericPacketMath.h
+-	../../extern/Eigen3/Eigen/src/Core/GlobalFunctions.h
+-	../../extern/Eigen3/Eigen/src/Core/IO.h
+-	../../extern/Eigen3/Eigen/src/Core/Map.h
+-	../../extern/Eigen3/Eigen/src/Core/MapBase.h
+-	../../extern/Eigen3/Eigen/src/Core/MathFunctions.h
+-	../../extern/Eigen3/Eigen/src/Core/Matrix.h
+-	../../extern/Eigen3/Eigen/src/Core/MatrixBase.h
+-	../../extern/Eigen3/Eigen/src/Core/NestByValue.h
+-	../../extern/Eigen3/Eigen/src/Core/NoAlias.h
+-	../../extern/Eigen3/Eigen/src/Core/NumTraits.h
+-	../../extern/Eigen3/Eigen/src/Core/PermutationMatrix.h
+-	../../extern/Eigen3/Eigen/src/Core/PlainObjectBase.h
+-	../../extern/Eigen3/Eigen/src/Core/Product.h
+-	../../extern/Eigen3/Eigen/src/Core/ProductBase.h
+-	../../extern/Eigen3/Eigen/src/Core/Random.h
+-	../../extern/Eigen3/Eigen/src/Core/Redux.h
+-	../../extern/Eigen3/Eigen/src/Core/Replicate.h
+-	../../extern/Eigen3/Eigen/src/Core/ReturnByValue.h
+-	../../extern/Eigen3/Eigen/src/Core/Reverse.h
+-	../../extern/Eigen3/Eigen/src/Core/Select.h
+-	../../extern/Eigen3/Eigen/src/Core/SelfAdjointView.h
+-	../../extern/Eigen3/Eigen/src/Core/SelfCwiseBinaryOp.h
+-	../../extern/Eigen3/Eigen/src/Core/SolveTriangular.h
+-	../../extern/Eigen3/Eigen/src/Core/StableNorm.h
+-	../../extern/Eigen3/Eigen/src/Core/Stride.h
+-	../../extern/Eigen3/Eigen/src/Core/Swap.h
+-	../../extern/Eigen3/Eigen/src/Core/Transpose.h
+-	../../extern/Eigen3/Eigen/src/Core/Transpositions.h
+-	../../extern/Eigen3/Eigen/src/Core/TriangularMatrix.h
+-	../../extern/Eigen3/Eigen/src/Core/VectorBlock.h
+-	../../extern/Eigen3/Eigen/src/Core/VectorwiseOp.h
+-	../../extern/Eigen3/Eigen/src/Core/Visitor.h
+-	../../extern/Eigen3/Eigen/src/Core/arch/AltiVec/Complex.h
+-	../../extern/Eigen3/Eigen/src/Core/arch/AltiVec/PacketMath.h
+-	../../extern/Eigen3/Eigen/src/Core/arch/Default/Settings.h
+-	../../extern/Eigen3/Eigen/src/Core/arch/NEON/Complex.h
+-	../../extern/Eigen3/Eigen/src/Core/arch/NEON/PacketMath.h
+-	../../extern/Eigen3/Eigen/src/Core/arch/SSE/Complex.h
+-	../../extern/Eigen3/Eigen/src/Core/arch/SSE/MathFunctions.h
+-	../../extern/Eigen3/Eigen/src/Core/arch/SSE/PacketMath.h
+-	../../extern/Eigen3/Eigen/src/Core/products/CoeffBasedProduct.h
+-	../../extern/Eigen3/Eigen/src/Core/products/GeneralBlockPanelKernel.h
+-	../../extern/Eigen3/Eigen/src/Core/products/GeneralMatrixMatrix.h
+-	../../extern/Eigen3/Eigen/src/Core/products/GeneralMatrixMatrixTriangular.h
+-	../../extern/Eigen3/Eigen/src/Core/products/GeneralMatrixMatrixTriangular_MKL.h
+-	../../extern/Eigen3/Eigen/src/Core/products/GeneralMatrixMatrix_MKL.h
+-	../../extern/Eigen3/Eigen/src/Core/products/GeneralMatrixVector.h
+-	../../extern/Eigen3/Eigen/src/Core/products/GeneralMatrixVector_MKL.h
+-	../../extern/Eigen3/Eigen/src/Core/products/Parallelizer.h
+-	../../extern/Eigen3/Eigen/src/Core/products/SelfadjointMatrixMatrix.h
+-	../../extern/Eigen3/Eigen/src/Core/products/SelfadjointMatrixMatrix_MKL.h
+-	../../extern/Eigen3/Eigen/src/Core/products/SelfadjointMatrixVector.h
+-	../../extern/Eigen3/Eigen/src/Core/products/SelfadjointMatrixVector_MKL.h
+-	../../extern/Eigen3/Eigen/src/Core/products/SelfadjointProduct.h
+-	../../extern/Eigen3/Eigen/src/Core/products/SelfadjointRank2Update.h
+-	../../extern/Eigen3/Eigen/src/Core/products/TriangularMatrixMatrix.h
+-	../../extern/Eigen3/Eigen/src/Core/products/TriangularMatrixMatrix_MKL.h
+-	../../extern/Eigen3/Eigen/src/Core/products/TriangularMatrixVector.h
+-	../../extern/Eigen3/Eigen/src/Core/products/TriangularMatrixVector_MKL.h
+-	../../extern/Eigen3/Eigen/src/Core/products/TriangularSolverMatrix.h
+-	../../extern/Eigen3/Eigen/src/Core/products/TriangularSolverMatrix_MKL.h
+-	../../extern/Eigen3/Eigen/src/Core/products/TriangularSolverVector.h
+-	../../extern/Eigen3/Eigen/src/Core/util/BlasUtil.h
+-	../../extern/Eigen3/Eigen/src/Core/util/Constants.h
+-	../../extern/Eigen3/Eigen/src/Core/util/DisableStupidWarnings.h
+-	../../extern/Eigen3/Eigen/src/Core/util/ForwardDeclarations.h
+-	../../extern/Eigen3/Eigen/src/Core/util/Macros.h
+-	../../extern/Eigen3/Eigen/src/Core/util/Memory.h
+-	../../extern/Eigen3/Eigen/src/Core/util/Meta.h
+-	../../extern/Eigen3/Eigen/src/Core/util/MKL_support.h
+-	../../extern/Eigen3/Eigen/src/Core/util/NonMPL2.h
+-	../../extern/Eigen3/Eigen/src/Core/util/ReenableStupidWarnings.h
+-	../../extern/Eigen3/Eigen/src/Core/util/StaticAssert.h
+-	../../extern/Eigen3/Eigen/src/Core/util/XprHelper.h
+-	../../extern/Eigen3/Eigen/src/Eigen2Support/Block.h
+-	../../extern/Eigen3/Eigen/src/Eigen2Support/Cwise.h
+-	../../extern/Eigen3/Eigen/src/Eigen2Support/CwiseOperators.h
+-	../../extern/Eigen3/Eigen/src/Eigen2Support/Lazy.h
+-	../../extern/Eigen3/Eigen/src/Eigen2Support/LeastSquares.h
+-	../../extern/Eigen3/Eigen/src/Eigen2Support/LU.h
+-	../../extern/Eigen3/Eigen/src/Eigen2Support/Macros.h
+-	../../extern/Eigen3/Eigen/src/Eigen2Support/MathFunctions.h
+-	../../extern/Eigen3/Eigen/src/Eigen2Support/Memory.h
+-	../../extern/Eigen3/Eigen/src/Eigen2Support/Meta.h
+-	../../extern/Eigen3/Eigen/src/Eigen2Support/Minor.h
+-	../../extern/Eigen3/Eigen/src/Eigen2Support/QR.h
+-	../../extern/Eigen3/Eigen/src/Eigen2Support/SVD.h
+-	../../extern/Eigen3/Eigen/src/Eigen2Support/TriangularSolver.h
+-	../../extern/Eigen3/Eigen/src/Eigen2Support/VectorBlock.h
+-	../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/AlignedBox.h
+-	../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/All.h
+-	../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/AngleAxis.h
+-	../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/Hyperplane.h
+-	../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/ParametrizedLine.h
+-	../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/Quaternion.h
+-	../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/Rotation2D.h
+-	../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/RotationBase.h
+-	../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/Scaling.h
+-	../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/Transform.h
+-	../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/Translation.h
+-	../../extern/Eigen3/Eigen/src/Eigenvalues/ComplexEigenSolver.h
+-	../../extern/Eigen3/Eigen/src/Eigenvalues/ComplexSchur.h
+-	../../extern/Eigen3/Eigen/src/Eigenvalues/ComplexSchur_MKL.h
+-	../../extern/Eigen3/Eigen/src/Eigenvalues/EigenSolver.h
+-	../../extern/Eigen3/Eigen/src/Eigenvalues/GeneralizedSelfAdjointEigenSolver.h
+-	../../extern/Eigen3/Eigen/src/Eigenvalues/HessenbergDecomposition.h
+-	../../extern/Eigen3/Eigen/src/Eigenvalues/MatrixBaseEigenvalues.h
+-	../../extern/Eigen3/Eigen/src/Eigenvalues/RealSchur.h
+-	../../extern/Eigen3/Eigen/src/Eigenvalues/RealSchur_MKL.h
+-	../../extern/Eigen3/Eigen/src/Eigenvalues/SelfAdjointEigenSolver.h
+-	../../extern/Eigen3/Eigen/src/Eigenvalues/SelfAdjointEigenSolver_MKL.h
+-	../../extern/Eigen3/Eigen/src/Eigenvalues/Tridiagonalization.h
+-	../../extern/Eigen3/Eigen/src/Geometry/AlignedBox.h
+-	../../extern/Eigen3/Eigen/src/Geometry/AngleAxis.h
+-	../../extern/Eigen3/Eigen/src/Geometry/EulerAngles.h
+-	../../extern/Eigen3/Eigen/src/Geometry/Homogeneous.h
+-	../../extern/Eigen3/Eigen/src/Geometry/Hyperplane.h
+-	../../extern/Eigen3/Eigen/src/Geometry/OrthoMethods.h
+-	../../extern/Eigen3/Eigen/src/Geometry/ParametrizedLine.h
+-	../../extern/Eigen3/Eigen/src/Geometry/Quaternion.h
+-	../../extern/Eigen3/Eigen/src/Geometry/Rotation2D.h
+-	../../extern/Eigen3/Eigen/src/Geometry/RotationBase.h
+-	../../extern/Eigen3/Eigen/src/Geometry/Scaling.h
+-	../../extern/Eigen3/Eigen/src/Geometry/Transform.h
+-	../../extern/Eigen3/Eigen/src/Geometry/Translation.h
+-	../../extern/Eigen3/Eigen/src/Geometry/Umeyama.h
+-	../../extern/Eigen3/Eigen/src/Geometry/arch/Geometry_SSE.h
+-	../../extern/Eigen3/Eigen/src/Householder/BlockHouseholder.h
+-	../../extern/Eigen3/Eigen/src/Householder/Householder.h
+-	../../extern/Eigen3/Eigen/src/Householder/HouseholderSequence.h
+-	../../extern/Eigen3/Eigen/src/IterativeLinearSolvers/BasicPreconditioners.h
+-	../../extern/Eigen3/Eigen/src/IterativeLinearSolvers/BiCGSTAB.h
+-	../../extern/Eigen3/Eigen/src/IterativeLinearSolvers/ConjugateGradient.h
+-	../../extern/Eigen3/Eigen/src/IterativeLinearSolvers/IncompleteLUT.h
+-	../../extern/Eigen3/Eigen/src/IterativeLinearSolvers/IterativeSolverBase.h
+-	../../extern/Eigen3/Eigen/src/Jacobi/Jacobi.h
+-	../../extern/Eigen3/Eigen/src/LU/Determinant.h
+-	../../extern/Eigen3/Eigen/src/LU/FullPivLU.h
+-	../../extern/Eigen3/Eigen/src/LU/Inverse.h
+-	../../extern/Eigen3/Eigen/src/LU/PartialPivLU.h
+-	../../extern/Eigen3/Eigen/src/LU/PartialPivLU_MKL.h
+-	../../extern/Eigen3/Eigen/src/LU/arch/Inverse_SSE.h
+-	../../extern/Eigen3/Eigen/src/misc/blas.h
+-	../../extern/Eigen3/Eigen/src/misc/Image.h
+-	../../extern/Eigen3/Eigen/src/misc/Kernel.h
+-	../../extern/Eigen3/Eigen/src/misc/Solve.h
+-	../../extern/Eigen3/Eigen/src/misc/SparseSolve.h
+-	../../extern/Eigen3/Eigen/src/OrderingMethods/Amd.h
+-	../../extern/Eigen3/Eigen/src/PardisoSupport/PardisoSupport.h
+-	../../extern/Eigen3/Eigen/src/PaStiXSupport/PaStiXSupport.h
+-	../../extern/Eigen3/Eigen/src/plugins/ArrayCwiseBinaryOps.h
+-	../../extern/Eigen3/Eigen/src/plugins/ArrayCwiseUnaryOps.h
+-	../../extern/Eigen3/Eigen/src/plugins/BlockMethods.h
+-	../../extern/Eigen3/Eigen/src/plugins/CommonCwiseBinaryOps.h
+-	../../extern/Eigen3/Eigen/src/plugins/CommonCwiseUnaryOps.h
+-	../../extern/Eigen3/Eigen/src/plugins/MatrixCwiseBinaryOps.h
+-	../../extern/Eigen3/Eigen/src/plugins/MatrixCwiseUnaryOps.h
+-	../../extern/Eigen3/Eigen/src/QR/ColPivHouseholderQR.h
+-	../../extern/Eigen3/Eigen/src/QR/ColPivHouseholderQR_MKL.h
+-	../../extern/Eigen3/Eigen/src/QR/FullPivHouseholderQR.h
+-	../../extern/Eigen3/Eigen/src/QR/HouseholderQR.h
+-	../../extern/Eigen3/Eigen/src/QR/HouseholderQR_MKL.h
+-	../../extern/Eigen3/Eigen/src/SparseCholesky/SimplicialCholesky.h
+-	../../extern/Eigen3/Eigen/src/SparseCore/AmbiVector.h
+-	../../extern/Eigen3/Eigen/src/SparseCore/CompressedStorage.h
+-	../../extern/Eigen3/Eigen/src/SparseCore/ConservativeSparseSparseProduct.h
+-	../../extern/Eigen3/Eigen/src/SparseCore/CoreIterators.h
+-	../../extern/Eigen3/Eigen/src/SparseCore/MappedSparseMatrix.h
+-	../../extern/Eigen3/Eigen/src/SparseCore/SparseAssign.h
+-	../../extern/Eigen3/Eigen/src/SparseCore/SparseBlock.h
+-	../../extern/Eigen3/Eigen/src/SparseCore/SparseCwiseBinaryOp.h
+-	../../extern/Eigen3/Eigen/src/SparseCore/SparseCwiseUnaryOp.h
+-	../../extern/Eigen3/Eigen/src/SparseCore/SparseDenseProduct.h
+-	../../extern/Eigen3/Eigen/src/SparseCore/SparseDiagonalProduct.h
+-	../../extern/Eigen3/Eigen/src/SparseCore/SparseDot.h
+-	../../extern/Eigen3/Eigen/src/SparseCore/SparseFuzzy.h
+-	../../extern/Eigen3/Eigen/src/SparseCore/SparseMatrix.h
+-	../../extern/Eigen3/Eigen/src/SparseCore/SparseMatrixBase.h
+-	../../extern/Eigen3/Eigen/src/SparseCore/SparsePermutation.h
+-	../../extern/Eigen3/Eigen/src/SparseCore/SparseProduct.h
+-	../../extern/Eigen3/Eigen/src/SparseCore/SparseRedux.h
+-	../../extern/Eigen3/Eigen/src/SparseCore/SparseSelfAdjointView.h
+-	../../extern/Eigen3/Eigen/src/SparseCore/SparseSparseProductWithPruning.h
+-	../../extern/Eigen3/Eigen/src/SparseCore/SparseTranspose.h
+-	../../extern/Eigen3/Eigen/src/SparseCore/SparseTriangularView.h
+-	../../extern/Eigen3/Eigen/src/SparseCore/SparseUtil.h
+-	../../extern/Eigen3/Eigen/src/SparseCore/SparseVector.h
+-	../../extern/Eigen3/Eigen/src/SparseCore/SparseView.h
+-	../../extern/Eigen3/Eigen/src/SparseCore/TriangularSolver.h
+-	../../extern/Eigen3/Eigen/src/StlSupport/details.h
+-	../../extern/Eigen3/Eigen/src/StlSupport/StdDeque.h
+-	../../extern/Eigen3/Eigen/src/StlSupport/StdList.h
+-	../../extern/Eigen3/Eigen/src/StlSupport/StdVector.h
+-	../../extern/Eigen3/Eigen/src/SuperLUSupport/SuperLUSupport.h
+-	../../extern/Eigen3/Eigen/src/SVD/JacobiSVD.h
+-	../../extern/Eigen3/Eigen/src/SVD/JacobiSVD_MKL.h
+-	../../extern/Eigen3/Eigen/src/SVD/UpperBidiagonalization.h
+-	../../extern/Eigen3/Eigen/src/UmfPackSupport/UmfPackSupport.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Cholesky/LDLT.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Cholesky/LLT.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Cholesky/LLT_MKL.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/CholmodSupport/CholmodSupport.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/Array.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/ArrayBase.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/ArrayWrapper.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/Assign.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/Assign_MKL.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/BandMatrix.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/Block.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/BooleanRedux.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/CommaInitializer.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/CwiseBinaryOp.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/CwiseNullaryOp.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/CwiseUnaryOp.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/CwiseUnaryView.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/DenseBase.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/DenseCoeffsBase.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/DenseStorage.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/Diagonal.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/DiagonalMatrix.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/DiagonalProduct.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/Dot.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/EigenBase.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/Flagged.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/ForceAlignedAccess.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/Functors.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/Fuzzy.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/GeneralProduct.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/GenericPacketMath.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/GlobalFunctions.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/IO.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/Map.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/MapBase.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/MathFunctions.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/Matrix.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/MatrixBase.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/NestByValue.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/NoAlias.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/NumTraits.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/PermutationMatrix.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/PlainObjectBase.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/Product.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/ProductBase.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/Random.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/Redux.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/Replicate.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/ReturnByValue.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/Reverse.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/Select.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/SelfAdjointView.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/SelfCwiseBinaryOp.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/SolveTriangular.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/StableNorm.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/Stride.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/Swap.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/Transpose.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/Transpositions.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/TriangularMatrix.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/VectorBlock.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/VectorwiseOp.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/Visitor.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/arch/AltiVec/Complex.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/arch/AltiVec/PacketMath.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/arch/Default/Settings.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/arch/NEON/Complex.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/arch/NEON/PacketMath.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/arch/SSE/Complex.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/arch/SSE/MathFunctions.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/arch/SSE/PacketMath.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/products/CoeffBasedProduct.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/products/GeneralBlockPanelKernel.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/products/GeneralMatrixMatrix.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/products/GeneralMatrixMatrixTriangular.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/products/GeneralMatrixMatrixTriangular_MKL.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/products/GeneralMatrixMatrix_MKL.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/products/GeneralMatrixVector.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/products/GeneralMatrixVector_MKL.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/products/Parallelizer.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/products/SelfadjointMatrixMatrix.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/products/SelfadjointMatrixMatrix_MKL.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/products/SelfadjointMatrixVector.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/products/SelfadjointMatrixVector_MKL.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/products/SelfadjointProduct.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/products/SelfadjointRank2Update.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/products/TriangularMatrixMatrix.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/products/TriangularMatrixMatrix_MKL.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/products/TriangularMatrixVector.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/products/TriangularMatrixVector_MKL.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/products/TriangularSolverMatrix.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/products/TriangularSolverMatrix_MKL.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/products/TriangularSolverVector.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/util/BlasUtil.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/util/Constants.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/util/DisableStupidWarnings.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/util/ForwardDeclarations.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/util/Macros.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/util/Memory.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/util/Meta.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/util/MKL_support.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/util/NonMPL2.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/util/ReenableStupidWarnings.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/util/StaticAssert.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/util/XprHelper.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Eigen2Support/Block.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Eigen2Support/Cwise.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Eigen2Support/CwiseOperators.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Eigen2Support/Lazy.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Eigen2Support/LeastSquares.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Eigen2Support/LU.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Eigen2Support/Macros.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Eigen2Support/MathFunctions.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Eigen2Support/Memory.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Eigen2Support/Meta.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Eigen2Support/Minor.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Eigen2Support/QR.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Eigen2Support/SVD.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Eigen2Support/TriangularSolver.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Eigen2Support/VectorBlock.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Eigen2Support/Geometry/AlignedBox.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Eigen2Support/Geometry/All.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Eigen2Support/Geometry/AngleAxis.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Eigen2Support/Geometry/Hyperplane.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Eigen2Support/Geometry/ParametrizedLine.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Eigen2Support/Geometry/Quaternion.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Eigen2Support/Geometry/Rotation2D.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Eigen2Support/Geometry/RotationBase.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Eigen2Support/Geometry/Scaling.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Eigen2Support/Geometry/Transform.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Eigen2Support/Geometry/Translation.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Eigenvalues/ComplexEigenSolver.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Eigenvalues/ComplexSchur.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Eigenvalues/ComplexSchur_MKL.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Eigenvalues/EigenSolver.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Eigenvalues/GeneralizedSelfAdjointEigenSolver.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Eigenvalues/HessenbergDecomposition.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Eigenvalues/MatrixBaseEigenvalues.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Eigenvalues/RealSchur.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Eigenvalues/RealSchur_MKL.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Eigenvalues/SelfAdjointEigenSolver.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Eigenvalues/SelfAdjointEigenSolver_MKL.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Eigenvalues/Tridiagonalization.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Geometry/AlignedBox.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Geometry/AngleAxis.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Geometry/EulerAngles.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Geometry/Homogeneous.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Geometry/Hyperplane.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Geometry/OrthoMethods.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Geometry/ParametrizedLine.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Geometry/Quaternion.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Geometry/Rotation2D.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Geometry/RotationBase.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Geometry/Scaling.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Geometry/Transform.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Geometry/Translation.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Geometry/Umeyama.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Geometry/arch/Geometry_SSE.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Householder/BlockHouseholder.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Householder/Householder.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Householder/HouseholderSequence.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/IterativeLinearSolvers/BasicPreconditioners.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/IterativeLinearSolvers/BiCGSTAB.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/IterativeLinearSolvers/ConjugateGradient.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/IterativeLinearSolvers/IncompleteLUT.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/IterativeLinearSolvers/IterativeSolverBase.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Jacobi/Jacobi.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/LU/Determinant.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/LU/FullPivLU.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/LU/Inverse.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/LU/PartialPivLU.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/LU/PartialPivLU_MKL.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/LU/arch/Inverse_SSE.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/misc/blas.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/misc/Image.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/misc/Kernel.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/misc/Solve.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/misc/SparseSolve.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/OrderingMethods/Amd.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/PardisoSupport/PardisoSupport.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/PaStiXSupport/PaStiXSupport.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/plugins/ArrayCwiseBinaryOps.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/plugins/ArrayCwiseUnaryOps.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/plugins/BlockMethods.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/plugins/CommonCwiseBinaryOps.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/plugins/CommonCwiseUnaryOps.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/plugins/MatrixCwiseBinaryOps.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/plugins/MatrixCwiseUnaryOps.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/QR/ColPivHouseholderQR.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/QR/ColPivHouseholderQR_MKL.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/QR/FullPivHouseholderQR.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/QR/HouseholderQR.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/QR/HouseholderQR_MKL.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/SparseCholesky/SimplicialCholesky.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/SparseCore/AmbiVector.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/SparseCore/CompressedStorage.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/SparseCore/ConservativeSparseSparseProduct.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/SparseCore/CoreIterators.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/SparseCore/MappedSparseMatrix.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/SparseCore/SparseAssign.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/SparseCore/SparseBlock.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/SparseCore/SparseCwiseBinaryOp.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/SparseCore/SparseCwiseUnaryOp.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/SparseCore/SparseDenseProduct.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/SparseCore/SparseDiagonalProduct.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/SparseCore/SparseDot.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/SparseCore/SparseFuzzy.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/SparseCore/SparseMatrix.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/SparseCore/SparseMatrixBase.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/SparseCore/SparsePermutation.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/SparseCore/SparseProduct.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/SparseCore/SparseRedux.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/SparseCore/SparseSelfAdjointView.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/SparseCore/SparseSparseProductWithPruning.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/SparseCore/SparseTranspose.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/SparseCore/SparseTriangularView.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/SparseCore/SparseUtil.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/SparseCore/SparseVector.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/SparseCore/SparseView.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/SparseCore/TriangularSolver.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/StlSupport/details.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/StlSupport/StdDeque.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/StlSupport/StdList.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/StlSupport/StdVector.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/SuperLUSupport/SuperLUSupport.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/SVD/JacobiSVD.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/SVD/JacobiSVD_MKL.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/SVD/UpperBidiagonalization.h
+	${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/UmfPackSupport/UmfPackSupport.h
+ )
+ 
+ 
+diff --git a/source/blender/ikplugin/CMakeLists.txt b/source/blender/ikplugin/CMakeLists.txt
+index 0a0e0e6..45fe6c9 100644
+--- a/source/blender/ikplugin/CMakeLists.txt
+++ b/source/blender/ikplugin/CMakeLists.txt
+@@ -59,7 +59,7 @@ if(WITH_IK_ITASC)
+ 		../../../intern/itasc
+ 	)
+ 	list(APPEND INC_SYS
+-		../../../extern/Eigen3
+		${_PC_EIGEN3_INCLUDE_DIRS}
+ 	)
+ 	list(APPEND SRC
+ 		intern/itasc_plugin.cpp
+diff --git a/source/gameengine/Converter/CMakeLists.txt b/source/gameengine/Converter/CMakeLists.txt
+index f18646c..b649328 100644
+--- a/source/gameengine/Converter/CMakeLists.txt
+++ b/source/gameengine/Converter/CMakeLists.txt
+@@ -57,7 +57,7 @@ set(INC
+ 
+ set(INC_SYS
+ 	../../../extern/recastnavigation/Detour/Include
+-	../../../extern/Eigen3
+	${_PC_EIGEN3_INCLUDE_DIRS}
+ 	${PTHREADS_INCLUDE_DIRS}
+ 	${BOOST_INCLUDE_DIR}
+ )
--- a/media-gfx/blender/files/blender-2.67b-unbundle-glog.patch
+++ b/media-gfx/blender/files/blender-2.67b-unbundle-glog.patch
@ -0,0 +1,104 @@
+commit 30edd34cfb066e8e238c95634c6bc92322e84475
+Author: hasufell <julian.ospald@googlemail.com>
+Date:   Thu Jun 20 21:00:49 2013 +0200
+
+    unbundle glog/gflags
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 40bf4d8..973bdcc 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -106,6 +106,14 @@ set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin CACHE INTERNAL "" FORCE)
+ set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib CACHE INTERNAL "" FORCE)
+ 
+ #-----------------------------------------------------------------------------
+# Check for some modules
+if(UNIX)
+  find_package(PkgConfig)
+  pkg_check_modules(_PC_GFLAGS libgflags)
+  pkg_check_modules(_PC_GLOG libglog)
+endif()
+
+#-----------------------------------------------------------------------------
+ # Set default config options
+ 
+ get_blender_version()
+diff --git a/extern/libmv/CMakeLists.txt b/extern/libmv/CMakeLists.txt
+index 025481f..5a0e8aa 100644
+--- a/extern/libmv/CMakeLists.txt
+++ b/extern/libmv/CMakeLists.txt
+@@ -76,9 +76,6 @@ set(SRC
+ 	third_party/fast/fast_9.c
+ 	third_party/fast/fast.c
+ 	third_party/fast/nonmax.c
+-	third_party/gflags/gflags.cc
+-	third_party/gflags/gflags_completions.cc
+-	third_party/gflags/gflags_reporting.cc
+ 
+ 	libmv-capi.h
+ 	libmv/base/id_generator.h
+@@ -129,13 +126,6 @@ set(SRC
+ 	libmv/tracking/track_region.h
+ 	libmv/tracking/trklt_region_tracker.h
+ 
+-	third_party/fast/fast.h
+-	third_party/gflags/config.h
+-	third_party/gflags/gflags/gflags_completions.h
+-	third_party/gflags/gflags/gflags_declare.h
+-	third_party/gflags/gflags/gflags.h
+-	third_party/gflags/mutex.h
+-	third_party/gflags/util.h
+ 	third_party/msinttypes/inttypes.h
+ 	third_party/msinttypes/stdint.h
+ )
+@@ -176,48 +166,14 @@ if(WIN32)
+ 			third_party/msinttypes
+ 		)
+ 	endif()
+-else()
+-	list(APPEND SRC
+-		third_party/glog/src/demangle.cc
+-		third_party/glog/src/logging.cc
+-		third_party/glog/src/raw_logging.cc
+-		third_party/glog/src/signalhandler.cc
+-		third_party/glog/src/symbolize.cc
+-		third_party/glog/src/utilities.cc
+-		third_party/glog/src/vlog_is_on.cc
+-
+-		third_party/glog/src/base/commandlineflags.h
+-		third_party/glog/src/base/googleinit.h
+-		third_party/glog/src/base/mutex.h
+-		third_party/glog/src/config_freebsd.h
+-		third_party/glog/src/config.h
+-		third_party/glog/src/config_hurd.h
+-		third_party/glog/src/config_linux.h
+-		third_party/glog/src/config_mac.h
+-		third_party/glog/src/demangle.h
+-		third_party/glog/src/glog/logging.h
+-		third_party/glog/src/glog/log_severity.h
+-		third_party/glog/src/glog/raw_logging.h
+-		third_party/glog/src/glog/vlog_is_on.h
+-		third_party/glog/src/stacktrace_generic-inl.h
+-		third_party/glog/src/stacktrace.h
+-		third_party/glog/src/stacktrace_libunwind-inl.h
+-		third_party/glog/src/stacktrace_powerpc-inl.h
+-		third_party/glog/src/stacktrace_x86_64-inl.h
+-		third_party/glog/src/stacktrace_x86-inl.h
+-		third_party/glog/src/symbolize.h
+-		third_party/glog/src/utilities.h
+-	)
+-
+-	list(APPEND INC
+-		third_party/glog/src
+-	)
+ endif()
+ 
+ add_definitions(
+ 	-DGOOGLE_GLOG_DLL_DECL=
+ )
+ 
+include_directories(${_PC_GFLAGS_INCLUDE_DIRS} ${_PC_GLOG_INCLUDE_DIRS})
+ blender_add_lib(extern_libmv "${SRC}" "${INC}" "${INC_SYS}")
+target_link_libraries(extern_libmv ${_PC_GFLAGS_LIBRARIES} ${_PC_GLOG_LIBRARIES})
+ 
+ add_subdirectory(third_party)
--- a/media-gfx/blender/metadata.xml
+++ b/media-gfx/blender/metadata.xml
@ -3,6 +3,11 @@
 <pkgmetadata>
  <herd>graphics</herd>

+  <maintainer>
+    <email>hasufell@gentoo.org</email>
+    <name>Julian Ospald</name>
+  </maintainer>
+
  <maintainer>
    <email>lu_zero@gentoo.org</email>
    <name>Luca Barbato</name>
--- a/media-gfx/rawstudio/files/rawstudio-2.0-icon.patch
+++ b/media-gfx/rawstudio/files/rawstudio-2.0-icon.patch
@ -0,0 +1,68 @@
+$(datadir)/icons/ is reserved for freedesktop.org specification compatible themes with index.theme file,
+use $(datadir)/pixmaps/ instead
+
+http://bugs.gentoo.org/389397
+
+--- pixmaps/Makefile.am
+++ pixmaps/Makefile.am
+@@ -1,6 +1,3 @@
+-icondir = $(datadir)/icons
+-icon_DATA = rawstudio.png
+-
+ rawstudiodir = $(datadir)/pixmaps/rawstudio
+ rawstudio_DATA = 	overlay_deleted.png \
+ 		overlay_priority1.png \
+@@ -18,7 +15,8 @@ rawstudio_DATA = 	overlay_deleted.png \
+ 		cursor-rotate.png \
+ 		tool-color-picker.png \
+ 		tool-crop.png \
+-		tool-rotate.png
+		tool-rotate.png \
+		rawstudio.png
+ 
+ 
+-EXTRA_DIST = $(icon_DATA) $(rawstudio_DATA) artwork.license
+EXTRA_DIST = $(rawstudio_DATA) artwork.license
+--- src/gtk-interface.c
+++ src/gtk-interface.c
+@@ -1393,7 +1393,7 @@ gui_init(int argc, char **argv, RS_BLOB *rs)
+ 	GtkWidget *valuefield[3];
+ 
+ 	
+-	gtk_window_set_default_icon_from_file(PACKAGE_DATA_DIR G_DIR_SEPARATOR_S "icons" G_DIR_SEPARATOR_S PACKAGE ".png", NULL);
+	gtk_window_set_default_icon_from_file(PACKAGE_DATA_DIR G_DIR_SEPARATOR_S "pixmaps" G_DIR_SEPARATOR_S PACKAGE G_DIR_SEPARATOR_S PACKAGE ".png", NULL);
+ 	rs->window = gui_window_make(rs);
+ 	gtk_widget_show(rs->window);
+ 
+--- src/rs-store.c
+++ src/rs-store.c
+@@ -1174,7 +1174,7 @@ rs_store_load_file(RSStore *store, gchar *fullname)
+ 
+ 	/* Global default icon */
+ 	if (!icon_default)
+-		icon_default = gdk_pixbuf_new_from_file(PACKAGE_DATA_DIR G_DIR_SEPARATOR_S "icons" G_DIR_SEPARATOR_S PACKAGE ".png", NULL);
+		icon_default = gdk_pixbuf_new_from_file(PACKAGE_DATA_DIR G_DIR_SEPARATOR_S "pixmaps" G_DIR_SEPARATOR_S PACKAGE G_DIR_SEPARATOR_S PACKAGE ".png", NULL);
+ 
+ 	/* Add file to store */
+ 	gdk_threads_enter();
+--- librawstudio/rs-utils.c
+++ librawstudio/rs-utils.c
+@@ -603,7 +603,7 @@ void
+ check_install(void)
+ {
+ #define TEST_FILE_ACCESS(path) do { if (g_access(path, R_OK)!=0) g_debug("Cannot access %s\n", path);} while (0)
+-	TEST_FILE_ACCESS(PACKAGE_DATA_DIR G_DIR_SEPARATOR_S "icons" G_DIR_SEPARATOR_S PACKAGE ".png");
+	TEST_FILE_ACCESS(PACKAGE_DATA_DIR G_DIR_SEPARATOR_S "pixmaps" G_DIR_SEPARATOR_S PACKAGE G_DIR_SEPARATOR_S PACKAGE ".png");
+ 	TEST_FILE_ACCESS(PACKAGE_DATA_DIR G_DIR_SEPARATOR_S "pixmaps" G_DIR_SEPARATOR_S PACKAGE G_DIR_SEPARATOR_S "overlay_priority1.png");
+ 	TEST_FILE_ACCESS(PACKAGE_DATA_DIR G_DIR_SEPARATOR_S "pixmaps" G_DIR_SEPARATOR_S PACKAGE G_DIR_SEPARATOR_S "overlay_priority2.png");
+ 	TEST_FILE_ACCESS(PACKAGE_DATA_DIR G_DIR_SEPARATOR_S "pixmaps" G_DIR_SEPARATOR_S PACKAGE G_DIR_SEPARATOR_S "overlay_priority3.png");
+--- rawstudio.desktop
+++ rawstudio.desktop
+@@ -25,6 +25,5 @@
+ Comment[sv]=Läs, bearbeta och konvertera råbilder från digitalkameror
+ Exec=rawstudio %F
+ StartupNotify=true
+-Icon=rawstudio
+Icon=/usr/share/pixmaps/rawstudio/rawstudio.png
+ MimeType=image/x-dcraw;
+-
--- a/media-gfx/rawstudio/rawstudio-2.0-r1.ebuild
+++ b/media-gfx/rawstudio/rawstudio-2.0-r1.ebuild
@ -0,0 +1,62 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/rawstudio/rawstudio-2.0-r1.ebuild,v 1.1 2013/06/21 03:40:40 ssuominen Exp $
+
+EAPI=5
+inherit autotools eutils
+
+DESCRIPTION="A program for reading and manipulating raw images from digital cameras"
+HOMEPAGE="http://rawstudio.org/"
+SRC_URI="http://${PN}.org/files/release/${P}.tar.gz"
+
+LICENSE="GPL-2 CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-db/sqlite:3
+	dev-libs/libxml2
+	>=dev-libs/openssl-1:0=
+	>=gnome-base/gconf-2
+	media-libs/flickcurl
+	media-libs/lcms:0
+	media-libs/lensfun
+	media-libs/libgphoto2
+	media-libs/libpng:0=
+	media-libs/tiff:0=
+	media-gfx/exiv2
+	net-misc/curl
+	sci-libs/fftw:3.0
+	sys-apps/dbus
+	sys-libs/zlib:=
+	virtual/jpeg:=
+	x11-libs/gtk+:2
+	x11-libs/libX11"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS NEWS README TODO )
+
+src_prepare() {
+	sed -i \
+		-e '/^AM_PROG_CC_STDC/d' \
+		-e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' \
+		configure.in || die
+	find . -name Makefile.am -exec sed -i -e 's:-O4:-Wall:' {} +
+	sed -i -e 's:-O3:-Wall:' plugins/load-rawspeed/Makefile.am
+	epatch \
+		"${FILESDIR}"/${P}-libpng15.patch \
+		"${FILESDIR}"/${P}-g_thread_init.patch \
+		"${FILESDIR}"/${P}-icon.patch
+	eautoreconf
+}
+
+src_configure() {
+	econf --disable-static
+}
+
+src_install() {
+	default
+	prune_libtool_files --all
+}
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@ -1,3 +1,2 @@
 DIST OpenCV-2.4.3.tar.bz2 67240491 SHA256 f8fbe985978d4eae73e8c3b526ed40a37d4761d2029a5b035233f58146f6f59b SHA512 5305e726089f3f43b2bac06b09e2b5f021c63421ba0b36eeb10e43a067a6954569fccb5a66ff8971e83ffb2c3829df222b74e6a33117f85286b3389e5add232e WHIRLPOOL a384e7d09ac31638bb4bc93c2c7c6b2bc88d0344a494d44d53110528a1abb84250b7979c46d3be55891b61b952ed780f10cee41478bdb906357d80bf52f52b57
-DIST OpenCV-2.4.4a.tar.bz2 74636004 SHA256 e663cf6e4762c8be2f80f9bca8fb32c01d65e103df44c2df4a728ddf65216030 SHA512 7ea28d57a8a7127c7daf25df087420c163ab4d0c765f02919aff28dffc27f7d2c378fb738da7182ffd4102080d9fc57eff214dc54514d7b6525675acd2068fd2 WHIRLPOOL f18ec40c16b1a7a32d4b3e6788d0ea94a9ea80626f91245d2d7a076b2de280c41f775ce1876ae2948958b3c344aeb6821d81c8e576aa7fa40dfbb497f22e0786
 DIST opencv-2.4.5.tar.gz 81884985 SHA256 d30beecf4b57977fbd1635af54c5ab3fc00113e9e59a9d58081732260fe06292 SHA512 2e0ab19203cc5d3a4d83633ee9762441d0d12128752edecb351b3c4abddc1714baf4b320b161f8b58e771933506bfa5a192d394a3b6b5b63d914923c6a767a08 WHIRLPOOL 117551edab5837a9382a6d84dec7f84fb693485e3cad7c08d38158baa22951381eb4958caaaa910dcef6ee2b78a0a494d732d0cac88cd18f1f6ebc2d30e3ddf0
--- a/media-libs/opencv/files/opencv-2.3.0-numpy.patch
+++ b/media-libs/opencv/files/opencv-2.3.0-numpy.patch
@ -1,12 +0,0 @@
-diff -ruN OpenCV-2.3.0-1-ol1/CMakeLists.txt OpenCV-2.3.0-2-numpy/CMakeLists.txt
--- OpenCV-2.3.0-1-ol1/CMakeLists.txt	2011-08-28 14:53:46.000000000 +0200
-+++ OpenCV-2.3.0-2-numpy/CMakeLists.txt	2011-08-28 15:26:37.000000000 +0200
-@@ -640,7 +640,7 @@
- 
- if(PYTHON_NUMPY_PROCESS EQUAL 0)
-     set(PYTHON_USE_NUMPY 1)
-    add_definitions(-D PYTHON_USE_NUMPY=1)
-+    add_definitions(-DPYTHON_USE_NUMPY=1)
-     include_directories(AFTER ${PYTHON_NUMPY_INCLUDE_DIRS})
-     message(STATUS "    Use NumPy headers from: ${PYTHON_NUMPY_INCLUDE_DIRS}")
- else()
--- a/media-libs/opencv/files/opencv-2.3.1a-True-False.patch
+++ b/media-libs/opencv/files/opencv-2.3.1a-True-False.patch
@ -1,170 +0,0 @@
-diff -ur OpenCV-2.3.1.orig/modules/flann/include/opencv2/flann/all_indices.h OpenCV-2.3.1/modules/flann/include/opencv2/flann/all_indices.h
--- OpenCV-2.3.1.orig/modules/flann/include/opencv2/flann/all_indices.h	2011-09-12 13:42:27.000000000 -0500
-+++ OpenCV-2.3.1/modules/flann/include/opencv2/flann/all_indices.h	2011-12-08 15:54:23.000000000 -0600
-@@ -88,7 +88,7 @@
- };
- 
- template<typename VectorSpace, typename Distance>
-struct index_creator<False,VectorSpace,Distance>
-+struct index_creator<XFalse,VectorSpace,Distance>
- {
-     static NNIndex<Distance>* create(const Matrix<typename Distance::ElementType>& dataset, const IndexParams& params, const Distance& distance)
-     {
-@@ -117,7 +117,7 @@
- };
- 
- template<typename Distance>
-struct index_creator<False,False,Distance>
-+struct index_creator<XFalse,XFalse,Distance>
- {
-     static NNIndex<Distance>* create(const Matrix<typename Distance::ElementType>& dataset, const IndexParams& params, const Distance& distance)
-     {
-diff -ur OpenCV-2.3.1.orig/modules/flann/include/opencv2/flann/dist.h OpenCV-2.3.1/modules/flann/include/opencv2/flann/dist.h
--- OpenCV-2.3.1.orig/modules/flann/include/opencv2/flann/dist.h	2011-09-12 13:42:27.000000000 -0500
-+++ OpenCV-2.3.1/modules/flann/include/opencv2/flann/dist.h	2011-12-08 15:54:11.000000000 -0600
-@@ -79,11 +79,11 @@
- struct Accumulator<int> { typedef float Type; };
- 
- 
-class True
-+class XTrue
- {
- };
- 
-class False
-+class XFalse
- {
- };
- 
-@@ -97,8 +97,8 @@
- template<class T>
- struct L2_Simple
- {
-    typedef True is_kdtree_distance;
-    typedef True is_vector_space_distance;
-+    typedef XTrue is_kdtree_distance;
-+    typedef XTrue is_vector_space_distance;
- 
-     typedef T ElementType;
-     typedef typename Accumulator<T>::Type ResultType;
-@@ -130,8 +130,8 @@
- template<class T>
- struct L2
- {
-    typedef True is_kdtree_distance;
-    typedef True is_vector_space_distance;
-+    typedef XTrue is_kdtree_distance;
-+    typedef XTrue is_vector_space_distance;
- 
-     typedef T ElementType;
-     typedef typename Accumulator<T>::Type ResultType;
-@@ -195,8 +195,8 @@
- template<class T>
- struct L1
- {
-    typedef True is_kdtree_distance;
-    typedef True is_vector_space_distance;
-+    typedef XTrue is_kdtree_distance;
-+    typedef XTrue is_vector_space_distance;
- 
-     typedef T ElementType;
-     typedef typename Accumulator<T>::Type ResultType;
-@@ -252,8 +252,8 @@
- template<class T>
- struct MinkowskiDistance
- {
-    typedef True is_kdtree_distance;
-    typedef True is_vector_space_distance;
-+    typedef XTrue is_kdtree_distance;
-+    typedef XTrue is_vector_space_distance;
- 
-     typedef T ElementType;
-     typedef typename Accumulator<T>::Type ResultType;
-@@ -316,8 +316,8 @@
- template<class T>
- struct MaxDistance
- {
-    typedef False is_kdtree_distance;
-    typedef True is_vector_space_distance;
-+    typedef XFalse is_kdtree_distance;
-+    typedef XTrue is_vector_space_distance;
- 
-     typedef T ElementType;
-     typedef typename Accumulator<T>::Type ResultType;
-@@ -373,8 +373,8 @@
-  */
- struct HammingLUT
- {
-    typedef False is_kdtree_distance;
-    typedef False is_vector_space_distance;
-+    typedef XFalse is_kdtree_distance;
-+    typedef XFalse is_vector_space_distance;
- 
-     typedef unsigned char ElementType;
-     typedef int ResultType;
-@@ -475,8 +475,8 @@
- template<class T>
- struct Hamming
- {
-    typedef False is_kdtree_distance;
-    typedef False is_vector_space_distance;
-+    typedef XFalse is_kdtree_distance;
-+    typedef XFalse is_vector_space_distance;
- 
- 
-     typedef T ElementType;
-@@ -537,8 +537,8 @@
- template<typename T>
- struct Hamming2
- {
-    typedef False is_kdtree_distance;
-    typedef False is_vector_space_distance;
-+    typedef XFalse is_kdtree_distance;
-+    typedef XFalse is_vector_space_distance;
- 
-     typedef T ElementType;
-     typedef int ResultType;
-@@ -596,8 +596,8 @@
- template<class T>
- struct HistIntersectionDistance
- {
-    typedef True is_kdtree_distance;
-    typedef True is_vector_space_distance;
-+    typedef XTrue is_kdtree_distance;
-+    typedef XTrue is_vector_space_distance;
- 
-     typedef T ElementType;
-     typedef typename Accumulator<T>::Type ResultType;
-@@ -649,8 +649,8 @@
- template<class T>
- struct HellingerDistance
- {
-    typedef True is_kdtree_distance;
-    typedef True is_vector_space_distance;
-+    typedef XTrue is_kdtree_distance;
-+    typedef XTrue is_vector_space_distance;
- 
-     typedef T ElementType;
-     typedef typename Accumulator<T>::Type ResultType;
-@@ -697,8 +697,8 @@
- template<class T>
- struct ChiSquareDistance
- {
-    typedef True is_kdtree_distance;
-    typedef True is_vector_space_distance;
-+    typedef XTrue is_kdtree_distance;
-+    typedef XTrue is_vector_space_distance;
- 
-     typedef T ElementType;
-     typedef typename Accumulator<T>::Type ResultType;
-@@ -751,8 +751,8 @@
- template<class T>
- struct KL_Divergence
- {
-    typedef True is_kdtree_distance;
-    typedef True is_vector_space_distance;
-+    typedef XTrue is_kdtree_distance;
-+    typedef XTrue is_vector_space_distance;
- 
-     typedef T ElementType;
-     typedef typename Accumulator<T>::Type ResultType;
--- a/media-libs/opencv/files/opencv-2.3.1a-convert_sets_to_options.patch
+++ b/media-libs/opencv/files/opencv-2.3.1a-convert_sets_to_options.patch
@ -1,229 +0,0 @@
--- OpenCV-2.3.1-0-vanilla/CMakeLists.txt
-+++ OpenCV-2.3.1-2-options/CMakeLists.txt
-@@ -72,13 +72,13 @@
- # Build static or dynamic libs?
- # Default: dynamic libraries
- # ----------------------------------------------------------------------------
-set(BUILD_SHARED_LIBS ON CACHE BOOL "Build shared libraries (.dll/.so) instead of static ones (.lib/.a)")
-+OPTION(BUILD_SHARED_LIBS "Build shared libraries (.dll/.so) instead of static ones (.lib/.a)" ON)
- 
- # ----------------------------------------------------------------------------
- # Include debug info into debug libs?
- # Default: yes
- # ----------------------------------------------------------------------------
-set(BUILD_WITH_DEBUG_INFO ON CACHE BOOL "Include debug info into debug libs")
-+OPTION(BUILD_WITH_DEBUG_INFO "Include debug info into debug libs" ON)
- 
- # ----------------------------------------------------------------------------
- #  Get actual OpenCV version number from sources
-@@ -318,23 +318,23 @@
- 
- # Build/install (or not) some apps:
- # ===================================================
-set(BUILD_EXAMPLES OFF CACHE BOOL "Build all examples")
-set(INSTALL_C_EXAMPLES OFF CACHE BOOL "Install C examples")
-set(INSTALL_PYTHON_EXAMPLES OFF CACHE BOOL "Install Python examples")
-+option(BUILD_EXAMPLES "Build all examples" OFF)
-+option(INSTALL_C_EXAMPLES "Install C examples" OFF)
-+option(INSTALL_PYTHON_EXAMPLES "Install Python examples" OFF)
- if(ANDROID)
-    set(INSTALL_ANDROID_EXAMPLES OFF CACHE BOOL "Install Android examples")
-+    option(INSTALL_ANDROID_EXAMPLES "Install Android examples" OFF)
- endif()
- 
- # Build tests:
- # ===================================================
-set(BUILD_TESTS ON CACHE BOOL "Build tests")
-+option(BUILD_TESTS "Build tests" ON)
- 
- # Build 3rdparty libraries under unix
- # ===================================================
- if(WIN32)
-    set(OPENCV_BUILD_3RDPARTY_LIBS TRUE  CACHE BOOL "Build 3rd party libraries")
-+    option(OPENCV_BUILD_3RDPARTY_LIBS "Build 3rd party libraries" TRUE)
- else()
-    set(OPENCV_BUILD_3RDPARTY_LIBS FALSE CACHE BOOL "Build 3rd party libraries")
-+    option(OPENCV_BUILD_3RDPARTY_LIBS "Build 3rd party libraries" FALSE)
- endif()
- 
- include(OpenCVPCHSupport.cmake REQUIRED)
-@@ -344,7 +344,7 @@
- endif()
- 
- if(PCHSupport_FOUND)
-    SET(USE_PRECOMPILED_HEADERS ON CACHE BOOL "Use precompiled headers")
-+    option(USE_PRECOMPILED_HEADERS "Use precompiled headers" ON)
- else()
-     SET(USE_PRECOMPILED_HEADERS OFF CACHE BOOL "Use precompiled headers" FORCE)
- endif()
-@@ -356,8 +356,8 @@
- endif()
- 
- if(CMAKE_COMPILER_IS_GNUCXX)
-    set(ENABLE_PROFILING OFF CACHE BOOL "Enable profiling in the GCC compiler (Add flags: -g -pg)")
-    set(USE_OMIT_FRAME_POINTER ON CACHE BOOL "Enable -fomit-frame-pointer for GCC")
-+    option(ENABLE_PROFILING "Enable profiling in the GCC compiler (Add flags: -g -pg)" OFF)
-+    option(USE_OMIT_FRAME_POINTER "Enable -fomit-frame-pointer for GCC" ON)
- 
-     if(${CMAKE_SYSTEM_PROCESSOR} MATCHES amd64.*|x86_64.*)
-         set(X86_64 1)
-@@ -376,59 +376,59 @@
-         #ELSE()
-         #    SET(_USE_FAST_MATH ON)
-         #ENDIF()
-        set(USE_FAST_MATH ${_USE_FAST_MATH} CACHE BOOL "Enable -ffast-math (not recommended for GCC 4.6.x)")
-        set(ENABLE_SSE ON CACHE BOOL "Enable SSE instructions")
-        set(ENABLE_SSE2 ON CACHE BOOL "Enable SSE2 instructions")
-        set(ENABLE_SSE3 OFF CACHE BOOL "Enable SSE3 instructions")
-        set(ENABLE_SSSE3 OFF CACHE BOOL "Enable SSSE3 instructions")
-        set(ENABLE_SSE41 OFF CACHE BOOL "Enable SSE4.1 instructions")
-        set(ENABLE_SSE42 OFF CACHE BOOL "Enable SSE4.2 instructions")
-+        option(USE_FAST_MATH "Enable -ffast-math for GCC" ON)
-+        option(ENABLE_SSE "Enable SSE instructions" ON)
-+        option(ENABLE_SSE2 "Enable SSE2 instructions" ON)
-+        option(ENABLE_SSE3 "Enable SSE3 instructions" OFF)
-+        option(ENABLE_SSSE3 "Enable SSSE3 instructions" OFF)
-+        option(ENABLE_SSE41 "Enable SSE4.1 instructions" OFF)
-+        option(ENABLE_SSE42 "Enable SSE4.2 instructions" OFF)
-     endif()
- endif()
- 
- if(MSVC)
-    set(ENABLE_SSE ON CACHE BOOL "Enable SSE instructions for MSVC")
-    set(ENABLE_SSE2 ON CACHE BOOL "Enable SSE2 instructions for MSVC")
-+    option(ENABLE_SSE "Enable SSE instructions for MSVC" ON)
-+    option(ENABLE_SSE2 "Enable SSE2 instructions for MSVC" ON)
-     if(CMAKE_C_COMPILER MATCHES "icc")
-        set(ENABLE_SSE3 OFF CACHE BOOL "Enable SSE3 instructions for ICC")
-        set(ENABLE_SSE4_1 OFF CACHE BOOL "Enable SSE4.1 instructions for ICC")
-+        option(ENABLE_SSE3 "Enable SSE3 instructions for ICC" OFF)
-+        option(ENABLE_SSE4_1 "Enable SSE4.1 instructions for ICC" OFF)
-     endif()
- endif()
- 
- # allow fine grained control over which libraries not to link, even if
- # they are available on the system
- # ====================================================================
-set(WITH_PNG ON CACHE BOOL "Include PNG support")
-set(WITH_JPEG ON CACHE BOOL "Include JPEG support")
-set(WITH_JASPER ON CACHE BOOL "Include JPEG2K support")
-set(WITH_TIFF ON CACHE BOOL "Include TIFF support")
-set(WITH_OPENEXR ON CACHE BOOL "Include ILM support via OpenEXR")
-+option(WITH_PNG "Include PNG support" ON)
-+option(WITH_JPEG "Include JPEG support" ON)
-+option(WITH_JASPER "Include JPEG2K support" ON)
-+option(WITH_TIFF "Include TIFF support" ON)
-+option(WITH_OPENEXR "Include ILM support via OpenEXR" ON)
- 
- if(UNIX)
-    set(WITH_FFMPEG ON CACHE BOOL "Include FFMPEG support")
-+    option(WITH_FFMPEG "Include FFMPEG support" ON)
-     if(NOT APPLE)
-        set(WITH_UNICAP OFF CACHE BOOL "Include Unicap support (GPL)")
-        set(WITH_GTK ON CACHE BOOL "Include GTK support")
-        set(WITH_GSTREAMER ON CACHE BOOL "Include Gstreamer support")
-        set(WITH_V4L ON CACHE BOOL "Include Video 4 Linux support")
-        set(WITH_XINE OFF CACHE BOOL "Include Xine support (GPL)")
-+        option(WITH_UNICAP "Include Unicap support (GPL)" OFF)
-+        option(WITH_GTK "Include GTK support" ON)
-+        option(WITH_GSTREAMER "Include Gstreamer support" ON)
-+        option(WITH_V4L "Include Video 4 Linux support" ON)
-+        option(WITH_XINE "Include Xine support (GPL)" OFF)
-     endif()
-    set(WITH_PVAPI ON CACHE BOOL "Include Prosilica GigE support")
-    set(WITH_1394 ON CACHE BOOL "Include IEEE1394 support")
-+    option(WITH_PVAPI "Include Prosilica GigE support" ON)
-+    option(WITH_1394 "Include IEEE1394 support" ON)
- endif()
- 
- if(APPLE)
-    set(WITH_CARBON OFF CACHE BOOL "Use Carbon for UI instead of Cocoa")
-    set(WITH_QUICKTIME OFF CACHE BOOL "Use QuickTime for Video I/O insted of QTKit")
-+    option(WITH_CARBON "Use Carbon for UI instead of Cocoa" OFF)
-+    option(WITH_QUICKTIME "Use QuickTime for Video I/O insted of QTKit" OFF)
- endif()
- 
-set(WITH_TBB OFF CACHE BOOL "Include Intel TBB support")
-set(WITH_IPP OFF CACHE BOOL "Include Intel IPP support")
-set(WITH_EIGEN ON CACHE BOOL "Include Eigen2/Eigen3 support")
-set(WITH_CUDA ON CACHE BOOL "Include NVidia Cuda Runtime support")
-
-set(WITH_OPENNI OFF CACHE BOOL "Include OpenNI support")
-set(WITH_XIMEA OFF CACHE BOOL "Include XIMEA cameras support")
-+option(WITH_TBB "Include TBB support" OFF)
-+option(WITH_IPP "Include Intel IPP support" OFF)
-+option(WITH_EIGEN "Include Eigen2/Eigen3 support" ON)
-+option(WITH_CUDA "Include NVidia Cuda Runtime support" ON)
-+ 
-+option(WITH_OPENNI "Include OpenNI support" OFF)
-+option(WITH_XIMEA "Include XIMEA cameras support" OFF)
- 
- # ===================================================
- # Macros that checks if module have been installed.
-@@ -626,13 +626,13 @@
-     include(OpenCVFindOpenEXR.cmake)
- endif()
- 
-set(BUILD_DOCS ON CACHE BOOL "Build OpenCV Documentation")
-+option(BUILD_DOCS "Build OpenCV Documentation" ON)
- 
- if(BUILD_DOCS)
-   include(OpenCVFindLATEX.cmake REQUIRED)
- endif()
- 
-set(BUILD_NEW_PYTHON_SUPPORT ON CACHE BOOL "Build with Python support")
-+option(BUILD_NEW_PYTHON_SUPPORT "Build with Python support" ON)
- 
- if (WIN32)
-     if ("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
-@@ -836,8 +836,8 @@
- #YV
- ############################### QT ################################
- 
-set(WITH_QT OFF CACHE BOOL "Build with Qt Backend support")
-set(WITH_QT_OPENGL OFF CACHE BOOL "Add OpenGL extension to Qt")
-+option(WITH_QT "Build with Qt Backend support" OFF)
-+option(WITH_QT_OPENGL "Add OpenGL extension to Qt" OFF)
- 
- set(HAVE_QT 0)
- set(HAVE_QT_OPENGL 0)
-@@ -1054,7 +1054,7 @@
- ################## Extra HighGUI libs on Windows ###################
- 
- if(WIN32)
-    set(WITH_VIDEOINPUT ON CACHE BOOL "Build HighGUI with DirectShow support")
-+    option(WITH_VIDEOINPUT "Build HighGUI with DirectShow support" ON)
-     set(HIGHGUI_LIBRARIES ${HIGHGUI_LIBRARIES} comctl32 gdi32 ole32)
- 
-     if(WITH_VIDEOINPUT)
-@@ -1123,7 +1123,7 @@
- #           Set the maximum level of warnings:
- # ----------------------------------------------------------------------------
- # Should be set to true for development
-set(OPENCV_WARNINGS_ARE_ERRORS OFF CACHE BOOL "Treat warnings as errors")
-+option(OPENCV_WARNINGS_ARE_ERRORS "Treat warnings as errors" OFF)
- if (WIN32 AND ${CMAKE_GENERATOR} MATCHES "(MinGW)|(MSYS)")
-     set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG" CACHE STRING "")
- endif()
-@@ -1222,12 +1222,6 @@ if(CMAKE_COMPILER_IS_GNUCXX)
-         endif()
-     endif()
- 
-    if(X86 OR X86_64)
-        if(NOT APPLE AND CMAKE_SIZEOF_VOID_P EQUAL 4)
-            set(EXTRA_C_FLAGS_RELEASE "${EXTRA_C_FLAGS_RELEASE} -mfpmath=387")
-        endif()
-    endif()
-
-     # Profiling?
-     if(ENABLE_PROFILING)
-         set(EXTRA_C_FLAGS_RELEASE "${EXTRA_C_FLAGS_RELEASE} -pg -g")
-@@@ -1494,7 +1494,7 @@
- #-----------------------------------
- # Source package:
- #-----------------------------------
-set(BUILD_PACKAGE ON CACHE BOOL "Enables 'make package_source' command")
-+option(BUILD_PACKAGE "Build a installer with the SDK" ON)
- 
- if(BUILD_PACKAGE)
-     set(TARBALL_NAME "${CMAKE_PROJECT_NAME}-${OPENCV_VERSION_MAJOR}.${OPENCV_VERSION_MINOR}.${OPENCV_VERSION_PATCH}")
--- a/media-libs/opencv/files/opencv-2.3.1a-gcc47.patch
+++ b/media-libs/opencv/files/opencv-2.3.1a-gcc47.patch
@ -1,22 +0,0 @@
-diff -ruN OpenCV-2.3.1.orig/modules/highgui/src/grfmt_tiff.cpp OpenCV-2.3.1/modules/highgui/src/grfmt_tiff.cpp
--- OpenCV-2.3.1.orig/modules/highgui/src/grfmt_tiff.cpp	2011-09-12 20:41:29.000000000 +0200
-+++ OpenCV-2.3.1/modules/highgui/src/grfmt_tiff.cpp	2012-05-06 22:02:17.041467539 +0200
-@@ -47,6 +47,7 @@
- 
- #include "precomp.hpp"
- #include "grfmt_tiff.hpp"
-+#include "unistd.h"
- 
- namespace cv
- {
-diff -ruN OpenCV-2.3.1.orig/modules/highgui/src/window_QT.h OpenCV-2.3.1/modules/highgui/src/window_QT.h
--- OpenCV-2.3.1.orig/modules/highgui/src/window_QT.h	2011-09-12 20:41:29.000000000 +0200
-+++ OpenCV-2.3.1/modules/highgui/src/window_QT.h	2012-05-06 22:02:58.208469764 +0200
-@@ -42,6 +42,7 @@
- 
- 
- #include "precomp.hpp"
-+#include "unistd.h"
- 
- #if defined( HAVE_QT_OPENGL )
- #include <QtOpenGL>
--- a/media-libs/opencv/files/opencv-2.3.1a-libsuffix.patch
+++ b/media-libs/opencv/files/opencv-2.3.1a-libsuffix.patch
@ -1,33 +0,0 @@
-diff -ruN OpenCV-2.3.1-2-options/CMakeLists.txt OpenCV-2.3.1-3-suffix/CMakeLists.txt
--- OpenCV-2.3.1-2-options/CMakeLists.txt	2011-11-13 14:11:45.000000000 +0100
-+++ OpenCV-2.3.1-3-suffix/CMakeLists.txt	2011-11-13 14:33:26.000000000 +0100
-@@ -18,7 +18,7 @@
-     # Add these standard paths to the search paths for FIND_LIBRARY
-     # to find libraries from these locations first
-     if(UNIX)
-        set(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} /lib /usr/lib)
-+        set(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} /lib${LIB_SUFFIX} /usr/lib${LIB_SUFFIX})
-     endif()
- 
-     # it _must_ go before PROJECT(OpenCV) in order to work
-@@ -117,7 +117,7 @@
- 
- # SUBDIRECTORIES:
- # Save libs and executables in the same place
-set(LIBRARY_OUTPUT_PATH "${CMAKE_BINARY_DIR}/lib" CACHE PATH "Output directory for libraries" )
-+set(LIBRARY_OUTPUT_PATH "${CMAKE_BINARY_DIR}/lib${LIB_SUFFIX}" CACHE PATH "Output directory for libraries" )
- set(EXECUTABLE_OUTPUT_PATH "${CMAKE_BINARY_DIR}/bin" CACHE PATH "Output directory for applications" )
- 
- if(ANDROID OR WIN32)
-@@ -665,9 +665,9 @@
-                     OUTPUT_VARIABLE PYTHON_STD_PACKAGES_PATH
-                     OUTPUT_STRIP_TRAILING_WHITESPACE)
-     if("${PYTHON_STD_PACKAGES_PATH}" MATCHES "site-packages")
-        set(PYTHON_PACKAGES_PATH lib/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages CACHE PATH "Where to install the python packages.")
-+        set(PYTHON_PACKAGES_PATH lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages CACHE PATH "Where to install the python packages.")
-     else() #debian based assumed, install to the dist-packages.
-        set(PYTHON_PACKAGES_PATH lib/python${PYTHON_VERSION_MAJOR_MINOR}/dist-packages CACHE PATH "Where to install the python packages.")
-+        set(PYTHON_PACKAGES_PATH lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR_MINOR}/dist-packages CACHE PATH "Where to install the python packages.")
-     endif()
- endif()
- if(CMAKE_HOST_WIN32)
--- a/media-libs/opencv/files/opencv-2.3.1a-nocaps.patch
+++ b/media-libs/opencv/files/opencv-2.3.1a-nocaps.patch
@ -1,83 +0,0 @@
-diff -ruN OpenCV-2.3.1-3-suffix/CMakeLists.txt OpenCV-2.3.1-4-caps/CMakeLists.txt
--- OpenCV-2.3.1-3-suffix/CMakeLists.txt	2011-11-13 14:33:26.000000000 +0100
-+++ OpenCV-2.3.1-4-caps/CMakeLists.txt	2011-11-13 14:37:04.000000000 +0100
-@@ -123,9 +123,9 @@
- if(ANDROID OR WIN32)
-     set(OPENCV_DOC_INSTALL_PATH doc)
- elseif(OPENCV_MANGLED_INSTALL_PATHS)
-    set(OPENCV_DOC_INSTALL_PATH share/OpenCV-${OPENCV_VERSION}/doc)
-+    set(OPENCV_DOC_INSTALL_PATH share/doc/opencv-${OPENCV_VERSION}/)
- else()
-    set(OPENCV_DOC_INSTALL_PATH share/OpenCV/doc)
-+    set(OPENCV_DOC_INSTALL_PATH share/doc/opencv-${OPENCV_VERSION}/)
- endif()
- 
- if(ANDROID)
-@@ -1347,12 +1347,12 @@
- set(CMAKE_OPENCV2_INCLUDE_DIRS_CONFIGCMAKE "")
- if(ANDROID)
-     set(CMAKE_LIB_DIRS_CONFIGCMAKE "\"\${OpenCV_INSTALL_PATH}/libs/\${ARMEABI_NDK_NAME}\"")
-    set(CMAKE_3RDPARTY_LIB_DIRS_CONFIGCMAKE "\"\${OpenCV_INSTALL_PATH}/share/OpenCV/3rdparty/libs/\${ARMEABI_NDK_NAME}\"")
-+    set(CMAKE_3RDPARTY_LIB_DIRS_CONFIGCMAKE "\"\${OpenCV_INSTALL_PATH}/share/opencv/3rdparty/libs/\${ARMEABI_NDK_NAME}\"")
- else()
-     set(CMAKE_LIB_DIRS_CONFIGCMAKE "\"\${OpenCV_INSTALL_PATH}/${OPENCV_LIB_INSTALL_PATH}\"")
-    set(CMAKE_3RDPARTY_LIB_DIRS_CONFIGCMAKE "\"\${OpenCV_INSTALL_PATH}/share/OpenCV/3rdparty/${OPENCV_LIB_INSTALL_PATH}\"")
-+    set(CMAKE_3RDPARTY_LIB_DIRS_CONFIGCMAKE "\"\${OpenCV_INSTALL_PATH}/share/opencv/3rdparty/${OPENCV_LIB_INSTALL_PATH}\"")
-     if(OPENCV_MANGLED_INSTALL_PATHS)
-      set(CMAKE_3RDPARTY_LIB_DIRS_CONFIGCMAKE "\"\${OpenCV_INSTALL_PATH}/share/OpenCV-${OPENCV_VERSION}/3rdparty/${OPENCV_LIB_INSTALL_PATH}\"")
-+      set(CMAKE_3RDPARTY_LIB_DIRS_CONFIGCMAKE "\"\${OpenCV_INSTALL_PATH}/share/opencv-${OPENCV_VERSION}/3rdparty/${OPENCV_LIB_INSTALL_PATH}\"")
-     endif()
- endif()
- 
-@@ -1367,16 +1367,16 @@
-   #                <prefix>/(share|lib)/<name>*/                           (U)
-   #                <prefix>/(share|lib)/<name>*/(cmake|CMake)/             (U)
-   if(OPENCV_MANGLED_INSTALL_PATHS)
-    install(FILES ${CMAKE_BINARY_DIR}/unix-install/OpenCVConfig.cmake DESTINATION share/OpenCV-${OPENCV_VERSION}/)
-    install(FILES ${CMAKE_BINARY_DIR}/unix-install/OpenCVConfig-version.cmake DESTINATION share/OpenCV-${OPENCV_VERSION}/)
-+    install(FILES ${CMAKE_BINARY_DIR}/unix-install/OpenCVConfig.cmake DESTINATION share/opencv-${OPENCV_VERSION}/)
-+    install(FILES ${CMAKE_BINARY_DIR}/unix-install/OpenCVConfig-version.cmake DESTINATION share/opencv-${OPENCV_VERSION}/)
-   else()
-    install(FILES "${CMAKE_BINARY_DIR}/unix-install/OpenCVConfig.cmake" DESTINATION share/OpenCV/)
-    install(FILES ${CMAKE_BINARY_DIR}/unix-install/OpenCVConfig-version.cmake DESTINATION share/OpenCV/)
-+    install(FILES "${CMAKE_BINARY_DIR}/unix-install/OpenCVConfig.cmake" DESTINATION share/opencv/)
-+    install(FILES ${CMAKE_BINARY_DIR}/unix-install/OpenCVConfig-version.cmake DESTINATION share/opencv/)
-   endif()
- endif()
- 
- if(ANDROID)
-    install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/android/android.toolchain.cmake" DESTINATION share/OpenCV)
-+    install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/android/android.toolchain.cmake" DESTINATION share/opencv)
- endif()
- 
- # --------------------------------------------------------------------------------------------
-@@ -1386,7 +1386,7 @@
-     set(CMAKE_INCLUDE_DIRS_CONFIGCMAKE "\"\${OpenCV_CONFIG_PATH}/include\" \"\${OpenCV_CONFIG_PATH}/include/opencv\"")
-     set(CMAKE_OPENCV2_INCLUDE_DIRS_CONFIGCMAKE "")
-     set(CMAKE_LIB_DIRS_CONFIGCMAKE "\"\${OpenCV_CONFIG_PATH}/${OPENCV_LIB_INSTALL_PATH}\"")
-    set(CMAKE_3RDPARTY_LIB_DIRS_CONFIGCMAKE "\"\${OpenCV_CONFIG_PATH}/share/OpenCV/3rdparty/${OPENCV_LIB_INSTALL_PATH}\"")
-+    set(CMAKE_3RDPARTY_LIB_DIRS_CONFIGCMAKE "\"\${OpenCV_CONFIG_PATH}/share/opencv/3rdparty/${OPENCV_LIB_INSTALL_PATH}\"")
- 
-     exec_program(mkdir ARGS "-p \"${CMAKE_BINARY_DIR}/win-install/\"" OUTPUT_VARIABLE RET_VAL)
-     configure_file("${CMAKE_CURRENT_SOURCE_DIR}/OpenCVConfig.cmake.in" "${CMAKE_BINARY_DIR}/win-install/OpenCVConfig.cmake" IMMEDIATE @ONLY)
-@@ -1439,7 +1439,7 @@
-     set(CMAKE_LIBS_DIR_CONFIGCMAKE "\$(OPENCV_THIS_DIR)/../..")
- 
-     configure_file("${CMAKE_CURRENT_SOURCE_DIR}/OpenCV.mk.in" "${CMAKE_BINARY_DIR}/unix-install/OpenCV.mk" IMMEDIATE @ONLY)
-    install(FILES ${CMAKE_BINARY_DIR}/unix-install/OpenCV.mk DESTINATION share/OpenCV/)
-+    install(FILES ${CMAKE_BINARY_DIR}/unix-install/OpenCV.mk DESTINATION share/opencv/)
- endif(ANDROID)
- 
- # --------------------------------------------------------------------------------------------
-diff -ruN OpenCV-2.3.1-3-suffix/data/CMakeLists.txt OpenCV-2.3.1-4-caps/data/CMakeLists.txt
--- OpenCV-2.3.1-3-suffix/data/CMakeLists.txt	2011-09-12 20:45:36.000000000 +0200
-+++ OpenCV-2.3.1-4-caps/data/CMakeLists.txt	2011-11-13 14:35:08.000000000 +0100
-@@ -2,6 +2,6 @@
- file(GLOB LBP_CASCADES lbpcascades/*.xml)
- 
- if(NOT WIN32)
-install(FILES ${HAAR_CASCADES} DESTINATION share/OpenCV/haarcascades COMPONENT main)
-install(FILES ${LBP_CASCADES} DESTINATION share/OpenCV/lbpcascades COMPONENT main)
-+    install(FILES ${HAAR_CASCADES} DESTINATION share/opencv/haarcascades COMPONENT main)
-+    install(FILES ${LBP_CASCADES} DESTINATION share/opencv/lbpcascades COMPONENT main)
- endif()
--- a/media-libs/opencv/files/opencv-2.4.4-javamagic.patch
+++ b/media-libs/opencv/files/opencv-2.4.4-javamagic.patch
@ -1,33 +0,0 @@
-diff -ruN opencv-2.4.4.orig/CMakeLists.txt opencv-2.4.4/CMakeLists.txt
--- opencv-2.4.4.orig/CMakeLists.txt	2013-03-01 16:44:17.000000000 +0100
-+++ opencv-2.4.4/CMakeLists.txt	2013-03-29 18:01:36.463227214 +0100
-@@ -144,7 +144,7 @@
- OCV_OPTION(WITH_OPENCL         "Include OpenCL Runtime support"              OFF  IF (NOT ANDROID AND NOT IOS) )
- OCV_OPTION(WITH_OPENCLAMDFFT   "Include AMD OpenCL FFT library support"      OFF  IF (NOT ANDROID AND NOT IOS) )
- OCV_OPTION(WITH_OPENCLAMDBLAS  "Include AMD OpenCL BLAS library support"     OFF  IF (NOT ANDROID AND NOT IOS) )
-
-+OCV_OPTION(WITH_JAVA           "Include Java support"                        ON)
- 
- # OpenCV build components
- # ===================================================
-@@ -392,6 +392,8 @@
- include(cmake/OpenCVDetectPython.cmake)
- 
- # --- Java Support ---
-+if(WITH_JAVA)
-+
- include(cmake/OpenCVDetectApacheAnt.cmake)
- if(ANDROID)
-   include(cmake/OpenCVDetectAndroidSDK.cmake)
-@@ -409,6 +411,11 @@
-   SET(CAN_BUILD_ANDROID_PROJECTS FALSE)
- endif()
- 
-+else()
-+  SET(ANT_EXECUTABLE "")
-+  SET(CAN_BUILD_ANDROID_PROJECTS FALSE)
-+endif()
-+
- # --- OpenCL ---
- if(WITH_OPENCL)
-   include(cmake/OpenCVDetectOpenCL.cmake)
--- a/media-libs/opencv/opencv-2.4.4a.ebuild
+++ b/media-libs/opencv/opencv-2.4.4a.ebuild
@ -1,194 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.4.4a.ebuild,v 1.3 2013/04/06 10:17:50 dilfridge Exp $
-
-EAPI=5
-PYTHON_DEPEND="2:2.6"
-
-inherit base toolchain-funcs cmake-utils python java-pkg-opt-2 java-ant-2
-
-MY_P=OpenCV-${PV}
-
-DESCRIPTION="A collection of algorithms and sample code for various computer vision problems"
-HOMEPAGE="http://opencv.willowgarage.com"
-SRC_URI="mirror://sourceforge/opencvlibrary/${MY_P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux"
-IUSE="cuda doc eigen examples ffmpeg gstreamer gtk ieee1394 ipp jpeg jpeg2k opencl openexr opengl pch png qt4 testprograms threads tiff v4l xine"
-
-RDEPEND="
-	app-arch/bzip2
-	dev-python/numpy
-	sys-libs/zlib
-	cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2 )
-	eigen? ( dev-cpp/eigen:2 )
-	ffmpeg? ( virtual/ffmpeg )
-	gstreamer? (
-		media-libs/gstreamer:0.10
-		media-libs/gst-plugins-base:0.10
-	)
-	gtk? (
-		dev-libs/glib:2
-		x11-libs/gtk+:2
-	)
-	java? ( >=virtual/jre-1.6 )
-	jpeg? ( virtual/jpeg )
-	jpeg2k? ( media-libs/jasper )
-	ieee1394? (
-		media-libs/libdc1394
-		sys-libs/libraw1394
-	)
-	ipp? ( sci-libs/ipp )
-	opencl? ( virtual/opencl )
-	openexr? ( media-libs/openexr )
-	opengl? ( virtual/glu )
-	png? ( media-libs/libpng:0= )
-	qt4? (
-		dev-qt/qtgui:4
-		dev-qt/qttest:4
-		opengl? ( dev-qt/qtopengl:4 )
-	)
-	threads? ( dev-cpp/tbb )
-	tiff? ( media-libs/tiff )
-	v4l? ( >=media-libs/libv4l-0.8.3 )
-	xine? ( media-libs/xine-lib )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	java? ( >=virtual/jdk-1.6 )
-"
-
-# REQUIRED_USE="opengl? ( qt )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.3.1a-libav-0.7.patch"
-	"${FILESDIR}/${PN}-2.4.3-gcc47.patch"
-	"${FILESDIR}/${PN}-2.4.2-cflags.patch"
-	"${FILESDIR}/${PN}-2.4.4-javamagic.patch"
-)
-
-S=${WORKDIR}/opencv-2.4.4
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-	java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-	base_src_prepare
-
-	# remove bundled stuff
-	rm -rf 3rdparty
-	sed -i \
-		-e '/add_subdirectory(3rdparty)/ d' \
-		CMakeLists.txt || die
-
-	java-pkg-opt-2_src_prepare
-}
-
-src_configure() {
-	JAVA_ANT_ENCODING="iso-8859-1"
-	# set encoding so even this cmake build will pick it up.
-	export ANT_OPTS+=" -Dfile.encoding=iso-8859-1"
-	java-ant-2_src_configure
-
-	# please dont sort here, order is the same as in CMakeLists.txt
-	local mycmakeargs=(
-	# the optinal dependency libraries
-		$(cmake-utils_use_with ieee1394 1394)
-		-DWITH_AVFOUNDATION=OFF
-		-DWITH_CARBON=OFF
-		$(cmake-utils_use_with eigen)
-		$(cmake-utils_use_with ffmpeg)
-		$(cmake-utils_use_with gstreamer)
-		$(cmake-utils_use_with gtk)
-		$(cmake-utils_use_with ipp)
-		$(cmake-utils_use_with java)
-		$(cmake-utils_use_with jpeg2k JASPER)
-		$(cmake-utils_use_with jpeg)
-		$(cmake-utils_use_with opencl)
-	#	$(cmake-utils_use_with opencl OPENCLAMDFFT)
-	#	$(cmake-utils_use_with opencl OPENCLAMDBLAS)
-		$(cmake-utils_use_with openexr)
-		$(cmake-utils_use_with opengl)
-		-DWITH_OPENNI=OFF					# not packaged
-		$(cmake-utils_use_with png)
-		-DWITH_PVAPI=OFF					# not packaged
-		$(cmake-utils_use_with qt4 QT)
-		-DWITH_QUICKTIME=OFF
-		$(cmake-utils_use_with threads TBB)
-		$(cmake-utils_use_with tiff)
-		-DWITH_UNICAP=OFF					# not packaged
-		$(cmake-utils_use_with v4l V4L)
-		-DWITH_VIDEOINPUT=OFF					# windows only
-		-DWITH_XIMEA=OFF					# windows only
-		$(cmake-utils_use_with xine)
-	# the build components
-		-DBUILD_SHARED_LIBS=ON
-		-DBUILD_ANDROID_EXAMPLES=OFF
-		$(cmake-utils_use_build doc DOCS)
-		$(cmake-utils_use_build examples)
-		-DBUILD_PERF_TESTS=OFF
-		$(cmake-utils_use_build testprograms TESTS)
-	# install examples
-		$(cmake-utils_use examples INSTALL_C_EXAMPLES)
-	# build options
-		$(cmake-utils_use_enable pch PRECOMPILED_HEADERS)
-		-DENABLE_OMIT_FRAME_POINTER=OFF				#
-		-DENABLE_FAST_MATH=OFF					#
-		-DENABLE_SSE=OFF					# these options do nothing but
-		-DENABLE_SSE2=OFF					# add params to CFLAGS
-		-DENABLE_SSE3=OFF
-		-DENABLE_SSSE3=OFF
-		-DENABLE_SSE41=OFF
-		-DENABLE_SSE42=OFF
-		-DOPENCV_EXTRA_FLAGS_RELEASE=""				# black magic
-	)
-
-	if use cuda; then
-		if [[ "$(gcc-version)" > "4.6" ]]; then
-			ewarn "CUDA and >=sys-devel/gcc-4.7 do not play well together. Disabling CUDA support."
-			mycmakeargs+=( "-DWITH_CUDA=OFF" )
-			mycmakeargs+=( "-DWITH_CUBLAS=OFF" )
-			mycmakeargs+=( "-DWITH_CUFFT=OFF" )
-		else
-			mycmakeargs+=( "-DWITH_CUDA=ON" )
-			mycmakeargs+=( "-DWITH_CUBLAS=ON" )
-			mycmakeargs+=( "-DWITH_CUFFT=ON" )
-		fi
-	else
-		mycmakeargs+=( "-DWITH_CUDA=OFF" )
-		mycmakeargs+=( "-DWITH_CUBLAS=OFF" )
-		mycmakeargs+=( "-DWITH_CUFFT=OFF" )
-	fi
-
-	if use examples; then
-		mycmakeargs+=( "-DINSTALL_PYTHON_EXAMPLES=ON" )
-	else
-		mycmakeargs+=( "-DINSTALL_PYTHON_EXAMPLES=OFF" )
-	fi
-
-	# things we want to be hard off or not yet figured out
-	mycmakeargs+=(
-		"-DOPENCV_BUILD_3RDPARTY_LIBS=OFF"
-		"-DBUILD_LATEX_DOCS=OFF"
-		"-DBUILD_PACKAGE=OFF"
-		"-DENABLE_PROFILING=OFF"
-	)
-
-	# things we want to be hard enabled not worth useflag
-	mycmakeargs+=(
-		"-DCMAKE_SKIP_RPATH=ON"
-		"-DOPENCV_DOC_INSTALL_PATH=${EPREFIX}/usr/share/doc/${PF}"
-	)
-
-	# hardcode cuda paths
-	mycmakeargs+=(
-		"-DCUDA_NPP_LIBRARY_ROOT_DIR=/opt/cuda"
-	)
-
-	cmake-utils_src_configure
-}
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@ -1 +1 @@
-Thu, 20 Jun 2013 16:36:59 +0000
+Fri, 21 Jun 2013 10:36:57 +0000
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@ -1 +1 @@
-Thu, 20 Jun 2013 16:36:59 +0000
+Fri, 21 Jun 2013 10:36:57 +0000
--- a/metadata/md5-cache/app-emulation/qemu-1.4.2
+++ b/metadata/md5-cache/app-emulation/qemu-1.4.2
@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure info install postinst prepare pretend setup test
-DEPEND=!static-softmmu? ( >=dev-libs/glib-2.0 sys-apps/pciutils sys-libs/zlib >=x11-libs/pixman-0.28.0 aio? ( dev-libs/libaio ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.2.0 ) jpeg? ( virtual/jpeg ) ncurses? ( sys-libs/ncurses ) png? ( media-libs/libpng ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( >=media-libs/libsdl-1.2.11 ) seccomp? ( >=sys-libs/libseccomp-1.0.1 ) spice? ( >=app-emulation/spice-0.12.0 ) tls? ( net-libs/gnutls ) uuid? ( >=sys-apps/util-linux-2.16.0 ) vde? ( net-misc/vde ) xattr? ( sys-apps/attr ) xfs? ( sys-fs/xfsprogs ) ) !app-emulation/kqemu qemu_softmmu_targets_i386? ( sys-firmware/ipxe ~sys-firmware/seabios-1.7.2.1 ~sys-firmware/sgabios-0.1_pre8 ~sys-firmware/vgabios-0.7a ) qemu_softmmu_targets_x86_64? ( sys-firmware/ipxe ~sys-firmware/seabios-1.7.2.1 ~sys-firmware/sgabios-0.1_pre8 ~sys-firmware/vgabios-0.7a ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) brltty? ( app-accessibility/brltty ) iscsi? ( net-libs/libiscsi ) opengl? ( virtual/opengl ) pulseaudio? ( media-sound/pulseaudio ) python? ( python_targets_python2_5? ( dev-lang/python:2.5[ncurses,readline] ) python_targets_python2_6? ( dev-lang/python:2.6[ncurses,readline] ) python_targets_python2_7? ( dev-lang/python:2.7[ncurses,readline] ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) sdl? ( media-libs/libsdl[X] ) selinux? ( sec-policy/selinux-qemu ) smartcard? ( dev-libs/nss !app-emulation/libcacard ) spice? ( >=app-emulation/spice-protocol-0.12.3 ) systemtap? ( dev-util/systemtap ) usbredir? ( >=sys-apps/usbredir-0.6 ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools ) app-text/texi2html =dev-lang/python-2* virtual/pkgconfig kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 ) static-softmmu? ( >=dev-libs/glib-2.0[static-libs(+)] sys-apps/pciutils[static-libs(+)] sys-libs/zlib[static-libs(+)] >=x11-libs/pixman-0.28.0[static-libs(+)] aio? ( dev-libs/libaio[static-libs(+)] ) caps? ( sys-libs/libcap-ng[static-libs(+)] ) curl? ( >=net-misc/curl-7.15.4[static-libs(+)] ) fdt? ( >=sys-apps/dtc-1.2.0[static-libs(+)] ) jpeg? ( virtual/jpeg[static-libs(+)] ) ncurses? ( sys-libs/ncurses[static-libs(+)] ) png? ( media-libs/libpng[static-libs(+)] ) rbd? ( sys-cluster/ceph[static-libs(+)] ) sasl? ( dev-libs/cyrus-sasl[static-libs(+)] ) sdl? ( >=media-libs/libsdl-1.2.11[static-libs(+)] ) seccomp? ( >=sys-libs/libseccomp-1.0.1[static-libs(+)] ) spice? ( >=app-emulation/spice-0.12.0[static-libs(+)] ) tls? ( net-libs/gnutls[static-libs(+)] ) uuid? ( >=sys-apps/util-linux-2.16.0[static-libs(+)] ) vde? ( net-misc/vde[static-libs(+)] ) xattr? ( sys-apps/attr[static-libs(+)] ) xfs? ( sys-fs/xfsprogs[static-libs(+)] ) ) test? ( dev-libs/glib[utils] sys-devel/bc ) virtual/pkgconfig filecaps? ( sys-libs/libcap )
+DEPEND=!static-softmmu? ( >=dev-libs/glib-2.0 sys-apps/pciutils sys-libs/zlib >=x11-libs/pixman-0.28.0 aio? ( dev-libs/libaio ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.2.0 ) jpeg? ( virtual/jpeg ) ncurses? ( sys-libs/ncurses ) png? ( media-libs/libpng ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( >=media-libs/libsdl-1.2.11 ) seccomp? ( >=sys-libs/libseccomp-1.0.1 ) spice? ( >=app-emulation/spice-0.12.0 ) tls? ( net-libs/gnutls ) uuid? ( >=sys-apps/util-linux-2.16.0 ) vde? ( net-misc/vde ) xattr? ( sys-apps/attr ) xfs? ( sys-fs/xfsprogs ) ) !app-emulation/kqemu qemu_softmmu_targets_i386? ( sys-firmware/ipxe ~sys-firmware/seabios-1.7.2.1 ~sys-firmware/sgabios-0.1_pre8 ~sys-firmware/vgabios-0.7a ) qemu_softmmu_targets_x86_64? ( sys-firmware/ipxe ~sys-firmware/seabios-1.7.2.1 ~sys-firmware/sgabios-0.1_pre8 ~sys-firmware/vgabios-0.7a ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) accessibility? ( app-accessibility/brltty ) iscsi? ( net-libs/libiscsi ) opengl? ( virtual/opengl ) pulseaudio? ( media-sound/pulseaudio ) python? ( python_targets_python2_5? ( dev-lang/python:2.5[ncurses,readline] ) python_targets_python2_6? ( dev-lang/python:2.6[ncurses,readline] ) python_targets_python2_7? ( dev-lang/python:2.7[ncurses,readline] ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) sdl? ( media-libs/libsdl[X] ) selinux? ( sec-policy/selinux-qemu ) smartcard? ( dev-libs/nss !app-emulation/libcacard ) spice? ( >=app-emulation/spice-protocol-0.12.3 ) systemtap? ( dev-util/systemtap ) usbredir? ( >=sys-apps/usbredir-0.6 ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools ) app-text/texi2html =dev-lang/python-2* virtual/pkgconfig kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 ) static-softmmu? ( >=dev-libs/glib-2.0[static-libs(+)] sys-apps/pciutils[static-libs(+)] sys-libs/zlib[static-libs(+)] >=x11-libs/pixman-0.28.0[static-libs(+)] aio? ( dev-libs/libaio[static-libs(+)] ) caps? ( sys-libs/libcap-ng[static-libs(+)] ) curl? ( >=net-misc/curl-7.15.4[static-libs(+)] ) fdt? ( >=sys-apps/dtc-1.2.0[static-libs(+)] ) jpeg? ( virtual/jpeg[static-libs(+)] ) ncurses? ( sys-libs/ncurses[static-libs(+)] ) png? ( media-libs/libpng[static-libs(+)] ) rbd? ( sys-cluster/ceph[static-libs(+)] ) sasl? ( dev-libs/cyrus-sasl[static-libs(+)] ) sdl? ( >=media-libs/libsdl-1.2.11[static-libs(+)] ) seccomp? ( >=sys-libs/libseccomp-1.0.1[static-libs(+)] ) spice? ( >=app-emulation/spice-0.12.0[static-libs(+)] ) tls? ( net-libs/gnutls[static-libs(+)] ) uuid? ( >=sys-apps/util-linux-2.16.0[static-libs(+)] ) vde? ( net-misc/vde[static-libs(+)] ) xattr? ( sys-apps/attr[static-libs(+)] ) xfs? ( sys-fs/xfsprogs[static-libs(+)] ) ) test? ( dev-libs/glib[utils] sys-devel/bc ) virtual/pkgconfig filecaps? ( sys-libs/libcap )
 DESCRIPTION=QEMU + Kernel-based Virtual Machine userland tools
 EAPI=5
 HOMEPAGE=http://www.qemu.org http://www.linux-kvm.org
-IUSE=+aio alsa bluetooth brltty +caps +curl debug fdt iscsi +jpeg kernel_linux kernel_FreeBSD mixemu ncurses opengl +png pulseaudio python rbd sasl +seccomp sdl selinux smartcard spice static static-softmmu static-user systemtap tci test +threads tls usbredir +uuid vde +vhost-net virtfs +vnc xattr xen xfs qemu_softmmu_targets_i386 qemu_softmmu_targets_x86_64 qemu_softmmu_targets_alpha qemu_softmmu_targets_arm qemu_softmmu_targets_cris qemu_softmmu_targets_m68k qemu_softmmu_targets_microblaze qemu_softmmu_targets_microblazeel qemu_softmmu_targets_mips qemu_softmmu_targets_mipsel qemu_softmmu_targets_or32 qemu_softmmu_targets_ppc qemu_softmmu_targets_ppc64 qemu_softmmu_targets_sh4 qemu_softmmu_targets_sh4eb qemu_softmmu_targets_sparc qemu_softmmu_targets_sparc64 qemu_softmmu_targets_s390x qemu_softmmu_targets_unicore32 qemu_softmmu_targets_lm32 qemu_softmmu_targets_mips64 qemu_softmmu_targets_mips64el qemu_softmmu_targets_ppcemb qemu_softmmu_targets_xtensa qemu_softmmu_targets_xtensaeb qemu_user_targets_i386 qemu_user_targets_x86_64 qemu_user_targets_alpha qemu_user_targets_arm qemu_user_targets_cris qemu_user_targets_m68k qemu_user_targets_microblaze qemu_user_targets_microblazeel qemu_user_targets_mips qemu_user_targets_mipsel qemu_user_targets_or32 qemu_user_targets_ppc qemu_user_targets_ppc64 qemu_user_targets_sh4 qemu_user_targets_sh4eb qemu_user_targets_sparc qemu_user_targets_sparc64 qemu_user_targets_s390x qemu_user_targets_unicore32 qemu_user_targets_armeb qemu_user_targets_ppc64abi32 qemu_user_targets_sparc32plus python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 +filecaps
+IUSE=accessibility +aio alsa bluetooth +caps +curl debug fdt iscsi +jpeg kernel_linux kernel_FreeBSD mixemu ncurses opengl +png pulseaudio python rbd sasl +seccomp sdl selinux smartcard spice static static-softmmu static-user systemtap tci test +threads tls usbredir +uuid vde +vhost-net virtfs +vnc xattr xen xfs qemu_softmmu_targets_i386 qemu_softmmu_targets_x86_64 qemu_softmmu_targets_alpha qemu_softmmu_targets_arm qemu_softmmu_targets_cris qemu_softmmu_targets_m68k qemu_softmmu_targets_microblaze qemu_softmmu_targets_microblazeel qemu_softmmu_targets_mips qemu_softmmu_targets_mipsel qemu_softmmu_targets_or32 qemu_softmmu_targets_ppc qemu_softmmu_targets_ppc64 qemu_softmmu_targets_sh4 qemu_softmmu_targets_sh4eb qemu_softmmu_targets_sparc qemu_softmmu_targets_sparc64 qemu_softmmu_targets_s390x qemu_softmmu_targets_unicore32 qemu_softmmu_targets_lm32 qemu_softmmu_targets_mips64 qemu_softmmu_targets_mips64el qemu_softmmu_targets_ppcemb qemu_softmmu_targets_xtensa qemu_softmmu_targets_xtensaeb qemu_user_targets_i386 qemu_user_targets_x86_64 qemu_user_targets_alpha qemu_user_targets_arm qemu_user_targets_cris qemu_user_targets_m68k qemu_user_targets_microblaze qemu_user_targets_microblazeel qemu_user_targets_mips qemu_user_targets_mipsel qemu_user_targets_or32 qemu_user_targets_ppc qemu_user_targets_ppc64 qemu_user_targets_sh4 qemu_user_targets_sh4eb qemu_user_targets_sparc qemu_user_targets_sparc64 qemu_user_targets_s390x qemu_user_targets_unicore32 qemu_user_targets_armeb qemu_user_targets_ppc64abi32 qemu_user_targets_sparc32plus python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 +filecaps
 KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd
 LICENSE=GPL-2 LGPL-2 BSD-2
-RDEPEND=!static-softmmu? ( >=dev-libs/glib-2.0 sys-apps/pciutils sys-libs/zlib >=x11-libs/pixman-0.28.0 aio? ( dev-libs/libaio ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.2.0 ) jpeg? ( virtual/jpeg ) ncurses? ( sys-libs/ncurses ) png? ( media-libs/libpng ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( >=media-libs/libsdl-1.2.11 ) seccomp? ( >=sys-libs/libseccomp-1.0.1 ) spice? ( >=app-emulation/spice-0.12.0 ) tls? ( net-libs/gnutls ) uuid? ( >=sys-apps/util-linux-2.16.0 ) vde? ( net-misc/vde ) xattr? ( sys-apps/attr ) xfs? ( sys-fs/xfsprogs ) ) !app-emulation/kqemu qemu_softmmu_targets_i386? ( sys-firmware/ipxe ~sys-firmware/seabios-1.7.2.1 ~sys-firmware/sgabios-0.1_pre8 ~sys-firmware/vgabios-0.7a ) qemu_softmmu_targets_x86_64? ( sys-firmware/ipxe ~sys-firmware/seabios-1.7.2.1 ~sys-firmware/sgabios-0.1_pre8 ~sys-firmware/vgabios-0.7a ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) brltty? ( app-accessibility/brltty ) iscsi? ( net-libs/libiscsi ) opengl? ( virtual/opengl ) pulseaudio? ( media-sound/pulseaudio ) python? ( python_targets_python2_5? ( dev-lang/python:2.5[ncurses,readline] ) python_targets_python2_6? ( dev-lang/python:2.6[ncurses,readline] ) python_targets_python2_7? ( dev-lang/python:2.7[ncurses,readline] ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) sdl? ( media-libs/libsdl[X] ) selinux? ( sec-policy/selinux-qemu ) smartcard? ( dev-libs/nss !app-emulation/libcacard ) spice? ( >=app-emulation/spice-protocol-0.12.3 ) systemtap? ( dev-util/systemtap ) usbredir? ( >=sys-apps/usbredir-0.6 ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools )
+RDEPEND=!static-softmmu? ( >=dev-libs/glib-2.0 sys-apps/pciutils sys-libs/zlib >=x11-libs/pixman-0.28.0 aio? ( dev-libs/libaio ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.2.0 ) jpeg? ( virtual/jpeg ) ncurses? ( sys-libs/ncurses ) png? ( media-libs/libpng ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( >=media-libs/libsdl-1.2.11 ) seccomp? ( >=sys-libs/libseccomp-1.0.1 ) spice? ( >=app-emulation/spice-0.12.0 ) tls? ( net-libs/gnutls ) uuid? ( >=sys-apps/util-linux-2.16.0 ) vde? ( net-misc/vde ) xattr? ( sys-apps/attr ) xfs? ( sys-fs/xfsprogs ) ) !app-emulation/kqemu qemu_softmmu_targets_i386? ( sys-firmware/ipxe ~sys-firmware/seabios-1.7.2.1 ~sys-firmware/sgabios-0.1_pre8 ~sys-firmware/vgabios-0.7a ) qemu_softmmu_targets_x86_64? ( sys-firmware/ipxe ~sys-firmware/seabios-1.7.2.1 ~sys-firmware/sgabios-0.1_pre8 ~sys-firmware/vgabios-0.7a ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) accessibility? ( app-accessibility/brltty ) iscsi? ( net-libs/libiscsi ) opengl? ( virtual/opengl ) pulseaudio? ( media-sound/pulseaudio ) python? ( python_targets_python2_5? ( dev-lang/python:2.5[ncurses,readline] ) python_targets_python2_6? ( dev-lang/python:2.6[ncurses,readline] ) python_targets_python2_7? ( dev-lang/python:2.7[ncurses,readline] ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) sdl? ( media-libs/libsdl[X] ) selinux? ( sec-policy/selinux-qemu ) smartcard? ( dev-libs/nss !app-emulation/libcacard ) spice? ( >=app-emulation/spice-protocol-0.12.3 ) systemtap? ( dev-util/systemtap ) usbredir? ( >=sys-apps/usbredir-0.6 ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools )
 REQUIRED_USE=|| ( qemu_softmmu_targets_i386 qemu_softmmu_targets_x86_64 qemu_softmmu_targets_alpha qemu_softmmu_targets_arm qemu_softmmu_targets_cris qemu_softmmu_targets_m68k qemu_softmmu_targets_microblaze qemu_softmmu_targets_microblazeel qemu_softmmu_targets_mips qemu_softmmu_targets_mipsel qemu_softmmu_targets_or32 qemu_softmmu_targets_ppc qemu_softmmu_targets_ppc64 qemu_softmmu_targets_sh4 qemu_softmmu_targets_sh4eb qemu_softmmu_targets_sparc qemu_softmmu_targets_sparc64 qemu_softmmu_targets_s390x qemu_softmmu_targets_unicore32 qemu_softmmu_targets_lm32 qemu_softmmu_targets_mips64 qemu_softmmu_targets_mips64el qemu_softmmu_targets_ppcemb qemu_softmmu_targets_xtensa qemu_softmmu_targets_xtensaeb ) python? ( || ( python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 ) ) static? ( static-softmmu static-user ) static-softmmu? ( !alsa !pulseaudio !bluetooth !opengl ) virtfs? ( xattr )
 SLOT=0
 SRC_URI=http://wiki.qemu-project.org/download/qemu-1.4.2.tar.bz2 http://dev.gentoo.org/~cardoe/distfiles/qemu-1.4.2-6b5934f9.tar.xz
 _eclasses_=eutils	f31a0ec0d081047cbf9c0bbb4822d831	fcaps	310b84a3fee3bb17f91526bf6f6206f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multibuild	4f797e941786b6313d84053ae3e0ec96	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	094dc7421f9aea7525b85b899f67e62a	python-utils-r1	9aa9cecaaf78644be7c0b8b8dc814dce	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=7009afff4dc87ca2c6a6e81586aa0f68
+_md5_=fceee67e84a716c23991622b9672b48c
--- a/metadata/md5-cache/app-emulation/qemu-9999
+++ b/metadata/md5-cache/app-emulation/qemu-9999
@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure info install postinst prepare pretend setup test unpack
-DEPEND=!static-softmmu? ( >=dev-libs/glib-2.0 sys-apps/pciutils sys-libs/zlib >=x11-libs/pixman-0.28.0 aio? ( dev-libs/libaio ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.2.0 ) jpeg? ( virtual/jpeg ) ncurses? ( sys-libs/ncurses ) png? ( media-libs/libpng ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( >=media-libs/libsdl-1.2.11 ) seccomp? ( >=sys-libs/libseccomp-1.0.1 ) spice? ( >=app-emulation/spice-0.12.0 ) tls? ( net-libs/gnutls ) uuid? ( >=sys-apps/util-linux-2.16.0 ) vde? ( net-misc/vde ) xattr? ( sys-apps/attr ) xfs? ( sys-fs/xfsprogs ) ) !app-emulation/kqemu qemu_softmmu_targets_i386? ( sys-firmware/ipxe sys-firmware/seabios sys-firmware/sgabios sys-firmware/vgabios ) qemu_softmmu_targets_x86_64? ( sys-firmware/ipxe sys-firmware/seabios sys-firmware/sgabios sys-firmware/vgabios ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) brltty? ( app-accessibility/brltty ) iscsi? ( net-libs/libiscsi ) opengl? ( virtual/opengl ) pulseaudio? ( media-sound/pulseaudio ) python? ( python_targets_python2_5? ( dev-lang/python:2.5[ncurses,readline] ) python_targets_python2_6? ( dev-lang/python:2.6[ncurses,readline] ) python_targets_python2_7? ( dev-lang/python:2.7[ncurses,readline] ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) sdl? ( media-libs/libsdl[X] ) selinux? ( sec-policy/selinux-qemu ) smartcard? ( dev-libs/nss !app-emulation/libcacard ) spice? ( >=app-emulation/spice-protocol-0.12.3 ) systemtap? ( dev-util/systemtap ) usbredir? ( >=sys-apps/usbredir-0.6 ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools ) app-text/texi2html =dev-lang/python-2* virtual/pkgconfig kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 ) static-softmmu? ( >=dev-libs/glib-2.0[static-libs(+)] sys-apps/pciutils[static-libs(+)] sys-libs/zlib[static-libs(+)] >=x11-libs/pixman-0.28.0[static-libs(+)] aio? ( dev-libs/libaio[static-libs(+)] ) caps? ( sys-libs/libcap-ng[static-libs(+)] ) curl? ( >=net-misc/curl-7.15.4[static-libs(+)] ) fdt? ( >=sys-apps/dtc-1.2.0[static-libs(+)] ) jpeg? ( virtual/jpeg[static-libs(+)] ) ncurses? ( sys-libs/ncurses[static-libs(+)] ) png? ( media-libs/libpng[static-libs(+)] ) rbd? ( sys-cluster/ceph[static-libs(+)] ) sasl? ( dev-libs/cyrus-sasl[static-libs(+)] ) sdl? ( >=media-libs/libsdl-1.2.11[static-libs(+)] ) seccomp? ( >=sys-libs/libseccomp-1.0.1[static-libs(+)] ) spice? ( >=app-emulation/spice-0.12.0[static-libs(+)] ) tls? ( net-libs/gnutls[static-libs(+)] ) uuid? ( >=sys-apps/util-linux-2.16.0[static-libs(+)] ) vde? ( net-misc/vde[static-libs(+)] ) xattr? ( sys-apps/attr[static-libs(+)] ) xfs? ( sys-fs/xfsprogs[static-libs(+)] ) ) test? ( dev-libs/glib[utils] sys-devel/bc ) virtual/pkgconfig filecaps? ( sys-libs/libcap ) dev-vcs/git
+DEPEND=!static-softmmu? ( >=dev-libs/glib-2.0 sys-apps/pciutils sys-libs/zlib >=x11-libs/pixman-0.28.0 aio? ( dev-libs/libaio ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.2.0 ) jpeg? ( virtual/jpeg ) ncurses? ( sys-libs/ncurses ) png? ( media-libs/libpng ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( >=media-libs/libsdl-1.2.11 ) seccomp? ( >=sys-libs/libseccomp-1.0.1 ) spice? ( >=app-emulation/spice-0.12.0 ) tls? ( net-libs/gnutls ) uuid? ( >=sys-apps/util-linux-2.16.0 ) vde? ( net-misc/vde ) xattr? ( sys-apps/attr ) xfs? ( sys-fs/xfsprogs ) ) !app-emulation/kqemu qemu_softmmu_targets_i386? ( sys-firmware/ipxe sys-firmware/seabios sys-firmware/sgabios sys-firmware/vgabios ) qemu_softmmu_targets_x86_64? ( sys-firmware/ipxe sys-firmware/seabios sys-firmware/sgabios sys-firmware/vgabios ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) accessibility? ( app-accessibility/brltty ) iscsi? ( net-libs/libiscsi ) opengl? ( virtual/opengl ) pulseaudio? ( media-sound/pulseaudio ) python? ( python_targets_python2_5? ( dev-lang/python:2.5[ncurses,readline] ) python_targets_python2_6? ( dev-lang/python:2.6[ncurses,readline] ) python_targets_python2_7? ( dev-lang/python:2.7[ncurses,readline] ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) sdl? ( media-libs/libsdl[X] ) selinux? ( sec-policy/selinux-qemu ) smartcard? ( dev-libs/nss !app-emulation/libcacard ) spice? ( >=app-emulation/spice-protocol-0.12.3 ) systemtap? ( dev-util/systemtap ) usbredir? ( >=sys-apps/usbredir-0.6 ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools ) app-text/texi2html =dev-lang/python-2* virtual/pkgconfig kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 ) static-softmmu? ( >=dev-libs/glib-2.0[static-libs(+)] sys-apps/pciutils[static-libs(+)] sys-libs/zlib[static-libs(+)] >=x11-libs/pixman-0.28.0[static-libs(+)] aio? ( dev-libs/libaio[static-libs(+)] ) caps? ( sys-libs/libcap-ng[static-libs(+)] ) curl? ( >=net-misc/curl-7.15.4[static-libs(+)] ) fdt? ( >=sys-apps/dtc-1.2.0[static-libs(+)] ) jpeg? ( virtual/jpeg[static-libs(+)] ) ncurses? ( sys-libs/ncurses[static-libs(+)] ) png? ( media-libs/libpng[static-libs(+)] ) rbd? ( sys-cluster/ceph[static-libs(+)] ) sasl? ( dev-libs/cyrus-sasl[static-libs(+)] ) sdl? ( >=media-libs/libsdl-1.2.11[static-libs(+)] ) seccomp? ( >=sys-libs/libseccomp-1.0.1[static-libs(+)] ) spice? ( >=app-emulation/spice-0.12.0[static-libs(+)] ) tls? ( net-libs/gnutls[static-libs(+)] ) uuid? ( >=sys-apps/util-linux-2.16.0[static-libs(+)] ) vde? ( net-misc/vde[static-libs(+)] ) xattr? ( sys-apps/attr[static-libs(+)] ) xfs? ( sys-fs/xfsprogs[static-libs(+)] ) ) test? ( dev-libs/glib[utils] sys-devel/bc ) virtual/pkgconfig filecaps? ( sys-libs/libcap ) dev-vcs/git
 DESCRIPTION=QEMU + Kernel-based Virtual Machine userland tools
 EAPI=5
 HOMEPAGE=http://www.qemu.org http://www.linux-kvm.org
-IUSE=+aio alsa bluetooth brltty +caps +curl debug fdt iscsi +jpeg kernel_linux kernel_FreeBSD mixemu ncurses opengl +png pulseaudio python rbd sasl +seccomp sdl selinux smartcard spice static static-softmmu static-user systemtap tci test +threads tls usbredir +uuid vde +vhost-net virtfs +vnc xattr xen xfs qemu_softmmu_targets_i386 qemu_softmmu_targets_x86_64 qemu_softmmu_targets_alpha qemu_softmmu_targets_arm qemu_softmmu_targets_cris qemu_softmmu_targets_m68k qemu_softmmu_targets_microblaze qemu_softmmu_targets_microblazeel qemu_softmmu_targets_mips qemu_softmmu_targets_mipsel qemu_softmmu_targets_mips64 qemu_softmmu_targets_mips64el qemu_softmmu_targets_or32 qemu_softmmu_targets_ppc qemu_softmmu_targets_ppc64 qemu_softmmu_targets_sh4 qemu_softmmu_targets_sh4eb qemu_softmmu_targets_sparc qemu_softmmu_targets_sparc64 qemu_softmmu_targets_s390x qemu_softmmu_targets_unicore32 qemu_softmmu_targets_lm32 qemu_softmmu_targets_moxie qemu_softmmu_targets_ppcemb qemu_softmmu_targets_xtensa qemu_softmmu_targets_xtensaeb qemu_user_targets_i386 qemu_user_targets_x86_64 qemu_user_targets_alpha qemu_user_targets_arm qemu_user_targets_cris qemu_user_targets_m68k qemu_user_targets_microblaze qemu_user_targets_microblazeel qemu_user_targets_mips qemu_user_targets_mipsel qemu_user_targets_mips64 qemu_user_targets_mips64el qemu_user_targets_or32 qemu_user_targets_ppc qemu_user_targets_ppc64 qemu_user_targets_sh4 qemu_user_targets_sh4eb qemu_user_targets_sparc qemu_user_targets_sparc64 qemu_user_targets_s390x qemu_user_targets_unicore32 qemu_user_targets_armeb qemu_user_targets_mipsn32 qemu_user_targets_mipsn32el qemu_user_targets_ppc64abi32 qemu_user_targets_sparc32plus python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 +filecaps
+IUSE=accessibility +aio alsa bluetooth +caps +curl debug fdt iscsi +jpeg kernel_linux kernel_FreeBSD mixemu ncurses opengl +png pulseaudio python rbd sasl +seccomp sdl selinux smartcard spice static static-softmmu static-user systemtap tci test +threads tls usbredir +uuid vde +vhost-net virtfs +vnc xattr xen xfs qemu_softmmu_targets_i386 qemu_softmmu_targets_x86_64 qemu_softmmu_targets_alpha qemu_softmmu_targets_arm qemu_softmmu_targets_cris qemu_softmmu_targets_m68k qemu_softmmu_targets_microblaze qemu_softmmu_targets_microblazeel qemu_softmmu_targets_mips qemu_softmmu_targets_mipsel qemu_softmmu_targets_mips64 qemu_softmmu_targets_mips64el qemu_softmmu_targets_or32 qemu_softmmu_targets_ppc qemu_softmmu_targets_ppc64 qemu_softmmu_targets_sh4 qemu_softmmu_targets_sh4eb qemu_softmmu_targets_sparc qemu_softmmu_targets_sparc64 qemu_softmmu_targets_s390x qemu_softmmu_targets_unicore32 qemu_softmmu_targets_lm32 qemu_softmmu_targets_moxie qemu_softmmu_targets_ppcemb qemu_softmmu_targets_xtensa qemu_softmmu_targets_xtensaeb qemu_user_targets_i386 qemu_user_targets_x86_64 qemu_user_targets_alpha qemu_user_targets_arm qemu_user_targets_cris qemu_user_targets_m68k qemu_user_targets_microblaze qemu_user_targets_microblazeel qemu_user_targets_mips qemu_user_targets_mipsel qemu_user_targets_mips64 qemu_user_targets_mips64el qemu_user_targets_or32 qemu_user_targets_ppc qemu_user_targets_ppc64 qemu_user_targets_sh4 qemu_user_targets_sh4eb qemu_user_targets_sparc qemu_user_targets_sparc64 qemu_user_targets_s390x qemu_user_targets_unicore32 qemu_user_targets_armeb qemu_user_targets_mipsn32 qemu_user_targets_mipsn32el qemu_user_targets_ppc64abi32 qemu_user_targets_sparc32plus python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 +filecaps
 LICENSE=GPL-2 LGPL-2 BSD-2
-RDEPEND=!static-softmmu? ( >=dev-libs/glib-2.0 sys-apps/pciutils sys-libs/zlib >=x11-libs/pixman-0.28.0 aio? ( dev-libs/libaio ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.2.0 ) jpeg? ( virtual/jpeg ) ncurses? ( sys-libs/ncurses ) png? ( media-libs/libpng ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( >=media-libs/libsdl-1.2.11 ) seccomp? ( >=sys-libs/libseccomp-1.0.1 ) spice? ( >=app-emulation/spice-0.12.0 ) tls? ( net-libs/gnutls ) uuid? ( >=sys-apps/util-linux-2.16.0 ) vde? ( net-misc/vde ) xattr? ( sys-apps/attr ) xfs? ( sys-fs/xfsprogs ) ) !app-emulation/kqemu qemu_softmmu_targets_i386? ( sys-firmware/ipxe sys-firmware/seabios sys-firmware/sgabios sys-firmware/vgabios ) qemu_softmmu_targets_x86_64? ( sys-firmware/ipxe sys-firmware/seabios sys-firmware/sgabios sys-firmware/vgabios ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) brltty? ( app-accessibility/brltty ) iscsi? ( net-libs/libiscsi ) opengl? ( virtual/opengl ) pulseaudio? ( media-sound/pulseaudio ) python? ( python_targets_python2_5? ( dev-lang/python:2.5[ncurses,readline] ) python_targets_python2_6? ( dev-lang/python:2.6[ncurses,readline] ) python_targets_python2_7? ( dev-lang/python:2.7[ncurses,readline] ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) sdl? ( media-libs/libsdl[X] ) selinux? ( sec-policy/selinux-qemu ) smartcard? ( dev-libs/nss !app-emulation/libcacard ) spice? ( >=app-emulation/spice-protocol-0.12.3 ) systemtap? ( dev-util/systemtap ) usbredir? ( >=sys-apps/usbredir-0.6 ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools )
+RDEPEND=!static-softmmu? ( >=dev-libs/glib-2.0 sys-apps/pciutils sys-libs/zlib >=x11-libs/pixman-0.28.0 aio? ( dev-libs/libaio ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.2.0 ) jpeg? ( virtual/jpeg ) ncurses? ( sys-libs/ncurses ) png? ( media-libs/libpng ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( >=media-libs/libsdl-1.2.11 ) seccomp? ( >=sys-libs/libseccomp-1.0.1 ) spice? ( >=app-emulation/spice-0.12.0 ) tls? ( net-libs/gnutls ) uuid? ( >=sys-apps/util-linux-2.16.0 ) vde? ( net-misc/vde ) xattr? ( sys-apps/attr ) xfs? ( sys-fs/xfsprogs ) ) !app-emulation/kqemu qemu_softmmu_targets_i386? ( sys-firmware/ipxe sys-firmware/seabios sys-firmware/sgabios sys-firmware/vgabios ) qemu_softmmu_targets_x86_64? ( sys-firmware/ipxe sys-firmware/seabios sys-firmware/sgabios sys-firmware/vgabios ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) accessibility? ( app-accessibility/brltty ) iscsi? ( net-libs/libiscsi ) opengl? ( virtual/opengl ) pulseaudio? ( media-sound/pulseaudio ) python? ( python_targets_python2_5? ( dev-lang/python:2.5[ncurses,readline] ) python_targets_python2_6? ( dev-lang/python:2.6[ncurses,readline] ) python_targets_python2_7? ( dev-lang/python:2.7[ncurses,readline] ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) sdl? ( media-libs/libsdl[X] ) selinux? ( sec-policy/selinux-qemu ) smartcard? ( dev-libs/nss !app-emulation/libcacard ) spice? ( >=app-emulation/spice-protocol-0.12.3 ) systemtap? ( dev-util/systemtap ) usbredir? ( >=sys-apps/usbredir-0.6 ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools )
 REQUIRED_USE=|| ( qemu_softmmu_targets_i386 qemu_softmmu_targets_x86_64 qemu_softmmu_targets_alpha qemu_softmmu_targets_arm qemu_softmmu_targets_cris qemu_softmmu_targets_m68k qemu_softmmu_targets_microblaze qemu_softmmu_targets_microblazeel qemu_softmmu_targets_mips qemu_softmmu_targets_mipsel qemu_softmmu_targets_mips64 qemu_softmmu_targets_mips64el qemu_softmmu_targets_or32 qemu_softmmu_targets_ppc qemu_softmmu_targets_ppc64 qemu_softmmu_targets_sh4 qemu_softmmu_targets_sh4eb qemu_softmmu_targets_sparc qemu_softmmu_targets_sparc64 qemu_softmmu_targets_s390x qemu_softmmu_targets_unicore32 qemu_softmmu_targets_lm32 qemu_softmmu_targets_moxie qemu_softmmu_targets_ppcemb qemu_softmmu_targets_xtensa qemu_softmmu_targets_xtensaeb ) python? ( || ( python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 ) ) static? ( static-softmmu static-user ) static-softmmu? ( !alsa !pulseaudio !bluetooth !opengl ) virtfs? ( xattr )
 SLOT=0
 _eclasses_=eutils	f31a0ec0d081047cbf9c0bbb4822d831	fcaps	310b84a3fee3bb17f91526bf6f6206f3	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	git-2	e92e09651292b1bef5656592364550f7	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multibuild	4f797e941786b6313d84053ae3e0ec96	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	094dc7421f9aea7525b85b899f67e62a	python-utils-r1	9aa9cecaaf78644be7c0b8b8dc814dce	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=9b99c64fc69fd3b1a79afa0bbc35062a
+_md5_=fb69ea6f3a6fbe5135451210bf1d8039
--- a/metadata/md5-cache/app-misc/bijiben-3.8.3
+++ b/metadata/md5-cache/app-misc/bijiben-3.8.3
@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=>=app-misc/tracker-0.16 >=dev-libs/glib-2.28:2 dev-libs/libxml2 gnome-extra/zeitgeist media-libs/clutter-gtk:1.0 net-libs/webkit-gtk:3 >=x11-libs/gtk+-3.7.7:3 app-text/yelp-tools >=dev-util/intltool-0.35.0 sys-devel/gettext app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=>=app-misc/tracker-0.16 >=dev-libs/glib-2.28:2 dev-libs/libxml2 dev-libs/libzeitgeist media-libs/clutter-gtk:1.0 net-libs/webkit-gtk:3 >=x11-libs/gtk+-3.7.7:3 app-text/yelp-tools >=dev-util/intltool-0.35.0 sys-devel/gettext app-arch/xz-utils >=sys-apps/sed-4
 DESCRIPTION=Note editor designed to remain simple to use
 EAPI=5
 HOMEPAGE=http://live.gnome.org/Bijiben
 KEYWORDS=~amd64
 LICENSE=GPL-3+
-RDEPEND=>=app-misc/tracker-0.16 >=dev-libs/glib-2.28:2 dev-libs/libxml2 gnome-extra/zeitgeist media-libs/clutter-gtk:1.0 net-libs/webkit-gtk:3 >=x11-libs/gtk+-3.7.7:3
+RDEPEND=>=app-misc/tracker-0.16 >=dev-libs/glib-2.28:2 dev-libs/libxml2 dev-libs/libzeitgeist media-libs/clutter-gtk:1.0 net-libs/webkit-gtk:3 >=x11-libs/gtk+-3.7.7:3
 SLOT=0
-SRC_URI=mirror://gnome/sources/bijiben/3.8/bijiben-3.8.1.tar.xz
+SRC_URI=mirror://gnome/sources/bijiben/3.8/bijiben-3.8.3.tar.xz
 _eclasses_=eutils	f31a0ec0d081047cbf9c0bbb4822d831	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	7976d3f4d0c0816c67033d3dcd4d9472	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=4525bf4558a62ce07661501a3e84d0fb
+_md5_=58d3be26320e5ebf18205b6ce79df713
--- a/metadata/md5-cache/app-misc/ca-certificates-20130119
+++ b/metadata/md5-cache/app-misc/ca-certificates-20130119
@ -3,10 +3,10 @@ DEPEND=kernel_AIX? ( app-arch/deb2targz ) !<sys-apps/portage-2.1.10.41
 DESCRIPTION=Common CA Certificates PEM files
 EAPI=3
 HOMEPAGE=http://packages.debian.org/sid/ca-certificates
-KEYWORDS=~alpha ~amd64 ~arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=MPL-1.1
 RDEPEND=kernel_AIX? ( app-arch/deb2targz ) !<sys-apps/portage-2.1.10.41 dev-libs/openssl sys-apps/debianutils
 SLOT=0
 SRC_URI=mirror://debian/pool/main/c/ca-certificates/ca-certificates_20130119_all.deb
 _eclasses_=eutils	f31a0ec0d081047cbf9c0bbb4822d831	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	unpacker	658a981a81fd7cb0767315a541bab01d	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=f6cd12f6d3e1b2d2f03cfbda3006b74f
+_md5_=3130d44181daa6e1a85150b8c3f80311
--- a/metadata/md5-cache/app-office/lyx-2.0.6
+++ b/metadata/md5-cache/app-office/lyx-2.0.6
@ -10,4 +10,4 @@ RDEPEND=dev-qt/qtgui:4 dev-qt/qtcore:4 >=dev-libs/boost-1.34 dev-texlive/texlive
 SLOT=0
 SRC_URI=ftp://ftp.lyx.org/pub/lyx/stable/2.0.x/lyx-2.0.6.tar.xz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	f31a0ec0d081047cbf9c0bbb4822d831	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	font	40ddec3cfe74f743af20f4578c1f7230	gnome2-utils	794d2847b4af390a1e020924876c8297	multilib	892e597faee02a5b94eb02ab512e7622	python	dd56675d8e9f7e85d815a28c87383141	qt4-r2	ce0c9abfee272185e03ab73f09f5fd69	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=09762b1c77f22fdcd91b12a31c749d94
+_md5_=d333ac8572c665f46c54fc3ab16bbfd6
--- a/metadata/md5-cache/app-portage/portpeek-2.1.8
+++ b/metadata/md5-cache/app-portage/portpeek-2.1.8
@ -2,11 +2,11 @@ DEFINED_PHASES=install setup
 DESCRIPTION=A helper program for maintaining the package.keyword and package.unmask files
 EAPI=5
 HOMEPAGE=http://www.mpagano.com/blog/?page_id=3
-IUSE=python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_single_target_python2_7 python_single_target_python3_2 python_single_target_python3_3
+IUSE=python_targets_python2_7 python_targets_python3_2 python_single_target_python2_7 python_single_target_python3_2
 KEYWORDS=~amd64 ~arm ~ppc ~sparc ~x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=app-portage/gentoolkit-0.3.0.7 >=sys-apps/portage-2.1.11.52
 SLOT=0
 SRC_URI=http://www.mpagano.com/downloads/portpeek-2.1.8.tar.gz
 _eclasses_=multilib	892e597faee02a5b94eb02ab512e7622	python-single-r1	7e219c03c7f3c029a5d1030f38aeafef	python-utils-r1	9aa9cecaaf78644be7c0b8b8dc814dce	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
-_md5_=f94f23dc082d327e038c9ff3508fbff9
+_md5_=96c275311a295197d67ddf755466873f
--- a/metadata/md5-cache/app-text/mupdf-9999
+++ b/metadata/md5-cache/app-text/mupdf-9999
@ -8,4 +8,4 @@ LICENSE=AGPL-3
 RDEPEND=dev-libs/openssl[static-libs?] media-libs/freetype:2[static-libs?] media-libs/jbig2dec[static-libs?] media-libs/openjpeg:2[static-libs?] virtual/jpeg[static-libs?] X? ( x11-libs/libX11[static-libs?] x11-libs/libXext[static-libs?] )
 SLOT=0/1.2
 _eclasses_=eutils	f31a0ec0d081047cbf9c0bbb4822d831	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=0026a924fe2d0f0ad3482b9368511b84
+_md5_=a5d6bd514fe19e3e024b22fcd9d80ae6
--- a/metadata/md5-cache/app-text/pdf2djvu-0.7.17
+++ b/metadata/md5-cache/app-text/pdf2djvu-0.7.17
@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install prepare setup
+DEPEND=>=app-text/djvu-3.5.21:= >=app-text/poppler-0.16.7:= dev-libs/libxml2:= dev-libs/libxslt:= graphicsmagick? ( media-gfx/graphicsmagick:= ) dev-cpp/pstreams virtual/pkgconfig nls? ( sys-devel/gettext ) test? ( dev-python/nose[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] )
+DESCRIPTION=A tool to create DjVu files from PDF files
+EAPI=5
+HOMEPAGE=http://code.google.com/p/pdf2djvu/
+IUSE=+graphicsmagick nls openmp test python_targets_python2_6 python_targets_python2_7 python_single_target_python2_6 python_single_target_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=app-text/djvu-3.5.21:= >=app-text/poppler-0.16.7:= dev-libs/libxml2:= dev-libs/libxslt:= graphicsmagick? ( media-gfx/graphicsmagick:= )
+REQUIRED_USE=test? ( graphicsmagick )
+SLOT=0
+SRC_URI=http://pdf2djvu.googlecode.com/files/pdf2djvu_0.7.17.tar.gz
+_eclasses_=multilib	892e597faee02a5b94eb02ab512e7622	python-single-r1	7e219c03c7f3c029a5d1030f38aeafef	python-utils-r1	9aa9cecaaf78644be7c0b8b8dc814dce	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
+_md5_=8d1f43c11254f9a7c4cdda1a924b8371
--- a/metadata/md5-cache/app-text/zathura-cb-0.1.1
+++ b/metadata/md5-cache/app-text/zathura-cb-0.1.1
@ -1,13 +1,12 @@
 DEFINED_PHASES=compile install setup
-DEPEND=>=app-text/zathura-0.2.0 dev-libs/glib:2 app-arch/libarchive:= cairo? ( x11-libs/cairo ) virtual/pkgconfig
+DEPEND=>=app-text/zathura-0.2.0 dev-libs/glib:2 app-arch/libarchive:= x11-libs/cairo:= virtual/pkgconfig
 DESCRIPTION=Comic book plug-in for zathura with 7zip, rar, tar and zip support
 EAPI=5
 HOMEPAGE=http://pwmt.org/projects/zathura/
-IUSE=cairo
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=ZLIB
-RDEPEND=>=app-text/zathura-0.2.0 dev-libs/glib:2 app-arch/libarchive:= cairo? ( x11-libs/cairo ) app-arch/p7zip app-arch/tar app-arch/unrar app-arch/unzip
+RDEPEND=>=app-text/zathura-0.2.0 dev-libs/glib:2 app-arch/libarchive:= x11-libs/cairo:= app-arch/p7zip app-arch/tar app-arch/unrar app-arch/unzip
 SLOT=0
 SRC_URI=http://pwmt.org/projects/zathura/plugins/download/zathura-cb-0.1.1.tar.gz
 _eclasses_=eutils	f31a0ec0d081047cbf9c0bbb4822d831	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=986c5e996c066bcda7701a43488e4825
+_md5_=cb278b4d1d91c0ab70a550bffb4d4d2c
--- a/metadata/md5-cache/dev-haskell/base-compat-0.2.1
+++ b/metadata/md5-cache/dev-haskell/base-compat-0.2.1
@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prerm setup test
+DEPEND=>=dev-lang/ghc-6.10.4:= test? ( >=dev-haskell/hspec-1.3 dev-haskell/setenv ) >=dev-haskell/cabal-1.8 doc? ( dev-haskell/haddock ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
+DESCRIPTION=A compatibility layer for base
+EAPI=5
+HOMEPAGE=http://hackage.haskell.org/package/base-compat
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-lang/ghc-6.10.4:=
+SLOT=0/0.2.1
+SRC_URI=mirror://hackage/packages/archive/base-compat/0.2.1/base-compat-0.2.1.tar.gz
+_eclasses_=eutils	f31a0ec0d081047cbf9c0bbb4822d831	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	0fe5ac58a8b877fae07bb258b762852e	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=58867a323b90ce0ce05763f86a89e843
--- a/metadata/md5-cache/dev-haskell/css-text-0.1.1
+++ b/metadata/md5-cache/dev-haskell/css-text-0.1.1
@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prerm setup test
+DEPEND=>=dev-haskell/attoparsec-0.10:=[profile?] >=dev-haskell/text-0.11:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hspec-0.6.1 >=dev-haskell/hunit-1.2 dev-haskell/quickcheck ) doc? ( dev-haskell/haddock ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
+DESCRIPTION=CSS parser and renderer.
+EAPI=5
+HOMEPAGE=http://www.yesodweb.com/
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/attoparsec-0.10:=[profile?] >=dev-haskell/text-0.11:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/0.1.1
+SRC_URI=mirror://hackage/packages/archive/css-text/0.1.1/css-text-0.1.1.tar.gz
+_eclasses_=eutils	f31a0ec0d081047cbf9c0bbb4822d831	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	0fe5ac58a8b877fae07bb258b762852e	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=55ec8b9db80b3b1cfebbcd2c749861ec
--- a/metadata/md5-cache/dev-haskell/doctest-0.9.7
+++ b/metadata/md5-cache/dev-haskell/doctest-0.9.7
@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prerm setup test
+DEPEND=dev-haskell/deepseq:=[profile?] >=dev-haskell/ghc-paths-0.1.0.9:=[profile?] >=dev-haskell/syb-0.3:=[profile?] <dev-haskell/syb-0.5:=[profile?] dev-haskell/transformers:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/base-compat-0.2.1 >=dev-haskell/hspec-1.3 dev-haskell/hunit >=dev-haskell/quickcheck-2.5 dev-haskell/setenv >=dev-haskell/silently-1.2.4 >=dev-haskell/stringbuilder-0.4 ) doc? ( dev-haskell/haddock ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
+DESCRIPTION=Test interactive Haskell examples
+EAPI=5
+HOMEPAGE=https://github.com/sol/doctest-haskell#readme
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-haskell/deepseq:=[profile?] >=dev-haskell/ghc-paths-0.1.0.9:=[profile?] >=dev-haskell/syb-0.3:=[profile?] <dev-haskell/syb-0.5:=[profile?] dev-haskell/transformers:=[profile?] >=dev-lang/ghc-6.10.4:=
+SLOT=0/0.9.7
+SRC_URI=mirror://hackage/packages/archive/doctest/0.9.7/doctest-0.9.7.tar.gz
+_eclasses_=eutils	f31a0ec0d081047cbf9c0bbb4822d831	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	0fe5ac58a8b877fae07bb258b762852e	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=6ea2aa669421fafc2e72f0517d81d1b7
--- a/Show More
+++ b/Show More
				`@ -0,0 +1 @@`
				`DIST base-compat-0.2.1.tar.gz 9158 SHA256 834465a92fdcbbb48623700208615f9f2d1b77b8ab9488f8ac2d21ceede85afb SHA512 959ce234c61211dc62850f656bb8342aa1fe0c849607a32d43f23d121eb1cb4c3f25a8b669042d9e76aa2f634708219e1a15a4a9afa89e3a3e1a4276b73c0214 WHIRLPOOL 266177e355907a54f8c2d7f2add7ac0741f7c81adaacc8a42e8413026b681e18e0715b4941719cbf9a92a70e501f9bd3e0dcb18a0bb4a6b502edb9d99224d323`
				`@ -0,0 +1 @@`
				`DIST css-text-0.1.1.tar.gz 3139 SHA256 1ed480f350d0107e3ba95c33ab94ea4efd1956443cc7cc0f3f28616733026b83 SHA512 6a62eb4c9919ddc2b8143422fc4af8fcc54fec151d88b46ee34467c94a630b47773a6b4a24c634b44b7551e70b82ddc385345f85ebf2c5fb440ea06a96bee4a6 WHIRLPOOL bb727f9ad50abcbb563f9232766dbcb3143234379b8ce5c68132004559ff642c444fa24fe39db6f9ae46776f7d452507c41cc90bccd86d4f8f69b962bba886ca`
				`@ -0,0 +1 @@`
				`DIST doctest-0.9.7.tar.gz 14131 SHA256 b4a8dcf800cf7af08eb89d2b8ca8aeb6c1936d248b991898097d8e5d2af76a34 SHA512 7b23d8b7e9ad5995427e68bcc230316ae3995441bcb6ef2328596e2c9b2069af0d9aa347fab7e27b9221b2aa0298c08c7d9be1a5667709c60fa0a08c2fd228f5 WHIRLPOOL 15db2c5fc72f4c10d375ee1f79c9929b4e77e16ab7b6cdfb3dda7b52a3b0e9d6182a3eeb607dbe514369415e76b2c586b9a21014bc8b9ff45ff720067e263f2f`
				`@ -0,0 +1 @@`
				`DIST filestore-0.6.0.1.tar.gz 29807 SHA256 6eabe0a7d5c8c95a3c827f92db80fe84a14c514f2a74dfca66cf4a56e30243d1 SHA512 875d79953ff92cf1605f5255cf5c9b53e218de9d110da51f8a216b6240a37566d3c70f36d4a68ca2f63827b45a75ce40e370b3cb4f93dc8b417c230a9f8b845f WHIRLPOOL 08295100ecb45276ab7844a90bff5b41896620c254648e878008abda23e6ceafaa3367382e36f3ab305a10d91f170a8d2fce2e0b5e6a623e4a16a9e947cc0c3b`
				`@ -0,0 +1 @@`
				`DIST hspec-expectations-0.3.2.tar.gz 3707 SHA256 b11b2618749197a56c4ea3ea1d924a0de910d95fc92f560fe36032fc2ce5c224 SHA512 0ccb5a8999c41df00d977cefd985f2fd9d3d1abe79e79e340ab92ab87d875edbbd22f5b7a16e9f2c7f7ad127d7a30a8491b4bb6c59e92eec0c6a1439604c2599 WHIRLPOOL 0cda24b6e5786f45641bf2aeaaba53baf9819ada09f5816770f73cff0fbce968a13ea93a15ff2fa88d176f1ddab36b950c93fd7dff649344dfd5213ecc951885`
				`@ -0,0 +1 @@`
				`DIST hspec-meta-1.5.4.tar.gz 19600 SHA256 88319cbaa84c4ef998f1813081e9b99ff24da59cb0b72530ca394d6b55e7a71e SHA512 de1fe63013bbae4178bb6beed181f2413c9398fba79d3ba8ee384809f636893b0052202f77eed2be12455c66f51a703d149d880fb628669c37fdae928ee4dda1 WHIRLPOOL f4b479b61f12c0189412d42efbff64fcba1b160b6a506e6cfef084174d43de84ae440370209f19a9e897598e2a389a2c5b7e22e564f39a829f0d809add37ed15`
				`@ -0,0 +1 @@`
				`DIST hspec-1.5.4.tar.gz 30050 SHA256 8dce8de068eb84eec2bf72de37f6727a2dfddd85f2289d969e07038885ac87a1 SHA512 a2587d3b105786e74664ca378c09c971f11f48daf6175dd6eb6ada84116312911545bedf93b8ef3a50c86374899f1b6267404f82587047d8d5163515ac58b346 WHIRLPOOL 13061d776531a0726f6dfcef4d195a8b2d25e579d7f372ac92e4d6618323a2ef290706cf6b4ea4ed1ad84b4341671f702c6317f630daf5dcb20e0190a23c3c82`
				`@ -0,0 +1 @@`
				`DIST markdown-unlit-0.2.0.1.tar.gz 2950 SHA256 186e38a8cba9371293763708778bce59756d184003478a606bac8bed22db83ad SHA512 72098e14fd7c8abceb2001d0b180384b7e1e1ad180d41417841bef6c327a242cf1eec060e23137f46f766c4b15366c212f1dde9500647e504ebf6246f0e89072 WHIRLPOOL 9988d5bdba0792d6a848f1b71980471ede2aa7856d07fceb495df24cb81cd181e4788a212c191377588353340dc3bb992c72bd884da882c126d408fd848bb175`
				`@ -0,0 +1 @@`
				`DIST nanospec-0.1.0.tar.gz 3408 SHA256 604aab074552e580a52bcfda8fce7cb2a48316f4f903801ea5d9a29b52b0179b SHA512 6e38bcee0d9a5f2e6b42566bb3e4aec57a61115dd649cb441721cb79193caac5aaf59aeef54a30dccb7e939e6512632221ec9e03b86142e5cb7671ef3433d4e9 WHIRLPOOL 0185abd0ad4a374a65f8b63168a74a66175b63db3f85deb3277ac6dd06c945486711aa1333501f104b59e400a9c6a176459fbf95b90f9a2e297325631edaa673`
				`@ -0,0 +1 @@`
				`DIST quickcheck-io-0.1.0.tar.gz 1604 SHA256 5a32c4bf8266010db2874d101b6af471af2e41d602c34ebd768c867bd8d1ed98 SHA512 9d0ed38c0e90475946528373e0ccfa1cd66337fda6ec18de1cdcfa7469e9809dbc227f8c8b0c2a48b020749f1750f1159f6b5a24a2b5f1f39965561bfa7c1d60 WHIRLPOOL 769617053dbd549222a9e9c09894d8718aaef664f3e7c415b42f385781c5dbdaae9df35ff965b92663212c44cf4375d22374af9ec41a2fdb5ac04d259b1207f1`